react-native-external-keyboard 0.8.5-rc → 0.9.0-alpha.0

package/ios/Delegates/RNCEKVFocusOrderDelegate/RNCEKVFocusGuideDelegate/RNCEKVFocusGuideDelegate.h

@@ -14,7 +14,7 @@
 
 @interface RNCEKVFocusGuideDelegate : NSObject
 
-- (instancetype _Nonnull)initWithView:(UIView<RNCEKVFocusOrderProtocol> *_Nonnull)view;
+- (instancetype _Nonnull)initWithView:(NSObject<RNCEKVFocusOrderProtocol> *_Nonnull)view;
 
 //- (void)setLeftGuide:(UIView *_Nullable)view;
 //- (void)setRightGuide:(UIView *_Nullable)view;

package/ios/Delegates/RNCEKVFocusOrderDelegate/RNCEKVFocusOrderDelegate.h

@@ -41,6 +41,11 @@ typedef NS_ENUM(NSUInteger, RNCEKVLinkDirection) {
 - (void)refreshDown:(NSString*_Nullable)prev next:(NSString*_Nullable)next;
 - (void)clear;
 
+- (void)link;
+- (void)unlink;
+- (void)updatePosition:(NSNumber*) position;
+- (void)updateOrderGroup:(NSString *)orderGroup;
+
 @end
 
 

package/ios/Delegates/RNCEKVFocusOrderDelegate/RNCEKVFocusOrderDelegate.mm

@@ -18,6 +18,7 @@
 #import "RNCEKVFocusLinkObserver.h"
 #import "RNCEKVFocusGuideHelper.h"
 #import "RNCEKVFocusGuideDelegate.h"
+#import "UIView+React.h"
 
 static NSNumber *const FOCUS_DEFAULT = nil;
 static NSNumber *const FOCUS_LOCK = @0;
@@ -25,11 +26,12 @@ static NSNumber *const FOCUS_UPDATE = @1;
 
 @implementation RNCEKVFocusOrderDelegate{
   BOOL _isFocused;
+  BOOL _isLinked;
   UIView<RNCEKVFocusOrderProtocol>* _delegate;
   UIView* _entry;
   UIView* _exit;
   UIView* _lock;
-  
+
   RNCEKVFocusGuideDelegate *_focusGuideDelegate;
   NSMutableDictionary<NSNumber *, id> *_updateLinks;
   NSMutableDictionary<NSNumber *, id> *_removeLinks;
@@ -47,27 +49,65 @@ static NSNumber *const FOCUS_UPDATE = @1;
   return self;
 }
 
+- (void)updatePosition:(NSNumber*) position {
+  if (position == nil || _delegate.orderPosition == position || (_delegate.orderPosition != nil && [_delegate.orderPosition isEqualToNumber:position])) {
+    return;
+  }
+
+  if (_delegate.orderGroup != nil && _delegate.superview != nil && _isLinked) {
+    [[RNCEKVOrderLinking sharedInstance] update: position lastPosition: _delegate.orderPosition withOrderKey: _delegate.orderGroup withView: _delegate];
+  }
+}
+
+- (void)updateOrderGroup:(NSString *)orderGroup {
+  if(_delegate.orderPosition != nil  && _delegate.superview != nil) {
+    [[RNCEKVOrderLinking sharedInstance] updateOrderKey: _delegate.orderGroup next:orderGroup position: _delegate.orderPosition withView: _delegate];
+  }
+}
+
+- (void)link {
+  if(_delegate.orderPosition != nil && _delegate.orderGroup != nil && !_isLinked) {
+    [[RNCEKVOrderLinking sharedInstance] add: _delegate.orderPosition withOrderKey: _delegate.orderGroup withObject: _delegate];
+    _isLinked = YES;
+  }
+  if(_delegate.orderId != nil) {
+    [[RNCEKVOrderLinking sharedInstance] storeOrderId: _delegate.orderId withView: _delegate];
+    [self linkId];
+  }
+}
+
+- (void)unlink {
+  if(_delegate.orderPosition != nil && _delegate.orderGroup != nil && _isLinked) {
+    [[RNCEKVOrderLinking sharedInstance] remove: _delegate.orderPosition withOrderKey: _delegate.orderGroup];
+  }
+  if(_delegate.orderId != nil) {
+    [[RNCEKVOrderLinking sharedInstance] cleanOrderId: _delegate.orderId];
+    [self clear];
+  }
+  _isLinked = NO;
+}
+
 - (void)subscribeToDirection:(RNCEKVFocusGuideDirection)direction
                       linkId:(NSString *)linkId {
   if (!linkId) {
     return;
   }
-  
+
   if(_subscribers[@(direction)]) {
     [self clearDirection: direction];
   }
-  
+
   __typeof(self) __weak weakSelf = self;
   RNCEKVFocusGuideDirection capturedDirection = direction;
-  
+
   LinkUpdatedCallback onLinkUpdated = ^(UIView *link) {
     [self->_focusGuideDelegate setGuideFor:capturedDirection withView: link];
   };
-  
+
   LinkRemovedCallback onLinkRemoved = ^{
     [self->_focusGuideDelegate removeGuideFor: capturedDirection];
   };
-  
+
   RNCEKVOrderSubscriber* subscriber = [[RNCEKVFocusLinkObserver sharedManager] subscribe:linkId
                                                                            onLinkUpdated:onLinkUpdated
                                                                            onLinkRemoved:onLinkRemoved];
@@ -78,7 +118,7 @@ static NSNumber *const FOCUS_UPDATE = @1;
   if (!self.subscribers[@(direction)]) {
     return;
   }
-  
+
   [[RNCEKVFocusLinkObserver sharedManager] unsubscribe:self.subscribers[@(direction)]];
   self.subscribers[@(direction)] = nil;
   [_focusGuideDelegate removeGuideFor: direction];
@@ -97,15 +137,11 @@ static NSNumber *const FOCUS_UPDATE = @1;
   }
 }
 
