react-native-unistyles 3.0.0-alpha.33 → 3.0.0-alpha.34

package/cxx/common/Helpers.h

@@ -96,7 +96,7 @@ inline bool isPlatformColor(jsi::Runtime& rt, jsi::Object& maybePlatformColor) {
         maybePlatformColor.getProperty(rt, "dynamic").isObject() &&
         maybePlatformColor.getProperty(rt, "dynamic").asObject(rt).hasProperty(rt, "dark") &&
         maybePlatformColor.getProperty(rt, "dynamic").asObject(rt).hasProperty(rt, "light");
-    
+
     if (isIOSDynamicColor) {
         return true;
     }
@@ -127,6 +127,16 @@ inline Variants variantsToPairs(jsi::Runtime& rt, jsi::Object&& variants) {
     return pairs;
 }
 
+inline jsi::Object pairsToVariantsValue(jsi::Runtime& rt, Variants& pairs) {
+    auto variantsValue = jsi::Object(rt);
+
+    std::for_each(pairs.begin(), pairs.end(), [&rt, &variantsValue](std::pair<std::string, std::string>& pair){
+        variantsValue.setProperty(rt, jsi::PropNameID::forUtf8(rt, pair.first), jsi::String::createFromUtf8(rt, pair.second));
+    });
+
+    return variantsValue;
+}
+
 inline jsi::Object variantsToValue(jsi::Runtime& rt, Variants& variants) {
     jsi::Object rawVariants = jsi::Object(rt);
 
@@ -137,7 +147,7 @@ inline jsi::Object variantsToValue(jsi::Runtime& rt, Variants& variants) {
     return rawVariants;
 }
 
-inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, jsi::Array& arguments) {
+inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& rt, jsi::Array&& arguments) {
     std::vector<folly::dynamic> parsedArgument{};
     size_t count = arguments.size(rt);
 
@@ -193,6 +203,18 @@ inline std::vector<folly::dynamic> parseDynamicFunctionArguments(jsi::Runtime& r
     return parsedArgument;
 }
 
+inline jsi::Array functionArgumentsToArray(jsi::Runtime& rt, const jsi::Value* args, size_t count) {
+    auto arr = jsi::Array(rt, count);
+
+    for (size_t i = 0; i < count; i++) {
+        const jsi::Value& arg = args[i];
+
+        arr.setValueAtIndex(rt, i, arg);
+    }
+
+    return arr;
+}
+
 inline static jsi::Array dependenciesToJSIArray(jsi::Runtime& rt, const std::vector<UnistyleDependency>& vec) {
     jsi::Array result(rt, vec.size());
 

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], this->_styleSheet->tag);
+        return valueFromUnistyle(rt, this->_unistylesRuntime, this->_styleSheet->unistyles[propertyName], this->_styleSheet->tag);
     }
     
     if (propertyName == helpers::STYLE_VARIANTS) {

package/cxx/core/UnistyleWrapper.h

@@ -4,7 +4,9 @@
 #include "Unistyle.h"
 #include "UnistylesRegistry.h"
 #include "Helpers.h"
+#include "HybridUnistylesRuntime.h"
 #include "Constants.h"
+#include "Parser.h"
 
 namespace margelo::nitro::unistyles::core {
 
@@ -57,6 +59,32 @@ customStyleProp={[styles.container, styles.otherProp]}
 Copying a Unistyle style outside of a JSX element will remove its internal C++ state, leading to unexpected behavior.)");
 }
 
