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

package/lib/commonjs/components/Pressable.js

@@ -34,15 +34,12 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
         passedRef.current = ref;
       }
       const returnFn = typeof passedRef === 'function' ? passedRef(ref) : () => {};
-      const unistyles = (rawStyle ?? []).map((style, index) => {
-        if (fnArgs[index]) {
-          return style;
-        }
-        return undefined;
-      }).filter(Boolean);
+      const unistyles = typeof rawStyle === 'function' ? rawStyle({
+        pressed: false
+      }) : rawStyle ?? [];
 
       // @ts-expect-error - this is hidden from TS
-      _specs.UnistylesShadowRegistry.add(ref, unistyles, variants, [...fnArgs]);
+      _specs.UnistylesShadowRegistry.add(ref, unistyles, variants, Array.isArray(styleResult) ? fnArgs : [fnArgs]);
       return () => {
         // @ts-expect-error - this is hidden from TS
         _specs.UnistylesShadowRegistry.remove(ref);
@@ -59,17 +56,12 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
       // @ts-expect-error - this is hidden from TS
       .map(style => typeof style === 'function' ? style.getBoundArgs() : []) : [];
       const pressId = (0, _core.getId)();
-      const unistyles = (rawStyle ?? []).map((style, index) => {
-        if (fnArgs[index]) {
-          return style;
-        }
-        return undefined;
-      }).filter(Boolean);
+      const unistyles = typeof rawStyle === 'function' ? rawStyle(state) : rawStyle ?? [];
       if (storedRef.current) {
         // @ts-expect-error - this is hidden from TS
         _specs.UnistylesShadowRegistry.remove(storedRef.current);
         // @ts-expect-error - this is hidden from TS
-        _specs.UnistylesShadowRegistry.add(storedRef.current, unistyles, variants, [...fnArgs], pressId);
+        _specs.UnistylesShadowRegistry.add(storedRef.current, unistyles, variants, Array.isArray(styleResult) ? fnArgs : [fnArgs], pressId);
       }
       return typeof styleResult === 'function'
       // @ts-expect-error - this is hidden from TS

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

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_specs","_core","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Pressable","exports","forwardRef","variants","style","rawStyle","props","passedRef","storedRef","useRef","jsx","ref","current","styleResult","pressed","fnArgs","getBoundArgs","Array","isArray","map","returnFn","unistyles","index","undefined","filter","Boolean","UnistylesShadowRegistry","add","remove","state","pressId","getId"],"sourceRoot":"../../../src","sources":["components/Pressable.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAA+B,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAK,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,SAAAP,wBAAAO,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;AAOxB,MAAMW,SAAS,GAAAC,OAAA,CAAAD,SAAA,gBAAG,IAAAE,iBAAU,EAAuB,CAAC;EAAEC,QAAQ;EAAEC,KAAK;EAAEC,QAAQ;EAAE,GAAGC;AAAM,CAAC,EAAEC,SAAS,KAAK;EAC9G,MAAMC,SAAS,GAAG,IAAAC,aAAM,EAAc,CAAC;EAEvC,oBACI,IAAA9B,WAAA,CAAA+B,GAAA,EAAClC,YAAA,CAAAwB,SAA0B;IAAA,GACnBM,KAAK;IACTK,GAAG,EAAEA,GAAG,IAAI;MACRH,SAAS,CAACI,OAAO,GAAGD,GAAG;MACvB,MAAME,WAAW,GAAG,OAAOT,KAAK,KAAK,UAAU,GACzCA,KAAK,CAAC;QAAEU,OAAO,EAAE;MAAM,CAAC,CAAC,GACzBV,KAAK;MACX,MAAMW,MAAM,GAAG,OAAOF,WAAW,KAAK;MAClC;MAAA,EACEA,WAAW,CAACG,YAAY,CAAC,CAAC,GAC1BC,KAAK,CAACC,OAAO,CAACL,WAAW,CAAC,GACtBA;MACE;MAAA,CACCM,GAAG,CAACf,KAAK,IAAI,OAAOA,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACY,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,GACxE,EAAE;MAEZ,IAAI,OAAOT,SAAS,KAAK,QAAQ,IAAIA,SAAS,KAAK,IAAI,EAAE;QACrDA,SAAS,CAACK,OAAO,GAAGD,GAAG;MAC3B;MAEA,MAAMS,QAAQ,GAAG,OAAOb,SAAS,KAAK,UAAU,GAC1CA,SAAS,CAACI,GAAG,CAAC,GACd,MAAM,CAAC,CAAC;MACd,MAAMU,SAAS,GAAG,CAAChB,QAAQ,IAAI,EAAE,EAC5Bc,GAAG,CAAC,CAACf,KAAK,EAAEkB,KAAK,KAAK;QACnB,IAAIP,MAAM,CAACO,KAAK,CAAC,EAAE;UACf,OAAOlB,KAAK;QAChB;QAEA,OAAOmB,SAAS;MACpB,CAAC,CAAC,CACDC,MAAM,CAACC,OAAO,CAAC;;MAEpB;MACAC,8BAAuB,CAACC,GAAG,CAAChB,GAAG,EAAEU,SAAS,EAAElB,QAAQ,EAAE,CAAC,GAAGY,MAAM,CAAC,CAAC;MAElE,OAAO,MAAM;QACT;QACAW,8BAAuB,CAACE,MAAM,CAACjB,GAAG,CAAC;QAEnC,IAAI,OAAOS,QAAQ,KAAK,UAAU,EAAE;UAChCA,QAAQ,CAAC,CAAC;QACd;MACJ,CAAC;IACL,CAAE;IACFhB,KAAK,EAAEyB,KAAK,IAAI;MACZ,MAAMhB,WAAW,GAAG,OAAOT,KAAK,KAAK,UAAU,GACzCA,KAAK,CAACyB,KAAK,CAAC,GACZzB,KAAK;MACX,MAAMW,MAAM,GAAG,OAAOF,WAAW,KAAK;MAClC;MAAA,EACEA,WAAW,CAACG,YAAY,CAAC,CAAC,GAC1BC,KAAK,CAACC,OAAO,CAACL,WAAW,CAAC,GACtBA;MACE;MAAA,CACCM,GAAG,CAACf,KAAK,IAAI,OAAOA,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACY,YAAY,CAAC,CAAC,GAAG,EAAE,CAAC,GACxE,EAAE;MACZ,MAAMc,OAAO,GAAG,IAAAC,WAAK,EAAC,CAAC;MACvB,MAAMV,SAAS,GAAG,CAAChB,QAAQ,IAAI,EAAE,EAC5Bc,GAAG,CAAC,CAACf,KAAK,EAAEkB,KAAK,KAAK;QACnB,IAAIP,MAAM,CAACO,KAAK,CAAC,EAAE;UACf,OAAOlB,KAAK;QAChB;QAEA,OAAOmB,SAAS;MACpB,CAAC,CAAC,CACDC,MAAM,CAACC,OAAO,CAAC;MAEpB,IAAIjB,SAAS,CAACI,OAAO,EAAE;QACnB;QACAc,8BAAuB,CAACE,MAAM,CAACpB,SAAS,CAACI,OAAO,CAAC;QACjD;QACAc,8BAAuB,CAACC,GAAG,CAACnB,SAAS,CAACI,OAAO,EAAES,SAAS,EAAElB,QAAQ,EAAE,CAAC,GAAGY,MAAM,CAAC,EAAEe,OAAO,CAAC;MAC7F;MAEA,OAAO,OAAOjB,WAAW,KAAK;MAC1B;MAAA,EACEA,WAAW,CAACiB,OAAO,CAAC,GACpBb,KAAK,CAACC,OAAO,CAACL,WAAW;MACvB;MAAA,EACEA,WAAW,CAACM,GAAG,CAACf,KAAK,IAAI,OAAOA,KAAK,KAAK,UAAU,GAAGA,KAAK,CAAC0B,OAAO,CAAC,GAAG1B,KAAK,CAAC,GAC9ES,WAAW;IACzB;EAAE,CACL,CAAC;AAEV,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_specs","_core","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Pressable","exports","forwardRef","variants","style","rawStyle","props","passedRef","storedRef","useRef","jsx","ref","current","styleResult","pressed","fnArgs","getBoundArgs","Array","isArray","map","returnFn","unistyles","UnistylesShadowRegistry","add","remove","state","pressId","getId"],"sourceRoot":"../../../src","sources":["components/Pressable.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/Pressable.web.js

@@ -35,12 +35,34 @@ const events = {
     focused: false
   }
 };
