SYNC: Release 0.3.1

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

@@ -6,25 +6,13 @@
 
 import androidx.annotation.Nullable;
 
-public class ExternalKeyboardView extends ViewGroup {
+import com.facebook.react.views.view.ReactViewGroup;
+
+public class ExternalKeyboardView extends ReactViewGroup {
   public boolean hasKeyDownListener = false;
   public boolean hasKeyUpListener = false;
 
   public ExternalKeyboardView(Context context) {
     super(context);
   }
-
-  public ExternalKeyboardView(Context context, @Nullable AttributeSet attrs) {
-    super(context, attrs);
-  }
-
-  public ExternalKeyboardView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-  }
-
-  @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    // No-op since UIManagerModule handles actually laying out children.
-  }
-
 }

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

@@ -15,6 +15,7 @@
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.views.view.ReactViewGroup;
 
 import java.util.Map;
 
@@ -37,7 +38,10 @@ public ExternalKeyboardView createViewInstance(ThemedReactContext context) {
   }
 
 
-  private void onKeyPressHandler(ExternalKeyboardView viewGroup, int keyCode, KeyEvent keyEvent, ThemedReactContext reactContext) {
+  private void onKeyPressHandler(ReactViewGroup reactViewGroup, int keyCode, KeyEvent keyEvent, ThemedReactContext reactContext) {
+    if(!(reactViewGroup instanceof ExternalKeyboardView)) return;
+    ExternalKeyboardView viewGroup = (ExternalKeyboardView)reactViewGroup;
+
     if (!viewGroup.hasKeyUpListener && !viewGroup.hasKeyDownListener) {
       return;
     }
@@ -56,7 +60,7 @@ private void onKeyPressHandler(ExternalKeyboardView viewGroup, int keyCode, KeyE
   }
 
   @Override
-  protected void addEventEmitters(final ThemedReactContext reactContext, ExternalKeyboardView viewGroup) {
+  protected void addEventEmitters(final ThemedReactContext reactContext, ReactViewGroup viewGroup) {
     viewGroup.setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() {
       @Override
       public void onChildViewAdded(View parent, View child) {

android/src/newarch/ExternalKeyboardViewManagerSpec.java

@@ -1,31 +1,14 @@
 package com.externalkeyboard;
 
-import android.view.ViewGroup;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.ExternalKeyboardViewManagerDelegate;
 import com.facebook.react.viewmanagers.ExternalKeyboardViewManagerInterface;
+import com.facebook.react.views.view.ReactViewGroup;
+import com.facebook.react.views.view.ReactViewManager;
 import com.facebook.soloader.SoLoader;
 
-public abstract class ExternalKeyboardViewManagerSpec<T extends ViewGroup> extends ViewGroupManager<T> implements ExternalKeyboardViewManagerInterface<T> {
+public abstract class ExternalKeyboardViewManagerSpec<T extends ReactViewGroup> extends ReactViewManager implements ExternalKeyboardViewManagerInterface<T> {
   static {
     if (BuildConfig.CODEGEN_MODULE_REGISTRATION != null) {
       SoLoader.loadLibrary(BuildConfig.CODEGEN_MODULE_REGISTRATION);
     }
   }
-
-  private final ViewManagerDelegate<T> mDelegate;
-
-  public ExternalKeyboardViewManagerSpec() {
-    mDelegate = new ExternalKeyboardViewManagerDelegate(this);
-  }
-
-  @Nullable
-  @Override
-  protected ViewManagerDelegate<T> getDelegate() {
-    return mDelegate;
-  }
 }

android/src/oldarch/ExternalKeyboardViewManagerSpec.java

@@ -1,10 +1,9 @@
 package com.externalkeyboard;
 
 import android.view.ViewGroup;
+import com.facebook.react.views.view.ReactViewManager;
 
-import com.facebook.react.uimanager.ViewGroupManager;
-
-public abstract class ExternalKeyboardViewManagerSpec<T extends ViewGroup> extends ViewGroupManager<T> {
+public abstract class ExternalKeyboardViewManagerSpec<T extends ViewGroup> extends ReactViewManager {
   public abstract void setCanBeFocused(T wrapper, boolean canBeFocused);
 
   public abstract void setHasKeyDownPress(T view, boolean value);

example/src/App.tsx

@@ -75,6 +75,9 @@ export default function App() {
         </KeyboardExtendedView>
       </KeyboardExtendedView>
       <KeyboardExtendedInput value={textInput} onChangeText={setTextInput} />
+      <KeyboardExtendedView style={styles.borderExample}>
+        <Text>Border here</Text>
+      </KeyboardExtendedView>
     </View>
   );
 }
@@ -92,4 +95,11 @@ const styles = StyleSheet.create({
   },
   divider: { height: 10 },
   pressFocusStyle: { backgroundColor: '#b2c6b7' },
+  borderExample: {
+    marginVertical: 10,
+    borderColor: 'black',
+    borderRadius: 15,
+    borderWidth: 2,
+    padding: 10,
+  },
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-external-keyboard",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",