react-native-external-keyboard 0.6.2 → 0.6.3

package/ios/Delegates/RNCEKVGroupIdentifierDelegate/RNCEKVGroupIdentifierDelegate.h

@@ -18,7 +18,9 @@
 - (NSString*_Nonnull) getFocusGroupIdentifier;
 - (void)updateGroupIdentifier;
 - (void)clear;
-- (void)clearSubview: (UIView*_Nullable)view;
+- (void)clearSubview:(UIView*_Nullable)subview;
+- (void)syncCustomGroupId;
+
 @end
 
 

package/ios/Delegates/RNCEKVGroupIdentifierDelegate/RNCEKVGroupIdentifierDelegate.mm

@@ -10,6 +10,11 @@
 #import "RNCEKVGroupIdentifierDelegate.h"
 #import "RNCEKVFocusEffectUtility.h"
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
+#endif
+
+
 @implementation RNCEKVGroupIdentifierDelegate {
   UIView<RNCEKVGroupIdentifierProtocol>* _delegate;
   NSString* _tagId;
@@ -24,48 +29,89 @@
 }
 
 
-- (NSString*) getFocusGroupIdentifier {
-  if(_delegate.customGroupId) {
-    return _delegate.customGroupId;
-  }
-  
+-  (NSString*) getTagId {
   if(_tagId) {
     return _tagId;
   }
-  
+
   NSUUID *uuid = [NSUUID UUID];
   NSString *uniqueID = [uuid UUIDString];
   _tagId = [NSString stringWithFormat:@"app.group.%@", uniqueID];
-  
+
   return _tagId;
 }
 
 
+- (NSString*) getFocusGroupIdentifier {
+  if (@available(iOS 14.0, *)) {
+    if(_delegate.customGroupId) {
+      return _delegate.customGroupId;
+    }
+
+    return [self getTagId];
+  } else {
+    return nil;
+  }
+}
+
+
+#ifdef RCT_NEW_ARCH_ENABLED
 - (void) updateGroupIdentifier {
   if (@available(iOS 14.0, *)) {
-    UIView* focusView = [_delegate getFocusTargetView];
-    if(focusView) {
-      focusView.focusGroupIdentifier = [self getFocusGroupIdentifier];
+    UIView* focus = [_delegate getFocusTargetView];
+
+    NSString* identifier = [self getFocusGroupIdentifier];
+    if([focus isKindOfClass:[RCTViewComponentView class]]) {
+      ((RCTViewComponentView*)focus).rncekvCustomGroup = identifier;
+    } else {
+      focus.focusGroupIdentifier = identifier;
     }
   }
 }
 
+#else
+
+- (void) updateGroupIdentifier {
+  if (@available(iOS 14.0, *)) {
+    UIView* focus = [_delegate getFocusTargetView];
+    focus.focusGroupIdentifier = [self getFocusGroupIdentifier];
+  }
+}
+
+#endif
+
 - (void) clear {
-  _tagId = nil;
   if (@available(iOS 14.0, *)) {
-    UIView* focusView = [_delegate getFocusTargetView];
-    if(focusView) {
-      focusView.focusGroupIdentifier = nil;
-    }
+    UIView* focus = [_delegate getFocusTargetView];
+    [self clearSubview: focus];
   }
 }
 
-- (void)clearSubview: (UIView*_Nullable)view {
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)clearSubview: (UIView*_Nullable)subview {
+  if(!subview) return;
+
   if (@available(iOS 14.0, *)) {
-    _tagId = nil;
-    if(view.focusGroupIdentifier != nil) {
-      view.focusGroupIdentifier = nil;
+
+    if(subview) {
+      if([subview isKindOfClass:[RCTViewComponentView class]]) {
+        ((RCTViewComponentView*)subview).rncekvCustomGroup = nil;
+      } else {
+        subview.focusGroupIdentifier = nil;
+      }
     }
   }
 }
+#else
+
+- (void)clearSubview: (UIView*_Nullable)subview {
+  if(!subview) return;
+
+  if (@available(iOS 14.0, *)) {
+    subview.focusGroupIdentifier = nil;
+  }
+}
+
+#endif
+
 @end

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.h

@@ -0,0 +1,20 @@
+//
+//  UIView+RNCEKVExternalKeyboard.h
+//  Pods
+//
+//  Created by Artur Kalach on 12/08/2025.
+//
+
+#ifndef UIView_RNCEKVExternalKeyboard_h
+#define UIView_RNCEKVExternalKeyboard_h
+
+#import <React/RCTViewComponentView.h>
+
+@interface RCTViewComponentView (RNCEKVExternalKeyboard)
+
+@property (nonatomic, copy, nullable) NSString *rncekvCustomGroup;
+
+@end
+
+
+#endif /* UIView_RNCEKVExternalKeyboard_h */

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.mm

@@ -0,0 +1,34 @@
+//
+//  UIView+RNCEKVExternalKeyboard.m
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 12/08/2025.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
+
+#import <objc/runtime.h>
+static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
+
+@implementation RCTViewComponentView (RNCEKVExternalKeyboard)
+
+- (NSString *)rncekvCustomGroup {
+    return objc_getAssociatedObject(self, RNCEKVCustomGroupKey);
+}
+
+// Setter for `rctekvCustomGroup`
+- (void)setRncekvCustomGroup:(NSString *)rncekvCustomGroup {
+    objc_setAssociatedObject(self, RNCEKVCustomGroupKey, rncekvCustomGroup, OBJC_ASSOCIATION_COPY_NONATOMIC);
+}
+
+- (NSString *)focusGroupIdentifier {
+  NSString* rncekv = [self rncekvCustomGroup];
+  if(rncekv) {
+    return rncekv;
+  }
+  return [super focusGroupIdentifier];
+}
+
+@end

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.h

@@ -8,7 +8,7 @@
 #import "RNCEKVGroupIdentifierProtocol.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTViewComponentView.h>
+#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.mm

@@ -37,7 +37,7 @@ using namespace facebook::react;
   RNCEKVFocusDelegate *_focusDelegate;
   RNCEKVGroupIdentifierDelegate *_gIdDelegate;
   RNCEKVFocusOrderDelegate *_focusOrderDelegate;
-  
+
   NSNumber *_isFocused;
   BOOL _isAttachedToWindow;
   BOOL _isAttachedToController;
@@ -61,16 +61,12 @@ using namespace facebook::react;
   if(_orderPosition != nil && _orderGroup != nil && _isLinked) {
     [[RNCEKVOrderLinking sharedInstance] remove:_orderPosition withOrderKey: _orderGroup];
   }
-  
+
   if(_orderId != nil) {
     [[RNCEKVOrderLinking sharedInstance] cleanOrderId:_orderId];
     [_focusOrderDelegate clear];
   }
-  
-  if (_customGroupId && _gIdDelegate) {
-    [_gIdDelegate clear];
-  }
-  
+
   _isLinked = NO;
   _isIdLinked = NO;
 }
@@ -130,14 +126,14 @@ using namespace facebook::react;
     _focusDelegate = [[RNCEKVFocusDelegate alloc] initWithView:self];
     _gIdDelegate = [[RNCEKVGroupIdentifierDelegate alloc] initWithView:self];
     _focusOrderDelegate = [[RNCEKVFocusOrderDelegate alloc] initWithView: self];
-    
+
     if (@available(iOS 13.0, *)) {
       UIContextMenuInteraction *interaction =
       [[UIContextMenuInteraction alloc] initWithDelegate:self];
       [self addInteraction:interaction];
     }
   }
-  
+
   return self;
 }
 
