fix: 修复KeyboardControllerView注册2次重复的问题 (#11)

Author: ganghongli

harmony/keyboard_controller.har

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '1.12.17-0.0.1';
+export const HAR_VERSION = '1.12.7-0.0.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

harmony/keyboard_controller/.gitignore

@@ -0,0 +1,9 @@
+string ReanimatedAbility_desc 0x02000001
+string ReanimatedAbility_label 0x02000002
+string WebviewAbility_desc 0x02000008
+string WebviewAbility_label 0x02000009
+string module_desc 0x02000003
+string page_show 0x02000000
+color start_window_background 0x02000004
+media icon 0x02000005
+profile main_pages 0x02000007

harmony/keyboard_controller/BuildProfile.ets

@@ -1,11 +1 @@
-{
-  "name": "@react-native-oh-tpl/react-native-keyboard-controller",
-  "version": "1.12.7-0.0.2",
-  "description": " control keyboard show or hide",
-  "main": "Index.ets",
-  "author": "",
-  "license": "MIT License",
-  "dependencies": {
-    "@rnoh/react-native-openharmony": "file:../react_native_openharmony",
-  }
-}
+{"name":"@react-native-oh-tpl/react-native-keyboard-controller","version":"1.12.7-0.0.3","description":" control keyboard show or hide","main":"Index.ets","author":"","license":"MIT License","dependencies":{"@rnoh/react-native-openharmony":"file:../react_native_openharmony"},"metadata":{"sourceRoots":["./src/main"],"useNormalizedOHMUrl":true},"compatibleSdkVersion":12,"compatibleSdkType":"HarmonyOS","obfuscated":false}

harmony/keyboard_controller/ResourceTable.txt

@@ -30,7 +30,7 @@
 namespace facebook {
 namespace react {
 
-inline const char KeyboardControllerViewName[] = "KeyboardControllerView";
+inline const char KeyboardControllerViewName[] = "RNKeyboardControllerView";
 
 class KeyboardControllerViewProps : public ViewProps {
 public:

harmony/keyboard_controller/oh-package.json5

@@ -116,7 +116,7 @@ void KeyboardControllerViewComponentInstance::keyboardHeightChangeHandle() {
     if (rnInstancePtr != nullptr && this->enabled) {
         if (this->keyboardStatus == KeyboardControllerStatus::HIDE) {
             facebook::react::KeyboardControllerViewEventEmitter::MoveEvent start = {this->keyboardHeight, 0, 0, m_tag};
-            facebook::react::KeyboardControllerViewEventEmitter::MoveEvent end = {0, 0, 0, m_tag};
+            facebook::react::KeyboardControllerViewEventEmitter::MoveEvent end = {0, 1, 0, m_tag};
             m_eventEmitter->onKeyboardMove(end);
             m_eventEmitter->onKeyboardMoveEnd(end);
         } else {

harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentDescriptor.h

@@ -31,7 +31,7 @@
 namespace facebook {
 namespace react {
 
-inline const char KeyboardGestureAreaComponentName[] = "KeyboardGestureArea";
+inline const char KeyboardGestureAreaComponentName[] = "RNKeyboardGestureArea";
 
 class KeyboardGestureAreaProps : public ViewProps {
 public:

harmony/keyboard_controller/src/main/cpp/KeyboardControllerViewComponentInstance.cpp

@@ -17,8 +17,8 @@ KeyboardControllerPackage::createComponentDescriptorProviders() {
                 facebook::react::KeyboardGestureAreaComponentDescriptor>()};
 }
 ComponentJSIBinderByString KeyboardControllerPackage::createComponentJSIBinderByName() {
-    return {{"KeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
-            {"KeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
+    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
+            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
 }
 
 std::unique_ptr<TurboModuleFactoryDelegate> KeyboardControllerPackage::createTurboModuleFactoryDelegate() {
@@ -30,10 +30,10 @@ ComponentInstanceFactoryDelegate::Shared KeyboardControllerPackage::createCompon
 };
 
 ComponentInstance::Shared KeyboardControllerPackage::createComponentInstance(const ComponentInstance::Context &ctx) {
-    if (ctx.componentName == "KeyboardControllerView") {
+    if (ctx.componentName == "RNKeyboardControllerView") {
         return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
     }
-    if (ctx.componentName == "KeyboardGestureArea") {
+    if (ctx.componentName == "RNKeyboardGestureArea") {
         return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
     }
     return nullptr;

harmony/keyboard_controller/src/main/cpp/KeyboardGestureAreaComponentDescriptor.h

@@ -17,10 +17,10 @@ namespace rnoh {
  class KeyboardControllerComponentInstanceFactoryDelegate : public ComponentInstanceFactoryDelegate {
  public:
         ComponentInstance::Shared create(ComponentInstance::Context ctx) override {
-            if (ctx.componentName == "KeyboardControllerView") {
+            if (ctx.componentName == "RNKeyboardControllerView") {
                 return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
             }
-         if (ctx.componentName == "KeyboardGestureArea") {
+         if (ctx.componentName == "RNKeyboardGestureArea") {
                 return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
             }
             return nullptr;

harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.cpp

@@ -0,0 +1,29 @@
+{
+	"app": {
+		"bundleName": "com.rnoh.lhg.test",
+		"debug": true,
+		"versionCode": 1000000,
+		"versionName": "1.0.0",
+		"minAPIVersion": 50000012,
+		"targetAPIVersion": 50000012,
+		"apiReleaseType": "Beta5",
+		"compileSdkVersion": "5.0.0.60",
+		"compileSdkType": "HarmonyOS",
+		"appEnvironments": [],
+		"bundleType": "app"
+	},
+	"module": {
+		"name": "keyboard_controller",
+		"type": "har",
+		"deviceTypes": [
+			"default",
+			"tablet",
+			"2in1"
+		],
+		"packageName": "@react-native-oh-tpl/react-native-keyboard-controller",
+		"installationFree": false,
+		"virtualMachine": "ark12.0.2.0",
+		"compileMode": "esmodule",
+		"dependencies": []
+	}
+}

harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.h

@@ -135,7 +135,7 @@ export const KeyboardProvider = ({
   const updateSharedValues = (event: NativeEvent, platforms: string[]) => {
     "worklet";
 
-    if (platforms.includes(OS)||Platform.OS as string=='harmony') {
+    if (platforms.includes(OS)) {
       // eslint-disable-next-line react-compiler/react-compiler
       progressSV.value = event.progress;
       heightSV.value = -event.height;
@@ -157,7 +157,6 @@ export const KeyboardProvider = ({
       },
       onKeyboardMoveEnd: (event: NativeEvent) => {
         "worklet";
-   
         broadcastKeyboardEvents("onEnd", event);
         updateSharedValues(event, ['harmony']);
       },
@@ -198,7 +197,6 @@ export const KeyboardProvider = ({
     {
       onFocusedInputSelectionChanged: (e) => {
         "worklet";
-
         broadcastInputEvents("onSelectionChange", e);
       },
     },

harmony/keyboard_controller/src/main/module.json

@@ -33,7 +33,6 @@ const KeyboardStickyView = forwardRef<
     ref,
   ) => {
     const { height, progress } = useReanimatedKeyboardAnimation();
-
     const stickyViewStyle = useAnimatedStyle(() => {
       const offset = interpolate(progress.value, [0, 1], [closed, opened]);
 

harmony/keyboard_controller/src/main/module.json5

@@ -55,7 +55,7 @@ const defaultContext: KeyboardAnimationContext = {
 export const KeyboardContext = createContext(defaultContext);
 export const useKeyboardContext = () => {
   const context = useContext(KeyboardContext);
-
+  console.log('###KeyboardContext',context,context.animated.height);
   if (__DEV__ && context === defaultContext) {
     console.warn(
       "Couldn't find real values for `KeyboardContext`. Please make sure you're inside of `KeyboardProvider` - otherwise functionality of `react-native-keyboard-controller` will not work.",

harmony/keyboard_controller/src/ohosTest/ets/test/Ability.test.ets

@@ -66,5 +66,5 @@ export interface NativeProps extends ViewProps {
 }
 
 export default codegenNativeComponent<NativeProps>(
-  "KeyboardControllerView",
+  "RNKeyboardControllerView",
 ) as HostComponent<NativeProps>;

harmony/keyboard_controller/src/ohosTest/ets/test/List.test.ets

@@ -10,6 +10,6 @@ export interface NativeProps extends ViewProps {
   enableSwipeToDismiss?: boolean;
 }
 
-export default codegenNativeComponent<NativeProps>("KeyboardGestureArea", {
+export default codegenNativeComponent<NativeProps>("RNKeyboardGestureArea", {
   excludedPlatforms: ["iOS"],
 }) as HostComponent<NativeProps>;