react-native-ui-lib 7.46.3 → 8.0.0

package/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 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     
     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 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     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;
 }
 
@@ -166,13 +168,38 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 -(void)layoutSubviews
 {
     [super layoutSubviews];
+    
+    // Preserving the AccessoryView's Y position within its superview
+    CGFloat bottomSafeArea = [self getBottomSafeArea];
+    CGFloat tabBarHeight = [self getTabBarHeight];
+    CGFloat yOffset = MIN(-bottomSafeArea, -_ObservingInputAccessoryViewTemp.keyboardHeight + tabBarHeight);
+    
+    if (self.frame.origin.y != yOffset) {
+        [self removeObserver:self forKeyPath:@"frame"];
+        self.frame = CGRectMake(self.frame.origin.x,
+                                yOffset,
+                                self.frame.size.width,
+                                self.frame.size.height);
+        [self addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionNew context:NULL];
+    }
+    
     [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)
     {
@@ -180,27 +207,30 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         {
             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")])
         {
             UITextField *textField = nil;
@@ -223,17 +253,30 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         {
             [self setupTextView:[subview valueForKey:@"_backedTextInputView"]];
         }
-        else if ([subview isKindOfClass:NSClassFromString(@"RCTTextView")])
+        else if ([subview isKindOfClass:NSClassFromString(@"RCTTextView")] ||
+                 [subview isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
         {
+            
             UITextView *textView = nil;
-            Ivar backedTextInputIvar = class_getInstanceVariable([subview class], "_backedTextInput");
-            if (backedTextInputIvar != NULL)
-            {
-                textView = [subview valueForKey:@"_backedTextInput"];
-            }
-            else if([subview isKindOfClass:[UITextView class]])
-            {
-                textView = (UITextView*)subview;
+            
+            if ([subview isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")]) {
+                Ivar textFieldIvar = class_getInstanceVariable([subview class], "_backedTextInputView");
+                if (textFieldIvar != NULL)
+                {
+                    textView = [subview valueForKey:@"_backedTextInputView"];
+                }
+                
+            } else {
+                
+                Ivar backedTextInputIvar = class_getInstanceVariable([subview class], "_backedTextInput");
+                if (backedTextInputIvar != NULL)
+                {
+                    textView = [subview valueForKey:@"_backedTextInput"];
+                }
+                else if([subview isKindOfClass:[UITextView class]])
+                {
+                    textView = (UITextView*)subview;
+                }
             }
             [self setupTextView:textView];
         }
@@ -247,13 +290,11 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         }
     }
     
-    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;
         }
     }
     
@@ -270,6 +311,8 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     _originalHeight = _ObservingInputAccessoryViewTemp.height;
     
     [self addBottomViewIfNecessary];
+    
+    [self ensureLegacyViewManagerTouchDelegation];
 }
 
 - (void)setupTextView:(UITextView*)textView
@@ -338,12 +381,12 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 
 -(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
@@ -391,7 +434,9 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 
 - (void)_updateScrollViewInsets
 {
-    if(self.scrollViewToManage != nil)
+    // Because our view is now being transformed inside it's superview (from RN77 it inherited a RCTLegacyViewManagerInteropComponentView as superview) we no longer need the scrollview to also update because it's inside our view
+    return;
+    /*if(self.scrollViewToManage != nil)
     {
         UIEdgeInsets insets = self.scrollViewToManage.contentInset;
         CGFloat bottomSafeArea = [self getBottomSafeArea];
@@ -401,6 +446,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         CGPoint originalOffset = self.scrollViewToManage.contentOffset;
         
         bottomInset += (_ObservingInputAccessoryViewTemp.keyboardHeight == 0 ? bottomSafeArea : 0);
+        
         if(self.scrollIsInverted)
         {
             insets.top = bottomInset;
@@ -437,7 +483,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
             insets.bottom = bottomInset;
         }
         self.scrollViewToManage.scrollIndicatorInsets = insets;
-    }
+    }*/
 }
 
 #pragma mark - bottom view
@@ -550,10 +596,53 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     }
     [self updateBottomViewFrame];
     
-    self.transform = CGAffineTransformMakeTranslation(0, accessoryTranslation);
+    CGAffineTransform oldTransform = self.transform;
+    CGAffineTransform newTransform = CGAffineTransformMakeTranslation(0, accessoryTranslation);
+    if (oldTransform.tx != newTransform.tx || oldTransform.ty != newTransform.ty) {
+        self.transform = CGAffineTransformMakeTranslation(0, accessoryTranslation);
+    }
+    
     [self _updateScrollViewInsets];
 }
 
+- (void)ensureLegacyViewManagerTouchDelegation {
+    UIView *superview = self.superview;
+    if (superview) {
+        if ([NSStringFromClass([superview class]) isEqualToString:@"RCTLegacyViewManagerInteropComponentView"]) {
+            [self changeLegacyViewManagerHitTestDelegation:superview];
+        }
+    }
+}
+
+- (void)changeLegacyViewManagerHitTestDelegation:(UIView *)wrapperView {
+    static dispatch_once_t onceToken;
+    static IMP originalHitTestIMP = NULL;
+    
+    dispatch_once(&onceToken, ^{
+        Class wrapperClass = [wrapperView class];
+        
+        Method originalMethod = class_getInstanceMethod(wrapperClass, @selector(hitTest:withEvent:));
+        if (originalMethod) {
+            originalHitTestIMP = method_getImplementation(originalMethod);
+            
+            IMP customHitTest = imp_implementationWithBlock(^UIView*(id self, CGPoint point, UIEvent *event) {
+                UIView *subview = [self subviews].firstObject;
+                if (subview &&
+                    [subview isKindOfClass:[KeyboardTrackingViewTemp class]]) {
+                    CGPoint convertedPoint = [self convertPoint:point toView:subview];
+                    UIView *result = [subview hitTest:convertedPoint withEvent:event];
+                    return result;
+                }
+                
+                UIView* (*originalFunc)(id, SEL, CGPoint, UIEvent*) = (void*)originalHitTestIMP;
+                return originalFunc(self, @selector(hitTest:withEvent:), point, event);
+            });
+            
+            method_setImplementation(originalMethod, customHitTest);
+        }
+    });
+}
+
 - (void)performScrollToFocusedInput
 {
     if (_scrollViewToManage != nil && self.scrollToFocusedInput)
@@ -735,3 +824,4 @@ RCT_EXPORT_METHOD(scrollToStart:(nonnull NSNumber *)reactTag)
 }
 
 @end
+

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index",
@@ -17,7 +17,7 @@
     "shell-utils": "^1.0.10"
   },
   "peerDependencies": {
-    "react": ">=17.0.1",
-    "react-native": ">=0.64.1"
+    "react": ">=18.3.1",
+    "react-native": ">=0.77.3"
   }
 }