@@ -166,7 +162,6 @@ using namespace facebook::react;
   _customGroupId = nil;
   _enableA11yFocus = NO;
   _isLinked = NO;
-  self.focusGroupIdentifier = nil;
 }
 
 - (void)setOrderGroup:(NSString *)orderGroup{
@@ -189,12 +184,12 @@ using namespace facebook::react;
   if(!_orderGroup && !_orderPosition && !_lockFocus && !_orderForward && !_orderBackward) {
     return [super shouldUpdateFocusInContext: context];
   }
-  
+
   NSNumber* result = [_focusOrderDelegate shouldUpdateFocusInContext: context];
   if(result == nil) {
     return [super shouldUpdateFocusInContext: context];
   }
-  
+
   return result.boolValue;
 }
 
@@ -205,7 +200,7 @@ using namespace facebook::react;
     }
     _orderPosition = position;
   }
-  
+
   if(_orderPosition == nil && _orderPosition != position) {
     _orderPosition = position;
   }
@@ -237,41 +232,41 @@ using namespace facebook::react;
   const auto &newViewProps =
   *std::static_pointer_cast<ExternalKeyboardViewProps const>(props);
   [super updateProps:props oldProps:oldProps];
-  
+
   if (_hasOnFocusChanged != newViewProps.hasOnFocusChanged) {
     [self setHasOnFocusChanged:newViewProps.hasOnFocusChanged];
   }
