react-native-external-keyboard 0.8.5 → 0.9.1

package/ios/Views/RNCEKVExternalKeyboardLockView/RNCEKVExternalKeyboardLockView.mm

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+#import "UIViewController+RNCEKVExternalKeyboard.h"
 
 #import <UIKit/UIKit.h>
 #import <React/RCTViewManager.h>
@@ -33,6 +33,89 @@ using namespace facebook::react;
 
 @implementation RNCEKVExternalKeyboardLockView
 
+- (void)didMoveToSuperview {
+  [super didMoveToSuperview];
+
+  if (self.superview) {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onAccessibilityFocusChanged:)
+                                                 name:UIAccessibilityElementFocusedNotification
+                                               object:nil];
+  } else {
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:UIAccessibilityElementFocusedNotification
+                                                  object:nil];
+  }
+}
+
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIAccessibilityElementFocusedNotification
+                                                object:nil];
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  _forceLock = NO;
+  _lockDisabled = NO;
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIAccessibilityElementFocusedNotification
+                                                object:nil];
+}
+#endif
+
+- (void)onAccessibilityFocusChanged:(NSNotification *)notification {
+  if (!_forceLock || _lockDisabled) return;
+
+  id element = notification.userInfo[UIAccessibilityFocusedElementKey];
+  if (![element isKindOfClass:[UIView class]]) return;
+
+  UIView *focused = (UIView *)element;
+  if (![focused isDescendantOfView:self]) {
+    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, self);
+  }
+}
+
+- (void)setForceLock:(BOOL)forceLock {
+  _forceLock = forceLock;
+  [self requestFocus];
+  [self requestScreenReaderFocus];
+}
+
+- (void)setLockDisabled:(BOOL)lockDisabled {
+  _lockDisabled = lockDisabled;
+  [self requestFocus];
+  [self requestScreenReaderFocus];
+}
+
+- (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
+  if (_lockDisabled) {
+    return [super shouldUpdateFocusInContext: context];
+  }
+
+  UIView *nextFocus = (UIView *)context.nextFocusedView;
+  if(_forceLock && nextFocus != nil && ![nextFocus isDescendantOfView: self]) {
+    return false;
+  }
+
+  return [super shouldUpdateFocusInContext: context];
+}
+
+- (void)requestFocus {
+  if (!_forceLock && _lockDisabled) return;
+
+  UIViewController *controller = self.reactViewController;
+  if (controller != nil) {
+    [controller rncekvFocusView: self];
+  }
+}
+
+- (void)requestScreenReaderFocus {
+  if (!_forceLock && _lockDisabled) return;
+
+  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, self);
+}
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
@@ -48,10 +131,21 @@ using namespace facebook::react;
     static const auto defaultProps = std::make_shared<const ExternalKeyboardLockViewProps>();
     _props = defaultProps;
   }
-  
+
   return self;
 }
 
+- (void)updateProps:(Props::Shared const &)props
+           oldProps:(Props::Shared const &)oldProps
+{
+  const auto &newViewProps =
+    *std::static_pointer_cast<ExternalKeyboardLockViewProps const>(props);
+  [super updateProps:props oldProps:oldProps];
+
+  self.forceLock = newViewProps.forceLock;
+  self.lockDisabled = newViewProps.lockDisabled;
+}
+
 Class<RCTComponentViewProtocol> ExternalKeyboardLockViewCls(void)
 {
   return RNCEKVExternalKeyboardLockView.class;
@@ -59,4 +153,13 @@ Class<RCTComponentViewProtocol> ExternalKeyboardLockViewCls(void)
 
 #endif
 
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+
+  if (self.window) {
+    [self requestFocus];
+    [self requestScreenReaderFocus];
+  }
+}
+
 @end

package/ios/Views/RNCEKVExternalKeyboardLockView/RNCEKVExternalKeyboardLockViewManager.mm

@@ -10,6 +10,7 @@
 
 #import <React/RCTViewManager.h>
 #import <React/RCTUIManager.h>
+#import <React/RCTConvert.h>
 #import "RNCEKVExternalKeyboardLockView.h"
 #import "RNCEKVExternalKeyboardLockViewManager.h"
 
@@ -22,4 +23,14 @@ RCT_EXPORT_MODULE(ExternalKeyboardLockView)
   return [[RNCEKVExternalKeyboardLockView alloc] init];
 }
 
+RCT_CUSTOM_VIEW_PROPERTY(forceLock, BOOL, RNCEKVExternalKeyboardLockView)
+{
+  view.forceLock = json ? [RCTConvert BOOL:json] : NO;
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(lockDisabled, BOOL, RNCEKVExternalKeyboardLockView)
+{
+  view.lockDisabled = json ? [RCTConvert BOOL:json] : NO;
+}
+
 @end

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.h

@@ -4,101 +4,26 @@
 #import <UIKit/UIKit.h>
 #import "RNCEKVFocusProtocol.h"
 #import "RNCEKVFocusOrderProtocol.h"
+#import "RNCEKVKeyboardFocusableProtocol.h"
 #import "RNCEKVHaloProtocol.h"
 #import "RNCEKVGroupIdentifierProtocol.h"
+#import "RNCEKVExternalKeyboardHalloBase.h"
+#import "RNCEKVViewKeyPress.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
+@interface RNCEKVExternalKeyboardView : RNCEKVViewKeyPress <RNCEKVKeyboardFocusableProtocol>
 
-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;
 @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;
-
-@end
-
-NS_ASSUME_NONNULL_END
 
-
-#else /* RCT_NEW_ARCH_ENABLED */
-
-
-#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;
-@property BOOL isGroup;
-@property BOOL enableA11yFocus;
-@property UIView* myPreferredFocusedView;
-@property (nonatomic, assign) CGFloat haloCornerRadius;
-@property (nonatomic, assign) CGFloat haloExpendX;
-@property (nonatomic, assign) CGFloat haloExpendY;
+#ifndef RCT_NEW_ARCH_ENABLED
 @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;
+#endif
 
-@property (nonatomic, strong, nullable) NSNumber *isHaloActive;
-- (void)focus;
 @end
 
 
-#endif /* RCT_NEW_ARCH_ENABLED */
+//#endif /* RCT_NEW_ARCH_ENABLED */
 #endif /* ExternalKeyboardViewNativeComponent_h */