react-native-external-keyboard 0.8.4 → 0.9.0-alpha.0

package/ios/Views/Base/KeyPress/RNCEKVViewKeyPress.mm

@@ -0,0 +1,82 @@
+//
+//  RNCEKVViewKeyPress.m
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 09/04/2026.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "RNCEKVViewKeyPress.h"
+#import "RNCEKVKeyboardKeyPressHandler.h"
+
+
+
+
+@implementation RNCEKVViewKeyPress {
+  RNCEKVKeyboardKeyPressHandler *_keyboardKeyPressHandler;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+//    _isAttachedToWindow = NO;
+//    _enableA11yFocus = NO;
+    _keyboardKeyPressHandler = [[RNCEKVKeyboardKeyPressHandler alloc] init];
+//    _autoFocusRequested = NO;
+  }
+
+  return self;
+}
+
+- (void)cleanReferences {
+  [super cleanReferences];
+  
+//  _isAttachedToWindow = NO;
+//  _enableA11yFocus = NO;
+//  _autoFocusRequested = NO;
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)updateKeyPressProps:(const RNCEKV::KeyPressProps &)oldProps
+                   newProps:(const RNCEKV::KeyPressProps &)newProps {
+  if (oldProps.hasKeyUpPress != newProps.hasKeyUpPress) {
+    [self setHasOnPressUp:newProps.hasKeyUpPress];
+  }
+
+  if (oldProps.hasKeyDownPress != newProps.hasKeyDownPress) {
+    [self setHasOnPressDown:newProps.hasKeyDownPress];
+  }
+}
+
+#endif
+
+
+- (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)onKeyDownPressHandler:(NSDictionary *)eventInfo{}
+- (void)onKeyUpPressHandler:(NSDictionary *)eventInfo{}
+
+
+@end

package/ios/Views/Base/KeyboardHallo/RNCEKVExternalKeyboardHalloBase.h

@@ -0,0 +1,33 @@
+//
+//  RNCEKVExternalKeyboardHalloBase.h
+//  Pods
+//
+//  Created by Artur Kalach on 08/04/2026.
+//
+
+#ifndef RNCEKVExternalKeyboardHalloBase_h
+#define RNCEKVExternalKeyboardHalloBase_h
+
+#import "RNCEKVViewOrderGroupBase.h"
+#import "RNCEKVCustomFocusEffectProtocol.h"
+#import "RNCEKVHaloProtocol.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#include "RNCEKVNativeProps.h"
+#endif
+
+@interface RNCEKVExternalKeyboardHalloBase : RNCEKVViewOrderGroupBase<RNCEKVHaloProtocol, RNCEKVCustomFocusEffectProtocol>
+
+@property (nonatomic, assign) CGFloat haloCornerRadius;
+@property (nonatomic, assign) CGFloat haloExpendX;
+@property (nonatomic, assign) CGFloat haloExpendY;
+@property BOOL isHaloHidden;
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)updateHaloProps:(const RNCEKV::HaloProps &)oldProps
+               newProps:(const RNCEKV::HaloProps &)newProps;
+#endif
+
+@end
+
+#endif /* RNCEKVExternalKeyboardHalloBase_h */

package/ios/Views/Base/KeyboardHallo/RNCEKVExternalKeyboardHalloBase.mm

