@react-native-ohos/react-native-reanimated 3.18.2 → 3.18.3

package/harmony/reanimated/src/main/cpp/patches/NativeModules/ReanimatedModuleProxy.cpp

@@ -228,16 +228,65 @@ void ReanimatedModuleProxy::init(
 }
 
 ReanimatedModuleProxy::~ReanimatedModuleProxy() {
-  invalidate();
-}
-
-void ReanimatedModuleProxy::invalidate() {
   // event handler registry and frame callbacks store some JSI values from UI
   // runtime, so they have to go away before we tear down the runtime
   eventHandlerRegistry_.reset();
   frameCallbacks_.clear();
 #ifdef RCT_NEW_ARCH_ENABLED
   operationsInBatch_.clear();
+  // 清空 PropsRegistry 中持有的 ShadowNode 引用,避免析构时级联释放已被框架回收的 ShadowNodeFamily
+  if (propsRegistry_) {
+    auto lock = propsRegistry_->createLock();
+    // 清空内部 map，释放所有 ShadowNode::Shared
+    propsRegistry_->clear();                                                                                                                                           
+  }
+  propsRegistry_.reset();
+
+  // LayoutAnimationsProxy 持有 ShadowView/MutationNode 引用（内部包含
+  // ShadowNode::Shared），需要在 runtime 销毁前清空，避免 runtime 析构时
+  // GC 级联触发 ShadowNodeFamily::~ShadowNodeFamily() 崩溃
+  if (layoutAnimationsProxy_) {
+    auto lock = std::unique_lock<std::recursive_mutex>(
+        layoutAnimationsProxy_->mutex);
+    layoutAnimationsProxy_->layoutAnimations_.clear();
+    layoutAnimationsProxy_->nodeForTag_.clear();
+    layoutAnimationsProxy_->deadNodes.clear();
+    layoutAnimationsProxy_->leastRemoved.clear();
+    layoutAnimationsProxy_->surfaceManager.props_.clear();
+  }
+  layoutAnimationsProxy_.reset();
+
+  // 主动触发 Hermes GC：在 uiWorkletRuntime_ 销毁前回收 Hermes 堆中持有
+  // ShadowNode::Shared（通过 NativeState / ShadowNodeWrapper）的 JSI 对象。
+  //
+  // 此处 commitHook_ / mountHook_ 仍未 reset，它们持有 uiManager_ 的
+  // shared_ptr，确保 GC 回收 ShadowNodeWrapper 触发 ~ShadowNodeFamily 时
+  // ComponentDescriptorRegistry 仍然有效。这样可避免 uiWorkletRuntime_.reset()
+  // → HadesGC::finalizeAll() 在上下文可能已失效后触发
+  // ~ShadowNodeFamily → ~InstanceHandle 崩溃（0730 复现变体根因）。
+  //
+  // UI runtime 为 LockableRuntime（supportsLocking=true），每个 JSI 操作
+  // 自动加锁 runtimeMutex_（recursive_mutex），从主线程调用 gc() 会阻塞
+  // 等待 UI 线程完成当前 worklet 后执行，不会死锁。
+#if JS_RUNTIME_HERMES
+  if (uiWorkletRuntime_) {
+    try {
+      auto &uiRuntime = uiWorkletRuntime_->getJSIRuntime();
+      auto gc = uiRuntime.global().getPropertyAsFunction(uiRuntime, "gc");
+      gc.call(uiRuntime);
+    } catch (const std::exception &) {
+      // gc() 调用失败不应阻止后续析构流程
+    } catch (...) {
+      // 忽略未知异常，保证析构不因 GC 失败而 terminate
+    }
+  }
+#endif // JS_RUNTIME_HERMES
+
+  // GC 之后再注销 hooks：确保 GC 回收 ShadowNodeWrapper 时
+  // UIManager（及 ComponentDescriptorRegistry）仍存活
+  commitHook_.reset();
+  mountHook_.reset();
+  uiManager_.reset();
 #endif // RCT_NEW_ARCH_ENABLED
   uiWorkletRuntime_.reset();
 }

package/harmony/reanimated/src/main/ets/ReanimatedModule.ts

@@ -3,40 +3,118 @@
 // found in the LICENSE file.
 
 import { RNOHLogger, Tag, UITurboModule, UITurboModuleContext } from "@rnoh/react-native-openharmony/ts";
