react-native-unistyles 3.0.0-alpha.44 → 3.0.0-alpha.45

package/lib/commonjs/web/shadowRegistry.js

@@ -30,10 +30,9 @@ class UnistylesShadowRegistryBuilder {
 
     // Ref is unmounted, remove style tags from the document
     if (ref === null) {
-      (0, _utils2.extractSecrets)(styles).forEach(({
-        __uni__refs
-      }) => {
-        __uni__refs.forEach(ref => {
+      const secrets = (0, _utils2.extractSecrets)(styles);
+      if (secrets) {
+        secrets.__uni__refs.forEach(ref => {
           if ((0, _utils2.isInDocument)(ref)) {
             return;
           }
@@ -44,7 +43,7 @@ class UnistylesShadowRegistryBuilder {
             _registry.UnistylesRegistry.remove(oldResult);
           }
         });
-      });
+      }
       return;
     }
 
@@ -52,59 +51,60 @@ class UnistylesShadowRegistryBuilder {
     if (!(ref instanceof HTMLElement)) {
       return;
     }
-    const parsedStyles = styles.flatMap((style, styleIndex) => {
-      const secrets = (0, _utils2.extractSecrets)(style);
+    const parsedStyles = styles.flat().flatMap((unistyleStyle, styleIndex) => {
+      if (!unistyleStyle) {
+        return [];
+      }
+      const secrets = (0, _utils2.extractSecrets)(unistyleStyle);
 
       // Regular style
-      if (secrets.length === 0) {
-        return style;
+      if (!secrets) {
+        return unistyleStyle;
       }
-      return secrets.map(secret => {
-        const {
-          __uni__key,
-          __uni__stylesheet,
-          __uni__variants,
-          __uni__args = [],
-          __uni__refs
-        } = secret;
-        const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
-        const style = newComputedStylesheet[__uni__key];
-        const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
-        const args = _args[styleIndex] && _args[styleIndex].length > 0 ? _args[styleIndex] : __uni__args;
-        const result = typeof style === 'function' ? style(...args) : style;
+      const {
+        __uni__key,
+        __uni__stylesheet,
+        __uni__variants,
+        __uni__args = [],
+        __uni__refs
+      } = secrets;
+      const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
+      const style = newComputedStylesheet[__uni__key];
+      const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
+      const args = _args[styleIndex] && _args[styleIndex].length > 0 ? _args[styleIndex] : __uni__args;
+      const result = typeof style === 'function' ? style(...args) : style;
+      const {
+        variantsResult
+      } = Object.fromEntries((0, _variants2.getVariants)({
+        variantsResult: result
+      }, variants));
+      const resultWithVariants = (0, _utils.deepMergeObjects)(result, variantsResult ?? {});
+      const dependencies = (0, _utils2.extractUnistyleDependencies)(resultWithVariants);
+      if (typeof __uni__stylesheet === 'function') {
+        // Add dependencies from dynamic styles to stylesheet
+        _registry.UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
+      }
+      __uni__refs.add(ref);
+      const dispose = _listener.UnistylesListener.addListeners((0, _utils2.extractUnistyleDependencies)(resultWithVariants), () => {
+        const hash = this.hashMap.get(ref);
+
+        // Dispose listener if there is no hash
+        if (!hash) {
+          dispose();
+          return;
+        }
+        const newComputedStyleSheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
+        const newValue = newComputedStyleSheet[__uni__key];
+        const result = typeof newValue === 'function' ? newValue(...args) : newValue;
         const {
           variantsResult
         } = Object.fromEntries((0, _variants2.getVariants)({
           variantsResult: result
         }, variants));
         const resultWithVariants = (0, _utils.deepMergeObjects)(result, variantsResult ?? {});
-        const dependencies = (0, _utils2.extractUnistyleDependencies)(resultWithVariants);
-        if (typeof __uni__stylesheet === 'function') {
-          // Add dependencies from dynamic styles to stylesheet
-          _registry.UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
-        }
-        __uni__refs.add(ref);
-        const dispose = _listener.UnistylesListener.addListeners((0, _utils2.extractUnistyleDependencies)(resultWithVariants), () => {
-          const hash = this.hashMap.get(ref);
-
-          // Dispose listener if there is no hash
-          if (!hash) {
-            dispose();
-            return;
-          }
-          const newComputedStyleSheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
-          const newValue = newComputedStyleSheet[__uni__key];
-          const result = typeof newValue === 'function' ? newValue(...args) : newValue;
-          const {
-            variantsResult
-          } = Object.fromEntries((0, _variants2.getVariants)({
-            variantsResult: result
-          }, variants));
-          const resultWithVariants = (0, _utils.deepMergeObjects)(result, variantsResult ?? {});
-          _registry.UnistylesRegistry.applyStyles(hash, (0, _convert.convertUnistyles)(resultWithVariants));
-        });
-        return resultWithVariants;
+        _registry.UnistylesRegistry.applyStyles(hash, (0, _convert.convertUnistyles)(resultWithVariants));
       });
+      return resultWithVariants;
     });
     const combinedStyles = (0, _utils.deepMergeObjects)(...parsedStyles);
     const oldStyles = this.resultsMap.get(ref);

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

@@ -1 +1 @@
-{"version":3,"names":["_convert","require","_listener","_registry","_utils","_utils2","_variants2","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","Map","hashMap","classNamesMap","add","ref","styles","_variants","_args","extractSecrets","forEach","__uni__refs","isInDocument","oldResult","get","delete","UnistylesRegistry","remove","HTMLElement","parsedStyles","flatMap","style","styleIndex","secrets","length","map","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","variants","Object","keys","args","result","variantsResult","fromEntries","getVariants","resultWithVariants","deepMergeObjects","dependencies","extractUnistyleDependencies","addDependenciesToStylesheet","UnistylesListener","addListeners","hash","newComputedStyleSheet","newValue","applyStyles","convertUnistyles","combinedStyles","oldStyles","equal","oldClassNames","className","classList","set","existingHash","injectedClassNames","_web","_classNames","newClassNames","Array","isArray","concat","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_convert","require","_listener","_registry","_utils","_utils2","_variants2","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","Map","hashMap","classNamesMap","add","ref","styles","_variants","_args","secrets","extractSecrets","__uni__refs","forEach","isInDocument","oldResult","get","delete","UnistylesRegistry","remove","HTMLElement","parsedStyles","flat","flatMap","unistyleStyle","styleIndex","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","style","variants","Object","keys","length","args","result","variantsResult","fromEntries","getVariants","resultWithVariants","deepMergeObjects","dependencies","extractUnistyleDependencies","addDependenciesToStylesheet","UnistylesListener","addListeners","hash","newComputedStyleSheet","newValue","applyStyles","convertUnistyles","combinedStyles","oldStyles","equal","oldClassNames","className","classList","set","existingHash","injectedClassNames","_web","_classNames","newClassNames","Array","isArray","concat","UnistylesShadowRegistry","exports"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/web/utils/unistyle.js

@@ -20,18 +20,12 @@ const schemeToTheme = scheme => {
 exports.schemeToTheme = schemeToTheme;
 const assignSecrets = (object, secrets) => {
   // @ts-expect-error - assign secrets to object
-  object[`__uni__secrets__${Math.random().toString(16).slice(2)}`] = secrets;
+  object.__uni__secrets__ = secrets;
   return object;
 };
 exports.assignSecrets = assignSecrets;
 const extractSecrets = object => {
-  const secrets = Object.entries(object).reduce((acc, [key, value]) => {
-    if (key.startsWith('__uni__secrets__')) {
-      acc.push(value);
-    }
-    return acc;
-  }, []);
-  return secrets;
+  return (0, _common.keyInObject)(object, '__uni__secrets__') ? object.__uni__secrets__ : undefined;
 };
 exports.extractSecrets = extractSecrets;
 const getStyles = values => {

package/lib/commonjs/web/utils/unistyle.js.map

@@ -1 +1 @@
-{"version":3,"names":["_types","require","_mq","_state","_common","schemeToTheme","scheme","ColorScheme","Dark","Light","exports","assignSecrets","object","secrets","Math","random","toString","slice","extractSecrets","Object","entries","reduce","acc","key","value","startsWith","push","getStyles","values","returnValue","defineProperties","reduceObject","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","undefined","Number","isNaN","getMediaQuery","Orientation","includes","isUnistylesMq","minWidth","maxWidth","minHeight","maxHeight","parseMq","filter","Boolean","join","UnistylesState","breakpoints","keyInObject","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_types","require","_mq","_state","_common","schemeToTheme","scheme","ColorScheme","Dark","Light","exports","assignSecrets","object","secrets","__uni__secrets__","extractSecrets","keyInObject","undefined","getStyles","values","returnValue","Object","defineProperties","reduceObject","value","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","Number","isNaN","getMediaQuery","Orientation","includes","isUnistylesMq","minWidth","maxWidth","minHeight","maxHeight","parseMq","filter","Boolean","join","UnistylesState","breakpoints","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/shadowRegistry.js

@@ -26,10 +26,9 @@ class UnistylesShadowRegistryBuilder {
 
     // Ref is unmounted, remove style tags from the document
     if (ref === null) {
-      extractSecrets(styles).forEach(({
-        __uni__refs
-      }) => {
-        __uni__refs.forEach(ref => {
+      const secrets = extractSecrets(styles);
+      if (secrets) {
+        secrets.__uni__refs.forEach(ref => {
           if (isInDocument(ref)) {
             return;
           }
@@ -40,7 +39,7 @@ class UnistylesShadowRegistryBuilder {
             UnistylesRegistry.remove(oldResult);
           }
         });
-      });
+      }
       return;
     }
 
@@ -48,59 +47,60 @@ class UnistylesShadowRegistryBuilder {
     if (!(ref instanceof HTMLElement)) {
       return;
     }
-    const parsedStyles = styles.flatMap((style, styleIndex) => {
-      const secrets = extractSecrets(style);
+    const parsedStyles = styles.flat().flatMap((unistyleStyle, styleIndex) => {
+      if (!unistyleStyle) {
+        return [];
+      }
+      const secrets = extractSecrets(unistyleStyle);
 
       // Regular style
-      if (secrets.length === 0) {
-        return style;
+      if (!secrets) {
+        return unistyleStyle;
       }
-      return secrets.map(secret => {
-        const {
-          __uni__key,
-          __uni__stylesheet,
-          __uni__variants,
-          __uni__args = [],
-          __uni__refs
-        } = secret;
-        const newComputedStylesheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
-        const style = newComputedStylesheet[__uni__key];
-        const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
-        const args = _args[styleIndex] && _args[styleIndex].length > 0 ? _args[styleIndex] : __uni__args;
-        const result = typeof style === 'function' ? style(...args) : style;
+      const {
+        __uni__key,
+        __uni__stylesheet,
+        __uni__variants,
+        __uni__args = [],
+        __uni__refs
+      } = secrets;
+      const newComputedStylesheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
+      const style = newComputedStylesheet[__uni__key];
+      const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
+      const args = _args[styleIndex] && _args[styleIndex].length > 0 ? _args[styleIndex] : __uni__args;
+      const result = typeof style === 'function' ? style(...args) : style;
+      const {
+        variantsResult
+      } = Object.fromEntries(getVariants({
+        variantsResult: result
+      }, variants));
+      const resultWithVariants = deepMergeObjects(result, variantsResult ?? {});
+      const dependencies = extractUnistyleDependencies(resultWithVariants);
+      if (typeof __uni__stylesheet === 'function') {
+        // Add dependencies from dynamic styles to stylesheet
+        UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
+      }
+      __uni__refs.add(ref);
+      const dispose = UnistylesListener.addListeners(extractUnistyleDependencies(resultWithVariants), () => {
+        const hash = this.hashMap.get(ref);
+
+        // Dispose listener if there is no hash
+        if (!hash) {
+          dispose();
+          return;
+        }
+        const newComputedStyleSheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
+        const newValue = newComputedStyleSheet[__uni__key];
+        const result = typeof newValue === 'function' ? newValue(...args) : newValue;
         const {
           variantsResult
         } = Object.fromEntries(getVariants({
           variantsResult: result
         }, variants));
         const resultWithVariants = deepMergeObjects(result, variantsResult ?? {});
-        const dependencies = extractUnistyleDependencies(resultWithVariants);
-        if (typeof __uni__stylesheet === 'function') {
-          // Add dependencies from dynamic styles to stylesheet
-          UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies);
-        }
-        __uni__refs.add(ref);
-        const dispose = UnistylesListener.addListeners(extractUnistyleDependencies(resultWithVariants), () => {
-          const hash = this.hashMap.get(ref);
-
-          // Dispose listener if there is no hash
-          if (!hash) {
-            dispose();
-            return;
-          }
-          const newComputedStyleSheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
-          const newValue = newComputedStyleSheet[__uni__key];
-          const result = typeof newValue === 'function' ? newValue(...args) : newValue;
-          const {
-            variantsResult
-          } = Object.fromEntries(getVariants({
-            variantsResult: result
-          }, variants));
-          const resultWithVariants = deepMergeObjects(result, variantsResult ?? {});
-          UnistylesRegistry.applyStyles(hash, convertUnistyles(resultWithVariants));
-        });
-        return resultWithVariants;
+        UnistylesRegistry.applyStyles(hash, convertUnistyles(resultWithVariants));
       });
+      return resultWithVariants;
     });
     const combinedStyles = deepMergeObjects(...parsedStyles);
     const oldStyles = this.resultsMap.get(ref);

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

@@ -1 +1 @@
-{"version":3,"names":["convertUnistyles","UnistylesListener","UnistylesRegistry","deepMergeObjects","equal","extractSecrets","extractUnistyleDependencies","isInDocument","getVariants","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","Map","hashMap","classNamesMap","add","ref","styles","_variants","_args","forEach","__uni__refs","oldResult","get","delete","remove","HTMLElement","parsedStyles","flatMap","style","styleIndex","secrets","length","map","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","variants","Object","keys","args","result","variantsResult","fromEntries","resultWithVariants","dependencies","addDependenciesToStylesheet","addListeners","hash","newComputedStyleSheet","newValue","applyStyles","combinedStyles","oldStyles","oldClassNames","className","classList","set","existingHash","injectedClassNames","_web","_classNames","newClassNames","Array","isArray","concat","UnistylesShadowRegistry"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["convertUnistyles","UnistylesListener","UnistylesRegistry","deepMergeObjects","equal","extractSecrets","extractUnistyleDependencies","isInDocument","getVariants","UnistylesShadowRegistryBuilder","name","__type","equals","toString","dispose","resultsMap","Map","hashMap","classNamesMap","add","ref","styles","_variants","_args","secrets","__uni__refs","forEach","oldResult","get","delete","remove","HTMLElement","parsedStyles","flat","flatMap","unistyleStyle","styleIndex","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","style","variants","Object","keys","length","args","result","variantsResult","fromEntries","resultWithVariants","dependencies","addDependenciesToStylesheet","addListeners","hash","newComputedStyleSheet","newValue","applyStyles","combinedStyles","oldStyles","oldClassNames","className","classList","set","existingHash","injectedClassNames","_web","_classNames","newClassNames","Array","isArray","concat","UnistylesShadowRegistry"],"sourceRoot":"../../../src","sources":["web/shadowRegistry.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/web/utils/unistyle.js

@@ -15,17 +15,11 @@ export const schemeToTheme = scheme => {
 };
 export const assignSecrets = (object, secrets) => {
   // @ts-expect-error - assign secrets to object
-  object[`__uni__secrets__${Math.random().toString(16).slice(2)}`] = secrets;
+  object.__uni__secrets__ = secrets;
   return object;
 };
 export const extractSecrets = object => {
-  const secrets = Object.entries(object).reduce((acc, [key, value]) => {
-    if (key.startsWith('__uni__secrets__')) {
-      acc.push(value);
-    }
-    return acc;
-  }, []);
-  return secrets;
+  return keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ : undefined;
 };
 export const getStyles = values => {
   const returnValue = {};

package/lib/module/web/utils/unistyle.js.map

@@ -1 +1 @@
-{"version":3,"names":["ColorScheme","Orientation","isUnistylesMq","parseMq","UnistylesState","keyInObject","reduceObject","schemeToTheme","scheme","Dark","Light","assignSecrets","object","secrets","Math","random","toString","slice","extractSecrets","Object","entries","reduce","acc","key","value","startsWith","push","getStyles","values","returnValue","defineProperties","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","undefined","Number","isNaN","getMediaQuery","includes","minWidth","maxWidth","minHeight","maxHeight","filter","Boolean","join","breakpoints","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":";;AACA,SAASA,WAAW,EAAEC,WAAW,QAAQ,mBAAmB;AAE5D,SAASC,aAAa,EAAEC,OAAO,QAAQ,UAAU;AACjD,SAASC,cAAc,QAAQ,UAAU;AACzC,SAASC,WAAW,EAAEC,YAAY,QAAQ,UAAU;AAEpD,OAAO,MAAMC,aAAa,GAAIC,MAAmB,IAAK;EAClD,QAAQA,MAAM;IACV,KAAKR,WAAW,CAACS,IAAI;MACjB,OAAO,MAAM;IACjB,KAAKT,WAAW,CAACU,KAAK;IACtB;MACI,OAAO,OAAO;EACtB;AACJ,CAAC;AAUD,OAAO,MAAMC,aAAa,GAAGA,CAAIC,MAAS,EAAEC,OAAwB,KAAK;EACrE;EACAD,MAAM,CAAC,mBAAmBE,IAAI,CAACC,MAAM,CAAC,CAAC,CAACC,QAAQ,CAAC,EAAE,CAAC,CAACC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,GAAGJ,OAAO;EAE1E,OAAOD,MAAM;AACjB,CAAC;AAED,OAAO,MAAMM,cAAc,GAAIN,MAAW,IAAK;EAC3C,MAAMC,OAAO,GAAGM,MAAM,CAACC,OAAO,CAACR,MAAM,CAAC,CAACS,MAAM,CAAC,CAACC,GAAG,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IACjE,IAAID,GAAG,CAACE,UAAU,CAAC,kBAAkB,CAAC,EAAE;MACpCH,GAAG,CAACI,IAAI,CAACF,KAAwB,CAAC;IACtC;IAEA,OAAOF,GAAG;EACd,CAAC,EAAE,EAA4B,CAAC;EAEhC,OAAOT,OAAO;AAClB,CAAC;AAED,OAAO,MAAMc,SAAS,GAAIC,MAAuB,IAAK;EAClD,MAAMC,WAAW,GAAG,CAAC,CAAC;EAEtBV,MAAM,CAACW,gBAAgB,CAACD,WAAW,EAAEvB,YAAY,CAACsB,MAAM,EAAEJ,KAAK,KAAK;IAChEA,KAAK;IACLO,UAAU,EAAE,KAAK;IACjBC,YAAY,EAAE;EAClB,CAAC,CAAC,CAAC,CAAC;EAEJ,OAAOH,WAAW;AACtB,CAAC;AAED,OAAO,MAAMI,YAAY,GAAIC,OAAoB,IAAKC,QAAQ,CAACC,IAAI,CAACC,QAAQ,CAACH,OAAO,CAAC;AAErF,OAAO,MAAMI,sBAAsB,GAAIC,KAAa,IAAK;EACrD,MAAM,CAACC,CAAC,EAAEC,EAAE,CAAC,GAAGF,KAAK,CAACG,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE;EAE5C,IAAI,CAACD,EAAE,EAAE;IACL,OAAOE,SAAS;EACpB;EAEA,MAAMnB,KAAK,GAAGoB,MAAM,CAACH,EAAE,CAAC;EAExB,OAAOG,MAAM,CAACC,KAAK,CAACrB,KAAK,CAAC,GACpBmB,SAAS,GACTnB,KAAK;AACf,CAAC;AAED,OAAO,MAAMsB,aAAa,GAAIP,KAAa,IAAK;EAC5C,IAAIpB,MAAM,CAACS,MAAM,CAAC3B,WAAW,CAAC,CAAC8C,QAAQ,CAACR,KAAoB,CAAC,EAAE;IAC3D,OAAO,iBAAiBA,KAAK,GAAG;EACpC;EAEA,IAAIrC,aAAa,CAACqC,KAAK,CAAC,EAAE;IACtB,MAAM;MAAES,QAAQ;MAAEC,QAAQ;MAAEC,SAAS;MAAEC;IAAU,CAAC,GAAGhD,OAAO,CAACoC,KAAK,CAAC;IAEnE,OAAO,CACHS,QAAQ,GAAG,eAAeA,QAAQ,KAAK,GAAGL,SAAS,EACnDM,QAAQ,GAAG,eAAeA,QAAQ,KAAK,GAAGN,SAAS,EACnDO,SAAS,GAAG,gBAAgBA,SAAS,KAAK,GAAGP,SAAS,EACtDQ,SAAS,GAAG,gBAAgBA,SAAS,KAAK,GAAGR,SAAS,CACzD,CAACS,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,OAAO,CAAC;EACnC;EAEA,MAAMN,QAAQ,GAAG5C,cAAc,CAACmD,WAAW,IAAIlD,WAAW,CAACD,cAAc,CAACmD,WAAW,EAAEhB,KAAK,CAAC,GAAGnC,cAAc,CAACmD,WAAW,CAAChB,KAAK,CAAC,GAAGI,SAAS;EAE7I,OAAO,eAAeK,QAAQ,IAAI,CAAC,KAAK;AAC5C,CAAC;AAED,OAAO,MAAMQ,2BAA2B,GAAIhC,KAAU,IAAK;EACvD,IAAI,CAACA,KAAK,EAAE;IACR,OAAO,EAAE;EACb;EAEA,MAAMiC,YAAuC,GAAGpD,WAAW,CAACmB,KAAK,EAAE,mBAAmB,CAAC,GAAGA,KAAK,CAACkC,iBAAiB,GAAG,EAAE;EAEtH,OAAOC,KAAK,CAACC,OAAO,CAACH,YAAY,CAAC,GAAGA,YAAY,GAAG,EAAE;AAC1D,CAAC","ignoreList":[]}
+{"version":3,"names":["ColorScheme","Orientation","isUnistylesMq","parseMq","UnistylesState","keyInObject","reduceObject","schemeToTheme","scheme","Dark","Light","assignSecrets","object","secrets","__uni__secrets__","extractSecrets","undefined","getStyles","values","returnValue","Object","defineProperties","value","enumerable","configurable","isInDocument","element","document","body","contains","extractMediaQueryValue","query","_","px","match","Number","isNaN","getMediaQuery","includes","minWidth","maxWidth","minHeight","maxHeight","filter","Boolean","join","breakpoints","extractUnistyleDependencies","dependencies","uni__dependencies","Array","isArray"],"sourceRoot":"../../../../src","sources":["web/utils/unistyle.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/web/shadowRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQ/C,KAAK,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAA;AAEzE,cAAM,8BAA8B;IAEhC,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAwC;IAE7D,GAAG,QAAS,GAAG,UAAU,KAAK,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,0BAoH1G;IAED,MAAM,aAAW;CACpB;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}
+{"version":3,"file":"shadowRegistry.d.ts","sourceRoot":"","sources":["../../../../src/web/shadowRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAQ/C,KAAK,KAAK,GAAG,eAAe,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,eAAe,CAAC,CAAA;AAEzE,cAAM,8BAA8B;IAEhC,IAAI,SAA4B;IAChC,MAAM,SAAQ;IACd,MAAM,gBAAa;IACnB,QAAQ,eAAkC;IAC1C,OAAO,aAAW;IAGlB,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,aAAa,CAAwC;IAE7D,GAAG,QAAS,GAAG,UAAU,KAAK,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,SAAS,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,0BAwH1G;IAED,MAAM,aAAW;CACpB;AAED,eAAO,MAAM,uBAAuB,gCAAuC,CAAA"}

package/lib/typescript/src/web/utils/unistyle.d.ts

@@ -10,7 +10,7 @@ export type UnistyleSecrets = {
     __uni__args?: Array<any>;
 };
 export declare const assignSecrets: <T>(object: T, secrets: UnistyleSecrets) => T;
-export declare const extractSecrets: (object: any) => UnistyleSecrets[];
+export declare const extractSecrets: (object: any) => UnistyleSecrets | undefined;
 export declare const getStyles: (values: UnistylesValues) => {};
 export declare const isInDocument: (element: HTMLElement) => boolean;
 export declare const extractMediaQueryValue: (query: string) => number | undefined;

package/lib/typescript/src/web/utils/unistyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unistyle.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/unistyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAe,MAAM,mBAAmB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKpG,eAAO,MAAM,aAAa,WAAY,WAAW,qBAQhD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,iBAAiB,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,UAAU,CAAC,WAAW,eAAe,MAKnE,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,sBAUzC,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,eAAe,OAUhD,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,WAAW,YAAoC,CAAA;AAErF,eAAO,MAAM,sBAAsB,UAAW,MAAM,uBAYnD,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAmB1C,CAAA;AAED,eAAO,MAAM,2BAA2B,UAAW,GAAG,yBAQrD,CAAA"}
+{"version":3,"file":"unistyle.d.ts","sourceRoot":"","sources":["../../../../../src/web/utils/unistyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAe,MAAM,mBAAmB,CAAA;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAKpG,eAAO,MAAM,aAAa,WAAY,WAAW,qBAQhD,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,iBAAiB,EAAE,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;IAC7B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACpC,WAAW,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,UAAU,CAAC,WAAW,eAAe,MAKnE,CAAA;AAED,eAAO,MAAM,cAAc,WAAY,GAAG,gCAEzC,CAAA;AAED,eAAO,MAAM,SAAS,WAAY,eAAe,OAUhD,CAAA;AAED,eAAO,MAAM,YAAY,YAAa,WAAW,YAAoC,CAAA;AAErF,eAAO,MAAM,sBAAsB,UAAW,MAAM,uBAYnD,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,WAmB1C,CAAA;AAED,eAAO,MAAM,2BAA2B,UAAW,GAAG,yBAQrD,CAAA"}

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::unistyles {
     [[maybe_unused]]
     ColorScheme toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<ColorScheme>(ordinal);
     }

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::unistyles {
     [[maybe_unused]]
     Orientation toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<Orientation>(ordinal);
     }

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

@@ -28,7 +28,7 @@ namespace margelo::nitro::unistyles {
     [[maybe_unused]]
     UnistyleDependency toCpp() const {
       static const auto clazz = javaClassStatic();
-      static const auto fieldOrdinal = clazz->getField<int>("ordinal");
+      static const auto fieldOrdinal = clazz->getField<int>("_ordinal");
       int ordinal = this->getFieldValue(fieldOrdinal);
       return static_cast<UnistyleDependency>(ordinal);
     }

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

@@ -18,5 +18,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 enum class ColorScheme {
   DARK,
   LIGHT,
-  UNSPECIFIED
+  UNSPECIFIED;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

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

@@ -17,5 +17,9 @@ import com.facebook.proguard.annotations.DoNotStrip
 @Keep
 enum class Orientation {
   PORTRAIT,
-  LANDSCAPE
+  LANDSCAPE;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

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

@@ -30,5 +30,9 @@ enum class UnistyleDependency {
   FONTSCALE,
   STATUSBAR,
   NAVIGATIONBAR,
-  IME
+  IME;
+
+  @DoNotStrip
+  @Keep
+  private val _ordinal = ordinal
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.44",
+  "version": "3.0.0-alpha.45",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",
@@ -69,11 +69,11 @@
     "husky": "9.1.7",
     "jest": "29.7.0",
     "metro-react-native-babel-preset": "0.77.0",
-    "nitro-codegen": "0.17.0",
+    "nitro-codegen": "0.18.0",
     "react": "18.3.1",
     "react-native": "0.76.3",
     "react-native-builder-bob": "0.33.1",
-    "react-native-nitro-modules": "0.17.0",
+    "react-native-nitro-modules": "0.18.0",
     "react-native-web": "0.19.13",
     "react-test-renderer": "18.3.1",
     "release-it": "17.6.0",

package/src/web/shadowRegistry.ts

@@ -29,8 +29,10 @@ class UnistylesShadowRegistryBuilder {
 
         // Ref is unmounted, remove style tags from the document
         if (ref === null) {
-            extractSecrets(styles).forEach(({ __uni__refs }) => {
-                __uni__refs.forEach(ref => {
+            const secrets = extractSecrets(styles)
+
+            if (secrets) {
+                secrets.__uni__refs.forEach(ref => {
                     if (isInDocument(ref)) {
                         return
                     }
@@ -43,7 +45,7 @@ class UnistylesShadowRegistryBuilder {
                         UnistylesRegistry.remove(oldResult)
                     }
                 })
-            })
+            }
 
             return
         }
@@ -53,16 +55,19 @@ class UnistylesShadowRegistryBuilder {
             return
         }
 
-        const parsedStyles = styles.flatMap((style, styleIndex) => {
-            const secrets = extractSecrets(style)
+        const parsedStyles = styles.flat().flatMap((unistyleStyle, styleIndex) => {
+            if (!unistyleStyle) {
+                return []
+            }
+
+            const secrets = extractSecrets(unistyleStyle)
 
             // Regular style
-            if (secrets.length === 0) {
-                return style as UnistylesValues
+            if (!secrets) {
+                return unistyleStyle as UnistylesValues
             }
 
-            return secrets.map(secret => {
-                const { __uni__key, __uni__stylesheet, __uni__variants, __uni__args = [], __uni__refs } = secret
+            const { __uni__key, __uni__stylesheet, __uni__variants, __uni__args = [], __uni__refs } = secrets
                 const newComputedStylesheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet)
                 const style = newComputedStylesheet[__uni__key] as (UnistylesValues | ((...args: any) => UnistylesValues))
                 const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants
@@ -73,7 +78,7 @@ class UnistylesShadowRegistryBuilder {
                 const { variantsResult } = Object.fromEntries(getVariants({ variantsResult: result }, variants))
                 const resultWithVariants = deepMergeObjects(result, variantsResult ?? {})
                 const dependencies = extractUnistyleDependencies(resultWithVariants)
-    
+
                 if (typeof __uni__stylesheet === 'function') {
                     // Add dependencies from dynamic styles to stylesheet
                     UnistylesRegistry.addDependenciesToStylesheet(__uni__stylesheet, dependencies)
@@ -103,7 +108,6 @@ class UnistylesShadowRegistryBuilder {
                 })
 
                 return resultWithVariants as UnistylesValues
-            })
         })
         const combinedStyles = deepMergeObjects(...parsedStyles)
         const oldStyles = this.resultsMap.get(ref)

package/src/web/utils/unistyle.ts

@@ -25,21 +25,13 @@ export type UnistyleSecrets = {
 
 export const assignSecrets = <T>(object: T, secrets: UnistyleSecrets) => {
     // @ts-expect-error - assign secrets to object
-    object[`__uni__secrets__${Math.random().toString(16).slice(2)}`] = secrets
+    object.__uni__secrets__ = secrets
 
     return object
 }
 
 export const extractSecrets = (object: any) => {
-    const secrets = Object.entries(object).reduce((acc, [key, value]) => {
-        if (key.startsWith('__uni__secrets__')) {
-            acc.push(value as UnistyleSecrets)
-        }
-
-        return acc
-    }, [] as Array<UnistyleSecrets>)
-
-    return secrets
+    return keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ as UnistyleSecrets : undefined
 }
 
 export const getStyles = (values: UnistylesValues) => {