+const isFunctionWithBoundArgs = fn => {
+  return typeof fn === 'function' && 'getBoundArgs' in fn;
+};
+const extractFunctionArgs = styleResult => {
+  return isFunctionWithBoundArgs(styleResult) ? [styleResult.getBoundArgs()] : Array.isArray(styleResult) ? styleResult.map(style => isFunctionWithBoundArgs(style) ? style.getBoundArgs() : []) : [];
+};
+const extractStyleResult = style => {
+  return typeof style === 'function' ? [style()] : Array.isArray(style) ? style.map(style => typeof style === 'function' ? style() : style) : [style];
+};
+const updateStyles = ({
+  ref,
+  style,
+  variants,
+  state
+}) => {
+  const styleResult = typeof style === 'function' ? style(state) : style;
+  const fnArgs = extractFunctionArgs(styleResult);
+  const extractedResult = extractStyleResult(styleResult);
+
+  // @ts-expect-error - this is hidden from TS
+  _specs.UnistylesShadowRegistry.add(ref, extractedResult, variants, fnArgs);
+};
 const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
   variants,
   style,
   ...props
 }, passedRef) => {
-  const storedRef = (0, _react.useRef)();
+  const storedRef = (0, _react.useRef)(null);
   const state = (0, _react.useRef)(initialState);
   const styleRef = (0, _react.useRef)(style);
   (0, _react.useEffect)(() => {
@@ -52,14 +74,12 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
         ...state.current,
         ...newState
       };
-      const styleResult = typeof styleRef.current === 'function' ? styleRef.current(state.current) : styleRef.current;
-      const fnArgs = typeof styleResult === 'function'
-      // @ts-expect-error - this is hidden from TS
-      ? styleResult.getBoundArgs() : [];
-      const extractedResult = typeof styleResult === 'function' ? styleResult() : styleResult;
-
-      // @ts-expect-error - this is hidden from TS
-      _specs.UnistylesShadowRegistry.add(storedRef.current, [extractedResult], variants, [fnArgs]);
+      updateStyles({
+        ref: storedRef.current,
+        style: styleRef.current,
+        variants,
+        state: state.current
+      });
     };
     if (!storedRef.current) {
       return;
@@ -80,17 +100,15 @@ const Pressable = exports.Pressable = /*#__PURE__*/(0, _react.forwardRef)(({
     ...props,
     ref: ref => {
       storedRef.current = ref;
-      const styleResult = typeof style === 'function' ? style(initialState) : style;
-      const fnArgs = typeof styleResult === 'function'
-      // @ts-expect-error - this is hidden from TS
-      ? styleResult.getBoundArgs() : [];
-      const extractedResult = typeof styleResult === 'function' ? styleResult() : styleResult;
+      updateStyles({
+        ref,
+        style: style,
+        variants,
+        state: initialState
+      });
       if (typeof passedRef === 'object' && passedRef !== null) {
         passedRef.current = ref;
       }
-
-      // @ts-expect-error - this is hidden from TS
-      _specs.UnistylesShadowRegistry.add(ref, [extractedResult], variants, [fnArgs]);
     }
   });
 });

package/lib/commonjs/components/Pressable.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","initialState","pressed","hovered","focused","events","Pressable","exports","forwardRef","variants","style","props","passedRef","storedRef","useRef","state","styleRef","useEffect","current","handler","newState","styleResult","fnArgs","getBoundArgs","extractedResult","UnistylesShadowRegistry","add","ref","entries","forEach","event","addEventListener","removeEventListener","jsx"],"sourceRoot":"../../../src","sources":["components/Pressable.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_specs","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","initialState","pressed","hovered","focused","events","isFunctionWithBoundArgs","fn","extractFunctionArgs","styleResult","getBoundArgs","Array","isArray","map","style","extractStyleResult","updateStyles","ref","variants","state","fnArgs","extractedResult","UnistylesShadowRegistry","add","Pressable","exports","forwardRef","props","passedRef","storedRef","useRef","styleRef","useEffect","current","handler","newState","entries","forEach","event","addEventListener","removeEventListener","jsx"],"sourceRoot":"../../../src","sources":["components/Pressable.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/web/shadowRegistry.js

@@ -22,19 +22,17 @@ class UnistylesShadowRegistryBuilder {
   resultsMap = new Map();
   hashMap = new Map();
   classNamesMap = new Map();
-  add = (ref, _style, _variants, _args) => {
-    // Style is not provided
-    if (!_style) {
+  add = (ref, styles, _variants, _args) => {
+    // Styles are not provided
+    if (!styles) {
       return;
     }
 
     // Ref is unmounted, remove style tags from the document
     if (ref === null) {
-      const secrets = (0, _utils2.extractSecrets)(_style);
-      secrets.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;
           }
@@ -45,7 +43,7 @@ class UnistylesShadowRegistryBuilder {
             _registry.UnistylesRegistry.remove(oldResult);
           }
         });
-      });
+      }
       return;
     }
 