-  
+
   BOOL isLockChanged = [RNCEKVPropHelper isPropChanged:_lockFocus intValue: newViewProps.lockFocus];
   if(isLockChanged) {
     NSNumber* lockValue = [RNCEKVPropHelper unwrapIntValue: newViewProps.lockFocus];
     [self setLockFocus: lockValue];
   }
-  
+
   if (oldViewProps.canBeFocused != newViewProps.canBeFocused) {
     [self setCanBeFocused:newViewProps.canBeFocused];
   }
-  
+
   if (oldViewProps.hasKeyUpPress != newViewProps.hasKeyUpPress) {
     [self setHasOnPressUp:newViewProps.hasKeyUpPress];
   }
-  
+
   if (oldViewProps.hasKeyDownPress != newViewProps.hasKeyDownPress) {
     [self setHasOnPressDown:newViewProps.hasKeyDownPress];
   }
-  
+
   if (oldViewProps.autoFocus != newViewProps.autoFocus) {
     BOOL hasAutoFocus = newViewProps.autoFocus;
     [self setAutoFocus:hasAutoFocus];
   }
-  
-  
+
+
   BOOL isIndexChanged = [RNCEKVPropHelper isPropChanged:_orderPosition intValue: newViewProps.orderIndex];
   if(isIndexChanged) {
     NSNumber* position = [RNCEKVPropHelper unwrapIntValue: newViewProps.orderIndex];
     [self updateOrderPosition: position];
   }
-  
+
   RKNA_PROP_UPDATE(orderGroup, setOrderGroup, newViewProps);
   RKNA_PROP_UPDATE(orderId, setOrderId, newViewProps);
   RKNA_PROP_UPDATE(orderLeft, setOrderLeft, newViewProps);
@@ -282,22 +277,22 @@ using namespace facebook::react;
   RKNA_PROP_UPDATE(orderBackward, setOrderBackward, newViewProps);
   RKNA_PROP_UPDATE(orderLast, setOrderLast, newViewProps);
   RKNA_PROP_UPDATE(orderFirst, setOrderFirst, newViewProps);
-  
+
   if (_enableA11yFocus != newViewProps.enableA11yFocus) {
     [self setEnableA11yFocus:newViewProps.enableA11yFocus];
   }
-  
+
   UIColor *newColor = RCTUIColorFromSharedColor(newViewProps.tintColor);
   BOOL renewColor = newColor != nil && self.tintColor == nil;
   BOOL isColorChanged = oldViewProps.tintColor != newViewProps.tintColor;
   if (isColorChanged || renewColor) {
     self.tintColor = RCTUIColorFromSharedColor(newViewProps.tintColor);
   }
-  
+
   if (oldViewProps.group != newViewProps.group) {
     [self setIsGroup:newViewProps.group];
   }
-  
+
   BOOL isNewGroup =
   oldViewProps.groupIdentifier != newViewProps.groupIdentifier;
   BOOL recoverCustomGroup =
@@ -312,7 +307,7 @@ using namespace facebook::react;
       [self setCustomGroupId:newGroupId];
     }
   }
-  
+
   // ToDo RNCEKV-0, refactor, condition for halo effect has side effect, recycle
   // is a question. The problem that we have to check the condition, (true means
   // we skip, but when it was false we should reset) and recycle (view is reused