-import { window } from '@kit.ArkUI';
-import { AnimationManager } from './AnimationManager'
+import { Animator, AnimatorResult, window } from '@kit.ArkUI';
+import { KeyboardState } from "./AnimationManager";
+import deviceInfo from '@ohos.deviceInfo';
+import { accessibility } from '@kit.AccessibilityKit';
 
 export class ReanimatedModule extends UITurboModule {
   static NAME = "ReanimatedModule"
   private logger: RNOHLogger
   private keyBordHeight = 0;
+  private currentAnimator: AnimatorResult ;
+  private currentAnimatedHeight = 0;
 
-  constructor(ctx:  UITurboModuleContext) {
+  constructor(ctx: UITurboModuleContext) {
     super(ctx);
     this.logger = ctx.logger.clone("Reanimated");
   }
+
   public setViewProps(tag: Tag, props: Object) {
     this.ctx.descriptorRegistry.setAnimatedRawProps(tag, props);
   }
 
-  public async subscribeKeyBordListeners() {
-    const windowInstance = await window.getLastWindow(this.ctx.uiAbilityContext);
+  public async subscribeKeyBordListeners(isStatusBarTranslucent: boolean, isNavigationBarTranslucent: boolean) {
+    //ignore isStatusBarTranslucent  - those are Android only
+    let windowInstance: window.Window;
+    try {
+      windowInstance = await window.getLastWindow(this.ctx.uiAbilityContext);
+    } catch (e: ESObject) {
+      this.logger.error(`subscribeKeyBordListeners failed: ${e?.message ?? e}`);
+      return;
+    }
+    const navIndicatorArea = windowInstance.getWindowAvoidArea(
+      window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR
+    );
+    const navIndicatorHeight = this.ctx.getUIContext().px2vp(
+      navIndicatorArea.bottomRect.height
+    );
+
+    const isEdgeToEdge = this.isEdgeToEdgeMode(windowInstance);
+    const effectiveNavBarTranslucent = isEdgeToEdge && isNavigationBarTranslucent;
+
     windowInstance.on('keyboardHeightChange', async (height) => {
-      let keyBordHeight = this.ctx.getUIContext().px2vp(height);
-      const animationManager = new AnimationManager();
-      animationManager.setUpdateCallback((value, status) => {
+      let rawKeyboardHeight = this.ctx.getUIContext().px2vp(height);
+      //If the immersive mode is not enabled, then the area around the bottom navigation bar that needs to be avoided needs to be removed.
+      //If the immersive mode is enabled, the returned value will be the height of the current keyboard.
+      let keyBordHeight = effectiveNavBarTranslucent
+        ? rawKeyboardHeight
+        : Math.max(0, rawKeyboardHeight - navIndicatorHeight);
+
+      //Unchanged height, skip handle
+      if (Math.abs(keyBordHeight - this.currentAnimatedHeight) < 0.01) {
+        return;
+      }
+
+      const isOpening = keyBordHeight > this.keyBordHeight;
+
+      if (this.currentAnimator) {
+        this.currentAnimator.onFrame = null;
+        this.currentAnimator.onFinish = null;
+        this.currentAnimator.cancel();
+        this.currentAnimator = null;
+      }
+
+      this.currentAnimator = Animator.create({
+        duration: isOpening ? 480 : 350,
+        delay: 0,
+        //simulate the keyboard pop-up and retraction animations in harmony
+        easing: isOpening ? "cubic-bezier(0.2, 0.0, 0.1, 1.0)"
+          : "cubic-bezier(0.0, 0.0, 0.1, 1.0)",
+        fill: "forwards",
+        direction: "normal",
+        iterations: 1,
+        begin: this.currentAnimatedHeight,
+        end: keyBordHeight
+      }
+      )
+      this.currentAnimator.onFrame = (progress: number) => {
+        this.currentAnimatedHeight = progress;
+        if (Math.abs(progress - keyBordHeight) < 0.01) { //The final instruction is sent by "onFinish".
+          return;
+        }
+        let status = keyBordHeight > this.keyBordHeight ? KeyboardState.OPENING : KeyboardState.CLOSING;
+        this.ctx.rnInstance.postMessageToCpp("REANIMATED_KEY_BOARD_CHANGE",
+          { keyboardHeight: progress, status: status.valueOf() });
+      }
+      this.currentAnimator.onFinish = () => {
+        this.currentAnimatedHeight = keyBordHeight;
+        let status = keyBordHeight > this.keyBordHeight ? KeyboardState.OPEN : KeyboardState.CLOSED;
+        this.keyBordHeight = keyBordHeight;
         this.ctx.rnInstance.postMessageToCpp("REANIMATED_KEY_BOARD_CHANGE",
-          { keyboardHeight: value, status: status.valueOf() });
-      });
-      animationManager.startAnimation(this.keyBordHeight, keyBordHeight, 200);
-      this.keyBordHeight = keyBordHeight;
+          { keyboardHeight: keyBordHeight, status: status.valueOf() });
+      }
+      this.currentAnimator.play();
     })
   }
 
   public async unsubscribeKeyBordListeners() {
-    const windowInstance = await window.getLastWindow(this.ctx.uiAbilityContext);
-    windowInstance.off('keyboardHeightChange', (v) => {
-    })
+    let windowInstance: window.Window;
+    try {
+      windowInstance = await window.getLastWindow(this.ctx.uiAbilityContext);
+    } catch (e: ESObject) {
+      this.logger.error(`unsubscribeKeyBordListeners failed: ${e?.message ?? e}`);
+      return;
+    }
+    windowInstance.off('keyboardHeightChange')
+    if (this.currentAnimator) {
+      this.currentAnimator.onFrame = null;
+      this.currentAnimator.onFinish = null;
+      this.currentAnimator.cancel();
+      this.currentAnimator = null;
+    }
+    this.keyBordHeight = 0;
+    this.currentAnimatedHeight = 0;
   }
 
   public setGestureHandlerState(handlerTag: Tag, newState: number) {
@@ -45,4 +123,26 @@ export class ReanimatedModule extends UITurboModule {
       module.setGestureHandlerState(handlerTag, newState);
     }
   }
+
+  private isEdgeToEdgeMode(windowInstance: window.Window) {
+    let isLayoutFullScreen = false;
+    try {
+      const windowProperties = windowInstance.getWindowProperties();
+      isLayoutFullScreen = windowProperties.isLayoutFullScreen;
+    } catch (e: ESObject) {
+      isLayoutFullScreen = false;
+    }
+    return isLayoutFullScreen;
+  }
+
+  public isReducedMotionEnabled(): boolean {
+    try {
+      if (deviceInfo.sdkApiVersion >= 23) {
+        return (accessibility as ESObject).isAnimationReduceEnabledSync();
+      }
+    } catch (e) {
+      this.logger.warn(`isReducedMotionEnabled failed: ${JSON.stringify(e)}`);
+    }
+    return false;
+  }
 }

package/harmony/reanimated/src/main/module.json5

@@ -1,13 +1,13 @@
-{
-  "module": {
-    "name": "reanimated",
-    "type": "har",
-    "description": "$string:module_desc",
-    "mainElement": "ReanimatedAbility",
-    "deviceTypes": [
-      "phone",
-      "tablet",
-      "2in1"
-    ],
-  }
+{
+  "module": {
+    "name": "reanimated",
+    "type": "har",
+    "description": "$string:module_desc",
+    "mainElement": "ReanimatedAbility",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+  }
 }

package/harmony/reanimated/src/main/resources/base/element/color.json

@@ -1,8 +1,8 @@
-{
-  "color": [
-    {
-      "name": "start_window_background",
-      "value": "#FFFFFF"
-    }
-  ]
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
 }

package/harmony/reanimated/src/main/resources/base/element/string.json

@@ -1,16 +1,16 @@
-{
-  "string": [
-    {
-      "name": "module_desc",
-      "value": "module description"
-    },
-    {
-      "name": "ReanimatedAbility_desc",
-      "value": "description"
-    },
-    {
-      "name": "ReanimatedAbility_label",
-      "value": "label"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "ReanimatedAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "ReanimatedAbility_label",
+      "value": "label"
+    }
+  ]
 }

package/harmony/reanimated/src/main/resources/base/profile/main_pages.json

@@ -1,5 +1,5 @@
-{
-  "src": [
-    "pages/Index"
-  ]
-}
+{
+  "src": [
+    "pages/Index"
+  ]
+}

package/harmony/reanimated/src/main/resources/en_US/element/string.json

@@ -1,16 +1,16 @@
-{
-  "string": [
-    {
-      "name": "module_desc",
-      "value": "module description"
-    },
-    {
-      "name": "ReanimatedAbility_desc",
-      "value": "description"
-    },
-    {
-      "name": "ReanimatedAbility_label",
-      "value": "label"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "ReanimatedAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "ReanimatedAbility_label",
+      "value": "label"
+    }
+  ]
 }

package/harmony/reanimated/src/main/resources/zh_CN/element/string.json

@@ -1,16 +1,16 @@
-{
-  "string": [
-    {
-      "name": "module_desc",
-      "value": "模块描述"
-    },
-    {
-      "name": "ReanimatedAbility_desc",
-      "value": "description"
-    },
-    {
-      "name": "ReanimatedAbility_label",
-      "value": "label"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "模块描述"
+    },
+    {
+      "name": "ReanimatedAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "ReanimatedAbility_label",
+      "value": "label"
+    }
+  ]
 }

package/harmony/reanimated/ts.ts

@@ -1,6 +1,6 @@
-// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
-// Use of this source code is governed by a MIT license that can be
-// found in the LICENSE file.
-
-export * from './src/main/ets/ReanimatedPackage';
-export * from './src/main/ets/ReanimatedModule';
+// Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+export * from './src/main/ets/ReanimatedPackage';
+export * from './src/main/ets/ReanimatedModule';

package/package.json

@@ -1,50 +1,51 @@
-{
-  "name": "@react-native-ohos/react-native-reanimated",
-  "harmony": {
-    "alias": "react-native-reanimated",
-    "redirectInternalImports": true
-  },
-  "version": "3.18.2",
-  "description": "",
-  "main": "lib/index.js",
-  "scripts": {
-    "build": "tsc",
-    "pack:prod": "npm pack",
-    "prepack": "npm run build",
-    "prepublishOnly": "npm run prepack && react-native verify-package-harmony --package-path . --skip-checks oh_package_name_is_derived_from_npm_package_name",
-    "update_version": "node ./scripts/update-version.js",
-    "deploy": "node ./scripts/deploy.js"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*",
-    "react-native-harmony": "*",
-    "react-native-reanimated": "3.18.0"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/node": "^20.11.4",
-    "react-native-reanimated": "3.18.0"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.8",
-    "@babel/preset-typescript": "^7.23.3",
-    "@babel/runtime": "^7.23.8",
-    "@types/invariant": "^2.2.35",
-    "@types/react": "^18.2.15",
-    "metro-react-native-babel-preset": "^0.77.0",
-    "react": "18.3.1",
-    "react-native": "0.77.1",
-    "react-native-builder-bob": "^0.21.3",
-    "typescript": "^5.1.6"
-  },
-  "files": [
-    "lib",
-    "harmony",
-    "src",
-    "./harmony.tar.gz"
-  ]
-}
+{
+  "name": "@react-native-ohos/react-native-reanimated",
+  "harmony": {
+    "alias": "react-native-reanimated",
+    "redirectInternalImports": true
+  },
+  "version": "3.18.3",
+  "description": "",
+  "main": "lib/index.js",
+  "scripts": {
+    "build": "tsc",
+    "pack":"npm pack",
+    "pack:prod": "npm pack",
+    "prepack": "npm run build",
+    "prepublishOnly": "npm run prepack && react-native verify-package-harmony --package-path . --skip-checks oh_package_name_is_derived_from_npm_package_name",
+    "update_version": "node ./scripts/update-version.js",
+    "deploy": "node ./scripts/deploy.js"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-native": "*",
+    "react-native-harmony": "*",
+    "react-native-reanimated": "3.18.0"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@types/node": "^20.11.4",
+    "react-native-reanimated": "3.18.0"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.23.4",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
+    "@babel/preset-typescript": "^7.23.3",
+    "@babel/runtime": "^7.23.8",
+    "@types/invariant": "^2.2.35",
+    "@types/react": "^18.2.15",
+    "metro-react-native-babel-preset": "^0.77.0",
+    "react": "18.3.1",
+    "react-native": "0.77.1",
+    "react-native-builder-bob": "^0.21.3",
+    "typescript": "^5.1.6"
+  },
+  "files": [
+    "lib",
+    "harmony",
+    "src",
+    "./harmony.tar.gz"
+  ]
+}