react-native-external-keyboard 0.8.5 → 0.9.1

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.mm

@@ -6,7 +6,6 @@
 #import "UIViewController+RNCEKVExternalKeyboard.h"
 #import <React/RCTViewManager.h>
 #import <UIKit/UIKit.h>
-#import "RNCEKVFocusOrderDelegate.h"
 #import "RNCEKVOrderLinking.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -21,6 +20,7 @@
 #import "RNCEKVFabricEventHelper.h"
 #import <React/RCTConversions.h>
 #import <stdlib.h>
+#include "RNCEKVNativeProps.h"
 
 
 using namespace facebook::react;
@@ -31,108 +31,7 @@ using namespace facebook::react;
 
 #endif
 
-@implementation RNCEKVExternalKeyboardView {
-  RNCEKVKeyboardKeyPressHandler *_keyboardKeyPressHandler;
-  RNCEKVHaloDelegate *_haloDelegate;
-  RNCEKVFocusDelegate *_focusDelegate;
-  RNCEKVGroupIdentifierDelegate *_gIdDelegate;
-  RNCEKVFocusOrderDelegate *_focusOrderDelegate;
-
-  NSNumber *_isFocused;
-  BOOL _isAttachedToWindow;
-  BOOL _isAttachedToController;
-  BOOL _isLinked;
-  BOOL _isIdLinked;
-  BOOL _autoFocusRequested;
-  UIContextMenuInteraction *_contextMenuInteraction;
-}
-
-- (void)updateContextMenuRegistration {
-  if (@available(iOS 13.0, *)) {
-    BOOL shouldRegister = _enableContextMenu &&
-      _isFocused != nil &&
-      [_isFocused isEqual:@YES];
-
-    if (shouldRegister && _contextMenuInteraction == nil) {
-      _contextMenuInteraction =
-        [[UIContextMenuInteraction alloc] initWithDelegate:self];
-      [self addInteraction:_contextMenuInteraction];
-    }
-
-    if (!shouldRegister && _contextMenuInteraction != nil) {
-      [self removeInteraction:_contextMenuInteraction];
-      _contextMenuInteraction = nil;
-    }
-  }
-}
-
-- (void)link:(UIView *)subview {
-  if(_orderPosition != nil && _orderGroup != nil && !_isLinked) {
-    [[RNCEKVOrderLinking sharedInstance] add: _orderPosition withOrderKey: _orderGroup withObject:self];
-    _isLinked = YES;
-  }
-  if(_orderId != nil) {
-    [[RNCEKVOrderLinking sharedInstance] storeOrderId:_orderId withView: self];
-    [_focusOrderDelegate linkId];
-    _isIdLinked = YES;
-  }
-}
-
-- (void)unlink{
-  if(_orderPosition != nil && _orderGroup != nil && _isLinked) {
-    [[RNCEKVOrderLinking sharedInstance] remove:_orderPosition withOrderKey: _orderGroup];
-  }
-
-  if(_orderId != nil) {
-    [[RNCEKVOrderLinking sharedInstance] cleanOrderId:_orderId];
-    [_focusOrderDelegate clear];
-  }
-
-  _isLinked = NO;
-  _isIdLinked = NO;
-}
-
-
-- (void)onAttached
-{
-  [_gIdDelegate updateGroupIdentifier];
-  [self focusOnMount];
-  if(self.subviews.count > 0) {
-    [self link: self.subviews[0]];
-  }
-}
-
-- (void)onDetached
-{
-  [self unlink];
-}
-
-
-@synthesize haloCornerRadius = _haloCornerRadius;
-@synthesize haloExpendX = _haloExpendX;
-@synthesize haloExpendY = _haloExpendY;
-
-- (void)setOrderLeft:(NSString *)orderLeft {
-  [_focusOrderDelegate refreshLeft: _orderLeft next: orderLeft];
-  _orderLeft = orderLeft;
-}
-
-- (void)setOrderRight:(NSString *)orderRight {
-  [_focusOrderDelegate refreshRight: _orderRight next: orderRight];
-  _orderRight = orderRight;
-}
-
-
-- (void)setOrderUp:(NSString *)orderUp {
-  [_focusOrderDelegate refreshUp: _orderUp next: orderUp];
-  _orderUp = orderUp;
-}
-
-- (void)setOrderDown:(NSString *)orderDown {
-  [_focusOrderDelegate refreshDown: _orderDown next: orderDown];
-  _orderDown = orderDown;
-}
-
+@implementation RNCEKVExternalKeyboardView
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
@@ -141,99 +40,11 @@ using namespace facebook::react;
     std::make_shared<const ExternalKeyboardViewProps>();
     _props = defaultProps;
 #endif
