react-native-unistyles 3.0.0-beta.3 → 3.0.0-beta.5

package/cxx/core/UnistylesRegistry.cpp

@@ -75,7 +75,7 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
 ) {
     shadow::ShadowLeafUpdates updates;
     auto parser = parser::Parser(nullptr);
-    
+
     std::for_each(unistylesData.begin(), unistylesData.end(), [this, &rt, shadowNodeFamily](std::shared_ptr<UnistyleData> unistyleData){
         this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(unistyleData);
     });
@@ -159,7 +159,7 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
                                       UnistyleDependency::THEME);
     auto themeDidChange = themeDidChangeIt != unistylesDependencies.end();
     auto runtimeDidChange = (themeDidChange && unistylesDependencies.size() > 1) || unistylesDependencies.size() > 0;
-    
+
     // if nothing changed, skip further lookup
     if (!themeDidChange && !runtimeDidChange) {
         return stylesheetsToRefresh;
@@ -173,7 +173,7 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
         if (styleSheet->type == StyleSheetType::ThemableWithMiniRuntime) {
             for (const auto& unistylePair: styleSheet->unistyles) {
                 auto& [_, unistyle] = unistylePair;
-                
+
                 bool hasAnyOfDependencies = std::any_of(
                     unistyle->dependencies.begin(),
                     unistyle->dependencies.end(),
@@ -181,10 +181,10 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
                         return std::find(unistylesDependencies.begin(), unistylesDependencies.end(), dep) != unistylesDependencies.end();
                     }
                 );
-                
+
                 if (hasAnyOfDependencies) {
                     stylesheetsToRefresh.emplace_back(styleSheet);
-                    
+
                     return;
                 }
             }
@@ -198,18 +198,26 @@ std::vector<std::shared_ptr<core::StyleSheet>> core::UnistylesRegistry::getStyle
     return stylesheetsToRefresh;
 }
 
-const core::Variants& core::UnistylesRegistry::getScopedVariants() {
-    return this->_scopedVariants;
+core::Unistyle::Shared core::UnistylesRegistry::getUnistyleById(jsi::Runtime& rt, std::string unistyleID) {
+    for (auto& pair: this->_styleSheetRegistry[&rt]) {
+        auto [_, stylesheet] = pair;
+        
+        for (auto unistylePair: stylesheet->unistyles) {
+            auto [_, unistyle] = unistylePair;
+            
+            if (unistyle->unid == unistyleID) {
+                return unistyle;
+            }
+        }
+    }
+    
+    return nullptr;
 }
 
 const std::optional<std::string> core::UnistylesRegistry::getScopedTheme() {
     return this->_scopedTheme;
 }
 
-void core::UnistylesRegistry::setScopedVariants(core::Variants&& variants) {
-    this->_scopedVariants = std::move(variants);
-}
-
 void core::UnistylesRegistry::setScopedTheme(std::optional<std::string> themeName) {
     this->_scopedTheme = std::move(themeName);
 }

package/cxx/core/UnistylesRegistry.h

@@ -43,15 +43,13 @@ struct UnistylesRegistry: public StyleSheetRegistry {
     DependencyMap buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps);
     void shadowLeafUpdateFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Value& maybePressableId);
     shadow::ShadowTrafficController trafficController{};
-    const core::Variants& getScopedVariants();
     const std::optional<std::string> getScopedTheme();
-    void setScopedVariants(core::Variants&& variants);
     void setScopedTheme(std::optional<std::string> themeName);
+    core::Unistyle::Shared getUnistyleById(jsi::Runtime& rt, std::string unistyleID);
 
 private:
     UnistylesRegistry() = default;
-    
-    core::Variants _scopedVariants{};
+
     std::optional<std::string> _scopedTheme{};
     std::unordered_map<jsi::Runtime*, UnistylesState> _states{};
     std::unordered_map<jsi::Runtime*, std::unordered_map<int, std::shared_ptr<core::StyleSheet>>> _styleSheetRegistry{};

