From 0162804a8ace2a8f6b77764894d8e4d87f94781a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20=C5=BBelawski?= <40713406+tjzel@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:48:41 +0100 Subject: [PATCH] refactor: rename cpp NativeWorkletsModule to WorkletsModuleProxy (#6767) ## Summary Analogous to: - #6766 `NativeWorkletsModule` is the name of the ObjC/Java modules generated from `WorkletsModule`. It's confusing that we name some Cpp object the same way. With this change Cpp `NativeWorkletsModule` becomes `WorkletsModuleProxy`, the same name we use to refer to it from JavaScript. ## Test plan CI --- .../NativeModules/ReanimatedModuleProxy.cpp | 10 +++++----- .../NativeModules/ReanimatedModuleProxy.h | 12 ++++++------ ...kletsModule.cpp => WorkletsModuleProxy.cpp} | 10 +++++----- ...eWorkletsModule.h => WorkletsModuleProxy.h} | 10 +++++----- ...uleSpec.cpp => WorkletsModuleProxySpec.cpp} | 8 ++++---- ...sModuleSpec.h => WorkletsModuleProxySpec.h} | 4 ++-- .../RNRuntimeWorkletDecorator.cpp | 4 ++-- .../WorkletRuntime/RNRuntimeWorkletDecorator.h | 4 ++-- .../cpp/reanimated/android/NativeProxy.cpp | 18 ++++++++---------- .../main/cpp/reanimated/android/NativeProxy.h | 4 ++-- .../cpp/worklets/android/WorkletsModule.cpp | 4 ++-- .../main/cpp/worklets/android/WorkletsModule.h | 8 ++++---- .../reanimated/apple/native/NativeProxy.mm | 8 ++++---- .../apple/worklets/apple/WorkletsModule.h | 4 ++-- .../apple/worklets/apple/WorkletsModule.mm | 12 ++++++------ 15 files changed, 59 insertions(+), 61 deletions(-) rename packages/react-native-reanimated/Common/cpp/worklets/NativeModules/{NativeWorkletsModule.cpp => WorkletsModuleProxy.cpp} (78%) rename packages/react-native-reanimated/Common/cpp/worklets/NativeModules/{NativeWorkletsModule.h => WorkletsModuleProxy.h} (77%) rename packages/react-native-reanimated/Common/cpp/worklets/NativeModules/{NativeWorkletsModuleSpec.cpp => WorkletsModuleProxySpec.cpp} (71%) rename packages/react-native-reanimated/Common/cpp/worklets/NativeModules/{NativeWorkletsModuleSpec.h => WorkletsModuleProxySpec.h} (82%) diff --git a/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp b/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp index 02b4f6a54950..12b4b22fe8bd 100644 --- a/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp +++ b/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.cpp @@ -52,7 +52,7 @@ using namespace facebook; namespace reanimated { ReanimatedModuleProxy::ReanimatedModuleProxy( - const std::shared_ptr &nativeWorkletsModule, + const std::shared_ptr &workletsModuleProxy, jsi::Runtime &rnRuntime, const std::shared_ptr &jsScheduler, const std::shared_ptr &uiScheduler, @@ -63,13 +63,13 @@ ReanimatedModuleProxy::ReanimatedModuleProxy( isBridgeless ? nullptr : jsScheduler->getJSCallInvoker()), isBridgeless_(isBridgeless), isReducedMotion_(isReducedMotion), - nativeWorkletsModule_(nativeWorkletsModule), + workletsModuleProxy_(workletsModuleProxy), jsScheduler_(jsScheduler), uiScheduler_(uiScheduler), - valueUnpackerCode_(nativeWorkletsModule->getValueUnpackerCode()), + valueUnpackerCode_(workletsModuleProxy->getValueUnpackerCode()), uiWorkletRuntime_(std::make_shared( rnRuntime, - nativeWorkletsModule->getJSQueue(), + workletsModuleProxy->getJSQueue(), jsScheduler_, "Reanimated UI runtime", true /* supportsLocking */, @@ -231,7 +231,7 @@ jsi::Value ReanimatedModuleProxy::createWorkletRuntime( const jsi::Value &initializer) { auto workletRuntime = std::make_shared( rt, - nativeWorkletsModule_->getJSQueue(), + workletsModuleProxy_->getJSQueue(), jsScheduler_, name.asString(rt).utf8(rt), false /* supportsLocking */, diff --git a/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.h b/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.h index 518e5bc7411a..f56a5c8c7394 100644 --- a/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.h +++ b/packages/react-native-reanimated/Common/cpp/reanimated/NativeModules/ReanimatedModuleProxy.h @@ -12,7 +12,7 @@ #include #endif // RCT_NEW_ARCH_ENABLED -#include +#include #include #include #include @@ -33,7 +33,7 @@ namespace reanimated { class ReanimatedModuleProxy : public ReanimatedModuleProxySpec { public: ReanimatedModuleProxy( - const std::shared_ptr &nativeWorkletsModule, + const std::shared_ptr &workletsModuleProxy, jsi::Runtime &rnRuntime, const std::shared_ptr &jsScheduler, const std::shared_ptr &uiScheduler, @@ -174,9 +174,9 @@ class ReanimatedModuleProxy : public ReanimatedModuleProxySpec { return isReducedMotion_; } - [[nodiscard]] inline std::shared_ptr - getNativeWorkletsModule() const { - return nativeWorkletsModule_; + [[nodiscard]] inline std::shared_ptr + getWorkletsModuleProxy() const { + return workletsModuleProxy_; } private: @@ -193,7 +193,7 @@ class ReanimatedModuleProxy : public ReanimatedModuleProxySpec { const bool isBridgeless_; const bool isReducedMotion_; - const std::shared_ptr nativeWorkletsModule_; + const std::shared_ptr workletsModuleProxy_; const std::shared_ptr jsScheduler_; const std::shared_ptr uiScheduler_; const std::string valueUnpackerCode_; diff --git a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModule.cpp b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp similarity index 78% rename from packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModule.cpp rename to packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp index 5189d0aa5612..c439dc2e6a81 100644 --- a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModule.cpp +++ b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.cpp @@ -5,7 +5,7 @@ #include #endif // RCT_NEW_ARCH_ENABLED -#include +#include #include #ifdef __ANDROID__ @@ -18,16 +18,16 @@ using namespace facebook; namespace worklets { -NativeWorkletsModule::NativeWorkletsModule( +WorkletsModuleProxy::WorkletsModuleProxy( const std::string &valueUnpackerCode, const std::shared_ptr &jsQueue) - : NativeWorkletsModuleSpec(nullptr), + : WorkletsModuleProxySpec(nullptr), valueUnpackerCode_(valueUnpackerCode), jsQueue_(jsQueue) {} -NativeWorkletsModule::~NativeWorkletsModule() {} +WorkletsModuleProxy::~WorkletsModuleProxy() {} -jsi::Value NativeWorkletsModule::makeShareableClone( +jsi::Value WorkletsModuleProxy::makeShareableClone( jsi::Runtime &rt, const jsi::Value &value, const jsi::Value &shouldRetainRemote, diff --git a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModule.h b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.h similarity index 77% rename from packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModule.h rename to packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.h index 13eb581337c8..e9fedb04e227 100644 --- a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModule.h +++ b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxy.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include #include @@ -9,13 +9,13 @@ namespace worklets { -class NativeWorkletsModule : public NativeWorkletsModuleSpec { +class WorkletsModuleProxy : public WorkletsModuleProxySpec { public: - explicit NativeWorkletsModule( + explicit WorkletsModuleProxy( const std::string &valueUnpackerCode, const std::shared_ptr &jsQueue); - ~NativeWorkletsModule(); + ~WorkletsModuleProxy(); jsi::Value makeShareableClone( jsi::Runtime &rt, @@ -35,7 +35,7 @@ class NativeWorkletsModule : public NativeWorkletsModuleSpec { const std::string valueUnpackerCode_; const std::shared_ptr jsQueue_; #ifndef NDEBUG - SingleInstanceChecker singleInstanceChecker_; + SingleInstanceChecker singleInstanceChecker_; #endif // NDEBUG }; diff --git a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModuleSpec.cpp b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxySpec.cpp similarity index 71% rename from packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModuleSpec.cpp rename to packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxySpec.cpp index 95f05ac80362..624c42ee2249 100644 --- a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModuleSpec.cpp +++ b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxySpec.cpp @@ -1,9 +1,9 @@ -#include +#include #include #define WORKLETS_SPEC_PREFIX(FN_NAME) \ - __hostFunction_NativeWorkletsModuleSpec_##FN_NAME + __hostFunction_WorkletsModuleProxySpec_##FN_NAME namespace worklets { @@ -12,12 +12,12 @@ static jsi::Value WORKLETS_SPEC_PREFIX(makeShareableClone)( TurboModule &turboModule, const jsi::Value *args, size_t) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->makeShareableClone( rt, std::move(args[0]), std::move(args[1]), std::move(args[2])); } -NativeWorkletsModuleSpec::NativeWorkletsModuleSpec( +WorkletsModuleProxySpec::WorkletsModuleProxySpec( const std::shared_ptr jsInvoker) : TurboModule("NativeWorklets", jsInvoker) { methodMap_["makeShareableClone"] = diff --git a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModuleSpec.h b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxySpec.h similarity index 82% rename from packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModuleSpec.h rename to packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxySpec.h index 1c1d622e17c6..c79a86b908fe 100644 --- a/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/NativeWorkletsModuleSpec.h +++ b/packages/react-native-reanimated/Common/cpp/worklets/NativeModules/WorkletsModuleProxySpec.h @@ -9,9 +9,9 @@ using namespace react; namespace worklets { -class JSI_EXPORT NativeWorkletsModuleSpec : public TurboModule { +class JSI_EXPORT WorkletsModuleProxySpec : public TurboModule { protected: - explicit NativeWorkletsModuleSpec( + explicit WorkletsModuleProxySpec( const std::shared_ptr jsInvoker); public: diff --git a/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.cpp b/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.cpp index 375653145340..8575570f72b7 100644 --- a/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.cpp +++ b/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.cpp @@ -4,11 +4,11 @@ namespace worklets { void RNRuntimeWorkletDecorator::decorate( jsi::Runtime &rnRuntime, - const std::shared_ptr &nativeWorkletsModule) { + const std::shared_ptr &workletsModuleProxy) { rnRuntime.global().setProperty( rnRuntime, "__workletsModuleProxy", - jsi::Object::createFromHostObject(rnRuntime, nativeWorkletsModule)); + jsi::Object::createFromHostObject(rnRuntime, workletsModuleProxy)); } } // namespace worklets diff --git a/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.h b/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.h index 9884e71091a3..41cf12b5598d 100644 --- a/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.h +++ b/packages/react-native-reanimated/Common/cpp/worklets/WorkletRuntime/RNRuntimeWorkletDecorator.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include using namespace facebook; @@ -13,7 +13,7 @@ class RNRuntimeWorkletDecorator { public: static void decorate( jsi::Runtime &rnRuntime, - const std::shared_ptr &nativeWorkletsModule); + const std::shared_ptr &workletsModuleProxy); }; } // namespace worklets diff --git a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp index f88eba94b6ea..01e2b1aaefa1 100644 --- a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp +++ b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp @@ -28,7 +28,7 @@ using namespace react; NativeProxy::NativeProxy( jni::alias_ref jThis, - const std::shared_ptr &nativeWorkletsModule, + const std::shared_ptr &workletsModuleProxy, jsi::Runtime *rnRuntime, const std::shared_ptr &jsCallInvoker, const std::shared_ptr &uiScheduler, @@ -42,7 +42,7 @@ NativeProxy::NativeProxy( : javaPart_(jni::make_global(jThis)), rnRuntime_(rnRuntime), reanimatedModuleProxy_(std::make_shared( - nativeWorkletsModule, + workletsModuleProxy, *rnRuntime, std::make_shared(*rnRuntime, jsCallInvoker), uiScheduler, @@ -58,7 +58,7 @@ NativeProxy::NativeProxy( #ifdef RCT_NEW_ARCH_ENABLED NativeProxy::NativeProxy( jni::alias_ref jThis, - const std::shared_ptr &nativeWorkletsModule, + const std::shared_ptr &workletsModuleProxy, jsi::Runtime *rnRuntime, RuntimeExecutor runtimeExecutor, const std::shared_ptr &uiScheduler, @@ -68,7 +68,7 @@ NativeProxy::NativeProxy( : javaPart_(jni::make_global(jThis)), rnRuntime_(rnRuntime), reanimatedModuleProxy_(std::make_shared( - nativeWorkletsModule, + workletsModuleProxy, *rnRuntime, std::make_shared(*rnRuntime, runtimeExecutor), uiScheduler, @@ -123,11 +123,10 @@ jni::local_ref NativeProxy::initHybrid( ) { auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker(); auto uiScheduler = androidUiScheduler->cthis()->getUIScheduler(); - auto nativeWorkletsModule = - jWorkletsModule->cthis()->getNativeWorkletsModule(); + auto workletsModuleProxy = jWorkletsModule->cthis()->getWorkletsModuleProxy(); return makeCxxInstance( jThis, - nativeWorkletsModule, + workletsModuleProxy, (jsi::Runtime *)jsContext, jsCallInvoker, uiScheduler, @@ -151,11 +150,10 @@ jni::local_ref NativeProxy::initHybridBridgeless( fabricUIManager) { auto uiScheduler = androidUiScheduler->cthis()->getUIScheduler(); auto runtimeExecutor = runtimeExecutorHolder->cthis()->get(); - auto nativeWorkletsModule = - jWorkletsModule->cthis()->getNativeWorkletsModule(); + auto workletsModuleProxy = jWorkletsModule->cthis()->getWorkletsModuleProxy(); return makeCxxInstance( jThis, - nativeWorkletsModule, + workletsModuleProxy, (jsi::Runtime *)jsContext, runtimeExecutor, uiScheduler, diff --git a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h index 9f312063b8ba..175570e10e1d 100644 --- a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h +++ b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h @@ -275,7 +275,7 @@ class NativeProxy : public jni::HybridClass { explicit NativeProxy( jni::alias_ref jThis, - const std::shared_ptr &nativeWorkletsModule, + const std::shared_ptr &workletsModuleProxy, jsi::Runtime *rnRuntime, const std::shared_ptr &jsCallInvoker, const std::shared_ptr &uiScheduler, @@ -290,7 +290,7 @@ class NativeProxy : public jni::HybridClass { #ifdef RCT_NEW_ARCH_ENABLED explicit NativeProxy( jni::alias_ref jThis, - const std::shared_ptr &nativeWorkletsModule, + const std::shared_ptr &workletsModuleProxy, jsi::Runtime *rnRuntime, RuntimeExecutor runtimeExecutor, const std::shared_ptr &uiScheduler, diff --git a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp index 833c5a36cbf1..ff2b0401e6f3 100644 --- a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp +++ b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp @@ -24,10 +24,10 @@ WorkletsModule::WorkletsModule( jni::alias_ref messageQueueThread) : javaPart_(jni::make_global(jThis)), rnRuntime_(rnRuntime), - nativeWorkletsModule_(std::make_shared( + workletsModuleProxy_(std::make_shared( valueUnpackerCode, std::make_shared(messageQueueThread))) { - RNRuntimeWorkletDecorator::decorate(*rnRuntime_, nativeWorkletsModule_); + RNRuntimeWorkletDecorator::decorate(*rnRuntime_, workletsModuleProxy_); } jni::local_ref WorkletsModule::initHybrid( diff --git a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h index e367780de3ca..4a7719251643 100644 --- a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h +++ b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -36,15 +36,15 @@ class WorkletsModule : public jni::HybridClass { static void registerNatives(); - inline std::shared_ptr getNativeWorkletsModule() { - return nativeWorkletsModule_; + inline std::shared_ptr getWorkletsModuleProxy() { + return workletsModuleProxy_; } private: friend HybridBase; jni::global_ref javaPart_; jsi::Runtime *rnRuntime_; - std::shared_ptr nativeWorkletsModule_; + std::shared_ptr workletsModuleProxy_; explicit WorkletsModule( jni::alias_ref jThis, diff --git a/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm b/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm index 1ed3429b2c92..81ad96fd0a0d 100644 --- a/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm +++ b/packages/react-native-reanimated/apple/reanimated/apple/native/NativeProxy.mm @@ -72,10 +72,10 @@ static inline bool getIsReducedMotion() std::shared_ptr jsScheduler = std::make_shared(rnRuntime, jsInvoker); constexpr auto isBridgeless = false; - const auto nativeWorkletsModule = [workletsModule getNativeWorkletsModule]; + const auto workletsModuleProxy = [workletsModule getWorkletsModuleProxy]; auto reanimatedModuleProxy = std::make_shared( - nativeWorkletsModule, + workletsModuleProxy, rnRuntime, jsScheduler, uiScheduler, @@ -109,13 +109,13 @@ static inline bool getIsReducedMotion() PlatformDepMethodsHolder platformDepMethodsHolder = makePlatformDepMethodsHolderBridgeless(moduleRegistry, nodesManager, reaModule); - const auto nativeWorkletsModule = [workletsModule getNativeWorkletsModule]; + const auto workletsModuleProxy = [workletsModule getWorkletsModuleProxy]; auto uiScheduler = std::make_shared(); auto jsScheduler = std::make_shared(runtime, runtimeExecutor); constexpr auto isBridgeless = true; auto reanimatedModuleProxy = std::make_shared( - nativeWorkletsModule, + workletsModuleProxy, runtime, jsScheduler, uiScheduler, diff --git a/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.h b/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.h index 25b96da8b9b7..5a3b01a10dd9 100644 --- a/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.h +++ b/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.h @@ -1,9 +1,9 @@ #import #import -#import +#import @interface WorkletsModule : RCTEventEmitter -- (std::shared_ptr)getNativeWorkletsModule; +- (std::shared_ptr)getWorkletsModuleProxy; @end diff --git a/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm b/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm index 77f502ed825a..64cb9069439e 100644 --- a/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm +++ b/packages/react-native-reanimated/apple/worklets/apple/WorkletsModule.mm @@ -4,8 +4,8 @@ #import #import -using worklets::NativeWorkletsModule; using worklets::RNRuntimeWorkletDecorator; +using worklets::WorkletsModuleProxy; @interface RCTBridge (JSIRuntime) - (void *)runtime; @@ -17,15 +17,15 @@ - (void)_tryAndHandleError:(dispatch_block_t)block; @end @implementation WorkletsModule { - std::shared_ptr nativeWorkletsModule_; + std::shared_ptr workletsModuleProxy_; #ifndef NDEBUG worklets::SingleInstanceChecker singleInstanceChecker_; #endif // NDEBUG } -- (std::shared_ptr)getNativeWorkletsModule +- (std::shared_ptr)getWorkletsModuleProxy { - return nativeWorkletsModule_; + return workletsModuleProxy_; } @synthesize moduleRegistry = _moduleRegistry; @@ -39,8 +39,8 @@ @implementation WorkletsModule { auto jsQueue = std::make_shared([NSRunLoop currentRunLoop], ^(NSError *error) { throw error; }); - nativeWorkletsModule_ = std::make_shared(std::string([valueUnpackerCode UTF8String]), jsQueue); - RNRuntimeWorkletDecorator::decorate(rnRuntime, nativeWorkletsModule_); + workletsModuleProxy_ = std::make_shared(std::string([valueUnpackerCode UTF8String]), jsQueue); + RNRuntimeWorkletDecorator::decorate(rnRuntime, workletsModuleProxy_); return @YES; }