-    _enableContextMenu = NO;
-    _isAttachedToController = NO;
-    _isAttachedToWindow = NO;
-    _enableA11yFocus = NO;
-    _keyboardKeyPressHandler = [[RNCEKVKeyboardKeyPressHandler alloc] init];
-    _haloDelegate = [[RNCEKVHaloDelegate alloc] initWithView:self];
-    _focusDelegate = [[RNCEKVFocusDelegate alloc] initWithView:self];
-    _gIdDelegate = [[RNCEKVGroupIdentifierDelegate alloc] initWithView:self];
-    _focusOrderDelegate = [[RNCEKVFocusOrderDelegate alloc] initWithView: self];
-    _autoFocusRequested = NO;
-    _contextMenuInteraction = nil;
   }
 
   return self;
 }
 
-- (void)cleanReferences {
-  [_focusOrderDelegate clear];
-  [_haloDelegate clear];
-  [_gIdDelegate clear];
-  _isAttachedToController = NO;
-  _isAttachedToWindow = NO;
-  _isHaloActive = @2; // ToDo RNCEKV-0
-  _haloExpendX = 0;
-  _haloExpendY = 0;
-  _haloCornerRadius = 0;
-  _orderGroup = nil;
-  _orderPosition = nil;
-  _orderLeft = nil;
-  _orderRight = nil;
-  _orderUp = nil;
-  _orderDown = nil;
-  _orderForward = nil;
-  _orderBackward = nil;
-  _orderLast = nil;
-  _orderFirst = nil;
-  _orderId = nil;
-  _lockFocus = nil;
-  _customGroupId = nil;
-  _enableA11yFocus = NO;
-  _isLinked = NO;
-  _autoFocusRequested = NO;
-  _enableContextMenu = NO;
-  [self updateContextMenuRegistration];
-}
-
-- (void)setEnableContextMenu:(BOOL)enableContextMenu {
-  _enableContextMenu = enableContextMenu;
-  [self updateContextMenuRegistration];
-}
-
-- (void)setOrderGroup:(NSString *)orderGroup{
-  [self updateOrderGroup:_orderGroup next: orderGroup];
-  _orderGroup = orderGroup;
-}
-
-- (void)updateOrderGroup:(NSString *)prev next:(NSString*)next {
-  if(prev != nil && _orderPosition != nil && self.subviews.count > 0) {
-    [[RNCEKVOrderLinking sharedInstance] updateOrderKey:(NSString *)prev next:next position:_orderPosition withView: self];
-  }
-}
-
-- (void)setOrderId:(NSString*) next {
-  [_focusOrderDelegate refreshId:_orderId next:next];
-  _orderId = next;
-}
-
-- (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
-  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;
-}
-
-- (void)updateOrderPosition:(NSNumber *)position {
-  if(_orderPosition != nil || _orderPosition != position) {
-    if(_orderGroup != nil && self.subviews.count > 0 && _isLinked) {
-      [[RNCEKVOrderLinking sharedInstance] update:position lastPosition:_orderPosition withOrderKey: _orderGroup withView: self];
-    }
-    _orderPosition = position;
-  }
-
-  if(_orderPosition == nil && _orderPosition != position) {
-    _orderPosition = position;
-  }
-}
-
 #ifdef RCT_NEW_ARCH_ENABLED
 + (ComponentDescriptorProvider)componentDescriptorProvider {
   return concreteComponentDescriptorProvider<
@@ -261,109 +72,28 @@ using namespace facebook::react;
   *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);