@@ -324,25 +319,20 @@ using namespace facebook::react;
       [self setIsHaloActive:@(haloState)];
     }
   }
-  
+
   if (_haloExpendX != newViewProps.haloExpendX) {
     [self setHaloExpendX:newViewProps.haloExpendX];
   }
-  
+
   if (_haloExpendY != newViewProps.haloExpendY) {
     [self setHaloExpendY:newViewProps.haloExpendY];
   }
-  
+
   if (_haloCornerRadius != newViewProps.haloCornerRadius) {
     [self setHaloCornerRadius:newViewProps.haloCornerRadius];
   }
 }
 
-- (void)mountChildComponentView:
-(UIView<RCTComponentViewProtocol> *)childComponentView
-                          index:(NSInteger)index {
-  [super mountChildComponentView:childComponentView index:index];
-}
 
 Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
   return RNCEKVExternalKeyboardView.class;
@@ -375,7 +365,7 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 
 - (void)updateFocus:(UIViewController *)controller {
   UIView *focusingView = self; // [_focusDelegate getFocusingView];
-  
+
   if (self.superview != nil && controller != nil) {
     controller.customFocusView = focusingView;
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -389,7 +379,7 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
        withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
   _isFocused = [_focusDelegate isFocusChanged:context];
-  
+
   [_focusOrderDelegate setIsFocused: [_isFocused isEqual:@YES]];
   if ([self hasOnFocusChanged]) {
     if (_isFocused != nil) {
@@ -397,10 +387,10 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
       _isAttachedToController = YES;
       [self onFocusChangeHandler:[_isFocused isEqual:@YES]];
     }
-    
+
     return;
   }
-  
+
   [super didUpdateFocusInContext:context withAnimationCoordinator:coordinator];
 }
 
@@ -475,11 +465,11 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
            withEvent:(UIPressesEvent *)event {
   NSDictionary *eventInfo = [_keyboardKeyPressHandler actionDownHandler:presses
                                                               withEvent:event];
-  
+
   if (self.hasOnPressUp || self.hasOnPressDown) {
     [self onKeyDownPressHandler:eventInfo];
   }
-  
+
   [super pressesBegan:presses withEvent:event];
 }
 
@@ -487,11 +477,11 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
            withEvent:(UIPressesEvent *)event {
   NSDictionary *eventInfo = [_keyboardKeyPressHandler actionUpHandler:presses
                                                             withEvent:event];
-  
+
   if (self.hasOnPressUp || self.hasOnPressDown) {
     [self onKeyUpPressHandler:eventInfo];
   }
-  
+
   [super pressesEnded:presses withEvent:event];
 }
 
@@ -523,8 +513,9 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 
 - (void)didMoveToWindow {
   [super didMoveToWindow];
-  
+
   if (self.window) {
+    [_gIdDelegate updateGroupIdentifier];
     [[NSNotificationCenter defaultCenter]
      addObserver:self
      selector:@selector(viewControllerChanged:)
@@ -538,7 +529,7 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
      object:nil];
     [self onDetached];
   }
-  
+
   if (self.window && !_isAttachedToWindow) {
     [self onViewAttached];
     _isAttachedToWindow = YES;
@@ -556,21 +547,26 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 - (void)layoutSubviews {
   [super layoutSubviews];
   [_haloDelegate displayHalo];
-  
+}
+
+
+- (void) setCustomGroupId:(NSString *)customGroupId {
+  _customGroupId = customGroupId;
   [_gIdDelegate updateGroupIdentifier];
-  //  [self setupLayout];
 }
 
-- (void)subviewRecycle: (UIView *)subview {
+- (void)didAddSubview:(UIView *)subview {
+  [super didAddSubview: subview];
+  [_gIdDelegate updateGroupIdentifier];
+}
+
+- (void)willRemoveSubview:(UIView *)subview {
   [_gIdDelegate clearSubview: subview];
   if (@available(iOS 15.0, *)) {
     subview.focusEffect = nil;
   }
-}
-
-- (void)willRemoveSubview:(UIView *)subview {
+  
   [super willRemoveSubview:subview];
-  [self subviewRecycle: subview];
 }
 
 - (void)viewControllerChanged:(NSNotification *)notification {
@@ -589,7 +585,7 @@ API_AVAILABLE(ios(13.0)) {
     [self onContextMenuPressHandler];
     [self onBubbledContextMenuPressHandler];
   }
-  
+
   return nil;
 }
 

package/ios/Views/RNCEKVKeyboardFocusGroupView/RNCEKVKeyboardFocusGroup.mm

@@ -15,6 +15,7 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #include <string>
+#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
 #import <react/renderer/components/RNExternalKeyboardViewSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNExternalKeyboardViewSpec/EventEmitters.h>
 #import <react/renderer/components/RNExternalKeyboardViewSpec/Props.h>
@@ -32,31 +33,24 @@ using namespace facebook::react;
 
 #endif
 
-@implementation RNCEKVKeyboardFocusGroup {
-  UIView* _entry;
-  UIView* _exit;
-  UIView* _lock;
-}
+@implementation RNCEKVKeyboardFocusGroup
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
         _isGroupFocused = false;
-        _entry = nil;
-        _exit = nil;
 #ifdef RCT_NEW_ARCH_ENABLED
         static const auto defaultProps = std::make_shared<const KeyboardFocusGroupProps>();
         _props = defaultProps;
 #endif
     }
-    
+
     return self;
 }
 
-
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
        withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
-    
+
     [super didUpdateFocusInContext:context withAnimationCoordinator:coordinator];
     NSString* nextFocusGroup = context.nextFocusedView.focusGroupIdentifier;
     BOOL isFocused = [nextFocusGroup isEqual: _customGroupId];
@@ -66,16 +60,6 @@ using namespace facebook::react;
     }
 }
 
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    
-    if (@available(iOS 14.0, *)) {
-        if(_customGroupId) {
-            self.focusGroupIdentifier = _customGroupId;
-        }
-    }
-}
-
 #ifdef RCT_NEW_ARCH_ENABLED
 
 - (void)onFocusChangeHandler:(BOOL) isFocused {
@@ -96,146 +80,22 @@ using namespace facebook::react;
 }
 #endif
 
