react-native-ui-lib 7.46.3-snapshot.7360 → 7.46.3-snapshot.7367

package/lib/components/SafeArea/SafeAreaSpacerView.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { ViewStyle, StyleProp } from 'react-native';
+import { ViewStyle } from 'react-native';
 export type SafeAreaSpacerViewProps = {
-    style?: StyleProp<ViewStyle>;
+    style?: ViewStyle;
 };
 declare const SafeAreaSpacerView: {
     ({ style }: SafeAreaSpacerViewProps): React.JSX.Element;

package/lib/components/SafeArea/SafeAreaSpacerView.js

@@ -1,68 +1,14 @@
-import React, { useState, useCallback, useEffect, useMemo } from 'react';
-import { View, Dimensions } from 'react-native';
-import SafeAreaInsetsManager from "./SafeAreaInsetsManager";
+import React from 'react';
+import { View, requireNativeComponent, Platform } from 'react-native';
+const NativeSafeAreaSpacerView = requireNativeComponent('SafeAreaSpacerView');
+const isIOS = Platform.OS === 'ios';
 const SafeAreaSpacerView = ({
   style
 }) => {
-  const [safeAreaInsets, setSafeAreaInsets] = useState({
-    top: 0,
-    left: 0,
-    bottom: 0,
-    right: 0
-  });
-  const [componentHeight, setComponentHeight] = useState(0);
-  const [spacerHeight, setSpacerHeight] = useState(0);
-  useEffect(() => {
-    const getSafeAreaInsets = async () => {
-      try {
-        const insets = await SafeAreaInsetsManager.getSafeAreaInsets();
-        if (insets) {
-          setSafeAreaInsets(insets);
-        }
-      } catch (error) {
-        console.warn('SafeAreaSpacerView: Failed to get initial safe area insets:', error);
-      }
-    };
-    getSafeAreaInsets();
-
-    // Add delegate to listen for safe area changes from native component
-    const delegate = {
-      onSafeAreaInsetsDidChangeEvent: insets => {
-        if (insets) {
-          setSafeAreaInsets(insets);
-        }
-      }
-    };
-    SafeAreaInsetsManager.addSafeAreaChangedDelegate(delegate);
-    return () => {
-      SafeAreaInsetsManager.removeSafeAreaChangedDelegate(delegate);
-    };
-  }, []);
-
-  // Position detection with useCallback
-  const handleLayout = useCallback(event => {
-    const {
-      y
-    } = event.nativeEvent.layout;
-    setComponentHeight(y);
-  }, []);
-  useEffect(() => {
-    const screenHeight = Dimensions.get('window').height;
-    let height = 0;
-    // Check if positioned within safe area bounds
-    if (componentHeight < safeAreaInsets.top) {
-      height = safeAreaInsets.top;
-    } else if (componentHeight > screenHeight - safeAreaInsets.bottom) {
-      height = safeAreaInsets.bottom;
-    }
-    if (height !== spacerHeight) {
-      setSpacerHeight(height);
-    }
-  }, [componentHeight, safeAreaInsets, spacerHeight]);
-  const spacerStyle = useMemo(() => [{
-    height: spacerHeight
-  }, style], [spacerHeight, style]);
-  return <View style={spacerStyle} onLayout={handleLayout} />;
+  return (
+    // @ts-ignore
+    isIOS ? <NativeSafeAreaSpacerView style={style} /> : <View style={style} />
+  );
 };
-SafeAreaSpacerView.displayName = 'SafeAreaSpacerView';
+SafeAreaSpacerView.displayName = 'IGNORE';
 export default SafeAreaSpacerView;

package/lib/components/index.d.ts

@@ -1,6 +1,6 @@
 import DynamicFonts, { FontExtension } from './DynamicFonts';
 import HighlighterOverlayView from './HighlighterOverlayView';
-import SafeAreaSpacerView from './SafeArea';
+import SafeAreaSpacerView from './SafeArea/SafeAreaSpacerView';
 import SafeAreaInsetsManager from './SafeArea/SafeAreaInsetsManager';
 import Keyboard, { KeyboardTrackingViewProps, KeyboardAccessoryViewProps } from './Keyboard';
 export { DynamicFonts, FontExtension, HighlighterOverlayView, SafeAreaSpacerView, SafeAreaInsetsManager, Keyboard, KeyboardTrackingViewProps, KeyboardAccessoryViewProps };

package/lib/components/index.js

@@ -1,6 +1,6 @@
 import DynamicFonts, { FontExtension } from "./DynamicFonts";
 import HighlighterOverlayView from "./HighlighterOverlayView";
-import SafeAreaSpacerView from "./SafeArea";
+import SafeAreaSpacerView from "./SafeArea/SafeAreaSpacerView";
 import SafeAreaInsetsManager from "./SafeArea/SafeAreaInsetsManager";
 import Keyboard, { KeyboardTrackingViewProps, KeyboardAccessoryViewProps } from "./Keyboard";
 export { DynamicFonts, FontExtension, HighlighterOverlayView, SafeAreaSpacerView, SafeAreaInsetsManager, Keyboard, KeyboardTrackingViewProps, KeyboardAccessoryViewProps };

package/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomInputControllerTemp.m

@@ -13,8 +13,6 @@
 
 #import "LNAnimatorTemp.h"
 
-#import "RNNAppDelegate.h"
-
 #define kHlperViewTag 0x1f1f1f
 
 NSString *const RCTCustomInputControllerKeyboardResigendEventTemp = @"kbdResigned";
@@ -51,6 +49,7 @@ NSString *const RCTCustomInputControllerKeyboardResigendEventTemp = @"kbdResigne
         {
             [self.delegate _WXInputHelperViewResignFirstResponder:self];
         }
+
     }
     
     return rv;
