react-native-external-keyboard 0.6.5 → 0.6.6

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloDelegate.mm

@@ -10,6 +10,10 @@
 #import "RNCEKVFocusEffectUtility.h"
 #import "RNCEKVHaloDelegate.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
+#endif
+
 @implementation RNCEKVHaloDelegate {
   UIView<RNCEKVHaloProtocol> *_delegate;
   UIFocusEffect *_focusEffect;
@@ -84,7 +88,7 @@
     if ((_focusEffect == nil && _recycled) || (_focusEffect != nil && prevEffect != _focusEffect &&
                                                focusingView.focusEffect != _focusEffect)) {
       _recycled = false;
-      focusingView.focusEffect = _focusEffect;
+      [self setFocusEffect: _focusEffect];
     }
   }
 }
@@ -104,16 +108,27 @@
                                withExpandedX:_delegate.haloExpendX
                                withExpandedY:_delegate.haloExpendY
                             withCornerRadius:_delegate.haloCornerRadius];
-    
-    focusingView.focusEffect = focusEffect;
+    [self setFocusEffect: focusEffect];
   }
 }
 
-- (void) clear {
+- (void)setFocusEffect: (UIFocusEffect*) focusEffect {
   UIView *focusingView = [_delegate getFocusTargetView];
   if (@available(iOS 15.0, *)) {
-    focusingView.focusEffect = nil;
+#ifdef RCT_NEW_ARCH_ENABLED
+    if([focusingView isKindOfClass: RCTViewComponentView.class]) {
+      ((RCTViewComponentView*)focusingView).rncekvCustomFocusEffect = focusEffect;
+    } else {
+      focusingView.focusEffect = focusEffect;
+    }
+#else
+    focusingView.focusEffect = focusEffect;
+#endif
   }
+}
+
+- (void) clear {
+  [self setFocusEffect: nil];
   _focusEffect = nil;
   _recycled = true;
   _prevBounds = CGRect();

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.h

@@ -15,6 +15,7 @@
 @interface RCTViewComponentView (RNCEKVExternalKeyboard)
 
 @property (nonatomic, copy, nullable) NSString *rncekvCustomGroup;
+@property (nonatomic, copy, nullable) UIFocusEffect *rncekvCustomFocusEffect;
 
 @end
 

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.mm

@@ -13,6 +13,7 @@
 
 #import <objc/runtime.h>
 static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
+static const void *RNCEKVCustomFocusEffect = &RNCEKVCustomFocusEffect;
 
 @implementation RCTViewComponentView (RNCEKVExternalKeyboard)
 
@@ -24,6 +25,14 @@ static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
     objc_setAssociatedObject(self, RNCEKVCustomGroupKey, rncekvCustomGroup, OBJC_ASSOCIATION_COPY_NONATOMIC);
 }
 
+- (NSString *)rncekvCustomFocusEffect {
+    return objc_getAssociatedObject(self, RNCEKVCustomFocusEffect);
+}
+
+- (void)setRncekvCustomFocusEffect:(NSString *)rncekvCustomFocusEffect {
+    objc_setAssociatedObject(self, RNCEKVCustomFocusEffect, rncekvCustomFocusEffect, OBJC_ASSOCIATION_COPY_NONATOMIC);
+}
+
 - (NSString *)focusGroupIdentifier {
   NSString* rncekv = [self rncekvCustomGroup];
   if(rncekv) {
@@ -32,6 +41,16 @@ static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
   return [super focusGroupIdentifier];
 }
 
+
+- (UIFocusEffect*)focusEffect {
+  UIFocusEffect* rncekv = [self rncekvCustomFocusEffect];
+  if(rncekv) {
+    return rncekv;
+  }
+  
+  return [super focusEffect];
+}
+
 @end
 
 #endif

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.mm

@@ -563,17 +563,33 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 - (void)willRemoveSubview:(UIView *)subview {
   [_gIdDelegate clearSubview: subview];
   if (@available(iOS 15.0, *)) {
+#ifdef RCT_NEW_ARCH_ENABLED
+    if([subview isKindOfClass: RCTViewComponentView.class]) {
+      ((RCTViewComponentView*)subview).rncekvCustomFocusEffect = nil;
+    } else {
+      subview.focusEffect = nil;
+    }
+#else
     subview.focusEffect = nil;
+#endif
   }
-  
+
   [super willRemoveSubview:subview];
 }
 
 - (void)viewControllerChanged:(NSNotification *)notification {
-  UIViewController *viewController = notification.object;
-  if (self.autoFocus && !_isAttachedToController) {
-    _isAttachedToController = YES;
-    [self updateFocus:viewController];
+  UIViewController *viewController = self.reactViewController;
+  UIViewController *shownController = notification.object;
+  if(viewController != shownController) return;
+  if (self.autoFocus) {
+    if(!_isAttachedToController) {
+      UIWindow *window = RCTKeyWindow();
+      if (window) {
+        [self updateFocus:window.rootViewController];
+      } else {
+        [self updateFocus:viewController];
+      }
+    }
   }
 }
 

package/ios/Views/RNCEKVTextInputFocusWrapper/RNCEKVTextInputFocusWrapper.mm

@@ -24,6 +24,7 @@
 
 #import <React/RCTConversions.h>
 
+#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
 #import "RCTFabricComponentsPlugins.h"
 
 using namespace facebook::react;
@@ -264,12 +265,20 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
     if (@available(iOS 15.0, *)) {
         BOOL isTextInput = [self getIsTextInputView: view];
         if(isTextInput) {
-            view.subviews[0].focusEffect = [self isHaloHidden] ? [RNCEKVFocusEffectUtility emptyFocusEffect] : nil;
+          UIFocusEffect* focusEffect = [self isHaloHidden] ? [RNCEKVFocusEffectUtility emptyFocusEffect] : nil;
+          #ifdef RCT_NEW_ARCH_ENABLED
+          if([view.subviews[0] isKindOfClass: RCTViewComponentView.class]) {
+            ((RCTViewComponentView*)view.subviews[0]).rncekvCustomFocusEffect = focusEffect;
+          } else {
+            view.subviews[0].focusEffect = focusEffect;
+          }
+          #else
+          view.subviews[0].focusEffect = focusEffect;
+          #endif
         }
     }
 }
 
-
 - (void)pressesBegan:(NSSet<UIPress *> *)presses
            withEvent:(UIPressesEvent *)event {
     if (@available(iOS 13.4, *)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-external-keyboard",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "Toolkit for improving physical keyboard support in React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",