Merge pull request #66 from ArturKalach/release/0.5.3

Release/0.5.3

Author: ArturKalach

README.md

@@ -11,6 +11,7 @@ React Native library for enhanced external keyboard support.
 
 
 ## New Release Features
+- Added `Keyboard.dismiss` functionality for Android.
 - Introduced an iOS-specific component: `KeyboardFocusGroup`, a component for managing the `tintColor`, `focusGroupIdentifier`, and group focus.
 - Enhanced `KeyboardExtendedBaseView` with `haloCornerRadius`, `haloExpandX`, and `haloExpandY` properties for customizing the appearance of the `Halo Effect`.
 - Enhanced `KeyboardExtendedBaseView` with `onBubbledContextMenuPress`, key press functionality has been also enhanced. Key presses can be listened to for a group of components, screens, or pages.
@@ -249,6 +250,18 @@ onFocus?: | Handler called when the component is focused  | `() => void`
 onBlur?: | Handler called when the component loses focus | `() => void`
 groupIdentifier?: | Relates to iOS `focusGroupIdentifier`: the identifier of the focus group to which this view belongs| `string`
 
+### Keyboard
+Keyboard module to support soft keyboard dismissal.
+
+```tsx
+import { Keyboard } from 'react-native-external-keyboard';
+
+...
+  Keyboard.dismiss();
+...
+```
+
+This is needed for hiding the soft keyboard using a hardware keyboard. Additionally, the soft keyboard can be hidden from the settings or by pressing `Alt + K`.
 
 # Migration 0.3.x to 0.4.0
 

android/src/main/java/com/externalkeyboard/ExternalKeyboardViewPackage.java

@@ -1,18 +1,49 @@
 package com.externalkeyboard;
 
 
+import com.externalkeyboard.modules.ExternalKeyboardModule;
 import com.externalkeyboard.views.ExternalKeyboardView.ExternalKeyboardViewManager;
 import com.externalkeyboard.views.KeyboardFocusGroup.KeyboardFocusGroupManager;
 import com.externalkeyboard.views.TextInputFocusWrapper.TextInputFocusWrapperManager;
-import com.facebook.react.ReactPackage;
+import com.facebook.react.BaseReactPackage;
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
-public class ExternalKeyboardViewPackage implements ReactPackage {
+public class ExternalKeyboardViewPackage extends TurboReactPackage {
+  @Override
+  public NativeModule getModule(String name, ReactApplicationContext reactContext) {
+    if (name.equals(ExternalKeyboardModule.NAME)) {
+      return new ExternalKeyboardModule(reactContext);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      Map<String, ReactModuleInfo> map = new HashMap<>();
+      boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+      map.put(ExternalKeyboardModule.NAME, new ReactModuleInfo(
+        ExternalKeyboardModule.NAME,       // name
+        ExternalKeyboardModule.NAME,       // className
+        false, // canOverrideExistingModule
+        false, // needsEagerInit
+        false, // isCXXModule
+        isTurboModule   // isTurboModule
+      ));
+      return map;
+    };
+  }
 
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
@@ -24,8 +55,5 @@ public List<ViewManager> createViewManagers(ReactApplicationContext reactContext
         return viewManagers;
     }
 
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return new ArrayList<>();
-    }
+
 }

android/src/main/java/com/externalkeyboard/modules/ExternalKeyboardModule.java

@@ -0,0 +1,52 @@
+package com.externalkeyboard.modules;
+
+import android.content.Context;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import com.externalkeyboard.ExternalKeyboardModuleSpec;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+
+public class ExternalKeyboardModule extends ExternalKeyboardModuleSpec {
+  public static final String NAME = "ExternalKeyboardModule";
+  private static View focusedView = null;
+  private final ReactApplicationContext context;
+
+
+  private boolean dismiss() {
+    if(focusedView == null) return false;
+    try {
+      InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+      if (imm != null) {
+        imm.hideSoftInputFromWindow(focusedView.getWindowToken(), 0);
+        return true;
+      }
+    } catch (Exception ignored){}
+
+    return false;
+  }
+
+
+  public static void setFocusedTextInput (View _focusedView) {
+    focusedView = _focusedView;
+  }
+
+  public ExternalKeyboardModule(ReactApplicationContext reactContext) {
+    super(reactContext);
+    context = reactContext;
+  }
+
+  @Override
+  public String getName() {
+    return NAME;
+  }
+
+  @Override
+  @ReactMethod
+  public void dismissKeyboard(Promise promise) {
+    boolean result = dismiss();
+    promise.resolve(result);
+  }
+}