@@ -119,36 +118,17 @@ RCT_EXPORT_MODULE(CustomInputControllerTemp)
     return [params[@"useSafeArea"] isEqual:@(1)];
 }
 
-- (UITextField*)getTextFieldFromTextInputComponentView:(id)inputField {
-    UITextField *textField = nil;
-    
-    if ([inputField isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
-    {
-        Ivar textFieldIvar = class_getInstanceVariable([inputField class], "_backedTextInputView");
-        if (textFieldIvar != NULL)
-        {
-            textField = [inputField valueForKey:@"_backedTextInputView"];
-        }
-    }
-    
-    return textField;
-}
-
 RCT_EXPORT_METHOD(presentCustomInputComponent:(nonnull NSNumber*)inputFieldTag params:(nonnull NSDictionary*)params)
 {
     RCTBridge* bridge = [self.bridge valueForKey:@"parentBridge"];
     if(bridge == nil)
     {
-        bridge = self.bridge;
+        return;
     }
     
     UIView* inputField = [self.bridge.uiManager viewForReactTag:inputFieldTag];
     NSDictionary *initialProps = params[@"initialProps"];
-    
-    RNNAppDelegate* appDelegate = (RNNAppDelegate*)[UIApplication sharedApplication].delegate;
-    UIView *rv = [appDelegate.rootViewFactory viewWithModuleName:params[@"component"]
-                                                      initialProperties:initialProps];
-    
+    RCTRootView* rv = [[RCTRootView alloc] initWithBridge:bridge moduleName:params[@"component"] initialProperties:initialProps];
     if(initialProps != nil && initialProps[@"backgroundColor"] != nil)
     {
         UIColor *backgroundColor = [RCTConvert UIColor:initialProps[@"backgroundColor"]];
@@ -168,17 +148,7 @@ RCT_EXPORT_METHOD(presentCustomInputComponent:(nonnull NSNumber*)inputFieldTag p
     helperView.tag = kHlperViewTag;
     helperView.delegate = self;
     
-    
-    
-    if ([inputField isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
-    {
-        UITextField *textField = [self getTextFieldFromTextInputComponentView:inputField];
-        if (textField != nil)
-        {
-            helperView.inputAccessoryView = textField.inputAccessoryView;
-        }
-    }
-    else if ([inputField isKindOfClass:NSClassFromString(@"RCTTextView")])
+    if ([inputField isKindOfClass:NSClassFromString(@"RCTTextView")])
     {
         UITextView *textView = nil;
         Ivar backedTextInputIvar = class_getInstanceVariable([inputField class], "_backedTextInput");
@@ -243,17 +213,7 @@ RCT_EXPORT_METHOD(resetInput:(nonnull NSNumber*)inputFieldTag)
         _WXInputHelperViewTemp* helperView = [inputField.superview viewWithTag:kHlperViewTag];
         if(helperView != nil && [helperView isFirstResponder])
         {//restore the first responder only if it was already the first responder to prevent the keyboard from opening again if not necessary
-            if ([inputField isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
-            {
-                UITextField *textField = [self getTextFieldFromTextInputComponentView:inputField];
-                if (textField != nil)
-                {
-                    [textField reactFocus];
-                }
-                
-            } else {
-                [inputField reactFocus];
-            }
+            [inputField reactFocus];
         }
     }
 }
@@ -291,7 +251,7 @@ RCT_EXPORT_METHOD(dismissKeyboard)
     }
 }
 
--(UIColor*)reactViewAvgColor:(UIView*)rootView
+-(UIColor*)reactViewAvgColor:(RCTRootView*)rootView
 {
     if (rootView.frame.size.width == 0 || rootView.frame.size.height == 0)
     {
@@ -336,7 +296,7 @@ RCT_EXPORT_METHOD(expandFullScreenForInput:(nonnull NSNumber*)inputFieldTag)
             helperView.keepInSuperviewOnResign = YES;
             
             RCTCustomKeyboardViewControllerTemp *customKeyboardViewController = (RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController;
-            UIView *rv = customKeyboardViewController.rootView;
+            RCTRootView *rv = customKeyboardViewController.rootView;
             UIInputView *inputView = helperView.inputViewController.inputView;
             
             _fullScreenWindow = [[UIWindow alloc] initWithFrame:[inputView.window convertRect:inputView.bounds fromView:inputView]];
@@ -410,7 +370,7 @@ RCT_EXPORT_METHOD(resetSizeForInput:(nonnull NSNumber*)inputFieldTag)
                             completionHandler:^(BOOL completed)
             {
                 RCTCustomKeyboardViewControllerTemp *customKeyboardViewController = (RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController;
-                UIView *rv = _fullScreenWindow.rootViewController.view;
+                RCTRootView *rv = (RCTRootView*)_fullScreenWindow.rootViewController.view;
                 
                 [UIView performWithoutAnimation:^{
                     
@@ -428,8 +388,6 @@ RCT_EXPORT_METHOD(resetSizeForInput:(nonnull NSNumber*)inputFieldTag)
     }
 }
 
-
-
 #pragma mark - _WXInputHelperViewDelegateTemp methods
 
 -(void)_WXInputHelperViewResignFirstResponder:(UIView*)wxInputHelperView
@@ -439,8 +397,6 @@ RCT_EXPORT_METHOD(resetSizeForInput:(nonnull NSNumber*)inputFieldTag)
         [self sendEventWithName:RCTCustomInputControllerKeyboardResigendEventTemp body:nil];
     }
     self.customInputComponentPresented = NO;
-    
-    
 }
 
 @end

package/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.h

@@ -7,12 +7,18 @@
 
 #import <UIKit/UIKit.h>
 
+#if __has_include(<React/RCTRootView.h>)
+#import <React/RCTRootView.h>
+#else
+#import "RCTRootView.h"
+#endif
+
 @interface RCTCustomKeyboardViewControllerTemp : UIInputViewController
 
 - (void) setAllowsSelfSizing:(BOOL)allowsSelfSizing;
 - (instancetype)initWithUsingSafeArea:(BOOL)useSafeArea;
 
 @property (nonatomic, strong) NSLayoutConstraint *heightConstraint;
-@property (nonatomic, strong) UIView *rootView;
+@property (nonatomic, strong) RCTRootView *rootView;
 
 @end

package/lib/ios/reactnativeuilib/keyboardinput/rctcustomInputcontroller/RCTCustomKeyboardViewControllerTemp.m

@@ -57,7 +57,7 @@
     }
 }
 
--(void)setRootView:(UIView*)rootView
+-(void)setRootView:(RCTRootView*)rootView
 {
     if(_rootView != nil)
     {

package/lib/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -11,12 +11,11 @@
 #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>
 
@@ -71,7 +70,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     
     if (self)
     {
-        [self addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:NULL];
+        [self addObserver:self forKeyPath:@"bounds" options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:NULL];
         _inputViewsMap = [NSMapTable weakToWeakObjectsMapTable];
         _deferedInitializeAccessoryViewsCount = 0;
         
@@ -94,21 +93,20 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     return self;
 }
 
--(UIView*)getRootView
+-(RCTRootView*)getRootView
 {
     UIView *view = self;
     while (view.superview != nil)
     {
         view = view.superview;
-        if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {
+        if ([view isKindOfClass:[RCTRootView class]])
             break;
-        }
     }
     
-    if ([view isKindOfClass:[RCTSurfaceHostingView class]]) {
-        return view;
+    if ([view isKindOfClass:[RCTRootView class]])
+    {
+        return (RCTRootView*)view;
     }
-    
     return nil;
 }
 
@@ -171,20 +169,10 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     [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)
     {
@@ -192,30 +180,27 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         {
             if(_scrollViewToManage == nil)
             {
-                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(_requiresSameParentToManageScrollView && [subview isKindOfClass:[RCTScrollView class]] && subview.superview == self.superview)
+                {
+                    _scrollViewToManage = ((RCTScrollView*)subview).scrollView;
+                }
+                else if(!_requiresSameParentToManageScrollView && [subview isKindOfClass:[UIScrollView class]])
+                {
+                    _scrollViewToManage = (UIScrollView*)subview;
+                }
+                
+                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;
@@ -238,30 +223,17 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         {
             [self setupTextView:[subview valueForKey:@"_backedTextInputView"]];
         }
-        else if ([subview isKindOfClass:NSClassFromString(@"RCTTextView")] ||
-                 [subview isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
+        else if ([subview isKindOfClass:NSClassFromString(@"RCTTextView")])
         {
-            
             UITextView *textView = nil;
-            
-            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;
-                }
+            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];
         }
@@ -275,11 +247,13 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         }
     }
     
-    if(_scrollViewToManage != nil)
+    for (RCTScrollView *scrollView in rctScrollViewsArray)
     {
-        if(_scrollViewToManage.delegate == nil)
+        if(scrollView.scrollView == _scrollViewToManage)
         {
-            _scrollViewToManage.delegate = self;
+            [scrollView removeScrollListener:self];
+            [scrollView addScrollListener:self];
+            break;
         }
     }
     
@@ -296,8 +270,6 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     _originalHeight = _ObservingInputAccessoryViewTemp.height;
     
     [self addBottomViewIfNecessary];
-    
-    [self ensureLegacyViewManagerTouchDelegation];
 }
 
 - (void)setupTextView:(UITextView*)textView
@@ -366,12 +338,12 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 
 -(void)dealloc
 {
-    [self removeObserver:self forKeyPath:@"frame"];
+    [self removeObserver:self forKeyPath:@"bounds"];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context
 {
-    _ObservingInputAccessoryViewTemp.height = self.frame.size.height;
+    _ObservingInputAccessoryViewTemp.height = self.bounds.size.height;
 }
 
 - (void)ObservingInputAccessoryViewTempKeyboardWillDisappear:(ObservingInputAccessoryViewTemp *)ObservingInputAccessoryViewTemp
@@ -579,48 +551,9 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     [self updateBottomViewFrame];
     
     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)
@@ -802,4 +735,3 @@ RCT_EXPORT_METHOD(scrollToStart:(nonnull NSNumber *)reactTag)
 }
 
 @end
-

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "5.0.0-snapshot.7360",
+  "version": "4.5.2",
   "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": ">=18.3.1",
-    "react-native": ">=0.77.3"
+    "react": ">=17.0.1",
+    "react-native": ">=0.64.1"
   }
 }

package/lib/react-native.config.js

@@ -10,9 +10,11 @@ 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.keyboardinput.KeyboardInputPackage;
+import com.wix.reactnativeuilib.textinput.TextInputDelKeyHandlerPackage;`,
         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://reactnative.dev/docs/metro
+ * https://facebook.github.io/metro/docs/configuration
  *
- * @type {import('@react-native/metro-config').MetroConfig}
+ * @type {import('metro-config').MetroConfig}
  */
 
 const config = {