-  RKNA_PROP_UPDATE(orderRight, setOrderRight, newViewProps);
-  RKNA_PROP_UPDATE(orderUp, setOrderUp, newViewProps);
-  RKNA_PROP_UPDATE(orderDown, setOrderDown, newViewProps);
-  RKNA_PROP_UPDATE(orderForward, setOrderForward, newViewProps);
-  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);
-  }
+  [self updateKeyPressProps:RNCEKV::KeyPressProps::from(oldViewProps)
+                      newProps:RNCEKV::KeyPressProps::from(newViewProps)];
+  
+  [self updateContextMenuProps:RNCEKV::ContextMenuProps::from(oldViewProps)
+                      newProps:RNCEKV::ContextMenuProps::from(newViewProps)];
+  
+  [self updateFocusProps:RNCEKV::FocusProps::from(oldViewProps)
+                  newProps:RNCEKV::FocusProps::from(newViewProps)];
+  
+  [self updateGroupIdentifierProps:RNCEKV::GroupIdentifierProps::from(oldViewProps)
+                          newProps:RNCEKV::GroupIdentifierProps::from(newViewProps)];
+
+  [self updateHaloProps:RNCEKV::HaloProps::from(oldViewProps)
+               newProps:RNCEKV::HaloProps::from(newViewProps)];
+  [self updateFocusOrderProps:RNCEKV::OrderProps::from(oldViewProps)
+                     newProps:RNCEKV::OrderProps::from(newViewProps)];
+  [self updateFocusRequestProps:RNCEKV::AutoFocusProps::from(oldViewProps)
+                     newProps:RNCEKV::AutoFocusProps::from(newViewProps)];
 
   if (oldViewProps.group != newViewProps.group) {
     [self setIsGroup:newViewProps.group];
   }
-
-  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];
-    }
-  }
-
-  // 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
-  // and we need to double check whether a new place for view should be with or
-  // without halo)
-  if (self.isHaloActive != nil || newViewProps.haloEffect == false) {
-    BOOL haloState = newViewProps.haloEffect;
-    if (![self.isHaloActive isEqual:@(haloState)]) {
-      [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];
-  }
-
-  if (oldViewProps.enableContextMenu != newViewProps.enableContextMenu) {
-    [self setEnableContextMenu: newViewProps.enableContextMenu];
-    [self updateContextMenuRegistration];
-  }
 }
 
 
@@ -373,61 +103,6 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 
 #endif
 
-// ToDo RNCEKV-DEPRICATED-0 remove after new system migration
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if (self.myPreferredFocusedView == nil) {
-    return @[];
-  }
-  return @[ self.myPreferredFocusedView ];
-}
-
-- (BOOL)canBecomeFocused {
-  if (!_canBeFocused)
-    NO;
-  return [_focusDelegate canBecomeFocused];
-}
-
-- (void)focus {
-  UIViewController *viewController = self.reactViewController;
-  [self updateFocus:viewController];
-}
-
-- (UIView *)getFocusTargetView {
-  return [_focusDelegate getFocusingView];
-}
-
-- (void)updateFocus:(UIViewController *)controller {
-  UIView *focusingView = self; // [_focusDelegate getFocusingView];
-
-  if (self.superview != nil && controller != nil) {
-    controller.rncekvCustomFocusView = focusingView;
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [controller setNeedsFocusUpdate];
-      [controller updateFocusIfNeeded];
-      [self a11yFocus];
-    });
-  }
-}
-
-- (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
-       withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
-  _isFocused = [_focusDelegate isFocusChanged:context];
-  [self updateContextMenuRegistration];
-
-  [_focusOrderDelegate setIsFocused: [_isFocused isEqual:@YES]];
-  if ([self hasOnFocusChanged]) {
-    if (_isFocused != nil) {
-      _isAttachedToWindow = YES;
-      _isAttachedToController = YES;
-      [self onFocusChangeHandler:[_isFocused isEqual:@YES]];
-    }
-
-    return;
-  }
-
-  [super didUpdateFocusInContext:context withAnimationCoordinator:coordinator];
-}
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)onContextMenuPressHandler {
   [RNCEKVFabricEventHelper onContextMenuPressEventEmmiter:_eventEmitter];
@@ -438,6 +113,7 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 }
 
 - (void)onFocusChangeHandler:(BOOL)isFocused {
+  [super onFocusChangeHandler: isFocused];
   [RNCEKVFabricEventHelper onFocusChangeEventEmmiter:isFocused
                                          withEmitter:_eventEmitter];
 }