+inline static jsi::Object generateUnistylesPrototype(
+    jsi::Runtime& rt,
+    std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime,
+    Unistyle::Shared unistyle,
+    std::optional<Variants> variants,
+    std::optional<jsi::Array> arguments
+) {
+    // add prototype metadata for createUnistylesComponent
+    auto proto = jsi::Object(rt);
+    auto hostFn = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forUtf8(rt, "getStyle"), 0, [unistyle, unistylesRuntime](jsi::Runtime &rt, const jsi::Value &thisValue, const jsi::Value *args, size_t count){
+        auto variants = helpers::variantsToPairs(rt, thisValue.asObject(rt).getProperty(rt, "variants").asObject(rt));
+        auto arguments = helpers::parseDynamicFunctionArguments(rt, thisValue.asObject(rt).getProperty(rt, "arguments").asObject(rt).asArray(rt));
+        
+        parser::Parser(unistylesRuntime).rebuildUnistyle(rt, unistyle->parent, unistyle, variants, std::make_optional<std::vector<folly::dynamic>>(arguments));
+
+        return jsi::Value(rt, unistyle->parsedStyle.value()).asObject(rt);
+    });
+
+    proto.setProperty(rt, "getStyle", std::move(hostFn));
+    proto.setProperty(rt, "arguments", arguments.has_value() ? std::move(arguments.value()) : jsi::Array(rt, 0));
+    proto.setProperty(rt, "variants", variants.has_value() ? helpers::pairsToVariantsValue(rt, variants.value()) : jsi::Object(rt));
+    proto.setProperty(rt, helpers::STYLE_DEPENDENCIES.c_str(), helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
+
+    return proto;
+}
+
 inline static std::vector<Unistyle::Shared> unistyleFromValue(jsi::Runtime& rt, const jsi::Value& value) {
     if (value.isNull()) {
         return {};
@@ -72,7 +100,7 @@ inline static std::vector<Unistyle::Shared> unistyleFromValue(jsi::Runtime& rt,
     return {value.getObject(rt).getNativeState<UnistyleWrapper>(rt)->unistyle};
 }
 
-inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared unistyle, int tag) {
+inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime, Unistyle::Shared unistyle, int tag) {
     auto wrappedUnistyle = std::make_shared<UnistyleWrapper>(unistyle);
 
     if (unistyle->type == UnistyleType::Object) {
@@ -84,6 +112,8 @@ inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared un
         helpers::defineHiddenProperty(rt, obj, helpers::STYLE_DEPENDENCIES.c_str(), helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
         helpers::mergeJSIObjects(rt, obj, unistyle->parsedStyle.value());
 
+        obj.setProperty(rt, "__proto__", generateUnistylesPrototype(rt, unistylesRuntime, unistyle, std::nullopt, std::nullopt));
+
         return obj;
     }
 

package/cxx/core/UnistylesMountHook.cpp

@@ -23,6 +23,6 @@ void core::UnistylesMountHook::shadowTreeDidMount(RootShadowNode::Shared const &
     auto& registry = core::UnistylesRegistry::get();
 
     if (!registry.trafficController.shouldStop()) {
-        shadow::ShadowTreeManager::updateShadowTree(*_rt);
+        shadow::ShadowTreeManager::updateShadowTree(this->_unistylesRuntime->getRuntime());
     }
 }

package/cxx/core/UnistylesMountHook.h

@@ -3,13 +3,15 @@
 #include <react/renderer/uimanager/UIManager.h>
 #include <react/renderer/uimanager/UIManagerMountHook.h>
 #include "ShadowTreeManager.h"
+#include "HybridUnistylesRuntime.h"
 
 namespace margelo::nitro::unistyles::core {
 
 using namespace facebook::react;
 
 struct UnistylesMountHook : public UIManagerMountHook {
-    UnistylesMountHook(std::shared_ptr<UIManager> uiManager, jsi::Runtime& rt) : _uiManager{uiManager}, _rt{&rt} {
+    UnistylesMountHook(std::shared_ptr<UIManager> uiManager, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime)
+        : _uiManager{uiManager}, _unistylesRuntime{unistylesRuntime} {
         _uiManager->registerMountHook(*this);
     }
 
@@ -19,7 +21,7 @@ struct UnistylesMountHook : public UIManagerMountHook {
 
 private:
     std::shared_ptr<UIManager> _uiManager;
-    jsi::Runtime* _rt;
+    std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
 };
 
 }

package/cxx/core/UnistylesRegistry.cpp

@@ -88,7 +88,13 @@ void core::UnistylesRegistry::linkShadowNodeWithUnistyle(
         // add or update node for shadow leaf updates
         // dynamic functions are parsed later
         if (unistyle->type == UnistyleType::Object) {
-            updates[shadowNodeFamily] = parser.parseUnistyleToShadowTreeStyles(rt, unistyle);
+            for (const auto& [family, unistyles] : this->_shadowRegistry[&rt]) {
+                for (const auto& unistyleData : unistyles) {
+                    if (unistyleData->unistyle == unistyle && family == shadowNodeFamily) {
+                        updates[family] = parser.parseStylesToShadowTreeStyles(rt, {unistyleData});
+                    }
+                }
+            }
         }
     });
 

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -9,8 +9,7 @@ jsi::Value HybridShadowRegistry::link(jsi::Runtime &rt, const jsi::Value &thisVa
     ShadowNode::Shared shadowNodeWrapper = shadowNodeFromValue(rt, args[0]);
     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);
+    std::vector<folly::dynamic> arguments = helpers::parseDynamicFunctionArguments(rt, args[3].asObject(rt).asArray(rt));
 
     auto& registry = core::UnistylesRegistry::get();
 

package/cxx/hybridObjects/HybridShadowRegistry.h

@@ -9,9 +9,7 @@
 namespace margelo::nitro::unistyles {
 
 struct HybridShadowRegistry: public HybridUnistylesShadowRegistrySpec {
-    HybridShadowRegistry(): HybridObject(TAG) {
-        core::UnistylesRegistry::get().trafficController.restore();
-    }
+    HybridShadowRegistry(): HybridObject(TAG) {}
     
     jsi::Value link(jsi::Runtime& rt,
                             const jsi::Value& thisValue,

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -230,8 +230,11 @@ void HybridStyleSheet::loadExternalMethods(const jsi::Value& thisValue, jsi::Run
 }
 
 void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
+    // cleanup Shadow updates
+    core::UnistylesRegistry::get().trafficController.restore();
+    
     this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager);
-    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager, rt);
+    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager, this->_unistylesRuntime);
 }
 
 void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> unistylesDependencies) {

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -57,6 +57,18 @@ double HybridUnistylesRuntime::getFontScale() {
     return this->_nativePlatform.getFontScale();
 };
 
+std::unordered_map<std::string, double> HybridUnistylesRuntime::getBreakpoints() {
+    auto& state = core::UnistylesRegistry::get().getState(*_rt);
+    auto sortedBreakpointPairs = state.getSortedBreakpointPairs();
+    std::unordered_map<std::string, double> breakpoints{};
+    
+    std::for_each(sortedBreakpointPairs.begin(), sortedBreakpointPairs.end(), [&breakpoints](std::pair<std::string, double>& pair){
+        breakpoints[pair.first] = pair.second;
+    });
+    
+    return breakpoints;
+}
+
 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.");
 

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -64,6 +64,8 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
     void setImmersiveMode(bool isEnabled) override;
     void setRootViewBackgroundColor(double color) override;
     UnistylesCxxMiniRuntime getMiniRuntime() override;
+    std::unordered_map<std::string, double> getBreakpoints() override;
+    
     jsi::Value getMiniRuntimeAsValue(jsi::Runtime& rt);
     jsi::Runtime& getRuntime();
     void includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps);

package/cxx/parser/Parser.cpp

@@ -1,4 +1,5 @@
 #include "Parser.h"
+#include "UnistyleWrapper.h"
 
 using namespace margelo::nitro::unistyles;
 using namespace facebook;
@@ -107,7 +108,7 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
         parsedStyleSheets.emplace(styleSheet, this->unwrapStyleSheet(rt, styleSheet));
     }
 
-    // then parse all visible Unistyles
+    // then parse all visible Unistyles managed by Unistyle
     for (auto& [shadowNode, unistyles] : dependencyMap) {
         auto styleSheet = unistyles.begin()->get()->unistyle->parent;
 
@@ -155,13 +156,12 @@ void parser::Parser::rebuildUnistylesInDependencyMap(jsi::Runtime& rt, Dependenc
         }
     }
 
-    // parse whatever left in StyleSheets
+    // parse whatever left in StyleSheets to be later accessible
+    // for createUnistylesComponent
     for (auto styleSheet : styleSheets) {
         for (auto& [_, unistyle] : styleSheet->unistyles) {
             if (!parsedUnistyles.contains(unistyle)) {
-                parsedUnistyles.emplace(unistyle, true);
                 unistyle->rawValue = parsedStyleSheets[styleSheet].asObject(rt).getProperty(rt, unistyle->styleKey.c_str()).asObject(rt);
-                this->rebuildUnistyle(rt, styleSheet, unistyle, {}, std::nullopt);
             }
         }
     }
@@ -367,10 +367,10 @@ jsi::Function parser::Parser::createDynamicFunctionProxy(jsi::Runtime& rt, Unist
             unistyleFn->parsedStyle = this->parseFirstLevel(rt, unistyleFn, variants);
             unistyleFn->seal();
 
-            // include dependencies for createUnistylesComponent
             jsi::Object style = jsi::Value(rt, unistyleFn->parsedStyle.value()).asObject(rt);
 
-            helpers::defineHiddenProperty(rt, style, helpers::STYLE_DEPENDENCIES, helpers::dependenciesToJSIArray(rt, unistyle->dependencies));
+            // include dependencies for createUnistylesComponent
+            style.setProperty(rt, "__proto__", generateUnistylesPrototype(rt, unistylesRuntime, unistyle, variants, helpers::functionArgumentsToArray(rt, args, count)));
 
             // update shadow leaf updates to indicate newest changes
             auto& registry = core::UnistylesRegistry::get();

package/cxx/parser/Parser.h

@@ -28,9 +28,9 @@ struct Parser {
     void rebuildShadowLeafUpdates(core::DependencyMap& dependencyMap);
     folly::dynamic parseUnistyleToShadowTreeStyles(jsi::Runtime& rt, const Unistyle::Shared unistyle);
     folly::dynamic parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles);
+    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);
 
 private:
-    void rebuildUnistyle(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet, Unistyle::Shared unistyle, const Variants& variants, std::optional<std::vector<folly::dynamic>>);
     jsi::Object unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<StyleSheet> styleSheet);
     jsi::Object parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, std::optional<Variants> variants);
     jsi::Value parseSecondLevel(jsi::Runtime& rt, Unistyle::Shared unistyle, jsi::Value& nestedObject);

