UI-LIB scrollview fix for new arch #3775 (#3776)

markdevocht · M-i-k-e-l · web-flow · commit b510acf00b30 · 2025-07-10T14:16:17.000+03:00
* UI-LIB scrollview fix for new arch #3775 * Update snapshot --------- Co-authored-by: M-i-k-e-l <michaelle@wix.com>
diff --git a/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m b/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m
@@ -11,11 +11,12 @@
 #import "UIResponder+FirstResponderTemp.h"
 
 #import <WebKit/WebKit.h>
-#import <React/RCTScrollView.h>
+
 #import <React/RCTBridge.h>
 #import <React/RCTUIManager.h>
 #import <React/UIView+React.h>
 #import <React/RCTUIManagerUtils.h>
+#import <React/RCTSurfaceHostingView.h>
 
 #import <objc/runtime.h>
 
@@ -70,7 +71,7 @@ -(instancetype)init
     
     if (self)
     {
-        [self addObserver:self forKeyPath:@"bounds" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:NULL];
+        [self addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:NULL];
         _inputViewsMap = [NSMapTable weakToWeakObjectsMapTable];
         _deferedInitializeAccessoryViewsCount = 0;
         
@@ -93,20 +94,21 @@ -(instancetype)init
     return self;
 }
 
--(RCTRootView*)getRootView
+-(UIView*)getRootView
 {
     UIView *view = self;
     while (view.superview != nil)
     {
         view = view.superview;
-        if ([view isKindOfClass:[RCTRootView class]])
+        if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {
             break;
+        }
     }
     
-    if ([view isKindOfClass:[RCTRootView class]])
-    {
-        return (RCTRootView*)view;
+    if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {
+        return view;
     }
+    
     return nil;
 }
 
@@ -169,37 +171,50 @@ -(void)layoutSubviews
     [self updateBottomViewFrame];
 }
 
+- (UIScrollView*)extractUIScrollView:(UIView*)view
+{
+    for (UIView* subview in view.subviews) {
+        if ([subview isKindOfClass:[UIScrollView class]]) {
+            return (UIScrollView*)subview;
+        }
+    }
+    
+    return nil;
+}
+
 - (void)initializeAccessoryViewsAndHandleInsets
 {
     NSArray<UIView*>* allSubviews = [self getBreadthFirstSubviewsForView:[self getRootView]];
-    NSMutableArray<RCTScrollView*>* rctScrollViewsArray = [NSMutableArray array];
     
     for (UIView* subview in allSubviews)
     {
         if(_manageScrollView)
         {
             if(_scrollViewToManage == nil)
             {
-                if(_requiresSameParentToManageScrollView && [subview isKindOfClass:[RCTScrollView class]] && subview.superview == self.superview)
-                {
-                    _scrollViewToManage = ((RCTScrollView*)subview).scrollView;
-                }
-                else if(!_requiresSameParentToManageScrollView && [subview isKindOfClass:[UIScrollView class]])
-                {
-                    _scrollViewToManage = (UIScrollView*)subview;
+                if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"]) {
+                  UIScrollView *scrollView = [self extractUIScrollView:subview];
+                  
+                    if ([scrollView isKindOfClass:[UIScrollView class]])
+                    {
+                        if(_requiresSameParentToManageScrollView && subview.superview == self.superview)
+                        {
+                          _scrollViewToManage = scrollView;
+                        }
+                        else if(!_requiresSameParentToManageScrollView)
+                        {
+                          _scrollViewToManage = scrollView;
+                        }
+                        
+                        if(_scrollViewToManage != nil)
+                        {
+                          _scrollIsInverted = CGAffineTransformEqualToTransform(subview.superview.transform, CGAffineTransformMakeScale(1, -1));
+                        }
+                    }
                 }
-                
-                if(_scrollViewToManage != nil)
-                {
-                    _scrollIsInverted = CGAffineTransformEqualToTransform(_scrollViewToManage.superview.transform, CGAffineTransformMakeScale(1, -1));
-                }
-            }
-            
-            if([subview isKindOfClass:[RCTScrollView class]])
-            {
-                [rctScrollViewsArray addObject:(RCTScrollView*)subview];
             }
         }
+          
         
         if ([subview isKindOfClass:NSClassFromString(@"RCTTextField")])
         {
@@ -247,13 +262,11 @@ - (void)initializeAccessoryViewsAndHandleInsets
         }
     }
     
-    for (RCTScrollView *scrollView in rctScrollViewsArray)
+    if(_scrollViewToManage != nil)
     {
-        if(scrollView.scrollView == _scrollViewToManage)
+        if(_scrollViewToManage.delegate == nil)
         {
-            [scrollView removeScrollListener:self];
-            [scrollView addScrollListener:self];
-            break;
+            _scrollViewToManage.delegate = self;
         }
     }
     
@@ -338,12 +351,12 @@ -(void)didMoveToWindow
 
 -(void)dealloc
 {
-    [self removeObserver:self forKeyPath:@"bounds"];
+    [self removeObserver:self forKeyPath:@"frame"];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
-    _ObservingInputAccessoryViewTemp.height = self.bounds.size.height;
+    _ObservingInputAccessoryViewTemp.height = self.frame.size.height;
 }
 
 - (void)ObservingInputAccessoryViewTempKeyboardWillDisappear:(ObservingInputAccessoryViewTemp *)ObservingInputAccessoryViewTemp
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "react-native-redash": "^12.0.3",
     "semver": "^5.5.0",
     "tinycolor2": "^1.4.2",
-    "uilib-native": "5.0.0-snapshot.7216",
+    "uilib-native": "5.0.0-snapshot.7240",
     "url-parse": "^1.2.0",
     "wix-react-native-text-size": "1.0.9"
   },