package/cxx/hybridObjects/HybridNavigationBar.cpp

@@ -1,13 +1,13 @@
 #include "HybridNavigationBar.h"
 
 void HybridNavigationBar::setHidden(bool isHidden) {
-    this->_nativePlatform.setNavigationBarHidden(isHidden);
+    this->_nativePlatform->setNavigationBarHidden(isHidden);
 };
 
 double HybridNavigationBar::getWidth() {
-    return this->_nativePlatform.getNavigationBarDimensions().width;
+    return this->_nativePlatform->getNavigationBarDimensions().width;
 }
 
 double HybridNavigationBar::getHeight() {
-    return this->_nativePlatform.getNavigationBarDimensions().height;
+    return this->_nativePlatform->getNavigationBarDimensions().height;
 }

package/cxx/hybridObjects/HybridNavigationBar.h

@@ -7,12 +7,12 @@
 using namespace margelo::nitro::unistyles;
 
 struct HybridNavigationBar: public HybridUnistylesNavigationBarSpec {
-    HybridNavigationBar(Unistyles::HybridNativePlatformSpecCxx nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
+    HybridNavigationBar(std::shared_ptr<HybridNativePlatformSpec> nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
 
     void setHidden(bool isHidden) override;
     double getWidth() override;
     double getHeight() override;
 
 private:
-    Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
+    std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;
 };

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -7,30 +7,31 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     helpers::assertThat(rt, count == 2, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 2 arguments.");
 
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
+
     std::vector<core::Unistyle::Shared> unistyleWrappers = core::unistyleFromValue(rt, args[1]);
     std::vector<std::vector<folly::dynamic>> arguments;
     auto& registry = core::UnistylesRegistry::get();
 
     for (size_t i = 0; i < unistyleWrappers.size(); i++) {
         if (unistyleWrappers[i]->type == core::UnistyleType::DynamicFunction) {
-            auto rawStyle = args[1].asObject(rt).asArray(rt).getValueAtIndex(rt, i);
-
-            helpers::assertThat(rt, rawStyle.isObject(), "Unistyles: Dynamic function is not bound!");
-
-            auto maybeSecrets = rawStyle.getObject(rt).getProperty(rt, helpers::SECRETS.c_str());
-
-            helpers::assertThat(rt, maybeSecrets.isObject(), "Unistyles: Dynamic function is not bound!");
-
-            auto secrets = maybeSecrets.asObject(rt).getProperty(rt, helpers::ARGUMENTS.c_str());
-
-            arguments.push_back(helpers::parseDynamicFunctionArguments(rt, secrets.asObject(rt).asArray(rt)));
-
-            continue;
+            try {
+                auto rawStyle = args[1].asObject(rt).asArray(rt).getValueAtIndex(rt, i);
+                auto rawStyleObj = rawStyle.getObject(rt);
+                auto unistyleHashKeys = core::getUnistylesHashKeys(rt, rawStyleObj);
+                auto secrets = rawStyleObj.getProperty(rt, unistyleHashKeys.at(0).c_str()).asObject(rt);
+                auto secretArguments = secrets.getProperty(rt, helpers::ARGUMENTS.c_str()).asObject(rt).asArray(rt);
+
+                arguments.push_back(helpers::parseDynamicFunctionArguments(rt, secretArguments));
+
+                continue;
+            } catch (...) {
+                arguments.push_back({});
+            }
         }
 
         arguments.push_back({});
     }
-    
+
     auto scopedTheme = registry.getScopedTheme();
 
     // check if scope theme exists
@@ -47,9 +48,23 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     // create unistyleData based on wrappers
     for (size_t i = 0; i < unistyleWrappers.size(); i++) {
         core::Unistyle::Shared& unistyle = unistyleWrappers[i];
+        auto rawStyle = args[1].asObject(rt).asArray(rt).getValueAtIndex(rt, i);
+        auto rawStyleObj = rawStyle.getObject(rt);
+        auto unistyleHashKeys = core::getUnistylesHashKeys(rt, rawStyleObj);
+        core::Variants variants{};
+
+        if (unistyleHashKeys.size() == 1) {
+            auto secrets = rawStyleObj.getProperty(rt, unistyleHashKeys.at(0).c_str()).asObject(rt);
+            auto hasVariants = secrets.hasProperty(rt, helpers::STYLESHEET_VARIANTS.c_str());
+
+            if (hasVariants) {
+                variants = helpers::variantsToPairs(rt, secrets.getProperty(rt, helpers::STYLESHEET_VARIANTS.c_str()).asObject(rt));
+            }
+        }
+
         std::shared_ptr<core::UnistyleData> unistyleData = std::make_shared<core::UnistyleData>(
             unistyle,
-            registry.getScopedVariants(),
+            variants,
             arguments[i],
             scopedTheme
         );
@@ -62,9 +77,6 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
 
             // if so we need to force update
             parser.rebuildUnistyleWithScopedTheme(rt, parsedStyleSheet, unistyleData);
-        } else {
-            // for other styles, not scoped to theme we need to compute variants value
-            parser.rebuildUnistyleWithVariants(rt, unistyleData);
         }
 
         unistylesData.emplace_back(unistyleData);
@@ -91,25 +103,9 @@ jsi::Value HybridShadowRegistry::unlink(jsi::Runtime &rt, const jsi::Value &this
     return jsi::Value::undefined();
 }
 
-jsi::Value HybridShadowRegistry::selectVariants(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    helpers::assertThat(rt, count == 1, "Unistyles: Invalid babel transform 'ShadowRegistry selectVariants' expected 1 arguments.");
-    
-    auto& registry = core::UnistylesRegistry::get();
-
-    if (args[0].isUndefined()) {
-        registry.setScopedVariants({});
-    }
-
-    if (args[0].isObject()) {
-        registry.setScopedVariants(helpers::variantsToPairs(rt, args[0].asObject(rt)));
-    }
-
-    return jsi::Value::undefined();
-}
-
 jsi::Value HybridShadowRegistry::setScopedTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     helpers::assertThat(rt, count == 1, "Unistyles: setScopedTheme expected 1 argument.");
-    
+
     auto& registry = core::UnistylesRegistry::get();
 
     if (args[0].isUndefined()) {
@@ -127,17 +123,8 @@ jsi::Value HybridShadowRegistry::setScopedTheme(jsi::Runtime &rt, const jsi::Val
 jsi::Value HybridShadowRegistry::getScopedTheme(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
     auto& registry = core::UnistylesRegistry::get();
     auto maybeScopedTheme = registry.getScopedTheme();
-    
+
     return maybeScopedTheme.has_value()
         ? jsi::String::createFromUtf8(rt, maybeScopedTheme.value())
         : jsi::Value::undefined();
 }
-
-jsi::Value HybridShadowRegistry::getVariants(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    auto& registry = core::UnistylesRegistry::get();
-    auto maybeScopedVariants = registry.getScopedVariants();
-    
-    return maybeScopedVariants.size() > 0
-        ? helpers::variantsToValue(rt, maybeScopedVariants)
-        : jsi::Value::undefined();
-}

package/cxx/hybridObjects/HybridShadowRegistry.h

@@ -20,10 +20,6 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
                             const jsi::Value& thisValue,
                             const jsi::Value* args,
                             size_t count);
-    jsi::Value selectVariants(jsi::Runtime& rt,
-                            const jsi::Value& thisValue,
-                            const jsi::Value* args,
-                            size_t count);
     jsi::Value setScopedTheme(jsi::Runtime& rt,
                             const jsi::Value& thisValue,
                             const jsi::Value* args,
@@ -32,10 +28,6 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
                             const jsi::Value& thisValue,
                             const jsi::Value* args,
                             size_t count);
-    jsi::Value getVariants(jsi::Runtime& rt,
-                            const jsi::Value& thisValue,
-                            const jsi::Value* args,
-                            size_t count);
 
     void loadHybridMethods() override {
         HybridUnistylesShadowRegistrySpec::loadHybridMethods();
@@ -43,10 +35,8 @@ struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
         registerHybrids(this, [](Prototype& prototype) {
             prototype.registerRawHybridMethod("link", 2, &HybridShadowRegistry::link);
             prototype.registerRawHybridMethod("unlink", 1, &HybridShadowRegistry::unlink);
-            prototype.registerRawHybridMethod("selectVariants", 1, &HybridShadowRegistry::selectVariants);
             prototype.registerRawHybridMethod("setScopedTheme", 1, &HybridShadowRegistry::setScopedTheme);
             prototype.registerRawHybridMethod("getScopedTheme", 0, &HybridShadowRegistry::getScopedTheme);
-            prototype.registerRawHybridMethod("getVariants", 0, &HybridShadowRegistry::getVariants);
         });
     };
 

package/cxx/hybridObjects/HybridStatusBar.cpp

@@ -1,13 +1,13 @@
 #include "HybridStatusBar.h"
 
 double HybridStatusBar::getWidth() {
-    return this->_nativePlatform.getStatusBarDimensions().width;
+    return this->_nativePlatform->getStatusBarDimensions().width;
 }
 
 double HybridStatusBar::getHeight() {
-    return this->_nativePlatform.getStatusBarDimensions().height;
+    return this->_nativePlatform->getStatusBarDimensions().height;
 }
 
 void HybridStatusBar::setHidden(bool isHidden) {
-    return this->_nativePlatform.setStatusBarHidden(isHidden);
+    this->_nativePlatform->setStatusBarHidden(isHidden);
 }

package/cxx/hybridObjects/HybridStatusBar.h

@@ -7,12 +7,12 @@
 using namespace margelo::nitro::unistyles;
 
 struct HybridStatusBar: public HybridUnistylesStatusBarSpec {
-    HybridStatusBar(Unistyles::HybridNativePlatformSpecCxx nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
+    HybridStatusBar(std::shared_ptr<HybridNativePlatformSpec> nativePlatform): HybridObject(TAG), _nativePlatform{nativePlatform} {}
 
     double getWidth() override;
     double getHeight() override;
     void setHidden(bool isHidden) override;
 
 private:
-    Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
+    std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;
 };

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -36,10 +36,7 @@ jsi::Value HybridStyleSheet::create(jsi::Runtime& rt, const jsi::Value &thisVal,
     parser.buildUnistyles(rt, registeredStyleSheet);
     parser.parseUnistyles(rt, registeredStyleSheet);
 
-    auto style = std::make_shared<core::HostStyle>(registeredStyleSheet, this->_unistylesRuntime);
-    auto styleHostObject = jsi::Object::createFromHostObject(rt, style);
-
-    return styleHostObject;
+    return core::toRNStyle(rt, registeredStyleSheet, this->_unistylesRuntime, {});
 }
 
 jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
@@ -80,6 +77,10 @@ jsi::Value HybridStyleSheet::configure(jsi::Runtime &rt, const jsi::Value &thisV
 }
 
 jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *arguments, size_t count) {
+    if (this->isInitialized) {
+        return jsi::Value::undefined();
+    }
+    
     // create new state
     auto& registry = core::UnistylesRegistry::get();
 
@@ -87,6 +88,8 @@ jsi::Value HybridStyleSheet::init(jsi::Runtime &rt, const jsi::Value &thisVal, c
 
     loadExternalMethods(thisVal, rt);
     registerHooks(rt);
+    
+    this->isInitialized = true;
 
     return jsi::Value::undefined();
 }
@@ -121,6 +124,10 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
             return;
         }
 
+        if (propertyName == "CSSVars") {
+            return;
+        }
+
         helpers::assertThat(rt, false, "StyleSheet.configure's settings received unexpected key: '" + std::string(propertyName) + "'");
     });
 }
@@ -250,8 +257,6 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
 
     if (dependencyMap.empty()) {
         this->notifyJSListeners(dependencies);
-
-        return;
     }
 
     // in a later step, we will rebuild only Unistyles with mounted StyleSheets
@@ -260,6 +265,13 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
     auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, dependencies);
 
     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);
 
     this->notifyJSListeners(dependencies);
