react-native-unistyles 3.0.0-alpha.19 → 3.0.0-alpha.20

package/cxx/common/Constants.h

@@ -7,5 +7,6 @@ static const std::string ADD_VARIANTS_FN = "useVariants";
 static const std::string STYLE_DEPENDENCIES = "uni__dependencies";
 static const std::string STYLE_VARIANTS = "uni__variants";
 static const std::string WEB_STYLE_KEY = "_web";
+static const std::string EXOTIC_STYLE_KEY = "_exotic";
 
 }

package/cxx/common/Helpers.h

@@ -20,11 +20,11 @@ inline void assertThat(jsi::Runtime& rt, bool condition, const std::string& mess
 inline void enumerateJSIObject(jsi::Runtime& rt, const jsi::Object& obj, std::function<void(const std::string& propertyName, jsi::Value& propertyValue)> callback) {
     jsi::Array propertyNames = obj.getPropertyNames(rt);
     size_t length = propertyNames.size(rt);
-    
+
     for (size_t i = 0; i < length; i++) {
         auto propertyName = propertyNames.getValueAtIndex(rt, i).asString(rt).utf8(rt);
         auto propertyValue = obj.getProperty(rt, propertyName.c_str());
-        
+
         callback(propertyName, propertyValue);
     }
 }
@@ -32,15 +32,15 @@ inline void enumerateJSIObject(jsi::Runtime& rt, const jsi::Object& obj, std::fu
 template<typename PropertyType>
 inline bool vecContainsKeys(std::vector<PropertyType>& vec, std::vector<PropertyType>&& keys) {
     std::unordered_set<PropertyType> availableKeys(keys.begin(), keys.end());
-    
+
     for (const auto& key : vec) {
         availableKeys.erase(key);
-        
+
         if (availableKeys.empty()) {
             return true;
         }
     }
-    
+
     return false;
 }
 
@@ -118,11 +118,11 @@ inline Variants variantsToPairs(jsi::Runtime& rt, jsi::Object&& variants) {
 
 inline jsi::Object variantsToValue(jsi::Runtime& rt, Variants& variants) {
     jsi::Object rawVariants = jsi::Object(rt);
-    
+
     std::for_each(variants.begin(), variants.end(), [&](std::pair<std::string, std::string>& pair){
         rawVariants.setProperty(rt, pair.first.c_str(), jsi::String::createFromUtf8(rt, pair.second));
     });
-    
+
     return rawVariants;
 }
 

package/cxx/core/HostStyle.cpp

@@ -28,7 +28,7 @@ jsi::Value HostStyle::get(jsi::Runtime& rt, const jsi::PropNameID& propNameId) {
     }
 
     if (this->_styleSheet->unistyles.contains(propertyName)) {
-        return valueFromUnistyle(rt, this->_styleSheet->unistyles[propertyName]);
+        return valueFromUnistyle(rt, this->_styleSheet->unistyles[propertyName], this->_styleSheet->tag);
     }
     
     if (propertyName == helpers::STYLE_VARIANTS) {

package/cxx/core/HostStyle.h

@@ -4,6 +4,7 @@
 #include "StyleSheet.h"
 #include "Constants.h"
 #include "Parser.h"
+#include "UnistyleWrapper.h"
 #include "HybridUnistylesRuntime.h"
 
 namespace margelo::nitro::unistyles::core {

package/cxx/core/StyleSheet.h

@@ -2,7 +2,6 @@
 
 #include <jsi/jsi.h>
 #include "Unistyle.h"
-#include "UnistyleWrapper.h"
 #include "Helpers.h"
 #include "Constants.h"
 

package/cxx/core/UnistyleWrapper.h

@@ -2,6 +2,7 @@
 
 #include <jsi/jsi.h>
 #include "Unistyle.h"
+#include "UnistylesRegistry.h"
 #include "Helpers.h"
 #include "Constants.h"
 
@@ -16,23 +17,90 @@ struct UnistyleWrapper: public jsi::NativeState {
     Unistyle::Shared unistyle;
 };
 
-inline static Unistyle::Shared unistyleFromValue(jsi::Runtime& rt, const jsi::Value& value) {
-    if (value.isNull()) {
+inline static std::string generateStyleKey(std::string& key, int tag) {
+    return std::string("__unid_").append(std::to_string(tag)).append("_").append(key).c_str();
+}
+
+inline static Unistyle::Shared unistyleFromKey(jsi::Runtime& rt, const std::string& key) {
+    std::string prefix = "__unid_";
+
+    if (key.substr(0, prefix.length()) != prefix) {
+        return nullptr;
+    }
+
+    std::string remaining = key.substr(prefix.length());
+
+    size_t underscorePos = remaining.find('_');
+
+    if (underscorePos == std::string::npos) {
         return nullptr;
     }
 
-    return value.getObject(rt).getNativeState<UnistyleWrapper>(rt)->unistyle;
+    std::string tagStr = remaining.substr(0, underscorePos);
+
+    auto& registry = UnistylesRegistry::get();
+    auto tag = std::stoi(tagStr);
+    auto styleKey = remaining.substr(underscorePos + 1);
+
+    return registry.findUnistyleFromKey(rt, styleKey, tag);
+}
+
+inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, jsi::Object& value) {
+    auto exoticUnistyle = std::make_shared<Unistyle>(
+        UnistyleType::Object,
+        helpers::EXOTIC_STYLE_KEY,
+        value,
+        nullptr
+    );
+
+    exoticUnistyle->seal();
+
+    return exoticUnistyle;
+}
+
+
+inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(jsi::Runtime& rt, jsi::Object& value) {
+    std::vector<Unistyle::Shared> foundUnistyles{};
+
+    helpers::enumerateJSIObject(rt, value, [&](const std::string& key, jsi::Value& value){
+        auto maybeUnistyle = unistyleFromKey(rt, key);
+
+        if (maybeUnistyle != nullptr) {
+            foundUnistyles.emplace_back(maybeUnistyle);
+        }
+    });
+
+    if (foundUnistyles.size() == 0) {
+        return {unistyleFromStaticStyleSheet(rt, value)};
+    }
+
+    return foundUnistyles;
 }
 
-inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle) {
+inline static std::vector<Unistyle::Shared> unistyleFromValue(jsi::Runtime& rt, const jsi::Value& value) {
+    if (value.isNull()) {
+        return {};
+    }
+
+    auto obj = value.getObject(rt);
+
+    // possible if user used React Native styles or inline styles or did spread styles
+    if (!obj.hasNativeState(rt)) {
+        return unistylesFromNonExistentNativeState(rt, obj);
+    }
+
+    return {value.getObject(rt).getNativeState<UnistyleWrapper>(rt)->unistyle};
+}
+
+inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, int tag) {
     auto wrappedUnistyle = std::make_shared<UnistyleWrapper>(unistyle);
 
     if (unistyle->type == UnistyleType::Object) {
         jsi::Object obj = jsi::Object(rt);
-
+       
         obj.setNativeState(rt, std::move(wrappedUnistyle));
-        helpers::defineHiddenProperty(rt, obj, helpers::UNISTYLES_ID.c_str(), unistyle->styleKey);
-
+        obj.setProperty(rt, std::string("__unid_").append(std::to_string(tag)).append("_").append(unistyle->styleKey).c_str(), jsi::Value::undefined());
+        
         helpers::mergeJSIObjects(rt, obj, unistyle->parsedStyle.value());
 
         return obj;
@@ -42,8 +110,8 @@ inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared un
     auto hostFn = jsi::Value(rt, unistyleFn->proxiedFunction.value()).asObject(rt).asFunction(rt);
 
     hostFn.setNativeState(rt, std::move(wrappedUnistyle));
-    helpers::defineHiddenProperty(rt, hostFn, helpers::UNISTYLES_ID.c_str(), unistyleFn->styleKey);
-
+    hostFn.setProperty(rt, std::string("__unid_").append(std::to_string(tag)).append("_").append(unistyleFn->styleKey).c_str(), jsi::Value::undefined());
+    
     return std::move(hostFn);
 }
 

package/cxx/core/UnistylesRegistry.cpp

@@ -74,7 +74,7 @@ void core::UnistylesRegistry::updateTheme(jsi::Runtime& rt, std::string& themeNa
 void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
     jsi::Runtime& rt,
     const ShadowNodeFamily* shadowNodeFamily,
-    const core::Unistyle::Shared unistyle,
+    std::vector<core::Unistyle::Shared>& unistyles,
     Variants& variants,
     std::vector<folly::dynamic>& arguments
 ) {
@@ -82,22 +82,23 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
         this->_shadowRegistry[&rt][shadowNodeFamily] = {};
     }
 
-    this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(std::make_shared<UnistyleData>(unistyle, variants, arguments));
+    std::for_each(unistyles.begin(), unistyles.end(), [&, this](Unistyle::Shared unistyle){
+        this->_shadowRegistry[&rt][shadowNodeFamily].emplace_back(std::make_shared<UnistyleData>(unistyle, variants, arguments));
+    });
 }
 
-void core::UnistylesRegistry::unlinkShadowNodeWithUnistyle(
-    jsi::Runtime& rt,
-    const ShadowNodeFamily* shadowNodeFamily,
-    const core::Unistyle::Shared unistyle
-) {
-    auto& unistylesVec = this->_shadowRegistry[&rt][shadowNodeFamily];
-    auto it = std::find_if(unistylesVec.begin(), unistylesVec.end(), [unistyle](std::shared_ptr<UnistyleData> unistyleData){
-        return unistyleData->unistyle == unistyle;
-    });
+void core::UnistylesRegistry::unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily* shadowNodeFamily) {
+    this->_shadowRegistry[&rt][shadowNodeFamily].clear();
+}
 
-    if (it != unistylesVec.end()) {
-        this->_shadowRegistry[&rt][shadowNodeFamily].erase(it);
+core::Unistyle::Shared core::UnistylesRegistry::findUnistyleFromKey(jsi::Runtime& rt, std::string styleKey, int tag) {
+    auto targetStyleSheet = this->_styleSheetRegistry[&rt][tag];
+    
+    if (targetStyleSheet == nullptr) {
+        return nullptr;
     }
+    
+    return targetStyleSheet.get()->unistyles[styleKey];
 }
 
 std::shared_ptr<core::StyleSheet> core::UnistylesRegistry::addStyleSheet(jsi::Runtime& rt, int unid, core::StyleSheetType type, jsi::Object&& rawValue) {

package/cxx/core/UnistylesRegistry.h

@@ -36,10 +36,11 @@ struct UnistylesRegistry: public StyleSheetRegistry {
 
     UnistylesState& getState(jsi::Runtime& rt);
     void createState(jsi::Runtime& rt);
-    void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, const core::Unistyle::Shared, Variants& variants, std::vector<folly::dynamic>&);
-    void unlinkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, const core::Unistyle::Shared);
+    void linkShadowNodeWithUnistyle(jsi::Runtime& rt, const ShadowNodeFamily*, std::vector<core::Unistyle::Shared>& unistyles, Variants& variants, std::vector<folly::dynamic>&);
+    void unlinkShadowNodeWithUnistyles(jsi::Runtime& rt, const ShadowNodeFamily*);
     std::shared_ptr<core::StyleSheet> addStyleSheet(jsi::Runtime& rt, int tag, core::StyleSheetType type, jsi::Object&& rawValue);
     DependencyMap buildDependencyMap(jsi::Runtime& rt, std::vector<UnistyleDependency>& deps);
+    Unistyle::Shared findUnistyleFromKey(jsi::Runtime& rt, std::string styleKey, int tag);
     DependencyMap buildDependencyMap(jsi::Runtime& rt);
     shadow::ShadowTrafficController trafficController{};
     

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -7,27 +7,26 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     helpers::assertThat(rt, count == 4, "Unistyles: Invalid babel transform 'ShadowRegistry link' expected 4 arguments.");
 
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
-    core::Unistyle::Shared unistyleWrapper = core::unistyleFromValue(rt, args[1]);
+    std::vector<core::Unistyle::Shared> unistyleWrappers = core::unistyleFromValue(rt, args[1]);
     core::Variants variants = helpers::variantsToPairs(rt, args[2].asObject(rt));
     auto rawArguments = args[3].asObject(rt).asArray(rt);
     std::vector<folly::dynamic> arguments = helpers::parseDynamicFunctionArguments(rt, rawArguments);
 
     auto& registry = core::UnistylesRegistry::get();
 
-    registry.linkShadowNodeWithUnistyle(rt, &shadowNodeWrapper->getFamily(), unistyleWrapper, variants, arguments);
+    registry.linkShadowNodeWithUnistyle(rt, &shadowNodeWrapper->getFamily(), unistyleWrappers, variants, arguments);
 
     return jsi::Value::undefined();
 }
 
 jsi::Value HybridShadowRegistry::unlink(jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count) {
-    helpers::assertThat(rt, count == 2, "Unistyles: Invalid babel transform 'ShadowRegistry unlink' expected 2 arguments.");
+    helpers::assertThat(rt, count == 1, "Unistyles: Invalid babel transform 'ShadowRegistry unlink' expected 1 arguments.");
 
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
-    core::Unistyle::Shared unistyleWrapper = core::unistyleFromValue(rt, args[1]);
 
     auto& registry = core::UnistylesRegistry::get();
 
-    registry.unlinkShadowNodeWithUnistyle(rt, &shadowNodeWrapper->getFamily(), unistyleWrapper);
+    registry.unlinkShadowNodeWithUnistyles(rt, &shadowNodeWrapper->getFamily());
 
     return jsi::Value::undefined();
 }

package/cxx/parser/Parser.cpp

@@ -105,13 +105,21 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
     for (auto& [shadowNode, unistyles] : dependencyMap) {
         auto styleSheet = unistyles.begin()->get()->unistyle->parent;
 
-        if (!parsedStyleSheets.contains(styleSheet)) {
+        // stylesheet may be optional for exotic unistyles
+        if (styleSheet != nullptr && !parsedStyleSheets.contains(styleSheet)) {
             parsedStyleSheets.emplace(styleSheet, this->unwrapStyleSheet(rt, styleSheet));
         }
 
         for (auto& unistyleData : unistyles) {
             auto& unistyle = unistyleData->unistyle;
 
+            // for RN styles or inline styles, compute styles only once
+            if (unistyle->styleKey == helpers::EXOTIC_STYLE_KEY.c_str() && !unistyleData->parsedStyle.has_value()) {
+                unistyleData->parsedStyle = jsi::Value(rt, unistyle->rawValue).asObject(rt);
+
+                continue;
+            }
+
             // StyleSheet might have styles that are not affected
             if (!parsedStyleSheets[styleSheet].asObject(rt).hasProperty(rt, unistyle->styleKey.c_str())) {
                 continue;
@@ -625,7 +633,7 @@ RawProps parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, const s
             // todo this something happens with large dataset, debug it
             continue;
         }
-        
+
         helpers::enumerateJSIObject(rt, unistyleData->parsedStyle.value(), [&](const std::string& propertyName, jsi::Value& propertyValue){
             if (this->isColor(propertyName)) {
                 return convertedStyles.setProperty(rt, propertyName.c_str(), jsi::Value(state.parseColor(propertyValue)));

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

@@ -19,45 +19,13 @@ HybridShadowRegistry.add = (handle, style, variants, args) => {
   if (!handle || !style) {
     return;
   }
-
-  // at this point unistyle can be only object or dynamic function
-  if (typeof style !== 'object' && typeof style !== 'function') {
-    return;
-  }
-  if (!style.__unid) {
-    console.warn(`Unistyles: Style is not bound!
-
-Potential reasons:
-a) You created a new Expo or React Native project that references StyleSheet from React Native
-b) You used the spread operator on a Unistyle style outside of a JSX component
-c) You're mixing StyleSheet styles from React Native with Unistyles
-
-a) For new projects
-If you're using a freshly generated project, replace StyleSheet imports from React Native with Unistyles:
-
-- import { StyleSheet } from 'react-native'
-+ import { StyleSheet } from 'react-native-unistyles'
-
-b) Merging styles
-If you need to merge styles, do it within the style prop of your JSX component:
-
-style={{...styles.container, ...styles.otherProp}}
-or
-style={[styles.container, styles.otherProp]}
-
-Copying a Unistyle style outside of a JSX element will remove its internal C++ state, leading to unexpected behavior.
-
-c) Mixing styles
-If you're mixing React Native and Unistyle StyleSheet styles, move your static styles into Unistyles to avoid conflicts.\n`);
-    return;
-  }
   HybridShadowRegistry.link(findShadowNodeForHandle(handle), style, variants ?? {}, args ?? []);
 };
-HybridShadowRegistry.remove = (handle, style) => {
-  if (!handle || !style?.__unid) {
+HybridShadowRegistry.remove = handle => {
+  if (!handle) {
     return;
   }
-  HybridShadowRegistry.unlink(findShadowNodeForHandle(handle), style);
+  HybridShadowRegistry.unlink(findShadowNodeForHandle(handle));
 };
 const UnistylesShadowRegistry = exports.UnistylesShadowRegistry = HybridShadowRegistry;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeNitroModules","require","HybridShadowRegistry","NitroModules","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","__unid","console","warn","link","remove","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAaA,MAAMC,oBAAoB,GAAGC,qCAAY,CAACC,kBAAkB,CAAiB,yBAAyB,CAAC;AAEvG,MAAMC,uBAAuB,GAAIC,MAAkB,IAAK;EACpD,MAAMC,IAAI,GAAGD,MAAM,EAAEE,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACvDD,MAAM,EAAEI,kBAAkB,GAAG,CAAC,EAAEC,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACjGD,MAAM,EAAEK,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI;EAEhF,IAAI,CAACA,IAAI,EAAE;IACP;IACA,MAAM,IAAIK,KAAK,CAAC,uDAAuD,CAAC;EAC5E;EAEA,OAAOL,IAAI;AACf,CAAC;AAEDL,oBAAoB,CAACW,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D;EACA,IAAI,CAACV,MAAM,IAAI,CAACQ,KAAK,EAAE;IACnB;EACJ;;EAEA;EACA,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,UAAU,EAAE;IAC1D;EACJ;EAEA,IAAI,CAACA,KAAK,CAACG,MAAM,EAAE;IACfC,OAAO,CAACC,IAAI,CAAC;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,2HAA2H,CAAC;IAEpH;EACJ;EAEAjB,oBAAoB,CAACkB,IAAI,CAACf,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDd,oBAAoB,CAACmB,MAAM,GAAG,CAACf,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEG,MAAM,EAAE;IAC3B;EACJ;EAEAf,oBAAoB,CAACoB,MAAM,CAACjB,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQM,MAAMS,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAGrB,oBAA4D","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","HybridShadowRegistry","NitroModules","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","link","remove","unlink","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAaA,MAAMC,oBAAoB,GAAGC,qCAAY,CAACC,kBAAkB,CAAiB,yBAAyB,CAAC;AAEvG,MAAMC,uBAAuB,GAAIC,MAAkB,IAAK;EACpD,MAAMC,IAAI,GAAGD,MAAM,EAAEE,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACvDD,MAAM,EAAEI,kBAAkB,GAAG,CAAC,EAAEC,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACjGD,MAAM,EAAEK,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI;EAEhF,IAAI,CAACA,IAAI,EAAE;IACP;IACA,MAAM,IAAIK,KAAK,CAAC,uDAAuD,CAAC;EAC5E;EAEA,OAAOL,IAAI;AACf,CAAC;AAEDL,oBAAoB,CAACW,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D;EACA,IAAI,CAACV,MAAM,IAAI,CAACQ,KAAK,EAAE;IACnB;EACJ;EAEAZ,oBAAoB,CAACe,IAAI,CAACZ,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDd,oBAAoB,CAACgB,MAAM,GAAGZ,MAAM,IAAI;EACpC,IAAI,CAACA,MAAM,EAAE;IACT;EACJ;EAEAJ,oBAAoB,CAACiB,MAAM,CAACd,uBAAuB,CAACC,MAAM,CAAC,CAAC;AAChE,CAAC;AAQM,MAAMc,uBAAuB,GAAAC,OAAA,CAAAD,uBAAA,GAAGlB,oBAA4D","ignoreList":[]}

package/lib/commonjs/web/createUnistylesComponent.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.createUnistylesComponent = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("./utils");
-var _runtime = require("./runtime");
 var _variants = require("./variants");
 var _listener = require("./listener");
+var _registry = require("./registry");
 var _jsxRuntime = require("react/jsx-runtime");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -23,7 +23,7 @@ const getStyles = value => {
     __uni__args = [],
     __uni__variants
   }) => {
-    const newComputedStylesheet = typeof __uni__stylesheet === 'function' ? __uni__stylesheet(_runtime.UnistylesRuntime.theme, _runtime.UnistylesRuntime.miniRuntime) : __uni__stylesheet;
+    const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
     const style = newComputedStylesheet[__uni__key];
     const resultHidden = typeof style === 'function' ? style(...__uni__args) : style;
     const result = (0, _utils.extractHiddenProperties)(resultHidden);

package/lib/commonjs/web/createUnistylesComponent.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_runtime","_variants","_listener","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getStyles","value","secrets","extractSecrets","length","undefined","reduce","acc","__uni__stylesheet","__uni__key","__uni__args","__uni__variants","newComputedStylesheet","UnistylesRuntime","theme","miniRuntime","style","resultHidden","result","extractHiddenProperties","variants","fromEntries","getVariants","resultWithVariants","createUnistylesComponent","Component","props","passedStyles","setStyle","useState","useEffect","newStyles","dependencies","dispose","UnistylesListener","addListeners","jsx","exports"],"sourceRoot":"../../../src","sources":["web/createUnistylesComponent.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_variants","_listener","_registry","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getStyles","value","secrets","extractSecrets","length","undefined","reduce","acc","__uni__stylesheet","__uni__key","__uni__args","__uni__variants","newComputedStylesheet","UnistylesRegistry","getComputedStylesheet","style","resultHidden","result","extractHiddenProperties","variants","fromEntries","getVariants","resultWithVariants","createUnistylesComponent","Component","props","passedStyles","setStyle","useState","useEffect","newStyles","dependencies","dispose","UnistylesListener","addListeners","jsx","exports"],"sourceRoot":"../../../src","sources":["web/createUnistylesComponent.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AAA8C,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAR,wBAAAQ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAE9C,MAAMW,SAAS,GAAIC,KAA0B,IAAK;EAC9C,MAAMC,OAAO,GAAG,IAAAC,qBAAc,EAACF,KAAK,CAAC;EAErC,IAAIC,OAAO,CAACE,MAAM,KAAK,CAAC,EAAE;IACtB,OAAOC,SAAS;EACpB;EAEA,OAAOH,OAAO,CAACI,MAAM,CAAC,CAACC,GAAG,EAAE;IAAEC,iBAAiB;IAAEC,UAAU;IAAEC,WAAW,GAAG,EAAE;IAAEC;EAAgB,CAAC,KAAK;IACjG,MAAMC,qBAAqB,GAAGC,2BAAiB,CAACC,qBAAqB,CAACN,iBAAiB,CAAC;IACxF,MAAMO,KAAK,GAAGH,qBAAqB,CAACH,UAAU,CAAC;IAC/C,MAAMO,YAAY,GAAG,OAAOD,KAAK,KAAK,UAAU,GAC1CA,KAAK,CAAC,GAAGL,WAAW,CAAC,GACrBK,KAAK;IACX,MAAME,MAAM,GAAG,IAAAC,8BAAuB,EAACF,YAAY,CAAC;IACpD,MAAM;MAAEG;IAAS,CAAC,GAAG3B,MAAM,CAAC4B,WAAW,CAAC,IAAAC,qBAAW,EAAC;MAAEF,QAAQ,EAAEF;IAAO,CAAC,EAAEN,eAAgB,CAAC,CAAC;IAC5F,MAAMW,kBAAkB,GAAG;MACvB,GAAGL,MAAM;MACT,GAAGE;IACP,CAAC;IAED,OAAO;MACH,GAAGZ,GAAG;MACN,GAAGe;IACP,CAAC;EACL,CAAC,EAAE,CAAC,CAAwB,CAAC;AACjC,CAAC;AAEM,MAAMC,wBAAwB,GAA2BC,SAAsC,IAAMC,KAAa,IAAK;EAC1H,MAAMC,YAAY,GAAID,KAAK,CAA6CV,KAAK,IAAI,CAAC,CAAC;EACnF,MAAM,CAACA,KAAK,EAAEY,QAAQ,CAAC,GAAG,IAAAC,eAAQ,EAAC5B,SAAS,CAAC0B,YAAY,CAAC,CAAC;EAE3D,IAAAG,gBAAS,EAAC,MAAM;IACZ,MAAMC,SAAS,GAAG9B,SAAS,CAAC0B,YAAY,CAAC;IACzC,MAAMK,YAAY,GAAGD,SAAS,GAAG,mBAAmB,CAAC,IAAI,EAAE;IAC3D,MAAME,OAAO,GAAGC,2BAAiB,CAACC,YAAY,CAACH,YAAY,EAAE,MAAMJ,QAAQ,CAAC3B,SAAS,CAAC0B,YAAY,CAAC,CAAC,CAAC;IAErGC,QAAQ,CAACG,SAAS,CAAC;IAEnB,OAAOE,OAAO;EAClB,CAAC,EAAE,CAACN,YAAY,CAAC,CAAC;EAElB,oBACI,IAAA/C,WAAA,CAAAwD,GAAA,EAACX,SAAS;IAAA,GACFC,KAAK;IACTV,KAAK,EAAEA;EAAM,CAChB,CAAC;AAEV,CAAC;AAAAqB,OAAA,CAAAb,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/web/listener/listenToDependencies.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.listenToDependencies = void 0;
 var _listener = require("./listener");
-var _runtime = require("../runtime");
 var _utils = require("../utils");
 var _registry = require("../registry");
 const listenToDependencies = ({
@@ -15,7 +14,7 @@ const listenToDependencies = ({
   args = [],
   stylesheet
 }) => {
-  const newComputedStylesheet = typeof stylesheet === 'function' ? stylesheet(_runtime.UnistylesRuntime.theme, _runtime.UnistylesRuntime.miniRuntime) : stylesheet;
+  const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(stylesheet);
   const _value = (0, _utils.keyInObject)(newComputedStylesheet, key) ? newComputedStylesheet[key] : undefined;
   if (!_value) {
     return;
@@ -26,7 +25,7 @@ const listenToDependencies = ({
     return;
   }
   return _listener.UnistylesListener.addListeners(dependencies, () => {
-    const newComputedStylesheet = typeof stylesheet === 'function' ? stylesheet(_runtime.UnistylesRuntime.theme, _runtime.UnistylesRuntime.miniRuntime) : stylesheet;
+    const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(stylesheet);
     if (!(0, _utils.keyInObject)(newComputedStylesheet, key)) {
       return;
     }

package/lib/commonjs/web/listener/listenToDependencies.js.map

@@ -1 +1 @@
-{"version":3,"names":["_listener","require","_runtime","_utils","_registry","listenToDependencies","key","className","unistyles","args","stylesheet","newComputedStylesheet","UnistylesRuntime","theme","miniRuntime","_value","keyInObject","undefined","value","dependencies","length","UnistylesListener","addListeners","result","UnistylesRegistry","updateStyles","exports"],"sourceRoot":"../../../../src","sources":["web/listener/listenToDependencies.ts"],"mappings":";;;;;;AAGA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AAUO,MAAMI,oBAAoB,GAAGA,CAAC;EAAEC,GAAG;EAAEC,SAAS;EAAEC,SAAS;EAAEC,IAAI,GAAG,EAAE;EAAEC;AAAsC,CAAC,KAAK;EACrH,MAAMC,qBAAqB,GAAG,OAAOD,UAAU,KAAK,UAAU,GACxDA,UAAU,CAACE,yBAAgB,CAACC,KAAK,EAAED,yBAAgB,CAACE,WAAW,CAAC,GAChEJ,UAAU;EAChB,MAAMK,MAAM,GAAG,IAAAC,kBAAW,EAACL,qBAAqB,EAAEL,GAAG,CAAC,GAAGK,qBAAqB,CAACL,GAAG,CAAC,GAAGW,SAAS;EAE/F,IAAI,CAACF,MAAM,EAAE;IACT;EACJ;EAEA,MAAMG,KAAK,GAAG,OAAOH,MAAM,KAAK,UAAU,GAAGA,MAAM,CAAC,GAAGN,IAAI,CAAC,GAAGM,MAAM;EACrE,MAAMI,YAAY,GAAI,mBAAmB,IAAID,KAAK,GAAGA,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAgC;EAElH,IAAIC,YAAY,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B;EACJ;EAEA,OAAOC,2BAAiB,CAACC,YAAY,CAACH,YAAY,EAAE,MAAM;IACtD,MAAMR,qBAAqB,GAAG,OAAOD,UAAU,KAAK,UAAU,GACxDA,UAAU,CAACE,yBAAgB,CAACC,KAAK,EAAED,yBAAgB,CAACE,WAAW,CAAC,GAChEJ,UAAU;IAEhB,IAAI,CAAC,IAAAM,kBAAW,EAACL,qBAAqB,EAAEL,GAAG,CAAC,EAAE;MAC1C;IACJ;IAEA,MAAMY,KAAK,GAAGP,qBAAqB,CAACL,GAAG,CAAE;IACzC,MAAMiB,MAAM,GAAG,OAAOL,KAAK,KAAK,UAAU,GACpCA,KAAK,CAAC,GAAGT,IAAI,CAAC,GACdS,KAAK;IAEXM,2BAAiB,CAACC,YAAY,CAACjB,SAAS,EAAEe,MAAM,EAAEhB,SAAS,CAAC;EAChE,CAAC,CAAC;AACN,CAAC;AAAAmB,OAAA,CAAArB,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"version":3,"names":["_listener","require","_utils","_registry","listenToDependencies","key","className","unistyles","args","stylesheet","newComputedStylesheet","UnistylesRegistry","getComputedStylesheet","_value","keyInObject","undefined","value","dependencies","length","UnistylesListener","addListeners","result","updateStyles","exports"],"sourceRoot":"../../../../src","sources":["web/listener/listenToDependencies.ts"],"mappings":";;;;;;AAGA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AAUO,MAAMG,oBAAoB,GAAGA,CAAC;EAAEC,GAAG;EAAEC,SAAS;EAAEC,SAAS;EAAEC,IAAI,GAAG,EAAE;EAAEC;AAAsC,CAAC,KAAK;EACrH,MAAMC,qBAAqB,GAAGC,2BAAiB,CAACC,qBAAqB,CAACH,UAAU,CAAC;EACjF,MAAMI,MAAM,GAAG,IAAAC,kBAAW,EAACJ,qBAAqB,EAAEL,GAAG,CAAC,GAAGK,qBAAqB,CAACL,GAAG,CAAC,GAAGU,SAAS;EAE/F,IAAI,CAACF,MAAM,EAAE;IACT;EACJ;EAEA,MAAMG,KAAK,GAAG,OAAOH,MAAM,KAAK,UAAU,GAAGA,MAAM,CAAC,GAAGL,IAAI,CAAC,GAAGK,MAAM;EACrE,MAAMI,YAAY,GAAI,mBAAmB,IAAID,KAAK,GAAGA,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAgC;EAElH,IAAIC,YAAY,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B;EACJ;EAEA,OAAOC,2BAAiB,CAACC,YAAY,CAACH,YAAY,EAAE,MAAM;IACtD,MAAMP,qBAAqB,GAAGC,2BAAiB,CAACC,qBAAqB,CAACH,UAAU,CAAC;IAEjF,IAAI,CAAC,IAAAK,kBAAW,EAACJ,qBAAqB,EAAEL,GAAG,CAAC,EAAE;MAC1C;IACJ;IAEA,MAAMW,KAAK,GAAGN,qBAAqB,CAACL,GAAG,CAAE;IACzC,MAAMgB,MAAM,GAAG,OAAOL,KAAK,KAAK,UAAU,GACpCA,KAAK,CAAC,GAAGR,IAAI,CAAC,GACdQ,KAAK;IAEXL,2BAAiB,CAACW,YAAY,CAACf,SAAS,EAAEc,MAAM,EAAEf,SAAS,CAAC;EAChE,CAAC,CAAC;AACN,CAAC;AAAAiB,OAAA,CAAAnB,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/web/registry.js

@@ -6,7 +6,29 @@ Object.defineProperty(exports, "__esModule", {
 exports.UnistylesRegistry = void 0;
 var _typestyle = require("typestyle");
 var _convert = require("./convert");
+var _runtime = require("./runtime");
+var _utils = require("./utils");
+var _listener = require("./listener");
 class UnistylesRegistryBuilder {
+  stylesheets = new Map();
+  getComputedStylesheet = stylesheet => {
+    if (typeof stylesheet !== 'function') {
+      return stylesheet;
+    }
+    const computedStylesheet = this.stylesheets.get(stylesheet);
+    if (computedStylesheet) {
+      return computedStylesheet;
+    }
+    const createdStylesheet = stylesheet(_runtime.UnistylesRuntime.theme, _runtime.UnistylesRuntime.miniRuntime);
+    // @ts-expect-error uni__dependencies is hidden
+    const dependencies = Object.values(createdStylesheet).flatMap(value => (0, _utils.keyInObject)(value, 'uni__dependencies') ? value.uni__dependencies : []);
+    _listener.UnistylesListener.addListeners(dependencies, () => {
+      const newComputedStylesheet = stylesheet(_runtime.UnistylesRuntime.theme, _runtime.UnistylesRuntime.miniRuntime);
+      this.stylesheets.set(stylesheet, newComputedStylesheet);
+    });
+    this.stylesheets.set(stylesheet, createdStylesheet);
+    return createdStylesheet;
+  };
   createStyles = (stylesheet, key) => {
     const unistyles = (0, _typestyle.createTypeStyle)();
     const typestyleStylesheet = (0, _convert.convertToTypeStyle)(stylesheet);

package/lib/commonjs/web/registry.js.map

@@ -1 +1 @@
-{"version":3,"names":["_typestyle","require","_convert","UnistylesRegistryBuilder","createStyles","stylesheet","key","unistyles","createTypeStyle","typestyleStylesheet","convertToTypeStyle","className","style","$debugName","Math","random","toString","slice","updateStyles","reinit","cssRule","UnistylesRegistry","exports"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AAEA,MAAME,wBAAwB,CAAC;EAC3BC,YAAY,GAAGA,CAACC,UAA2B,EAAEC,GAAW,KAAK;IACzD,MAAMC,SAAS,GAAG,IAAAC,0BAAe,EAAC,CAAC;IACnC,MAAMC,mBAAmB,GAAG,IAAAC,2BAAkB,EAACL,UAAU,CAAC;IAE1D,MAAMM,SAAS,GAAGJ,SAAS,CAACK,KAAK,CAAC;MAC9BC,UAAU,EAAE,GAAGP,GAAG,IAAIQ,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,EAAE,CAAC;IAC9D,CAAC,EAAER,mBAAmB,CAAC;IAEvB,OAAO;MACHE,SAAS;MACTJ;IACJ,CAAC;EACL,CAAC;EAEDW,YAAY,GAAGA,CAACX,SAAoB,EAAEF,UAA2B,EAAEM,SAAiB,KAAK;IACrF,MAAMF,mBAAmB,GAAG,IAAAC,2BAAkB,EAACL,UAAU,CAAC;IAE1DE,SAAS,CAACY,MAAM,CAAC,CAAC;IAClBZ,SAAS,CAACa,OAAO,CAAC,IAAIT,SAAS,EAAE,EAAEF,mBAAmB,CAAC;EAC3D,CAAC;AACL;AAEO,MAAMY,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,GAAG,IAAIlB,wBAAwB,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_typestyle","require","_convert","_runtime","_utils","_listener","UnistylesRegistryBuilder","stylesheets","Map","getComputedStylesheet","stylesheet","computedStylesheet","get","createdStylesheet","UnistylesRuntime","theme","miniRuntime","dependencies","Object","values","flatMap","value","keyInObject","uni__dependencies","UnistylesListener","addListeners","newComputedStylesheet","set","createStyles","key","unistyles","createTypeStyle","typestyleStylesheet","convertToTypeStyle","className","style","$debugName","Math","random","toString","slice","updateStyles","reinit","cssRule","UnistylesRegistry","exports"],"sourceRoot":"../../../src","sources":["web/registry.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AAEA,MAAMK,wBAAwB,CAAC;EACnBC,WAAW,GAAG,IAAIC,GAAG,CAAoD,CAAC;EAElFC,qBAAqB,GAAIC,UAAiD,IAAK;IAC3E,IAAI,OAAOA,UAAU,KAAK,UAAU,EAAE;MAClC,OAAOA,UAAU;IACrB;IAEA,MAAMC,kBAAkB,GAAG,IAAI,CAACJ,WAAW,CAACK,GAAG,CAACF,UAAU,CAAC;IAE3D,IAAIC,kBAAkB,EAAE;MACpB,OAAOA,kBAAkB;IAC7B;IAEA,MAAME,iBAAiB,GAAGH,UAAU,CAACI,yBAAgB,CAACC,KAAK,EAAED,yBAAgB,CAACE,WAAW,CAAC;IAC1F;IACA,MAAMC,YAAY,GAAGC,MAAM,CAACC,MAAM,CAACN,iBAAiB,CAAC,CAACO,OAAO,CAACC,KAAK,IAAI,IAAAC,kBAAW,EAACD,KAAK,EAAE,mBAAmB,CAAC,GAAGA,KAAK,CAACE,iBAAiB,GAAG,EAAE,CAAC;IAE9IC,2BAAiB,CAACC,YAAY,CAACR,YAAY,EAAE,MAAM;MAC/C,MAAMS,qBAAqB,GAAGhB,UAAU,CAACI,yBAAgB,CAACC,KAAK,EAAED,yBAAgB,CAACE,WAAW,CAAC;MAE9F,IAAI,CAACT,WAAW,CAACoB,GAAG,CAACjB,UAAU,EAAEgB,qBAAqB,CAAC;IAC3D,CAAC,CAAC;IAEF,IAAI,CAACnB,WAAW,CAACoB,GAAG,CAACjB,UAAU,EAAEG,iBAAiB,CAAC;IAEnD,OAAOA,iBAAiB;EAC5B,CAAC;EAEDe,YAAY,GAAGA,CAAClB,UAA2B,EAAEmB,GAAW,KAAK;IACzD,MAAMC,SAAS,GAAG,IAAAC,0BAAe,EAAC,CAAC;IACnC,MAAMC,mBAAmB,GAAG,IAAAC,2BAAkB,EAACvB,UAAU,CAAC;IAE1D,MAAMwB,SAAS,GAAGJ,SAAS,CAACK,KAAK,CAAC;MAC9BC,UAAU,EAAE,GAAGP,GAAG,IAAIQ,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,EAAE,CAAC;IAC9D,CAAC,EAAER,mBAAmB,CAAC;IAEvB,OAAO;MACHE,SAAS;MACTJ;IACJ,CAAC;EACL,CAAC;EAEDW,YAAY,GAAGA,CAACX,SAAoB,EAAEpB,UAA2B,EAAEwB,SAAiB,KAAK;IACrF,MAAMF,mBAAmB,GAAG,IAAAC,2BAAkB,EAACvB,UAAU,CAAC;IAE1DoB,SAAS,CAACY,MAAM,CAAC,CAAC;IAClBZ,SAAS,CAACa,OAAO,CAAC,IAAIT,SAAS,EAAE,EAAEF,mBAAmB,CAAC;EAC3D,CAAC;AACL;AAEO,MAAMY,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,GAAG,IAAItC,wBAAwB,CAAC,CAAC","ignoreList":[]}

package/lib/commonjs/web/shadowRegistry.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.UnistylesShadowRegistry = void 0;
 var _listener = require("./listener");
 var _registry = require("./registry");
-var _runtime = require("./runtime");
 var _utils = require("./utils");
 var _variants2 = require("./variants");
 class UnistylesShadowRegistryBuilder {
@@ -66,7 +65,7 @@ class UnistylesShadowRegistryBuilder {
         __uni__variants,
         __uni__args = []
       } = secret;
-      const newComputedStylesheet = typeof __uni__stylesheet === 'function' ? __uni__stylesheet(_runtime.UnistylesRuntime.theme, _runtime.UnistylesRuntime.miniRuntime) : __uni__stylesheet;
+      const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
       const style = newComputedStylesheet[__uni__key];
       const args = _args ?? __uni__args;
       const resultHidden = typeof style === 'function' ? style(...args) : style;

package/lib/commonjs/web/shadowRegistry.js.map

@@ -1 +1 @@
-{"version":3,"names":["_listener","require","_registry","_runtime","_utils","_variants2","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","webUnistylesMap","createDoubleMap","disposeMap","stylesMap","add","ref","_style","_variants","_args","Array","isArray","forEach","style","Object","keys","some","key","startsWith","secrets","extractSecrets","__uni__refs","isInDocument","remove","HTMLElement","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","UnistylesRuntime","theme","miniRuntime","args","resultHidden","result","extractHiddenProperties","variants","fromEntries","getVariants","length","resultWithVariants","storedWebUnistyle","get","webUnistyle","UnistylesRegistry","createStyles","set","listenToDependencies","stylesheet","className","unistyles","styleTag","document","createElement","additionalClasses","_web","_classNames","classList","setStylesTarget","head","appendChild","updateStyles","delete","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_listener","require","_registry","_utils","_variants2","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","webUnistylesMap","createDoubleMap","disposeMap","stylesMap","add","ref","_style","_variants","_args","Array","isArray","forEach","style","Object","keys","some","key","startsWith","secrets","extractSecrets","__uni__refs","isInDocument","remove","HTMLElement","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","UnistylesRegistry","getComputedStylesheet","args","resultHidden","result","extractHiddenProperties","variants","fromEntries","getVariants","length","resultWithVariants","storedWebUnistyle","get","webUnistyle","createStyles","set","listenToDependencies","stylesheet","className","unistyles","styleTag","document","createElement","additionalClasses","_web","_classNames","classList","setStylesTarget","head","appendChild","updateStyles","delete","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}

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

@@ -15,45 +15,13 @@ HybridShadowRegistry.add = (handle, style, variants, args) => {
   if (!handle || !style) {
     return;
   }
-
-  // at this point unistyle can be only object or dynamic function
-  if (typeof style !== 'object' && typeof style !== 'function') {
-    return;
-  }
-  if (!style.__unid) {
-    console.warn(`Unistyles: Style is not bound!
-
-Potential reasons:
-a) You created a new Expo or React Native project that references StyleSheet from React Native
-b) You used the spread operator on a Unistyle style outside of a JSX component
-c) You're mixing StyleSheet styles from React Native with Unistyles
-
-a) For new projects
-If you're using a freshly generated project, replace StyleSheet imports from React Native with Unistyles:
-
-- import { StyleSheet } from 'react-native'
-+ import { StyleSheet } from 'react-native-unistyles'
-
-b) Merging styles
-If you need to merge styles, do it within the style prop of your JSX component:
-
-style={{...styles.container, ...styles.otherProp}}
-or
-style={[styles.container, styles.otherProp]}
-
-Copying a Unistyle style outside of a JSX element will remove its internal C++ state, leading to unexpected behavior.
-
-c) Mixing styles
-If you're mixing React Native and Unistyle StyleSheet styles, move your static styles into Unistyles to avoid conflicts.\n`);
-    return;
-  }
   HybridShadowRegistry.link(findShadowNodeForHandle(handle), style, variants ?? {}, args ?? []);
 };
-HybridShadowRegistry.remove = (handle, style) => {
-  if (!handle || !style?.__unid) {
+HybridShadowRegistry.remove = handle => {
+  if (!handle) {
     return;
   }
-  HybridShadowRegistry.unlink(findShadowNodeForHandle(handle), style);
+  HybridShadowRegistry.unlink(findShadowNodeForHandle(handle));
 };
 export const UnistylesShadowRegistry = HybridShadowRegistry;
 //# sourceMappingURL=index.js.map

package/lib/module/specs/ShadowRegistry/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","HybridShadowRegistry","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","__unid","console","warn","link","remove","unlink","UnistylesShadowRegistry"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAazD,MAAMC,oBAAoB,GAAGD,YAAY,CAACE,kBAAkB,CAAiB,yBAAyB,CAAC;AAEvG,MAAMC,uBAAuB,GAAIC,MAAkB,IAAK;EACpD,MAAMC,IAAI,GAAGD,MAAM,EAAEE,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACvDD,MAAM,EAAEI,kBAAkB,GAAG,CAAC,EAAEC,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACjGD,MAAM,EAAEK,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI;EAEhF,IAAI,CAACA,IAAI,EAAE;IACP;IACA,MAAM,IAAIK,KAAK,CAAC,uDAAuD,CAAC;EAC5E;EAEA,OAAOL,IAAI;AACf,CAAC;AAEDJ,oBAAoB,CAACU,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D;EACA,IAAI,CAACV,MAAM,IAAI,CAACQ,KAAK,EAAE;IACnB;EACJ;;EAEA;EACA,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,OAAOA,KAAK,KAAK,UAAU,EAAE;IAC1D;EACJ;EAEA,IAAI,CAACA,KAAK,CAACG,MAAM,EAAE;IACfC,OAAO,CAACC,IAAI,CAAC;AACrB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,2HAA2H,CAAC;IAEpH;EACJ;EAEAhB,oBAAoB,CAACiB,IAAI,CAACf,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDb,oBAAoB,CAACkB,MAAM,GAAG,CAACf,MAAM,EAAEQ,KAAK,KAAK;EAC7C,IAAI,CAACR,MAAM,IAAI,CAACQ,KAAK,EAAEG,MAAM,EAAE;IAC3B;EACJ;EAEAd,oBAAoB,CAACmB,MAAM,CAACjB,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,CAAC;AACvE,CAAC;AAQD,OAAO,MAAMS,uBAAuB,GAAGpB,oBAA4D","ignoreList":[]}
+{"version":3,"names":["NitroModules","HybridShadowRegistry","createHybridObject","findShadowNodeForHandle","handle","node","__internalInstanceHandle","stateNode","getScrollResponder","getNativeScrollRef","Error","add","style","variants","args","link","remove","unlink","UnistylesShadowRegistry"],"sourceRoot":"../../../../src","sources":["specs/ShadowRegistry/index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAazD,MAAMC,oBAAoB,GAAGD,YAAY,CAACE,kBAAkB,CAAiB,yBAAyB,CAAC;AAEvG,MAAMC,uBAAuB,GAAIC,MAAkB,IAAK;EACpD,MAAMC,IAAI,GAAGD,MAAM,EAAEE,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACvDD,MAAM,EAAEI,kBAAkB,GAAG,CAAC,EAAEC,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI,IACjGD,MAAM,EAAEK,kBAAkB,GAAG,CAAC,EAAEH,wBAAwB,EAAEC,SAAS,EAAEF,IAAI;EAEhF,IAAI,CAACA,IAAI,EAAE;IACP;IACA,MAAM,IAAIK,KAAK,CAAC,uDAAuD,CAAC;EAC5E;EAEA,OAAOL,IAAI;AACf,CAAC;AAEDJ,oBAAoB,CAACU,GAAG,GAAG,CAACP,MAAM,EAAEQ,KAAK,EAAEC,QAAQ,EAAEC,IAAI,KAAK;EAC1D;EACA,IAAI,CAACV,MAAM,IAAI,CAACQ,KAAK,EAAE;IACnB;EACJ;EAEAX,oBAAoB,CAACc,IAAI,CAACZ,uBAAuB,CAACC,MAAM,CAAC,EAAEQ,KAAK,EAAEC,QAAQ,IAAI,CAAC,CAAC,EAAEC,IAAI,IAAI,EAAE,CAAC;AACjG,CAAC;AAEDb,oBAAoB,CAACe,MAAM,GAAGZ,MAAM,IAAI;EACpC,IAAI,CAACA,MAAM,EAAE;IACT;EACJ;EAEAH,oBAAoB,CAACgB,MAAM,CAACd,uBAAuB,CAACC,MAAM,CAAC,CAAC;AAChE,CAAC;AAQD,OAAO,MAAMc,uBAAuB,GAAGjB,oBAA4D","ignoreList":[]}