react-native-unistyles 3.1.1 → 3.2.0

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -61,7 +61,7 @@ jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisV
 
     verifyAndSelectTheme(rt);
 
-    auto& state = core::UnistylesRegistry::get().getState(rt);
+    auto& state = core::UnistylesRegistry::get().getState();
 
     state.hasUserConfig = true;
 
@@ -76,7 +76,7 @@ jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, c
     // create new state
     auto& registry = core::UnistylesRegistry::get();
 
-    registry.createState(rt);
+    registry.createState();
 
     loadExternalMethods(thisVal, rt);
 
@@ -95,7 +95,7 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
         if (propertyName == "adaptiveThemes") {
             helpers::assertThat(rt, propertyValue.isBool(), "StyleSheet.configure's adaptiveThemes must be of boolean type.");
 
-            registry.setPrefersAdaptiveThemes(rt, propertyValue.asBool());
+            registry.setPrefersAdaptiveThemes(propertyValue.asBool());
 
             return;
         }
@@ -108,12 +108,12 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
 
                 helpers::assertThat(rt, result.isString(), "StyleSheet.configure's initialTheme resolved from function is not a string. Please check your initialTheme function.");
 
-                return registry.setInitialThemeName(rt, result.asString(rt).utf8(rt));
+                return registry.setInitialThemeName(result.asString(rt).utf8(rt));
             }
 
             helpers::assertThat(rt, propertyValue.isString(), "StyleSheet.configure's initialTheme must be either a string or a function.");
 
-            registry.setInitialThemeName(rt, propertyValue.asString(rt).utf8(rt));
+            registry.setInitialThemeName(propertyValue.asString(rt).utf8(rt));
 
             return;
         }
@@ -147,9 +147,9 @@ void HybridStyleSheet::parseBreakpoints(jsi::Runtime &rt, jsi::Object breakpoint
     helpers::assertThat(rt, sortedBreakpoints.front().second == 0, "StyleSheet.configure's first breakpoint must start from 0.");
 
     auto& registry = core::UnistylesRegistry::get();
-    auto& state = registry.getState(rt);
+    auto& state = registry.getState();
 
-    registry.registerBreakpoints(rt, sortedBreakpoints);
+    registry.registerBreakpoints(sortedBreakpoints);
 
     auto rawWidth = this->_unistylesRuntime->getScreen().width;
     auto width = registry.shouldUsePointsForBreakpoints
@@ -170,7 +170,7 @@ void HybridStyleSheet::parseThemes(jsi::Runtime &rt, jsi::Object themes) {
 }
 
 void HybridStyleSheet::verifyAndSelectTheme(jsi::Runtime &rt) {
-    auto& state = core::UnistylesRegistry::get().getState(rt);
+    auto& state = core::UnistylesRegistry::get().getState();
 
     bool hasInitialTheme = state.hasInitialTheme();
     bool prefersAdaptiveThemes = state.getPrefersAdaptiveThemes();
@@ -217,7 +217,7 @@ void HybridStyleSheet::verifyAndSelectTheme(jsi::Runtime &rt) {
 }
 
 void HybridStyleSheet::setThemeFromColorScheme(jsi::Runtime& rt) {
-    auto& state = core::UnistylesRegistry::get().getState(rt);
+    auto& state = core::UnistylesRegistry::get().getState();
     auto colorScheme = static_cast<ColorScheme>(this->_unistylesRuntime->getColorScheme());
 
     switch (colorScheme) {
@@ -250,7 +250,7 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
     auto processColorFn = maybeProcessColorFn.asObject(rt).asFunction(rt);
     auto parseBoxShadowStringFn = maybeParseBoxShadowStringFn.asObject(rt).asFunction(rt);
     auto& registry = core::UnistylesRegistry::get();
-    auto& state = registry.getState(rt);
+    auto& state = registry.getState();
 
     state.registerProcessColorFunction(std::move(processColorFn));
     state.registerParseBoxShadowString(std::move(parseBoxShadowStringFn));
@@ -262,32 +262,42 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
         return;
     }
 
-    auto& registry = core::UnistylesRegistry::get();
-    auto& rt = this->_unistylesRuntime->getRuntime();
-    auto parser = parser::Parser(this->_unistylesRuntime);
-    auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
+    auto weakSelf = weak_from_this();
 
-    if (dependencyMap.empty()) {
-        this->notifyJSListeners(dependencies);
-    }
+    this->_unistylesRuntime->runOnJSThread([weakSelf, dependencies](jsi::Runtime& rt) {
+        auto self = std::dynamic_pointer_cast<HybridStyleSheet>(weakSelf.lock());
 
-    // in a later step, we will rebuild only Unistyles with mounted StyleSheets
-    // however, user may have StyleSheets with components that haven't mounted yet
-    // we need to rebuild all dependent StyleSheets as well
-    auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, dependencies);
+        if (!self) {
+            return;
+        }
 
-    parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, std::nullopt);
+        auto& registry = core::UnistylesRegistry::get();
+        auto parser = parser::Parser(self->_unistylesRuntime);
+        auto unistyleDependencies = dependencies;
+        auto dependencyMap = registry.buildDependencyMap(unistyleDependencies);
 
-    // we need to stop here if there is nothing to update at the moment,
-    // but we need to compute dependentStyleSheets
-    if (dependencyMap.empty()) {
-        return;
-    }
+        if (dependencyMap.empty()) {
+            self->notifyJSListeners(unistyleDependencies);
+        }
+
+        // in a later step, we will rebuild only Unistyles with mounted StyleSheets
+        // however, user may have StyleSheets with components that haven't mounted yet
+        // we need to rebuild all dependent StyleSheets as well
+        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(unistyleDependencies);
+
+        parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, std::nullopt);
+
+        // we need to stop here if there is nothing to update at the moment,
+        // but we need to compute dependentStyleSheets
+        if (dependencyMap.empty()) {
+            return;
+        }
 
-    parser.rebuildShadowLeafUpdates(rt, dependencyMap);
+        parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
-    this->notifyJSListeners(dependencies);
-    shadow::ShadowTreeManager::updateShadowTree(rt);
+        self->notifyJSListeners(unistyleDependencies);
+        shadow::ShadowTreeManager::updateShadowTree(rt);
+    });
 }
 
 void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDependency> dependencies, UnistylesNativeMiniRuntime miniRuntime) {
@@ -296,21 +306,29 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         return;
     }
 