package/cxx/shadowTree/ShadowTrafficController.h

@@ -49,6 +49,8 @@ struct ShadowTrafficController {
     }
 
     inline void restore() {
+        std::lock_guard<std::mutex> lock(_mutex);
+        
         _unistylesUpdates = {};
         _canCommit = false;
     }

package/lib/commonjs/components/Display.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Display = void 0;
+var _useMedia = require("./useMedia");
+const Display = ({
+  children,
+  ...props
+}) => {
+  const {
+    isVisible
+  } = (0, _useMedia.useMedia)(props);
+  return isVisible ? children : null;
+};
+exports.Display = Display;
+//# sourceMappingURL=Display.js.map

package/lib/commonjs/components/Display.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_useMedia","require","Display","children","props","isVisible","useMedia","exports"],"sourceRoot":"../../../src","sources":["components/Display.tsx"],"mappings":";;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AAIO,MAAMC,OAA8C,GAAGA,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAM,CAAC,KAAK;EACtF,MAAM;IAAEC;EAAU,CAAC,GAAG,IAAAC,kBAAQ,EAACF,KAAK,CAAC;EAErC,OAAOC,SAAS,GACVF,QAAQ,GACR,IAAI;AACd,CAAC;AAAAI,OAAA,CAAAL,OAAA,GAAAA,OAAA","ignoreList":[]}

