react-native-unistyles 3.0.0-beta.7 → 3.0.0-experimental-2025051401

package/lib/module/components/native/Image.js

@@ -1,6 +1,30 @@
 "use strict";
 
+import React, { forwardRef } from 'react';
 import { Image as NativeImage } from 'react-native';
-import { createUnistylesElement } from '../../core';
-export const Image = createUnistylesElement(NativeImage);
+import { getClassName } from '../../core';
+import { maybeWarnAboutMultipleUnistyles } from '../../core/warn';
+import { copyComponentProperties } from '../../utils';
+import { checkForProp } from '../../web/utils';
+import { createUnistylesRef } from '../../web/utils/createUnistylesRef';
+import { jsx as _jsx } from "react/jsx-runtime";
+const UnistylesImage = /*#__PURE__*/forwardRef((props, forwardedRef) => {
+  const classNames = getClassName(props.style);
+  const ref = createUnistylesRef(classNames, forwardedRef);
+  const hasWidthStyle = checkForProp(props.style, 'width');
+  const hasHeightStyle = checkForProp(props.style, 'height');
+  maybeWarnAboutMultipleUnistyles(props.style, 'Image');
+  return /*#__PURE__*/_jsx(NativeImage, {
+    ...props,
+    style: [classNames,
+    // Clear inline width and height extracted from source
+    hasWidthStyle && {
+      width: ''
+    }, hasHeightStyle && {
+      height: ''
+    }],
+    ref: ref
+  });
+});
+export const Image = copyComponentProperties(NativeImage, UnistylesImage);
 //# sourceMappingURL=Image.js.map

package/lib/module/components/native/Image.js.map

@@ -1 +1 @@
-{"version":3,"names":["Image","NativeImage","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/Image.tsx"],"mappings":";;AAAA,SAASA,KAAK,IAAIC,WAAW,QAAQ,cAAc;AACnD,SAASC,sBAAsB,QAAQ,YAAY;AAEnD,OAAO,MAAMF,KAAK,GAAGE,sBAAsB,CAACD,WAAW,CAAC","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","Image","NativeImage","getClassName","maybeWarnAboutMultipleUnistyles","copyComponentProperties","checkForProp","createUnistylesRef","jsx","_jsx","UnistylesImage","props","forwardedRef","classNames","style","ref","hasWidthStyle","hasHeightStyle","width","height"],"sourceRoot":"../../../../src","sources":["components/native/Image.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAyBC,UAAU,QAAQ,OAAO;AAC9D,SAA0BC,KAAK,IAAIC,WAAW,QAAwC,cAAc;AACpG,SAASC,YAAY,QAAQ,YAAY;AACzC,SAASC,+BAA+B,QAAQ,iBAAiB;AAEjE,SAASC,uBAAuB,QAAQ,aAAa;AACrD,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,kBAAkB,QAAQ,oCAAoC;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAOvE,MAAMC,cAAc,gBAAGV,UAAU,CAAiB,CAACW,KAAK,EAAEC,YAAY,KAAK;EACvE,MAAMC,UAAU,GAAGV,YAAY,CAACQ,KAAK,CAACG,KAAK,CAAC;EAC5C,MAAMC,GAAG,GAAGR,kBAAkB,CAACM,UAAU,EAAED,YAAY,CAAC;EACxD,MAAMI,aAAa,GAAGV,YAAY,CAACK,KAAK,CAACG,KAAK,EAAE,OAAO,CAAC;EACxD,MAAMG,cAAc,GAAGX,YAAY,CAACK,KAAK,CAACG,KAAK,EAAE,QAAQ,CAAC;EAE1DV,+BAA+B,CAACO,KAAK,CAACG,KAAK,EAAe,OAAO,CAAC;EAElE,oBACIL,IAAA,CAACP,WAAW;IAAA,GACJS,KAAK;IACTG,KAAK,EAAE,CACHD,UAAU;IACV;IACAG,aAAa,IAAI;MAAEE,KAAK,EAAE;IAAG,CAAC,EAC9BD,cAAc,IAAI;MAAEE,MAAM,EAAE;IAAG,CAAC,CACT;IAC3BJ,GAAG,EAAEA;EAAI,CACZ,CAAC;AAEV,CAAC,CAAC;AAEF,OAAO,MAAMd,KAAK,GAAGI,uBAAuB,CAACH,WAAW,EAAEQ,cAAc,CAAC","ignoreList":[]}

package/lib/module/components/native/Image.native.js

@@ -0,0 +1,6 @@
+"use strict";
+
+import { Image as NativeImage } from 'react-native';
+import { createUnistylesElement } from '../../core';
+export const Image = createUnistylesElement(NativeImage);
+//# sourceMappingURL=Image.native.js.map

package/lib/module/components/native/Image.native.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Image","NativeImage","createUnistylesElement"],"sourceRoot":"../../../../src","sources":["components/native/Image.native.tsx"],"mappings":";;AAAA,SAASA,KAAK,IAAIC,WAAW,QAAQ,cAAc;AACnD,SAASC,sBAAsB,QAAQ,YAAY;AAEnD,OAAO,MAAMF,KAAK,GAAGE,sBAAsB,CAACD,WAAW,CAAC","ignoreList":[]}

package/lib/module/components/native/ImageBackground.js

@@ -4,48 +4,33 @@ import React from 'react';
 import { forwardRef } from 'react';
 import { ImageBackground as NativeImageBackground } from 'react-native';
 import { getClassName } from '../../core';
+import { maybeWarnAboutMultipleUnistyles } from '../../core/warn';
 import { copyComponentProperties } from '../../utils';
-import { UnistylesShadowRegistry } from '../../web';
-import { isServer } from '../../web/utils';
+import { keyInObject } from '../../web/utils';
+import { createUnistylesRef } from '../../web/utils/createUnistylesRef';
 import { jsx as _jsx } from "react/jsx-runtime";
 const UnistylesImageBackground = /*#__PURE__*/forwardRef((props, forwardedRef) => {
-  let storedRef = null;
-  let storedImageRef = null;
   const styleClassNames = getClassName(props.style);
   const imageClassNames = getClassName(props.imageStyle);
-  return (
-    /*#__PURE__*/
-    // @ts-expect-error - RN types are not compatible with RNW styles
-    _jsx(NativeImageBackground, {
-      ...props,
-      style: styleClassNames,
-      imageStyle: imageClassNames,
-      ref: isServer() ? undefined : ref => {
-        if (!ref) {
-          // @ts-expect-error hidden from TS
-          UnistylesShadowRegistry.remove(storedRef, styleClassNames?.hash);
-        }
-        storedRef = ref;
-        // @ts-expect-error hidden from TS
-        UnistylesShadowRegistry.add(ref, styleClassNames?.hash);
-        if (typeof forwardedRef === 'function') {
-          return forwardedRef(ref);
-        }
-        if (forwardedRef) {
-          forwardedRef.current = ref;
-        }
-      },
-      imageRef: isServer() ? undefined : ref => {
-        if (!ref) {
-          // @ts-expect-error hidden from TS
-          UnistylesShadowRegistry.remove(storedImageRef, imageClassNames?.hash);
-        }
-        storedImageRef = ref;
-        // @ts-expect-error hidden from TS
-        UnistylesShadowRegistry.add(ref, imageClassNames?.hash);
-      }
-    })
-  );
+  const ref = createUnistylesRef(styleClassNames, forwardedRef);
+  const imageRef = createUnistylesRef(imageClassNames);
+  const hasWidthStyle = typeof props.imageStyle === 'object' && keyInObject(props.imageStyle, 'width');
+  const hasHeightStyle = typeof props.imageStyle === 'object' && keyInObject(props.imageStyle, 'height');
+  maybeWarnAboutMultipleUnistyles(props.style, 'ImageBackground');
+  maybeWarnAboutMultipleUnistyles(props.imageStyle, 'ImageBackground');
+  return /*#__PURE__*/_jsx(NativeImageBackground, {
+    ...props,
+    style: styleClassNames,
+    imageStyle: [imageClassNames,
+    // Clear inline width and height extracted from source
+    hasWidthStyle && {
+      width: ''
+    }, hasHeightStyle && {
+      height: ''
+    }],
+    ref: ref,
+    imageRef: imageRef
+  });
 });
 export const ImageBackground = copyComponentProperties(NativeImageBackground, UnistylesImageBackground);
 //# sourceMappingURL=ImageBackground.js.map

