@react-native-ohos/react-native-reanimated 3.18.1-rc.2 → 3.18.1-rc.4

package/harmony/reanimated/oh-package.json5

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

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

@@ -28,6 +28,9 @@ jsi::Value installTurboModule(facebook::jsi::Runtime &rt, react::TurboModule &tu
     const facebook::jsi::Value *args, size_t count)
 {
     auto self = static_cast<ReanimatedModule *>(&turboModule);
+    if (self == nullptr) {
+        return facebook::jsi::Value::undefined();
+    }
     self->installTurboModule(rt);
     return facebook::jsi::Value(true);
 }
@@ -162,7 +165,25 @@ void ReanimatedModule::installTurboModule(facebook::jsi::Runtime &rt)
         }
         return instance->getTurboModule<WorkletsModule>("WorkletsModule");
     };
-    auto nativeReanimatedModule = std::make_shared<ReanimatedModuleProxy>(workletsModule()->getWorkletsModuleProxy(),
+    auto workletsModulePtr = workletsModule();
+    if (!workletsModulePtr) {
+        LOG(ERROR) << "ReanimatedModule: Failed to get WorkletsModule";
+        return;
+    }
+    auto workletsModuleProxy = workletsModulePtr->getWorkletsModuleProxy();
+    if (!workletsModuleProxy) {
+        LOG(ERROR) << "ReanimatedModule: WorkletsModuleProxy is null, WorkletsModule may not be initialized yet";
+        return;
+    }
+    if (!jsInvoker_) {
+        LOG(ERROR) << "ReanimatedModule: jsInvoker_ is null";
+        return;
+    }
+    if (!m_ctx.scheduler) {
+        LOG(ERROR) << "ReanimatedModule: m_ctx.scheduler is null";
+        return;
+    }
+    auto nativeReanimatedModule = std::make_shared<ReanimatedModuleProxy>(workletsModuleProxy,
         rt, jsInvoker_, platformDepMethodsHolder, isBridgeless, isReducedMotion);
     weakNativeReanimatedModule_ = nativeReanimatedModule;
     nativeReanimatedModule->init(platformDepMethodsHolder);
@@ -203,11 +224,24 @@ void ReanimatedModule::installTurboModule(facebook::jsi::Runtime &rt)
             }
             return nativeReanimatedModule->handleRawEvent(rawEvent, frameTime);
         });
-    m_ctx.scheduler->addEventListener(eventListener);
+    if (m_ctx.scheduler) {
+        m_ctx.scheduler->addEventListener(eventListener);
+    } else {
+        LOG(ERROR) << "ReanimatedModule: Cannot add event listener, scheduler is null";
+    }
 }
+
 void ReanimatedModule::injectDependencies(facebook::jsi::Runtime & /* rt */)
 {
+    if (!m_ctx.scheduler) {
+        LOG(ERROR) << "ReanimatedModule::injectDependencies: scheduler is null";
+        return;
+    }
     const auto uiManager = m_ctx.scheduler->getUIManager();
+    if (!uiManager) {
+        LOG(WARNING) << "ReanimatedModule::injectDependencies: uiManager is null";
+        return;
+    }
     if (auto nativeReanimatedModule = weakNativeReanimatedModule_.lock()) {
         nativeReanimatedModule->initializeFabric(uiManager);
     }

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

@@ -24,6 +24,9 @@ jsi::Value installTurboModule(facebook::jsi::Runtime &rt, react::TurboModule &tu
     }
 
     std::string valueUnpackerCode = args[0].getString(rt).utf8(rt);
+    if (self == nullptr) { 
+        return facebook::jsi::Value::undefined();
+    }
     self->installTurboModule(rt, valueUnpackerCode);
     return facebook::jsi::Value(true);
 }

package/package.json

@@ -4,14 +4,15 @@
     "alias": "react-native-reanimated",
     "redirectInternalImports": true
   },
-  "version": "3.18.1-rc.2",
+  "react-native-harmony": { "oh-package-name": "react_native_ohos_reanimated" },
+  "version": "3.18.1-rc.4",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
     "build": "tsc",
     "pack:prod": "npm pack",
     "prepack": "npm run build",
-    "prepublishOnly": "npm run prepack ",
+    "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"
   },