package/lib/commonjs/components/Hide.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Hide = void 0;
+var _useMedia = require("./useMedia");
+const Hide = ({
+  children,
+  ...props
+}) => {
+  const {
+    isVisible
+  } = (0, _useMedia.useMedia)(props);
+  return !isVisible ? children : null;
+};
+exports.Hide = Hide;
+//# sourceMappingURL=Hide.js.map

package/lib/commonjs/components/Hide.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_useMedia","require","Hide","children","props","isVisible","useMedia","exports"],"sourceRoot":"../../../src","sources":["components/Hide.tsx"],"mappings":";;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AAIO,MAAMC,IAAwC,GAAGA,CAAC;EAAEC,QAAQ;EAAE,GAAGC;AAAM,CAAC,KAAK;EAChF,MAAM;IAAEC;EAAU,CAAC,GAAG,IAAAC,kBAAQ,EAACF,KAAK,CAAC;EAErC,OAAO,CAACC,SAAS,GACXF,QAAQ,GACR,IAAI;AACd,CAAC;AAAAI,OAAA,CAAAL,IAAA,GAAAA,IAAA","ignoreList":[]}

package/lib/commonjs/components/index.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "Display", {
+  enumerable: true,
+  get: function () {
+    return _Display.Display;
+  }
+});
+Object.defineProperty(exports, "Hide", {
+  enumerable: true,
+  get: function () {
+    return _Hide.Hide;
+  }
+});
+var _Hide = require("./Hide");
+var _Display = require("./Display");
+//# sourceMappingURL=index.js.map

package/lib/commonjs/components/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_Hide","require","_Display"],"sourceRoot":"../../../src","sources":["components/index.ts"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA","ignoreList":[]}

package/lib/commonjs/components/useMedia.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useMedia = void 0;
+var _react = require("react");
+var _specs = require("../specs");
+var _mq = require("../mq");
+const useMedia = config => {
+  const computeIsVisible = () => {
+    const maybeMq = config.mq;
+    if (!(0, _mq.isUnistylesMq)(maybeMq)) {
+      console.error(`🦄 Unistyles: Received invalid mq: ${maybeMq}`);
+      return false;
+    }
+    const parsedMq = (0, _mq.parseMq)(maybeMq);
+    if (!(0, _mq.isValidMq)(parsedMq)) {
+      console.error(`🦄 Unistyles: Received invalid mq where min is greater than max: ${maybeMq}`);
+      return false;
+    }
+    const {
+      width,
+      height
+    } = _specs.UnistylesRuntime.screen;
+    if (parsedMq.minWidth !== undefined && width < parsedMq.minWidth) {
+      return false;
+    }
+    if (parsedMq.maxWidth !== undefined && width > parsedMq.maxWidth) {
+      return false;
+    }
+    if (parsedMq.minHeight !== undefined && height < parsedMq.minHeight) {
+      return false;
+    }
+    if (parsedMq.maxHeight !== undefined && height > parsedMq.maxHeight) {
+      return false;
+    }
+    return true;
+  };
+  const [isVisible, setIsVisible] = (0, _react.useState)(computeIsVisible());
+  (0, _react.useEffect)(() => {
+    setIsVisible(computeIsVisible());
+  }, [config.mq]);
+  (0, _react.useLayoutEffect)(() => {
+    const removeChangeListener = _specs.StyleSheet.addChangeListener(dependencies => {
+      if (dependencies.includes(_specs.UnistyleDependency.Breakpoints)) {
+        setIsVisible(computeIsVisible());
+      }
+    });
+    return () => {
+      removeChangeListener();
+    };
+  }, [config.mq]);
+  return {
+    isVisible
+  };
+};
+exports.useMedia = useMedia;
+//# sourceMappingURL=useMedia.js.map