@@ -0,0 +1,102 @@
+//
+//  RNCEKVExternakKeyboardHalloBase.m
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 08/04/2026.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "RNCEKVHaloDelegate.h"
+#import "RNCEKVExternalKeyboardHalloBase.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+  #import <React/RCTConversions.h>
+#endif
+
+@implementation RNCEKVExternalKeyboardHalloBase {
+  RNCEKVHaloDelegate *_haloDelegate;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    _haloDelegate = [[RNCEKVHaloDelegate alloc] initWithView:self];
+  }
+  
+  return self;
+}
+
+- (UIFocusEffect*)customFocusEffect {
+  return [_haloDelegate getHalo];
+}
+
+- (void)cleanReferences {
+  [super cleanReferences];
+  [_haloDelegate clear];
+  _isHaloHidden = false;
+//  _isHaloActive = @2; // ToDo RNCEKV-0
+  _haloExpendX = 0;
+  _haloExpendY = 0;
+  _haloCornerRadius = 0;
+}
+
+// ToDo RNCEKV-8 review and find better place for halo calculation
+//- (void)layoutSubviews {
+//  [super layoutSubviews];
+////  [_haloDelegate displayHalo];
+//}
+
+- (void)setIsHaloHidden:(BOOL)isHaloHidden {
+  _isHaloHidden = isHaloHidden;
+//  [_haloDelegate displayHalo];
+}
+
+- (void)setHaloCornerRadius:(CGFloat)haloCornerRadius {
+  _haloCornerRadius = haloCornerRadius;
+//  if (self.window) {
+//    [_haloDelegate updateHalo];
+//  }
+}
+
+- (void)setHaloExpendX:(CGFloat)haloExpendX {
+  _haloExpendX = haloExpendX;
+//  if (self.window) {
+//    [_haloDelegate updateHalo];
+//  }
+}
+
+- (void)setHaloExpendY:(CGFloat)haloExpendY {
+  _haloExpendY = haloExpendY;
+//  if (self.window) {
+////    [_haloDelegate updateHalo];
+//  }
+}
+
+- (void)updateHaloProps:(const RNCEKV::HaloProps &)oldProps
+               newProps:(const RNCEKV::HaloProps &)newProps {
+  if (_isHaloHidden == newProps.haloEffect) {
+    [self setIsHaloHidden: !newProps.haloEffect];
+  }
+
+  if (oldProps.haloExpendX != newProps.haloExpendX) {
+    [self setHaloExpendX:newProps.haloExpendX];
+  }
+
+  if (oldProps.haloExpendY != newProps.haloExpendY) {
+    [self setHaloExpendY:newProps.haloExpendY];
+  }
+
+  if (oldProps.haloCornerRadius != newProps.haloCornerRadius) {
+    [self setHaloCornerRadius:newProps.haloCornerRadius];
+  }
+  
+  UIColor *newColor = RCTUIColorFromSharedColor(newProps.tintColor);
+  BOOL renewColor = newColor != nil && self.tintColor == nil;
+  BOOL isColorChanged = oldProps.tintColor != newProps.tintColor;
+  if (isColorChanged || renewColor) {
+    self.tintColor = RCTUIColorFromSharedColor(newProps.tintColor);
+  }
+}
+
+@end

package/ios/Views/Base/ViewGroup/RNCEKVViewGroupBase.h

@@ -0,0 +1,36 @@
+//
+//  RNCEKVViewGroupBase.h
+//  Pods
+//
+//  Created by Artur Kalach on 07/04/2026.
+//
+
+#ifndef RNCEKVViewGroupBase_h
+#define RNCEKVViewGroupBase_h
+
+#import <UIKit/UIKit.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+  #import <React/RCTViewComponentView.h>
+  #define RNCEKVBaseViewClass RCTViewComponentView
+#else
+  #import <React/RCTView.h>
+  #define RNCEKVBaseViewClass RCTView
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNCEKVViewGroupBase : RNCEKVBaseViewClass
+
+- (UIView*)getStoredView;
+- (void)onSubviewAdded:(UIView *)subview;
+- (void)onSubviewRemoved:(UIView *)subview;
+- (void)onSubviewsLayoutUpdated;
+
+- (void)cleanReferences;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif /* RNCEKVViewGroupBase_h */

package/ios/Views/Base/ViewGroup/RNCEKVViewGroupBase.mm

@@ -0,0 +1,63 @@
+//
+//  RNCEKVViewGroupBase.m
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 07/04/2026.
+//
+
+#import "RNCEKVViewGroupBase.h"
+
+@interface RNCEKVViewGroupBase ()
+
+@property (nonatomic, weak, nullable) UIView *storedView;
+
+@end
+
+
+@implementation RNCEKVViewGroupBase
+
+- (void)didAddSubview:(UIView *)subview {
+  [super didAddSubview:subview];
+
+  if (self.storedView == nil) {
+    self.storedView = subview;
+    [self onSubviewAdded:subview];
+  }
+}
+
+- (void)cleanReferences{
+  self.storedView = nil;
+}
+
+- (void)willRemoveSubview:(UIView *)subview {
+  [super willRemoveSubview:subview];
+
+  if (self.storedView == subview) {
+    self.storedView = nil;
+    [self onSubviewRemoved:subview];
+  }
+}
+
+- (UIView*)getStoredView {
+  return self.storedView;
+}
+
+#pragma mark - Layout updates
+
+- (void)layoutSubviews {
+  [super layoutSubviews];
+
+  if (self.storedView != nil) {
+    [self onSubviewsLayoutUpdated];
+  }
+}
+
+#pragma mark - Hooks (override in subclass)
+
+- (void)onSubviewAdded:(UIView *)subview {}
+
+- (void)onSubviewRemoved:(UIView *)subview {}
+
+- (void)onSubviewsLayoutUpdated {}
+
+@end

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.h