package/lib/module/components/native/ImageBackground.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","ImageBackground","NativeImageBackground","getClassName","copyComponentProperties","UnistylesShadowRegistry","isServer","jsx","_jsx","UnistylesImageBackground","props","forwardedRef","storedRef","storedImageRef","styleClassNames","style","imageClassNames","imageStyle","ref","undefined","remove","hash","add","current","imageRef"],"sourceRoot":"../../../../src","sources":["components/native/ImageBackground.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,UAAU,QAAQ,OAAO;AAClC,SAASC,eAAe,IAAIC,qBAAqB,QAAQ,cAAc;AACvE,SAASC,YAAY,QAAQ,YAAY;AAEzC,SAASC,uBAAuB,QAAQ,aAAa;AACrD,SAASC,uBAAuB,QAAQ,WAAW;AACnD,SAASC,QAAQ,QAAQ,iBAAiB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAO1C,MAAMC,wBAAwB,gBAAGT,UAAU,CAAiB,CAACU,KAAK,EAAEC,YAAY,KAAK;EACjF,IAAIC,SAAuC,GAAG,IAAI;EAClD,IAAIC,cAA4C,GAAG,IAAI;EACvD,MAAMC,eAAe,GAAGX,YAAY,CAACO,KAAK,CAACK,KAAK,CAAC;EACjD,MAAMC,eAAe,GAAGb,YAAY,CAACO,KAAK,CAACO,UAAU,CAAC;EAEtD;IAAA;IACI;IACAT,IAAA,CAACN,qBAAqB;MAAA,GACdQ,KAAK;MACTK,KAAK,EAAED,eAAgB;MACvBG,UAAU,EAAED,eAAgB;MAC5BE,GAAG,EAAEZ,QAAQ,CAAC,CAAC,GAAGa,SAAS,GAAGD,GAAG,IAAI;QACjC,IAAI,CAACA,GAAG,EAAE;UACN;UACAb,uBAAuB,CAACe,MAAM,CAACR,SAAS,EAAEE,eAAe,EAAEO,IAAI,CAAC;QACpE;QAEAT,SAAS,GAAGM,GAAG;QACf;QACAb,uBAAuB,CAACiB,GAAG,CAACJ,GAAG,EAAEJ,eAAe,EAAEO,IAAI,CAAC;QAEvD,IAAI,OAAOV,YAAY,KAAK,UAAU,EAAE;UACpC,OAAOA,YAAY,CAACO,GAAG,CAAC;QAC5B;QAEA,IAAIP,YAAY,EAAE;UACdA,YAAY,CAACY,OAAO,GAAGL,GAAG;QAC9B;MACJ,CAAE;MACFM,QAAQ,EAAElB,QAAQ,CAAC,CAAC,GAAGa,SAAS,GAAGD,GAAG,IAAI;QACtC,IAAI,CAACA,GAAG,EAAE;UACN;UACAb,uBAAuB,CAACe,MAAM,CAACP,cAAc,EAAEG,eAAe,EAAEK,IAAI,CAAC;QACzE;QAEAR,cAAc,GAAGK,GAAG;QACpB;QACAb,uBAAuB,CAACiB,GAAG,CAACJ,GAAG,EAAEF,eAAe,EAAEK,IAAI,CAAC;MAC3D;IAAE,CACL;EAAC;AAEV,CAAC,CAAC;AAEF,OAAO,MAAMpB,eAAe,GAAGG,uBAAuB,CAACF,qBAAqB,EAAEO,wBAAwB,CAAC","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","ImageBackground","NativeImageBackground","getClassName","maybeWarnAboutMultipleUnistyles","copyComponentProperties","keyInObject","createUnistylesRef","jsx","_jsx","UnistylesImageBackground","props","forwardedRef","styleClassNames","style","imageClassNames","imageStyle","ref","imageRef","hasWidthStyle","hasHeightStyle","width","height"],"sourceRoot":"../../../../src","sources":["components/native/ImageBackground.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,UAAU,QAAQ,OAAO;AAClC,SAA0BC,eAAe,IAAIC,qBAAqB,QAAwC,cAAc;AACxH,SAASC,YAAY,QAAQ,YAAY;AACzC,SAASC,+BAA+B,QAAQ,iBAAiB;AAEjE,SAASC,uBAAuB,QAAQ,aAAa;AACrD,SAASC,WAAW,QAAQ,iBAAiB;AAC7C,SAASC,kBAAkB,QAAQ,oCAAoC;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAOvE,MAAMC,wBAAwB,gBAAGV,UAAU,CAAiB,CAACW,KAAK,EAAEC,YAAY,KAAK;EACjF,MAAMC,eAAe,GAAGV,YAAY,CAACQ,KAAK,CAACG,KAAK,CAAC;EACjD,MAAMC,eAAe,GAAGZ,YAAY,CAACQ,KAAK,CAACK,UAAU,CAAC;EACtD,MAAMC,GAAG,GAAGV,kBAAkB,CAACM,eAAe,EAAED,YAAY,CAAC;EAC7D,MAAMM,QAAQ,GAAGX,kBAAkB,CAACQ,eAAe,CAAC;EACpD,MAAMI,aAAa,GAAG,OAAOR,KAAK,CAACK,UAAU,KAAK,QAAQ,IAAIV,WAAW,CAACK,KAAK,CAACK,UAAU,EAAE,OAAO,CAAC;EACpG,MAAMI,cAAc,GAAG,OAAOT,KAAK,CAACK,UAAU,KAAK,QAAQ,IAAIV,WAAW,CAACK,KAAK,CAACK,UAAU,EAAE,QAAQ,CAAC;EAEtGZ,+BAA+B,CAACO,KAAK,CAACG,KAAK,EAAe,iBAAiB,CAAC;EAC5EV,+BAA+B,CAACO,KAAK,CAACK,UAAU,EAAe,iBAAiB,CAAC;EAEjF,oBACIP,IAAA,CAACP,qBAAqB;IAAA,GACdS,KAAK;IACTG,KAAK,EAAED,eAAwC;IAC/CG,UAAU,EAAE,CACRD,eAAe;IACf;IACAI,aAAa,IAAI;MAAEE,KAAK,EAAE;IAAG,CAAC,EAC9BD,cAAc,IAAI;MAAEE,MAAM,EAAE;IAAG,CAAC,CACT;IAC3BL,GAAG,EAAEA,GAAI;IACTC,QAAQ,EAAEA;EAAS,CACtB,CAAC;AAEV,CAAC,CAAC;AAEF,OAAO,MAAMjB,eAAe,GAAGI,uBAAuB,CAACH,qBAAqB,EAAEQ,wBAAwB,CAAC","ignoreList":[]}