diff --git a/yarn.lock b/yarn.lock
@@ -10938,7 +10938,7 @@ __metadata:
     shell-utils: ^1.0.10
     tinycolor2: ^1.4.2
     typescript: 5.0.4
-    uilib-native: 5.0.0-snapshot.7216
+    uilib-native: 5.0.0-snapshot.7240
     url-parse: ^1.2.0
     wix-react-native-text-size: 1.0.9
   peerDependencies:
@@ -12570,16 +12570,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uilib-native@npm:5.0.0-snapshot.7216":
-  version: 5.0.0-snapshot.7216
-  resolution: "uilib-native@npm:5.0.0-snapshot.7216"
+"uilib-native@npm:5.0.0-snapshot.7240":
+  version: 5.0.0-snapshot.7240
+  resolution: "uilib-native@npm:5.0.0-snapshot.7240"
   dependencies:
     lodash: ^4.17.21
     prop-types: ^15.5.10
   peerDependencies:
     react: ">=17.0.1"
     react-native: ">=0.64.1"
-  checksum: 3ca207bae3865fc4275393135f5cd4a46c52678100d4308fe1008d0167d8d5ae8bd1cab558b364d7ad60e5c96cb38497cd10b0109e15376c623ef9849cfb3a32
+  checksum: e18a273800b231479aea3fac4a43c7f2c4a6f74c995f44e7b9ab5642b666d94060ff09a2c0f76cf6e871cbd8fc57baaee92a4879c28e20be3358fbb4fd02dc0f
   languageName: node
   linkType: hard
 

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`	`#import "UIResponder+FirstResponderTemp.h"`
`12`	`12`
`13`	`13`	`#import <WebKit/WebKit.h>`
`14`		`-#import <React/RCTScrollView.h>`
	`14`	`+`
`15`	`15`	`#import <React/RCTBridge.h>`
`16`	`16`	`#import <React/RCTUIManager.h>`
`17`	`17`	`#import <React/UIView+React.h>`
`18`	`18`	`#import <React/RCTUIManagerUtils.h>`
	`19`	`+#import <React/RCTSurfaceHostingView.h>`
`19`	`20`
`20`	`21`	`#import <objc/runtime.h>`
`21`	`22`
`@@ -70,7 +71,7 @@ -(instancetype)init`
`70`	`71`
`71`	`72`	`if (self)`
`72`	`73`	`{`
`73`		`- [self addObserver:self forKeyPath:@"bounds" options:NSKeyValueObservingOptionInitial \| NSKeyValueObservingOptionNew context:NULL];`
	`74`	`+ [self addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionInitial \| NSKeyValueObservingOptionNew context:NULL];`
`74`	`75`	`_inputViewsMap = [NSMapTable weakToWeakObjectsMapTable];`
`75`	`76`	`_deferedInitializeAccessoryViewsCount = 0;`
`76`	`77`
`@@ -93,20 +94,21 @@ -(instancetype)init`
`93`	`94`	`return self;`
`94`	`95`	`}`
`95`	`96`
`96`		`--(RCTRootView*)getRootView`
	`97`	`+-(UIView*)getRootView`
`97`	`98`	`{`
`98`	`99`	`UIView *view = self;`
`99`	`100`	`while (view.superview != nil)`
`100`	`101`	`{`
`101`	`102`	`view = view.superview;`
`102`		`- if ([view isKindOfClass:[RCTRootView class]])`
	`103`	`+ if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {`
`103`	`104`	`break;`
	`105`	`+ }`
`104`	`106`	`}`
`105`	`107`
`106`		`- if ([view isKindOfClass:[RCTRootView class]])`
`107`		`- {`
`108`		`- return (RCTRootView*)view;`
	`108`	`+ if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {`
	`109`	`+ return view;`
`109`	`110`	`}`
	`111`	`+`
`110`	`112`	`return nil;`
`111`	`113`	`}`
`112`	`114`
`@@ -169,37 +171,50 @@ -(void)layoutSubviews`
`169`	`171`	`[self updateBottomViewFrame];`
`170`	`172`	`}`
`171`	`173`
	`174`	`+- (UIScrollView)extractUIScrollView:(UIView)view`
	`175`	`+{`
	`176`	`+ for (UIView* subview in view.subviews) {`
	`177`	`+ if ([subview isKindOfClass:[UIScrollView class]]) {`
	`178`	`+ return (UIScrollView*)subview;`
	`179`	`+ }`
	`180`	`+ }`
	`181`	`+`
	`182`	`+ return nil;`
	`183`	`+}`
	`184`	`+`
