react-native-unistyles 3.6.0 → 3.7.0

package/cxx/hybridObjects/HybridShadowRegistry.cpp

@@ -1,4 +1,5 @@
 #include "HybridShadowRegistry.h"
+#include "PerformanceTracing.h"
 
 using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
@@ -182,6 +183,8 @@ void HybridShadowRegistry::scheduleShadowTreeUpdate(jsi::Runtime& rt) {
                 return jsi::Value::undefined();
             }
 
+            UNISTYLES_TRACE_SECTION("updateShadowTree");
+
             shadow::ShadowTreeManager::updateShadowTree(rt);
 
             return jsi::Value::undefined();
@@ -225,6 +228,8 @@ jsi::Value HybridShadowRegistry::flush(jsi::Runtime &rt, const jsi::Value &thisV
         return jsi::Value::undefined();
     }
 
+    UNISTYLES_TRACE_SECTION("flush");
+
     shadow::ShadowTreeManager::updateShadowTree(rt);
 
     return jsi::Value::undefined();
@@ -286,6 +291,9 @@ jsi::Value HybridShadowRegistry::refreshReactNodes(jsi::Runtime &rt, const jsi::
     helpers::assertThat(rt, count == 1 && args[0].isObject(), "Unistyles: refreshReactNodes expected to be called with an array of shadow nodes.");
 
     auto nodes = args[0].asObject(rt).asArray(rt);
+
+    UNISTYLES_TRACE_SECTION("refreshReactNodes", "nodes", static_cast<int64_t>(nodes.size(rt)));
+
     std::unordered_map<SurfaceId, std::shared_ptr<const RootShadowNode>> roots;
 
     UIManagerBinding::getBinding(rt)->getUIManager().getShadowTreeRegistry().enumerate([&roots](const ShadowTree& shadowTree, bool&) {

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -18,6 +18,8 @@ jsi::Value HybridStyleSheet::create(jsi::Runtime& rt, const jsi::Value &thisVal,
     helpers::assertThat(rt, arguments[0].isObject(), "StyleSheet.create expected to be called with object or function.");
     helpers::assertThat(rt, this->_unistylesRuntime->ownsRegistry(), helpers::RUNTIME_REPLACED_ERROR);
 
+    UNISTYLES_TRACE_SECTION("createStyleSheet");
+
     auto thisStyleSheet = thisVal.asObject(rt);
     auto& registry = core::UnistylesRegistry::get();
 
@@ -345,6 +347,8 @@ void HybridStyleSheet::onImeChange(UnistylesNativeMiniRuntime miniRuntime) {
 }
 
 void HybridStyleSheet::applyDependencyChanges(jsi::Runtime& rt, std::vector<UnistyleDependency>& dependencies, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime) {
+    UNISTYLES_TRACE_SECTION("applyDependencyChanges", "dependencies", helpers::dependenciesToString(dependencies));
+
     auto& registry = core::UnistylesRegistry::get();
     auto parser = parser::Parser(this->_unistylesRuntime);
     auto dependencyMap = registry.buildDependencyMap(dependencies);
@@ -355,10 +359,14 @@ void HybridStyleSheet::applyDependencyChanges(jsi::Runtime& rt, std::vector<Unis
 
     // rebuild rawValue BEFORE notifying listeners so JS rerenders read fresh closures
     if (!dependencyMap.empty() || !dependentStyleSheets.empty()) {
+        UNISTYLES_TRACE_SECTION("rebuildUnistyles");
+
         parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, maybeMiniRuntime);
     }
 
     if (!dependencyMap.empty()) {
+        UNISTYLES_TRACE_SECTION("rebuildShadowLeafUpdates");
+
         parser.rebuildShadowLeafUpdates(rt, dependencyMap);
     }
 
@@ -370,6 +378,9 @@ void HybridStyleSheet::applyDependencyChanges(jsi::Runtime& rt, std::vector<Unis
 
     // after the commit, so listeners can point React at the committed nodes
     registry.setCommittedInstanceHandles(std::move(committedInstanceHandles));
+
+    UNISTYLES_TRACE_SECTION("notifyListeners");
+
     // also when no StyleSheet depends on the change, hooks (useUnistyles, withUnistyles, Display, Hide) may
     this->notifyJSListeners(dependencies);
 }

package/cxx/hybridObjects/HybridStyleSheet.h

@@ -9,6 +9,7 @@
 #include "HybridUnistylesStyleSheetSpec.hpp"
 #include "RNStyle.h"
 #include "Helpers.h"
+#include "PerformanceTracing.h"
 #include "UnistylesConstants.h"
 #include "Breakpoints.h"
 #include "Parser.h"

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -30,14 +30,8 @@ Dimensions HybridUnistylesRuntime::getScreen() {
     return this->_nativePlatform->getScreenDimensions();
 };
 
+// app theme, like getTheme(). ScopedTheme is read from React Context (useUnistyles) (#1295)
 std::optional<std::string> HybridUnistylesRuntime::getThemeName() {
-    auto& registry = core::UnistylesRegistry::get();
-    auto maybeScopedTheme = registry.getScopedTheme();
-
-    if (maybeScopedTheme.has_value()) {
-        return maybeScopedTheme.value();
-    }
-
     return this->getState().getCurrentThemeName();
 };
 
@@ -215,29 +209,13 @@ jsi::Value HybridUnistylesRuntime::createHybridNavigationBar(jsi::Runtime &rt, c
 
 UnistylesCxxMiniRuntime HybridUnistylesRuntime::getMiniRuntime() {
     UnistylesNativeMiniRuntime nativeMiniRuntime = this->_nativePlatform->getMiniRuntime();
-    UnistylesCxxMiniRuntime cxxMiniRuntime{
-        this->getThemeName(),
-        this->getBreakpoint(),
-        this->getHasAdaptiveThemes(),
-        nativeMiniRuntime.colorScheme,
-        nativeMiniRuntime.screen,
-        nativeMiniRuntime.contentSizeCategory,
-        nativeMiniRuntime.insets,
-        nativeMiniRuntime.pixelRatio,
-        nativeMiniRuntime.fontScale,
-        nativeMiniRuntime.rtl,
-        nativeMiniRuntime.statusBar,
-        nativeMiniRuntime.navigationBar,
-        nativeMiniRuntime.isPortrait,
-        nativeMiniRuntime.isLandscape
-    };
 
-    return cxxMiniRuntime;
+    return this->buildMiniRuntimeFromNativeRuntime(nativeMiniRuntime, this->getThemeName());
 }
 
-UnistylesCxxMiniRuntime HybridUnistylesRuntime::buildMiniRuntimeFromNativeRuntime(UnistylesNativeMiniRuntime& nativeMiniRuntime) {
+UnistylesCxxMiniRuntime HybridUnistylesRuntime::buildMiniRuntimeFromNativeRuntime(UnistylesNativeMiniRuntime& nativeMiniRuntime, std::optional<std::string> themeName) {
     UnistylesCxxMiniRuntime cxxMiniRuntime{
-        this->getThemeName(),
+        themeName,
         this->getBreakpoint(),
         this->getHasAdaptiveThemes(),
         nativeMiniRuntime.colorScheme,
@@ -256,11 +234,13 @@ UnistylesCxxMiniRuntime HybridUnistylesRuntime::buildMiniRuntimeFromNativeRuntim
     return cxxMiniRuntime;
 }
 
-jsi::Value HybridUnistylesRuntime::getMiniRuntimeAsValue(jsi::Runtime& rt, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime) {
+// themeName is passed by the caller, so it matches the theme the StyleSheet is called with
+jsi::Value HybridUnistylesRuntime::getMiniRuntimeAsValue(jsi::Runtime& rt, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime, std::optional<std::string> themeName) {
     jsi::Object obj(rt);
-    auto miniRuntime = maybeMiniRuntime.has_value()
-        ? this->buildMiniRuntimeFromNativeRuntime(maybeMiniRuntime.value())
-        : this->getMiniRuntime();
+    auto nativeMiniRuntime = maybeMiniRuntime.has_value()
+        ? maybeMiniRuntime.value()
+        : this->_nativePlatform->getMiniRuntime();
+    auto miniRuntime = this->buildMiniRuntimeFromNativeRuntime(nativeMiniRuntime, std::move(themeName));
 
     // auto generated by nitro, but can't be accessed due to static inline function
     obj.setProperty(rt, "themeName", JSIConverter<std::optional<std::string>>::toJSI(rt, miniRuntime.themeName));

package/cxx/hybridObjects/HybridUnistylesRuntime.h

@@ -71,8 +71,8 @@ struct HybridUnistylesRuntime: public HybridUnistylesRuntimeSpec {
 
     core::UnistylesState& getState();
     bool ownsRegistry() const;
-    UnistylesCxxMiniRuntime buildMiniRuntimeFromNativeRuntime(UnistylesNativeMiniRuntime& nativeMiniRuntime);
-    jsi::Value getMiniRuntimeAsValue(jsi::Runtime& rt, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime);
+    UnistylesCxxMiniRuntime buildMiniRuntimeFromNativeRuntime(UnistylesNativeMiniRuntime& nativeMiniRuntime, std::optional<std::string> themeName);
+    jsi::Value getMiniRuntimeAsValue(jsi::Runtime& rt, std::optional<UnistylesNativeMiniRuntime> maybeMiniRuntime, std::optional<std::string> themeName);
     void includeDependenciesForColorSchemeChange(std::vector<UnistyleDependency>& deps);
     void calculateNewThemeAndDependencies(std::vector<UnistyleDependency>& deps);
     std::function<void(std::function<void(jsi::Runtime&)>&&)> runOnJSThread;

package/cxx/parser/Parser.cpp

@@ -1,6 +1,8 @@
 #include "Parser.h"
 #include "UnistyleWrapper.h"
 #include "BackgroundImageConverter.h"
+#include "BackgroundLayerConverter.h"
+#include "FontVariationSettingsConverter.h"
 #include "TransformOriginConverter.h"
 #include <iomanip>
 #include <sstream>
@@ -113,7 +115,7 @@ jsi::Value parser::Parser::getParsedStyleSheetForScopedTheme(jsi::Runtime& rt, c
             .asObject(rt);
     }
 
-    auto miniRuntime = this->_unistylesRuntime->getMiniRuntimeAsValue(rt, std::nullopt);
+    auto miniRuntime = this->_unistylesRuntime->getMiniRuntimeAsValue(rt, std::nullopt, scopedTheme);
 
     return unistyle->parent->rawValue
         .asFunction(rt)
@@ -198,7 +200,7 @@ jsi::Object parser::Parser::unwrapStyleSheet(jsi::Runtime& rt, std::shared_ptr<S
 
     // stylesheet also has a mini runtime dependency
     // StyleSheetType::ThemableWithMiniRuntime
-    auto miniRuntime = this->_unistylesRuntime->getMiniRuntimeAsValue(rt, maybeMiniRuntime);
+    auto miniRuntime = this->_unistylesRuntime->getMiniRuntimeAsValue(rt, maybeMiniRuntime, state.getCurrentThemeName());
 
     return styleSheet->rawValue
         .asFunction(rt)
@@ -563,9 +565,28 @@ jsi::Object parser::Parser::parseFirstLevel(jsi::Runtime& rt, Unistyle::Shared u
             return;
         }
 
+        // { wght: 700 } is the object syntax, not breakpoints
+        if (converters::isFontVariationSettingsPropName(propertyName) && converters::isFontVariationSettingsObject(rt, propertyValueObject)) {
+            parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), propertyValue);
+
+            return;
+        }
+
+        if (converters::isBackgroundLayerPropName(propertyName) && propertyValueObject.isArray(rt)) {
+            parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), propertyValue);
+
+            return;
+        }
+
         // 'mq' or 'breakpoints'
         auto valueFromBreakpoint = getValueFromBreakpoints(rt, unistyle, propertyValueObject);
 
+        if (converters::isBackgroundLayerPropName(propertyName) && valueFromBreakpoint.isObject() && valueFromBreakpoint.asObject(rt).isArray(rt)) {
+            parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), valueFromBreakpoint);
+
+            return;
+        }
+
         parsedStyle.setProperty(rt, jsi::PropNameID::forUtf8(rt, propertyName), this->parseSecondLevel(rt, unistyle, valueFromBreakpoint));
     });
 
@@ -1026,8 +1047,21 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
             return;
         }
 
+        // { wght: 700 } is the object syntax, not breakpoints
+        if (converters::isFontVariationSettingsPropName(propertyName) && converters::isFontVariationSettingsObject(rt, nestedObjectStyle)) {
+            parsedStyle.setProperty(rt, propertyName.c_str(), propertyValue);
+
+            return;
+        }
+
         auto isArray = nestedObjectStyle.isArray(rt);
 
+        if (converters::isBackgroundLayerPropName(propertyName) && isArray) {
+            parsedStyle.setProperty(rt, propertyName.c_str(), propertyValue);
+
+            return;
+        }
+
         if (!isArray) {
             parsedStyle.setProperty(rt, propertyName.c_str(), this->getValueFromBreakpoints(rt, unistyle, nestedObjectStyle));
         }
@@ -1071,7 +1105,7 @@ jsi::Value parser::Parser::parseSecondLevel(jsi::Runtime &rt, Unistyle::Shared u
 folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, const std::vector<std::shared_ptr<UnistyleData>>& unistyles) {
     jsi::Object convertedStyles(rt);
     auto& state = core::UnistylesRegistry::get().getState();
-    std::unordered_set<std::string> skippedBackgroundImages;
+    std::unordered_set<std::string> skippedPropNames;
 
     for (const auto& unistyleData : unistyles) {
         if (!unistyleData->parsedStyle.has_value()) {
@@ -1081,10 +1115,9 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
         helpers::enumerateJSIObject(
             rt,
             unistyleData->parsedStyle.value(),
-            [this, &rt, &state, &convertedStyles, &skippedBackgroundImages](const std::string& propertyName, jsi::Value& propertyValue) {
-                if (converters::isBackgroundImagePropName(propertyName)) {
-                    skippedBackgroundImages.erase(propertyName);
-                }
+            [this, &rt, &state, &convertedStyles, &skippedPropNames](const std::string& propertyName, jsi::Value& propertyValue) {
+                // a later style replaces a skipped value
+                skippedPropNames.erase(propertyName);
 
                 if (converters::isBackgroundImagePropName(propertyName) && propertyValue.isString()) {
                     // React Native parses the raw string natively and reads an array as the unprocessed syntax
@@ -1112,7 +1145,39 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
 
                     // without a converter (React Native < 0.83) a raw string reads as no background image,
                     // so leave the prop to React, which processes it in JS
-                    skippedBackgroundImages.insert(propertyName);
+                    skippedPropNames.insert(propertyName);
+
+                    return;
+                }
+
+                // React Native processes these strings in JS, its native props only read the processed arrays
+                if (converters::isBackgroundLayerPropName(propertyName) && propertyValue.isString()) {
+                    convertedStyles.setProperty(
+                        rt,
+                        propertyName.c_str(),
+                        jsi::valueFromDynamic(rt, converters::parseBackgroundLayerString(propertyName, propertyValue.asString(rt).utf8(rt)))
+                    );
+
+                    return;
+                }
+
+                // React Native converts the object syntax in JS, its native props only read the string
+                if (converters::isFontVariationSettingsPropName(propertyName) && propertyValue.isObject()) {
+                    auto fontVariationSettings = propertyValue.asObject(rt);
+                    auto maybeFontVariationSettings = converters::fontVariationSettingsToString(rt, fontVariationSettings);
+
+                    if (maybeFontVariationSettings.has_value()) {
+                        convertedStyles.setProperty(
+                            rt,
+                            propertyName.c_str(),
+                            jsi::String::createFromUtf8(rt, maybeFontVariationSettings.value())
+                        );
+
+                        return;
+                    }
+
+                    // React throws for an invalid value, so leave the prop to React
+                    skippedPropNames.insert(propertyName);
 
                     return;
                 }
@@ -1289,9 +1354,9 @@ folly::dynamic parser::Parser::parseStylesToShadowTreeStyles(jsi::Runtime& rt, c
 
     auto props = jsi::dynamicFromValue(rt, jsi::Value(rt, convertedStyles));
 
-    // a skipped string still wins over earlier styles in React,
+    // a skipped value still wins over earlier styles in React,
     // so drop the prop instead of writing an earlier style's value
-    for (const auto& propName : skippedBackgroundImages) {
+    for (const auto& propName : skippedPropNames) {
         props.erase(propName);
     }
 

package/cxx/shadowTree/ShadowTreeDiagnostics.cpp

@@ -2,6 +2,7 @@
 
 #include <array>
 #include <cstdio>
+#include <cxxreact/ReactNativeVersion.h>
 #include <folly/Conv.h>
 #include <react/renderer/components/image/ImageProps.h>
 // ParagraphProps is platform specific and not exposed by the Android prefab
@@ -13,6 +14,13 @@
 #endif
 #include <react/renderer/components/text/TextProps.h>
 #include <react/renderer/components/view/BaseViewProps.h>
+// background size, position and repeat exist since React Native 0.83
+#if __has_include(<react/renderer/graphics/BackgroundSize.h>)
+#include <react/renderer/graphics/BackgroundPosition.h>
+#include <react/renderer/graphics/BackgroundRepeat.h>
+#include <react/renderer/graphics/BackgroundSize.h>
+#define UNISTYLES_HAS_BACKGROUND_LAYER_PROPS 1
+#endif
 #include <react/renderer/uimanager/UIManagerBinding.h>
 #include <string_view>
 #include "Parser.h"
@@ -74,6 +82,64 @@ std::string serialize(const std::optional<FontWeight>& fontWeight) {
     return fontWeight ? std::to_string(static_cast<int>(*fontWeight)) : "undefined";
 }
 
+#if UNISTYLES_HAS_BACKGROUND_LAYER_PROPS
+std::string serialize(const ValueUnit& valueUnit) {
+    switch (valueUnit.unit) {
+        case UnitType::Point:
+            return serialize(valueUnit.value) + "px";
+        case UnitType::Percent:
+            return serialize(valueUnit.value) + "%";
+        default:
+            return "undefined";
+    }
+}
+
+std::string serialize(const std::variant<std::monostate, ValueUnit>& value) {
+    return std::holds_alternative<ValueUnit>(value) ? serialize(std::get<ValueUnit>(value)) : "auto";
+}
+
+std::string serialize(const BackgroundSize& backgroundSize) {
+    if (std::holds_alternative<BackgroundSizeKeyword>(backgroundSize)) {
+        return std::get<BackgroundSizeKeyword>(backgroundSize) == BackgroundSizeKeyword::Cover ? "cover" : "contain";
+    }
+
+    const auto& size = std::get<BackgroundSizeLengthPercentage>(backgroundSize);
+
+    return serialize(size.x) + " " + serialize(size.y);
+}
+
+std::string serialize(const BackgroundPosition& backgroundPosition) {
+    std::string result;
+    auto append = [&result](const char* edge, const std::optional<ValueUnit>& value) {
+        if (value) {
+            result += (result.empty() ? "" : " ") + std::string(edge) + " " + serialize(*value);
+        }
+    };
+
+    append("top", backgroundPosition.top);
+    append("left", backgroundPosition.left);
+    append("right", backgroundPosition.right);
+    append("bottom", backgroundPosition.bottom);
+
+    return result;
+}
+
+std::string serialize(const BackgroundRepeat& backgroundRepeat) {
+    return std::to_string(static_cast<int>(backgroundRepeat.x)) + " " + std::to_string(static_cast<int>(backgroundRepeat.y));
+}
+
+template <typename T>
+std::string serialize(const std::vector<T>& values) {
+    std::string result;
+
+    for (const auto& value : values) {
+        result += (result.empty() ? "" : ", ") + serialize(value);
+    }
+
+    return "[" + result + "]";
+}
+#endif
+
 RectangleEdges<SharedColor> borderColors(const BaseViewProps& props) {
     return props.borderColors.resolve(false, {});
 }
@@ -87,6 +153,11 @@ const VerifiedProps<BaseViewProps> viewProps{
     {"borderBottomColor", [](const BaseViewProps& props) { return serialize(borderColors(props).bottom); }},
     {"opacity", [](const BaseViewProps& props) { return serialize(props.opacity); }},
     {"shadowColor", [](const BaseViewProps& props) { return serialize(props.shadowColor); }},
+#if UNISTYLES_HAS_BACKGROUND_LAYER_PROPS
+    {"backgroundSize", [](const BaseViewProps& props) { return serialize(props.backgroundSize); }},
+    {"backgroundPosition", [](const BaseViewProps& props) { return serialize(props.backgroundPosition); }},
+    {"backgroundRepeat", [](const BaseViewProps& props) { return serialize(props.backgroundRepeat); }},
+#endif
 };
 
 const VerifiedProps<BaseTextProps> textProps{
@@ -95,6 +166,9 @@ const VerifiedProps<BaseTextProps> textProps{
     {"fontSize", [](const BaseTextProps& props) { return serialize(props.textAttributes.fontSize); }},
     {"fontWeight", [](const BaseTextProps& props) { return serialize(props.textAttributes.fontWeight); }},
     {"textDecorationColor", [](const BaseTextProps& props) { return serialize(props.textAttributes.textDecorationColor); }},
+#if REACT_NATIVE_VERSION_MAJOR > 0 || REACT_NATIVE_VERSION_MINOR >= 88
+    {"fontVariationSettings", [](const BaseTextProps& props) { return props.textAttributes.fontVariationSettings.value_or("undefined"); }},
+#endif
 };
 
 const VerifiedProps<ImageProps> imageProps{

package/cxx/shadowTree/ShadowTreeManager.cpp

@@ -1,4 +1,5 @@
 #include "ShadowTreeManager.h"
+#include "PerformanceTracing.h"
 
 using namespace margelo::nitro::unistyles;
 using namespace facebook::react;
@@ -19,6 +20,8 @@ std::vector<InstanceHandle::Shared> shadow::ShadowTreeManager::updateShadowTree(
             return;
         }
 
+        UNISTYLES_TRACE_SECTION("commit", "nodes", static_cast<int64_t>(updates.size()));
+
         std::unordered_map<Tag, folly::dynamic> tagToProps;
 
         committedInstanceHandles.reserve(updates.size());

package/lib/commonjs/components/NamedTheme.js

@@ -19,6 +19,10 @@ const NamedTheme = ({
   const scope = (0, _react.useMemo)(() => ({
     name
   }), [name]);
+  (0, _react.useLayoutEffect)(() => {
+    // this will affect only scoped styles as other styles are not yet mounted
+    _specs.UnistylesShadowRegistry.flush();
+  });
   const mappedChildren = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: name
   }, "apply"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScopedThemeContext.ScopedThemeContext.Provider, {
@@ -27,10 +31,6 @@ const NamedTheme = ({
   }, "scope"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ApplyScopedTheme.ApplyScopedTheme, {
     name: previousScopedTheme
   }, "dispose")];
-  (0, _react.useLayoutEffect)(() => {
-    // this will affect only scoped styles as other styles are not yet mounted
-    _specs.UnistylesShadowRegistry.flush();
-  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
     children: mappedChildren
   });

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_ApplyScopedTheme","_scopeChildren","_ScopedThemeContext","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NamedTheme","name","children","previousScopedTheme","scope","useMemo","mappedChildren","jsx","ApplyScopedTheme","ScopedThemeContext","Provider","value","scopeChildren","useLayoutEffect","UnistylesShadowRegistry","flush","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAIA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AAAyD,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,wBAAAO,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAT,uBAAA,YAAAA,CAAAO,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAOlD,MAAMkB,UAAoD,GAAGA,CAAC;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAMC,KAAK,GAAG,IAAAC,cAAO,EAAC,OAAO;IAAEJ;EAAK,CAAC,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAE/C,MAAMK,cAAc,GAAG,cACnB,IAAA1B,WAAA,CAAA2B,GAAA,EAAC9B,iBAAA,CAAA+B,gBAAgB;IAAaP,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,eAC5C,IAAArB,WAAA,CAAA2B,GAAA,EAAC5B,mBAAA,CAAA8B,kBAAkB,CAACC,QAAQ;IAAaC,KAAK,EAAEP,KAAM;IAAAF,QAAA,EACjD,IAAAU,4BAAa,EAACX,IAAI,EAAEC,QAAQ;EAAC,GADD,OAEJ,CAAC,eAC9B,IAAAtB,WAAA,CAAA2B,GAAA,EAAC9B,iBAAA,CAAA+B,gBAAgB;IAAeP,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,IAAAU,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,oBAAO,IAAAnC,WAAA,CAAA2B,GAAA,EAAClC,MAAA,CAAAkB,OAAK,CAACyB,QAAQ;IAAAd,QAAA,EAAEI;EAAc,CAAiB,CAAC;AAC5D,CAAC;AAAAW,OAAA,CAAAjB,UAAA,GAAAA,UAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_ApplyScopedTheme","_scopeChildren","_ScopedThemeContext","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","NamedTheme","name","children","previousScopedTheme","scope","useMemo","useLayoutEffect","UnistylesShadowRegistry","flush","mappedChildren","jsx","ApplyScopedTheme","ScopedThemeContext","Provider","value","scopeChildren","Fragment","exports"],"sourceRoot":"../../../src","sources":["components/NamedTheme.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAIA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AACA,IAAAI,mBAAA,GAAAJ,OAAA;AAAyD,IAAAK,WAAA,GAAAL,OAAA;AAAA,SAAAD,wBAAAO,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAT,uBAAA,YAAAA,CAAAO,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAOlD,MAAMkB,UAAoD,GAAGA,CAAC;EAAEC,IAAI;EAAEC,QAAQ;EAAEC;AAAoB,CAAC,KAAK;EAC7G,MAAMC,KAAK,GAAG,IAAAC,cAAO,EAAC,OAAO;IAAEJ;EAAK,CAAC,CAAC,EAAE,CAACA,IAAI,CAAC,CAAC;EAE/C,IAAAK,sBAAe,EAAC,MAAM;IAClB;IACAC,8BAAuB,CAACC,KAAK,CAAC,CAAC;EACnC,CAAC,CAAC;EAEF,MAAMC,cAAc,GAAG,cACnB,IAAA7B,WAAA,CAAA8B,GAAA,EAACjC,iBAAA,CAAAkC,gBAAgB;IAAaV,IAAI,EAAEA;EAAK,GAAnB,OAAqB,CAAC,eAC5C,IAAArB,WAAA,CAAA8B,GAAA,EAAC/B,mBAAA,CAAAiC,kBAAkB,CAACC,QAAQ;IAAaC,KAAK,EAAEV,KAAM;IAAAF,QAAA,EACjD,IAAAa,4BAAa,EAACd,IAAI,EAAEC,QAAQ;EAAC,GADD,OAEJ,CAAC,eAC9B,IAAAtB,WAAA,CAAA8B,GAAA,EAACjC,iBAAA,CAAAkC,gBAAgB;IAAeV,IAAI,EAAEE;EAAyD,GAAzE,SAA2E,CAAC,CACrG;EAED,oBAAO,IAAAvB,WAAA,CAAA8B,GAAA,EAACrC,MAAA,CAAAkB,OAAK,CAACyB,QAAQ;IAAAd,QAAA,EAAEO;EAAc,CAAiB,CAAC;AAC5D,CAAC;AAAAQ,OAAA,CAAAjB,UAAA,GAAAA,UAAA","ignoreList":[]}

package/lib/commonjs/components/ScopedThemeContext.js

@@ -5,5 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ScopedThemeContext = void 0;
 var _react = require("react");
-const ScopedThemeContext = exports.ScopedThemeContext = /*#__PURE__*/(0, _react.createContext)(null);
+// React Server Components load a React build without createContext (or useContext). The Next.js App Router
+// setup imports Unistyles from the root layout, a server component, and nothing can read this context there.
+const ScopedThemeContext = exports.ScopedThemeContext = typeof _react.createContext === 'function' ? /*#__PURE__*/(0, _react.createContext)(null) : null;
 //# sourceMappingURL=ScopedThemeContext.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","ScopedThemeContext","exports","createContext"],"sourceRoot":"../../../src","sources":["components/ScopedThemeContext.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAQO,MAAMC,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,gBAAG,IAAAE,oBAAa,EAAe,IAAI,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","require","ScopedThemeContext","exports","createContext"],"sourceRoot":"../../../src","sources":["components/ScopedThemeContext.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAQA;AACA;AACO,MAAMC,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAC3B,OAAOE,oBAAa,KAAK,UAAU,gBAAG,IAAAA,oBAAa,EAAe,IAAI,CAAC,GAAG,IACpD","ignoreList":[]}

package/lib/commonjs/core/createUnistylesImageBackground.js

@@ -14,7 +14,11 @@ var _warn = require("./warn");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const createUnistylesImageBackground = Component => {
-  const UnistylesImageBackground = /*#__PURE__*/_react.default.forwardRef((props, forwardedRef) => {
+  const UnistylesImageBackground = ({
+    ref,
+    ...props
+  }) => {
+    const forwardedRef = ref ?? null;
     const scope = (0, _react.useContext)(_ScopedThemeContext.ScopedThemeContext);
 
     // @ts-expect-error we don't know the type of the component
@@ -43,7 +47,7 @@ const createUnistylesImageBackground = Component => {
       ref: (0, _hasUnistyles.hasUnistyles)(props.style) ? linkRef : forwardedRef,
       imageRef: (0, _hasUnistyles.hasUnistyles)(props.imageStyle) ? linkImageRef : props.imageRef
     });
-  });
+  };
   return (0, _utils.copyComponentProperties)(Component, UnistylesImageBackground);
 };
 exports.createUnistylesImageBackground = createUnistylesImageBackground;

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_ScopedThemeContext","_specs","_utils","_hasUnistyles","_passForwardRef","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createUnistylesImageBackground","Component","UnistylesImageBackground","React","forwardRef","props","forwardedRef","scope","useContext","ScopedThemeContext","maybeWarnAboutMultipleUnistyles","style","imageStyle","linkRef","ref","passForwardedRef","UnistylesShadowRegistry","add","remove","linkImageRef","jsx","hasUnistyles","imageRef","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesImageBackground.tsx"],"mappings":";;;;;;AAEA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,mBAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,aAAA,GAAAJ,OAAA;AACA,IAAAK,eAAA,GAAAL,OAAA;AACA,IAAAM,KAAA,GAAAN,OAAA;AAAwD,IAAAO,WAAA,GAAAP,OAAA;AAAA,SAAAD,wBAAAS,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAX,uBAAA,YAAAA,CAAAS,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAEjD,MAAMkB,8BAA8B,GAAIC,SAAiC,IAAK;EACjF,MAAMC,wBAAwB,gBAAGC,cAAK,CAACC,UAAU,CAAwC,CAACC,KAAK,EAAEC,YAAY,KAAK;IAC9G,MAAMC,KAAK,GAAG,IAAAC,iBAAU,EAACC,sCAAkB,CAAC;;IAE5C;IACA,IAAAC,qCAA+B,EAACL,KAAK,CAACM,KAAK,EAAE,iBAAiB,CAAC;IAC/D;IACA,IAAAD,qCAA+B,EAACL,KAAK,CAACO,UAAU,EAAE,iBAAiB,CAAC;IAEpE,MAAMC,OAAO,GAAIC,GAA2B,IAAK;MAC7C,OAAO,IAAAC,gCAAgB,EACnBD,GAAG,EACHR,YAAY,EACZ,MAAM;QACF;QACAU,8BAAuB,CAACC,GAAG,CAACH,GAAG,EAAET,KAAK,CAACM,KAAK,EAAEJ,KAAK,CAAC;MACxD,CAAC,EACD,MAAM;QACF;QACAS,8BAAuB,CAACE,MAAM,CAACJ,GAAG,CAAC;MACvC,CACJ,CAAC;IACL,CAAC;IACD,MAAMK,YAAY,GAAIL,GAAY,IAAK;MACnC;MACAE,8BAAuB,CAACC,GAAG,CAACH,GAAG,EAAET,KAAK,CAACO,UAAU,EAAEL,KAAK,CAAC;MAEzD,OAAO,MAAM;QACT;QACAS,8BAAuB,CAACE,MAAM,CAACJ,GAAG,CAAC;MACvC,CAAC;IACL,CAAC;IAED,oBACI,IAAAlC,WAAA,CAAAwC,GAAA,EAACnB,SAAS;MAAA,GACFI,KAAK;MACTS,GAAG,EAAE,IAAAO,0BAAY,EAAChB,KAAK,CAACM,KAAK,CAAC,GAAGE,OAAO,GAAGP,YAAa;MACxDgB,QAAQ,EAAE,IAAAD,0BAAY,EAAChB,KAAK,CAACO,UAAU,CAAC,GAAGO,YAAY,GAAGd,KAAK,CAACiB;IAAS,CAC5E,CAAC;EAEV,CAAC,CAAC;EAEF,OAAO,IAAAC,8BAAuB,EAACtB,SAAS,EAAEC,wBAAwB,CAAC;AACvE,CAAC;AAAAsB,OAAA,CAAAxB,8BAAA,GAAAA,8BAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_ScopedThemeContext","_specs","_utils","_hasUnistyles","_passForwardRef","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","createUnistylesImageBackground","Component","UnistylesImageBackground","ref","props","forwardedRef","scope","useContext","ScopedThemeContext","maybeWarnAboutMultipleUnistyles","style","imageStyle","linkRef","passForwardedRef","UnistylesShadowRegistry","add","remove","linkImageRef","jsx","hasUnistyles","imageRef","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesImageBackground.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/withUnistyles/withUnistyles.js

@@ -4,21 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withUnistyles = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _utils = require("../../utils");
 var _getClassname = require("../getClassname");
 var _useProxifiedUnistyles = require("../useProxifiedUnistyles");
 var _warn = require("../warn");
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // @ts-expect-error
 
 // @ts-expect-error
 
 const withUnistyles = (Component, mappings) => {
-  return /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
+  return ({
+    ref,
+    ...props
+  }) => {
     const narrowedProps = props;
-    const styleClassNames = (0, _getClassname.getClassName)(narrowedProps.style, true);
+    const [classNames, animatedStyles] = (0, _getClassname.getClassName)(narrowedProps.style, true) ?? [];
     const contentContainerStyleClassNames = (0, _getClassname.getClassName)(narrowedProps.contentContainerStyle);
     const {
       proxifiedRuntime,
@@ -37,7 +40,8 @@ const withUnistyles = (Component, mappings) => {
       ...(0, _utils.deepMergeObjects)(mappingsProps, unistyleProps, props),
       ...(narrowedProps.style ? {
         // Override default component styles with undefined values to reset them
-        style: emptyStyles
+        // animated styles can't be a class, so they stay inline
+        style: animatedStyles?.length ? [emptyStyles, ...animatedStyles] : emptyStyles
       } : {}),
       ...(narrowedProps.contentContainerStyle ? {
         contentContainerStyle: contentContainerStyleClassNames
@@ -51,7 +55,6 @@ const withUnistyles = (Component, mappings) => {
     // prettier-ignore
     (0, _warn.maybeWarnAboutMultipleUnistyles)(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`);
     const NativeComponent = Component;
-    const [classNames] = styleClassNames ?? [];
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: classNames?.hash,
       style: {
@@ -62,7 +65,7 @@ const withUnistyles = (Component, mappings) => {
         ref: ref
       }, uniPropsKey || mappingsKey)
     });
-  });
+  };
 };
 exports.withUnistyles = withUnistyles;
 //# sourceMappingURL=withUnistyles.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withUnistyles","Component","mappings","forwardRef","props","ref","narrowedProps","styleClassNames","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","key","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","emptyStyles","fromEntries","entries","getOwnPropertyDescriptors","filter","startsWith","map","undefined","combinedProps","deepMergeObjects","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","classNames","jsx","className","hash","display","children","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_utils","_getClassname","_useProxifiedUnistyles","_warn","_jsxRuntime","e","__esModule","default","withUnistyles","Component","mappings","ref","props","narrowedProps","classNames","animatedStyles","getClassName","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","useProxifiedUnistyles","key","mappingsKey","mappingsProps","uniPropsKey","unistyleProps","uniProps","emptyStyles","Object","fromEntries","entries","getOwnPropertyDescriptors","filter","startsWith","map","undefined","combinedProps","deepMergeObjects","length","maybeWarnAboutMultipleUnistyles","displayName","name","NativeComponent","jsx","className","hash","display","children","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":"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","ignoreList":[]}