-
-#pragma mark - Get Order Focus List
-- (NSArray<UIView *> *)getOrder {
-  RNCEKVRelashioship* orderRelationship = [[RNCEKVOrderLinking sharedInstance] getInfo:_orderGroup];
-  return [orderRelationship getArray];
-}
-
-
-#pragma mark - Focus Find Index
-- (int)findOrderIndex:(NSArray *)order element:(UIView*)el  {
-  int resultIndex = -1;
-
-  for (int i = 0; i < order.count; i++) {
-    UIView *element = order[i];
-      if (element.subviews[0] == el) { //ToDo focus element
-        resultIndex = i;
-        break;
-      }
-  }
-  
-  return resultIndex;
-}
-
-
-#pragma mark - Next Focus Handling
-- (void)handleNextFocus:(UIView *)current currentIndex:(NSInteger)currentIndex {
-  NSArray<UIView *> * order = [self getOrder];
-  
-  BOOL isEntry = _entry == current;
-  if (isEntry) {
-    UIView* firstElement = order[0];
-    if ([firstElement isKindOfClass:[RNCEKVExternalKeyboardView class]]) {
-      [(RNCEKVExternalKeyboardView*)firstElement focus];
-    }
-  }
-  
-  BOOL isLast = currentIndex == order.count - 1 && _exit;
-  if (isLast) {
-    [self updateFocus: _exit];
-  }
-  
-  BOOL inOrderRange = currentIndex >= 0 && currentIndex < order.count - 1;
-  if (inOrderRange) {
-    UIView* nextElement = order[currentIndex + 1];
-    if ([nextElement isKindOfClass:[RNCEKVExternalKeyboardView class]]) {
-      [(RNCEKVExternalKeyboardView*)nextElement focus];
-    }
-  }
-}
-
-#pragma mark - Prev Focus Handling
-- (void)handlePrevFocus:(UIView *)current currentIndex:(NSInteger)currentIndex {
-  NSArray<UIView *> * order = [self getOrder];
-  
-  BOOL isExit = _exit == current;
-  if (isExit) {
-    UIView* lastElement = order[order.count - 1];
-    if ([lastElement isKindOfClass:[RNCEKVExternalKeyboardView class]]) {
-      [(RNCEKVExternalKeyboardView*)lastElement focus];
-    }
-  }
-  
-  BOOL isFirst = currentIndex == 0 && _entry;
-  if (isFirst) {
-    [self updateFocus: _entry];
-  }
-  
-  BOOL inRange = currentIndex > 0 && currentIndex <= order.count - 1;
-  if (inRange) {
-    UIView* prevElement = order[currentIndex - 1];
-    if ([prevElement isKindOfClass:[RNCEKVExternalKeyboardView class]]) {
-      [(RNCEKVExternalKeyboardView*)prevElement focus];
+- (void )setCustomGroupId: (NSString *) customGroupId {
+    if (@available(iOS 14.0, *)) {
+        _customGroupId = customGroupId;
+        [self updateFocusGroup: customGroupId];
     }
-  }
 }
 
-#pragma mark - Focus Order Handler
-- (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
-    return YES;
-    UIView *next = (UIView *)context.nextFocusedItem;
-    UIView *current = (UIView *)context.previouslyFocusedItem;
-    UIFocusHeading movementHint = context.focusHeading;
-
-//  UIView* rnkv = current.superview; //ToDo Create a map for RNKV <-> Target relations
-//  if ([rnkv isKindOfClass:[RNCEKVExternalKeyboardView class]]) {
-//      NSUInteger rawFocusLockValue = [((RNCEKVExternalKeyboardView *)rnkv).lockFocus unsignedIntegerValue];
-//
-//      BOOL isDirectionLock = (rawFocusLockValue & movementHint) != 0;
-//      if (isDirectionLock) {
-//          return NO;
-//      }
-//  }
-  
-  if(_orderGroup) {
-    RNCEKVRelashioship* orderRelationship = [[RNCEKVOrderLinking sharedInstance] getInfo:_orderGroup];
-    NSArray *order = [orderRelationship getArray];
-    if(order.count == 0) {
-      return YES;
-    }
-    
-    int currentIndex = [self findOrderIndex:order element:current];
-    int nextIndex = [self findOrderIndex:order element:next];
 
-    BOOL isEntryElement = _entry == nil && currentIndex == -1 && movementHint == UIFocusHeadingNext;
-    if(isEntryElement) {
-      _entry = current;
-    }
-    
-    BOOL isExit = _exit == nil && nextIndex == -1 && movementHint == UIFocusHeadingNext;
-    if(isExit) {
-      _exit = next;
-    }
-    
-    if(context.focusHeading == UIFocusHeadingNext) {
-      [self handleNextFocus:current currentIndex: currentIndex];
-      return YES;
-    }
-    
-    
-    if(context.focusHeading == UIFocusHeadingPrevious) {
-      [self handlePrevFocus:current currentIndex: currentIndex];
-      return YES;
+- (void )updateFocusGroup: (NSString *) customGroupId {
+    if (@available(iOS 14.0, *)) {
+      #ifdef RCT_NEW_ARCH_ENABLED
+        self.rncekvCustomGroup = _customGroupId;
+      #else
+        self.focusGroupIdentifier = _customGroupId;
+      #endif
     }
-    
-    //ToDo add sides focus handlers
-  }
-  
-  return YES;
-}
-
-- (void)updateFocus:(UIView *)focusingView {
-  UIViewController *controller = self.reactViewController;
-
-  if (controller != nil) {
-    controller.customFocusView = focusingView;
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [controller setNeedsFocusUpdate];
-      [controller updateFocusIfNeeded];
-    });
-  }
 }
 
 
@@ -250,8 +110,9 @@ using namespace facebook::react;
 - (void)prepareForRecycle
 {
     [super prepareForRecycle];
-    _customGroupId = nil;
     self.tintColor = nil;
+    [self updateFocusGroup: nil];
+    _customGroupId = nil;
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
@@ -260,8 +121,8 @@ using namespace facebook::react;
     const auto &newViewProps = *std::static_pointer_cast<KeyboardFocusGroupProps const>(props);
     [super updateProps
      :props oldProps:oldProps];
-  
-  
+
+
     UIColor* newColor = RCTUIColorFromSharedColor(newViewProps.tintColor);
     BOOL isDifferentColor = ![newColor isEqual: self.tintColor];
     BOOL renewColor = newColor != nil && self.tintColor == nil;
@@ -269,8 +130,8 @@ using namespace facebook::react;
     if(isColorChanged || renewColor || isDifferentColor) {
         self.tintColor = newColor;
     }
-    
-    if(oldViewProps.groupIdentifier != newViewProps.groupIdentifier || !self.customGroupId) {
+
+      if(oldViewProps.groupIdentifier != newViewProps.groupIdentifier || !self.customGroupId) {
       if(newViewProps.groupIdentifier.empty()) {
         [self setCustomGroupId:nil];
       } else {
@@ -278,11 +139,6 @@ using namespace facebook::react;
         [self setCustomGroupId:newGroupId];
       }
     }
-  
-  if(oldViewProps.orderGroup != newViewProps.orderGroup) {
-    _orderGroup = [NSString stringWithUTF8String:newViewProps.orderGroup.c_str()];
-  }
-
 }
 
 Class<RCTComponentViewProtocol> KeyboardFocusGroupCls(void)
@@ -296,7 +152,3 @@ Class<RCTComponentViewProtocol> KeyboardFocusGroupCls(void)
 
 
 @end
-
-
-
-

package/ios/Views/RNCEKVTextInputFocusWrapper/RNCEKVTextInputFocusWrapper.mm

@@ -5,7 +5,6 @@
 #import <React/RCTUITextView.h>
 #import "RNCEKVFocusEffectUtility.h"
 #import "RCTBaseTextInputView.h"
-#import "RNCEKVGroupIdentifierDelegate.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RCTTextInputComponentView+RNCEKVExternalKeyboard.h"
@@ -38,9 +37,7 @@ using namespace facebook::react;
 static const NSInteger AUTO_FOCUS = 2;
 static const NSInteger AUTO_BLUR = 2;
 
-@implementation RNCEKVTextInputFocusWrapper{
-  RNCEKVGroupIdentifierDelegate* _gIdDelegate;
-}
+@implementation RNCEKVTextInputFocusWrapper
 
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -50,9 +47,8 @@ static const NSInteger AUTO_BLUR = 2;
         static const auto defaultProps = std::make_shared<const TextInputFocusWrapperProps>();
         _props = defaultProps;
 #endif
-      _gIdDelegate = [[RNCEKVGroupIdentifierDelegate alloc] initWithView:self];
     }
-    
+
     return self;
 }
 
@@ -76,36 +72,29 @@ static const NSInteger AUTO_BLUR = 2;
     [self cleanReferences];
 }
 