@@ -6,49 +6,50 @@
 #import "RNCEKVFocusOrderProtocol.h"
 #import "RNCEKVHaloProtocol.h"
 #import "RNCEKVGroupIdentifierProtocol.h"
+#import "RNCEKVExternalKeyboardHalloBase.h"
+#import "RNCEKVViewKeyPress.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
 
 NS_ASSUME_NONNULL_BEGIN
-
-#define RKNA_PROP_UPDATE(prop, setter, newProps) \
-if ([RNCEKVPropHelper isPropChanged: _##prop stringValue: newProps.prop]) { \
-[self setter: [RNCEKVPropHelper unwrapStringValue: newProps.prop]]; \
-}
-
-@interface RNCEKVExternalKeyboardView : RCTViewComponentView <UIContextMenuInteractionDelegate, RNCEKVHaloProtocol, RNCEKVFocusProtocol, RNCEKVFocusOrderProtocol, RNCEKVGroupIdentifierProtocol>
-@property (nonatomic, strong, nullable) NSNumber *isHaloActive;
-@property BOOL canBeFocused;
-@property BOOL hasOnPressUp;
-@property BOOL hasOnPressDown;
-@property BOOL hasOnFocusChanged;
+//
+//#define RKNA_PROP_UPDATE(prop, setter, newProps) \
+//if ([RNCEKVPropHelper isPropChanged: _##prop stringValue: newProps.prop]) { \
+//[self setter: [RNCEKVPropHelper unwrapStringValue: newProps.prop]]; \
+//}
+
+@interface RNCEKVExternalKeyboardView : RNCEKVViewKeyPress
+//@property (nonatomic, strong, nullable) NSNumber *isHaloActive;
+//@property BOOL canBeFocused;
+//@property BOOL hasOnPressUp;
+//@property BOOL hasOnPressDown;
+//@property BOOL hasOnFocusChanged;
 @property BOOL isGroup;
-@property BOOL enableA11yFocus;
-@property (nonatomic, assign) CGFloat haloCornerRadius;
-@property (nonatomic, assign) CGFloat haloExpendX;
-@property (nonatomic, assign) CGFloat haloExpendY;
-@property (nullable, nonatomic, strong) UIView* myPreferredFocusedView;
-@property (nonatomic, strong, nullable) NSString *customGroupId;
-@property BOOL autoFocus;
-@property BOOL enableContextMenu;
-@property NSNumber* orderPosition;
-@property NSNumber* lockFocus;
-@property (nonatomic, strong) NSString* orderGroup;
-@property (nonatomic, strong) NSString* orderId;
-@property (nonatomic, strong) NSString* orderLeft;
-@property (nonatomic, strong) NSString* orderRight;
-@property (nonatomic, strong) NSString* orderUp;
-@property (nonatomic, strong) NSString* orderDown;
-@property NSString* orderForward;
-@property NSString* orderBackward;
-@property NSString* orderLast;
-@property NSString* orderFirst;
-@property BOOL isLinked;
-
-- (UIView*)getFocusTargetView;
-
-- (void)focus;
+//@property BOOL enableA11yFocus;
+//@property (nonatomic, assign) CGFloat haloCornerRadius;
+//@property (nonatomic, assign) CGFloat haloExpendX;
+//@property (nonatomic, assign) CGFloat haloExpendY;
+//@property (nullable, nonatomic, strong) UIView* myPreferredFocusedView;
+//@property (nonatomic, strong, nullable) NSString *customGroupId;
+//@property BOOL enableContextMenu;
+//@property NSNumber* orderPosition;
+//@property NSNumber* lockFocus;
+//@property (nonatomic, strong) NSString* orderGroup;
+//@property (nonatomic, strong) NSString* orderId;
+//@property (nonatomic, strong) NSString* orderLeft;
+//@property (nonatomic, strong) NSString* orderRight;
+//@property (nonatomic, strong) NSString* orderUp;
+//@property (nonatomic, strong) NSString* orderDown;
+//@property NSString* orderForward;
+//@property NSString* orderBackward;
+//@property NSString* orderLast;
+//@property NSString* orderFirst;
+//@property BOOL isLinked;
+
+//- (UIView*)getFocusTargetView;
+
+//- (void)focus;
 
 @end
 
@@ -59,44 +60,44 @@ NS_ASSUME_NONNULL_END
 
 
 #import <React/RCTView.h>
-@interface RNCEKVExternalKeyboardView : RCTView <UIContextMenuInteractionDelegate, RNCEKVHaloProtocol, RNCEKVFocusOrderProtocol, RNCEKVFocusProtocol, RNCEKVGroupIdentifierProtocol>
-
-@property BOOL autoFocus;
-@property BOOL canBeFocused;
-@property BOOL hasOnPressUp;
-@property BOOL hasOnPressDown;
-@property BOOL hasOnFocusChanged;
+@interface RNCEKVExternalKeyboardView : RNCEKVViewKeyPress /*<UIContextMenuInteractionDelegate, RNCEKVHaloProtocol, RNCEKVFocusOrderProtocol, RNCEKVFocusProtocol, RNCEKVGroupIdentifierProtocol>*/
+//
+//@property BOOL autoFocus;
+//@property BOOL canBeFocused;
+//@property BOOL hasOnPressUp;
+//@property BOOL hasOnPressDown;
+//@property BOOL hasOnFocusChanged;
 @property BOOL isGroup;
-@property BOOL enableA11yFocus;
-@property UIView* myPreferredFocusedView;
-@property (nonatomic, assign) CGFloat haloCornerRadius;
-@property (nonatomic, assign) CGFloat haloExpendX;
-@property (nonatomic, assign) CGFloat haloExpendY;
-@property (nonatomic, copy) RCTDirectEventBlock onFocusChange;
-@property (nonatomic, copy) RCTDirectEventBlock onContextMenuPress;
-@property (nonatomic, copy) RCTDirectEventBlock onKeyUpPress;
-@property (nonatomic, copy) RCTDirectEventBlock onKeyDownPress;
-@property (nonatomic, copy) RCTBubblingEventBlock onBubbledContextMenuPress;
-@property (nonatomic, strong, nullable) NSString *customGroupId;
-@property NSNumber* orderPosition;
-@property NSNumber* lockFocus;
-@property (nonatomic, strong)NSString* orderGroup;
-@property (nonatomic, strong)  NSString* orderId;
-@property (nonatomic, strong)NSString* orderLeft;
-@property (nonatomic, strong)NSString* orderRight;
-@property (nonatomic, strong) NSString* orderUp;
-@property (nonatomic, strong) NSString* orderDown;
-@property NSString* orderForward;
-@property NSString* orderBackward;
-@property NSString* orderLast;
-@property NSString* orderFirst;
-@property BOOL isLinked;
-@property BOOL enableContextMenu;
-
-- (UIView*)getFocusTargetView;
-
-@property (nonatomic, strong, nullable) NSNumber *isHaloActive;
-- (void)focus;
+//@property BOOL enableA11yFocus;
+//@property UIView* myPreferredFocusedView;
+//@property (nonatomic, assign) CGFloat haloCornerRadius;
+//@property (nonatomic, assign) CGFloat haloExpendX;
+//@property (nonatomic, assign) CGFloat haloExpendY;
+//@property (nonatomic, copy) RCTDirectEventBlock onFocusChange;
+//@property (nonatomic, copy) RCTDirectEventBlock onContextMenuPress;
+//@property (nonatomic, copy) RCTDirectEventBlock onKeyUpPress;
+//@property (nonatomic, copy) RCTDirectEventBlock onKeyDownPress;
+//@property (nonatomic, copy) RCTBubblingEventBlock onBubbledContextMenuPress;
+//@property (nonatomic, strong, nullable) NSString *customGroupId;
+//@property NSNumber* orderPosition;
+//@property NSNumber* lockFocus;
+//@property (nonatomic, strong)NSString* orderGroup;
+//@property (nonatomic, strong)  NSString* orderId;
+//@property (nonatomic, strong)NSString* orderLeft;
+//@property (nonatomic, strong)NSString* orderRight;
+//@property (nonatomic, strong) NSString* orderUp;
+//@property (nonatomic, strong) NSString* orderDown;
+//@property NSString* orderForward;
+//@property NSString* orderBackward;
+//@property NSString* orderLast;
+//@property NSString* orderFirst;
+//@property BOOL isLinked;
+//@property BOOL enableContextMenu;
+
+//- (UIView*)getFocusTargetView;
+
+//@property (nonatomic, strong, nullable) NSNumber *isHaloActive;
+//- (void)focus;
 @end