@onekeyfe/react-native-text-input 3.0.91 → 3.0.93

package/android/src/main/java/com/textinput/TextInputViewManager.kt

@@ -7,7 +7,6 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.textinput.ReactEditText
 import com.facebook.react.views.textinput.ReactTextInputManager
 import so.onekey.app.wallet.pasteinput.PasteWatcher
@@ -53,19 +52,20 @@ class TextInputViewManager : ReactTextInputManager() {
 
     private class ReactPasteWatcher(editText: TextInputView) : PasteWatcher {
         private val mReactEditText: TextInputView = editText
-        private val mEventDispatcher: EventDispatcher
-        private val mSurfaceId: Int
-
-        init {
-            val reactContext = UIManagerHelper.getReactContext(editText)
-            mEventDispatcher =
-                UIManagerHelper.getEventDispatcherForReactTag(reactContext, editText.id)!!
-            mSurfaceId = UIManagerHelper.getSurfaceId(reactContext)
-        }
 
         override fun onPaste(type: String, data: String) {
-            mEventDispatcher.dispatchEvent(
-                TextInputPasteEvent(mSurfaceId, mReactEditText.id, type, data)
+            val reactContext = UIManagerHelper.getReactContext(mReactEditText) ?: return
+            val eventDispatcher =
+                UIManagerHelper.getEventDispatcherForReactTag(reactContext, mReactEditText.id)
+                    ?: return
+
+            eventDispatcher.dispatchEvent(
+                TextInputPasteEvent(
+                    UIManagerHelper.getSurfaceId(reactContext),
+                    mReactEditText.id,
+                    type,
+                    data
+                )
             )
         }
     }

package/android/src/main/jni/CMakeLists.txt

@@ -0,0 +1,35 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
+set(LIB_TARGET_NAME react_codegen_RNTextInputViewSpec)
+set(LIB_ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
+set(LIB_GENERATED_JNI_DIR ${LIB_ANDROID_DIR}/build/generated/source/codegen/jni)
+
+file(GLOB LIB_CODEGEN_SRCS CONFIGURE_DEPENDS ${LIB_GENERATED_JNI_DIR}/*.cpp)
+
+add_library(
+  ${LIB_TARGET_NAME}
+  SHARED
+  ${LIB_CODEGEN_SRCS}
+)
+
+target_include_directories(
+  ${LIB_TARGET_NAME}
+  PUBLIC
+  .
+  ${LIB_GENERATED_JNI_DIR}
+)
+
+target_link_libraries(
+  ${LIB_TARGET_NAME}
+  fbjni
+  jsi
+  reactnative
+)
+
+target_compile_reactnative_options(${LIB_TARGET_NAME} PRIVATE)

package/android/src/main/jni/react/renderer/components/RNTextInputViewSpec/ComponentDescriptors.h

@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+
+#include <react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h>
+#include <react/renderer/components/androidtextinput/AndroidTextInputState.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+#include <yoga/YGEnums.h>
+#include <yoga/YGValue.h>
+
+#include <unordered_map>
+
+namespace facebook::react {
+
+class OneKeyTextInputComponentDescriptor final
+    : public ConcreteComponentDescriptor<AndroidTextInputShadowNode> {
+  using Base = ConcreteComponentDescriptor<AndroidTextInputShadowNode>;
+
+ public:
+  struct ConcreteShadowNode {
+    inline static constexpr char NameValue[] = "OneKeyTextInput";
+
+    static ComponentHandle Handle() {
+      return ComponentHandle(NameValue);
+    }
+
+    static ComponentName Name() {
+      return NameValue;
+    }
+  };
+
+  explicit OneKeyTextInputComponentDescriptor(
+      const ComponentDescriptorParameters &parameters)
+      : Base(parameters),
+        textLayoutManager_(
+            std::make_shared<TextLayoutManager>(contextContainer_)) {}
+
+  ComponentHandle getComponentHandle() const override {
+    return ConcreteShadowNode::Handle();
+  }
+
+  ComponentName getComponentName() const override {
+    return ConcreteShadowNode::Name();
+  }
+
+  State::Shared createInitialState(
+      const Props::Shared &props,
+      const ShadowNodeFamily::Shared &family) const override {
+    const auto surfaceId = family->getSurfaceId();
+
+    ThemePadding theme;
+    if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
+        surfaceIdToThemePaddingMap_.end()) {
+      theme = surfaceIdToThemePaddingMap_[surfaceId];
+    } else {
+      const jni::global_ref<jobject> &fabricUIManager =
+          contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+      auto env = jni::Environment::current();
+      auto defaultTextInputPaddingArray = env->NewFloatArray(4);
+      static auto getThemeData = jni::findClassStatic(UIManagerJavaDescriptor)
+                                     ->getMethod<jboolean(jint, jfloatArray)>(
+                                         "getThemeData");
+
+      if (getThemeData(
+              fabricUIManager, surfaceId, defaultTextInputPaddingArray) != 0u) {
+        auto defaultTextInputPadding = env->GetFloatArrayElements(
+            defaultTextInputPaddingArray, nullptr);
+        theme.start = defaultTextInputPadding[0];
+        theme.end = defaultTextInputPadding[1];
+        theme.top = defaultTextInputPadding[2];
+        theme.bottom = defaultTextInputPadding[3];
+        surfaceIdToThemePaddingMap_.emplace(surfaceId, theme);
+        env->ReleaseFloatArrayElements(
+            defaultTextInputPaddingArray,
+            defaultTextInputPadding,
+            JNI_ABORT);
+      }
+      env->DeleteLocalRef(defaultTextInputPaddingArray);
+    }
+
+    return std::make_shared<AndroidTextInputShadowNode::ConcreteState>(
+        std::make_shared<const AndroidTextInputState>(
+            AndroidTextInputState({}, {}, {}, 0)),
+        family);
+  }
+
+ protected:
+  void adopt(ShadowNode &shadowNode) const override {
+    auto &textInputShadowNode =
+        static_cast<AndroidTextInputShadowNode &>(shadowNode);
+    textInputShadowNode.setTextLayoutManager(textLayoutManager_);
+
+    const auto surfaceId = textInputShadowNode.getSurfaceId();
+    if (surfaceIdToThemePaddingMap_.find(surfaceId) !=
+        surfaceIdToThemePaddingMap_.end()) {
+      const auto &theme = surfaceIdToThemePaddingMap_[surfaceId];
+      const auto &textInputProps = textInputShadowNode.getConcreteProps();
+      auto &style = const_cast<yoga::Style &>(textInputProps.yogaStyle);
+      auto changedPadding = false;
+
+      if (!textInputProps.hasPadding && !textInputProps.hasPaddingStart &&
+          !textInputProps.hasPaddingLeft &&
+          !textInputProps.hasPaddingHorizontal) {
+        changedPadding = true;
+        style.setPadding(
+            yoga::Edge::Start, yoga::StyleLength::points(theme.start));
+      }
+      if (!textInputProps.hasPadding && !textInputProps.hasPaddingEnd &&
+          !textInputProps.hasPaddingRight &&
+          !textInputProps.hasPaddingHorizontal) {
+        changedPadding = true;
+        style.setPadding(
+            yoga::Edge::End, yoga::StyleLength::points(theme.end));
+      }
+      if (!textInputProps.hasPadding && !textInputProps.hasPaddingTop &&
+          !textInputProps.hasPaddingVertical) {
+        changedPadding = true;
+        style.setPadding(
+            yoga::Edge::Top, yoga::StyleLength::points(theme.top));
+      }
+      if (!textInputProps.hasPadding && !textInputProps.hasPaddingBottom &&
+          !textInputProps.hasPaddingVertical) {
+        changedPadding = true;
+        style.setPadding(
+            yoga::Edge::Bottom, yoga::StyleLength::points(theme.bottom));
+      }
+
+      if ((textInputProps.hasPadding || textInputProps.hasPaddingLeft ||
+           textInputProps.hasPaddingHorizontal) &&
+          !textInputProps.hasPaddingStart) {
+        style.setPadding(yoga::Edge::Start, yoga::StyleLength::undefined());
+      }
+      if ((textInputProps.hasPadding || textInputProps.hasPaddingRight ||
+           textInputProps.hasPaddingHorizontal) &&
+          !textInputProps.hasPaddingEnd) {
+        style.setPadding(yoga::Edge::End, yoga::StyleLength::undefined());
+      }
+
+      if (changedPadding) {
+        textInputShadowNode.updateYogaProps();
+      }
+    }
+
+    textInputShadowNode.dirtyLayout();
+    Base::adopt(shadowNode);
+  }
+
+ private:
+  struct ThemePadding {
+    float start{};
+    float end{};
+    float top{};
+    float bottom{};
+  };
+
+  inline static constexpr auto UIManagerJavaDescriptor =
+      "com/facebook/react/fabric/FabricUIManager";
+
+  const std::shared_ptr<TextLayoutManager> textLayoutManager_;
+  mutable std::unordered_map<int, ThemePadding>
+      surfaceIdToThemePaddingMap_;
+};
+
+} // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-text-input",
-  "version": "3.0.91",
+  "version": "3.0.93",
   "description": "React Native TextInput with native paste events",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/react-native.config.js

@@ -5,7 +5,8 @@ module.exports = {
   dependency: {
     platforms: {
       android: {
-        cmakeListsPath: "build/generated/source/codegen/jni/CMakeLists.txt",
+        cmakeListsPath: "src/main/jni/CMakeLists.txt",
+        componentDescriptors: ["OneKeyTextInputComponentDescriptor"],
       },
     },
   },