package/lib/module/components/native/Pressable.native.js

@@ -21,7 +21,8 @@ export const Pressable = /*#__PURE__*/forwardRef(({
   style,
   ...props
 }, forwardedRef) => {
-  const storedRef = useRef();
+  const storedRef = useRef(null);
+  const scopedTheme = UnistylesShadowRegistry.getScopedTheme();
   useLayoutEffect(() => {
     return () => {
       if (storedRef.current) {
@@ -33,13 +34,25 @@ export const Pressable = /*#__PURE__*/forwardRef(({
   return /*#__PURE__*/_jsx(NativePressableReactNative, {
     ...props,
     ref: ref => {
+      const isPropStyleAFunction = typeof style === 'function';
+      const unistyles = isPropStyleAFunction ? style.call(style, {
+        pressed: false
+      }) : getStyles(style);
       if (ref) {
         storedRef.current = ref;
       }
-      return passForwardedRef(props, ref, forwardedRef);
+      return passForwardedRef(ref, forwardedRef, () => {
+        // @ts-expect-error - this is hidden from TS
+        UnistylesShadowRegistry.add(ref, unistyles);
+      }, () => {
+        // @ts-expect-error - this is hidden from TS
+        UnistylesShadowRegistry.remove(ref);
+      });
     },
     style: state => {
       const isPropStyleAFunction = typeof style === 'function';
+      const previousScopedTheme = UnistylesShadowRegistry.getScopedTheme();
+      UnistylesShadowRegistry.setScopedTheme(scopedTheme);
       const unistyles = isPropStyleAFunction ? style.call(style, state) : getStyles(style);
       if (!storedRef.current) {
         return unistyles;
@@ -50,6 +63,7 @@ export const Pressable = /*#__PURE__*/forwardRef(({
 
       // @ts-expect-error - this is hidden from TS
       UnistylesShadowRegistry.add(storedRef.current, unistyles);
+      UnistylesShadowRegistry.setScopedTheme(previousScopedTheme);
       return unistyles;
     }
   });

package/lib/module/components/native/Pressable.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useLayoutEffect","useRef","Pressable","NativePressableReactNative","passForwardedRef","UnistylesShadowRegistry","jsx","_jsx","getStyles","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","variants","style","props","forwardedRef","storedRef","current","remove","ref","state","isPropStyleAFunction","unistyles","call","add"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAClE,SAASC,SAAS,IAAIC,0BAA0B,QAAQ,cAAc;AAEtE,SAASC,gBAAgB,QAAQ,YAAY;AAC7C,SAASC,uBAAuB,QAAQ,aAAa;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMrD,MAAMC,SAAS,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAK;EACxD,MAAMC,WAAW,GAAGC,MAAM,CACrBC,IAAI,CAACH,UAAU,CAAC,CAChBI,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;EAE9C,IAAI,CAACL,WAAW,EAAE;IACd,OAAOD,UAAU;EACrB;EAEA,OAAO;IACH;IACA,GAAGA,UAAU,CAACC,WAAW,CAAC,CAACM,cAAc,CAAC,CAAC;IAC3C,CAACN,WAAW,GAAGD,UAAU,CAACC,WAAW;EACzC,CAAC;AACL,CAAC;AAED,OAAO,MAAMR,SAAS,gBAAGH,UAAU,CAAuB,CAAC;EAAEkB,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,YAAY,KAAK;EACvG,MAAMC,SAAS,GAAGpB,MAAM,CAAc,CAAC;EAEvCD,eAAe,CAAC,MAAM;IAClB,OAAO,MAAM;MACT,IAAIqB,SAAS,CAACC,OAAO,EAAE;QACnB;QACAjB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACIf,IAAA,CAACJ,0BAA0B;IAAA,GACnBgB,KAAK;IACTK,GAAG,EAAEA,GAAG,IAAI;MACR,IAAIA,GAAG,EAAE;QACLH,SAAS,CAACC,OAAO,GAAGE,GAAG;MAC3B;MAEA,OAAOpB,gBAAgB,CAACe,KAAK,EAAEK,GAAG,EAAEJ,YAAY,CAAC;IACrD,CAAE;IACFF,KAAK,EAAEO,KAAK,IAAI;MACZ,MAAMC,oBAAoB,GAAG,OAAOR,KAAK,KAAK,UAAU;MACxD,MAAMS,SAAS,GAAGD,oBAAoB,GAChCR,KAAK,CAACU,IAAI,CAACV,KAAK,EAAEO,KAAK,CAAC,GACxBjB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAI,CAACG,SAAS,CAACC,OAAO,EAAE;QACpB,OAAOK,SAAS;MACpB;;MAEA;MACAtB,uBAAuB,CAACkB,MAAM,CAACF,SAAS,CAACC,OAAO,CAAC;;MAEjD;MACAjB,uBAAuB,CAACwB,GAAG,CAACR,SAAS,CAACC,OAAO,EAAEK,SAAS,CAAC;MAEzD,OAAOA,SAAS;IACpB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useLayoutEffect","useRef","Pressable","NativePressableReactNative","passForwardedRef","UnistylesShadowRegistry","jsx","_jsx","getStyles","styleProps","unistyleKey","Object","keys","find","key","startsWith","uni__getStyles","variants","style","props","forwardedRef","storedRef","scopedTheme","getScopedTheme","current","remove","ref","isPropStyleAFunction","unistyles","call","pressed","add","state","previousScopedTheme","setScopedTheme"],"sourceRoot":"../../../../src","sources":["components/native/Pressable.native.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,UAAU,EAAEC,eAAe,EAAEC,MAAM,QAAQ,OAAO;AAClE,SAASC,SAAS,IAAIC,0BAA0B,QAAQ,cAAc;AAEtE,SAASC,gBAAgB,QAAQ,YAAY;AAC7C,SAASC,uBAAuB,QAAQ,aAAa;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMrD,MAAMC,SAAS,GAAGA,CAACC,UAA+B,GAAG,CAAC,CAAC,KAAK;EACxD,MAAMC,WAAW,GAAGC,MAAM,CACrBC,IAAI,CAACH,UAAU,CAAC,CAChBI,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,YAAY,CAAC,CAAC;EAE9C,IAAI,CAACL,WAAW,EAAE;IACd,OAAOD,UAAU;EACrB;EAEA,OAAO;IACH;IACA,GAAGA,UAAU,CAACC,WAAW,CAAC,CAACM,cAAc,CAAC,CAAC;IAC3C,CAACN,WAAW,GAAGD,UAAU,CAACC,WAAW;EACzC,CAAC;AACL,CAAC;AAED,OAAO,MAAMR,SAAS,gBAAGH,UAAU,CAAuB,CAAC;EAAEkB,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,YAAY,KAAK;EACvG,MAAMC,SAAS,GAAGpB,MAAM,CAAc,IAAI,CAAC;EAC3C,MAAMqB,WAAW,GAAGjB,uBAAuB,CAACkB,cAAc,CAAC,CAAC;EAE5DvB,eAAe,CAAC,MAAM;IAClB,OAAO,MAAM;MACT,IAAIqB,SAAS,CAACG,OAAO,EAAE;QACnB;QACAnB,uBAAuB,CAACoB,MAAM,CAACJ,SAAS,CAACG,OAAO,CAAC;MACrD;IACJ,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACIjB,IAAA,CAACJ,0BAA0B;IAAA,GACnBgB,KAAK;IACTO,GAAG,EAAEA,GAAG,IAAI;MACR,MAAMC,oBAAoB,GAAG,OAAOT,KAAK,KAAK,UAAU;MACxD,MAAMU,SAAS,GAAGD,oBAAoB,GAChCT,KAAK,CAACW,IAAI,CAACX,KAAK,EAAE;QAAEY,OAAO,EAAE;MAAM,CAAC,CAAC,GACrCtB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAIQ,GAAG,EAAE;QACLL,SAAS,CAACG,OAAO,GAAGE,GAAG;MAC3B;MAEA,OAAOtB,gBAAgB,CACnBsB,GAAG,EACHN,YAAY,EACZ,MAAM;QACF;QACAf,uBAAuB,CAAC0B,GAAG,CAACL,GAAG,EAAEE,SAAS,CAAC;MAC/C,CAAC,EACD,MAAM;QACF;QACAvB,uBAAuB,CAACoB,MAAM,CAACC,GAAG,CAAC;MACvC,CACJ,CAAC;IACL,CAAE;IACFR,KAAK,EAAEc,KAAK,IAAI;MACZ,MAAML,oBAAoB,GAAG,OAAOT,KAAK,KAAK,UAAU;MACxD,MAAMe,mBAAmB,GAAG5B,uBAAuB,CAACkB,cAAc,CAAC,CAAC;MAEpElB,uBAAuB,CAAC6B,cAAc,CAACZ,WAAW,CAAC;MAEnD,MAAMM,SAAS,GAAGD,oBAAoB,GAChCT,KAAK,CAACW,IAAI,CAACX,KAAK,EAAEc,KAAK,CAAC,GACxBxB,SAAS,CAACU,KAAuC,CAAC;MAExD,IAAI,CAACG,SAAS,CAACG,OAAO,EAAE;QACpB,OAAOI,SAAS;MACpB;;MAEA;MACAvB,uBAAuB,CAACoB,MAAM,CAACJ,SAAS,CAACG,OAAO,CAAC;;MAEjD;MACAnB,uBAAuB,CAAC0B,GAAG,CAACV,SAAS,CAACG,OAAO,EAAEI,SAAS,CAAC;MAEzDvB,uBAAuB,CAAC6B,cAAc,CAACD,mBAAmB,CAAC;MAE3D,OAAOL,SAAS;IACpB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}

package/lib/module/core/createUnistylesElement.js

@@ -2,35 +2,31 @@
 
 import React from 'react';
 import { copyComponentProperties } from '../utils';
-import { UnistylesShadowRegistry } from '../web';
 import { isServer } from '../web/utils';
+import { createUnistylesRef } from '../web/utils/createUnistylesRef';
 import { getClassName } from './getClassname';
 import { maybeWarnAboutMultipleUnistyles } from './warn';
 import { jsx as _jsx } from "react/jsx-runtime";
+const STYLE_PROPS = ['style', 'contentContainerStyle', 'columnWrapperStyle'];
+const buildUnistylesProps = (Component, props, forwardedRef) => {
+  const componentStyleProps = STYLE_PROPS.filter(styleProp => styleProp in props);
+  const classNames = Object.fromEntries(componentStyleProps.map(styleProp => [styleProp, getClassName(props[styleProp])]));
+  const refs = componentStyleProps.map(styleProp => {
+    return createUnistylesRef(classNames[styleProp], styleProp === 'style' ? forwardedRef : undefined);
+  });
+  componentStyleProps.forEach(styleProp => {
+    maybeWarnAboutMultipleUnistyles(props[styleProp], Component.displayName);
+  });
+  return {
+    ...classNames,
+    ref: isServer() ? undefined : componentRef => refs.forEach(ref => ref?.(componentRef))
+  };
+};
 export const createUnistylesElement = Component => {
   const UnistylesComponent = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
-    let storedRef = null;
-    const classNames = getClassName(props.style);
     return /*#__PURE__*/_jsx(Component, {
       ...props,
-      style: classNames,
-      ref: isServer() ? undefined : ref => {
-        // @ts-ignore we don't know the type of the component
-        maybeWarnAboutMultipleUnistyles(props.style, Component.displayName);
-        if (!ref) {
-          // @ts-expect-error hidden from TS
-          UnistylesShadowRegistry.remove(storedRef, classNames?.hash);
-        }
-        storedRef = ref;
-        // @ts-expect-error hidden from TS
-        UnistylesShadowRegistry.add(ref, classNames?.hash);
-        if (typeof forwardedRef === 'function') {
-          return forwardedRef(ref);
-        }
-        if (forwardedRef) {
-          forwardedRef.current = ref;
-        }
-      }
+      ...buildUnistylesProps(Component, props, forwardedRef)
     });
   });
   return copyComponentProperties(Component, UnistylesComponent);

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

@@ -1 +1 @@
-{"version":3,"names":["React","copyComponentProperties","UnistylesShadowRegistry","isServer","getClassName","maybeWarnAboutMultipleUnistyles","jsx","_jsx","createUnistylesElement","Component","UnistylesComponent","forwardRef","props","forwardedRef","storedRef","classNames","style","ref","undefined","displayName","remove","hash","add","current"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,uBAAuB,QAAQ,QAAQ;AAChD,SAASC,QAAQ,QAAQ,cAAc;AACvC,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMxD,OAAO,MAAMC,sBAAsB,GAAIC,SAAc,IAAK;EACtD,MAAMC,kBAAkB,gBAAGV,KAAK,CAACW,UAAU,CAA0B,CAACC,KAAK,EAAEC,YAAY,KAAK;IAC1F,IAAIC,SAA6B,GAAG,IAAI;IACxC,MAAMC,UAAU,GAAGX,YAAY,CAACQ,KAAK,CAACI,KAAK,CAAC;IAE5C,oBACIT,IAAA,CAACE,SAAS;MAAA,GACFG,KAAK;MACTI,KAAK,EAAED,UAAW;MAClBE,GAAG,EAAEd,QAAQ,CAAC,CAAC,GAAGe,SAAS,GAAID,GAAuB,IAAK;QACvD;QACAZ,+BAA+B,CAACO,KAAK,CAACI,KAAK,EAAEP,SAAS,CAACU,WAAW,CAAC;QAEnE,IAAI,CAACF,GAAG,EAAE;UACN;UACAf,uBAAuB,CAACkB,MAAM,CAACN,SAAS,EAAEC,UAAU,EAAEM,IAAI,CAAC;QAC/D;QAEAP,SAAS,GAAGG,GAAG;QACf;QACAf,uBAAuB,CAACoB,GAAG,CAACL,GAAG,EAAEF,UAAU,EAAEM,IAAI,CAAC;QAElD,IAAI,OAAOR,YAAY,KAAK,UAAU,EAAE;UACpC,OAAOA,YAAY,CAACI,GAAG,CAAC;QAC5B;QAEA,IAAIJ,YAAY,EAAE;UACdA,YAAY,CAACU,OAAO,GAAGN,GAAG;QAC9B;MACJ;IAAE,CACL,CAAC;EAEV,CAAC,CAAC;EAEF,OAAOhB,uBAAuB,CAACQ,SAAS,EAAEC,kBAAkB,CAAC;AACjE,CAAC","ignoreList":[]}
+{"version":3,"names":["React","copyComponentProperties","isServer","createUnistylesRef","getClassName","maybeWarnAboutMultipleUnistyles","jsx","_jsx","STYLE_PROPS","buildUnistylesProps","Component","props","forwardedRef","componentStyleProps","filter","styleProp","classNames","Object","fromEntries","map","refs","undefined","forEach","displayName","ref","componentRef","createUnistylesElement","UnistylesComponent","forwardRef"],"sourceRoot":"../../../src","sources":["core/createUnistylesElement.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAGzB,SAASC,uBAAuB,QAAQ,UAAU;AAClD,SAASC,QAAQ,QAAQ,cAAc;AACvC,SAASC,kBAAkB,QAAQ,iCAAiC;AACpE,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,SAASC,+BAA+B,QAAQ,QAAQ;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAExD,MAAMC,WAAW,GAAG,CAAC,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,CAAU;AAMrF,MAAMC,mBAAmB,GAAGA,CAACC,SAAc,EAAEC,KAAqB,EAAEC,YAAyC,KAAK;EAC9G,MAAMC,mBAAmB,GAAGL,WAAW,CAACM,MAAM,CAACC,SAAS,IAAIA,SAAS,IAAIJ,KAAK,CAAC;EAC/E,MAAMK,UAAU,GAAGC,MAAM,CAACC,WAAW,CAACL,mBAAmB,CAACM,GAAG,CAACJ,SAAS,IAAI,CAACA,SAAS,EAAEX,YAAY,CAACO,KAAK,CAACI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;EACxH,MAAMK,IAAI,GAAGP,mBAAmB,CAACM,GAAG,CAACJ,SAAS,IAAI;IAC9C,OAAOZ,kBAAkB,CACrBa,UAAU,CAACD,SAAS,CAAC,EACrBA,SAAS,KAAK,OAAO,GAAGH,YAAY,GAAGS,SAC3C,CAAC;EACL,CAAC,CAAC;EAEFR,mBAAmB,CAACS,OAAO,CAACP,SAAS,IAAI;IACrCV,+BAA+B,CAACM,KAAK,CAACI,SAAS,CAAC,EAAeL,SAAS,CAACa,WAAW,CAAC;EACzF,CAAC,CAAC;EAEF,OAAO;IACH,GAAGP,UAAU;IACbQ,GAAG,EAAEtB,QAAQ,CAAC,CAAC,GAAGmB,SAAS,GAAII,YAAiB,IAAKL,IAAI,CAACE,OAAO,CAACE,GAAG,IAAIA,GAAG,GAAGC,YAAY,CAAC;EAChG,CAAC;AACL,CAAC;AAED,OAAO,MAAMC,sBAAsB,GAAIhB,SAAc,IAAK;EACtD,MAAMiB,kBAAkB,gBAAG3B,KAAK,CAAC4B,UAAU,CAA0B,CAACjB,KAAK,EAAEC,YAAY,KAAK;IAC1F,oBACIL,IAAA,CAACG,SAAS;MAAA,GACFC,KAAK;MAAA,GACLF,mBAAmB,CAACC,SAAS,EAAEC,KAAK,EAAEC,YAAY;IAAC,CAC1D,CAAC;EAEV,CAAC,CAAC;EAEF,OAAOX,uBAAuB,CAACS,SAAS,EAAEiB,kBAAkB,CAAC;AACjE,CAAC","ignoreList":[]}

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

@@ -35,10 +35,16 @@ export const createUnistylesElement = Component => {
         if (ref) {
           storedRef.current = getNativeRef(Component, ref);
         }
-        passForwardedRef(props, ref, forwardedRef);
 
         // @ts-ignore we don't know the type of the component
         maybeWarnAboutMultipleUnistyles(props.style, Component.displayName);
+        return passForwardedRef(ref, forwardedRef, () => {
+          // @ts-ignore this is hidden from TS
+          UnistylesShadowRegistry.add(ref, props.style);
+        }, () => {
+          // @ts-ignore this is hidden from TS
+          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","add"],"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;;QAEA;QACAL,+BAA+B,CAACc,KAAK,CAACI,KAAK,EAAEd,SAAS,CAACe,WAAW,CAAC;QAEnE,OAAOpB,gBAAgB,CACnBM,GAAG,EACHU,YAAY,EACZ,MAAM;UACF;UACAlB,uBAAuB,CAACuB,GAAG,CAACf,GAAG,EAAES,KAAK,CAACI,KAAK,CAAC;QACjD,CAAC,EACD,MAAM;UACF;UACArB,uBAAuB,CAACoB,MAAM,CAACZ,GAAG,CAAC;QACvC,CACJ,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

@@ -25,11 +25,17 @@ export const createUnistylesImageBackground = Component => {
     return /*#__PURE__*/_jsx(Component, {
       ...props,
       ref: ref => {
-        passForwardedRef(props, ref, forwardedRef);
-        return () => {
-          // @ts-ignore
+        return passForwardedRef(ref, forwardedRef, () => {
+          // @ts-expect-error - this is hidden from TS
+          UnistylesShadowRegistry.add(ref, props.style);
+        }, () => {
+          // @ts-expect-error - this is hidden from TS
           UnistylesShadowRegistry.remove(ref);
-        };
+          if (storedImageRef.current) {
+            // @ts-expect-error - this is hidden from TS
+            UnistylesShadowRegistry.remove(storedImageRef.current);
+          }
+        });
       },
       imageRef: ref => {
         if (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","add","imageRef"],"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;QACR,OAAOf,gBAAgB,CACnBe,GAAG,EACHN,YAAY,EACZ,MAAM;UACF;UACAX,uBAAuB,CAACkB,GAAG,CAACD,GAAG,EAAEP,KAAK,CAACK,KAAK,CAAC;QACjD,CAAC,EACD,MAAM;UACF;UACAf,uBAAuB,CAACc,MAAM,CAACG,GAAG,CAAC;UAEnC,IAAIL,cAAc,CAACC,OAAO,EAAE;YACxB;YACAb,uBAAuB,CAACc,MAAM,CAACF,cAAc,CAACC,OAAO,CAAC;UAC1D;QACJ,CACJ,CAAC;MACL,CAAE;MACFM,QAAQ,EAAEF,GAAG,IAAI;QACb,IAAIA,GAAG,EAAE;UACLL,cAAc,CAACC,OAAO,GAAGI,GAAG;QAChC;;QAEA;QACAjB,uBAAuB,CAACkB,GAAG,CAACD,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/getClassname.js

@@ -1,18 +1,22 @@
 "use strict";
 
-import { UnistylesWeb } from '../web';
-export const getClassName = unistyle => {
+import * as unistyles from '../web/services';
+import { checkForAnimated } from '../web/utils';
+export const getClassName = (unistyle, forChild) => {
   if (!unistyle) {
     return undefined;
   }
+  const flattenedStyles = Array.isArray(unistyle) ? unistyle.flat(Number.POSITIVE_INFINITY) : [unistyle];
+  const animatedStyles = flattenedStyles.filter(checkForAnimated);
+  const regularStyles = flattenedStyles.filter(style => !checkForAnimated(style));
   const {
     hash,
     injectedClassName
-  } = UnistylesWeb.shadowRegistry.addStyles(Array.isArray(unistyle) ? unistyle.flat(Number.POSITIVE_INFINITY) : [unistyle]);
-  return hash ? {
+  } = unistyles.services.shadowRegistry.addStyles(regularStyles, forChild);
+  return hash ? [{
     $$css: true,
     hash,
     injectedClassName
-  } : undefined;
+  }, animatedStyles] : undefined;
 };
 //# sourceMappingURL=getClassname.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["UnistylesWeb","getClassName","unistyle","undefined","hash","injectedClassName","shadowRegistry","addStyles","Array","isArray","flat","Number","POSITIVE_INFINITY","$$css"],"sourceRoot":"../../../src","sources":["core/getClassname.ts"],"mappings":";;AACA,SAASA,YAAY,QAAQ,QAAQ;AAErC,OAAO,MAAMC,YAAY,GAAIC,QAA8D,IAAK;EAC5F,IAAI,CAACA,QAAQ,EAAE;IACX,OAAOC,SAAS;EACpB;EAEA,MAAM;IAAEC,IAAI;IAAEC;EAAkB,CAAC,GAAGL,YAAY,CAACM,cAAc,CAACC,SAAS,CACrEC,KAAK,CAACC,OAAO,CAACP,QAAQ,CAAC,GAAGA,QAAQ,CAACQ,IAAI,CAACC,MAAM,CAACC,iBAAiB,CAAC,GAAG,CAACV,QAAQ,CACjF,CAAC;EAED,OAAOE,IAAI,GAAG;IAAES,KAAK,EAAE,IAAI;IAAET,IAAI;IAAEC;EAAkB,CAAC,GAAGF,SAAS;AACtE,CAAC","ignoreList":[]}
+{"version":3,"names":["unistyles","checkForAnimated","getClassName","unistyle","forChild","undefined","flattenedStyles","Array","isArray","flat","Number","POSITIVE_INFINITY","animatedStyles","filter","regularStyles","style","hash","injectedClassName","services","shadowRegistry","addStyles","$$css"],"sourceRoot":"../../../src","sources":["core/getClassname.ts"],"mappings":";;AACA,OAAO,KAAKA,SAAS,MAAM,iBAAiB;AAC5C,SAASC,gBAAgB,QAAQ,cAAc;AAE/C,OAAO,MAAMC,YAAY,GAAGA,CAACC,QAA8D,EAAEC,QAAkB,KAAK;EAChH,IAAI,CAACD,QAAQ,EAAE;IACX,OAAOE,SAAS;EACpB;EAEA,MAAMC,eAAe,GAAGC,KAAK,CAACC,OAAO,CAACL,QAAQ,CAAC,GAAGA,QAAQ,CAACM,IAAI,CAACC,MAAM,CAACC,iBAAiB,CAAC,GAAG,CAACR,QAAQ,CAAC;EACtG,MAAMS,cAAc,GAAGN,eAAe,CAACO,MAAM,CAACZ,gBAAgB,CAAC;EAC/D,MAAMa,aAAa,GAAGR,eAAe,CAACO,MAAM,CAACE,KAAK,IAAI,CAACd,gBAAgB,CAACc,KAAK,CAAC,CAAC;EAE/E,MAAM;IAAEC,IAAI;IAAEC;EAAkB,CAAC,GAAGjB,SAAS,CAACkB,QAAQ,CAACC,cAAc,CAACC,SAAS,CAC3EN,aAAa,EACbV,QACJ,CAAC;EAED,OAAOY,IAAI,GACL,CACE;IAAEK,KAAK,EAAE,IAAI;IAAEL,IAAI;IAAEC;EAAkB,CAAC,EACxCL,cAAc,CACjB,GACCP,SAAS;AACnB,CAAC","ignoreList":[]}

package/lib/module/core/passForwardRef.js

@@ -1,7 +1,6 @@
 "use strict";
 
-import { UnistylesShadowRegistry } from '../specs';
-export const passForwardedRef = (props, ref, forwardedRef) => {
+export const passForwardedRef = (ref, forwardedRef, onMount, onUnmount) => {
   const passForwardedRef = () => {
     if (typeof forwardedRef === 'function') {
       return forwardedRef(ref);
@@ -12,11 +11,10 @@ export const passForwardedRef = (props, ref, forwardedRef) => {
     return () => {};
   };
   const forwardedRefReturnFn = passForwardedRef();
-
-  // @ts-expect-error hidden from TS
-  UnistylesShadowRegistry.add(ref, props.style);
+  onMount?.();
   return () => {
     forwardedRefReturnFn?.();
+    onUnmount?.();
   };
 };
 //# sourceMappingURL=passForwardRef.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["UnistylesShadowRegistry","passForwardedRef","props","ref","forwardedRef","current","forwardedRefReturnFn","add","style"],"sourceRoot":"../../../src","sources":["core/passForwardRef.ts"],"mappings":";;AACA,SAASA,uBAAuB,QAAQ,UAAU;AAElD,OAAO,MAAMC,gBAAgB,GAAGA,CAC5BC,KAAU,EACVC,GAAM,EACNC,YAAmC,KAClC;EACD,MAAMH,gBAAgB,GAAGA,CAAA,KAAM;IAC3B,IAAI,OAAOG,YAAY,KAAK,UAAU,EAAE;MACpC,OAAOA,YAAY,CAACD,GAAG,CAAC;IAC5B;IAEA,IAAIC,YAAY,EAAE;MACdA,YAAY,CAACC,OAAO,GAAGF,GAAG;IAC9B;IAEA,OAAO,MAAM,CAAC,CAAC;EACnB,CAAC;EACD,MAAMG,oBAAoB,GAAGL,gBAAgB,CAAC,CAAC;;EAE/C;EACAD,uBAAuB,CAACO,GAAG,CAACJ,GAAG,EAAED,KAAK,CAACM,KAAK,CAAC;EAE7C,OAAO,MAAM;IACTF,oBAAoB,GAAG,CAAC;EAC5B,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["passForwardedRef","ref","forwardedRef","onMount","onUnmount","current","forwardedRefReturnFn"],"sourceRoot":"../../../src","sources":["core/passForwardRef.ts"],"mappings":";;AAEA,OAAO,MAAMA,gBAAgB,GAAGA,CAC5BC,GAAM,EACNC,YAAmC,EACnCC,OAAoB,EACpBC,SAAsB,KACrB;EACD,MAAMJ,gBAAgB,GAAGA,CAAA,KAAM;IAC3B,IAAI,OAAOE,YAAY,KAAK,UAAU,EAAE;MACpC,OAAOA,YAAY,CAACD,GAAG,CAAC;IAC5B;IAEA,IAAIC,YAAY,EAAE;MACdA,YAAY,CAACG,OAAO,GAAGJ,GAAG;IAC9B;IAEA,OAAO,MAAM,CAAC,CAAC;EACnB,CAAC;EACD,MAAMK,oBAAoB,GAAGN,gBAAgB,CAAC,CAAC;EAE/CG,OAAO,GAAG,CAAC;EAEX,OAAO,MAAM;IACTG,oBAAoB,GAAG,CAAC;IACxBF,SAAS,GAAG,CAAC;EACjB,CAAC;AACL,CAAC","ignoreList":[]}

package/lib/module/core/useProxifiedUnistyles/listener.js

@@ -1,14 +1,14 @@
 "use strict";
 
 import { UnistyleDependency } from '../../specs';
-import { UnistylesWeb } from '../../web';
+import * as unistyles from '../../web/services';
 export const listener = ({
   dependencies,
   updateTheme,
   updateRuntime
 }) => {
-  const disposeTheme = UnistylesWeb.listener.addListeners(dependencies.filter(dependency => dependency === UnistyleDependency.Theme), updateTheme);
-  const disposeRuntime = UnistylesWeb.listener.addListeners(dependencies.filter(dependency => dependency !== UnistyleDependency.Theme), updateRuntime);
+  const disposeTheme = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency === UnistyleDependency.Theme), updateTheme);
+  const disposeRuntime = unistyles.services.listener.addListeners(dependencies.filter(dependency => dependency !== UnistyleDependency.Theme), updateRuntime);
   return () => {
     disposeTheme();
     disposeRuntime();

package/lib/module/core/useProxifiedUnistyles/listener.js.map

@@ -1 +1 @@
-{"version":3,"names":["UnistyleDependency","UnistylesWeb","listener","dependencies","updateTheme","updateRuntime","disposeTheme","addListeners","filter","dependency","Theme","disposeRuntime"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/listener.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,aAAa;AAChD,SAASC,YAAY,QAAQ,WAAW;AAGxC,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,YAAY;EAAEC,WAAW;EAAEC;AAA6B,CAAC,KAAK;EACrF,MAAMC,YAAY,GAAGL,YAAY,CAACC,QAAQ,CAACK,YAAY,CAACJ,YAAY,CAACK,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKT,kBAAkB,CAACU,KAAK,CAAC,EAAEN,WAAW,CAAC;EAChJ,MAAMO,cAAc,GAAGV,YAAY,CAACC,QAAQ,CAACK,YAAY,CAACJ,YAAY,CAACK,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKT,kBAAkB,CAACU,KAAK,CAAC,EAAEL,aAAa,CAAC;EAEpJ,OAAO,MAAM;IACTC,YAAY,CAAC,CAAC;IACdK,cAAc,CAAC,CAAC;EACpB,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["UnistyleDependency","unistyles","listener","dependencies","updateTheme","updateRuntime","disposeTheme","services","addListeners","filter","dependency","Theme","disposeRuntime"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/listener.ts"],"mappings":";;AAAA,SAASA,kBAAkB,QAAQ,aAAa;AAChD,OAAO,KAAKC,SAAS,MAAM,oBAAoB;AAG/C,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,YAAY;EAAEC,WAAW;EAAEC;AAA6B,CAAC,KAAK;EACrF,MAAMC,YAAY,GAAGL,SAAS,CAACM,QAAQ,CAACL,QAAQ,CAACM,YAAY,CAACL,YAAY,CAACM,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKV,kBAAkB,CAACW,KAAK,CAAC,EAAEP,WAAW,CAAC;EACtJ,MAAMQ,cAAc,GAAGX,SAAS,CAACM,QAAQ,CAACL,QAAQ,CAACM,YAAY,CAACL,YAAY,CAACM,MAAM,CAACC,UAAU,IAAIA,UAAU,KAAKV,kBAAkB,CAACW,KAAK,CAAC,EAAEN,aAAa,CAAC;EAE1J,OAAO,MAAM;IACTC,YAAY,CAAC,CAAC;IACdM,cAAc,CAAC,CAAC;EACpB,CAAC;AACL,CAAC","ignoreList":[]}

package/lib/module/core/useProxifiedUnistyles/useProxifiedUnistyles.js

@@ -22,14 +22,15 @@ const RTDependencyMap = {
   screen: UnistyleDependency.Dimensions,
   statusBar: UnistyleDependency.StatusBar,
   pixelRatio: UnistyleDependency.PixelRatio,
-  themeName: UnistyleDependency.ThemeName
+  themeName: UnistyleDependency.ThemeName,
+  rtl: UnistyleDependency.Rtl
 };
 export const useProxifiedUnistyles = forcedTheme => {
   const scopedTheme = forcedTheme ?? UnistylesShadowRegistry.getScopedTheme();
   const [dependencies] = useState(() => new Set());
   const [theme, setTheme] = useState(UnistylesRuntime.getTheme(scopedTheme));
   const [_, runtimeChanged] = useReducer(() => ({}), {});
-  const disposeRef = useRef();
+  const disposeRef = useRef(undefined);
   const reinitListener = () => {
     disposeRef.current?.();
     disposeRef.current = listener({
@@ -55,6 +56,18 @@ export const useProxifiedUnistyles = forcedTheme => {
   });
   const proxifiedRuntime = new Proxy(getMiniRuntime(), {
     get: (target, prop) => {
+      if (prop === 'insets') {
+        return new Proxy(target.insets, {
+          get: (target, prop) => {
+            if (prop === 'ime') {
+              dependencies.add(UnistyleDependency.Ime);
+              return target[prop];
+            }
+            dependencies.add(UnistyleDependency.Insets);
+            return target[prop];
+          }
+        });
+      }
       if (prop in RTDependencyMap) {
         dependencies.add(RTDependencyMap[prop]);
       }

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

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useReducer","useRef","useState","UnistylesRuntime","UnistylesShadowRegistry","UnistyleDependency","listener","getMiniRuntime","miniRuntime","RTDependencyMap","breakpoint","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","useProxifiedUnistyles","forcedTheme","scopedTheme","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","disposeRef","reinitListener","current","Array","from","updateTheme","updateRuntime","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","addDependencies","newDependencies","dependenciesSize","forEach","dependency"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","useReducer","useRef","useState","UnistylesRuntime","UnistylesShadowRegistry","UnistyleDependency","listener","getMiniRuntime","miniRuntime","RTDependencyMap","breakpoint","Breakpoints","colorScheme","ColorScheme","contentSizeCategory","ContentSizeCategory","hasAdaptiveThemes","AdaptiveThemes","insets","Insets","fontScale","FontScale","isLandscape","Orientation","isPortrait","navigationBar","NavigationBar","screen","Dimensions","statusBar","StatusBar","pixelRatio","PixelRatio","themeName","ThemeName","rtl","Rtl","useProxifiedUnistyles","forcedTheme","scopedTheme","getScopedTheme","dependencies","Set","theme","setTheme","getTheme","_","runtimeChanged","disposeRef","undefined","reinitListener","current","Array","from","updateTheme","updateRuntime","size","proxifiedTheme","Proxy","get","target","prop","add","Theme","proxifiedRuntime","Ime","addDependencies","newDependencies","dependenciesSize","forEach","dependency"],"sourceRoot":"../../../../src","sources":["core/useProxifiedUnistyles/useProxifiedUnistyles.ts"],"mappings":"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","ignoreList":[]}

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

@@ -13,7 +13,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export const withUnistyles = (Component, mappings) => {
   return /*#__PURE__*/forwardRef((props, ref) => {
     const narrowedProps = props;
-    const styleClassNames = getClassName(narrowedProps.style);
+    const styleClassNames = getClassName(narrowedProps.style, true);
     const contentContainerStyleClassNames = getClassName(narrowedProps.contentContainerStyle);
     const {
       proxifiedRuntime,
@@ -21,10 +21,12 @@ export const withUnistyles = (Component, mappings) => {
     } = useProxifiedUnistyles();
     const mappingsProps = mappings ? mappings(proxifiedTheme, proxifiedRuntime) : {};
     const unistyleProps = narrowedProps.uniProps ? narrowedProps.uniProps(proxifiedTheme, proxifiedRuntime) : {};
+    const emptyStyles = narrowedProps.style ? Object.fromEntries(Object.entries(Object.getOwnPropertyDescriptors(narrowedProps.style)).filter(([key]) => !key.startsWith("unistyles") && !key.startsWith("_")).map(([key]) => [key, undefined])) : undefined;
     const combinedProps = {
       ...deepMergeObjects(mappingsProps, unistyleProps, props),
       ...(narrowedProps.style ? {
-        style: styleClassNames
+        // Override default component styles with undefined values to reset them
+        style: emptyStyles
       } : {}),
       ...(narrowedProps.contentContainerStyle ? {
         contentContainerStyle: contentContainerStyleClassNames
@@ -36,9 +38,16 @@ export const withUnistyles = (Component, mappings) => {
     // @ts-ignore
     maybeWarnAboutMultipleUnistyles(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? Component.name ?? 'Unknown'})`);
     const NativeComponent = Component;
-    return /*#__PURE__*/_jsx(NativeComponent, {
-      ...combinedProps,
-      ref: ref
+    const [classNames] = styleClassNames ?? [];
+    return /*#__PURE__*/_jsx("div", {
+      className: classNames?.hash,
+      style: {
+        display: 'contents'
+      },
+      children: /*#__PURE__*/_jsx(NativeComponent, {
+        ...combinedProps,
+        ref: ref
+      })
     });
   });
 };

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

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","deepMergeObjects","getClassName","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","props","ref","narrowedProps","styleClassNames","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","mappingsProps","unistyleProps","uniProps","combinedProps","displayName","name","NativeComponent"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAGrG,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,0BAA0B;AAChE,SAASC,+BAA+B,QAAQ,SAAS;;AAGzD;;AAEA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAOT,UAAU,CAAsD,CAACU,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAGX,YAAY,CAACU,aAAa,CAACE,KAAK,CAAC;IACzD,MAAMC,+BAA+B,GAAGb,YAAY,CAACU,aAAa,CAACI,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAGf,qBAAqB,CAAC,CAAC;IAEpE,MAAMgB,aAAa,GAAGV,QAAQ,GAAGA,QAAQ,CAACS,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMG,aAAa,GAAGR,aAAa,CAACS,QAAQ,GAAGT,aAAa,CAACS,QAAQ,CAACH,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAE5G,MAAMK,aAAa,GAAG;MAClB,GAAGrB,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrBA,KAAK,EAAED;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGD,aAAa,CAACI,qBAAqB,GAAG;QACrCA,qBAAqB,EAAED;MAC3B,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;;IAER;IACAX,+BAA+B,CAACQ,aAAa,CAACE,KAAK,EAAE,iBAAiBN,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACApB,+BAA+B,CAACQ,aAAa,CAACI,qBAAqB,EAAE,iBAAiBR,SAAS,CAACe,WAAW,IAAIf,SAAS,CAACgB,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAMC,eAAe,GAAGjB,SAA0B;IAElD,oBAAOF,IAAA,CAACmB,eAAe;MAAA,GAAKH,aAAa;MAAEX,GAAG,EAAEA;IAAI,CAAE,CAAC;EAC3D,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","deepMergeObjects","getClassName","useProxifiedUnistyles","maybeWarnAboutMultipleUnistyles","jsx","_jsx","withUnistyles","Component","mappings","props","ref","narrowedProps","styleClassNames","style","contentContainerStyleClassNames","contentContainerStyle","proxifiedRuntime","proxifiedTheme","mappingsProps","unistyleProps","uniProps","emptyStyles","Object","fromEntries","entries","getOwnPropertyDescriptors","filter","key","startsWith","map","undefined","combinedProps","displayName","name","NativeComponent","classNames","className","hash","display","children"],"sourceRoot":"../../../../src","sources":["core/withUnistyles/withUnistyles.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAwBC,UAAU,QAAgD,OAAO;AAErG,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,iBAAiB;AAC9C,SAASC,qBAAqB,QAAQ,0BAA0B;AAChE,SAASC,+BAA+B,QAAQ,SAAS;;AAGzD;;AAEA;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA,OAAO,MAAMC,aAAa,GAAGA,CAAkEC,SAAqB,EAAEC,QAA8B,KAAK;EAUrJ,oBAAOT,UAAU,CAAsD,CAACU,KAAK,EAAEC,GAAG,KAAK;IACnF,MAAMC,aAAa,GAAGF,KAA4C;IAClE,MAAMG,eAAe,GAAGX,YAAY,CAACU,aAAa,CAACE,KAAK,EAAE,IAAI,CAAC;IAC/D,MAAMC,+BAA+B,GAAGb,YAAY,CAACU,aAAa,CAACI,qBAAqB,CAAC;IACzF,MAAM;MAAEC,gBAAgB;MAAEC;IAAe,CAAC,GAAGf,qBAAqB,CAAC,CAAC;IAEpE,MAAMgB,aAAa,GAAGV,QAAQ,GAAGA,QAAQ,CAACS,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAChF,MAAMG,aAAa,GAAGR,aAAa,CAACS,QAAQ,GAAGT,aAAa,CAACS,QAAQ,CAACH,cAAc,EAAED,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAG5G,MAAMK,WAAW,GAAGV,aAAa,CAACE,KAAK,GACjCS,MAAM,CAACC,WAAW,CACdD,MAAM,CAACE,OAAO,CAACF,MAAM,CAACG,yBAAyB,CAACd,aAAa,CAACE,KAAK,CAAC,CAAC,CAChEa,MAAM,CAAC,CAAC,CAACC,GAAG,CAAC,KAAK,CAACA,GAAG,CAACC,UAAU,CAAC,WAAW,CAAC,IAAI,CAACD,GAAG,CAACC,UAAU,CAAC,GAAG,CAAC,CAAC,CACvEC,GAAG,CAAC,CAAC,CAACF,GAAG,CAAC,KAAK,CAACA,GAAG,EAAEG,SAAS,CAAC,CACxC,CAAC,GACDA,SAAS;IAEf,MAAMC,aAAa,GAAG;MAClB,GAAG/B,gBAAgB,CAACkB,aAAa,EAAEC,aAAa,EAAEV,KAAK,CAAC;MACxD,IAAGE,aAAa,CAACE,KAAK,GAAG;QACrB;QACAA,KAAK,EAAEQ;MACX,CAAC,GAAG,CAAC,CAAC;MACN,IAAGV,aAAa,CAACI,qBAAqB,GAAG;QACrCA,qBAAqB,EAAED;MAC3B,CAAC,GAAG,CAAC,CAAC;IACV,CAAQ;;IAER;IACAX,+BAA+B,CAACQ,aAAa,CAACE,KAAK,EAAE,iBAAiBN,SAAS,CAACyB,WAAW,IAAIzB,SAAS,CAAC0B,IAAI,IAAI,SAAS,GAAG,CAAC;IAC9H;IACA9B,+BAA+B,CAACQ,aAAa,CAACI,qBAAqB,EAAE,iBAAiBR,SAAS,CAACyB,WAAW,IAAIzB,SAAS,CAAC0B,IAAI,IAAI,SAAS,GAAG,CAAC;IAE9I,MAAMC,eAAe,GAAG3B,SAA0B;IAClD,MAAM,CAAC4B,UAAU,CAAC,GAAGvB,eAAe,IAAI,EAAE;IAE1C,oBACIP,IAAA;MACI+B,SAAS,EAAED,UAAU,EAAEE,IAAK;MAC5BxB,KAAK,EAAE;QAAEyB,OAAO,EAAE;MAAW,CAAE;MAAAC,QAAA,eAE/BlC,IAAA,CAAC6B,eAAe;QAAA,GAAKH,aAAa;QAAErB,GAAG,EAAEA;MAAI,CAAE;IAAC,CAC/C,CAAC;EAEd,CAAC,CAAC;AACN,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.flat() : [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: () => style,
+        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, {