@@ -53,20 +51,23 @@ class UnistylesShadowRegistryBuilder {
     if (!(ref instanceof HTMLElement)) {
       return;
     }
-    const styles = _style.filter(style => Object.keys(style ?? {}).some(key => key.startsWith('__uni__')));
+    const parsedStyles = styles.flat().flatMap((unistyleStyle, styleIndex) => {
+      if (!unistyleStyle) {
+        return [];
+      }
+      const secrets = (0, _utils2.extractSecrets)(unistyleStyle);
 
-    // No unistyles
-    if (styles.length === 0) {
-      return;
-    }
-    const parsedStyles = styles.flatMap((style, styleIndex) => (0, _utils2.extractSecrets)(style).map(secret => {
+      // Regular style
+      if (!secrets) {
+        return unistyleStyle;
+      }
       const {
         __uni__key,
         __uni__stylesheet,
         __uni__variants,
         __uni__args = [],
         __uni__refs
-      } = secret;
+      } = secrets;
       const newComputedStylesheet = _registry.UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
       const style = newComputedStylesheet[__uni__key];
       const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
@@ -104,7 +105,7 @@ class UnistylesShadowRegistryBuilder {
         _registry.UnistylesRegistry.applyStyles(hash, (0, _convert.convertUnistyles)(resultWithVariants));
       });
       return resultWithVariants;
-    }));
+    });
     const combinedStyles = (0, _utils.deepMergeObjects)(...parsedStyles);
     const oldStyles = this.resultsMap.get(ref);
     if ((0, _utils2.equal)(combinedStyles, oldStyles)) {

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","_style","_variants","_args","secrets","extractSecrets","forEach","__uni__refs","isInDocument","oldResult","get","delete","UnistylesRegistry","remove","HTMLElement","styles","filter","style","Object","keys","some","key","startsWith","length","parsedStyles","flatMap","styleIndex","map","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","variants","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/components/Pressable.js

@@ -28,15 +28,12 @@ export const Pressable = /*#__PURE__*/forwardRef(({
         passedRef.current = ref;
       }
       const returnFn = typeof passedRef === 'function' ? passedRef(ref) : () => {};
-      const unistyles = (rawStyle ?? []).map((style, index) => {
-        if (fnArgs[index]) {
-          return style;
-        }
-        return undefined;
-      }).filter(Boolean);
+      const unistyles = typeof rawStyle === 'function' ? rawStyle({
+        pressed: false
+      }) : rawStyle ?? [];
 
       // @ts-expect-error - this is hidden from TS
-      UnistylesShadowRegistry.add(ref, unistyles, variants, [...fnArgs]);
+      UnistylesShadowRegistry.add(ref, unistyles, variants, Array.isArray(styleResult) ? fnArgs : [fnArgs]);
       return () => {
         // @ts-expect-error - this is hidden from TS
         UnistylesShadowRegistry.remove(ref);
@@ -53,17 +50,12 @@ export const Pressable = /*#__PURE__*/forwardRef(({
       // @ts-expect-error - this is hidden from TS
       .map(style => typeof style === 'function' ? style.getBoundArgs() : []) : [];
       const pressId = getId();
-      const unistyles = (rawStyle ?? []).map((style, index) => {
-        if (fnArgs[index]) {
-          return style;
-        }
-        return undefined;
-      }).filter(Boolean);
+      const unistyles = typeof rawStyle === 'function' ? rawStyle(state) : rawStyle ?? [];
       if (storedRef.current) {
         // @ts-expect-error - this is hidden from TS
         UnistylesShadowRegistry.remove(storedRef.current);
         // @ts-expect-error - this is hidden from TS
-        UnistylesShadowRegistry.add(storedRef.current, unistyles, variants, [...fnArgs], pressId);
+        UnistylesShadowRegistry.add(storedRef.current, unistyles, variants, Array.isArray(styleResult) ? fnArgs : [fnArgs], pressId);
       }
       return typeof styleResult === 'function'
       // @ts-expect-error - this is hidden from TS

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

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useRef","Pressable","NativePressableReactNative","UnistylesShadowRegistry","getId","jsx","_jsx","variants","style","rawStyle","props","passedRef","storedRef","ref","current","styleResult","pressed","fnArgs","getBoundArgs","Array","isArray","map","returnFn","unistyles","index","undefined","filter","Boolean","add","remove","state","pressId"],"sourceRoot":"../../../src","sources":["components/Pressable.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useRef","Pressable","NativePressableReactNative","UnistylesShadowRegistry","getId","jsx","_jsx","variants","style","rawStyle","props","passedRef","storedRef","ref","current","styleResult","pressed","fnArgs","getBoundArgs","Array","isArray","map","returnFn","unistyles","add","remove","state","pressId"],"sourceRoot":"../../../src","sources":["components/Pressable.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -29,12 +29,34 @@ const events = {
     focused: false
   }
 };
+const isFunctionWithBoundArgs = fn => {
+  return typeof fn === 'function' && 'getBoundArgs' in fn;
+};
+const extractFunctionArgs = styleResult => {
+  return isFunctionWithBoundArgs(styleResult) ? [styleResult.getBoundArgs()] : Array.isArray(styleResult) ? styleResult.map(style => isFunctionWithBoundArgs(style) ? style.getBoundArgs() : []) : [];
+};
+const extractStyleResult = style => {
+  return typeof style === 'function' ? [style()] : Array.isArray(style) ? style.map(style => typeof style === 'function' ? style() : style) : [style];
+};
+const updateStyles = ({
+  ref,
+  style,
+  variants,
+  state
+}) => {
+  const styleResult = typeof style === 'function' ? style(state) : style;
+  const fnArgs = extractFunctionArgs(styleResult);
+  const extractedResult = extractStyleResult(styleResult);
+
+  // @ts-expect-error - this is hidden from TS
+  UnistylesShadowRegistry.add(ref, extractedResult, variants, fnArgs);
+};
 export const Pressable = /*#__PURE__*/forwardRef(({
   variants,
   style,
   ...props
 }, passedRef) => {
-  const storedRef = useRef();
+  const storedRef = useRef(null);
   const state = useRef(initialState);
   const styleRef = useRef(style);
   useEffect(() => {
@@ -46,14 +68,12 @@ export const Pressable = /*#__PURE__*/forwardRef(({
         ...state.current,
         ...newState
       };
-      const styleResult = typeof styleRef.current === 'function' ? styleRef.current(state.current) : styleRef.current;
-      const fnArgs = typeof styleResult === 'function'
-      // @ts-expect-error - this is hidden from TS
-      ? styleResult.getBoundArgs() : [];
-      const extractedResult = typeof styleResult === 'function' ? styleResult() : styleResult;
-
-      // @ts-expect-error - this is hidden from TS
-      UnistylesShadowRegistry.add(storedRef.current, [extractedResult], variants, [fnArgs]);
+      updateStyles({
+        ref: storedRef.current,
+        style: styleRef.current,
+        variants,
+        state: state.current
+      });
     };
     if (!storedRef.current) {
       return;
@@ -74,17 +94,15 @@ export const Pressable = /*#__PURE__*/forwardRef(({
     ...props,
     ref: ref => {
       storedRef.current = ref;
-      const styleResult = typeof style === 'function' ? style(initialState) : style;
-      const fnArgs = typeof styleResult === 'function'
-      // @ts-expect-error - this is hidden from TS
-      ? styleResult.getBoundArgs() : [];
-      const extractedResult = typeof styleResult === 'function' ? styleResult() : styleResult;
+      updateStyles({
+        ref,
+        style: style,
+        variants,
+        state: initialState
+      });
       if (typeof passedRef === 'object' && passedRef !== null) {
         passedRef.current = ref;
       }
-
-      // @ts-expect-error - this is hidden from TS
-      UnistylesShadowRegistry.add(ref, [extractedResult], variants, [fnArgs]);
     }
   });
 });

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

@@ -1 +1 @@
-{"version":3,"names":["React","forwardRef","useEffect","useRef","Pressable","NativePressableReactNative","UnistylesShadowRegistry","jsx","_jsx","initialState","pressed","hovered","focused","events","variants","style","props","passedRef","storedRef","state","styleRef","current","handler","newState","styleResult","fnArgs","getBoundArgs","extractedResult","add","ref","Object","entries","forEach","event","addEventListener","removeEventListener"],"sourceRoot":"../../../src","sources":["components/Pressable.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","useEffect","useRef","Pressable","NativePressableReactNative","UnistylesShadowRegistry","jsx","_jsx","initialState","pressed","hovered","focused","events","isFunctionWithBoundArgs","fn","extractFunctionArgs","styleResult","getBoundArgs","Array","isArray","map","style","extractStyleResult","updateStyles","ref","variants","state","fnArgs","extractedResult","add","props","passedRef","storedRef","styleRef","current","handler","newState","Object","entries","forEach","event","addEventListener","removeEventListener"],"sourceRoot":"../../../src","sources":["components/Pressable.web.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/web/shadowRegistry.js

@@ -18,19 +18,17 @@ class UnistylesShadowRegistryBuilder {
   resultsMap = new Map();
   hashMap = new Map();
   classNamesMap = new Map();
-  add = (ref, _style, _variants, _args) => {
-    // Style is not provided
-    if (!_style) {
+  add = (ref, styles, _variants, _args) => {
+    // Styles are not provided
+    if (!styles) {
       return;
     }
 
     // Ref is unmounted, remove style tags from the document
     if (ref === null) {
-      const secrets = extractSecrets(_style);
-      secrets.forEach(({
-        __uni__refs
-      }) => {
-        __uni__refs.forEach(ref => {
+      const secrets = extractSecrets(styles);
+      if (secrets) {
+        secrets.__uni__refs.forEach(ref => {
           if (isInDocument(ref)) {
             return;
           }
@@ -41,7 +39,7 @@ class UnistylesShadowRegistryBuilder {
             UnistylesRegistry.remove(oldResult);
           }
         });
-      });
+      }
       return;
     }
 
@@ -49,20 +47,23 @@ class UnistylesShadowRegistryBuilder {
     if (!(ref instanceof HTMLElement)) {
       return;
     }
-    const styles = _style.filter(style => Object.keys(style ?? {}).some(key => key.startsWith('__uni__')));
+    const parsedStyles = styles.flat().flatMap((unistyleStyle, styleIndex) => {
+      if (!unistyleStyle) {
+        return [];
+      }
+      const secrets = extractSecrets(unistyleStyle);
 
-    // No unistyles
-    if (styles.length === 0) {
-      return;
-    }
-    const parsedStyles = styles.flatMap((style, styleIndex) => extractSecrets(style).map(secret => {
+      // Regular style
+      if (!secrets) {
+        return unistyleStyle;
+      }
       const {
         __uni__key,
         __uni__stylesheet,
         __uni__variants,
         __uni__args = [],
         __uni__refs
-      } = secret;
+      } = secrets;
       const newComputedStylesheet = UnistylesRegistry.getComputedStylesheet(__uni__stylesheet);
       const style = newComputedStylesheet[__uni__key];
       const variants = _variants && Object.keys(_variants).length > 0 ? _variants : __uni__variants;
@@ -100,7 +101,7 @@ class UnistylesShadowRegistryBuilder {
         UnistylesRegistry.applyStyles(hash, convertUnistyles(resultWithVariants));
       });
       return resultWithVariants;
-    }));
+    });
     const combinedStyles = deepMergeObjects(...parsedStyles);
     const oldStyles = this.resultsMap.get(ref);
     if (equal(combinedStyles, oldStyles)) {

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","_style","_variants","_args","secrets","forEach","__uni__refs","oldResult","get","delete","remove","HTMLElement","styles","filter","style","Object","keys","some","key","startsWith","length","parsedStyles","flatMap","styleIndex","map","secret","__uni__key","__uni__stylesheet","__uni__variants","__uni__args","newComputedStylesheet","getComputedStylesheet","variants","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":";;AACA,SAASA,gBAAgB,QAAQ,WAAW;AAC5C,SAASC,iBAAiB,QAAQ,YAAY;AAC9C,SAASC,iBAAiB,QAAQ,YAAY;AAC9C,SAASC,gBAAgB,QAAQ,UAAU;AAC3C,SAASC,KAAK,EAAEC,cAAc,EAAEC,2BAA2B,EAAEC,YAAY,QAAQ,SAAS;AAC1F,SAASC,WAAW,QAAQ,YAAY;AAIxC,MAAMC,8BAA8B,CAAC;EACjC;EACAC,IAAI,GAAG,yBAAyB;EAChCC,MAAM,GAAG,KAAK;EACdC,MAAM,GAAGA,CAAA,KAAM,IAAI;EACnBC,QAAQ,GAAGA,CAAA,KAAM,yBAAyB;EAC1CC,OAAO,GAAGA,CAAA,KAAM,CAAC,CAAC;EAClB;;EAEQC,UAAU,GAAG,IAAIC,GAAG,CAA+B,CAAC;EACpDC,OAAO,GAAG,IAAID,GAAG,CAAsB,CAAC;EACxCE,aAAa,GAAG,IAAIF,GAAG,CAA6B,CAAC;EAE7DG,GAAG,GAAGA,CAACC,GAAQ,EAAEC,MAAoB,EAAEC,SAA0C,EAAEC,KAAwB,KAAK;IAC5G;IACA,IAAI,CAACF,MAAM,EAAE;MACT;IACJ;;IAEA;IACA,IAAID,GAAG,KAAK,IAAI,EAAE;MACd,MAAMI,OAAO,GAAGnB,cAAc,CAACgB,MAAM,CAAC;MAEtCG,OAAO,CAACC,OAAO,CAAC,CAAC;QAAEC;MAAY,CAAC,KAAK;QACjCA,WAAW,CAACD,OAAO,CAACL,GAAG,IAAI;UACvB,IAAIb,YAAY,CAACa,GAAG,CAAC,EAAE;YACnB;UACJ;UAEA,MAAMO,SAAS,GAAG,IAAI,CAACZ,UAAU,CAACa,GAAG,CAACR,GAAG,CAAC;UAC1C,IAAI,CAACL,UAAU,CAACc,MAAM,CAACT,GAAG,CAAC;UAC3B,IAAI,CAACF,aAAa,CAACW,MAAM,CAACT,GAAG,CAAC;UAE9B,IAAIO,SAAS,EAAE;YACXzB,iBAAiB,CAAC4B,MAAM,CAACH,SAAS,CAAC;UACvC;QACJ,CAAC,CAAC;MACN,CAAC,CAAC;MAEF;IACJ;;IAEA;IACA,IAAI,EAAEP,GAAG,YAAYW,WAAW,CAAC,EAAE;MAC/B;IACJ;IAEA,MAAMC,MAAM,GAAGX,MAAM,CAACY,MAAM,CAACC,KAAK,IAAIC,MAAM,CAACC,IAAI,CAACF,KAAK,IAAI,CAAC,CAAC,CAAC,CAACG,IAAI,CAACC,GAAG,IAAIA,GAAG,CAACC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;;IAEtG;IACA,IAAIP,MAAM,CAACQ,MAAM,KAAK,CAAC,EAAE;MACrB;IACJ;IAEA,MAAMC,YAAY,GAAGT,MAAM,CAACU,OAAO,CAAC,CAACR,KAAK,EAAES,UAAU,KAAKtC,cAAc,CAAC6B,KAAK,CAAC,CAACU,GAAG,CAACC,MAAM,IAAI;MAC3F,MAAM;QAAEC,UAAU;QAAEC,iBAAiB;QAAEC,eAAe;QAAEC,WAAW,GAAG,EAAE;QAAEvB;MAAY,CAAC,GAAGmB,MAAM;MAChG,MAAMK,qBAAqB,GAAGhD,iBAAiB,CAACiD,qBAAqB,CAACJ,iBAAiB,CAAC;MACxF,MAAMb,KAAK,GAAGgB,qBAAqB,CAACJ,UAAU,CAA4D;MAC1G,MAAMM,QAAQ,GAAG9B,SAAS,IAAIa,MAAM,CAACC,IAAI,CAACd,SAAS,CAAC,CAACkB,MAAM,GAAG,CAAC,GAAGlB,SAAS,GAAG0B,eAAe;MAC7F,MAAMK,IAAI,GAAG9B,KAAK,CAACoB,UAAU,CAAC,IAAIpB,KAAK,CAACoB,UAAU,CAAC,CAACH,MAAM,GAAG,CAAC,GAAGjB,KAAK,CAACoB,UAAU,CAAC,GAAGM,WAAW;MAChG,MAAMK,MAAM,GAAG,OAAOpB,KAAK,KAAK,UAAU,GACpCA,KAAK,CAAC,GAAGmB,IAAI,CAAC,GACdnB,KAAK;MACX,MAAM;QAAEqB;MAAe,CAAC,GAAGpB,MAAM,CAACqB,WAAW,CAAChD,WAAW,CAAC;QAAE+C,cAAc,EAAED;MAAO,CAAC,EAAEF,QAAQ,CAAC,CAAC;MAChG,MAAMK,kBAAkB,GAAGtD,gBAAgB,CAACmD,MAAM,EAAEC,cAAc,IAAI,CAAC,CAAC,CAAC;MACzE,MAAMG,YAAY,GAAGpD,2BAA2B,CAACmD,kBAAkB,CAAC;MAEpE,IAAI,OAAOV,iBAAiB,KAAK,UAAU,EAAE;QACzC;QACA7C,iBAAiB,CAACyD,2BAA2B,CAACZ,iBAAiB,EAAEW,YAAY,CAAC;MAClF;MAEAhC,WAAW,CAACP,GAAG,CAACC,GAAG,CAAC;MAEpB,MAAMN,OAAO,GAAGb,iBAAiB,CAAC2D,YAAY,CAACtD,2BAA2B,CAACmD,kBAAkB,CAAC,EAAE,MAAM;QAClG,MAAMI,IAAI,GAAG,IAAI,CAAC5C,OAAO,CAACW,GAAG,CAACR,GAAG,CAAC;;QAElC;QACA,IAAI,CAACyC,IAAI,EAAE;UACP/C,OAAO,CAAC,CAAC;UAET;QACJ;QAEA,MAAMgD,qBAAqB,GAAG5D,iBAAiB,CAACiD,qBAAqB,CAACJ,iBAAiB,CAAC;QACxF,MAAMgB,QAAQ,GAAGD,qBAAqB,CAAChB,UAAU,CAA4D;QAC7G,MAAMQ,MAAM,GAAG,OAAOS,QAAQ,KAAK,UAAU,GACvCA,QAAQ,CAAC,GAAGV,IAAI,CAAC,GACjBU,QAAQ;QACd,MAAM;UAAER;QAAe,CAAC,GAAGpB,MAAM,CAACqB,WAAW,CAAChD,WAAW,CAAC;UAAE+C,cAAc,EAAED;QAAO,CAAC,EAAEF,QAAQ,CAAC,CAAC;QAChG,MAAMK,kBAAkB,GAAGtD,gBAAgB,CAACmD,MAAM,EAAEC,cAAc,IAAI,CAAC,CAAC,CAAC;QAEzErD,iBAAiB,CAAC8D,WAAW,CAACH,IAAI,EAAE7D,gBAAgB,CAACyD,kBAAkB,CAAC,CAAC;MAC7E,CAAC,CAAC;MAEF,OAAOA,kBAAkB;IAC7B,CAAC,CAAC,CAAC;IACH,MAAMQ,cAAc,GAAG9D,gBAAgB,CAAC,GAAGsC,YAAY,CAAC;IACxD,MAAMyB,SAAS,GAAG,IAAI,CAACnD,UAAU,CAACa,GAAG,CAACR,GAAG,CAAC;IAE1C,IAAIhB,KAAK,CAAC6D,cAAc,EAAEC,SAAS,CAAC,EAAE;MAClC;IACJ;IAEA,MAAMC,aAAa,GAAG,IAAI,CAACjD,aAAa,CAACU,GAAG,CAACR,GAAG,CAAC;;IAEjD;IACA,IAAI8C,SAAS,EAAE;MACXhE,iBAAiB,CAAC4B,MAAM,CAACoC,SAAS,CAAC;IACvC;;IAEA;IACAC,aAAa,EAAE1C,OAAO,CAAC2C,SAAS,IAAIhD,GAAG,CAACiD,SAAS,CAACvC,MAAM,CAACsC,SAAS,CAAC,CAAC;IACpE,IAAI,CAACrD,UAAU,CAACuD,GAAG,CAAClD,GAAG,EAAE6C,cAAc,CAAC;IAExC,MAAM;MAAEJ,IAAI;MAAEU;IAAa,CAAC,GAAGrE,iBAAiB,CAACiB,GAAG,CAAC8C,cAAc,CAAC;IACpE,MAAMO,kBAAkB,GAAGP,cAAc,EAAEQ,IAAI,EAAEC,WAAW,IAAI,EAAE;IAClE,MAAMC,aAAa,GAAG,CAACC,KAAK,CAACC,OAAO,CAACL,kBAAkB,CAAC,GAAGA,kBAAkB,GAAG,CAACA,kBAAkB,CAAC,EAAEM,MAAM,CAACjB,IAAI,CAAC;IAElH,IAAI,CAAC3C,aAAa,CAACoD,GAAG,CAAClD,GAAG,EAAEuD,aAAa,CAAC;IAC1C;IACAvD,GAAG,CAACiD,SAAS,CAAClD,GAAG,CAAC,GAAGwD,aAAa,CAAC;;IAEnC;IACA,IAAI,CAACJ,YAAY,EAAE;MACf,IAAI,CAACtD,OAAO,CAACqD,GAAG,CAAClD,GAAG,EAAEyC,IAAI,CAAC;IAC/B;IAEA,OAAOc,aAAa;EACxB,CAAC;EAED7C,MAAM,GAAGA,CAAA,KAAM,CAAC,CAAC;AACrB;AAEA,OAAO,MAAMiD,uBAAuB,GAAG,IAAItE,8BAA8B,CAAC,CAAC","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":";;AACA,SAASA,gBAAgB,QAAQ,WAAW;AAC5C,SAASC,iBAAiB,QAAQ,YAAY;AAC9C,SAASC,iBAAiB,QAAQ,YAAY;AAC9C,SAASC,gBAAgB,QAAQ,UAAU;AAC3C,SAASC,KAAK,EAAEC,cAAc,EAAEC,2BAA2B,EAAEC,YAAY,QAAQ,SAAS;AAC1F,SAASC,WAAW,QAAQ,YAAY;AAIxC,MAAMC,8BAA8B,CAAC;EACjC;EACAC,IAAI,GAAG,yBAAyB;EAChCC,MAAM,GAAG,KAAK;EACdC,MAAM,GAAGA,CAAA,KAAM,IAAI;EACnBC,QAAQ,GAAGA,CAAA,KAAM,yBAAyB;EAC1CC,OAAO,GAAGA,CAAA,KAAM,CAAC,CAAC;EAClB;;EAEQC,UAAU,GAAG,IAAIC,GAAG,CAA+B,CAAC;EACpDC,OAAO,GAAG,IAAID,GAAG,CAAsB,CAAC;EACxCE,aAAa,GAAG,IAAIF,GAAG,CAA6B,CAAC;EAE7DG,GAAG,GAAGA,CAACC,GAAQ,EAAEC,MAAoB,EAAEC,SAA0C,EAAEC,KAAwB,KAAK;IAC5G;IACA,IAAI,CAACF,MAAM,EAAE;MACT;IACJ;;IAEA;IACA,IAAID,GAAG,KAAK,IAAI,EAAE;MACd,MAAMI,OAAO,GAAGnB,cAAc,CAACgB,MAAM,CAAC;MAEtC,IAAIG,OAAO,EAAE;QACTA,OAAO,CAACC,WAAW,CAACC,OAAO,CAACN,GAAG,IAAI;UAC/B,IAAIb,YAAY,CAACa,GAAG,CAAC,EAAE;YACnB;UACJ;UAEA,MAAMO,SAAS,GAAG,IAAI,CAACZ,UAAU,CAACa,GAAG,CAACR,GAAG,CAAC;UAC1C,IAAI,CAACL,UAAU,CAACc,MAAM,CAACT,GAAG,CAAC;UAC3B,IAAI,CAACF,aAAa,CAACW,MAAM,CAACT,GAAG,CAAC;UAE9B,IAAIO,SAAS,EAAE;YACXzB,iBAAiB,CAAC4B,MAAM,CAACH,SAAS,CAAC;UACvC;QACJ,CAAC,CAAC;MACN;MAEA;IACJ;;IAEA;IACA,IAAI,EAAEP,GAAG,YAAYW,WAAW,CAAC,EAAE;MAC/B;IACJ;IAEA,MAAMC,YAAY,GAAGX,MAAM,CAACY,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAACC,aAAa,EAAEC,UAAU,KAAK;MACtE,IAAI,CAACD,aAAa,EAAE;QAChB,OAAO,EAAE;MACb;MAEA,MAAMX,OAAO,GAAGnB,cAAc,CAAC8B,aAAa,CAAC;;MAE7C;MACA,IAAI,CAACX,OAAO,EAAE;QACV,OAAOW,aAAa;MACxB;MAEA,MAAM;QAAEE,UAAU;QAAEC,iBAAiB;QAAEC,eAAe;QAAEC,WAAW,GAAG,EAAE;QAAEf;MAAY,CAAC,GAAGD,OAAO;MAC7F,MAAMiB,qBAAqB,GAAGvC,iBAAiB,CAACwC,qBAAqB,CAACJ,iBAAiB,CAAC;MACxF,MAAMK,KAAK,GAAGF,qBAAqB,CAACJ,UAAU,CAA4D;MAC1G,MAAMO,QAAQ,GAAGtB,SAAS,IAAIuB,MAAM,CAACC,IAAI,CAACxB,SAAS,CAAC,CAACyB,MAAM,GAAG,CAAC,GAAGzB,SAAS,GAAGiB,eAAe;MAC7F,MAAMS,IAAI,GAAGzB,KAAK,CAACa,UAAU,CAAC,IAAIb,KAAK,CAACa,UAAU,CAAC,CAACW,MAAM,GAAG,CAAC,GAAGxB,KAAK,CAACa,UAAU,CAAC,GAAGI,WAAW;MAChG,MAAMS,MAAM,GAAG,OAAON,KAAK,KAAK,UAAU,GACpCA,KAAK,CAAC,GAAGK,IAAI,CAAC,GACdL,KAAK;MACX,MAAM;QAAEO;MAAe,CAAC,GAAGL,MAAM,CAACM,WAAW,CAAC3C,WAAW,CAAC;QAAE0C,cAAc,EAAED;MAAO,CAAC,EAAEL,QAAQ,CAAC,CAAC;MAChG,MAAMQ,kBAAkB,GAAGjD,gBAAgB,CAAC8C,MAAM,EAAEC,cAAc,IAAI,CAAC,CAAC,CAAC;MACzE,MAAMG,YAAY,GAAG/C,2BAA2B,CAAC8C,kBAAkB,CAAC;MAEpE,IAAI,OAAOd,iBAAiB,KAAK,UAAU,EAAE;QACzC;QACApC,iBAAiB,CAACoD,2BAA2B,CAAChB,iBAAiB,EAAEe,YAAY,CAAC;MAClF;MAEA5B,WAAW,CAACN,GAAG,CAACC,GAAG,CAAC;MAEpB,MAAMN,OAAO,GAAGb,iBAAiB,CAACsD,YAAY,CAACjD,2BAA2B,CAAC8C,kBAAkB,CAAC,EAAE,MAAM;QAClG,MAAMI,IAAI,GAAG,IAAI,CAACvC,OAAO,CAACW,GAAG,CAACR,GAAG,CAAC;;QAElC;QACA,IAAI,CAACoC,IAAI,EAAE;UACP1C,OAAO,CAAC,CAAC;UAET;QACJ;QAEA,MAAM2C,qBAAqB,GAAGvD,iBAAiB,CAACwC,qBAAqB,CAACJ,iBAAiB,CAAC;QACxF,MAAMoB,QAAQ,GAAGD,qBAAqB,CAACpB,UAAU,CAA4D;QAC7G,MAAMY,MAAM,GAAG,OAAOS,QAAQ,KAAK,UAAU,GACvCA,QAAQ,CAAC,GAAGV,IAAI,CAAC,GACjBU,QAAQ;QACd,MAAM;UAAER;QAAe,CAAC,GAAGL,MAAM,CAACM,WAAW,CAAC3C,WAAW,CAAC;UAAE0C,cAAc,EAAED;QAAO,CAAC,EAAEL,QAAQ,CAAC,CAAC;QAChG,MAAMQ,kBAAkB,GAAGjD,gBAAgB,CAAC8C,MAAM,EAAEC,cAAc,IAAI,CAAC,CAAC,CAAC;QAEzEhD,iBAAiB,CAACyD,WAAW,CAACH,IAAI,EAAExD,gBAAgB,CAACoD,kBAAkB,CAAC,CAAC;MAC7E,CAAC,CAAC;MAEF,OAAOA,kBAAkB;IACjC,CAAC,CAAC;IACF,MAAMQ,cAAc,GAAGzD,gBAAgB,CAAC,GAAG6B,YAAY,CAAC;IACxD,MAAM6B,SAAS,GAAG,IAAI,CAAC9C,UAAU,CAACa,GAAG,CAACR,GAAG,CAAC;IAE1C,IAAIhB,KAAK,CAACwD,cAAc,EAAEC,SAAS,CAAC,EAAE;MAClC;IACJ;IAEA,MAAMC,aAAa,GAAG,IAAI,CAAC5C,aAAa,CAACU,GAAG,CAACR,GAAG,CAAC;;IAEjD;IACA,IAAIyC,SAAS,EAAE;MACX3D,iBAAiB,CAAC4B,MAAM,CAAC+B,SAAS,CAAC;IACvC;;IAEA;IACAC,aAAa,EAAEpC,OAAO,CAACqC,SAAS,IAAI3C,GAAG,CAAC4C,SAAS,CAAClC,MAAM,CAACiC,SAAS,CAAC,CAAC;IACpE,IAAI,CAAChD,UAAU,CAACkD,GAAG,CAAC7C,GAAG,EAAEwC,cAAc,CAAC;IAExC,MAAM;MAAEJ,IAAI;MAAEU;IAAa,CAAC,GAAGhE,iBAAiB,CAACiB,GAAG,CAACyC,cAAc,CAAC;IACpE,MAAMO,kBAAkB,GAAGP,cAAc,EAAEQ,IAAI,EAAEC,WAAW,IAAI,EAAE;IAClE,MAAMC,aAAa,GAAG,CAACC,KAAK,CAACC,OAAO,CAACL,kBAAkB,CAAC,GAAGA,kBAAkB,GAAG,CAACA,kBAAkB,CAAC,EAAEM,MAAM,CAACjB,IAAI,CAAC;IAElH,IAAI,CAACtC,aAAa,CAAC+C,GAAG,CAAC7C,GAAG,EAAEkD,aAAa,CAAC;IAC1C;IACAlD,GAAG,CAAC4C,SAAS,CAAC7C,GAAG,CAAC,GAAGmD,aAAa,CAAC;;IAEnC;IACA,IAAI,CAACJ,YAAY,EAAE;MACf,IAAI,CAACjD,OAAO,CAACgD,GAAG,CAAC7C,GAAG,EAAEoC,IAAI,CAAC;IAC/B;IAEA,OAAOc,aAAa;EACxB,CAAC;EAEDxC,MAAM,GAAGA,CAAA,KAAM,CAAC,CAAC;AACrB;AAEA,OAAO,MAAM4C,uBAAuB,GAAG,IAAIjE,8BAA8B,CAAC,CAAC","ignoreList":[]}