react-native-external-keyboard 0.8.5 → 0.9.1

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloDelegate.mm

@@ -16,125 +16,56 @@
 
 @implementation RNCEKVHaloDelegate {
   UIView<RNCEKVHaloProtocol> *_delegate;
-  UIFocusEffect *_focusEffect;
-  CGFloat _prevHaloExpendX;
-  CGFloat _prevHaloExpendY;
-  CGFloat _prevHaloCornerRadius;
+  UIFocusEffect *_currentEffect;
+  BOOL _isDirty;
   CGRect _prevBounds;
-  BOOL _recycled;
 }
 
-- (instancetype _Nonnull)initWithView:
-(UIView<RNCEKVHaloProtocol> *_Nonnull)delegate {
+- (instancetype _Nonnull)initWithView:(UIView<RNCEKVHaloProtocol> *_Nonnull)delegate {
   self = [super init];
   if (self) {
     _delegate = delegate;
-    _focusEffect = nil;
-    _prevBounds = CGRect();
-    _prevHaloExpendX = 0;
-    _prevHaloExpendY = 0;
-    _prevHaloCornerRadius = 0;
-    _recycled = true;
+    _currentEffect = nil;
+    _isDirty = YES;
+    _prevBounds = CGRectZero;
   }
   return self;
 }
 
-- (BOOL)isHaloHidden {
-  NSNumber *isHaloActive = [_delegate isHaloActive];
-  return [isHaloActive isEqual:@NO];
-}
-
-- (void)displayHalo:(BOOL)force {
-  _focusEffect = nil;
-  _recycled = true;
-  
-  [self displayHalo];
-}
-
-- (void)displayHalo {
-  if (@available(iOS 15.0, *)) {
-    UIView *focusingView = [_delegate getFocusTargetView];
-    UIFocusEffect *prevEffect = _focusEffect;
-    
-    BOOL isHidden = [self isHaloHidden];
-    
-    if (isHidden) {
-      _focusEffect = [RNCEKVFocusEffectUtility emptyFocusEffect];
-    }
-    
-    BOOL hasHaloSettings = _delegate.haloExpendX || _delegate.haloExpendY ||
-    _delegate.haloCornerRadius;
-    BOOL isDifferentBounds =
-    !CGRectEqualToRect(_prevBounds, focusingView.bounds);
-    BOOL isDifferent = _prevHaloExpendX != _delegate.haloExpendX ||
-    _prevHaloExpendY != _delegate.haloExpendY ||
-    _prevHaloCornerRadius != _delegate.haloCornerRadius ||
-    isDifferentBounds;
-    
-    // ToDo refactor for better halo setup RNCEKV-7, RNCEKV-8
-    if (!isHidden && hasHaloSettings && isDifferent) {
-      _prevHaloExpendX = _delegate.haloExpendX;
-      _prevHaloExpendY = _delegate.haloExpendY;
-      _prevHaloCornerRadius = _delegate.haloCornerRadius;
-      _prevBounds = focusingView.bounds;
-      
-      _focusEffect =
-      [RNCEKVFocusEffectUtility getFocusEffect:focusingView
-                                 withExpandedX:_delegate.haloExpendX
-                                 withExpandedY:_delegate.haloExpendY
-                              withCornerRadius:_delegate.haloCornerRadius];
-    }
-    
-    if ((_focusEffect == nil && _recycled) || (_focusEffect != nil && prevEffect != _focusEffect &&
-                                               focusingView.focusEffect != _focusEffect)) {
-      _recycled = false;
-      [self setFocusEffect: _focusEffect];
-    }
+- (UIFocusEffect *)focusEffect {
+  if (_delegate.isHaloHidden) {
+    return [RNCEKVFocusEffectUtility emptyFocusEffect];
   }
-}
 
-- (void)updateHalo {
-  if ([self isHaloHidden])
-    return;
-  if (@available(iOS 15.0, *)) {
-    BOOL shouldUpdate = _delegate.haloExpendX || _delegate.haloExpendY ||
-    _delegate.haloCornerRadius;
-    if (!shouldUpdate)
-      return;
-    
-    UIView *focusingView = [_delegate getFocusTargetView];
-    UIFocusEffect *focusEffect =
-    [RNCEKVFocusEffectUtility getFocusEffect:focusingView
-                               withExpandedX:_delegate.haloExpendX
-                               withExpandedY:_delegate.haloExpendY
-                            withCornerRadius:_delegate.haloCornerRadius];
-    [self setFocusEffect: focusEffect];
+  BOOL hasCustomSettings = _delegate.haloExpendX || _delegate.haloExpendY || _delegate.haloCornerRadius;
+  if (!hasCustomSettings) {
+    return nil;
   }
-}
 
-- (void)setFocusEffect: (UIFocusEffect*) focusEffect {
   UIView *focusingView = [_delegate getFocusTargetView];
-  if (@available(iOS 15.0, *)) {
-#ifdef RCT_NEW_ARCH_ENABLED
-    if([focusingView isKindOfClass: RCTViewComponentView.class]) {
-      ((RCTViewComponentView*)focusingView).rncekvCustomFocusEffect = focusEffect;
-    } else {
-      focusingView.focusEffect = focusEffect;
-    }
-#else
-    focusingView.focusEffect = focusEffect;
-#endif
+  BOOL boundsChanged = !CGRectEqualToRect(_prevBounds, focusingView.bounds);
+
+  if (_isDirty || boundsChanged) {
+    _isDirty = NO;
+    _prevBounds = focusingView.bounds;
+
+    _currentEffect = [RNCEKVFocusEffectUtility getFocusEffect:focusingView
+                                                withExpandedX:_delegate.haloExpendX
+                                                withExpandedY:_delegate.haloExpendY
+                                             withCornerRadius:_delegate.haloCornerRadius];
   }
+
+  return _currentEffect;
+}
+
+- (void)invalidate {
+  _isDirty = YES;
 }
 
-- (void) clear {
-  [self setFocusEffect: nil];
-  _focusEffect = nil;
-  _recycled = true;
-  _prevBounds = CGRect();
-  _prevHaloExpendX = 0;
-  _prevHaloExpendY = 0;
-  _prevHaloCornerRadius = 0;
+- (void)clear {
+  _currentEffect = nil;
+  _isDirty = YES;
+  _prevBounds = CGRectZero;
 }
 
 @end

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloProtocol.h

@@ -10,7 +10,7 @@
 
 @protocol RNCEKVHaloProtocol <NSObject>
 
-- (NSNumber *)isHaloActive;
+- (BOOL)isHaloHidden;
 - (CGFloat) haloCornerRadius;
 - (CGFloat) haloExpendX;
 - (CGFloat) haloExpendY;

package/ios/Extensions/RCTEnhancedScrollView+RNCEKVExternalKeyboard.mm

@@ -47,7 +47,7 @@
   return scrollView;
 }
 
-
 @end
 
+
 #endif

package/ios/Extensions/RCTTextInputComponentView+RNCEKVExternalKeyboard.mm

@@ -8,6 +8,9 @@
 #import "RCTTextInputComponentView+RNCEKVExternalKeyboard.h"
 #import <React/RCTBackedTextInputViewProtocol.h>
 #import <objc/runtime.h>
+#import "RNCEKVCustomFocusEffectProtocol.h"
+#import "RCTUITextField.h"
+#import "RCTUITextView.h"
 
 @implementation RCTTextInputComponentView (RNCEKVExternalKeyboard)
 
@@ -26,5 +29,17 @@
 
 @end
 
+@implementation RCTUITextField (RNCEKVExternalKeyboard)
+  - (UIFocusEffect*)focusEffect {
+    id superParent = self.superview.superview;
+    if (superParent != nil && [superParent conformsToProtocol:@protocol(RNCEKVCustomFocusEffectProtocol)]) {
+      id<RNCEKVCustomFocusEffectProtocol> parent = (id<RNCEKVCustomFocusEffectProtocol>)superParent;
+      return [parent customFocusEffect];
+    }
+    
+    return [super focusEffect];
+  }
+@end
+
 #endif
 

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.h

@@ -8,17 +8,20 @@
 #ifndef UIView_RNCEKVExternalKeyboard_h
 #define UIView_RNCEKVExternalKeyboard_h
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTViewComponentView.h>
 
-@interface RCTViewComponentView (RNCEKVExternalKeyboard)
+#ifdef RCT_NEW_ARCH_ENABLED
+  #import <React/RCTViewComponentView.h>
+  #define RNCEKVViewClass RCTViewComponentView
+#else
+  #import <React/RCTView.h>
+  #define RNCEKVViewClass RCTView
+#endif
+
 
-@property (nonatomic, copy, nullable) NSString *rncekvCustomGroup;
-@property (nonatomic, copy, nullable) UIFocusEffect *rncekvCustomFocusEffect;
+@interface RNCEKVViewClass (RNCEKVExternalKeyboard)
 
 @end
 
-#endif
 
 #endif /* UIView_RNCEKVExternalKeyboard_h */

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.mm

@@ -5,47 +5,35 @@
 //  Created by Artur Kalach on 12/08/2025.
 //
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <Foundation/Foundation.h>
-
+#import "RNCEKVCustomFocusEffectProtocol.h"
 #import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
+#import "RNCEKVCustomGroudIdProtocol.h"
 
-#import <objc/runtime.h>
-static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
-static const void *RNCEKVCustomFocusEffect = &RNCEKVCustomFocusEffect;
-
-@implementation RCTViewComponentView (RNCEKVExternalKeyboard)
-
-- (NSString *)rncekvCustomGroup {
-    return objc_getAssociatedObject(self, RNCEKVCustomGroupKey);
-}
-
-- (void)setRncekvCustomGroup:(NSString *)rncekvCustomGroup {
-    objc_setAssociatedObject(self, RNCEKVCustomGroupKey, rncekvCustomGroup, OBJC_ASSOCIATION_COPY_NONATOMIC);
-}
+@implementation RNCEKVViewClass (RNCEKVExternalKeyboard)
 
-- (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) {
-    return rncekv;
+  if ([self.superview conformsToProtocol:@protocol(RNCEKVCustomGroudIdProtocol)]) {
+    id<RNCEKVCustomGroudIdProtocol> parent = (id<RNCEKVCustomGroudIdProtocol>)self.superview;
+    NSString* groupId = [parent customGroupIdentifier];
+    if(groupId != nil) {
+      return groupId;
+    }
   }
+  
   return [super focusGroupIdentifier];
 }
 
 
 - (UIFocusEffect*)focusEffect {
-  UIFocusEffect* rncekv = [self rncekvCustomFocusEffect];
-  if(rncekv) {
-    return rncekv;
+  if ([self.superview conformsToProtocol:@protocol(RNCEKVCustomFocusEffectProtocol)]) {
+    id<RNCEKVCustomFocusEffectProtocol> parent = (id<RNCEKVCustomFocusEffectProtocol>)self.superview;
+    UIFocusEffect* effect = [parent customFocusEffect];
+    if(effect != nil) {
+      return effect;
+    }
   }
   
   return [super focusEffect];
@@ -53,4 +41,3 @@ static const void *RNCEKVCustomFocusEffect = &RNCEKVCustomFocusEffect;
 
 @end
 
-#endif

package/ios/Extensions/UIViewController+RNCEKVExternalKeyboard.h

@@ -12,6 +12,7 @@
 
 @interface UIViewController (RNCEKVExternalKeyboard)
 @property (nonatomic, strong) UIView *rncekvCustomFocusView;
+- (void)rncekvFocusView:(UIView *)view;
 @end
 
 #endif /* UIViewController_RNCEKVExternalKeyboard_h */

package/ios/Extensions/UIViewController+RNCEKVExternalKeyboard.mm

@@ -41,6 +41,14 @@ static char kCustomFocusViewKey;
   [[NSNotificationCenter defaultCenter] postNotificationName:@"ViewControllerChangedNotification" object:self];
 }
 
+- (void)rncekvFocusView:(UIView *)view {
+  self.rncekvCustomFocusView = view;
+  dispatch_async(dispatch_get_main_queue(), ^{
+    [self setNeedsFocusUpdate];
+    [self updateFocusIfNeeded];
+  });
+}
+
 - (NSArray<id<UIFocusEnvironment>> *)keyboardedPreferredFocusEnvironments {
   NSArray<id<UIFocusEnvironment>> *originalEnvironments = [self keyboardedPreferredFocusEnvironments];
 

package/ios/Helpers/RNCEKVNativeProps/RNCEKVNativeProps.h

@@ -0,0 +1,123 @@
+#pragma once
+
+#include <string>
+
+namespace RNCEKV {
+
+struct OrderProps {
+  std::string orderGroup{};
+  int orderIndex{0};
+  int lockFocus{0};
+  std::string orderId{};
+  std::string orderLeft{};
+  std::string orderRight{};
+  std::string orderUp{};
+  std::string orderDown{};
+  std::string orderForward{};
+  std::string orderBackward{};
+  std::string orderFirst{};
+  std::string orderLast{};
+
+  template <typename T>
+  static OrderProps from(const T &props) {
+    return OrderProps{
+      props.orderGroup,
+      props.orderIndex,
+      props.lockFocus,
+      props.orderId,
+      props.orderLeft,
+      props.orderRight,
+      props.orderUp,
+      props.orderDown,
+      props.orderForward,
+      props.orderBackward,
+      props.orderFirst,
+      props.orderLast,
+    };
+  }
+};
+
+
+
+struct HaloProps {
+  bool haloEffect{true};
+  double haloExpendX{0};
+  double haloExpendY{0};
+  double haloCornerRadius{0};
+  facebook::react::SharedColor tintColor{};
+
+  template <typename T>
+  static HaloProps from(const T &props) {
+    return HaloProps{
+      props.haloEffect,
+      props.haloExpendX,
+      props.haloExpendY,
+      props.haloCornerRadius,
+      props.tintColor,
+    };
+  }
+};
+
+struct GroupIdentifierProps {
+  std::string groupIdentifier{};
+
+  template <typename T>
+  static GroupIdentifierProps from(const T &props) {
+    return GroupIdentifierProps{
+      props.groupIdentifier,
+    };
+  }
+};
+
+struct FocusProps {
+  bool canBeFocused{false};
+  bool hasOnFocusChanged{false};
+
+  template <typename T>
+  static FocusProps from(const T &props) {
+    return FocusProps{
+      props.canBeFocused,
+      props.hasOnFocusChanged
+    };
+  }
+};
+
+
+struct ContextMenuProps {
+  bool enableContextMenu{false};
+
+  template <typename T>
+  static ContextMenuProps from(const T &props) {
+    return ContextMenuProps{
+      props.enableContextMenu,
+    };
+  }
+};
+
+struct AutoFocusProps {
+  bool autoFocus{false};
+  bool enableA11yFocus{false};
+  
+  template <typename T>
+  static AutoFocusProps from(const T &props) {
+    return AutoFocusProps{
+      props.autoFocus,
+      props.enableA11yFocus,
+    };
+  }
+};
+
+struct KeyPressProps {
+  bool hasKeyDownPress{false};
+  bool hasKeyUpPress{false};
+  
+  template <typename T>
+  static KeyPressProps from(const T &props) {
+    return KeyPressProps{
+      props.hasKeyDownPress,
+      props.hasKeyUpPress,
+    };
+  }
+};
+
+} // namespace RNCEKV

package/ios/Protocols/RNCEKVCustomFocusEffectProtocol.h

@@ -0,0 +1,15 @@
+//
+//  RNCEKVCustomFocusEffectProtocol.h
+//  Pods
+//
+//  Created by Artur Kalach on 08/04/2026.
+//
+
+#ifndef RNCEKVCustomFocusEffectProtocol_h
+#define RNCEKVCustomFocusEffectProtocol_h
+
+@protocol RNCEKVCustomFocusEffectProtocol <NSObject>
+- (UIFocusEffect*)customFocusEffect;
+@end
+
+#endif /* RNCEKVCustomFocusEffectProtocol_h */

package/ios/Protocols/RNCEKVCustomGroudIdProtocol.h

@@ -0,0 +1,15 @@
+//
+//  RNCEKVCustomGroudIdProtocol.h
+//  Pods
+//
+//  Created by Artur Kalach on 09/04/2026.
+//
+
+#ifndef RNCEKVCustomGroudIdProtocol_h
+#define RNCEKVCustomGroudIdProtocol_h
+
+@protocol RNCEKVCustomGroudIdProtocol <NSObject>
+- (NSString*)customGroupIdentifier;
+@end
+
+#endif /* RNCEKVCustomGroudIdProtocol_h */

package/ios/Protocols/RNCEKVKeyboardFocusableProtocol.h

@@ -0,0 +1,15 @@
+//
+//  RNCEKVKeyboardFocusableProtocol.h
+//  react-native-external-keyboard
+//
+
+#ifndef RNCEKVKeyboardFocusableProtocol_h
+#define RNCEKVKeyboardFocusableProtocol_h
+
+#import <UIKit/UIKit.h>
+
+@protocol RNCEKVKeyboardFocusableProtocol <NSObject>
+- (void)focus;
+@end
+
+#endif /* RNCEKVKeyboardFocusableProtocol_h */

package/ios/Services/RNCEKVFocusLinkObserver.mm

@@ -36,13 +36,12 @@
   if (!identifier || !link) {
     return;
   }
-  
-  [_links setObject:link forKey:identifier];
+  _links[identifier] = link;
   [self emitLinkUpdatedForId:identifier link:link];
 }
 
 - (void)emitRemoveWithId:(NSString *)identifier {
-  if ([_links objectForKey:identifier]) {
+  if (_links[identifier]) {
     [_links removeObjectForKey:identifier];
     [self emitLinkRemovedForId:identifier];
   }

package/ios/Services/RNCEKVKeyboardOrderManager/RNCEKVOrderRelationship/RNCEKVOrderRelationship.mm

@@ -17,8 +17,6 @@
   self = [super init];
   if (self) {
     _positions = [[RNCEKVSortedMap alloc] init];
-    _entry = nil;
-    _exit = nil;
   }
   return self;
 }
@@ -39,45 +37,34 @@
   [_positions clear];
 }
 
--(int)getItemIndex:(UIView*)element  {
-  int resultIndex = -1;
-  if([self isEmpty]) {
-    return resultIndex;
-  }
-  
-  NSArray* order = [_positions getValues];
-  for (int i = 0; i < order.count; i++) {
+- (int)getItemIndex:(UIView *)element {
+  if (element == nil || ![element isKindOfClass:[UIView class]]) return -1;
+  NSArray *order = [_positions getValues];
+  for (int i = 0; i < (int)order.count; i++) {
     UIView *orderElement = order[i];
-    if (orderElement.subviews[0] == element) { //ToDo focus element
-      resultIndex = i;
-      break;
+    if ([element isDescendantOfView:orderElement]) {
+      return i;
     }
   }
-  
-  return resultIndex;
+  return -1;
 }
 
--(UIView*)getItem:(int)index {
-  if([self isEmpty]) return nil;
-  
-  NSArray* order = [_positions getValues];
-  BOOL inOrderRange = index >= 0 && index < order.count;
-  if(!inOrderRange) return nil;
-  
+- (UIView *)getItem:(int)index {
+  NSArray *order = [_positions getValues];
+  if (index < 0 || index >= (int)order.count) return nil;
   return order[index];
-};
+}
 
-- (NSArray*)getArray {
+- (NSArray *)getArray {
   return [_positions getValues];
 }
 
--(BOOL)isEmpty {
+- (BOOL)isEmpty {
   return [_positions isEmpty];
 }
 
--(int)count {
-  NSArray* order = [_positions getValues];
-  return order.count;
+- (int)count {
+  return (int)[_positions getValues].count;
 }