uilib-native 5.0.0-snapshot.7259 → 5.0.0-snapshot.7298

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

@@ -13,6 +13,8 @@
 
 #import "LNAnimatorTemp.h"
 
+#import "RNNAppDelegate.h"
+
 #define kHlperViewTag 0x1f1f1f
 
 NSString *const RCTCustomInputControllerKeyboardResigendEventTemp = @"kbdResigned";
@@ -49,7 +51,6 @@ NSString *const RCTCustomInputControllerKeyboardResigendEventTemp = @"kbdResigne
         {
             [self.delegate _WXInputHelperViewResignFirstResponder:self];
         }
-
     }
     
     return rv;
@@ -118,17 +119,36 @@ 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)
     {
-        return;
+        bridge = self.bridge;
     }
     
     UIView* inputField = [self.bridge.uiManager viewForReactTag:inputFieldTag];
     NSDictionary *initialProps = params[@"initialProps"];
-    RCTRootView* rv = [[RCTRootView alloc] initWithBridge:bridge moduleName:params[@"component"] initialProperties:initialProps];
+    
+    RNNAppDelegate* appDelegate = (RNNAppDelegate*)[UIApplication sharedApplication].delegate;
+    UIView *rv = [appDelegate.rootViewFactory viewWithModuleName:params[@"component"]
+                                                      initialProperties:initialProps];
+    
     if(initialProps != nil && initialProps[@"backgroundColor"] != nil)
     {
         UIColor *backgroundColor = [RCTConvert UIColor:initialProps[@"backgroundColor"]];
@@ -148,7 +168,17 @@ RCT_EXPORT_METHOD(presentCustomInputComponent:(nonnull NSNumber*)inputFieldTag p
     helperView.tag = kHlperViewTag;
     helperView.delegate = self;
     
-    if ([inputField isKindOfClass:NSClassFromString(@"RCTTextView")])
+    
+    
+    if ([inputField isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
+    {
+        UITextField *textField = [self getTextFieldFromTextInputComponentView:inputField];
+        if (textField != nil)
+        {
+            helperView.inputAccessoryView = textField.inputAccessoryView;
+        }
+    }
+    else if ([inputField isKindOfClass:NSClassFromString(@"RCTTextView")])
     {
         UITextView *textView = nil;
         Ivar backedTextInputIvar = class_getInstanceVariable([inputField class], "_backedTextInput");
@@ -213,7 +243,17 @@ 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
-            [inputField reactFocus];
+            if ([inputField isKindOfClass:NSClassFromString(@"RCTTextInputComponentView")])
+            {
+                UITextField *textField = [self getTextFieldFromTextInputComponentView:inputField];
+                if (textField != nil)
+                {
+                    [textField reactFocus];
+                }
+                
+            } else {
+                [inputField reactFocus];
+            }
         }
     }
 }
@@ -251,7 +291,7 @@ RCT_EXPORT_METHOD(dismissKeyboard)
     }
 }
 
--(UIColor*)reactViewAvgColor:(RCTRootView*)rootView
+-(UIColor*)reactViewAvgColor:(UIView*)rootView
 {
     if (rootView.frame.size.width == 0 || rootView.frame.size.height == 0)
     {
@@ -296,7 +336,7 @@ RCT_EXPORT_METHOD(expandFullScreenForInput:(nonnull NSNumber*)inputFieldTag)
             helperView.keepInSuperviewOnResign = YES;
             
             RCTCustomKeyboardViewControllerTemp *customKeyboardViewController = (RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController;
-            RCTRootView *rv = customKeyboardViewController.rootView;
+            UIView *rv = customKeyboardViewController.rootView;
             UIInputView *inputView = helperView.inputViewController.inputView;
             
             _fullScreenWindow = [[UIWindow alloc] initWithFrame:[inputView.window convertRect:inputView.bounds fromView:inputView]];
@@ -370,7 +410,7 @@ RCT_EXPORT_METHOD(resetSizeForInput:(nonnull NSNumber*)inputFieldTag)
                             completionHandler:^(BOOL completed)
             {
                 RCTCustomKeyboardViewControllerTemp *customKeyboardViewController = (RCTCustomKeyboardViewControllerTemp*)helperView.inputViewController;
-                RCTRootView *rv = (RCTRootView*)_fullScreenWindow.rootViewController.view;
+                UIView *rv = _fullScreenWindow.rootViewController.view;
                 
                 [UIView performWithoutAnimation:^{
                     
@@ -388,6 +428,8 @@ RCT_EXPORT_METHOD(resetSizeForInput:(nonnull NSNumber*)inputFieldTag)
     }
 }
 
+
+
 #pragma mark - _WXInputHelperViewDelegateTemp methods
 
 -(void)_WXInputHelperViewResignFirstResponder:(UIView*)wxInputHelperView
@@ -397,6 +439,8 @@ RCT_EXPORT_METHOD(resetSizeForInput:(nonnull NSNumber*)inputFieldTag)
         [self sendEventWithName:RCTCustomInputControllerKeyboardResigendEventTemp body:nil];
     }
     self.customInputComponentPresented = NO;
+    
+    
 }
 
 @end

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

@@ -7,18 +7,12 @@
 
 #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) RCTRootView *rootView;
+@property (nonatomic, strong) UIView *rootView;
 
 @end

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

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

package/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -193,28 +193,28 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
             if(_scrollViewToManage == nil)
             {
                 if ([NSStringFromClass([subview class]) isEqualToString:@"RCTScrollViewComponentView"]) {
-                  UIScrollView *scrollView = [self extractUIScrollView:subview];
-                  
+                    UIScrollView *scrollView = [self extractUIScrollView:subview];
+                    
                     if ([scrollView isKindOfClass:[UIScrollView class]])
                     {
                         if(_requiresSameParentToManageScrollView && subview.superview == self.superview)
                         {
-                          _scrollViewToManage = scrollView;
+                            _scrollViewToManage = scrollView;
                         }
                         else if(!_requiresSameParentToManageScrollView)
                         {
-                          _scrollViewToManage = scrollView;
+                            _scrollViewToManage = scrollView;
                         }
                         
                         if(_scrollViewToManage != nil)
                         {
-                          _scrollIsInverted = CGAffineTransformEqualToTransform(subview.superview.transform, CGAffineTransformMakeScale(1, -1));
+                            _scrollIsInverted = CGAffineTransformEqualToTransform(subview.superview.transform, CGAffineTransformMakeScale(1, -1));
                         }
                     }
                 }
             }
         }
-          
+        
         
         if ([subview isKindOfClass:NSClassFromString(@"RCTTextField")])
         {
@@ -238,17 +238,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];
         }
@@ -283,6 +296,8 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     _originalHeight = _ObservingInputAccessoryViewTemp.height;
     
     [self addBottomViewIfNecessary];
+    
+    [self ensureLegacyViewManagerTouchDelegation];
 }
 
 - (void)setupTextView:(UITextView*)textView
@@ -564,9 +579,48 @@ 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)
@@ -748,3 +802,4 @@ RCT_EXPORT_METHOD(scrollToStart:(nonnull NSNumber *)reactTag)
 }
 
 @end
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "5.0.0-snapshot.7259",
+  "version": "5.0.0-snapshot.7298",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index",