@@ -465,8 +141,9 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
     self.onBubbledContextMenuPress(@{});
   }
 }
-
+//
 - (void)onFocusChangeHandler:(BOOL)isFocused {
+  [super onFocusChangeHandler: isFocused];
   if (self.onFocusChange) {
     self.onFocusChange(@{@"isFocused" : @(isFocused)});
   }
@@ -486,151 +163,4 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 
 #endif
 
-
-- (void)a11yFocus {
-  if (!_enableA11yFocus)
-    return;
-  UIView *focusView = [self getFocusTargetView];
-  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification,
-                                  focusView);
-}
-
-- (void)pressesBegan:(NSSet<UIPress *> *)presses
-           withEvent:(UIPressesEvent *)event {
-  NSDictionary *eventInfo = [_keyboardKeyPressHandler actionDownHandler:presses
-                                                              withEvent:event];
-
-  if (self.hasOnPressUp || self.hasOnPressDown) {
-    [self onKeyDownPressHandler:eventInfo];
-  }
-
-  [super pressesBegan:presses withEvent:event];
-}
-
-- (void)pressesEnded:(NSSet<UIPress *> *)presses
-           withEvent:(UIPressesEvent *)event {
-  NSDictionary *eventInfo = [_keyboardKeyPressHandler actionUpHandler:presses
-                                                            withEvent:event];
-
-  if (self.hasOnPressUp || self.hasOnPressDown) {
-    [self onKeyUpPressHandler:eventInfo];
-  }
-
-  [super pressesEnded:presses withEvent:event];
-}
-
-- (void)setIsHaloActive:(NSNumber *_Nullable)isHaloActive {
-  _isHaloActive = isHaloActive;
-  [_haloDelegate displayHalo];
-}
-
-- (void)setHaloCornerRadius:(CGFloat)haloCornerRadius {
-  _haloCornerRadius = haloCornerRadius;
-  if (_isAttachedToWindow) {
-    [_haloDelegate updateHalo];
-  }
-}
-
-- (void)setHaloExpendX:(CGFloat)haloExpendX {
-  _haloExpendX = haloExpendX;
-  if (_isAttachedToWindow) {
-    [_haloDelegate updateHalo];
-  }
-}
-
-- (void)setHaloExpendY:(CGFloat)haloExpendY {
-  _haloExpendY = haloExpendY;
-  if (_isAttachedToWindow) {
-    [_haloDelegate updateHalo];
-  }
-}
-
-- (void)didMoveToWindow {
-  [super didMoveToWindow];
-
-  if (self.window) {
-    [self onAttached];
-  } else {
-    [self onDetached];
-  }
-
-  if (self.window && !_isAttachedToWindow) {
-    [self onViewAttached];
-    _isAttachedToWindow = YES;
-  }
-}
-
-- (void)onViewAttached {
-  [_haloDelegate displayHalo: true];
-  if (self.autoFocus) {
-    [self updateFocus:self.reactViewController];
-  }
-}
-
-// ToDo RNCEKV-8 review and find better place for halo calculation
-- (void)layoutSubviews {
-  [super layoutSubviews];
-  [_haloDelegate displayHalo];
-}
-
-
-- (void) setCustomGroupId:(NSString *)customGroupId {
-  _customGroupId = customGroupId;
-  [_gIdDelegate updateGroupIdentifier];
-}
-
-- (void)didAddSubview:(UIView *)subview {
-  [super didAddSubview: subview];
-  [_gIdDelegate updateGroupIdentifier];
-}
-
-- (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)focusOnMount {
-  UIViewController *viewController = self.reactViewController;
-  if (self.autoFocus) {
-    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];
-          }
-        });
-      });
-    }
-  }
-}
-
-- (UIContextMenuConfiguration *)contextMenuInteraction:
-(UIContextMenuInteraction *)interaction
-                        configurationForMenuAtLocation:(CGPoint)location
-API_AVAILABLE(ios(13.0)) {
-  if (_isFocused != nil && [_isFocused isEqual:@YES]) {
-    [self onContextMenuPressHandler];
-    [self onBubbledContextMenuPressHandler];
-  }
-
-  return nil;
-}
-
-
 @end

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardViewManager.mm