android/src/main/java/com/externalkeyboard/views/TextInputFocusWrapper/TextInputFocusWrapper.java

@@ -1,18 +1,25 @@
 package com.externalkeyboard.views.TextInputFocusWrapper;
 
+import static androidx.core.content.ContextCompat.getSystemService;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.text.Editable;
+import android.util.Log;
+import android.view.FocusFinder;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 
 import com.externalkeyboard.events.EventHelper;
+import com.externalkeyboard.modules.ExternalKeyboardModule;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.views.textinput.ReactEditText;
+import com.facebook.react.views.textinput.ReactTextInputManager;
 
 public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChangeListener {
   private final Context context;
@@ -23,6 +30,25 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
   private View.OnAttachStateChangeListener onAttachListener;
   private boolean blurOnSubmit = true;
   private boolean multiline = false;
+  private boolean keyboardFocusable = true;
+  private Integer planedDirection = null;
+  private static View focusedView = null;
+  public boolean getIsFocusByPress() {
+    return focusType == FOCUS_BY_PRESS;
+  }
+
+  public void setKeyboardFocusable (boolean canBeFocusable) {
+    if(keyboardFocusable == canBeFocusable) {
+      return;
+    }
+
+    keyboardFocusable = canBeFocusable;
+
+    this.setFocusable(keyboardFocusable);
+    if(this.reactEditText != null) {
+      this.reactEditText.setFocusable(false);
+    }
+  }
 
   private View.OnAttachStateChangeListener getOnAttachListener() {
     if (onAttachListener == null) {
@@ -59,6 +85,23 @@ public void setEditText(ReactEditText editText) {
       if (focusType == FOCUS_BY_PRESS) {
         this.reactEditText.setFocusable(false);
       }
+      OnFocusChangeListener reactListener = this.reactEditText.getOnFocusChangeListener();
+      this.reactEditText.setOnFocusChangeListener((textInput, hasTextEditFocus) -> {
+        reactListener.onFocusChange(textInput, hasTextEditFocus);
+        focusedView = textInput;
+        this.focusEventIgnore = false;
+        if (focusType != FOCUS_BY_PRESS || !hasTextEditFocus) {
+          onFocusChange(textInput, hasTextEditFocus);
+        }
+
+        if(hasTextEditFocus) {
+          ExternalKeyboardModule.setFocusedTextInput(textInput);
+        }
+        if (!hasTextEditFocus) {
+          this.setFocusable(true);
+          this.reactEditText.setFocusable(false);
+        }
+      });
       onMultiplyBlurSubmitHandle();
     } else {
       this.clearEditText();
@@ -87,6 +130,10 @@ public void setBlurType(int blurType) {
   public TextInputFocusWrapper(Context context) {
     super(context);
     this.context = context;
+
+    if(keyboardFocusable) {
+      setFocusable(true);
+    }
   }
 
   public void setBlurOnSubmit(boolean blurOnSubmit) {
@@ -109,17 +156,16 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     return super.onKeyDown(keyCode, event);
   }
 
-  @Override
   public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
     if ((direction == View.FOCUS_FORWARD || direction == View.FOCUS_BACKWARD) && focusType != FOCUS_BY_PRESS) {
-      this.handleTextInputFocus();
-      return true;
+        this.handleTextInputFocus();
+        return true;
     }
 
     return super.requestFocus(direction, previouslyFocusedRect);
   }
 
-    private void onMultiplyBlurSubmitHandle() {
+  private void onMultiplyBlurSubmitHandle() {
     if(this.reactEditText == null) return;
     if(this.multiline) {
       this.reactEditText.setOnKeyListener(new View.OnKeyListener() {
@@ -144,20 +190,12 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
 
   private void handleTextInputFocus() {
     this.focusEventIgnore = true;
-    this.reactEditText.setOnFocusChangeListener((textInput, hasTextEditFocus) -> {
-      this.focusEventIgnore = false;
-      if (focusType != FOCUS_BY_PRESS || !hasTextEditFocus) {
-        onFocusChange(textInput, hasTextEditFocus);
-      }
-
-      if (!hasTextEditFocus) {
-        this.setFocusable(true);
-        this.reactEditText.setFocusable(false);
-      }
-    });
-    this.reactEditText.setFocusable(true);
-    this.reactEditText.requestFocusFromJS();
     this.setFocusable(false);
+    this.reactEditText.setFocusable(true);
+
+    if(!this.reactEditText.hasFocus()) {
+      this.reactEditText.requestFocusFromJS();
+    }
   }
 
   @Override

android/src/main/java/com/externalkeyboard/views/TextInputFocusWrapper/TextInputFocusWrapperManager.java

@@ -8,11 +8,14 @@
 
 import com.externalkeyboard.events.FocusChangeEvent;
 import com.externalkeyboard.events.MultiplyTextSubmit;
+import com.externalkeyboard.views.ExternalKeyboardView.ExternalKeyboardView;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.views.textinput.ReactEditText;
+import com.facebook.react.views.view.ReactViewGroup;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,7 +37,6 @@ public TextInputFocusWrapper createViewInstance(ThemedReactContext context) {
 
   @Override
   protected void addEventEmitters(final ThemedReactContext reactContext, TextInputFocusWrapper viewGroup) {
-    viewGroup.setFocusable(true);
     viewGroup.subscribeOnFocus();
   }
 
@@ -91,7 +93,7 @@ public void setGroupIdentifier(TextInputFocusWrapper view, @Nullable String valu
   @Override
   @ReactProp(name = "canBeFocused", defaultBoolean = true)
   public void setCanBeFocused(TextInputFocusWrapper view, boolean value) {
-    view.setFocusable(value);
+    view.setKeyboardFocusable(value);
   }
 
   @Override
@@ -124,7 +126,7 @@ public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
 
     export.put(FocusChangeEvent.EVENT_NAME, createEventMap("onFocusChange"));
     export.put(MultiplyTextSubmit.EVENT_NAME, createEventMap("onMultiplyTextSubmit"));
-    
+
     return export;
   }
 }

android/src/newarch/ExternalKeyboardModuleSpec.java

@@ -0,0 +1,9 @@
+package com.externalkeyboard;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+
+public abstract class ExternalKeyboardModuleSpec extends NativeExternalKeyboardModuleSpec {
+  protected ExternalKeyboardModuleSpec(ReactApplicationContext context) {
+    super(context);
+  }
+}

android/src/oldarch/ExternalKeyboardModuleSpec.java

@@ -0,0 +1,13 @@
+package com.externalkeyboard;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+
+public abstract class ExternalKeyboardModuleSpec extends ReactContextBaseJavaModule {
+  protected ExternalKeyboardModuleSpec(ReactApplicationContext context) {
+    super(context);
+  }
+
+  public abstract void dismissKeyboard(Promise promise);
+}

example/android/app/build.gradle

@@ -129,9 +129,9 @@ if (isNewArchitectureEnabled()) {
       def isWindows = System.getProperty('os.name').toLowerCase().contains('windows')
 
       if (isWindows) {
-        commandLine 'cmd', '/c', 'npx bob build --target codegen'
+        commandLine 'cmd', '/c', 'npx bob build'
       } else {
-        commandLine 'sh', '-c', 'npx bob build --target codegen'
+        commandLine 'sh', '-c', 'npx bob build'
       }
     }
     preBuild.dependsOn invokeLibraryCodegen

example/ios/Podfile

@@ -32,7 +32,7 @@ target 'ExternalKeyboardExample' do
 
 
   pre_install do |installer|
-    system("cd ../../ && npx bob build --target codegen")
+    system("cd ../../ && npx bob build")
   end
 
   post_install do |installer|

example/ios/Podfile.lock

@@ -1242,7 +1242,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-external-keyboard (0.5.1):
+  - react-native-external-keyboard (0.5.3):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1913,7 +1913,7 @@ SPEC CHECKSUMS:
   React-logger: 697873f06b8ba436e3cddf28018ab4741e8071b6
   React-Mapbuffer: c174e11bdea12dce07df8669d6c0dc97eb0c7706
   React-microtasksnativemodule: 8a80099ad7391f4e13a48b12796d96680f120dc6
-  react-native-external-keyboard: cab5e7d0e6b274e1ba7b5f67bddc51629f8ad18c
+  react-native-external-keyboard: ff6129ab940e6bb571df873281511161d9580b40
   react-native-safe-area-context: cbadf383376f589bb611c8ae0280c1d4b7b447e9
   React-nativeconfig: f7ab6c152e780b99a8c17448f2d99cf5f69a2311
   React-NativeModulesApple: 70600f7edfc2c2a01e39ab13a20fd59f4c60df0b
@@ -1947,6 +1947,6 @@ SPEC CHECKSUMS:
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: fcc198acd4a55599b3468cfb6ebc526baff5f06e
 
-PODFILE CHECKSUM: da3435fd0238a05043abf0fa88b420ba9ea4e965
+PODFILE CHECKSUM: 60fd2791380dbcec1be1a39c520a7d54b593cb12
 
 COCOAPODS: 1.15.2