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

package/README.md

@@ -2,9 +2,9 @@
 This project is based on [react-native-reanimated@v3.18.0](https://github.com/software-mansion/react-native-reanimated/tree/3.18.0)
 
 ## Documentation
-[中文](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-reanimated.md)
+[中文](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/zh-cn/react-native-reanimated.md)
 
-[English](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-reanimated.md)
+[English](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/en/react-native-reanimated.md)
 
 ## License
 This library is licensed under [The MIT License (MIT)](https://github.com/react-native-oh-library/react-native-harmony-reanimated/blob/sig/LICENSE).

package/harmony/reanimated/BuildProfile.ets

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

package/harmony/reanimated/oh-package.json5

@@ -1,6 +1,6 @@
 {
   name: '@react-native-ohos/react-native-reanimated',
-  version: '3.18.1',
+  version: '3.18.2',
   description: "",
   type: 'module',
   main: 'index.ets',

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/Fabric/ReanimatedMountHook.cpp

@@ -1,5 +1,6 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
+#include <glog/logging.h>
 #include <reanimated/Fabric/ReanimatedCommitShadowNode.h>
 #include <reanimated/Fabric/ReanimatedMountHook.h>
 
@@ -44,35 +45,38 @@ void ReanimatedMountHook::shadowTreeDidMount(
     }
   }
 
-  const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();
-  shadowTreeRegistry.visit(
-      rootShadowNode->getSurfaceId(), [&](ShadowTree const &shadowTree) {
+  try {
+    const auto &shadowTreeRegistry = uiManager_->getShadowTreeRegistry();
+    shadowTreeRegistry.visit(
+        rootShadowNode->getSurfaceId(), [=](ShadowTree const &shadowTree) {
         shadowTree.commit(
-            [&](RootShadowNode const &oldRootShadowNode)
+            [=](RootShadowNode const &oldRootShadowNode)
                 -> RootShadowNode::Unshared {
               PropsMap propsMap;
 
               RootShadowNode::Unshared rootNode =
                   std::static_pointer_cast<RootShadowNode>(
                       oldRootShadowNode.ShadowNode::clone({}));
-              {
+
+              if (rootNode) {
                 auto lock = propsRegistry_->createLock();
 
-                propsRegistry_->for_each([&](const ShadowNodeFamily &family,
-                                             const folly::dynamic &props) {
-                  propsMap[&family].emplace_back(props);
-                });
+                if (!propsRegistry_->isEmpty()) {
+                  propsRegistry_->for_each([&](const ShadowNodeFamily &family,
+                                               const folly::dynamic &props) {
+                    propsMap[&family].emplace_back(props);
+                  });
 
-                rootNode =
-                    cloneShadowTreeWithNewProps(oldRootShadowNode, propsMap);
+                  rootNode = cloneShadowTreeWithNewProps(oldRootShadowNode, propsMap);
+                }
               }
 
-              // Mark the commit as Reanimated commit so that we can
-              // distinguish it in ReanimatedCommitHook.
-              auto reaShadowNode =
-                  std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
-                      rootNode);
-              reaShadowNode->setReanimatedCommitTrait();
+              if (rootNode) {
+                auto reaShadowNode =
+                    std::reinterpret_pointer_cast<ReanimatedCommitShadowNode>(
+                        rootNode);
+                reaShadowNode->setReanimatedCommitTrait();
+              }
 
               return rootNode;
             },
@@ -80,6 +84,11 @@ void ReanimatedMountHook::shadowTreeDidMount(
              false,
              /* .mountSynchronously = */ true});
       });
+  } catch (const std::exception &e) {
+    LOG(ERROR) << "ReanimatedMountHook::shadowTreeDidMount error: " << e.what();
+  } catch (...) {
+    LOG(ERROR) << "ReanimatedMountHook::shadowTreeDidMount unknown error";
+  }
 }
 
 } // namespace reanimated

package/harmony/reanimated/src/main/cpp/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.h

@@ -64,6 +64,8 @@ class ReanimatedModuleProxy
 
   ~ReanimatedModuleProxy();
 
+  void invalidate();
+
   jsi::Value registerEventHandler(
       jsi::Runtime &rt,
       const jsi::Value &worklet,

package/harmony/reanimated/src/main/cpp/Common/cpp/worklets/WorkletRuntime/WorkletRuntime.cpp

@@ -1,4 +1,5 @@
 #include <worklets/Tools/JSISerializer.h>
+#include <worklets/Tools/PlatformLogger.h>
 #include <worklets/WorkletRuntime/ReanimatedRuntime.h>
 #include <worklets/WorkletRuntime/WorkletRuntime.h>
 #include <worklets/WorkletRuntime/WorkletRuntimeCollector.h>
@@ -84,20 +85,37 @@ WorkletRuntime::WorkletRuntime(
 jsi::Value WorkletRuntime::executeSync(
     jsi::Runtime &rt,
     const jsi::Value &worklet) const {
+  if (worklet.isNull() || worklet.isUndefined()) {
+    PlatformLogger::log('worklet isNull or isUndefined');
+    return jsi::Value::undefined();
+  }
+
   assert(
       supportsLocking_ &&
       ("[Reanimated] Runtime \"" + name_ + "\" doesn't support locking.")
           .c_str());
+
   auto shareableWorklet = extractShareableOrThrow<ShareableWorklet>(
       rt,
       worklet,
       "[Reanimated] Only worklets can be executed synchronously on UI runtime.");
+
+  if (!shareableWorklet) {
+    PlatformLogger::log('shareableWorklet is undefined');
+    return jsi::Value::undefined();
+  }
+
   auto lock = std::unique_lock<std::recursive_mutex>(*runtimeMutex_);
   jsi::Runtime &uiRuntime = getJSIRuntime();
   auto result = runGuarded(shareableWorklet);
   auto shareableResult = extractShareableOrThrow(uiRuntime, result);
   lock.unlock();
-  return shareableResult->toJSValue(rt);
+
+  if (shareableResult && !shareableResult->toJSValue(rt).isNull()) {
+    return shareableResult->toJSValue(rt);
+  }
+  PlatformLogger::log('shareableResult is undefined');
+  return jsi::Value::undefined();
 }
 
 jsi::Value WorkletRuntime::get(

package/harmony/reanimated/src/main/cpp/Common/cpp/worklets/WorkletRuntime/WorkletRuntimeDecorator.cpp

@@ -137,8 +137,15 @@ void WorkletRuntimeDecorator::decorate(
           jsi::Runtime &rt,
           const jsi::Value &hostFunValue,
           const jsi::Value &argsValue) {
+        if (hostFunValue.isUndefined() || !hostFunValue.isObject()) {
+            return;
+        }
+        auto hostFunObject = hostFunValue.asObject(rt);
+        if (!hostFunObject.isFunction(rt) || !hostFunObject.asFunction(rt).isHostFunction(rt)) {
+            return;
+        }
         auto hostFun =
-            hostFunValue.asObject(rt).asFunction(rt).getHostFunction(rt);
+            hostFunObject.asFunction(rt).getHostFunction(rt);
 
         auto shareableArgs = argsValue.isUndefined()
             ? nullptr

package/harmony/reanimated/src/main/cpp/ReanimatedModule.cpp

@@ -50,6 +50,9 @@ ReanimatedModule::~ReanimatedModule()
     if (keyboardEventDataUpdater_) {
         keyboardEventDataUpdater_ = nullptr;
     }
+    if (auto nativeReanimatedModule = weakNativeReanimatedModule_.lock()) {
+        nativeReanimatedModule->invalidate();
+    }
 }
 
 void ReanimatedModule::installTurboModule(facebook::jsi::Runtime &rt)

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

@@ -228,6 +228,10 @@ 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();

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

@@ -38,4 +38,11 @@ export class ReanimatedModule extends UITurboModule {
     windowInstance.off('keyboardHeightChange', (v) => {
     })
   }
+
+  public setGestureHandlerState(handlerTag: Tag, newState: number) {
+    const module = this.ctx.rnInstance.getTurboModule("RNGestureHandlerModule") as any;
+    if (module && module.setGestureHandlerState) {
+      module.setGestureHandlerState(handlerTag, newState);
+    }
+  }
 }

package/package.json

@@ -4,7 +4,7 @@
     "alias": "react-native-reanimated",
     "redirectInternalImports": true
   },
-  "version": "3.18.1",
+  "version": "3.18.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/harmony/reanimated/oh-package-lock.json5

@@ -1,31 +0,0 @@
-{
-  "meta": {
-    "stableOrder": true,
-    "enableUnifiedLockfile": false
-  },
-  "lockfileVersion": 3,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/materialprogressbar@2.1.3-rc.0": "@ohos/materialprogressbar@2.1.3-rc.0",
-    "@ppd/ffrt@1.1.5": "@ppd/ffrt@1.1.5",
-    "@rnoh/react-native-openharmony@../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har": "@rnoh/react-native-openharmony@../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har"
-  },
-  "packages": {
-    "@ppd/ffrt@1.1.5": {
-      "name": "@ppd/ffrt",
-      "version": "1.1.5",
-      "integrity": "sha512-MbXdRqeNHQQv4ALTGdosvOCQI+xH8nt0+E2/aFLS4UuGJ5541MAeenRCDOrgIG05k7SnSJ4WngsCfjj3FbTCQg==",
-      "resolved": "https://ohpm.openharmony.cn/ohpm/@ppd/ffrt/-/ffrt-1.1.5.har",
-      "registryType": "ohpm"
-    },
-    "@rnoh/react-native-openharmony@../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har": {
-      "name": "@rnoh/react-native-openharmony",
-      "version": "0.77.56",
-      "resolved": "../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har",
-      "registryType": "local",
-      "dependencies": {
-        "@ppd/ffrt": "1.1.5"
-      }
-    }
-  }
-}