+//ToDo: Refactor to one method with direction param, remove it
 - (void)defaultViewFocus:(UIView *)view {
   UIViewController *controller = _delegate.reactViewController;
-  
   if (controller != nil) {
-    controller.rncekvCustomFocusView = view;
-    dispatch_async(dispatch_get_main_queue(), ^{
-      [controller setNeedsFocusUpdate];
-      [controller updateFocusIfNeeded];
-    });
+    [controller rncekvFocusView:view];
   }
 }
 
@@ -115,18 +151,18 @@ static NSNumber *const FOCUS_UPDATE = @1;
   RNCEKVOrderRelationship* orderRelationship = [[RNCEKVOrderLinking sharedInstance] getInfo: _delegate.orderGroup];
   UIView* _entry = orderRelationship.entry;
   UIView* _exit = orderRelationship.exit;
-  
+
   BOOL isEntry = _entry == current;
   if (isEntry) {
     UIView* firstElement = [orderRelationship getItem: 0];
     [self keyboardedViewFocus: firstElement];
   }
-  
+
   BOOL isLast = currentIndex == orderRelationship.count - 1 && _exit;
   if (isLast) {
     [self defaultViewFocus: _exit];
   }
-  
+
   BOOL inOrderRange = currentIndex >= 0 && currentIndex < orderRelationship.count - 1;
   if (inOrderRange) {
     UIView* nextElement = [orderRelationship getItem: currentIndex + 1];
@@ -138,22 +174,22 @@ static NSNumber *const FOCUS_UPDATE = @1;
 #pragma mark - Prev Focus Handling
 - (void)handlePrevFocus:(UIView *)current currentIndex:(NSInteger)currentIndex {
   RNCEKVOrderRelationship* orderRelationship = [[RNCEKVOrderLinking sharedInstance] getInfo: _delegate.orderGroup];
-  
+
   UIView* _exit = orderRelationship.exit;
   UIView* _entry = orderRelationship.entry;
-  
+
   BOOL isExit = _exit == current;
   int orderCount = [orderRelationship count];
   if (isExit) {
     UIView* lastElement = [orderRelationship getItem: orderCount - 1];
     [self keyboardedViewFocus: lastElement];
   }
-  
+
   BOOL isFirst = currentIndex == 0 && _entry;
   if (isFirst) {
     [self defaultViewFocus: _entry];
   }
-  
+
   BOOL inRange = currentIndex > 0 && currentIndex <= orderCount - 1;
   if (inRange) {
     UIView* prevElement =  [orderRelationship getItem: currentIndex - 1];
@@ -167,7 +203,7 @@ static NSNumber *const FOCUS_UPDATE = @1;
   UIView *next = (UIView *)context.nextFocusedItem;
   UIView *current = (UIView *)context.previouslyFocusedItem;
   UIView* targetView = [_delegate getFocusTargetView];
-  
+
   BOOL isTarget = current == targetView;
   if (isTarget) {
     NSMutableDictionary<NSNumber *, NSString *> *orderMapping = [NSMutableDictionary dictionary]; //Todo create custom structure
@@ -183,7 +219,7 @@ static NSNumber *const FOCUS_UPDATE = @1;
     if (_delegate.orderBackward) {
       orderMapping[@(UIFocusHeadingPrevious)] = _delegate.orderBackward;
     }
-    
+
     NSString *orderKey = orderMapping[@(movementHint)];
     if (orderKey) {
       UIView *nextView = [[RNCEKVOrderLinking sharedInstance] getOrderView:orderKey];
@@ -191,80 +227,80 @@ static NSNumber *const FOCUS_UPDATE = @1;
       return FOCUS_LOCK;
     }
   }
-  
-  
+
+
   if (current == targetView) {
     NSUInteger rawFocusLockValue = [_delegate.lockFocus unsignedIntegerValue];
-    
+
     BOOL isDirectionLock = (rawFocusLockValue & movementHint) != 0;
     if (isDirectionLock) {
       return FOCUS_LOCK;
     }
   }
-  
+
   if(_delegate.orderGroup && _delegate.orderPosition != nil) {
     RNCEKVOrderRelationship* orderRelationship = [[RNCEKVOrderLinking sharedInstance] getInfo: _delegate.orderGroup];
     NSArray *order = [orderRelationship getArray];
     if(order.count == 0) {
       return FOCUS_DEFAULT;
     }
-    
+
     UIView* _exit = orderRelationship.exit;
     UIView* _entry = orderRelationship.entry;
-    
+
     int currentIndex = [orderRelationship getItemIndex:current];
     int nextIndex = [orderRelationship getItemIndex:next];
     //    [self findOrderIndex:order element:current];
-    
+
     //    [self findOrderIndex:order element:next];
-    
+
     BOOL isEntryElement = _entry == nil && currentIndex == -1 && movementHint == UIFocusHeadingNext;
-    
+
     if(isEntryElement) {
       orderRelationship.entry = current;
     }
-    
+
     BOOL isExit = _exit == nil && nextIndex == -1 && movementHint == UIFocusHeadingNext;
     if(isExit) {
       orderRelationship.exit = next;
     }
-    
+
     if(context.focusHeading == UIFocusHeadingNext) {
       [self handleNextFocus:current currentIndex: currentIndex];
       return FOCUS_UPDATE;
     }
-    
-    
+
+
     if(context.focusHeading == UIFocusHeadingPrevious) {
       [self handlePrevFocus:current currentIndex: currentIndex];
       return FOCUS_UPDATE;
     }
   }
-  
+
   return FOCUS_DEFAULT;
 }
 
 - (void)linkId {
   RNCEKVFocusLinkObserver *focusLinkObserver = [RNCEKVFocusLinkObserver sharedManager];
-  
+
   NSString* orderId = _delegate.orderId;
   UIView* view = [_delegate getFocusTargetView];
-  
+
   if(orderId != nil) {
     [focusLinkObserver emitWithId:orderId link:view];
   }
-  
+
   [self subscribeToDirection:RNCEKVFocusGuideDirectionLeft
                       linkId:_delegate.orderLeft];
-  
+
   [self subscribeToDirection:RNCEKVFocusGuideDirectionRight
                       linkId:_delegate.orderRight
   ];
-  
+
   [self subscribeToDirection:RNCEKVFocusGuideDirectionUp
                       linkId:_delegate.orderUp
   ];
-  
+
   [self subscribeToDirection:RNCEKVFocusGuideDirectionDown
                       linkId:_delegate.orderDown
   ];
@@ -273,13 +309,13 @@ static NSNumber *const FOCUS_UPDATE = @1;
 - (void)refreshId: (NSString*)prev next:(NSString*)next {
   RNCEKVFocusLinkObserver *focusLinkObserver = [RNCEKVFocusLinkObserver sharedManager];
   UIView* view = [_delegate getFocusTargetView];
-  
-  
+
+
   if(prev != nil) {
     [focusLinkObserver emitRemoveWithId: prev];
     [[RNCEKVOrderLinking sharedInstance] cleanOrderId: prev];
   }
-  
+
   if(next != nil && view != nil) {
     [[RNCEKVOrderLinking sharedInstance] storeOrderId: next withView:_delegate];
     [focusLinkObserver emitWithId:next link:view];
@@ -319,7 +355,7 @@ static NSNumber *const FOCUS_UPDATE = @1;
   [self clearDirection:RNCEKVFocusGuideDirectionRight];
   [self clearDirection:RNCEKVFocusGuideDirectionUp];
   [self clearDirection:RNCEKVFocusGuideDirectionDown];
-  
+
   [self refreshId: _delegate.orderId next:nil];
 }
 

package/ios/Delegates/RNCEKVFocusOrderDelegate/RNCEKVFocusOrderProtocol.h

@@ -13,20 +13,18 @@
 @protocol RNCEKVFocusOrderProtocol <NSObject>
 
 @property (nonatomic, strong) NSString* orderGroup;
-@property NSNumber* lockFocus;
-@property NSNumber* orderPosition;
+@property (nonatomic, strong) NSNumber* lockFocus;
+@property (nonatomic, strong) NSNumber* orderPosition;
 @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 (nonatomic, strong) NSString* orderForward;
+@property (nonatomic, strong) NSString* orderBackward;
+@property (nonatomic, strong) NSString* orderLast;
+@property (nonatomic, strong) NSString* orderFirst;
 @property (nonatomic, strong) NSString* orderId;
 
-- (UIViewController *)reactViewController;
 - (UIView *)getFocusTargetView;
 
 @end

package/ios/Delegates/RNCEKVGroupIdentifierDelegate/RNCEKVGroupIdentifierDelegate.mm

@@ -53,65 +53,65 @@
     return nil;
   }
 }
-
-
-#ifdef RCT_NEW_ARCH_ENABLED
-- (void) updateGroupIdentifier {
-  if (@available(iOS 14.0, *)) {
-    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 {
-  if (@available(iOS 14.0, *)) {
-    UIView* focus = [_delegate getFocusTargetView];
-    [self clearSubview: focus];
-  }
-}
-
-#ifdef RCT_NEW_ARCH_ENABLED
-- (void)clearSubview: (UIView*_Nullable)subview {
-  if(!subview) return;
-
-  if (@available(iOS 14.0, *)) {
-
-    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
+//
+//
+//#ifdef RCT_NEW_ARCH_ENABLED
+//- (void) updateGroupIdentifier {
+////  if (@available(iOS 14.0, *)) {
+////    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 {
+//  if (@available(iOS 14.0, *)) {
+////    UIView* focus = [_delegate getFocusTargetView];
+////    [self clearSubview: focus];
+//  }
+//}
+
+//#ifdef RCT_NEW_ARCH_ENABLED
+//- (void)clearSubview: (UIView*_Nullable)subview {
+////  if(!subview) return;
+//
+////  if (@available(iOS 14.0, *)) {
+////
+////    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/Delegates/RNCEKVHaloDelegate/RNCEKVHaloDelegate.h

@@ -15,9 +15,10 @@
 
 - (instancetype _Nonnull )initWithView:(UIView<RNCEKVHaloProtocol> *_Nonnull)view;
 
-- (void)displayHalo:(BOOL)force;
-- (void)displayHalo;
-- (void)updateHalo;
+- (UIFocusEffect*) getHalo;
+//- (void)displayHalo:(BOOL)force;
+//- (void)displayHalo;
+//- (void)updateHalo;
 - (void)clear;
 
 @end