`172`	`185`	`- (void)initializeAccessoryViewsAndHandleInsets`
`173`	`186`	`{`
`174`	`187`	`NSArray<UIView> allSubviews = [self getBreadthFirstSubviewsForView:[self getRootView]];`
`175`		`- NSMutableArray<RCTScrollView> rctScrollViewsArray = [NSMutableArray array];`
`176`	`188`
`177`	`189`	`for (UIView* subview in allSubviews)`
`178`	`190`	`{`
`179`	`191`	`if(_manageScrollView)`
`180`	`192`	`{`
`181`	`193`	`if(_scrollViewToManage == nil)`
`182`	`194`	`{`
`183`		`- if(_requiresSameParentToManageScrollView && [subview isKindOfClass:[RCTScrollView class]] && subview.superview == self.superview)`
`184`		`- {`
`185`		`- _scrollViewToManage = ((RCTScrollView*)subview).scrollView;`
`186`		`- }`
`187`		`- else if(!_requiresSameParentToManageScrollView && [subview isKindOfClass:[UIScrollView class]])`
`188`		`- {`
`189`		`- _scrollViewToManage = (UIScrollView*)subview;`
	`195`	`+ if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"]) {`
	`196`	`+ UIScrollView *scrollView = [self extractUIScrollView:subview];`
	`197`	`+`
	`198`	`+ if ([scrollView isKindOfClass:[UIScrollView class]])`
	`199`	`+ {`
	`200`	`+ if(_requiresSameParentToManageScrollView && subview.superview == self.superview)`
	`201`	`+ {`
	`202`	`+ _scrollViewToManage = scrollView;`
	`203`	`+ }`
	`204`	`+ else if(!_requiresSameParentToManageScrollView)`
	`205`	`+ {`
	`206`	`+ _scrollViewToManage = scrollView;`
	`207`	`+ }`
	`208`	`+`
	`209`	`+ if(_scrollViewToManage != nil)`
	`210`	`+ {`
	`211`	`+ _scrollIsInverted = CGAffineTransformEqualToTransform(subview.superview.transform, CGAffineTransformMakeScale(1, -1));`
	`212`	`+ }`
	`213`	`+ }`
`190`	`214`	`}`
`191`		`-`
`192`		`- if(_scrollViewToManage != nil)`
`193`		`- {`
`194`		`- _scrollIsInverted = CGAffineTransformEqualToTransform(_scrollViewToManage.superview.transform, CGAffineTransformMakeScale(1, -1));`
`195`		`- }`
`196`		`- }`
`197`		`-`
`198`		`- if([subview isKindOfClass:[RCTScrollView class]])`
`199`		`- {`
`200`		`- [rctScrollViewsArray addObject:(RCTScrollView*)subview];`
`201`	`215`	`}`
`202`	`216`	`}`
	`217`	`+`
`203`	`218`
`204`	`219`	`if ([subview isKindOfClass:NSClassFromString(@"RCTTextField")])`
`205`	`220`	`{`
`@@ -247,13 +262,11 @@ - (void)initializeAccessoryViewsAndHandleInsets`
`247`	`262`	`}`
`248`	`263`	`}`
`249`	`264`
`250`		`- for (RCTScrollView *scrollView in rctScrollViewsArray)`
	`265`	`+ if(_scrollViewToManage != nil)`
`251`	`266`	`{`
`252`		`- if(scrollView.scrollView == _scrollViewToManage)`
	`267`	`+ if(_scrollViewToManage.delegate == nil)`
`253`	`268`	`{`
`254`		`- [scrollView removeScrollListener:self];`
`255`		`- [scrollView addScrollListener:self];`
`256`		`- break;`
	`269`	`+ _scrollViewToManage.delegate = self;`
`257`	`270`	`}`
`258`	`271`	`}`
`259`	`272`
`@@ -338,12 +351,12 @@ -(void)didMoveToWindow`
`338`	`351`
`339`	`352`	`-(void)dealloc`
`340`	`353`	`{`
`341`		`- [self removeObserver:self forKeyPath:@"bounds"];`
	`354`	`+ [self removeObserver:self forKeyPath:@"frame"];`
`342`	`355`	`}`
`343`	`356`
`344`	`357`	`- (void)observeValueForKeyPath:(NSString )keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> )change context:(void *)context`
`345`	`358`	`{`
`346`		`- _ObservingInputAccessoryViewTemp.height = self.bounds.size.height;`
	`359`	`+ _ObservingInputAccessoryViewTemp.height = self.frame.size.height;`
`347`	`360`	`}`
`348`	`361`
`349`	`362`	`- (void)ObservingInputAccessoryViewTempKeyboardWillDisappear:(ObservingInputAccessoryViewTemp *)ObservingInputAccessoryViewTemp`