package/lib/commonjs/components/useMedia.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_specs","_mq","useMedia","config","computeIsVisible","maybeMq","mq","isUnistylesMq","console","error","parsedMq","parseMq","isValidMq","width","height","UnistylesRuntime","screen","minWidth","undefined","maxWidth","minHeight","maxHeight","isVisible","setIsVisible","useState","useEffect","useLayoutEffect","removeChangeListener","StyleSheet","addChangeListener","dependencies","includes","UnistyleDependency","Breakpoints","exports"],"sourceRoot":"../../../src","sources":["components/useMedia.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,GAAA,GAAAF,OAAA;AAEO,MAAMG,QAAQ,GAAIC,MAAsB,IAAK;EAChD,MAAMC,gBAAgB,GAAGA,CAAA,KAAe;IACpC,MAAMC,OAAO,GAAGF,MAAM,CAACG,EAAuB;IAE9C,IAAI,CAAC,IAAAC,iBAAa,EAACF,OAAO,CAAC,EAAE;MACzBG,OAAO,CAACC,KAAK,CAAC,sCAAsCJ,OAAO,EAAE,CAAC;MAE9D,OAAO,KAAK;IAChB;IAEA,MAAMK,QAAQ,GAAI,IAAAC,WAAO,EAACN,OAAO,CAAC;IAElC,IAAI,CAAC,IAAAO,aAAS,EAACF,QAAQ,CAAC,EAAE;MACtBF,OAAO,CAACC,KAAK,CAAC,oEAAoEJ,OAAO,EAAE,CAAC;MAE5F,OAAO,KAAK;IAChB;IAEA,MAAM;MAAEQ,KAAK;MAAEC;IAAO,CAAC,GAAGC,uBAAgB,CAACC,MAAM;IAEjD,IAAIN,QAAQ,CAACO,QAAQ,KAAKC,SAAS,IAAIL,KAAK,GAAGH,QAAQ,CAACO,QAAQ,EAAE;MAC9D,OAAO,KAAK;IAChB;IAEA,IAAIP,QAAQ,CAACS,QAAQ,KAAKD,SAAS,IAAIL,KAAK,GAAGH,QAAQ,CAACS,QAAQ,EAAE;MAC9D,OAAO,KAAK;IAChB;IAEA,IAAIT,QAAQ,CAACU,SAAS,KAAKF,SAAS,IAAIJ,MAAM,GAAGJ,QAAQ,CAACU,SAAS,EAAE;MACjE,OAAO,KAAK;IAChB;IAEA,IAAIV,QAAQ,CAACW,SAAS,KAAKH,SAAS,IAAIJ,MAAM,GAAGJ,QAAQ,CAACW,SAAS,EAAE;MACjE,OAAO,KAAK;IAChB;IAEA,OAAO,IAAI;EACf,CAAC;EACD,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAiBpB,gBAAgB,CAAC,CAAC,CAAC;EAE9E,IAAAqB,gBAAS,EAAC,MAAM;IACZF,YAAY,CAACnB,gBAAgB,CAAC,CAAC,CAAC;EACpC,CAAC,EAAE,CAACD,MAAM,CAACG,EAAE,CAAC,CAAC;EAEf,IAAAoB,sBAAe,EAAC,MAAM;IAClB,MAAMC,oBAAoB,GAAIC,iBAAU,CAAyBC,iBAAiB,CAACC,YAAY,IAAI;MAC/F,IAAIA,YAAY,CAACC,QAAQ,CAACC,yBAAkB,CAACC,WAAW,CAAC,EAAE;QACvDV,YAAY,CAACnB,gBAAgB,CAAC,CAAC,CAAC;MACpC;IACJ,CAAC,CAAC;IAEF,OAAO,MAAM;MACTuB,oBAAoB,CAAC,CAAC;IAC1B,CAAC;EACL,CAAC,EAAE,CAACxB,MAAM,CAACG,EAAE,CAAC,CAAC;EAEf,OAAO;IACHgB;EACJ,CAAC;AACL,CAAC;AAAAY,OAAA,CAAAhC,QAAA,GAAAA,QAAA","ignoreList":[]}

package/lib/commonjs/core/createUnistylesComponent.js