-- (void)willRemoveSubview:(UIView *)subview {
-    [super willRemoveSubview:subview];
-    if(_customGroupId && _gIdDelegate) {
-      [_gIdDelegate clear];
-    }
-}
-
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
     const auto &oldViewProps = *std::static_pointer_cast<TextInputFocusWrapperProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<TextInputFocusWrapperProps const>(props);
     [super updateProps
      :props oldProps:oldProps];
-    
+
     if(oldViewProps.canBeFocused != newViewProps.canBeFocused) {
         [self setCanBeFocused: newViewProps.canBeFocused];
     }
-    
+
     if(oldViewProps.focusType != newViewProps.focusType) {
         [self setFocusType: newViewProps.focusType];
     }
-    
+
     if(oldViewProps.blurType != newViewProps.blurType) {
         [self setBlurType: newViewProps.blurType];
     }
-    
+
     if(oldViewProps.blurOnSubmit != newViewProps.blurOnSubmit) {
         [self setBlurOnSubmit: newViewProps.blurOnSubmit];
     }
-    
+
     if(oldViewProps.multiline != newViewProps.multiline) {
         [self setMultiline: newViewProps.multiline];
     }
@@ -116,26 +105,14 @@ static const NSInteger AUTO_BLUR = 2;
             [self setIsHaloActive: @(haloState)];
         }
     }
