react-native-external-keyboard 0.8.5 → 0.9.1

package/android/src/main/java/com/externalkeyboard/services/FocusLinkObserver/FocusLinkObserver.java

@@ -1,5 +1,6 @@
 package com.externalkeyboard.services.FocusLinkObserver;
 
+import android.util.Log;
 import android.view.View;
 
 import java.lang.ref.WeakReference;
@@ -9,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 public class FocusLinkObserver {
-  private final Map<String, View> links;
+  private final Map<String, WeakReference<View>> links;
   private final Map<String, List<Subscriber>> subscribers;
 
   public FocusLinkObserver() {
@@ -22,16 +23,16 @@ public class FocusLinkObserver {
       throw new IllegalArgumentException("Both id and link are required");
     }
 
-    links.put(id, link);
+    links.entrySet().removeIf(e -> e.getValue().get() == null);
+    links.put(id, new WeakReference<>(link));
     emitLinkUpdated(id, link);
   }
 
-
   public void emitRemove(String id) {
     if (links.containsKey(id)) {
-      links.remove(id);  // Remove the link
-      emitLinkRemoved(id);  // Notify subscribers
-      subscribers.remove(id);  // Clean up subscribers for the ID
+      links.remove(id);
+      emitLinkRemoved(id);
+      subscribers.remove(id);
     }
   }
 
@@ -44,7 +45,11 @@ public class FocusLinkObserver {
     subscribers.get(id).add(new Subscriber(onLinkUpdated, onLinkRemoved));
 
     if (onLinkUpdated != null && links.containsKey(id)) {
-      onLinkUpdated.onLinkUpdated(links.get(id));
+      WeakReference<View> ref = links.get(id);
+      View link = ref != null ? ref.get() : null;
+      if (link != null) {
+        onLinkUpdated.onLinkUpdated(link);
+      }
     }
   }
 
@@ -55,11 +60,9 @@ public class FocusLinkObserver {
 
     List<Subscriber> subscriberList = subscribers.get(id);
     if (subscriberList != null) {
-      subscriberList.removeIf(subscriber -> {
-        LinkUpdatedCallback updatedCallback = subscriber.onLinkUpdated.get();
-        LinkRemovedCallback removedCallback = subscriber.onLinkRemoved.get();
-        return updatedCallback == onLinkUpdated && removedCallback == onLinkRemoved;
-      });
+      subscriberList.removeIf(subscriber ->
+        subscriber.onLinkUpdated == onLinkUpdated && subscriber.onLinkRemoved == onLinkRemoved
+      );
 
       if (subscriberList.isEmpty()) {
         subscribers.remove(id);
@@ -70,8 +73,6 @@ public class FocusLinkObserver {
   private void emitLinkUpdated(String id, View link) {
     List<Subscriber> subscriberList = subscribers.get(id);
     if (subscriberList != null) {
-      subscriberList.removeIf(Subscriber::isEmpty);
-
       for (Subscriber subscriber : subscriberList) {
         subscriber.notifyLinkUpdated(link);
       }
@@ -81,10 +82,6 @@ public class FocusLinkObserver {
   private void emitLinkRemoved(String id) {
     List<Subscriber> subscriberList = subscribers.get(id);
     if (subscriberList != null) {
-      // Remove stale subscribers (whose weak references were garbage-collected)
-      subscriberList.removeIf(Subscriber::isEmpty);
-
-      // Notify all valid subscribers
       for (Subscriber subscriber : subscriberList) {
         subscriber.notifyLinkRemoved();
       }
@@ -102,30 +99,24 @@ public class FocusLinkObserver {
   }
 
   private static class Subscriber {
-    private final WeakReference<LinkUpdatedCallback> onLinkUpdated;
-    private final WeakReference<LinkRemovedCallback> onLinkRemoved;
+    final LinkUpdatedCallback onLinkUpdated;
+    final LinkRemovedCallback onLinkRemoved;
 
-    public Subscriber(LinkUpdatedCallback onLinkUpdated, LinkRemovedCallback onLinkRemoved) {
-      this.onLinkUpdated = new WeakReference<>(onLinkUpdated);
-      this.onLinkRemoved = new WeakReference<>(onLinkRemoved);
+    Subscriber(LinkUpdatedCallback onLinkUpdated, LinkRemovedCallback onLinkRemoved) {
+      this.onLinkUpdated = onLinkUpdated;
+      this.onLinkRemoved = onLinkRemoved;
     }
 
-    public void notifyLinkUpdated(View link) {
-      LinkUpdatedCallback callback = onLinkUpdated.get();
-      if (callback != null) {
-        callback.onLinkUpdated(link);
+    void notifyLinkUpdated(View link) {
+      if (onLinkUpdated != null) {
+        onLinkUpdated.onLinkUpdated(link);
       }
     }
 
-    public void notifyLinkRemoved() {
-      LinkRemovedCallback callback = onLinkRemoved.get();
-      if (callback != null) {
-        callback.onLinkRemoved();
+    void notifyLinkRemoved() {
+      if (onLinkRemoved != null) {
+        onLinkRemoved.onLinkRemoved();
       }
     }
-
-    public boolean isEmpty() {
-      return onLinkUpdated.get() == null && onLinkRemoved.get() == null;
-    }
   }
 }

package/android/src/main/java/com/externalkeyboard/views/ExternalKeyboardLockView/ExternalKeyboardLockView.java

@@ -11,6 +11,7 @@ import com.facebook.react.views.view.ReactViewGroup;
 public class ExternalKeyboardLockView extends ReactViewGroup {
   private int componentType;
   private Boolean lockDisable = false;
+  private Boolean forceLock = false;
 
   public ExternalKeyboardLockView(Context context) {
     super(context);
@@ -35,6 +36,10 @@ public class ExternalKeyboardLockView extends ReactViewGroup {
     this.lockDisable = lockDisabled;
   }
 
+  public void setForceLock(boolean forceLock) {
+    this.forceLock = forceLock;
+  }
+
   @Override
   public View focusSearch(View focused, int direction) {
     try {

package/android/src/main/java/com/externalkeyboard/views/ExternalKeyboardLockView/ExternalKeyboardLockViewManager.java

@@ -29,4 +29,10 @@ public class ExternalKeyboardLockViewManager extends com.externalkeyboard.Extern
   public void setLockDisabled(ExternalKeyboardLockView view, boolean value) {
     view.setLockDisabled(value);
   }
+
+  @Override
+  @ReactProp(name = "forceLock")
+  public void setForceLock(ExternalKeyboardLockView view, boolean value) {
+    view.setForceLock(value);
+  }
 }

package/android/src/main/java/com/externalkeyboard/views/ExternalKeyboardView/ExternalKeyboardView.java

@@ -1,336 +1,37 @@
 package com.externalkeyboard.views.ExternalKeyboardView;
 
 import android.content.Context;
-import android.view.FocusFinder;
 import android.view.KeyEvent;
-import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.accessibility.AccessibilityEvent;
 
-import com.externalkeyboard.delegates.FocusOrderDelegate;
-import com.externalkeyboard.events.EventHelper;
+import com.externalkeyboard.views.base.keyboard.ViewKeyHandlerBase;
 
-import com.externalkeyboard.helper.FocusHelper;
-import com.externalkeyboard.helper.ReactNativeVersionChecker;
-import com.externalkeyboard.services.KeyboardKeyPressHandler;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.common.ViewUtil;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.EventDispatcherListener;
-import com.facebook.react.views.view.ReactViewGroup;
-
-public class ExternalKeyboardView extends ReactViewGroup {
-  public boolean hasKeyDownListener = false;
-  public boolean hasKeyUpListener = false;
-  public boolean autoFocus = false;
-  public boolean hasBeenFocused = false;
-  public boolean hasBeenA11yFocused = false;
-  public boolean enableA11yFocus = false;
-  public boolean screenAutoA11yFocus = false;
-  public int screenAutoA11yFocusDelay = 500;
-  public int lockFocus = 0;
-  public String orderForward;
-  public String orderBackward;
-  public String orderId;
-
-
-  private FocusOrderDelegate focusOrderDelegate = null;
-  private EventDispatcher a11yViewAppearDispatcher = null;
-  private EventDispatcherListener eventA11yViewAppearListener = null;
-  private final KeyboardKeyPressHandler keyboardKeyPressHandler;
-  private final Context context;
-  private View listeningView;
-
-  private Integer orderIndex;
-  private String orderGroup;
-  private View firstChild;
-
-  private String orderUp;
-  private String orderDown;
-  private String orderLeft;
-
-  public String getOrderRight() {
-    return orderRight;
-  }
-
-  public void setOrderRight(String orderRight) {
-    focusOrderDelegate.refreshRight(this.orderRight, orderRight);
-    this.orderRight = orderRight;
-  }
-
-  public String getOrderLeft() {
-    return orderLeft;
-  }
-
-  public void setOrderLeft(String orderLeft) {
-    focusOrderDelegate.refreshLeft(this.orderLeft, orderLeft);
-    this.orderLeft = orderLeft;
-  }
-
-  public String getOrderDown() {
-    return orderDown;
-  }
-
-  public void setOrderDown(String orderDown) {
-    focusOrderDelegate.refreshDown(this.orderDown, orderDown);
-    this.orderDown = orderDown;
-  }
-
-  public String getOrderUp() {
-    return orderUp;
-  }
-
-  public void setOrderUp(String orderUp) {
-    focusOrderDelegate.refreshUp(this.orderUp, orderUp);
-    this.orderUp = orderUp;
-  }
-
-  private String orderRight;
+public class ExternalKeyboardView extends ViewKeyHandlerBase {
 
   public ExternalKeyboardView(Context context) {
     super(context);
-    this.context = context;
-    this.focusOrderDelegate = new FocusOrderDelegate(this);
-    this.keyboardKeyPressHandler = new KeyboardKeyPressHandler();
-  }
-
-  public View getFirstChild() {
-    return this.firstChild;
-  }
-
-  public String getOrderGroup() {
-    return this.orderGroup;
-  }
-
-  public String getOrderId() {
-    return this.orderId;
-  }
-
-  public void setOrderGroup(String orderGroup) {
-    focusOrderDelegate.updateOrderGroup(this.orderGroup, orderGroup);
-    this.orderGroup = orderGroup;
-  }
-
-  public Integer getOrderIndex() {
-    return this.orderIndex;
-  }
-
-  public void setOrderIndex(int orderIndex) {
-    if (this.orderIndex == null) {
-      this.orderIndex = orderIndex;
-    } else {
-      this.orderIndex = orderIndex;
-      focusOrderDelegate.refreshOrder();
-    }
-  }
-
-  public void linkAddView(View child) {
-    if (firstChild == null) {
-      firstChild = child;
-      focusOrderDelegate.link();
-    }
-  }
-
-  public void linkRemoveView(View view) {
-    if (view == firstChild) {
-      firstChild = null;
-      focusOrderDelegate.unlink(view);
-    }
-  }
-
-  @Override
-  public View focusSearch(View focused, int direction) {
-    if (lockFocus == 0 && orderGroup == null && orderIndex == null && orderForward == null && orderBackward == null) {
-      return super.focusSearch(focused, direction);
-    }
-
-    boolean isLocked = FocusHelper.isLocked(direction, lockFocus);
-    if (isLocked) {
-      return this;
-    }
-
-    if (direction == FOCUS_FORWARD && orderForward != null) {
-      View nextView = this.focusOrderDelegate.getLink(orderForward);
-      if (isValidLinkedFocusTarget(nextView)) {
-        return nextView;
-      }
-    }
-
-    if (direction == FOCUS_BACKWARD && orderBackward != null) {
-      View prevView = this.focusOrderDelegate.getLink(orderBackward);
-      if (isValidLinkedFocusTarget(prevView)) {
-        return prevView;
-      }
-    }
-
-    if (ReactNativeVersionChecker.isReactNative80OrLater()) {
-      if (orderGroup != null && orderIndex != null && (direction == FOCUS_FORWARD || direction == FOCUS_BACKWARD)) {
-        return FocusFinder.getInstance().findNextFocus((ViewGroup) this.getParent(), focused, direction);
-      }
-    }
-
-    return super.focusSearch(focused, direction);
   }
 
   @Override
   public boolean dispatchKeyEvent(KeyEvent keyEvent) {
-    if(lockFocus != 0) {
-      int keyCode = keyEvent.getKeyCode();
-      boolean isLocked = FocusHelper.isKeyLocked(keyCode, lockFocus);
-      if(isLocked) {
-        return true;
-      }
+    if (this.isFocusLocked(keyEvent)) {
+      return true;
     }
-    if (!this.hasKeyUpListener && !this.hasKeyDownListener) {
+    if (!this.hasKeyListener()) {
       return super.dispatchKeyEvent(keyEvent);
     }
 
-    int keyCode = keyEvent.getKeyCode();
-    if (keyCode == KeyEvent.KEYCODE_TAB) {
-      return super.dispatchKeyEvent(keyEvent); //?
+    if (keyEvent.getKeyCode() == KeyEvent.KEYCODE_TAB) {
+      return super.dispatchKeyEvent(keyEvent);
     }
 
-    KeyboardKeyPressHandler.PressInfo pressInfo = keyboardKeyPressHandler.getEventsFromKeyPress(keyCode, keyEvent);
-
-    if (pressInfo.firePressDownEvent && this.hasKeyDownListener) {
-      EventHelper.pressDown((ReactContext) context, this.getId(), keyCode, keyEvent);
-    }
-
-    if (pressInfo.firePressUpEvent && this.hasKeyUpListener) {
-      EventHelper.pressUp((ReactContext) context, this.getId(), keyCode, keyEvent, pressInfo.isLongPress);
-    }
+    this.handleKeyPress(keyEvent);
 
     return super.dispatchKeyEvent(keyEvent);
   }
 
-  @Override
-  protected void onAttachedToWindow() {
-    super.onAttachedToWindow();
-
-    this.listeningView = getFocusingView();
-    setFocusable(this.listeningView == this);
-
-    this.listeningView.setOnFocusChangeListener((focusedView, hasFocus) -> {
-      EventHelper.focusChanged((ReactContext) context, this.getId(), hasFocus);
-    });
-
-    if (autoFocus && !hasBeenFocused) {
-      this.autoFocusOnDraw();
-      hasBeenFocused = true;
-    }
-  }
-
-  private void onRnScreenViewAppear() {
-    boolean a11yAutoFocus = autoFocus && enableA11yFocus && !hasBeenA11yFocused && screenAutoA11yFocus;
-    if (!a11yAutoFocus) return;
-
-    try {
-      int reactTag = this.getId();
-      int uiManagerType = ViewUtil.getUIManagerType(reactTag);
-      a11yViewAppearDispatcher = UIManagerHelper.getEventDispatcher((ReactContext) context, uiManagerType);
-      if (a11yViewAppearDispatcher == null) return;
-      View focusingView = this.getFocusingView();
-
-
-      eventA11yViewAppearListener = new EventDispatcherListener() {
-        @Override
-        public void onEventDispatch(Event event) {
-          if ("topClick".equals(event.getEventName())) {
-            a11yViewAppearDispatcher.removeListener(this);
-            eventA11yViewAppearListener = null;
-            hasBeenA11yFocused = true;
-          }
-          if ("topFinishTransitioning".equals(event.getEventName()) || "topShow".equals(event.getEventName())) {
-            if (hasBeenA11yFocused) return;
-            hasBeenA11yFocused = true;
-
-            focusingView.postDelayed(() -> {
-              focus(false, true);
-              a11yViewAppearDispatcher.removeListener(this);
-              eventA11yViewAppearListener = null;
-            }, screenAutoA11yFocusDelay);
-          }
-        }
-      };
-      a11yViewAppearDispatcher.addListener(eventA11yViewAppearListener);
-    } catch (Exception ignored) {
-    }
-  }
-
-  private void autoFocusOnDraw() {
-    getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-      @Override
-      public boolean onPreDraw() {
-        onRnScreenViewAppear();
-        getViewTreeObserver().removeOnPreDrawListener(this);
-        focus();
-
-        return true;
-      }
-    });
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    if (this.a11yViewAppearDispatcher != null && this.eventA11yViewAppearListener != null) {
-      this.a11yViewAppearDispatcher.removeListener(this.eventA11yViewAppearListener);
-      eventA11yViewAppearListener = null;
-    }
-    if (this.listeningView != null) {
-      this.listeningView.setOnFocusChangeListener(null);
-    }
-
-//    this.focusOrderDelegate.clear(firstChild); // ToDO check how to clean
-  }
-
-  private View getFocusingView() {
-    View focusableView = FocusHelper.getFocusableView(this);
-    return focusableView != null ? focusableView : this;
-  }
-
-  private boolean isValidLinkedFocusTarget(View target) {
-    if (target == null || !target.isAttachedToWindow() || !this.isAttachedToWindow()) {
-      return false;
-    }
-
-    if (target.getWindowToken() == null || this.getWindowToken() == null) {
-      return false;
-    }
-
-    if (target.getWindowToken() != this.getWindowToken()) {
-      return false;
-    }
-
-    return target.getRootView() == this.getRootView();
-  }
-
   public void setCanBeFocused(boolean canBeFocused) {
     int descendantFocusability = canBeFocused ? ViewGroup.FOCUS_BEFORE_DESCENDANTS : ViewGroup.FOCUS_BLOCK_DESCENDANTS;
     this.setDescendantFocusability(descendantFocusability);
   }
-
-  private void a11yFocus(View view) {
-    if (!enableA11yFocus) return;
-    view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
-  }
-
-
-  public void focus(Boolean keyboard, Boolean a11y) {
-    View focusingView = this.getFocusingView();
-    if (keyboard) {
-      focusingView.requestFocus();
-    }
-    if (a11y) {
-      a11yFocus(focusingView);
-    }
-  }
-
-  public void focus() {
-    this.focus(true, true);
-  }
-
 }

package/android/src/main/java/com/externalkeyboard/views/ExternalKeyboardView/ExternalKeyboardViewManager.java

@@ -1,7 +1,5 @@
 package com.externalkeyboard.views.ExternalKeyboardView;
 
-import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -32,20 +30,7 @@ public class ExternalKeyboardViewManager extends com.externalkeyboard.ExternalKe
   @NonNull
   @Override
   public ExternalKeyboardView createViewInstance(@NonNull ThemedReactContext context) {
-    ExternalKeyboardView viewGroup = new ExternalKeyboardView(context);
-
-    viewGroup.setOnHierarchyChangeListener(new ExternalKeyboardView.OnHierarchyChangeListener() {
-      @Override
-      public void onChildViewAdded(View parent, View child) {
-        viewGroup.linkAddView(child);
-      }
-
-      @Override
-      public void onChildViewRemoved(View parent, View child) {
-        viewGroup.linkRemoveView(child);
-      }
-    });
-    return viewGroup;
+    return new ExternalKeyboardView(context);
   }
 
   public static Map<String, Object> buildDirectEventMap(String registrationName) {
@@ -138,9 +123,9 @@ public class ExternalKeyboardViewManager extends com.externalkeyboard.ExternalKe
   }
 
   @Override
-  @ReactProp(name = "haloEffect", defaultBoolean = false)
+  @ReactProp(name = "haloEffect", defaultBoolean = true)
   public void setHaloEffect(ExternalKeyboardView view, boolean value) {
-    //stub
+    view.setFocusHighlight(value);
   }
 
   @Override
@@ -285,4 +270,12 @@ public class ExternalKeyboardViewManager extends com.externalkeyboard.ExternalKe
       super.receiveCommand(root, commandId, args);
     }
   }
+
+  @Override
+  public void onDropViewInstance(@NonNull ReactViewGroup  viewGroup) {
+    if(viewGroup instanceof ExternalKeyboardView) {
+      ((ExternalKeyboardView)viewGroup).onDropViewInstance();
+    }
+    super.onDropViewInstance(viewGroup);
+  }
 }