@react-native-ohos/react-native-reanimated 3.18.3 → 3.18.4-beta.2

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.3';
+export const HAR_VERSION = '3.18.4-beta.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.3',
+  version: '3.18.4-beta.2',
   description: "",
   type: 'module',
   main: 'index.ets',

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

@@ -600,6 +600,7 @@ void ReanimatedModuleProxy::cleanupSensors() {
 void ReanimatedModuleProxy::markNodeAsRemovable(
     jsi::Runtime &rt,
     const jsi::Value &shadowNodeWrapper) {
+  auto lock = propsRegistry_->createLock();    
   auto shadowNode = shadowNodeFromValue(rt, shadowNodeWrapper);
   propsRegistry_->markNodeAsRemovable(shadowNode);
 }
@@ -607,6 +608,7 @@ void ReanimatedModuleProxy::markNodeAsRemovable(
 void ReanimatedModuleProxy::unmarkNodeAsRemovable(
     jsi::Runtime &rt,
     const jsi::Value &viewTag) {
+  auto lock = propsRegistry_->createLock();    
   propsRegistry_->unmarkNodeAsRemovable(viewTag.asNumber());
 }
 

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

@@ -44,13 +44,18 @@ ReanimatedModule::ReanimatedModule(const ArkTSTurboModule::Context ctx, const st
 
 ReanimatedModule::~ReanimatedModule()
 {
-    LOG(INFO) << "ReanimatedModule::~ReanimatedModule";
+    const bool isOnMain = m_ctx.taskExecutor &&
+        m_ctx.taskExecutor->isOnTaskThread(TaskThread::MAIN);
+    LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=module_dtor_begin"
+                 << " on_main=" << isOnMain
+                 << " proxy_alive=" << static_cast<bool>(weakNativeReanimatedModule_.lock());
     if (eventListener) {
         m_ctx.scheduler->removeEventListener(eventListener);
     }
     if (keyboardEventDataUpdater_) {
         keyboardEventDataUpdater_ = nullptr;
     }
+    LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=module_dtor_complete";
 }
 
 void ReanimatedModule::installTurboModule(facebook::jsi::Runtime &rt)
@@ -199,6 +204,7 @@ void ReanimatedModule::installTurboModule(facebook::jsi::Runtime &rt)
     auto nativeReanimatedModule = std::make_shared<ReanimatedModuleProxy>(workletsModuleProxy,
         rt, jsInvoker_, platformDepMethodsHolder, isBridgeless, isReducedMotion);
     weakNativeReanimatedModule_ = nativeReanimatedModule;
+    LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=proxy_installed";
     nativeReanimatedModule->init(platformDepMethodsHolder);
     ReanimatedPerformOperations reanimatedPerformOperations = [weakNativeReanimatedModule =
                                                                    weakNativeReanimatedModule_]() {

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

@@ -27,6 +27,7 @@
 #endif // RCT_NEW_ARCH_ENABLED
 
 #include <functional>
+#include <glog/logging.h>
 #include <utility>
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -228,6 +229,14 @@ void ReanimatedModuleProxy::init(
 }
 
 ReanimatedModuleProxy::~ReanimatedModuleProxy() {
+  LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=proxy_dtor"
+               << " frame_callbacks=" << frameCallbacks_.size()
+#ifdef RCT_NEW_ARCH_ENABLED
+               << " pending_operations=" << operationsInBatch_.size()
+               << " props_registry=" << static_cast<bool>(propsRegistry_)
+               << " layout_proxy=" << static_cast<bool>(layoutAnimationsProxy_)
+#endif
+      ;
   // 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();
@@ -286,9 +295,12 @@ ReanimatedModuleProxy::~ReanimatedModuleProxy() {
   // UIManager（及 ComponentDescriptorRegistry）仍存活
   commitHook_.reset();
   mountHook_.reset();
+  LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=fabric_hooks_removed";
   uiManager_.reset();
 #endif // RCT_NEW_ARCH_ENABLED
+  LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=ui_runtime_reset_begin";
   uiWorkletRuntime_.reset();
+  LOG(WARNING) << "[RNOH_REA_TEARDOWN_V1] stage=proxy_dtor_complete";
 }
 
 void ReanimatedModuleProxy::scheduleOnUI(
@@ -653,6 +665,7 @@ void ReanimatedModuleProxy::cleanupSensors() {
 void ReanimatedModuleProxy::markNodeAsRemovable(
     jsi::Runtime &rt,
     const jsi::Value &shadowNodeWrapper) {
+  auto lock = propsRegistry_->createLock();    
   auto shadowNode = shadowNodeFromValue(rt, shadowNodeWrapper);
   propsRegistry_->markNodeAsRemovable(shadowNode);
 }
@@ -660,6 +673,7 @@ void ReanimatedModuleProxy::markNodeAsRemovable(
 void ReanimatedModuleProxy::unmarkNodeAsRemovable(
     jsi::Runtime &rt,
     const jsi::Value &viewTag) {
+  auto lock = propsRegistry_->createLock();    
   propsRegistry_->unmarkNodeAsRemovable(viewTag.asNumber());
 }
 

package/package.json

@@ -4,8 +4,8 @@
     "alias": "react-native-reanimated",
     "redirectInternalImports": true
   },
-  "version": "3.18.3",
-  "description": "",
+  "version": "3.18.4-beta.2",
+  "description": "More powerful alternative to Animated library for React Native.",
   "main": "lib/index.js",
   "scripts": {
     "build": "tsc",
@@ -46,6 +46,20 @@
     "lib",
     "harmony",
     "src",
-    "./harmony.tar.gz"
-  ]
+    "./harmony.tar.gz",
+    "CHANGELOG.md",
+    "!build"
+  ],
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "homepage": "https://gitcode.com/CPF-RN/rntpc_react-native-reanimated",
+  "bugs": {
+    "url": "https://gitcode.com/CPF-RN/rntpc_react-native-reanimated/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitcode.com/CPF-RN/rntpc_react-native-reanimated.git"
+  }
 }