react-native-unistyles 2.32.0 → 2.41.0

package/android/src/main/cxx/cpp-adapter.cpp

@@ -27,7 +27,13 @@ Java_com_unistyles_UnistylesModule_nativeInstall(JNIEnv *env, jobject thiz, jlon
         return throwKotlinException(env, "Something went wrong while initializing UnistylesModule");
     }
 
-    unistylesRuntime = std::make_shared<UnistylesRuntime>(*runtime, callInvoker);
+    auto runOnJSThread = [callInvoker](std::function<void(jsi::Runtime&)>&& callback) {
+        callInvoker->invokeAsync([callback = std::move(callback)](jsi::Runtime &rt) {
+            callback(rt);
+        });
+    };
+
+    unistylesRuntime = std::make_shared<UnistylesRuntime>(runOnJSThread);
     makeShared(env, unistylesModule, unistylesRuntime);
 
     jsi::Object hostObject = jsi::Object::createFromHostObject(*runtime, unistylesRuntime);

package/cxx/UnistylesModel.cpp

@@ -110,29 +110,27 @@ std::vector<std::pair<std::string, double>> UnistylesModel::toSortedBreakpointPa
 // ref: https://github.com/facebook/react-native/pull/43375
 // ref: https://github.com/facebook/react-native/blob/b5fd041917d197f256433a41a126f0dff767c429/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp#L42
 void UnistylesModel::emitDeviceEvent(const std::string eventType, EventPayload payload) {
-    this->callInvoker->invokeAsync([eventType, payload, this](){
-        jsi::Value emitter = this->runtime.global().getProperty(this->runtime, "__rctDeviceEventEmitter");
+    this->runOnJSThread([this, &eventType, payload = std::move(payload)](jsi::Runtime& rt){
+        jsi::Value emitter = rt.global().getProperty(rt, "__rctDeviceEventEmitter");
 
         if (emitter.isUndefined()) {
             return;
         }
 
-        jsi::Object emitterObject = emitter.asObject(runtime);
-        jsi::Function emitFunction = emitterObject.getPropertyAsFunction(runtime, "emit");
+        jsi::Object emitterObject = emitter.asObject(rt);
+        jsi::Function emitFunction = emitterObject.getPropertyAsFunction(rt, "emit");
 
         std::vector<jsi::Value> arguments;
-        jsi::Object event = jsi::Object(this->runtime);
+        jsi::Object event = jsi::Object(rt);
+        jsi::Object eventPayload = this->parseEventPayload(rt, payload);
 
-        event.setProperty(this->runtime, "type", jsi::String::createFromUtf8(this->runtime, eventType));
+        event.setProperty(rt, "type", jsi::String::createFromUtf8(rt, std::move(eventType)));
+        event.setProperty(rt, "payload", std::move(eventPayload));
 
-        jsi::Object eventPayload = this->parseEventPayload(payload);
-
-        event.setProperty(this->runtime, "payload", eventPayload);
-
-        arguments.emplace_back(jsi::String::createFromAscii(runtime, "__unistylesOnChange"));
+        arguments.emplace_back(jsi::String::createFromAscii(rt, "__unistylesOnChange"));
         arguments.emplace_back(std::move(event));
 
-        emitFunction.callWithThis(runtime, emitterObject, (const jsi::Value*)arguments.data(), arguments.size());
+        emitFunction.callWithThis(rt, emitterObject, (const jsi::Value*)arguments.data(), arguments.size());
     });
 }
 
@@ -193,36 +191,42 @@ void UnistylesModel::onLayoutChange() {
     this->emitDeviceEvent("layout", payload);
 }
 
-jsi::Object UnistylesModel::parseEventPayload(EventPayload payload) {
-    jsi::Object eventPayload = jsi::Object(this->runtime);
+jsi::Object UnistylesModel::parseEventPayload(jsi::Runtime& rt, const EventPayload& payload) {
+    jsi::Object eventPayload = jsi::Object(rt);
 
     for (const auto& [key, value] : payload) {
         if (std::holds_alternative<std::string>(value)) {
-            eventPayload.setProperty(this->runtime, key.c_str(), jsi::String::createFromUtf8(this->runtime, std::get<std::string>(value)));
+            eventPayload.setProperty(rt, key.c_str(), jsi::String::createFromUtf8(rt, std::get<std::string>(value)));
+            
+            continue;
         }
 
         if (std::holds_alternative<int>(value)) {
-            eventPayload.setProperty(this->runtime, key.c_str(), std::get<int>(value));
+            eventPayload.setProperty(rt, key.c_str(), std::get<int>(value));
+            
+            continue;
         }
 
         if (std::holds_alternative<EventNestedValue>(value)) {
-            eventPayload.setProperty(this->runtime, key.c_str(), this->parseEventNestedPayload(std::get<EventNestedValue>(value)));
+            eventPayload.setProperty(rt, key.c_str(), this->parseEventNestedPayload(rt, std::get<EventNestedValue>(value)));
+            
+            continue;
         }
     }
 
     return eventPayload;
 }
 
-jsi::Object UnistylesModel::parseEventNestedPayload(EventNestedValue payload) {
-    jsi::Object eventPayload = jsi::Object(this->runtime);
+jsi::Object UnistylesModel::parseEventNestedPayload(jsi::Runtime& rt, const EventNestedValue& payload) {
+    jsi::Object eventPayload = jsi::Object(rt);
 
     for (const auto& [key, value] : payload) {
         if (std::holds_alternative<std::string>(value)) {
-            eventPayload.setProperty(this->runtime, key.c_str(), jsi::String::createFromUtf8(this->runtime, std::get<std::string>(value)));
+            eventPayload.setProperty(rt, key.c_str(), jsi::String::createFromUtf8(rt, std::get<std::string>(value)));
         }
 
         if (std::holds_alternative<int>(value)) {
-            eventPayload.setProperty(this->runtime, key.c_str(), std::get<int>(value));
+            eventPayload.setProperty(rt, key.c_str(), std::get<int>(value));
         }
     }
 

package/cxx/UnistylesModel.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <jsi/jsi.h>
-#include <ReactCommon/CallInvoker.h>
 #include <vector>
 #include <map>
 #include <optional>
@@ -51,8 +50,8 @@ struct UnistylesModel {
     void onThemeChange(std::string themeName);
     void onPluginChange();
     void onLayoutChange();
-    jsi::Object parseEventPayload(EventPayload payload);
-    jsi::Object parseEventNestedPayload(EventNestedValue payload);
+    jsi::Object parseEventPayload(jsi::Runtime& rt, const EventPayload& payload);
+    jsi::Object parseEventNestedPayload(jsi::Runtime& rt, const EventNestedValue& payload);
 
     std::function<Screen()> getScreenDimensions;
     std::function<std::string()> getContentSizeCategory;
@@ -118,7 +117,7 @@ struct UnistylesModel {
     std::string colorScheme = UnistylesUnspecifiedScheme;
     std::string contentSizeCategory = UnistylesUnspecifiedScheme;
 
-    UnistylesModel(jsi::Runtime& rt, std::shared_ptr<react::CallInvoker> callInvoker): runtime(rt), callInvoker(callInvoker) {}
+    UnistylesModel(std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread): runOnJSThread(std::move(runOnJSThread)) {}
 
     bool hasAdaptiveThemes;
     bool supportsAutomaticColorScheme;
@@ -138,6 +137,5 @@ struct UnistylesModel {
     std::vector<std::pair<std::string, double>> toSortedBreakpointPairs(jsi::Runtime&, jsi::Object&);
 
 private:
-    jsi::Runtime& runtime;
-    std::shared_ptr<react::CallInvoker> callInvoker;
+    std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread;
 };

package/cxx/UnistylesRuntime.h

@@ -2,7 +2,6 @@
 
 #include "UnistylesModel.h"
 #include "Macros.h"
-#include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
 
 using namespace facebook;
@@ -11,7 +10,7 @@ using Getter = std::function<jsi::Value(jsi::Runtime& rt, std::string)>;
 using Setter = std::function<std::optional<jsi::Value>(jsi::Runtime& rt, const jsi::Value&)>;
 
 struct JSI_EXPORT UnistylesRuntime : public jsi::HostObject, UnistylesModel {
-    UnistylesRuntime(jsi::Runtime& rt, std::shared_ptr<react::CallInvoker> callInvoker) : UnistylesModel(rt, callInvoker) {
+    UnistylesRuntime(std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread) : UnistylesModel(runOnJSThread) {
         this->getters = {
             {"screenWidth", BIND_FN(getScreenWidth)},
             {"screenHeight", BIND_FN(getScreenHeight)},

package/ios/UnistylesModule.h

@@ -1,5 +1,6 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
+#include <ReactCommon/CallInvoker.h>
 
 #import <string>
 

package/ios/UnistylesModule.mm

@@ -1,6 +1,5 @@
 #import "UnistylesModule.h"
 #import "UnistylesRuntime.h"
-
 #import <React/RCTBridge+Private.h>
 #import <jsi/jsi.h>
 
@@ -16,10 +15,14 @@ RCT_EXPORT_MODULE(Unistyles)
     if ((self = [super init])) {
         self.platform = [[Platform alloc] init];
     }
-
+    
     return self;
 }
 
+- (void)dealloc {
+    [self.platform clean];
+}
+
 + (BOOL)requiresMainQueueSetup {
     return YES;
 }
@@ -62,8 +65,12 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(install) {
 
 void registerUnistylesHostObject(RCTBridge* bridge, UnistylesModule* weakSelf) {
     std::shared_ptr<react::CallInvoker> callInvoker = bridge.jsCallInvoker;
+    auto runOnJSThread = [callInvoker](std::function<void(jsi::Runtime& rt)> &&callback){
+        callInvoker->invokeAsync(std::move(callback));
+    };
+    
     jsi::Runtime* runtime = reinterpret_cast<jsi::Runtime*>(bridge.runtime);
-    auto unistylesRuntime = std::make_shared<UnistylesRuntime>(*runtime, callInvoker);
+    auto unistylesRuntime = std::make_shared<UnistylesRuntime>(runOnJSThread);
 
     [weakSelf.platform makeShared:unistylesRuntime.get()];
 

package/ios/platform/Platform_iOS.h

@@ -9,6 +9,7 @@
 
 - (instancetype)init;
 
+- (void)clean;
 - (void)setupListeners;
 - (void)makeShared:(void*)runtime;
 - (void)onWindowChange:(NSNotification *)notification;

package/ios/platform/Platform_iOS.mm

@@ -14,6 +14,10 @@
 }
 
 - (void)dealloc {
+    [self clean];
+}
+
+- (void)clean {
     if (self.unistylesRuntime != nullptr) {
         self.unistylesRuntime = nullptr;
     }
@@ -116,7 +120,7 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         UIApplicationState appState = [UIApplication sharedApplication].applicationState;
 
-        if (appState == UIApplicationStateBackground) {
+        if (appState != UIApplicationStateActive) {
             return;
         }
 

package/ios/platform/Platform_macOS.h

@@ -8,6 +8,7 @@
 
 - (instancetype)init;
 
+- (void)clean;
 - (void)setupListeners;
 - (void)makeShared:(void*)runtime;
 - (void)onWindowChange;

package/ios/platform/Platform_macOS.mm

@@ -14,6 +14,10 @@
 }
 
 - (void)dealloc {
+    [self clean];
+}
+
+- (void)clean {
     if (self.unistylesRuntime != nullptr) {
         self.unistylesRuntime = nullptr;
     }

package/ios/platform/Platform_tvOS.h

@@ -8,6 +8,7 @@
 
 - (instancetype)init;
 
+- (void)clean;
 - (void)makeShared:(void*)runtime;
 - (void)onAppearanceChange:(NSNotification *)notification;
 - (void)onContentSizeCategoryChange:(NSNotification *)notification;

package/ios/platform/Platform_tvOS.mm

@@ -14,6 +14,10 @@
 }
 
 - (void)dealloc {
+    [self clean];
+}
+
+- (void)clean {
     if (self.unistylesRuntime != nullptr) {
         self.unistylesRuntime = nullptr;
     }

package/ios/platform/Platform_visionOS.h

@@ -9,6 +9,7 @@
 
 - (instancetype)init;
 
+- (void)clean;
 - (void)setupListeners;
 - (void)makeShared:(void*)runtime;
 - (UIWindow *)getMainWindow;

package/ios/platform/Platform_visionOS.mm

@@ -36,6 +36,10 @@
 }
 
 - (void)dealloc {
+    [self clean];
+}
+
+- (void)clean {
     if (self.unistylesRuntime != nullptr) {
         self.unistylesRuntime = nullptr;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "2.32.0",
+  "version": "2.41.0",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",