fix(ios): dynamic size adaptation support of modal component (#4285)

wwwcg · wwwcg · commit 887b53d4f0ad · 2025-04-28T14:26:42.000+08:00
diff --git a/renderer/native/ios/renderer/HippyUIManager.mm b/renderer/native/ios/renderer/HippyUIManager.mm
@@ -425,27 +425,28 @@ - (void)observeValueForKeyPath:(NSString *)keyPath
     }
 }
 
-- (void)setFrame:(CGRect)frame forView:(UIView *)view{
+- (void)setFrame:(CGRect)frame forView:(UIView *)view {
     NSNumber* hippyTag = view.hippyTag;
     NSNumber* rootTag = view.rootTag;
     
     auto domManager = _domManager.lock();
     if (!domManager) {
         return;
     }
-    __weak id weakSelf = self;
+    
+    __weak __typeof(self)weakSelf = self;
     std::vector<std::function<void()>> ops_ = {[hippyTag, rootTag, weakSelf, frame]() {
-        HippyUIManager *strongSelf = weakSelf;
+        __strong __typeof(weakSelf)strongSelf = weakSelf;
         if (!strongSelf) {
             return;
         }
-        HippyShadowView *renderObject = [strongSelf->_shadowViewRegistry componentForTag:hippyTag onRootTag:rootTag];
-        if (renderObject == nil) {
+        HippyShadowView *shadowView = [strongSelf->_shadowViewRegistry componentForTag:hippyTag onRootTag:rootTag];
+        if (!shadowView) {
             return;
         }
         
-        if (!HippyCGRectRoundInPixelNearlyEqual(frame, renderObject.frame)) {
-            [renderObject setLayoutFrame:frame];
+        if (!HippyCGRectRoundInPixelNearlyEqual(frame, shadowView.frame)) {
+            [shadowView setLayoutFrame:frame];
             std::weak_ptr<RootNode> rootNode = [strongSelf->_shadowViewRegistry rootNodeForTag:rootTag];
             [strongSelf batchOnRootNode:rootNode];
         }
@@ -1073,19 +1074,19 @@ - (void)updateNodesLayout:(const std::vector<std::tuple<int32_t, hippy::LayoutRe
         NSNumber *componentTag = @(tag);
         hippy::LayoutResult layoutResult = std::get<1>(layoutInfoTuple);
         CGRect frame = CGRectMakeFromLayoutResult(layoutResult);
-        HippyShadowView *renderObject = [_shadowViewRegistry componentForTag:componentTag onRootTag:rootTag];
-        if (renderObject) {
-            [renderObject dirtyPropagation:NativeRenderUpdateLifecycleLayoutDirtied];
-            renderObject.frame = frame;
-            renderObject.nodeLayoutResult = layoutResult;
+        HippyShadowView *shadowView = [_shadowViewRegistry componentForTag:componentTag onRootTag:rootTag];
+        if (shadowView) {
+            [shadowView dirtyPropagation:NativeRenderUpdateLifecycleLayoutDirtied];
+            shadowView.frame = frame;
+            shadowView.nodeLayoutResult = layoutResult;
             [self addUIBlock:^(__unused HippyUIManager *uiManager, NSDictionary<NSNumber *,__kindof UIView *> *viewRegistry) {
                 UIView *view = viewRegistry[componentTag];
                 /* do not use frame directly, because shadow view's frame possibly changed manually in
                  * [HippyShadowView collectRenderObjectHaveNewLayoutResults]
                  * This is a Wrong example:
                  * [view hippySetFrame:frame]
                  */
-                [view hippySetFrame:renderObject.frame];
+                [view hippySetFrame:shadowView.frame];
             }];
         }
     }
diff --git a/renderer/native/ios/renderer/component/modal/HippyModalHostView.m b/renderer/native/ios/renderer/component/modal/HippyModalHostView.m
@@ -62,6 +62,7 @@ - (instancetype)initWithBridge:(HippyBridge *)bridge {
 
 - (void)notifyForBoundsChange:(CGRect)newBounds {
     if (_isPresented) {
+        [[_bridge uiManager] setFrame:newBounds forView:self];
         [[_bridge uiManager] setFrame:newBounds forView:_hippySubview];
         [self notifyForOrientationChange];
     }
@@ -89,7 +90,6 @@ - (void)insertHippySubview:(UIView *)subview atIndex:(NSInteger)atIndex {
     HippyAssert(_hippySubview == nil, @"Modal view can only have one subview");
     [super insertHippySubview:subview atIndex:atIndex];
     [subview addGestureRecognizer:_touchHandler];
-    subview.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     
     [_modalViewController.view insertSubview:subview atIndex:0];
     [subview sendAttachedToWindowEvent];
diff --git a/renderer/native/ios/renderer/component/modal/HippyModalHostViewController.m b/renderer/native/ios/renderer/component/modal/HippyModalHostViewController.m
@@ -80,7 +80,6 @@ - (BOOL)prefersStatusBarHidden {
     return hidden;
 }
 
-#if HIPPY_DEBUG
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     UIWindow *keyWindow = HippyKeyWindow();
     UIInterfaceOrientationMask appSupportedOrientationsMask = [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:keyWindow];
@@ -90,6 +89,5 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 
     return _supportedInterfaceOrientations;
 }
-#endif  // HIPPY_DEBUG
 
 @end
diff --git a/renderer/native/ios/renderer/component/modal/HippyModalHostViewManager.mm b/renderer/native/ios/renderer/component/modal/HippyModalHostViewManager.mm
@@ -26,32 +26,11 @@
 #import "HippyModalTransitioningDelegate.h"
 #import "HippyShadowView.h"
 #import "HippyShadowView+Internal.h"
-#import "HippyRenderUtils.h"
 
 
 NSString * const HippyModalHostViewDismissNotification = @"HippyModalHostViewDismissNotification";
 
 
-@interface HippyModalHostShadowView : HippyShadowView
-
-@end
-
-@implementation HippyModalHostShadowView
-
-- (void)insertHippySubview:(HippyShadowView *)subview atIndex:(NSUInteger)atIndex{
-    [super insertHippySubview:subview atIndex:atIndex];
-    CGRect frame = { .origin = CGPointZero, .size = HippyScreenSize() };
-    [subview setLayoutFrame:frame];
-}
-
-- (void)setDomManager:(std::weak_ptr<hippy::DomManager>)domManager {
-    [super setDomManager:domManager];
-    CGRect frame = { .origin = CGPointZero, .size = HippyScreenSize() };
-    [self setLayoutFrame:frame];
-}
-
-@end
-
 @implementation HippyModalHostViewManager
 
 HIPPY_EXPORT_MODULE(Modal)
@@ -83,10 +62,6 @@ - (UIView *)view {
     return _transitioningDelegate;
 }
 
-- (HippyShadowView *)shadowView {
-    return [HippyModalHostShadowView new];
-}
-
 - (void)invalidate {
     for (HippyModalHostView *hostView in _hostViews) {
         [hostView invalidate];

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ - (BOOL)prefersStatusBarHidden {`
`80`	`80`	`return hidden;`
`81`	`81`	`}`
`82`	`82`
`83`		`-#if HIPPY_DEBUG`
`84`	`83`	`- (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`85`	`84`	`UIWindow *keyWindow = HippyKeyWindow();`
`86`	`85`	`UIInterfaceOrientationMask appSupportedOrientationsMask = [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:keyWindow];`
`@@ -90,6 +89,5 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations {`
`90`	`89`
`91`	`90`	`return _supportedInterfaceOrientations;`
`92`	`91`	`}`
`93`		`-#endif // HIPPY_DEBUG`
`94`	`92`
`95`	`93`	`@end`