feat: popover 添加通过 nativeID 定位元素功能

Author: magicismight

RNPopoverIOS.ios.js

@@ -61,6 +61,10 @@ export default class extends Component {
      * The `sourceViewGetterTag` prop is the tag of The view getter which containing the anchor rectangle for the popover
      */
     sourceViewGetterTag: PropTypes.number,
+    /**
+     * The `sourceViewNativeID` prop is the nativeID of The view containing the anchor rectangle for the popover
+     */
+    sourceViewNativeID: PropTypes.string,
     /**
      * The `sourceRect` prop is the rectangle in the specified view in which to anchor the popover.
      */
@@ -87,7 +91,7 @@ export default class extends Component {
     /**
      * The `onHide` prop allows passing a function that will be called once the popover has been hidden.
      */
-    onHide: PropTypes.func,
+    onHide: PropTypes.func
   };
 
   static defaultProps = {

ios/RNPopoverHostView.h

@@ -44,6 +44,11 @@
  */
 @property (nonatomic, assign) NSInteger sourceViewGetterTag;
 
+/**
+ nativeID for the native view containing the anchor rectangle for the popover.
+ */
+@property (nonatomic, assign) NSString *sourceViewNativeID;
+
 /**
  reactTag for the react view containing the anchor rectangle for the popover.
  

ios/RNPopoverHostView.m

@@ -103,25 +103,26 @@ - (void)didMoveToWindow {
         _initialized = YES;
         _popoverHostViewController.view.backgroundColor = _popoverBackgroundColor;
 
-        UIView *sourceView = [self autoGetSourceView];
-        if (!sourceView) {
-            NSLog(@"sourceView is invalid");
-            if (_onHide) {
-                _onHide(nil);
+        [self autoGetSourceView:^(UIView *sourceView) {
+            if (!sourceView) {
+                NSLog(@"sourceView is invalid");
+                if (_onHide) {
+                    _onHide(nil);
+                }
+                return;
             }
-            return;
-        }
-        _presented = YES;
-        [self updateContentSize];
-        _popoverHostViewController.popoverPresentationController.sourceView = sourceView;
-        _popoverHostViewController.popoverPresentationController.sourceRect = CGRectEqualToRect(_realSourceRect, CGRectNull) ? sourceView.bounds : _realSourceRect;
-        _popoverHostViewController.popoverPresentationController.backgroundColor = _popoverBackgroundColor;
-        _popoverHostViewController.popoverPresentationController.permittedArrowDirections = [self getPermittedArrowDirections];
-        if (!CGSizeEqualToSize(CGSizeZero, _realPreferredContentSize)) {
-            _popoverHostViewController.preferredContentSize = _realPreferredContentSize;
-        }
-        
-        [_delegate presentPopoverHostView:self withViewController:_popoverHostViewController animated:_animated];
+            _presented = YES;
+            [self updateContentSize];
+            _popoverHostViewController.popoverPresentationController.sourceView = sourceView;
+            _popoverHostViewController.popoverPresentationController.sourceRect = CGRectEqualToRect(_realSourceRect, CGRectNull) ? sourceView.bounds : _realSourceRect;
+            _popoverHostViewController.popoverPresentationController.backgroundColor = _popoverBackgroundColor;
+            _popoverHostViewController.popoverPresentationController.permittedArrowDirections = [self getPermittedArrowDirections];
+            if (!CGSizeEqualToSize(CGSizeZero, _realPreferredContentSize)) {
+                _popoverHostViewController.preferredContentSize = _realPreferredContentSize;
+            }
+            
+            [_delegate presentPopoverHostView:self withViewController:_popoverHostViewController animated:_animated];
+        }];
     }
 }
 
@@ -201,16 +202,24 @@ - (void)updateContentSize {
     });
 }
 
-- (UIView *)autoGetSourceView {
-    UIView *sourceView = nil;
-    if (_sourceViewReactTag >= 0) {
-        sourceView = [_bridge.uiManager viewForReactTag:@(_sourceViewReactTag)];
-    } else if (_sourceViewTag >= 0) {
-        sourceView = [[RNPopoverTargetManager getInstance] viewForTag:_sourceViewTag];
-    } else if (_sourceViewGetterTag >= 0) {
-        sourceView = [[RNPopoverTargetManager getInstance] viewForGetterTag:_sourceViewGetterTag];
+- (void)autoGetSourceView:(void (^)(UIView *view))completion {
+    if (_sourceViewNativeID) {
+        __block NSString *nativeID = _sourceViewNativeID;
+        [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *view) {
+            completion([_bridge.uiManager viewForNativeID:nativeID withRootTag:view.reactTag]);
+        }];
+    } else {
+        UIView *sourceView = nil;
+        if (_sourceViewReactTag >= 0) {
+            sourceView = [_bridge.uiManager viewForReactTag:@(_sourceViewReactTag)];
+        } else if (_sourceViewTag >= 0) {
+            sourceView = [[RNPopoverTargetManager getInstance] viewForTag:_sourceViewTag];
+        } else if (_sourceViewGetterTag >= 0) {
+            sourceView = [[RNPopoverTargetManager getInstance] viewForGetterTag:_sourceViewGetterTag];
+        }
+        completion(sourceView);
     }
-    return sourceView;
+
 }
 
 #pragma mark - Setter

ios/RNPopoverHostViewManager.m

@@ -34,6 +34,7 @@ @implementation RNPopoverHostViewManager  {
 RCT_EXPORT_VIEW_PROPERTY(popoverBackgroundColor, UIColor)
 RCT_EXPORT_VIEW_PROPERTY(sourceViewReactTag, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(sourceViewTag, NSInteger)
+RCT_EXPORT_VIEW_PROPERTY(sourceViewNativeID, NSString)
 RCT_EXPORT_VIEW_PROPERTY(sourceViewGetterTag, NSInteger)
 RCT_EXPORT_VIEW_PROPERTY(sourceRect, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(permittedArrowDirections, NSArray)