@@ -296,8 +308,6 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
 
         if (dependencyMap.empty()) {
             this->notifyJSListeners(unistyleDependencies);
-
-            return;
         }
 
         // in a later step, we will rebuild only Unistyles with mounted StyleSheets
@@ -306,6 +316,13 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
         auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, unistyleDependencies);
 
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);
+
+        // 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);
 
         this->notifyJSListeners(unistyleDependencies);

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -4,7 +4,7 @@
 #include <jsi/jsi.h>
 #include "HybridUnistylesRuntime.h"
 #include "HybridUnistylesStyleSheetSpec.hpp"
-#include "HostStyle.h"
+#include "RNStyle.h"
 #include "Helpers.h"
 #include "Constants.h"
 #include "Breakpoints.h"
@@ -73,6 +73,7 @@ private:
     void onImeChange(UnistylesNativeMiniRuntime miniRuntime);
     void notifyJSListeners(std::vector<UnistyleDependency>& dependencies);
 
+    bool isInitialized = false;
     double __unid = -1;
     std::vector<std::unique_ptr<const std::function<void(std::vector<UnistyleDependency>&)>>> _changeListeners{};
     std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -4,7 +4,7 @@
 using namespace margelo::nitro::unistyles;
 
 ColorScheme HybridUnistylesRuntime::getColorScheme() {
-    auto colorScheme = this->_nativePlatform.getColorScheme();
+    auto colorScheme = this->_nativePlatform->getColorScheme();
 
     return static_cast<ColorScheme>(colorScheme);
 }