-    this->_unistylesRuntime->runOnJSThread([this, dependencies, miniRuntime](jsi::Runtime& rt){
+    auto weakSelf = weak_from_this();
+
+    this->_unistylesRuntime->runOnJSThread([weakSelf, dependencies, miniRuntime](jsi::Runtime& rt){
+        auto self = std::dynamic_pointer_cast<HybridStyleSheet>(weakSelf.lock());
+
+        if (!self) {
+            return;
+        }
+
         auto& registry = core::UnistylesRegistry::get();
-        auto parser = parser::Parser(this->_unistylesRuntime);
+        auto parser = parser::Parser(self->_unistylesRuntime);
         auto unistyleDependencies = std::move(dependencies);
 
         // re-compute new breakpoint
         auto dimensionsIt = std::find(dependencies.begin(), dependencies.end(), UnistyleDependency::DIMENSIONS);
 
         if (dimensionsIt != dependencies.end()) {
-            auto rawWidth = this->_unistylesRuntime->getScreen().width;
+            auto rawWidth = self->_unistylesRuntime->getScreen().width;
             auto width = registry.shouldUsePointsForBreakpoints
-                ? rawWidth / this->_unistylesRuntime->getPixelRatio()
+                ? rawWidth / self->_unistylesRuntime->getPixelRatio()
                 : rawWidth;
 
-            registry.getState(rt).computeCurrentBreakpoint(width);
+            registry.getState().computeCurrentBreakpoint(width);
         }
 
         // check if color scheme changed and then if Unistyles state depend on it (adaptive themes)
@@ -318,19 +336,19 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         auto hasNewColorScheme = colorSchemeIt != dependencies.end();
 
         if (hasNewColorScheme) {
-            this->_unistylesRuntime->includeDependenciesForColorSchemeChange(unistyleDependencies);
+            self->_unistylesRuntime->includeDependenciesForColorSchemeChange(unistyleDependencies);
         }
 
-        auto dependencyMap = registry.buildDependencyMap(rt, unistyleDependencies);
+        auto dependencyMap = registry.buildDependencyMap(unistyleDependencies);
 
         if (dependencyMap.empty()) {
-            this->notifyJSListeners(unistyleDependencies);
+            self->notifyJSListeners(unistyleDependencies);
         }
 
         // in a later step, we will rebuild only Unistyles with mounted StyleSheets
         // however, user may have StyleSheets with components that haven't mounted yet
         // we need to rebuild all dependent StyleSheets as well
-        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, unistyleDependencies);
+        auto dependentStyleSheets = registry.getStyleSheetsToRefresh(unistyleDependencies);
 
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);
 
@@ -342,7 +360,7 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
 
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
-        this->notifyJSListeners(unistyleDependencies);
+        self->notifyJSListeners(unistyleDependencies);
         shadow::ShadowTreeManager::updateShadowTree(rt);
     });
 }