-    
-  
+
+
   UIColor* newColor = RCTUIColorFromSharedColor(newViewProps.tintColor);
   BOOL renewColor = newColor != nil && self.tintColor == nil;
   BOOL isColorChanged = oldViewProps.tintColor != newViewProps.tintColor;
   if(isColorChanged || renewColor) {
       self.tintColor = RCTUIColorFromSharedColor(newViewProps.tintColor);
   }
-  
-  BOOL isNewGroup = oldViewProps.groupIdentifier != newViewProps.groupIdentifier;
-  BOOL recoverCustomGroup = !self.customGroupId && !newViewProps.groupIdentifier.empty();
-  if(isNewGroup || recoverCustomGroup) {
-    if(newViewProps.groupIdentifier.empty() && self.customGroupId != nil) {
-      self.customGroupId = nil;
-    }
-    if(!newViewProps.groupIdentifier.empty()) {
-      NSString *newGroupId = [NSString stringWithUTF8String:newViewProps.groupIdentifier.c_str()];
-      [self setCustomGroupId:newGroupId];
-    }
-  }
 }
 
 Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
@@ -194,11 +171,11 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
 
 - (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
        withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
-  
+
     if(_textField == nil) {
       _textField = [self getTextFieldComponent];
     }
-  
+
     BOOL isNext = context.nextFocusedView == _textField;
     BOOL isPrev = context.previouslyFocusedView == _textField;
 
@@ -210,7 +187,7 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
         }
       }
     }