@@ -7,7 +7,8 @@ exports.createUnistylesComponent = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const createUnistylesComponent = (Component, _) => {
+const SUPPORTED_STYLE_PROPS = ['style', 'contentContainerStyle'];
+const createUnistylesComponent = (Component, _ = () => ({})) => {
   return props => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
       ...props

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_jsxRuntime","e","__esModule","default","createUnistylesComponent","Component","_","props","jsx","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesComponent.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAAsE,IAAAC,WAAA,GAAAD,OAAA;AAAA,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAK/D,MAAMG,wBAAwB,GAAGA,CAA+BC,SAAY,EAAEC,CAAc,KAAK;EACpG,OAAQC,KAAwB,IAAK;IACjC,oBAAO,IAAAP,WAAA,CAAAQ,GAAA,EAACH,SAAS;MAAA,GAAKE;IAAK,CAAG,CAAC;EACnC,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAL,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_jsxRuntime","e","__esModule","default","SUPPORTED_STYLE_PROPS","createUnistylesComponent","Component","_","props","jsx","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesComponent.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAAsE,IAAAC,WAAA,GAAAD,OAAA;AAAA,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAKtE,MAAMG,qBAAqB,GAAG,CAAC,OAAO,EAAE,uBAAuB,CAAU;AAElE,MAAMC,wBAAwB,GAAGA,CAA+BC,SAAY,EAAEC,CAAc,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC,KAAK;EACjH,OAAQC,KAAwB,IAAK;IACjC,oBAAO,IAAAR,WAAA,CAAAS,GAAA,EAACH,SAAS;MAAA,GAAKE;IAAK,CAAG,CAAC;EACnC,CAAC;AACL,CAAC;AAAAE,OAAA,CAAAL,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/core/createUnistylesComponent.native.js

@@ -9,15 +9,45 @@ var _specs = require("../specs");
 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; }
-const createUnistylesComponent = (Component, mappings) => {
+const SUPPORTED_STYLE_PROPS = ['style', 'contentContainerStyle'];
+const createUnistylesComponent = (Component, mappings = () => ({})) => {
   return props => {
     const [theme, setTheme] = (0, _react.useState)(_specs.UnistylesRuntime.getTheme());
     const [, setRt] = (0, _react.useState)(0);
+    const stylesRef = (0, _react.useRef)({});
+    const isForcedRef = (0, _react.useRef)(false);
+    if (!isForcedRef.current) {
+      SUPPORTED_STYLE_PROPS.forEach(propName => {
+        if (props?.[propName]) {
+          if (Array.isArray(props[propName])) {
+            console.error(`🦄 Unistyles: createUnistylesComponent requires ${propName} to be an object. Please check props for component: ${Component.displayName}`);
+          }
+          if (props[propName].__unistyles_name && !props[propName].__proto__?.getStyle) {
+            console.error(`🦄 Unistyles: createUnistylesComponent received style that is not bound. You likely used the spread operator on a Unistyle style. Please check props for component: ${Component.displayName}`);
+          }
+          stylesRef.current = {
+            ...stylesRef.current,
+            [propName]: props[propName]
+          };
+        }
+      });
+    }
     (0, _react.useEffect)(() => {
       const removeChangeListener = _specs.StyleSheet.addChangeListener(dependencies => {
-        const componentDependencies = props.style?.uni__dependencies || mappings(theme).style?.uni__dependencies;
+        const componentDependencies = props.style?.__proto__.uni__dependencies || mappings(theme).style?.__proto__.uni__dependencies;
         if (dependencies.includes(_specs.UnistyleDependency.Theme) && (!componentDependencies || componentDependencies.includes(_specs.UnistyleDependency.Theme))) {
           setTheme(_specs.UnistylesRuntime.getTheme());
+
+          // override with Unistyles styles
+          SUPPORTED_STYLE_PROPS.forEach(propName => {
+            if (props?.[propName]) {
+              stylesRef.current = {
+                ...stylesRef.current,
+                [propName]: props[propName].__proto__?.getStyle() || props[propName]
+              };
+            }
+          });
+          isForcedRef.current = true;
         }
         if (dependencies.some(dependency => dependency >= 2) && (!componentDependencies || componentDependencies.some(dependency => dependency >= 2))) {
           setRt(prevState => prevState + 1);
@@ -37,6 +67,14 @@ const createUnistylesComponent = (Component, mappings) => {
       }
       mergedProps[key] = props[key];
     });
+
+    // override with Unistyles styles
+    SUPPORTED_STYLE_PROPS.forEach(propName => {
+      if (mergedProps[propName]) {
+        mergedProps[propName] = stylesRef.current[propName];
+      }
+    });
+    isForcedRef.current = false;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
       ...mergedProps
     });

package/lib/commonjs/core/createUnistylesComponent.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","createUnistylesComponent","Component","mappings","props","theme","setTheme","useState","UnistylesRuntime","getTheme","setRt","useEffect","removeChangeListener","StyleSheet","addChangeListener","dependencies","componentDependencies","style","uni__dependencies","includes","UnistyleDependency","Theme","some","dependency","prevState","mergedProps","keys","forEach","key","assign","jsx","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesComponent.native.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","SUPPORTED_STYLE_PROPS","createUnistylesComponent","Component","mappings","props","theme","setTheme","useState","UnistylesRuntime","getTheme","setRt","stylesRef","useRef","isForcedRef","current","forEach","propName","Array","isArray","console","error","displayName","__unistyles_name","getStyle","useEffect","removeChangeListener","StyleSheet","addChangeListener","dependencies","componentDependencies","style","uni__dependencies","includes","UnistyleDependency","Theme","some","dependency","prevState","mergedProps","keys","key","assign","jsx","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesComponent.native.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAAqG,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAG,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,SAAAL,wBAAAK,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;AAIrG,MAAMW,qBAAqB,GAAG,CAAC,OAAO,EAAE,uBAAuB,CAAU;AAElE,MAAMC,wBAAwB,GAAGA,CAA+BC,SAAY,EAAEC,QAAqB,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC,KAAK;EACxH,OAAQC,KAAwB,IAAK;IACjC,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,eAAQ,EAAiBC,uBAAgB,CAACC,QAAQ,CAAC,CAAC,CAAC;IAC/E,MAAM,GAAGC,KAAK,CAAC,GAAG,IAAAH,eAAQ,EAAC,CAAC,CAAC;IAC7B,MAAMI,SAAS,GAAG,IAAAC,aAAM,EAAsB,CAAC,CAAC,CAAC;IACjD,MAAMC,WAAW,GAAG,IAAAD,aAAM,EAAC,KAAK,CAAC;IAEjC,IAAI,CAACC,WAAW,CAACC,OAAO,EAAE;MACtBd,qBAAqB,CAACe,OAAO,CAACC,QAAQ,IAAI;QACtC,IAAIZ,KAAK,GAAGY,QAAQ,CAAC,EAAE;UACnB,IAAIC,KAAK,CAACC,OAAO,CAACd,KAAK,CAACY,QAAQ,CAAC,CAAC,EAAE;YAChCG,OAAO,CAACC,KAAK,CAAC,mDAAmDJ,QAAQ,uDAAuDd,SAAS,CAACmB,WAAW,EAAE,CAAC;UAC5J;UAEA,IAAIjB,KAAK,CAACY,QAAQ,CAAC,CAACM,gBAAgB,IAAI,CAAClB,KAAK,CAACY,QAAQ,CAAC,CAAC1B,SAAS,EAAEiC,QAAQ,EAAE;YAC1EJ,OAAO,CAACC,KAAK,CAAC,uKAAuKlB,SAAS,CAACmB,WAAW,EAAE,CAAC;UACjN;UAEAV,SAAS,CAACG,OAAO,GAAG;YAChB,GAAGH,SAAS,CAACG,OAAO;YACpB,CAACE,QAAQ,GAAGZ,KAAK,CAACY,QAAQ;UAC9B,CAAC;QACL;MACJ,CAAC,CAAC;IACN;IAEA,IAAAQ,gBAAS,EAAC,MAAM;MACZ,MAAMC,oBAAoB,GAAIC,iBAAU,CAAyBC,iBAAiB,CAACC,YAAY,IAAI;QAC/F,MAAMC,qBAAqB,GAAIzB,KAAK,CAAC0B,KAAK,EAAExC,SAAS,CAACyC,iBAAiB,IAAI5B,QAAQ,CAACE,KAAK,CAAC,CAACyB,KAAK,EAAExC,SAAS,CAACyC,iBAA+C;QAE3J,IAAIH,YAAY,CAACI,QAAQ,CAACC,yBAAkB,CAACC,KAAK,CAAC,KAAK,CAACL,qBAAqB,IAAGA,qBAAqB,CAACG,QAAQ,CAACC,yBAAkB,CAACC,KAAK,CAAC,CAAC,EAAE;UACxI5B,QAAQ,CAACE,uBAAgB,CAACC,QAAQ,CAAC,CAAC,CAAC;;UAErC;UACAT,qBAAqB,CAACe,OAAO,CAACC,QAAQ,IAAI;YACtC,IAAIZ,KAAK,GAAGY,QAAQ,CAAC,EAAE;cACnBL,SAAS,CAACG,OAAO,GAAG;gBAChB,GAAGH,SAAS,CAACG,OAAO;gBACpB,CAACE,QAAQ,GAAGZ,KAAK,CAACY,QAAQ,CAAC,CAAC1B,SAAS,EAAEiC,QAAQ,CAAC,CAAC,IAAInB,KAAK,CAACY,QAAQ;cACvE,CAAC;YACL;UACJ,CAAC,CAAC;UAEFH,WAAW,CAACC,OAAO,GAAG,IAAI;QAC9B;QAEA,IAAIc,YAAY,CAACO,IAAI,CAACC,UAAU,IAAIA,UAAU,IAAI,CAAC,CAAC,KAAK,CAACP,qBAAqB,IAAIA,qBAAqB,CAACM,IAAI,CAACC,UAAU,IAAIA,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE;UAC3I1B,KAAK,CAAC2B,SAAS,IAAIA,SAAS,GAAG,CAAC,CAAC;QACrC;MACJ,CAAC,CAAC;MAEF,OAAO,MAAM;QACTZ,oBAAoB,CAAC,CAAC;MAC1B,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;IAEN,MAAMa,WAAW,GAAG;MAAE,GAAGnC,QAAQ,CAACE,KAAK;IAAE,CAAsB;IAE/Db,MAAM,CAAC+C,IAAI,CAACnC,KAAK,CAAC,CAACW,OAAO,CAACyB,GAAG,IAAI;MAC9B,IAAIA,GAAG,IAAIF,WAAW,EAAE;QACpBA,WAAW,CAACE,GAAG,CAAC,GAAGhD,MAAM,CAACiD,MAAM,CAACrC,KAAK,CAACoC,GAAG,CAAC,EAAEF,WAAW,CAACE,GAAG,CAAC,CAAC;QAE9D;MACJ;MAEAF,WAAW,CAACE,GAAG,CAAC,GAAGpC,KAAK,CAACoC,GAAG,CAAC;IACjC,CAAC,CAAC;;IAEF;IACAxC,qBAAqB,CAACe,OAAO,CAACC,QAAQ,IAAI;MACtC,IAAIsB,WAAW,CAACtB,QAAQ,CAAC,EAAE;QACvBsB,WAAW,CAACtB,QAAQ,CAAC,GAAGL,SAAS,CAACG,OAAO,CAACE,QAAQ,CAAC;MACvD;IACJ,CAAC,CAAC;IAEFH,WAAW,CAACC,OAAO,GAAG,KAAK;IAE3B,oBAAO,IAAAnC,WAAA,CAAA+D,GAAA,EAACxC,SAAS;MAAA,GAAKoC;IAAW,CAAG,CAAC;EACzC,CAAC;AACL,CAAC;AAAAK,OAAA,CAAA1C,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/lib/commonjs/core/index.js

@@ -9,19 +9,5 @@ Object.defineProperty(exports, "createUnistylesComponent", {
     return _createUnistylesComponent.createUnistylesComponent;
   }
 });
-Object.defineProperty(exports, "useBreakpoint", {
-  enumerable: true,
-  get: function () {
-    return _useBreakpoint.useBreakpoint;
-  }
-});
-Object.defineProperty(exports, "useTheme", {
-  enumerable: true,
-  get: function () {
-    return _useTheme.useTheme;
-  }
-});
-var _useBreakpoint = require("./useBreakpoint");
-var _useTheme = require("./useTheme");
 var _createUnistylesComponent = require("./createUnistylesComponent");
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_useBreakpoint","require","_useTheme","_createUnistylesComponent"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AACA,IAAAE,yBAAA,GAAAF,OAAA","ignoreList":[]}
+{"version":3,"names":["_createUnistylesComponent","require"],"sourceRoot":"../../../src","sources":["core/index.ts"],"mappings":";;;;;;;;;;;AAAA,IAAAA,yBAAA,GAAAC,OAAA","ignoreList":[]}

package/lib/commonjs/global.js

@@ -1,6 +1,2 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
 //# sourceMappingURL=global.js.map

package/lib/commonjs/global.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../src","sources":["global.js"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../src","sources":["global.ts"],"mappings":"","ignoreList":[]}

package/lib/commonjs/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   mq: true,
-  useTheme: true,
-  useBreakpoint: true,
   createUnistylesComponent: true
 };
 Object.defineProperty(exports, "createUnistylesComponent", {
@@ -21,18 +19,6 @@ Object.defineProperty(exports, "mq", {
     return _mq.mq;
   }
 });
-Object.defineProperty(exports, "useBreakpoint", {
-  enumerable: true,
-  get: function () {
-    return _core.useBreakpoint;
-  }
-});
-Object.defineProperty(exports, "useTheme", {
-  enumerable: true,
-  get: function () {
-    return _core.useTheme;
-  }
-});
 var _specs = require("./specs");
 Object.keys(_specs).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -47,4 +33,16 @@ Object.keys(_specs).forEach(function (key) {
 });
 var _mq = require("./mq");
 var _core = require("./core");
+var _components = require("./components");
+Object.keys(_components).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _components[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _components[key];
+    }
+  });
+});
 //# sourceMappingURL=index.js.map