package/lib/react-native.config.js

@@ -10,11 +10,9 @@ module.exports = {
         sourceDir: './android/',
         packageImportPath: `import com.wix.reactnativeuilib.dynamicfont.DynamicFontPackage;
 import com.wix.reactnativeuilib.highlighterview.HighlighterViewPackage;
-import com.wix.reactnativeuilib.keyboardinput.KeyboardInputPackage;
-import com.wix.reactnativeuilib.textinput.TextInputDelKeyHandlerPackage;`,
+import com.wix.reactnativeuilib.keyboardinput.KeyboardInputPackage;`,
         packageInstance: `new DynamicFontPackage(),
       new HighlighterViewPackage(),
-      new TextInputDelKeyHandlerPackage(),
       new KeyboardInputPackage(getApplication())`
       }
     }

package/metro.config.js

@@ -5,9 +5,9 @@ const {assetExts, sourceExts} = defaultConfig.resolver;
 
 /**
  * Metro configuration
- * https://facebook.github.io/metro/docs/configuration
+ * https://reactnative.dev/docs/metro
  *
- * @type {import('metro-config').MetroConfig}
+ * @type {import('@react-native/metro-config').MetroConfig}
  */
 
 const config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ui-lib",
-  "version": "7.46.3",
+  "version": "8.0.0",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "author": "Ethan Sharabi <ethan.shar@gmail.com>",
@@ -14,7 +14,7 @@
     "url": "https://github.com/wix/react-native-ui-lib"
   },
   "scripts": {
-    "start": "watchman watch-del-all && react-native start",
+    "start": "watchman watch-del-all && react-native start --client-logs",
     "start:web": "npm --prefix webDemo run start",
     "ios": "react-native run-ios",
     "android": "react-native run-android",
@@ -56,15 +56,14 @@
     "react-native-redash": "^12.0.3",
     "semver": "^5.5.0",
     "tinycolor2": "^1.4.2",
-    "uilib-native": "4.5.1",
     "url-parse": "^1.2.0",
     "wix-react-native-text-size": "1.0.9"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.8",
-    "@babel/core": "^7.24.4",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-transform-modules-commonjs": "^7.17.9",
-    "@babel/preset-env": "^7.20.0",
+    "@babel/preset-env": "^7.25.3",
     "@babel/preset-react": "^7.10.1",
     "@babel/runtime": "^7.26.10",
     "@formatjs/intl-datetimeformat": "^6.0.3",
@@ -73,28 +72,29 @@
     "@formatjs/intl-numberformat": "^8.0.4",
     "@formatjs/intl-pluralrules": "^5.0.3",
     "@react-native-community/blur": "4.4.1",
-    "@react-native-community/datetimepicker": "^3.4.6",
-    "@react-native-community/netinfo": "^5.6.2",
-    "@react-native/babel-preset": "0.73.21",
-    "@react-native/eslint-config": "0.73.2",
-    "@react-native/metro-config": "0.73.5",
-    "@react-native/typescript-config": "0.73.1",
+    "@react-native-community/cli": "15.0.1",
+    "@react-native-community/cli-platform-android": "15.0.1",
+    "@react-native-community/cli-platform-ios": "15.0.1",
+    "@react-native-community/datetimepicker": "8.2.0",
+    "@react-native-community/netinfo": "11.3.3",
+    "@react-native/babel-preset": "0.77.3",
+    "@react-native/eslint-config": "0.77.3",
+    "@react-native/metro-config": "0.77.3",
+    "@react-native/typescript-config": "0.77.3",
     "@shopify/flash-list": "1.7.6",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/react-native": "^11.5.1",
     "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/jest": "^29.2.1",
+    "@types/jest": "^29.5.13",
     "@types/lodash": "^4.0.0",
     "@types/prop-types": "^15.5.3",
-    "@types/react": "18.3.7",
-    "@types/react-native": "0.73.0",
+    "@types/react": "18.3.24",
     "@types/react-test-renderer": "^18.3.0",
     "@types/tinycolor2": "^1.4.2",
     "@types/url-parse": "^1.4.3",
     "@typescript-eslint/eslint-plugin": "^5.3.1",
     "@typescript-eslint/parser": "^5.3.1",
     "@welldone-software/why-did-you-render": "^3.2.1",
-    "babel-jest": "^29.6.3",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-module-resolver": "^5.0.0",
     "eslint": "8.19.0",
@@ -104,38 +104,40 @@
     "eslint-plugin-react-native": "^4.0.0",
     "jest": "^29.6.3",
     "light-date": "^1.2.0",
-    "metro-react-native-babel-preset": "0.73.10",
     "moment": "^2.24.0",
     "object-hash": "^3.0.0",
     "postcss": "^8.4.21",
     "postcss-js": "^4.0.0",
     "prettier": "^3.2.5",
     "prettier-eslint": "16.3.0",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-autobind": "^1.0.6",
-    "react-dom": "^18.2.0",
-    "react-native": "0.73.9",
+    "react-dom": "18.3.1",
+    "react-native": "0.77.3",
     "react-native-fs": "^2.20.0",
-    "react-native-gesture-handler": "2.14.1",
+    "react-native-gesture-handler": "2.24.0",
     "react-native-haptic-feedback": "^1.11.0",
     "react-native-linear-gradient": "2.6.2",
-    "react-native-mmkv": "2.11.0",
-    "react-native-navigation": "7.40.1",
-    "react-native-reanimated": "3.16.7",
+    "react-native-mmkv": "3.2.0",
+    "react-native-navigation": "8.1.2",
+    "react-native-reanimated": "3.17.5",
     "react-native-shimmer-placeholder": "^2.0.6",
-    "react-native-svg": "15.2.0",
+    "react-native-svg": "15.11.2",
     "react-native-svg-transformer": "1.5.0",
-    "react-test-renderer": "18.2.0",
+    "react-test-renderer": "18.3.1",
     "reassure": "^0.4.1",
+    "setimmediate": "^1.0.5",
     "shell-utils": "^1.0.10",
-    "typescript": "5.0.4"
+    "typescript": "5.0.4",
+    "uilib-native": "5.0.0"
   },
   "peerDependencies": {
-    "react": ">=17.0.1",
-    "react-native": ">=0.64.1",
-    "react-native-gesture-handler": ">=2.5.0",
-    "react-native-reanimated": ">=2.0.0",
-    "react-native-ui-lib": "*"
+    "react": ">=18.3.1",
+    "react-native": ">=0.77.3",
+    "react-native-gesture-handler": ">=2.24.0",
+    "react-native-reanimated": ">=3.17.5",
+    "react-native-ui-lib": "*",
+    "uilib-native": "5.0.0"
   },
   "jest": {
     "preset": "react-native",
@@ -162,7 +164,6 @@
   "engines": {
     "node": ">=18"
   },
-  "packageManager": "yarn@3.4.1",
   "files": [
     "*.js",
     "*.d.ts",

package/panView.d.ts

@@ -0,0 +1,2 @@
+import {PanView} from './src';
+export default PanView;

package/panView.js

@@ -0,0 +1 @@
+module.exports = require('./src/components/panView').default;

package/scripts/release/prReleaseNotesCommon.js

@@ -71,6 +71,7 @@ async function fetchMergedPRs(postMergedDate, _repo, isPatchRelease) {
             info: parsePR(pr.body)
           };
         } catch {
+          // eslint-disable-next-line no-restricted-syntax
           console.error('Failed parsing PR: ', pr.url);
           return null;
         }
@@ -164,9 +165,7 @@ function getReleaseNotesForType(PRs, title) {
   return releaseNotes;
 }
 
-async function _generateReleaseNotes(latestVersion, newVersion, fileNamePrefix, repo, header, tagPrefix, categories, isPatchRelease) {
-  const latestReleaseDate = fetchLatestReleaseDate(tagPrefix, latestVersion);
-  const PRs = await fetchMergedPRs(latestReleaseDate, repo, isPatchRelease);
+function generateReleaseNotesFromPRs(PRs, categories, header) {
   if (!PRs) {
     return;
   }
@@ -198,10 +197,20 @@ async function _generateReleaseNotes(latestVersion, newVersion, fileNamePrefix,
 
   releaseNotes += getTitle(':bulb: Deprecations & Migrations');
 
+  return releaseNotes;
+}
+
+// eslint-disable-next-line max-len, max-params
+async function _generateReleaseNotes(latestVersion, newVersion, fileNamePrefix, repo, header, tagPrefix, categories, isPatchRelease) {
+  const latestReleaseDate = fetchLatestReleaseDate(tagPrefix, latestVersion);
+  const PRs = await fetchMergedPRs(latestReleaseDate, repo, isPatchRelease);
+  const releaseNotes = generateReleaseNotesFromPRs(PRs, categories, header);
+
   fs.writeFileSync(`${process.env.HOME}/Downloads/${fileNamePrefix}-release-notes_${newVersion}.txt`, releaseNotes, {
     encoding: 'utf8'
   });
 
+  // eslint-disable-next-line max-len
   console.log(`\x1b[1m\x1b[32m✔\x1b[0m \x1b[32m${fileNamePrefix}-release-notes.txt was successfully written to ${process.env.HOME}/Downloads\x1b[0m \x1b[1m\x1b[32m✔\x1b[0m`);
 }
 
@@ -212,6 +221,7 @@ function isPatchRelease(lastVersion, newVersion) {
   return lastMajor === newMajor && lastMinor === newMinor && newPatch - lastPatch > 0;
 }
 
+// eslint-disable-next-line max-params
 async function generateReleaseNotes(latestVersion,
   newVersion,
   fileNamePrefix,
@@ -238,8 +248,9 @@ async function generateReleaseNotes(latestVersion,
     const header = getHeader(newVer);
     console.info(`Current latest version is v${latestVer}`);
     console.info(`Generating release notes out or PRs for v${newVer}`);
+    // eslint-disable-next-line max-len
     _generateReleaseNotes(latestVer, newVer, fileNamePrefix, repo, header, tagPrefix, categories, isPatchRelease(latestVer, newVer));
   });
 }
 
-module.exports = {generateReleaseNotes};
+module.exports = {generateReleaseNotes, generateReleaseNotesFromPRs, parsePR};

package/src/commons/Constants.js

@@ -24,11 +24,8 @@ function setStatusBarHeight() {
   const {
     StatusBarManager
   } = NativeModules;
-  statusBarHeight = (StatusBar.currentHeight ?? StatusBarManager?.HEIGHT) || 0;
-  if (isIOS && StatusBarManager) {
-    // override guesstimate height with the actual height from StatusBarManager
-    StatusBarManager.getHeight(data => statusBarHeight = data.height);
-  }
+  // override guesstimate height with the actual height from StatusBarManager
+  statusBarHeight = (StatusBar.currentHeight ?? StatusBarManager?.getConstants?.()?.HEIGHT) || 0;
 }
 function getAspectRatio() {
   return screenWidth < screenHeight ? screenHeight / screenWidth : screenWidth / screenHeight;

package/src/commons/modifiers.d.ts

@@ -111,6 +111,7 @@ export declare function extractModifierProps(props: Dictionary<any>): _.Dictiona
  */
 export declare function extractOwnProps(props: Dictionary<any>, ignoreProps: string[]): _.Omit<_.Dictionary<any>, string>;
 export declare function extractComponentProps(component: any, props: Dictionary<any>, ignoreProps?: string[]): _.Omit<_.Dictionary<any>, string>;
+export declare function getComponentName(componentDisplayName: string): any;
 export declare function getThemeProps<T extends object>(props?: T, context?: any, componentDisplayName?: string): T;
 export declare function generateModifiersStyle(options: ModifiersOptions | undefined, props: Dictionary<any>): ExtractedStyle;
 export declare function getAlteredModifiersOptions(currentProps: any, nextProps: any): AlteredOptions;

package/src/commons/modifiers.js

@@ -248,12 +248,15 @@ export function extractComponentProps(component, props, ignoreProps = []) {
   const componentProps = _flow(props => _pickBy(props, (_value, key) => _includes(Object.keys(componentPropTypes), key)), props => _omit(props, ignoreProps))(props);
   return componentProps;
 }
+export function getComponentName(componentDisplayName) {
+  //@ts-ignore
+  return componentDisplayName || this.displayName || this.constructor.displayName || this.constructor.name;
+}
 
 //@ts-ignore
 export function getThemeProps(props = this.props, context = this.context, componentDisplayName = '') {
-  const componentName =
   //@ts-ignore
-  componentDisplayName || this.displayName || this.constructor.displayName || this.constructor.name;
+  const componentName = getComponentName.call(this, componentDisplayName);
   let themeProps;
   if (_isFunction(ThemeManager.components[componentName])) {
     themeProps = ThemeManager.components[componentName](props, context);

package/src/components/KeyboardAwareScrollView/KeyboardAwareBase.js

@@ -107,7 +107,7 @@ export default class KeyboardAwareBase extends Component {
           setTimeout(() => {
             this._keyboardAwareView
               .getScrollResponder()
-              .scrollResponderScrollNativeHandleToKeyboard(ReactNative.findNodeHandle(textInputRef),
+              .scrollResponderScrollNativeHandleToKeyboard(this.findNodeHandle(textInputRef),
                 this.props.scrollToInputAdditionalOffset,
                 true);
           }, 0);
@@ -117,6 +117,10 @@ export default class KeyboardAwareBase extends Component {
     }
   }
 
+  findNodeHandle(ref) {
+    return ref.current?.getNodeHandle?.() || ref?.getNodeHandle?.() || ReactNative.findNodeHandle(ref.current || ref);
+  }
+
   _onKeyboardWillShow(event) {
     this._scrollToFocusedTextInput();
 

package/src/components/actionSheet/index.d.ts

@@ -1,14 +1,9 @@
 import React from 'react';
 import { StyleProp, ViewStyle } from 'react-native';
-import { DialogProps } from '../dialog';
 import { ButtonProps } from '../button';
-import { DialogProps as IncubatorDialogProps } from '../../incubator';
+import { type DialogProps } from '../dialog';
 type ActionSheetOnOptionPress = (index: number) => void;
 type ActionSheetProps = {
-    /**
-     * Migrate to the Incubator.Dialog component
-     */
-    migrateDialog?: boolean;
     /**
      * Whether to show the action sheet or not
      */
@@ -68,11 +63,6 @@ type ActionSheetProps = {
      * Note: you will need to call onOptionPress so the option's onPress will be called
      */
     renderAction?: (option: ButtonProps, index: number, onOptionPress: ActionSheetOnOptionPress) => JSX.Element;
-    /**
-     * @deprecated
-     * Called once the modal has been dismissed completely
-     */
-    onModalDismissed?: DialogProps['onDialogDismissed'];
     /**
      * Whether or not to handle SafeArea
      */
@@ -80,7 +70,7 @@ type ActionSheetProps = {
     /**
      * Additional props to send to the Dialog
      */
-    dialogProps?: Omit<DialogProps, 'useSafeArea' | 'testID' | 'containerStyle' | 'visible' | 'onDismiss' | 'onDialogDismissed'> | IncubatorDialogProps;
+    dialogProps?: Omit<DialogProps, 'useSafeArea' | 'testID' | 'containerStyle' | 'visible' | 'onDismiss' | 'onDialogDismissed'> | DialogProps;
     /**
      * testID for e2e tests
      */