react-native-external-keyboard 0.6.6 → 0.6.7

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.mm

@@ -37,12 +37,13 @@ using namespace facebook::react;
   RNCEKVFocusDelegate *_focusDelegate;
   RNCEKVGroupIdentifierDelegate *_gIdDelegate;
   RNCEKVFocusOrderDelegate *_focusOrderDelegate;
-
+  
   NSNumber *_isFocused;
   BOOL _isAttachedToWindow;
   BOOL _isAttachedToController;
   BOOL _isLinked;
   BOOL _isIdLinked;
+  BOOL _autoFocusRequested;
 }
 
 - (void)link:(UIView *)subview {
@@ -74,6 +75,8 @@ using namespace facebook::react;
 
 - (void)onAttached
 {
+  [_gIdDelegate updateGroupIdentifier];
+  [self focusOnMount];
   if(self.subviews.count > 0) {
     [self link: self.subviews[0]];
   }
@@ -126,7 +129,7 @@ using namespace facebook::react;
     _focusDelegate = [[RNCEKVFocusDelegate alloc] initWithView:self];
     _gIdDelegate = [[RNCEKVGroupIdentifierDelegate alloc] initWithView:self];
     _focusOrderDelegate = [[RNCEKVFocusOrderDelegate alloc] initWithView: self];
-
+    _autoFocusRequested = NO;
     if (@available(iOS 13.0, *)) {
       UIContextMenuInteraction *interaction =
       [[UIContextMenuInteraction alloc] initWithDelegate:self];
@@ -162,6 +165,7 @@ using namespace facebook::react;
   _customGroupId = nil;
   _enableA11yFocus = NO;
   _isLinked = NO;
+  _autoFocusRequested = NO;
 }
 
 - (void)setOrderGroup:(NSString *)orderGroup{
@@ -515,18 +519,8 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
   [super didMoveToWindow];
 
   if (self.window) {
-    [_gIdDelegate updateGroupIdentifier];
-    [[NSNotificationCenter defaultCenter]
-     addObserver:self
-     selector:@selector(viewControllerChanged:)
-     name:@"ViewControllerChangedNotification"
-     object:nil];
     [self onAttached];
   } else {
-    [[NSNotificationCenter defaultCenter]
-     removeObserver:self
-     name:@"ViewControllerChangedNotification"
-     object:nil];
     [self onDetached];
   }
 
@@ -577,18 +571,21 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
   [super willRemoveSubview:subview];
 }
 
-- (void)viewControllerChanged:(NSNotification *)notification {
+- (void)focusOnMount {
   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];
-      }
+    if(!_autoFocusRequested) {
+      _autoFocusRequested = YES;
+      dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+          UIWindow *window = RCTKeyWindow();
+          if (window) {
+            [self updateFocus:window.rootViewController];
+          } else {
+            [self updateFocus:viewController];
+          }
+        });
+      });
     }
   }
 }

package/package.json

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