react-native-unistyles 3.0.0-nightly-20250221 → 3.0.0-nightly-20250226

package/README.md

@@ -18,6 +18,20 @@
 yarn add react-native-unistyles@beta
 ```
 
+Install dependencies:
+
+```shell
+yarn add react-native-edge-to-edge react-native-nitro-modules@0.22.1
+```
+
+> Always use fixed version of `react-native-nitro-modules` to avoid unexpected behaviors.
+
+| react-native-unistyles | react-native-nitro-modules |
+|------------------------|----------------------------|
+| 3.0.0.beta.7           | 0.22.1                     |
+| 3.0.0.nightly-20250221 | 0.22.1                     |
+| 3.0.0.nightly-20250226 | 0.24.1                     |
+
 Then follow [installation guides](https://unistyl.es/v3/start/getting-started) for your platform.
 
 ## [Documentation](https://unistyl.es/)

package/android/CMakeLists.txt

@@ -23,7 +23,8 @@ include_directories(
     ../cxx/shadowTree
 )
 
-string(APPEND CMAKE_CXX_FLAGS " -DFOLLY_NO_CONFIG=1 -DFOLLY_CFG_NO_COROUTINES=1 -DFOLLY_MOBILE=1")
+# Nitro appends all Folly Flags, leaving it empty
+string(APPEND CMAKE_CXX_FLAGS " ")
 
 set_target_properties(unistyles PROPERTIES
     CXX_STANDARD 20

package/cxx/core/UnistylesMountHook.cpp

@@ -22,7 +22,7 @@ void core::UnistylesMountHook::shadowTreeDidMount(RootShadowNode::Shared const &
     // one more time merge Unistyles changes
     auto& registry = core::UnistylesRegistry::get();
 
-    if (!registry.trafficController.shouldStop()) {
-        shadow::ShadowTreeManager::updateShadowTree(this->_uiManager->getShadowTreeRegistry());
+    if (registry.trafficController.shouldStop()) {
+        registry.trafficController.resumeUnistylesTraffic();
     }
 }

package/cxx/core/UnistylesMountHook.h

@@ -3,15 +3,13 @@
 #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, std::shared_ptr<HybridUnistylesRuntime> unistylesRuntime)
-        : _uiManager{uiManager}, _unistylesRuntime{unistylesRuntime} {
+    UnistylesMountHook(std::shared_ptr<UIManager> uiManager): _uiManager{uiManager} {
         _uiManager->registerMountHook(*this);
     }
 
@@ -21,7 +19,6 @@ struct UnistylesMountHook : public UIManagerMountHook {
 
 private:
     std::shared_ptr<UIManager> _uiManager;
-    std::shared_ptr<HybridUnistylesRuntime> _unistylesRuntime;
 };
 
 }

package/cxx/hybridObjects/HybridStyleSheet.cpp

@@ -261,7 +261,7 @@ void HybridStyleSheet::registerHooks(jsi::Runtime& rt) {
     core::UnistylesRegistry::get().trafficController.restore();
 
     this->_unistylesCommitHook = std::make_shared<core::UnistylesCommitHook>(this->_uiManager);
-    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager, this->_unistylesRuntime);
+    this->_unistylesMountHook = std::make_shared<core::UnistylesMountHook>(this->_uiManager);
 }
 
 void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependency> dependencies) {

package/cxx/hybridObjects/HybridUnistylesRuntime.cpp

@@ -73,11 +73,11 @@ 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.");
 
     auto& state = core::UnistylesRegistry::get().getState(*_rt);
-    auto& currentThemeName = state.getCurrentThemeName();
+    auto currentThemeName = state.getCurrentThemeName();
 
     state.setTheme(themeName);
 
-    if (currentThemeName != themeName) {
+    if (currentThemeName.value() != themeName) {
         this->_onDependenciesChange({UnistyleDependency::THEME, UnistyleDependency::THEMENAME});
     }
 };

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

@@ -45,6 +45,10 @@ const createUnistylesElement = Component => {
 
         // @ts-ignore we don't know the type of the component
         (0, _warn.maybeWarnAboutMultipleUnistyles)(props.style, Component.displayName);
+        return () => {
+          // @ts-ignore
+          _specs.UnistylesShadowRegistry.remove(ref);
+        };
       }
     });
   });

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_passForwardRef","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getNativeRef","Component","ref","name","viewRef","current","getNativeScrollRef","getScrollRef","createUnistylesElement","UnistylesComponent","React","forwardRef","props","forwardedRef","storedRef","useRef","useLayoutEffect","UnistylesShadowRegistry","remove","jsx","passForwardedRef","maybeWarnAboutMultipleUnistyles","style","displayName","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.native.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAAwD,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;AAExD,MAAMW,YAAY,GAAGA,CAACC,SAAc,EAAEC,GAAQ,KAAK;EAC/C,QAAQD,SAAS,CAACE,IAAI;IAClB,KAAK,sBAAsB;MACvB,OAAOD,GAAG,CAACE,OAAO,EAAEC,OAAO;IAC/B,KAAK,UAAU;MACX,OAAOH,GAAG,CAACI,kBAAkB,GAAG,CAAC;IACrC,KAAK,iBAAiB;MAClB,OAAOJ,GAAG,CAACK,YAAY,GAAG,CAAC;IAC/B;MACI,OAAOL,GAAG;EAClB;AACJ,CAAC;AAEM,MAAMM,sBAAsB,GAAIP,SAAc,IAAK;EACtD,MAAMQ,kBAAkB,gBAAGC,cAAK,CAACC,UAAU,CAAC,CAACC,KAAK,EAAEC,YAAY,KAAK;IACjE,MAAMC,SAAS,GAAG,IAAAC,aAAM,EAAU,IAAI,CAAC;IAEvC,IAAAC,sBAAe,EAAC,MAAM;MAClB,OAAO,MAAM;QACT,IAAIF,SAAS,CAACT,OAAO,EAAE;UACnB;UACAY,8BAAuB,CAACC,MAAM,CAACJ,SAAS,CAACT,OAAO,CAAC;QACrD;MACJ,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;IAEN,oBACI,IAAA1B,WAAA,CAAAwC,GAAA,EAAClB,SAAS;MAAA,GACFW,KAAK;MACTV,GAAG,EAAGA,GAAY,IAAK;QACnB,IAAIA,GAAG,EAAE;UACLY,SAAS,CAACT,OAAO,GAAGL,YAAY,CAACC,SAAS,EAAEC,GAAG,CAAC;QACpD;QAEA,IAAAkB,gCAAgB,EAACR,KAAK,EAAEV,GAAG,EAAEW,YAAY,CAAC;;QAE1C;QACA,IAAAQ,qCAA+B,EAACT,KAAK,CAACU,KAAK,EAAErB,SAAS,CAACsB,WAAW,CAAC;MACvE;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAO,IAAAC,8BAAuB,EAACvB,SAAS,EAAEQ,kBAAkB,CAAC;AACjE,CAAC;AAAAgB,OAAA,CAAAjB,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_passForwardRef","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","getNativeRef","Component","ref","name","viewRef","current","getNativeScrollRef","getScrollRef","createUnistylesElement","UnistylesComponent","React","forwardRef","props","forwardedRef","storedRef","useRef","useLayoutEffect","UnistylesShadowRegistry","remove","jsx","passForwardedRef","maybeWarnAboutMultipleUnistyles","style","displayName","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.native.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/core/createUnistylesImageBackground.js

@@ -35,6 +35,10 @@ const createUnistylesImageBackground = Component => {
         return () => {
           // @ts-ignore
           _specs.UnistylesShadowRegistry.remove(ref);
+          if (storedImageRef.current) {
+            // @ts-ignore
+            _specs.UnistylesShadowRegistry.remove(storedImageRef.current);
+          }
         };
       },
       imageRef: ref => {

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_passForwardRef","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","createUnistylesImageBackground","Component","UnistylesImageBackground","React","forwardRef","props","forwardedRef","storedImageRef","useRef","useLayoutEffect","current","UnistylesShadowRegistry","remove","maybeWarnAboutMultipleUnistyles","style","imageStyle","jsx","ref","passForwardedRef","imageRef","add","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesImageBackground.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AAAwD,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;AAEjD,MAAMW,8BAA8B,GAAIC,SAAiC,IAAK;EACjF,MAAMC,wBAAwB,gBAAGC,cAAK,CAACC,UAAU,CAAwC,CAACC,KAAK,EAAEC,YAAY,KAAK;IAC9G,MAAMC,cAAc,GAAG,IAAAC,aAAM,EAAe,IAAI,CAAC;IAEjD,IAAAC,sBAAe,EAAC,MAAM;MAClB,OAAO,MAAM;QACT,IAAIF,cAAc,CAACG,OAAO,EAAE;UACxB;UACAC,8BAAuB,CAACC,MAAM,CAACL,cAAc,CAACG,OAAO,CAAC;QAC1D;MACJ,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;;IAEN;IACA,IAAAG,qCAA+B,EAACR,KAAK,CAACS,KAAK,EAAE,iBAAiB,CAAC;IAC/D;IACA,IAAAD,qCAA+B,EAACR,KAAK,CAACU,UAAU,EAAE,iBAAiB,CAAC;IAEpE,oBACI,IAAApC,WAAA,CAAAqC,GAAA,EAACf,SAAS;MAAA,GACFI,KAAK;MACTY,GAAG,EAAEA,GAAG,IAAI;QACR,IAAAC,gCAAgB,EAACb,KAAK,EAAEY,GAAG,EAAEX,YAAY,CAAC;QAE1C,OAAO,MAAM;UACT;UACAK,8BAAuB,CAACC,MAAM,CAACK,GAAG,CAAC;QACvC,CAAC;MACL,CAAE;MACFE,QAAQ,EAAEF,GAAG,IAAI;QACb,IAAIA,GAAG,EAAE;UACLV,cAAc,CAACG,OAAO,GAAGO,GAAG;QAChC;;QAEA;QACAN,8BAAuB,CAACS,GAAG,CAACH,GAAG,EAAEZ,KAAK,CAACU,UAAU,CAAC;MACtD;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAO,IAAAM,8BAAuB,EAACpB,SAAS,EAAEC,wBAAwB,CAAC;AACvE,CAAC;AAAAoB,OAAA,CAAAtB,8BAAA,GAAAA,8BAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_passForwardRef","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","createUnistylesImageBackground","Component","UnistylesImageBackground","React","forwardRef","props","forwardedRef","storedImageRef","useRef","useLayoutEffect","current","UnistylesShadowRegistry","remove","maybeWarnAboutMultipleUnistyles","style","imageStyle","jsx","ref","passForwardedRef","imageRef","add","copyComponentProperties","exports"],"sourceRoot":"../../../src","sources":["core/createUnistylesImageBackground.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -18,10 +18,17 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 const withUnistyles = (Component, mappings) => {
   const getSecrets = (styleProps = {}) => {
-    const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
-    return unistyleKey ? styleProps[unistyleKey] : {
-      uni__getStyles: () => styleProps,
-      uni__dependencies: []
+    const styles = Array.isArray(styleProps) ? styleProps : [styleProps];
+    const secrets = styles.filter(Boolean).reduce((acc, style) => {
+      const unistyleKey = Object.keys(style).find(key => key.startsWith('unistyles_'));
+      return acc.concat([unistyleKey ? style[unistyleKey] : {
+        uni__getStyles: () => styleProps,
+        uni__dependencies: []
+      }]);
+    }, []);
+    return {
+      styles: secrets.reduce((acc, secret) => Object.assign(acc, secret.uni__getStyles()), {}),
+      dependencies: secrets.flatMap(secret => secret.uni__dependencies)
     };
   };
   return /*#__PURE__*/(0, _react.forwardRef)((props, ref) => {
@@ -41,7 +48,7 @@ const withUnistyles = (Component, mappings) => {
     (0, _react.useEffect)(() => {
       const styleSecrets = getSecrets(narrowedProps.style);
       const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle);
-      addDependencies(Array.from(new Set([...styleSecrets.uni__dependencies, ...contentContainerStyleSecrets.uni__dependencies])));
+      addDependencies(Array.from(new Set([...styleSecrets.dependencies, ...contentContainerStyleSecrets.dependencies])));
     }, [narrowedProps.style, narrowedProps.contentContainerStyle]);
     const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
     const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
@@ -50,10 +57,10 @@ const withUnistyles = (Component, mappings) => {
     const finalProps = {
       ...(0, _utils.deepMergeObjects)(mappingsProps, unistyleProps, props),
       ...(narrowedProps.style ? {
-        style: styleSecrets.uni__getStyles()
+        style: styleSecrets.styles
       } : {}),
       ...(narrowedProps.contentContainerStyle ? {
-        contentContainerStyle: contentContainerStyleSecrets.uni__getStyles()
+        contentContainerStyle: contentContainerStyleSecrets.styles
       } : {})
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(NativeComponent, {

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","getSecrets","styleProps","unistyleKey","keys","find","key","startsWith","uni__getStyles","uni__dependencies","forwardRef","props","ref","narrowedProps","NativeComponent","maybeWarnAboutMultipleUnistyles","style","displayName","name","contentContainerStyle","scopedTheme","useRef","UnistylesShadowRegistry","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","useProxifiedUnistyles","current","useEffect","styleSecrets","contentContainerStyleSecrets","Array","from","Set","mappingsProps","unistyleProps","uniProps","finalProps","deepMergeObjects","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_specs","_utils","_useProxifiedUnistyles","_warn","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","secrets","filter","Boolean","reduce","acc","style","unistyleKey","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","forwardRef","props","ref","narrowedProps","NativeComponent","maybeWarnAboutMultipleUnistyles","displayName","name","contentContainerStyle","scopedTheme","useRef","UnistylesShadowRegistry","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","useProxifiedUnistyles","current","useEffect","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsProps","unistyleProps","uniProps","finalProps","deepMergeObjects","jsx","exports"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/core/createUnistylesElement.native.js

@@ -39,6 +39,10 @@ export const createUnistylesElement = Component => {
 
         // @ts-ignore we don't know the type of the component
         maybeWarnAboutMultipleUnistyles(props.style, Component.displayName);
+        return () => {
+          // @ts-ignore
+          UnistylesShadowRegistry.remove(ref);
+        };
       }
     });
   });

package/lib/module/core/createUnistylesElement.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useLayoutEffect","useRef","UnistylesShadowRegistry","copyComponentProperties","passForwardedRef","maybeWarnAboutMultipleUnistyles","jsx","_jsx","getNativeRef","Component","ref","name","viewRef","current","getNativeScrollRef","getScrollRef","createUnistylesElement","UnistylesComponent","forwardRef","props","forwardedRef","storedRef","remove","style","displayName"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AACtD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,kBAAkB;AACnD,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAExD,MAAMC,YAAY,GAAGA,CAACC,SAAc,EAAEC,GAAQ,KAAK;EAC/C,QAAQD,SAAS,CAACE,IAAI;IAClB,KAAK,sBAAsB;MACvB,OAAOD,GAAG,CAACE,OAAO,EAAEC,OAAO;IAC/B,KAAK,UAAU;MACX,OAAOH,GAAG,CAACI,kBAAkB,GAAG,CAAC;IACrC,KAAK,iBAAiB;MAClB,OAAOJ,GAAG,CAACK,YAAY,GAAG,CAAC;IAC/B;MACI,OAAOL,GAAG;EAClB;AACJ,CAAC;AAED,OAAO,MAAMM,sBAAsB,GAAIP,SAAc,IAAK;EACtD,MAAMQ,kBAAkB,gBAAGlB,KAAK,CAACmB,UAAU,CAAC,CAACC,KAAK,EAAEC,YAAY,KAAK;IACjE,MAAMC,SAAS,GAAGpB,MAAM,CAAU,IAAI,CAAC;IAEvCD,eAAe,CAAC,MAAM;MAClB,OAAO,MAAM;QACT,IAAIqB,SAAS,CAACR,OAAO,EAAE;UACnB;UACAX,uBAAuB,CAACoB,MAAM,CAACD,SAAS,CAACR,OAAO,CAAC;QACrD;MACJ,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;IAEN,oBACIN,IAAA,CAACE,SAAS;MAAA,GACFU,KAAK;MACTT,GAAG,EAAGA,GAAY,IAAK;QACnB,IAAIA,GAAG,EAAE;UACLW,SAAS,CAACR,OAAO,GAAGL,YAAY,CAACC,SAAS,EAAEC,GAAG,CAAC;QACpD;QAEAN,gBAAgB,CAACe,KAAK,EAAET,GAAG,EAAEU,YAAY,CAAC;;QAE1C;QACAf,+BAA+B,CAACc,KAAK,CAACI,KAAK,EAAEd,SAAS,CAACe,WAAW,CAAC;MACvE;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAOrB,uBAAuB,CAACM,SAAS,EAAEQ,kBAAkB,CAAC;AACjE,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useLayoutEffect","useRef","UnistylesShadowRegistry","copyComponentProperties","passForwardedRef","maybeWarnAboutMultipleUnistyles","jsx","_jsx","getNativeRef","Component","ref","name","viewRef","current","getNativeScrollRef","getScrollRef","createUnistylesElement","UnistylesComponent","forwardRef","props","forwardedRef","storedRef","remove","style","displayName"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AACtD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,kBAAkB;AACnD,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAExD,MAAMC,YAAY,GAAGA,CAACC,SAAc,EAAEC,GAAQ,KAAK;EAC/C,QAAQD,SAAS,CAACE,IAAI;IAClB,KAAK,sBAAsB;MACvB,OAAOD,GAAG,CAACE,OAAO,EAAEC,OAAO;IAC/B,KAAK,UAAU;MACX,OAAOH,GAAG,CAACI,kBAAkB,GAAG,CAAC;IACrC,KAAK,iBAAiB;MAClB,OAAOJ,GAAG,CAACK,YAAY,GAAG,CAAC;IAC/B;MACI,OAAOL,GAAG;EAClB;AACJ,CAAC;AAED,OAAO,MAAMM,sBAAsB,GAAIP,SAAc,IAAK;EACtD,MAAMQ,kBAAkB,gBAAGlB,KAAK,CAACmB,UAAU,CAAC,CAACC,KAAK,EAAEC,YAAY,KAAK;IACjE,MAAMC,SAAS,GAAGpB,MAAM,CAAU,IAAI,CAAC;IAEvCD,eAAe,CAAC,MAAM;MAClB,OAAO,MAAM;QACT,IAAIqB,SAAS,CAACR,OAAO,EAAE;UACnB;UACAX,uBAAuB,CAACoB,MAAM,CAACD,SAAS,CAACR,OAAO,CAAC;QACrD;MACJ,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;IAEN,oBACIN,IAAA,CAACE,SAAS;MAAA,GACFU,KAAK;MACTT,GAAG,EAAGA,GAAY,IAAK;QACnB,IAAIA,GAAG,EAAE;UACLW,SAAS,CAACR,OAAO,GAAGL,YAAY,CAACC,SAAS,EAAEC,GAAG,CAAC;QACpD;QAEAN,gBAAgB,CAACe,KAAK,EAAET,GAAG,EAAEU,YAAY,CAAC;;QAE1C;QACAf,+BAA+B,CAACc,KAAK,CAACI,KAAK,EAAEd,SAAS,CAACe,WAAW,CAAC;QAEnE,OAAO,MAAM;UACT;UACAtB,uBAAuB,CAACoB,MAAM,CAACZ,GAAG,CAAC;QACvC,CAAC;MACL;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAOP,uBAAuB,CAACM,SAAS,EAAEQ,kBAAkB,CAAC;AACjE,CAAC","ignoreList":[]}

package/lib/module/core/createUnistylesImageBackground.js

@@ -29,6 +29,10 @@ export const createUnistylesImageBackground = Component => {
         return () => {
           // @ts-ignore
           UnistylesShadowRegistry.remove(ref);
+          if (storedImageRef.current) {
+            // @ts-ignore
+            UnistylesShadowRegistry.remove(storedImageRef.current);
+          }
         };
       },
       imageRef: ref => {

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

@@ -1 +1 @@
-{"version":3,"names":["React","useLayoutEffect","useRef","UnistylesShadowRegistry","copyComponentProperties","passForwardedRef","maybeWarnAboutMultipleUnistyles","jsx","_jsx","createUnistylesImageBackground","Component","UnistylesImageBackground","forwardRef","props","forwardedRef","storedImageRef","current","remove","style","imageStyle","ref","imageRef","add"],"sourceRoot":"../../../src","sources":["core/createUnistylesImageBackground.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAEtD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,kBAAkB;AACnD,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAExD,OAAO,MAAMC,8BAA8B,GAAIC,SAAiC,IAAK;EACjF,MAAMC,wBAAwB,gBAAGX,KAAK,CAACY,UAAU,CAAwC,CAACC,KAAK,EAAEC,YAAY,KAAK;IAC9G,MAAMC,cAAc,GAAGb,MAAM,CAAe,IAAI,CAAC;IAEjDD,eAAe,CAAC,MAAM;MAClB,OAAO,MAAM;QACT,IAAIc,cAAc,CAACC,OAAO,EAAE;UACxB;UACAb,uBAAuB,CAACc,MAAM,CAACF,cAAc,CAACC,OAAO,CAAC;QAC1D;MACJ,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;;IAEN;IACAV,+BAA+B,CAACO,KAAK,CAACK,KAAK,EAAE,iBAAiB,CAAC;IAC/D;IACAZ,+BAA+B,CAACO,KAAK,CAACM,UAAU,EAAE,iBAAiB,CAAC;IAEpE,oBACIX,IAAA,CAACE,SAAS;MAAA,GACFG,KAAK;MACTO,GAAG,EAAEA,GAAG,IAAI;QACRf,gBAAgB,CAACQ,KAAK,EAAEO,GAAG,EAAEN,YAAY,CAAC;QAE1C,OAAO,MAAM;UACT;UACAX,uBAAuB,CAACc,MAAM,CAACG,GAAG,CAAC;QACvC,CAAC;MACL,CAAE;MACFC,QAAQ,EAAED,GAAG,IAAI;QACb,IAAIA,GAAG,EAAE;UACLL,cAAc,CAACC,OAAO,GAAGI,GAAG;QAChC;;QAEA;QACAjB,uBAAuB,CAACmB,GAAG,CAACF,GAAG,EAAEP,KAAK,CAACM,UAAU,CAAC;MACtD;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAOf,uBAAuB,CAACM,SAAS,EAAEC,wBAAwB,CAAC;AACvE,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useLayoutEffect","useRef","UnistylesShadowRegistry","copyComponentProperties","passForwardedRef","maybeWarnAboutMultipleUnistyles","jsx","_jsx","createUnistylesImageBackground","Component","UnistylesImageBackground","forwardRef","props","forwardedRef","storedImageRef","current","remove","style","imageStyle","ref","imageRef","add"],"sourceRoot":"../../../src","sources":["core/createUnistylesImageBackground.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAEtD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,gBAAgB,QAAQ,kBAAkB;AACnD,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAExD,OAAO,MAAMC,8BAA8B,GAAIC,SAAiC,IAAK;EACjF,MAAMC,wBAAwB,gBAAGX,KAAK,CAACY,UAAU,CAAwC,CAACC,KAAK,EAAEC,YAAY,KAAK;IAC9G,MAAMC,cAAc,GAAGb,MAAM,CAAe,IAAI,CAAC;IAEjDD,eAAe,CAAC,MAAM;MAClB,OAAO,MAAM;QACT,IAAIc,cAAc,CAACC,OAAO,EAAE;UACxB;UACAb,uBAAuB,CAACc,MAAM,CAACF,cAAc,CAACC,OAAO,CAAC;QAC1D;MACJ,CAAC;IACL,CAAC,EAAE,EAAE,CAAC;;IAEN;IACAV,+BAA+B,CAACO,KAAK,CAACK,KAAK,EAAE,iBAAiB,CAAC;IAC/D;IACAZ,+BAA+B,CAACO,KAAK,CAACM,UAAU,EAAE,iBAAiB,CAAC;IAEpE,oBACIX,IAAA,CAACE,SAAS;MAAA,GACFG,KAAK;MACTO,GAAG,EAAEA,GAAG,IAAI;QACRf,gBAAgB,CAACQ,KAAK,EAAEO,GAAG,EAAEN,YAAY,CAAC;QAE1C,OAAO,MAAM;UACT;UACAX,uBAAuB,CAACc,MAAM,CAACG,GAAG,CAAC;UAEnC,IAAIL,cAAc,CAACC,OAAO,EAAE;YACxB;YACAb,uBAAuB,CAACc,MAAM,CAACF,cAAc,CAACC,OAAO,CAAC;UAC1D;QACJ,CAAC;MACL,CAAE;MACFK,QAAQ,EAAED,GAAG,IAAI;QACb,IAAIA,GAAG,EAAE;UACLL,cAAc,CAACC,OAAO,GAAGI,GAAG;QAChC;;QAEA;QACAjB,uBAAuB,CAACmB,GAAG,CAACF,GAAG,EAAEP,KAAK,CAACM,UAAU,CAAC;MACtD;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAOf,uBAAuB,CAACM,SAAS,EAAEC,wBAAwB,CAAC;AACvE,CAAC","ignoreList":[]}

package/lib/module/core/withUnistyles/withUnistyles.native.js

@@ -12,10 +12,17 @@ import { maybeWarnAboutMultipleUnistyles } from '../warn';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const withUnistyles = (Component, mappings) => {
   const getSecrets = (styleProps = {}) => {
-    const unistyleKey = Object.keys(styleProps).find(key => key.startsWith('unistyles_'));
-    return unistyleKey ? styleProps[unistyleKey] : {
-      uni__getStyles: () => styleProps,
-      uni__dependencies: []
+    const styles = Array.isArray(styleProps) ? styleProps : [styleProps];
+    const secrets = styles.filter(Boolean).reduce((acc, style) => {
+      const unistyleKey = Object.keys(style).find(key => key.startsWith('unistyles_'));
+      return acc.concat([unistyleKey ? style[unistyleKey] : {
+        uni__getStyles: () => styleProps,
+        uni__dependencies: []
+      }]);
+    }, []);
+    return {
+      styles: secrets.reduce((acc, secret) => Object.assign(acc, secret.uni__getStyles()), {}),
+      dependencies: secrets.flatMap(secret => secret.uni__dependencies)
     };
   };
   return /*#__PURE__*/forwardRef((props, ref) => {
@@ -35,7 +42,7 @@ export const withUnistyles = (Component, mappings) => {
     useEffect(() => {
       const styleSecrets = getSecrets(narrowedProps.style);
       const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle);
-      addDependencies(Array.from(new Set([...styleSecrets.uni__dependencies, ...contentContainerStyleSecrets.uni__dependencies])));
+      addDependencies(Array.from(new Set([...styleSecrets.dependencies, ...contentContainerStyleSecrets.dependencies])));
     }, [narrowedProps.style, narrowedProps.contentContainerStyle]);
     const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
     const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
@@ -44,10 +51,10 @@ export const withUnistyles = (Component, mappings) => {
     const finalProps = {
       ...deepMergeObjects(mappingsProps, unistyleProps, props),
       ...(narrowedProps.style ? {
-        style: styleSecrets.uni__getStyles()
+        style: styleSecrets.styles
       } : {}),
       ...(narrowedProps.contentContainerStyle ? {
-        contentContainerStyle: contentContainerStyleSecrets.uni__getStyles()
+        contentContainerStyle: contentContainerStyleSecrets.styles
       } : {})
     };
     return /*#__PURE__*/_jsx(NativeComponent, {

package/lib/module/core/withUnistyles/withUnistyles.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useEffect","useRef","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","uni__dependencies","props","ref","narrowedProps","NativeComponent","style","displayName","name","contentContainerStyle","scopedTheme","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","current","styleSecrets","contentContainerStyleSecrets","Array","from","Set","mappingsProps","unistyleProps","uniProps","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useEffect","useRef","UnistylesShadowRegistry","deepMergeObjects","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","getSecrets","styleProps","styles","Array","isArray","secrets","filter","Boolean","reduce","acc","style","unistyleKey","Object","keys","find","key","startsWith","concat","uni__getStyles","uni__dependencies","secret","assign","dependencies","flatMap","props","ref","narrowedProps","NativeComponent","displayName","name","contentContainerStyle","scopedTheme","getScopedTheme","proxifiedRuntime","proxifiedTheme","addDependencies","current","styleSecrets","contentContainerStyleSecrets","from","Set","mappingsProps","unistyleProps","uniProps","finalProps"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.native.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/core/createUnistylesElement.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createUnistylesElement.native.d.ts","sourceRoot":"","sources":["../../../../src/core/createUnistylesElement.native.tsx"],"names":[],"mappings":"AAmBA,eAAO,MAAM,sBAAsB,cAAe,GAAG,QA+BpD,CAAA"}
+{"version":3,"file":"createUnistylesElement.native.d.ts","sourceRoot":"","sources":["../../../../src/core/createUnistylesElement.native.tsx"],"names":[],"mappings":"AAmBA,eAAO,MAAM,sBAAsB,cAAe,GAAG,QAoCpD,CAAA"}

package/lib/typescript/src/core/createUnistylesImageBackground.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createUnistylesImageBackground.d.ts","sourceRoot":"","sources":["../../../../src/core/createUnistylesImageBackground.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAS,eAAe,EAAwB,MAAM,cAAc,CAAA;AAMhF,eAAO,MAAM,8BAA8B,cAAe,OAAO,eAAe,QA0C/E,CAAA"}
+{"version":3,"file":"createUnistylesImageBackground.d.ts","sourceRoot":"","sources":["../../../../src/core/createUnistylesImageBackground.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAS,eAAe,EAAwB,MAAM,cAAc,CAAA;AAMhF,eAAO,MAAM,8BAA8B,cAAe,OAAO,eAAe,QA+C/E,CAAA"}

package/lib/typescript/src/core/withUnistyles/withUnistyles.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withUnistyles.native.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAOhF,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,SAAS,CAAA;AAG5D,KAAK,qBAAqB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA;AAIjD,eAAO,MAAM,aAAa,GAAI,UAAU,EAAE,SAAS,SAAS,qBAAqB,CAAC,UAAU,CAAC,aAAa,UAAU,aAAa,QAAQ,CAAC,SAAS,CAAC;eAGjI,QAAQ,mBAAQ;0CAoDlC,CAAA"}
+{"version":3,"file":"withUnistyles.native.d.ts","sourceRoot":"","sources":["../../../../../src/core/withUnistyles/withUnistyles.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAA;AAOhF,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,SAAS,CAAA;AAG5D,KAAK,qBAAqB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA;AAcjD,eAAO,MAAM,aAAa,GAAI,UAAU,EAAE,SAAS,SAAS,qBAAqB,CAAC,UAAU,CAAC,aAAa,UAAU,aAAa,QAAQ,CAAC,SAAS,CAAC;eAGjI,QAAQ,mBAAQ;0CAoElC,CAAA"}

package/nitrogen/generated/android/c++/JFunc_void_UnistylesNativeMiniRuntime.hpp

@@ -38,7 +38,7 @@ namespace margelo::nitro::unistyles {
      * Invokes the function this `JFunc_void_UnistylesNativeMiniRuntime` instance holds through JNI.
      */
     void invoke(const UnistylesNativeMiniRuntime& miniRuntime) const {
-      static const auto method = getClass()->getMethod<void(jni::alias_ref<JUnistylesNativeMiniRuntime> /* miniRuntime */)>("invoke");
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JUnistylesNativeMiniRuntime> /* miniRuntime */)>("invoke");
       method(self(), JUnistylesNativeMiniRuntime::fromCpp(miniRuntime));
     }
   };
@@ -69,7 +69,7 @@ namespace margelo::nitro::unistyles {
   public:
     static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/unistyles/Func_void_UnistylesNativeMiniRuntime_cxx;";
     static void registerNatives() {
-      registerHybrid({makeNativeMethod("invoke", JFunc_void_UnistylesNativeMiniRuntime_cxx::invoke_cxx)});
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_UnistylesNativeMiniRuntime_cxx::invoke_cxx)});
     }
 
   private:

package/nitrogen/generated/android/c++/JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.hpp

@@ -41,7 +41,7 @@ namespace margelo::nitro::unistyles {
      * Invokes the function this `JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime` instance holds through JNI.
      */
     void invoke(const std::vector<UnistyleDependency>& dependencies, const UnistylesNativeMiniRuntime& miniRuntime) const {
-      static const auto method = getClass()->getMethod<void(jni::alias_ref<jni::JArrayClass<JUnistyleDependency>> /* dependencies */, jni::alias_ref<JUnistylesNativeMiniRuntime> /* miniRuntime */)>("invoke");
+      static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JArrayClass<JUnistyleDependency>> /* dependencies */, jni::alias_ref<JUnistylesNativeMiniRuntime> /* miniRuntime */)>("invoke");
       method(self(), [&]() {
         size_t __size = dependencies.size();
         jni::local_ref<jni::JArrayClass<JUnistyleDependency>> __array = jni::JArrayClass<JUnistyleDependency>::newArray(__size);
@@ -89,7 +89,7 @@ namespace margelo::nitro::unistyles {
   public:
     static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/unistyles/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime_cxx;";
     static void registerNatives() {
-      registerHybrid({makeNativeMethod("invoke", JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime_cxx::invoke_cxx)});
+      registerHybrid({makeNativeMethod("invoke_cxx", JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime_cxx::invoke_cxx)});
     }
 
   private:

package/nitrogen/generated/android/c++/JHybridNativePlatformSpec.cpp

@@ -51,7 +51,7 @@ namespace margelo::nitro::unistyles {
   }
 
   size_t JHybridNativePlatformSpec::getExternalMemorySize() noexcept {
-    static const auto method = _javaPart->getClass()->getMethod<jlong()>("getMemorySize");
+    static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
     return method(_javaPart);
   }
 
@@ -60,86 +60,86 @@ namespace margelo::nitro::unistyles {
 
   // Methods
   Insets JHybridNativePlatformSpec::getInsets() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JInsets>()>("getInsets");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JInsets>()>("getInsets");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   ColorScheme JHybridNativePlatformSpec::getColorScheme() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JColorScheme>()>("getColorScheme");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JColorScheme>()>("getColorScheme");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   double JHybridNativePlatformSpec::getFontScale() {
-    static const auto method = _javaPart->getClass()->getMethod<double()>("getFontScale");
+    static const auto method = javaClassStatic()->getMethod<double()>("getFontScale");
     auto __result = method(_javaPart);
     return __result;
   }
   double JHybridNativePlatformSpec::getPixelRatio() {
-    static const auto method = _javaPart->getClass()->getMethod<double()>("getPixelRatio");
+    static const auto method = javaClassStatic()->getMethod<double()>("getPixelRatio");
     auto __result = method(_javaPart);
     return __result;
   }
   Orientation JHybridNativePlatformSpec::getOrientation() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JOrientation>()>("getOrientation");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JOrientation>()>("getOrientation");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   std::string JHybridNativePlatformSpec::getContentSizeCategory() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<jni::JString>()>("getContentSizeCategory");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getContentSizeCategory");
     auto __result = method(_javaPart);
     return __result->toStdString();
   }
   Dimensions JHybridNativePlatformSpec::getScreenDimensions() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getScreenDimensions");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JDimensions>()>("getScreenDimensions");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   Dimensions JHybridNativePlatformSpec::getStatusBarDimensions() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getStatusBarDimensions");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JDimensions>()>("getStatusBarDimensions");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   Dimensions JHybridNativePlatformSpec::getNavigationBarDimensions() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JDimensions>()>("getNavigationBarDimensions");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JDimensions>()>("getNavigationBarDimensions");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   bool JHybridNativePlatformSpec::getPrefersRtlDirection() {
-    static const auto method = _javaPart->getClass()->getMethod<jboolean()>("getPrefersRtlDirection");
+    static const auto method = javaClassStatic()->getMethod<jboolean()>("getPrefersRtlDirection");
     auto __result = method(_javaPart);
     return static_cast<bool>(__result);
   }
   void JHybridNativePlatformSpec::setRootViewBackgroundColor(double color) {
-    static const auto method = _javaPart->getClass()->getMethod<void(double /* color */)>("setRootViewBackgroundColor");
+    static const auto method = javaClassStatic()->getMethod<void(double /* color */)>("setRootViewBackgroundColor");
     method(_javaPart, color);
   }
   void JHybridNativePlatformSpec::setNavigationBarHidden(bool isHidden) {
-    static const auto method = _javaPart->getClass()->getMethod<void(jboolean /* isHidden */)>("setNavigationBarHidden");
+    static const auto method = javaClassStatic()->getMethod<void(jboolean /* isHidden */)>("setNavigationBarHidden");
     method(_javaPart, isHidden);
   }
   void JHybridNativePlatformSpec::setStatusBarHidden(bool isHidden) {
-    static const auto method = _javaPart->getClass()->getMethod<void(jboolean /* isHidden */)>("setStatusBarHidden");
+    static const auto method = javaClassStatic()->getMethod<void(jboolean /* isHidden */)>("setStatusBarHidden");
     method(_javaPart, isHidden);
   }
   void JHybridNativePlatformSpec::setImmersiveMode(bool isEnabled) {
-    static const auto method = _javaPart->getClass()->getMethod<void(jboolean /* isEnabled */)>("setImmersiveMode");
+    static const auto method = javaClassStatic()->getMethod<void(jboolean /* isEnabled */)>("setImmersiveMode");
     method(_javaPart, isEnabled);
   }
   UnistylesNativeMiniRuntime JHybridNativePlatformSpec::getMiniRuntime() {
-    static const auto method = _javaPart->getClass()->getMethod<jni::local_ref<JUnistylesNativeMiniRuntime>()>("getMiniRuntime");
+    static const auto method = javaClassStatic()->getMethod<jni::local_ref<JUnistylesNativeMiniRuntime>()>("getMiniRuntime");
     auto __result = method(_javaPart);
     return __result->toCpp();
   }
   void JHybridNativePlatformSpec::registerPlatformListener(const std::function<void(const std::vector<UnistyleDependency>& /* dependencies */, const UnistylesNativeMiniRuntime& /* miniRuntime */)>& callback) {
-    static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime::javaobject> /* callback */)>("registerPlatformListener_cxx");
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime::javaobject> /* callback */)>("registerPlatformListener_cxx");
     method(_javaPart, JFunc_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime_cxx::fromCpp(callback));
   }
   void JHybridNativePlatformSpec::registerImeListener(const std::function<void(const UnistylesNativeMiniRuntime& /* miniRuntime */)>& callback) {
-    static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JFunc_void_UnistylesNativeMiniRuntime::javaobject> /* callback */)>("registerImeListener_cxx");
+    static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_UnistylesNativeMiniRuntime::javaobject> /* callback */)>("registerImeListener_cxx");
     method(_javaPart, JFunc_void_UnistylesNativeMiniRuntime_cxx::fromCpp(callback));
   }
   void JHybridNativePlatformSpec::unregisterPlatformListeners() {
-    static const auto method = _javaPart->getClass()->getMethod<void()>("unregisterPlatformListeners");
+    static const auto method = javaClassStatic()->getMethod<void()>("unregisterPlatformListeners");
     method(_javaPart);
   }
 

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_UnistylesNativeMiniRuntime.kt

@@ -40,7 +40,7 @@ fun interface Func_void_UnistylesNativeMiniRuntime: (UnistylesNativeMiniRuntime)
 @Keep
 @Suppress(
   "KotlinJniMissingFunction", "unused",
-  "RedundantSuppression", "RedundantUnitReturnType",
+  "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
   "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
 )
 class Func_void_UnistylesNativeMiniRuntime_cxx: Func_void_UnistylesNativeMiniRuntime {
@@ -54,8 +54,13 @@ class Func_void_UnistylesNativeMiniRuntime_cxx: Func_void_UnistylesNativeMiniRun
     mHybridData = hybridData
   }
 
+  @DoNotStrip
+  @Keep
+  override fun invoke(miniRuntime: UnistylesNativeMiniRuntime): Unit
+    = invoke_cxx(miniRuntime)
+
   @FastNative
-  external override fun invoke(miniRuntime: UnistylesNativeMiniRuntime): Unit
+  private external fun invoke_cxx(miniRuntime: UnistylesNativeMiniRuntime): Unit
 }
 
 /**

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime.kt

@@ -40,7 +40,7 @@ fun interface Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRunti
 @Keep
 @Suppress(
   "KotlinJniMissingFunction", "unused",
-  "RedundantSuppression", "RedundantUnitReturnType",
+  "RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
   "ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
 )
 class Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime_cxx: Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime {
@@ -54,8 +54,13 @@ class Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime_cxx:
     mHybridData = hybridData
   }
 
+  @DoNotStrip
+  @Keep
+  override fun invoke(dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime): Unit
+    = invoke_cxx(dependencies,miniRuntime)
+
   @FastNative
-  external override fun invoke(dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime): Unit
+  private external fun invoke_cxx(dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime): Unit
 }
 
 /**

package/nitrogen/generated/android/kotlin/com/margelo/nitro/unistyles/HybridNativePlatformSpec.kt

@@ -37,87 +37,87 @@ abstract class HybridNativePlatformSpec: HybridObject() {
   }
 
   // Properties
-
+  
 
   // Methods
   @DoNotStrip
   @Keep
   abstract fun getInsets(): Insets
-
+  
   @DoNotStrip
   @Keep
   abstract fun getColorScheme(): ColorScheme
-
+  
   @DoNotStrip
   @Keep
   abstract fun getFontScale(): Double
-
+  
   @DoNotStrip
   @Keep
   abstract fun getPixelRatio(): Double
-
+  
   @DoNotStrip
   @Keep
   abstract fun getOrientation(): Orientation
-
+  
   @DoNotStrip
   @Keep
   abstract fun getContentSizeCategory(): String
-
+  
   @DoNotStrip
   @Keep
   abstract fun getScreenDimensions(): Dimensions
-
+  
   @DoNotStrip
   @Keep
   abstract fun getStatusBarDimensions(): Dimensions
-
+  
   @DoNotStrip
   @Keep
   abstract fun getNavigationBarDimensions(): Dimensions
-
+  
   @DoNotStrip
   @Keep
   abstract fun getPrefersRtlDirection(): Boolean
-
+  
   @DoNotStrip
   @Keep
   abstract fun setRootViewBackgroundColor(color: Double): Unit
-
+  
   @DoNotStrip
   @Keep
   abstract fun setNavigationBarHidden(isHidden: Boolean): Unit
-
+  
   @DoNotStrip
   @Keep
   abstract fun setStatusBarHidden(isHidden: Boolean): Unit
-
+  
   @DoNotStrip
   @Keep
   abstract fun setImmersiveMode(isEnabled: Boolean): Unit
-
+  
   @DoNotStrip
   @Keep
   abstract fun getMiniRuntime(): UnistylesNativeMiniRuntime
-
+  
   abstract fun registerPlatformListener(callback: (dependencies: Array<UnistyleDependency>, miniRuntime: UnistylesNativeMiniRuntime) -> Unit): Unit
-
+  
   @DoNotStrip
   @Keep
-  fun registerPlatformListener_cxx(callback: Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime): Unit {
+  private fun registerPlatformListener_cxx(callback: Func_void_std__vector_UnistyleDependency__UnistylesNativeMiniRuntime): Unit {
     val __result = registerPlatformListener(callback)
     return __result
   }
-
+  
   abstract fun registerImeListener(callback: (miniRuntime: UnistylesNativeMiniRuntime) -> Unit): Unit
-
+  
   @DoNotStrip
   @Keep
-  fun registerImeListener_cxx(callback: Func_void_UnistylesNativeMiniRuntime): Unit {
+  private fun registerImeListener_cxx(callback: Func_void_UnistylesNativeMiniRuntime): Unit {
     val __result = registerImeListener(callback)
     return __result
   }
-
+  
   @DoNotStrip
   @Keep
   abstract fun unregisterPlatformListeners(): Unit

package/nitrogen/generated/android/unistyles+autolinking.cmake

@@ -40,6 +40,22 @@ target_sources(
 # Define a flag to check if we are building properly
 add_definitions(-DBUILDING_UNISTYLES_WITH_GENERATED_CMAKE_PROJECT)
 
+# From node_modules/react-native/ReactAndroid/cmake-utils/folly-flags.cmake
+# Used in node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
+ target_compile_definitions(
+  unistyles PRIVATE
+  -DFOLLY_NO_CONFIG=1
+  -DFOLLY_HAVE_CLOCK_GETTIME=1
+  -DFOLLY_USE_LIBCPP=1
+  -DFOLLY_CFG_NO_COROUTINES=1
+  -DFOLLY_MOBILE=1
+  -DFOLLY_HAVE_RECVMMSG=1
+  -DFOLLY_HAVE_PTHREAD=1
+  # Once we target android-23 above, we can comment
+  # the following line. NDK uses GNU style stderror_r() after API 23.
+  -DFOLLY_HAVE_XSI_STRERROR_R=1
+)
+
 # Add all libraries required by the generated specs
 find_package(fbjni REQUIRED) # <-- Used for communication between Java <-> C++
 find_package(ReactAndroid REQUIRED) # <-- Used to set up React Native bindings (e.g. CallInvoker/TurboModule)

package/nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp

@@ -44,7 +44,6 @@ namespace margelo::nitro::unistyles { struct UnistylesNativeMiniRuntime; }
 // Common C++ types used in Swift
 #include <NitroModules/ArrayBufferHolder.hpp>
 #include <NitroModules/AnyMapHolder.hpp>
-#include <NitroModules/HybridContext.hpp>
 #include <NitroModules/RuntimeError.hpp>
 
 // Forward declarations of Swift defined types

package/nitrogen/generated/shared/c++/Dimensions.hpp

@@ -33,6 +33,7 @@ namespace margelo::nitro::unistyles {
     double height     SWIFT_PRIVATE;
 
   public:
+    Dimensions() = default;
     explicit Dimensions(double width, double height): width(width), height(height) {}
   };
 

package/nitrogen/generated/shared/c++/Insets.hpp

@@ -36,6 +36,7 @@ namespace margelo::nitro::unistyles {
     double ime     SWIFT_PRIVATE;
 
   public:
+    Insets() = default;
     explicit Insets(double top, double bottom, double left, double right, double ime): top(top), bottom(bottom), left(left), right(right), ime(ime) {}
   };
 

package/nitrogen/generated/shared/c++/UnistylesCxxMiniRuntime.hpp

@@ -54,6 +54,7 @@ namespace margelo::nitro::unistyles {
     bool isLandscape     SWIFT_PRIVATE;
 
   public:
+    UnistylesCxxMiniRuntime() = default;
     explicit UnistylesCxxMiniRuntime(std::optional<std::string> themeName, std::optional<std::string> breakpoint, bool hasAdaptiveThemes, ColorScheme colorScheme, Dimensions screen, std::string contentSizeCategory, Insets insets, double pixelRatio, double fontScale, bool rtl, Dimensions statusBar, Dimensions navigationBar, bool isPortrait, bool isLandscape): themeName(themeName), breakpoint(breakpoint), hasAdaptiveThemes(hasAdaptiveThemes), colorScheme(colorScheme), screen(screen), contentSizeCategory(contentSizeCategory), insets(insets), pixelRatio(pixelRatio), fontScale(fontScale), rtl(rtl), statusBar(statusBar), navigationBar(navigationBar), isPortrait(isPortrait), isLandscape(isLandscape) {}
   };
 

package/nitrogen/generated/shared/c++/UnistylesNativeMiniRuntime.hpp

@@ -50,6 +50,7 @@ namespace margelo::nitro::unistyles {
     bool isLandscape     SWIFT_PRIVATE;
 
   public:
+    UnistylesNativeMiniRuntime() = default;
     explicit UnistylesNativeMiniRuntime(ColorScheme colorScheme, Dimensions screen, std::string contentSizeCategory, Insets insets, double pixelRatio, double fontScale, bool rtl, Dimensions statusBar, Dimensions navigationBar, bool isPortrait, bool isLandscape): colorScheme(colorScheme), screen(screen), contentSizeCategory(contentSizeCategory), insets(insets), pixelRatio(pixelRatio), fontScale(fontScale), rtl(rtl), statusBar(statusBar), navigationBar(navigationBar), isPortrait(isPortrait), isLandscape(isLandscape) {}
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-nightly-20250221",
+  "version": "3.0.0-nightly-20250226",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -105,11 +105,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.22.1",
+    "nitro-codegen": "0.24.1",
     "react": "18.3.1",
     "react-native": "0.77.1",
     "react-native-builder-bob": "0.37.0",
-    "react-native-nitro-modules": "0.22.1",
+    "react-native-nitro-modules": "0.24.1",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.11.0",

package/plugin/index.js

@@ -523,6 +523,12 @@ function getStylesDependenciesFromFunction(path) {
                 usedLabel = "ime";
               }
             }
+            if (usedLabel === "insets" && (memberExpr.parentPath.isBinaryExpression() || memberExpr.parentPath.isLogicalExpression())) {
+              const secondPropPath = memberExpr.node.property;
+              if (t4.isIdentifier(secondPropPath) && secondPropPath.name === "ime") {
+                usedLabel = "ime";
+              }
+            }
           }
         }
         const containerProp = refPath.findParent((parent2) => parent2.isObjectProperty() && parent2.parentPath === returnedObjectPath);

package/src/core/createUnistylesElement.native.tsx

@@ -42,6 +42,11 @@ export const createUnistylesElement = (Component: any) => {
 
                     // @ts-ignore we don't know the type of the component
                     maybeWarnAboutMultipleUnistyles(props.style, Component.displayName)
+
+                    return () => {
+                        // @ts-ignore
+                        UnistylesShadowRegistry.remove(ref)
+                    }
                 }}
             />
         )

package/src/core/createUnistylesImageBackground.tsx

@@ -32,6 +32,11 @@ export const createUnistylesImageBackground = (Component: typeof ImageBackground
                     return () => {
                         // @ts-ignore
                         UnistylesShadowRegistry.remove(ref)
+
+                        if (storedImageRef.current) {
+                            // @ts-ignore
+                            UnistylesShadowRegistry.remove(storedImageRef.current)
+                        }
                     }
                 }}
                 imageRef={ref => {

package/src/core/withUnistyles/withUnistyles.native.tsx

@@ -12,22 +12,48 @@ type GenericComponentProps<P> = ComponentProps<P>
 // @ts-expect-error
 type GenericComponentRef<T> = ComponentRef<T>
 
+type UnistylesSecrets = {
+    uni__getStyles: () => Record<string, any>,
+    uni__dependencies: Array<UnistyleDependency>
+}
+
+type MappedSecrets = {
+    styles: Record<string, any>,
+    dependencies: Array<UnistyleDependency>
+}
+
 export const withUnistyles = <TComponent, TMappings extends GenericComponentProps<TComponent>>(Component: TComponent, mappings?: Mappings<TMappings>) => {
     type TProps = GenericComponentProps<TComponent>
     type PropsWithUnistyles = PartialBy<TProps, keyof TMappings | SupportedStyleProps> & {
         uniProps?: Mappings<TProps>
     }
-    const getSecrets = (styleProps: Record<string, any> = {}): { uni__getStyles(): any, uni__dependencies: Array<UnistyleDependency> } => {
-        const unistyleKey = Object
-            .keys(styleProps)
-            .find(key => key.startsWith('unistyles_'))
-
-        return unistyleKey
-            ? styleProps[unistyleKey]
-            : {
-                uni__getStyles: () => styleProps,
-                uni__dependencies: [],
-            }
+    const getSecrets = (styleProps: Record<string, any> = {}): MappedSecrets => {
+        const styles = Array.isArray(styleProps)
+            ? styleProps
+            : [styleProps]
+
+        const secrets: Array<UnistylesSecrets> = styles
+            .filter(Boolean)
+            .reduce((acc, style) => {
+                const unistyleKey = Object
+                    .keys(style)
+                    .find(key => key.startsWith('unistyles_'))
+
+                return acc.concat([
+                    unistyleKey
+                        ? style[unistyleKey]
+                        : {
+                            uni__getStyles: () => styleProps,
+                            uni__dependencies: [],
+                        }
+                ])
+            }, [])
+
+        return {
+            styles: secrets.reduce((acc, secret) => Object
+                .assign(acc, secret.uni__getStyles()), {} as Record<string, any>),
+            dependencies: secrets.flatMap(secret => secret.uni__dependencies),
+        }
     }
 
     return forwardRef<GenericComponentRef<TComponent>, PropsWithUnistyles>((props, ref) => {
@@ -46,7 +72,7 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
             const styleSecrets = getSecrets(narrowedProps.style)
             const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle)
 
-            addDependencies(Array.from(new Set([...styleSecrets.uni__dependencies, ...contentContainerStyleSecrets.uni__dependencies])))
+            addDependencies(Array.from(new Set([...styleSecrets.dependencies, ...contentContainerStyleSecrets.dependencies])))
         }, [narrowedProps.style, narrowedProps.contentContainerStyle])
 
         const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {}
@@ -58,10 +84,10 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
         const finalProps = {
             ...deepMergeObjects(mappingsProps, unistyleProps, props),
             ...narrowedProps.style ? {
-                style: styleSecrets.uni__getStyles(),
+                style: styleSecrets.styles,
             } : {},
             ...narrowedProps.contentContainerStyle ? {
-                contentContainerStyle: contentContainerStyleSecrets.uni__getStyles(),
+                contentContainerStyle: contentContainerStyleSecrets.styles,
             } : {},
         } as any