@@ -16,7 +16,7 @@ bool HybridUnistylesRuntime::getHasAdaptiveThemes() {
 };
 
 Dimensions HybridUnistylesRuntime::getScreen() {
-    return this->_nativePlatform.getScreenDimensions();
+    return this->_nativePlatform->getScreenDimensions();
 };
 
 std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
@@ -26,7 +26,7 @@ std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
 };
 
 std::string HybridUnistylesRuntime::getContentSizeCategory() {
-    return this->_nativePlatform.getContentSizeCategory();
+    return this->_nativePlatform->getContentSizeCategory();
 };
 
 std::optional<std::string> HybridUnistylesRuntime::getBreakpoint() {
@@ -36,25 +36,25 @@ std::optional<std::string> HybridUnistylesRuntime::getBreakpoint() {
 };
 
 bool HybridUnistylesRuntime::getRtl() {
-    return this->_nativePlatform.getPrefersRtlDirection();
+    return this->_nativePlatform->getPrefersRtlDirection();
 }
 
 Insets HybridUnistylesRuntime::getInsets() {
-    return this->_nativePlatform.getInsets();
+    return this->_nativePlatform->getInsets();
 };
 
 Orientation HybridUnistylesRuntime::getOrientation() {
-    auto orientation = this->_nativePlatform.getOrientation();
+    auto orientation = this->_nativePlatform->getOrientation();
 
     return static_cast<Orientation>(orientation);
 };
 
 double HybridUnistylesRuntime::getPixelRatio() {
-    return this->_nativePlatform.getPixelRatio();
+    return this->_nativePlatform->getPixelRatio();
 };
 
 double HybridUnistylesRuntime::getFontScale() {
-    return this->_nativePlatform.getFontScale();
+    return this->_nativePlatform->getFontScale();
 };
 
 std::unordered_map<std::string, double> HybridUnistylesRuntime::getBreakpoints() {
@@ -133,7 +133,7 @@ jsi::Value HybridUnistylesRuntime::getTheme(jsi::Runtime &rt, const jsi::Value &
         if (args[0].isUndefined()) {
             return state.getCurrentJSTheme();
         }
-        
+
         helpers::assertThat(rt, args[0].isString(), "UnistylesRuntime.getTheme expected to be called with string.");
 
         auto themeName = args[0].asString(rt).utf8(rt);
@@ -164,11 +164,11 @@ jsi::Value HybridUnistylesRuntime::updateTheme(jsi::Runtime &rt, const jsi::Valu
 }
 
 void HybridUnistylesRuntime::setImmersiveMode(bool isEnabled) {
-    this->_nativePlatform.setImmersiveMode(isEnabled);
+    this->_nativePlatform->setImmersiveMode(isEnabled);
 };
 
 void HybridUnistylesRuntime::setRootViewBackgroundColor(double color) {
-    this->_nativePlatform.setRootViewBackgroundColor(color);
+    this->_nativePlatform->setRootViewBackgroundColor(color);
 }
 
 jsi::Value HybridUnistylesRuntime::createHybridStatusBar(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
@@ -188,7 +188,7 @@ jsi::Value HybridUnistylesRuntime::createHybridNavigationBar(jsi::Runtime &rt, c
 }
 
 UnistylesCxxMiniRuntime HybridUnistylesRuntime::getMiniRuntime() {
-    UnistylesNativeMiniRuntime nativeMiniRuntime = this->_nativePlatform.getMiniRuntime();
+    UnistylesNativeMiniRuntime nativeMiniRuntime = this->_nativePlatform->getMiniRuntime();
     UnistylesCxxMiniRuntime cxxMiniRuntime{
         this->getThemeName(),
         this->getBreakpoint(),
@@ -260,16 +260,16 @@ void HybridUnistylesRuntime::registerPlatformListener(const std::function<void (
 }
 
 void HybridUnistylesRuntime::registerNativePlatformListener(const std::function<void(std::vector<UnistyleDependency>, UnistylesNativeMiniRuntime)>& listener) {
-    this->_nativePlatform.registerPlatformListener(listener);
+    this->_nativePlatform->registerPlatformListener(listener);
     this->_onNativeDependenciesChange = listener;
 }
 
 void HybridUnistylesRuntime::registerImeListener(const std::function<void(UnistylesNativeMiniRuntime)>& listener) {
-    this->_nativePlatform.registerImeListener(listener);
+    this->_nativePlatform->registerImeListener(listener);
 }
 
 void HybridUnistylesRuntime::unregisterNativePlatformListeners() {
-    this->_nativePlatform.unregisterPlatformListeners();
+    this->_nativePlatform->unregisterPlatformListeners();
 }
 
 void HybridUnistylesRuntime::includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps) {

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -13,7 +13,7 @@
 namespace margelo::nitro::unistyles {
 
 struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
-    HybridUnistylesRuntime(Unistyles::HybridNativePlatformSpecCxx nativePlatform, jsi::Runtime& rt, std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread)
+    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)) {}
 
     jsi::Value getTheme(jsi::Runtime& rt,
@@ -78,7 +78,7 @@ private:
     jsi::Runtime* _rt;
     std::shared_ptr<HybridNavigationBar> _navigationBar;
     std::shared_ptr<HybridStatusBar> _statusBar;
-    Unistyles::HybridNativePlatformSpecCxx _nativePlatform;
+    std::shared_ptr<HybridNativePlatformSpec> _nativePlatform;
     std::function<void(std::vector<UnistyleDependency>)> _onDependenciesChange;
     std::function<void(std::vector<UnistyleDependency>, UnistylesNativeMiniRuntime)> _onNativeDependenciesChange;
 };

package/cxx/parser/Parser.cpp

@@ -18,6 +18,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
 
         if (styleValue.isFunction(rt)) {
             styleSheet->unistyles[styleKey] = std::make_shared<UnistyleDynamicFunction>(
+                helpers::HashGenerator::generateHash(styleKey),
                 UnistyleType::DynamicFunction,
                 styleKey,
                 styleValue,
@@ -28,6 +29,7 @@ void parser::Parser::buildUnistyles(jsi::Runtime& rt, std::shared_ptr<StyleSheet
         }
 
         styleSheet->unistyles[styleKey] = std::make_shared<Unistyle>(
+            helpers::HashGenerator::generateHash(styleKey),
             UnistyleType::Object,
             styleKey,
             styleValue,
@@ -301,7 +303,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
                 );
             } else {
                 unistyle->rawValue = parsedStyleSheetsWithDefaultTheme[unistyleStyleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
-                this->rebuildUnistyle(rt, unistyleStyleSheet, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
+                this->rebuildUnistyle(rt, unistyle, unistyleData->variants, unistyleData->dynamicFunctionMetadata);
                 unistyleData->parsedStyle = jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
             }
 
@@ -317,13 +319,14 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
         for (auto& [_, unistyle] : styleSheet->unistyles) {
             if (!parsedUnistyles.contains(unistyle)) {
                 unistyle->rawValue = parsedStyleSheetsWithDefaultTheme[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
+                unistyle->isDirty = true;
             }
         }
     }
 }
 
 // rebuild single unistyle
-void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>> metadata) {
+void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>> metadata) {
     if (unistyle->type == core::UnistyleType::Object) {
         auto result = this->parseFirstLevel(rt, unistyle, variants);
 
@@ -358,6 +361,10 @@ void parser::Parser::rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleShee
         unistyleFn->unprocessedValue = std::move(functionResult);
         unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
     }
+    
+    if (unistyle->isDirty) {
+        unistyle->isDirty = false;
+    }
 }
 
 // convert dependency map to shadow tree updates
@@ -508,36 +515,22 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
 
             // memoize metadata to call it later
             auto unistyleFn = std::dynamic_pointer_cast<UnistyleDynamicFunction>(unistyle);
-            auto& registry = core::UnistylesRegistry::get();
 
             unistyleFn->unprocessedValue = jsi::Value(rt, result).asObject(rt);
 
-            jsi::Value rawVariants = thisObject.hasProperty(rt, helpers::STYLE_VARIANTS.c_str())
-                ? thisObject.getProperty(rt, helpers::STYLE_VARIANTS.c_str())
-                : jsi::Value::undefined();
-            std::optional<Variants> variants = rawVariants.isUndefined()
-                ? registry.getScopedVariants()
-                : std::optional<Variants>(helpers::variantsToPairs(rt, rawVariants.asObject(rt)));
+            jsi::Value rawVariants = thisObject.hasProperty(rt, helpers::STYLESHEET_VARIANTS.c_str())
+                ? thisObject.getProperty(rt, helpers::STYLESHEET_VARIANTS.c_str())
+                : jsi::Object(rt);
+
+            Variants variants = helpers::variantsToPairs(rt, rawVariants.asObject(rt));
 
             unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
             unistyleFn->seal();
 
-            jsi::Object style = jsi::Value(rt, unistyleFn->parsedStyle.value()).asObject(rt);
-
-            // include dependencies for createUnistylesComponent
-            style.setProperty(rt, "__proto__", generateUnistylesPrototype(rt, unistylesRuntime, unistyle, variants, helpers::functionArgumentsToArray(rt, args, count)));
-
-            jsi::Object secrets = jsi::Object(rt);
-
-            secrets.setProperty(rt, helpers::ARGUMENTS.c_str(), helpers::functionArgumentsToArray(rt, args, count));
-
-            helpers::defineHiddenProperty(rt, style, helpers::SECRETS.c_str(), secrets);
-
-            auto wrappedUnistyle = std::make_shared<UnistyleWrapper>(unistyle);
-
-            style.setNativeState(rt, std::move(wrappedUnistyle));
+            // for compatibility purpose save last arguments to style instance. It will work ok, if user sees warning about multiple unistyles
+            helpers::defineHiddenProperty(rt, thisObject, helpers::ARGUMENTS.c_str() + std::string("_") + unistyleFn->styleKey, helpers::functionArgumentsToArray(rt, args, count));
 
-            return style;
+            return core::objectFromUnistyle(rt, unistylesRuntime, unistyle, variants, std::make_optional<jsi::Array>(helpers::functionArgumentsToArray(rt, args, count))).asObject(rt);
     });
 }