@@ -64,11 +64,8 @@ RCT_CUSTOM_VIEW_PROPERTY(haloEffect, BOOL, RNCEKVExternalKeyboardView)
 {
   if(json) {
     BOOL value = [RCTConvert BOOL:json];
-    if(view.isHaloActive == nil && !value) {
-      [view setIsHaloActive: @0];
-    }
-    if(view.isHaloActive != nil) {
-      [view setIsHaloActive: @(value)];
+    if(view.isHaloHidden == value) {
+      [view setIsHaloHidden: !value];
     }
   }
 }
@@ -90,7 +87,7 @@ RCT_CUSTOM_VIEW_PROPERTY(screenAutoA11yFocusDelay, int, RNCEKVExternalKeyboardVi
 {
   //stub
 }
-
+//
 RCT_CUSTOM_VIEW_PROPERTY(haloCornerRadius, float, RNCEKVExternalKeyboardView)
 {
   if(json) {
@@ -143,7 +140,8 @@ RCT_CUSTOM_VIEW_PROPERTY(orderIndex, NSNumber, RNCEKVExternalKeyboardView)
 {
   if(json){
     NSNumber* value = [RCTConvert NSNumber:json];
-    [view setOrderPosition: value];
+    NSNumber* orderPosition = [value intValue] == -1 ? nil : value;
+    [view setOrderPosition: orderPosition];
   }
 }
 

package/ios/Views/RNCEKVKeyboardFocusGroupView/RNCEKVKeyboardFocusGroup.mm

@@ -51,11 +51,14 @@ using namespace facebook::react;
        withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
 
     [super didUpdateFocusInContext:context withAnimationCoordinator:coordinator];
-    NSString* nextFocusGroup = context.nextFocusedView.focusGroupIdentifier;
-    BOOL isFocused = [nextFocusGroup isEqual: _customGroupId];
-    if(_isGroupFocused != isFocused){
-        _isGroupFocused = isFocused;
-        [self onFocusChangeHandler: isFocused];
+    if (@available(iOS 14.0, *)) {
+        NSString* nextFocusGroup = context.nextFocusedView.focusGroupIdentifier;
+        BOOL isFocused = [nextFocusGroup isEqual: _customGroupId];
+    
+        if(_isGroupFocused != isFocused){
+            _isGroupFocused = isFocused;
+            [self onFocusChangeHandler: isFocused];
+        }
     }
 }
 
@@ -82,20 +85,20 @@ using namespace facebook::react;
 - (void )setCustomGroupId: (NSString *) customGroupId {
     if (@available(iOS 14.0, *)) {
         _customGroupId = customGroupId;
-        [self updateFocusGroup: customGroupId];
+//        [self updateFocusGroup: customGroupId];
     }
 }
 
-
-- (void )updateFocusGroup: (NSString *) customGroupId {
-    if (@available(iOS 14.0, *)) {
-      #ifdef RCT_NEW_ARCH_ENABLED
-        self.rncekvCustomGroup = _customGroupId;
-      #else
-        self.focusGroupIdentifier = _customGroupId;
-      #endif
-    }
-}
+//
+//- (void )updateFocusGroup: (NSString *) customGroupId {
+//    if (@available(iOS 14.0, *)) {
+//      #ifdef RCT_NEW_ARCH_ENABLED
+//        self.rncekvCustomGroup = _customGroupId;
+//      #else
+//        self.focusGroupIdentifier = _customGroupId;
+//      #endif
+//    }
+//}
 
 
 
@@ -110,7 +113,7 @@ using namespace facebook::react;
 {
     [super prepareForRecycle];
     self.tintColor = nil;
-    [self updateFocusGroup: nil];
+//    [self updateFocusGroup: nil];
     _customGroupId = nil;
 }