@@ -352,14 +370,22 @@ void HybridStyleSheet::onImeChange(UnistylesNativeMiniRuntime miniRuntime) {
         return;
     }
 
-    this->_unistylesRuntime->runOnJSThread([this, miniRuntime](jsi::Runtime& rt){
+    auto weakSelf = weak_from_this();
+
+    this->_unistylesRuntime->runOnJSThread([weakSelf, miniRuntime](jsi::Runtime& rt){
+        auto self = std::dynamic_pointer_cast<HybridStyleSheet>(weakSelf.lock());
+
+        if (!self) {
+            return;
+        }
+
         std::vector<UnistyleDependency> dependencies{UnistyleDependency::IME};
         auto& registry = core::UnistylesRegistry::get();
-        auto parser = parser::Parser(this->_unistylesRuntime);
-        auto dependencyMap = registry.buildDependencyMap(rt, dependencies);
+        auto parser = parser::Parser(self->_unistylesRuntime);
+        auto dependencyMap = registry.buildDependencyMap(dependencies);
 
         if (dependencyMap.empty()) {
-            this->notifyJSListeners(dependencies);
+            self->notifyJSListeners(dependencies);
 
             return;
         }
@@ -371,7 +397,7 @@ void HybridStyleSheet::onImeChange(UnistylesNativeMiniRuntime miniRuntime) {
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
 
-        this->notifyJSListeners(dependencies);
+        self->notifyJSListeners(dependencies);
         shadow::ShadowTreeManager::updateShadowTree(rt);
     });
 }

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -3,6 +3,10 @@
 
 using namespace margelo::nitro::unistyles;
 
+core::UnistylesState& HybridUnistylesRuntime::getState() {
+    return core::UnistylesRegistry::get().getState();
+}
+
 ColorScheme HybridUnistylesRuntime::getColorScheme() {
     auto colorScheme = this->_nativePlatform->getColorScheme();
 
@@ -10,9 +14,7 @@ ColorScheme HybridUnistylesRuntime::getColorScheme() {
 }
 
 bool HybridUnistylesRuntime::getHasAdaptiveThemes() {
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
-
-    return state.hasAdaptiveThemes();
+    return this->getState().hasAdaptiveThemes();
 };
 
 Dimensions HybridUnistylesRuntime::getScreen() {
@@ -22,14 +24,12 @@ Dimensions HybridUnistylesRuntime::getScreen() {
 std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
     auto& registry = core::UnistylesRegistry::get();
     auto maybeScopedTheme = registry.getScopedTheme();
-    
+
     if (maybeScopedTheme.has_value()) {
         return maybeScopedTheme.value();
     }
-    
-    auto& state = registry.getState(*_rt);
-    
-    return state.getCurrentThemeName();
+
+    return this->getState().getCurrentThemeName();
 };
 
 std::string HybridUnistylesRuntime::getContentSizeCategory() {
@@ -37,9 +37,7 @@ std::string HybridUnistylesRuntime::getContentSizeCategory() {
 };
 
 std::optional<std::string> HybridUnistylesRuntime::getBreakpoint() {
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
-
-    return state.getCurrentBreakpointName();
+    return this->getState().getCurrentBreakpointName();
 };
 
 bool HybridUnistylesRuntime::getRtl() {
@@ -73,8 +71,7 @@ double HybridUnistylesRuntime::getFontScale() {
 };
 
 std::unordered_map<std::string, double> HybridUnistylesRuntime::getBreakpoints() {
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
-    auto sortedBreakpointPairs = state.getSortedBreakpointPairs();
+    auto sortedBreakpointPairs = this->getState().getSortedBreakpointPairs();
     std::unordered_map<std::string, double> breakpoints{};
 
     std::for_each(sortedBreakpointPairs.begin(), sortedBreakpointPairs.end(), [&breakpoints](std::pair<std::string, double>& pair){
@@ -85,12 +82,13 @@ std::unordered_map<std::string, double> HybridUnistylesRuntime::getBreakpoints()
 }
 
 void HybridUnistylesRuntime::setTheme(const std::string &themeName) {
-    helpers::assertThat(*_rt, !this->getHasAdaptiveThemes(), "Unistyles: You're trying to set theme to: '" + themeName + "', but adaptiveThemes are enabled.");
+    if (this->getHasAdaptiveThemes()) {
+        throw std::runtime_error("Unistyles: You're trying to set theme to: '" + themeName + "', but adaptiveThemes are enabled.");
+    }
 
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
-    auto currentThemeName = state.getCurrentThemeName();
+    auto currentThemeName = this->getState().getCurrentThemeName();
 
-    state.setTheme(themeName);
+    this->getState().setTheme(themeName);
 
     if (currentThemeName.value() != themeName) {
         this->_onDependenciesChange({UnistyleDependency::THEME, UnistyleDependency::THEMENAME});
@@ -106,7 +104,7 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
 
     bool hadAdaptiveThemes = this->getHasAdaptiveThemes();
 
-    registry.setPrefersAdaptiveThemes(*_rt, isEnabled);
+    registry.setPrefersAdaptiveThemes(isEnabled);
 
     bool haveAdaptiveThemes = this->getHasAdaptiveThemes();
 
@@ -128,7 +126,6 @@ void HybridUnistylesRuntime::setAdaptiveThemes(bool isEnabled) {
 };
 
 void HybridUnistylesRuntime::calculateNewThemeAndDependencies(std::vector<UnistyleDependency>& changedDependencies) {
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
     auto colorScheme = this->getColorScheme();
     auto currentThemeName = this->getThemeName();
     auto nextTheme = colorScheme == ColorScheme::LIGHT
@@ -139,18 +136,18 @@ void HybridUnistylesRuntime::calculateNewThemeAndDependencies(std::vector<Unisty
         changedDependencies.push_back(UnistyleDependency::THEME);
         changedDependencies.push_back(UnistyleDependency::THEMENAME);
 
-        state.setTheme(nextTheme);
+        this->getState().setTheme(nextTheme);
     }
 }
 
 jsi::Value HybridUnistylesRuntime::getTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     helpers::assertThat(rt, count <= 1, "UnistylesRuntime.getTheme expected to be called with 0 or 1 argument.");
 
-    auto& state = core::UnistylesRegistry::get().getState(*_rt);
+    auto& state = this->getState();
 
     if (count == 1) {
         if (args[0].isUndefined()) {
-            return state.getCurrentJSTheme();
+            return state.getCurrentJSTheme(rt);
         }
 
         helpers::assertThat(rt, args[0].isString(), "UnistylesRuntime.getTheme expected to be called with string.");
@@ -159,10 +156,10 @@ jsi::Value HybridUnistylesRuntime::getTheme(jsi::Runtime &rt, const jsi::Value &
 
         helpers::assertThat(rt, state.hasTheme(themeName), "Unistyles: You're trying to get theme '" + themeName + "' but it wasn't registered.");
 
-        return state.getJSThemeByName(themeName);
+        return state.getJSThemeByName(rt, themeName);
     }
 
-    return state.getCurrentJSTheme();
+    return state.getCurrentJSTheme(rt);
 }
 
 jsi::Value HybridUnistylesRuntime::updateTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
@@ -292,17 +289,10 @@ void HybridUnistylesRuntime::unregisterNativePlatformListeners() {
 }
 
 void HybridUnistylesRuntime::includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps) {
-    auto& registry = core::UnistylesRegistry::get();
-    auto& state = registry.getState(*this->_rt);
-
     // ignore color scheme changes if user has no adaptive themes
-    if (!state.hasAdaptiveThemes()) {
+    if (!this->getState().hasAdaptiveThemes()) {
         return;
     }
 
     this->calculateNewThemeAndDependencies(deps);
 }
-
-jsi::Runtime& HybridUnistylesRuntime::getRuntime() {
-    return *this->_rt;
-}

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -13,8 +13,8 @@
 namespace margelo::nitro::unistyles {
 
 struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
-    HybridUnistylesRuntime(std::shared_ptr<HybridNativePlatformSpec> nativePlatform, jsi::Runtime& rt, std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread)
-        : HybridObject(TAG), _nativePlatform{nativePlatform}, _rt{&rt}, runOnJSThread(std::move(runOnJSThread)) {}
+    HybridUnistylesRuntime(std::shared_ptr<HybridNativePlatformSpec> nativePlatform, std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread)
+        : HybridObject(TAG), _nativePlatform{nativePlatform}, runOnJSThread(std::move(runOnJSThread)) {}
 
     jsi::Value getTheme(jsi::Runtime& rt,
                             const jsi::Value& thisValue,
@@ -69,7 +69,7 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     UnistylesCxxMiniRuntime getMiniRuntime() override;
     std::unordered_map<std::string, double> getBreakpoints() override;
 
-    jsi::Runtime& getRuntime();
+    core::UnistylesState& getState();
     UnistylesCxxMiniRuntime buildMiniRuntimeFromNativeRuntime(UnistylesNativeMiniRuntime& nativeMiniRuntime);
     jsi::Value getMiniRuntimeAsValue(jsi::Runtime& rt, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime);
     void includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps);
@@ -77,7 +77,6 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread;
 
 private:
-    jsi::Runtime* _rt;
     std::shared_ptr<HybridNavigationBar> _navigationBar;
     std::shared_ptr<HybridStatusBar> _statusBar;
     std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;

package/cxx/parser/Parser.cpp

@@ -101,8 +101,8 @@ jsi::Value parser::Parser::getParsedStyleSheetForScopedTheme(jsi::Runtime& rt, c
         return jsi::Value::undefined();
     }
 
-    auto& state = core::UnistylesRegistry::get().getState(rt);
-    auto jsTheme = state.getJSThemeByName(scopedTheme);
+    auto& state = core::UnistylesRegistry::get().getState();
+    auto jsTheme = state.getJSThemeByName(rt, scopedTheme);
 
     if (unistyle->parent->type == StyleSheetType::Themable) {
         return unistyle->parent->rawValue
@@ -184,8 +184,8 @@ jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<S
     }
 
     // StyleSheet is a function
-    auto& state = core::UnistylesRegistry::get().getState(rt);
-    auto theme = state.getCurrentJSTheme();
+    auto& state = core::UnistylesRegistry::get().getState();
+    auto theme = state.getCurrentJSTheme(rt);
 
     if (styleSheet->type == StyleSheetType::Themable) {
         return styleSheet->rawValue
@@ -497,7 +497,7 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
         
         if (propertyValue.isBool() && propertyName == "includeFontPadding") {
             parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), propertyValue);
-            
+
             return;
         }
 
@@ -690,9 +690,9 @@ jsi::Value parser::Parser::parseBoxShadow(jsi::Runtime &rt, Unistyle::Shared uni
 
 jsi::Array parser::Parser::parseBoxShadowString(jsi::Runtime& rt, std::string&& boxShadowString) {
     auto& registry = core::UnistylesRegistry::get();
-    auto& state = registry.getState(rt);
+    auto& state = registry.getState();
 
-    return state.parseBoxShadowString(std::move(boxShadowString));
+    return state.parseBoxShadowString(rt, std::move(boxShadowString));
 }
 
 // eg. [{ brightness: 0.5 }, { opacity: 0.25 }]
@@ -767,7 +767,7 @@ jsi::Value parser::Parser::parseFilters(jsi::Runtime &rt, Unistyle::Shared unist
 // find value based on breakpoints and mq
 jsi::Value parser::Parser::getValueFromBreakpoints(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Object& obj) {
     auto& registry = core::UnistylesRegistry::get();
-    auto& state = registry.getState(rt);
+    auto& state = registry.getState();
 
     auto sortedBreakpoints = state.getSortedBreakpointPairs();
     auto hasBreakpoints = !sortedBreakpoints.empty();
@@ -1039,7 +1039,7 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
             return;
         }
 
-        if (propertyName == "shadowOffset" || propertyName == "textShadowOffset") {
+        if (propertyName == "shadowOffset" || propertyName == "textShadowOffset" || propertyName == "dropShadow") {
             parsedStyle.setProperty(rt, propertyName.c_str(), this->parseSecondLevel(rt, unistyle, propertyValue));
 
             return;
@@ -1052,7 +1052,7 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
 // convert unistyles to folly with int colors
 folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles) {
     jsi::Object convertedStyles(rt);
-    auto& state = core::UnistylesRegistry::get().getState(rt);
+    auto& state = core::UnistylesRegistry::get().getState();
 
     for (const auto& unistyleData : unistyles) {
         if (!unistyleData->parsedStyle.has_value()) {
@@ -1068,7 +1068,7 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
                         convertedStyles.setProperty(
                             rt,
                             propertyName.c_str(),
-                            jsi::Value(state.parseColor(propertyValue))
+                            jsi::Value(state.parseColor(rt, propertyValue))
                         );
                     } else {
                         convertedStyles.setProperty(
@@ -1124,7 +1124,7 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
                                             obj.setProperty(
                                                 rt,
                                                 nestedPropName.c_str(),
-                                                state.parseColor(nestedPropValue)
+                                                state.parseColor(rt, nestedPropValue)
                                             );
                                         } else {
                                             obj.setProperty(
@@ -1156,7 +1156,7 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
                                                     parsedNestedObj.setProperty(
                                                         rt,
                                                         secondLevelPropName.c_str(),
-                                                        state.parseColor(secondLevelPropValue)
+                                                        state.parseColor(rt, secondLevelPropValue)
                                                     );
 
                                                     return;
@@ -1195,7 +1195,7 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
                                 parsedArray.setValueAtIndex(
                                     rt,
                                     i,
-                                    jsi::Value(state.parseColor(nestedValue))
+                                    jsi::Value(state.parseColor(rt, nestedValue))
                                 );
                             } else {
                                 parsedArray.setValueAtIndex(rt, i, nestedValue);

package/ios/UnistylesModuleOnLoad.mm

@@ -6,9 +6,7 @@
 
 using namespace margelo::nitro;
 
-@implementation UnistylesModule {
-    jsi::Runtime* _runtime;
-}
+@implementation UnistylesModule
 
 RCT_EXPORT_MODULE(Unistyles)
 
@@ -17,8 +15,6 @@ RCT_EXPORT_MODULE(Unistyles)
 }
 
 - (void)installJSIBindingsWithRuntime:(jsi::Runtime&)rt callInvoker:(const std::shared_ptr<facebook::react::CallInvoker> &)callInvoker {
-    _runtime = &rt;
-
     // function is called on: first init and every live reload
     // check if this is live reload, if so let's replace UnistylesRuntime with new runtime
     auto hasUnistylesRuntime = HybridObjectRegistry::hasHybridObject("UnistylesRuntime");
@@ -38,7 +34,7 @@ RCT_EXPORT_MODULE(Unistyles)
     };
 
     auto nativePlatform = Unistyles::NativePlatform::create().getCxxPart();
-    auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, rt, runOnJSThread);
+    auto unistylesRuntime = std::make_shared<HybridUnistylesRuntime>(nativePlatform, runOnJSThread);
     auto styleSheet = std::make_shared<HybridStyleSheet>(unistylesRuntime);
 
     HybridObjectRegistry::registerHybridObjectConstructor("UnistylesRuntime", [unistylesRuntime]() -> std::shared_ptr<HybridObject>{
@@ -57,10 +53,7 @@ RCT_EXPORT_MODULE(Unistyles)
 }
 
 - (void)invalidate {
-    if (_runtime) {
-        core::UnistylesRegistry::get().destroyState(_runtime);
-        _runtime = nullptr;
-    }
+    core::UnistylesRegistry::get().destroy();
 
     [super invalidate];
 }

package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js

@@ -57,7 +57,10 @@ const useProxifiedUnistyles = forcedTheme => {
     });
   };
   (0, _react.useEffect)(() => {
-    return () => disposeRef.current?.();
+    return () => {
+      disposeRef.current?.();
+      syncedDependenciesSizeRef.current = -1;
+    };
   }, [disposeRef]);
   const maybeNewScopedTheme = _specs.UnistylesShadowRegistry.getScopedTheme();
   if (scopedTheme && maybeNewScopedTheme && scopedTheme !== maybeNewScopedTheme) {

package/lib/commonjs/core/useProxifiedUnistyles/useProxifiedUnistyles.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_specs","_NativePlatform","_listener","getMiniRuntime","UnistylesRuntime","miniRuntime","RTDependencyMap","breakpoint","UnistyleDependency","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","forcedTheme","scopedTheme","setScopedTheme","useState","UnistylesShadowRegistry","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","useReducer","disposeRef","useRef","undefined","syncedDependenciesSizeRef","syncedScopedThemeRef","reinitListener","current","listener","Array","from","updateTheme","updateRuntime","hasThemeNameChange","useEffect","maybeNewScopedTheme","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","useLayoutEffect","sameDeps","size","sameScopedTheme","addDependencies","newDependencies","dependenciesSize","forEach","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_specs","_NativePlatform","_listener","getMiniRuntime","UnistylesRuntime","miniRuntime","RTDependencyMap","breakpoint","UnistyleDependency","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","forcedTheme","scopedTheme","setScopedTheme","useState","UnistylesShadowRegistry","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","useReducer","disposeRef","useRef","undefined","syncedDependenciesSizeRef","syncedScopedThemeRef","reinitListener","current","listener","Array","from","updateTheme","updateRuntime","hasThemeNameChange","useEffect","maybeNewScopedTheme","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","useLayoutEffect","sameDeps","size","sameScopedTheme","addDependencies","newDependencies","dependenciesSize","forEach","dependency","exports"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/specs/ShadowRegistry/index.js

@@ -6,6 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.UnistylesShadowRegistry = void 0;
 var _reactNativeNitroModules = require("react-native-nitro-modules");
 const HybridShadowRegistry = _reactNativeNitroModules.NitroModules.createHybridObject('UnistylesShadowRegistry');
+const SUSPENSE_TAG = 13;
+const isInsideSuspendedBoundary = fiber => {
+  let current = fiber?.return;
+  while (current) {
+    if (current.tag === SUSPENSE_TAG && current.memoizedState !== null) {
+      return true;
+    }
+    current = current.return;
+  }
+  return false;
+};
+const findFiberForHandle = handle => {
+  return handle?.__internalInstanceHandle ?? handle?.getScrollResponder?.()?.getNativeScrollRef?.()?.__internalInstanceHandle ?? handle?.getNativeScrollRef?.()?.__internalInstanceHandle ?? handle?._viewRef?.__internalInstanceHandle ?? handle?.viewRef?.current?.__internalInstanceHandle ?? handle?._nativeRef?.__internalInstanceHandle;
+};
 const findShadowNodeForHandle = handle => {
   const node = handle?.__internalInstanceHandle?.stateNode?.node ?? handle?.getScrollResponder?.()?.getNativeScrollRef?.()?.__internalInstanceHandle?.stateNode?.node ?? handle?.getNativeScrollRef?.()?.__internalInstanceHandle?.stateNode?.node ?? handle?._viewRef?.__internalInstanceHandle?.stateNode?.node ?? handle?.viewRef?.current?.__internalInstanceHandle?.stateNode?.node ?? handle?._nativeRef?.__internalInstanceHandle?.stateNode?.node;
 
@@ -38,7 +52,12 @@ HybridShadowRegistry.remove = handle => {
   }
   const maybeNode = findShadowNodeForHandle(handle);
   if (maybeNode) {
-    HybridShadowRegistry.unlink(maybeNode);
+    const fiber = findFiberForHandle(handle);
+    if (fiber && isInsideSuspendedBoundary(fiber)) {
+      HybridShadowRegistry.suspend(maybeNode);
+    } else {
+      HybridShadowRegistry.unlink(maybeNode);
+    }
   }
 };
 const UnistylesShadowRegistry = exports.UnistylesShadowRegistry = HybridShadowRegistry;