-      
+
     if(isPrev) {
       [self onFocusChange: NO];
       if(self.blurType == AUTO_BLUR) {
@@ -225,7 +202,7 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
   @try{
     UIView* input = self.subviews[0];
     UIView* backedTextInputView = nil;
-  
+
     #ifdef RCT_NEW_ARCH_ENABLED
         if([input isKindOfClass: [RCTTextInputComponentView class]]) {
           backedTextInputView = ((RCTTextInputComponentView *)input).backedTextInputView;
@@ -237,7 +214,7 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
           backedTextInputView = ((RCTSinglelineTextInputView *)input).backedTextInputView;
         }
     #endif
-    
+
     return backedTextInputView;
   } @catch (NSException *ex) {
     return nil;
@@ -282,7 +259,7 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
     if(self.subviews.count == 0) {
         return;
     }
-    
+
     UIView* view = self.subviews[0];
     if (@available(iOS 15.0, *)) {
         BOOL isTextInput = [self getIsTextInputView: view];
@@ -298,16 +275,16 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
     if (@available(iOS 13.4, *)) {
         UIKey *key = presses.allObjects[0].key;
         BOOL isEnter = [key.characters isEqualToString:@"\n"] || [key.characters isEqualToString:@"\r"];
-      
+
         RCTUITextField* textView = _textField != nil ? _textField : [self getTextFieldComponent];
         if(isEnter && textView && !textView.isFirstResponder) {
             [_textField reactFocus];
             return;
         }
-      
+
         if(self.multiline) {
             BOOL isShiftPressed = (key.modifierFlags & UIKeyModifierShift) != 0;
-            
+
             if(textView && textView.isFirstResponder) {
                 if(!isShiftPressed && isEnter) {
                     [self onMultiplyTextSubmitHandler: (UIView*)textView];
@@ -318,7 +295,7 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
             }
         }
     }
-    
+
     [super pressesBegan:presses withEvent:event];
 }
 
@@ -335,20 +312,13 @@ Class<RCTComponentViewProtocol> TextInputFocusWrapperCls(void)
     UIView* focusingView = self.subviews[0].subviews[0];
     return focusingView;
   }
-  
-  return nil;
-}
 
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    // ToDo RNCEKV-7 add cache for halo update
-    [_gIdDelegate updateGroupIdentifier];
+  return nil;
 }
 
-
 - (void)willMoveToSuperview:(UIView *)newSuperview {
     [super willMoveToSuperview:newSuperview];
-    
+
     if (newSuperview == nil) {
         [self cleanReferences];
     }

package/package.json

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