react-native-css 0.0.0-nightly.da5ce0f → 0.0.0-nightly.eda2b28

package/dist/commonjs/metro/typescript.js.map

@@ -1 +1 @@
-{"version":3,"names":["_fs","require","_commentJson","_picocolors","setupTypeScript","envPath","name","ts","configFileName","findConfigFile","sys","fileExists","userConfig","parse","readFileSync","encoding","Array","isArray","output","updatedConfig","existsSync","writeFileSync","push","cyan","include","CommentArray","includes","stringify","length","console","log","bold","join"],"sourceRoot":"../../../src","sources":["metro/typescript.ts"],"mappings":";;;;;;AACA,IAAAA,GAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AALA;;AAOO,SAASG,eAAeA,CAC7BC,OAAO,GAAG,2BAA2B,EACrCC,IAAI,GAAG,kBAAkB,EACzB;EACA,IAAI;IACF,MAAMC,EAAE,GAAGN,OAAO,CAAC,YAAY,CAAC;IAChC,IAAI,CAACM,EAAE,EAAE;MACP;IACF;IAEA,MAAMC,cAAc,GAAGD,EAAE,CAACE,cAAc,CACtC,IAAI,EACJF,EAAE,CAACG,GAAG,CAACC,UAAU,EACjB,eACF,CAAC;IAED,MAAMC,UAAU,GAAG,IAAAC,kBAAK,EACtB,IAAAC,gBAAY,EAACN,cAAc,EAAE;MAC3BO,QAAQ,EAAE;IACZ,CAAC,CACH,CAAC;IAED,IACE,OAAOH,UAAU,KAAK,QAAQ,IAC9B,CAACA,UAAU,IACXI,KAAK,CAACC,OAAO,CAACL,UAAU,CAAC,EACzB;MACA;IACF;IAEA,MAAMM,MAAgB,GAAG,EAAE;IAC3B,IAAIC,aAAa,GAAG,KAAK;IAEzB,IAAI,CAAC,IAAAC,cAAU,EAACf,OAAO,CAAC,EAAE;MACxB,IAAAgB,iBAAa,EACXhB,OAAO,EACP;AACR;AACA,4GAA4GC,IAAI,2EAC1G,CAAC;MACDY,MAAM,CAACI,IAAI,CAAC,WAAW,IAAAC,gBAAI,EAAClB,OAAO,CAAC,EAAE,CAAC;IACzC;IAEAO,UAAU,CAACY,OAAO,KAAK,IAAIC,yBAAY,CAACpB,OAAO,CAAC;IAChD,IACEW,KAAK,CAACC,OAAO,CAACL,UAAU,CAACY,OAAO,CAAC,IACjC,CAACZ,UAAU,CAACY,OAAO,CAACE,QAAQ,CAACrB,OAAO,CAAC,EACrC;MACAO,UAAU,CAACY,OAAO,CAACF,IAAI,CAACjB,OAAO,CAAC;MAChCc,aAAa,GAAG,IAAI;MACpBD,MAAM,CAACI,IAAI,CACT,WAAWd,cAAc,mBAAmB,IAAAe,gBAAI,EAAClB,OAAO,CAAC,OAC3D,CAAC;IACH;IAEA,IAAIc,aAAa,EAAE;MACjB,IAAAE,iBAAa,EAACb,cAAc,EAAE,IAAAmB,sBAAS,EAACf,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/D;IAEA,IAAIM,MAAM,CAACU,MAAM,EAAE;MACjBC,OAAO,CAACC,GAAG,CACT,GAAG,IAAAP,gBAAI,EAAC,IAAAQ,gBAAI,EAAC,YAAY,CAAC,CAAC,2EAA2Eb,MAAM,CAACc,IAAI,CAAC,QAAQ,CAAC,EAC7H,CAAC;IACH;EACF,CAAC,CAAC,MAAM,CAAC;AACX","ignoreList":[]}
+{"version":3,"names":["_fs","require","_nodePath","_commentJson","_picocolors","setupTypeScript","envPath","name","ts","configFileName","findConfigFile","resolve","sys","fileExists","configDirectory","dirname","environmentFile","relativeEnvironmentFile","relative","userConfig","parse","readFileSync","encoding","Array","isArray","Object","prototype","toString","call","output","updatedConfig","existsSync","writeFileSync","push","cyan","include","files","includes","effectiveConfig","parseJsonConfigFileContent","JSON","stringify","fileNames","some","file","raw","undefined","CommentArray","length","console","log","bold","join"],"sourceRoot":"../../../src","sources":["metro/typescript.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/native/api.js

@@ -74,7 +74,7 @@ const colorScheme = exports.colorScheme = {
     return _reactivity.colorScheme.get() ?? _reactNative.Appearance.getColorScheme() ?? "light";
   },
   set(value) {
-    return _reactivity.colorScheme.set(value);
+    return _reactivity.colorScheme.set(value === "unspecified" ? null : value);
   }
 };
 const useUnstableNativeVariable = exports.useUnstableNativeVariable = useNativeVariable;
@@ -88,19 +88,23 @@ function useNativeVariable(name) {
     name = name.slice(2);
   }
   const inheritedVariables = (0, _react.useContext)(_nativeInternal.VariableContext);
-  const [effect, setState] = (0, _react.useState)(() => {
+  const [, forceUpdate] = (0, _react.useState)(0);
+  const [effect] = (0, _react.useState)(() => {
     const effect = {
       observers: new Set(),
-      run: () => setState(state => ({
-        ...state
-      }))
+      run: () => forceUpdate(state => state + 1)
     };
     const get = observable => observable.get(effect);
-    return {
-      ...effect,
+    return Object.assign(effect, {
       get
-    };
+    });
   });
+  (0, _react.useEffect)(() => {
+    // React StrictMode replays setup after cleanup without another render.
+    if (effect.observers.size === 0) forceUpdate(state => state + 1);
+    return () => (0, _reactivity.cleanupEffect)(effect);
+  }, [effect]);
+  (0, _reactivity.cleanupEffect)(effect);
   return (0, _resolve.resolveValue)([{}, "var", [name]], effect.get, {
     inheritedVariables
   });

package/dist/commonjs/native/api.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_nativeInternal","_useNativeCss","_usePassthrough","_reactivity","_resolve","defaultMapping","className","styled","baseComponent","mapping","options","component","configs","mappingToConfig","passThrough","props","usePassthrough","useNativeCss","name","displayName","exports","colorScheme","get","colorSchemeObs","Appearance","getColorScheme","set","value","useUnstableNativeVariable","useNativeVariable","useCssElement","incomingProps","config","useState","startsWith","slice","inheritedVariables","useContext","VariableContext","effect","setState","observers","Set","run","state","observable","resolveValue","vars","variables","Object","assign","VAR_SYMBOL","fromEntries","entries","map","k","v","replace"],"sourceRoot":"../../../src","sources":["native/api.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_nativeInternal","_useNativeCss","_usePassthrough","_reactivity","_resolve","defaultMapping","className","styled","baseComponent","mapping","options","component","configs","mappingToConfig","passThrough","props","usePassthrough","useNativeCss","name","displayName","exports","colorScheme","get","colorSchemeObs","Appearance","getColorScheme","set","value","useUnstableNativeVariable","useNativeVariable","useCssElement","incomingProps","config","useState","startsWith","slice","inheritedVariables","useContext","VariableContext","forceUpdate","effect","observers","Set","run","state","observable","Object","assign","useEffect","size","cleanupEffect","resolveValue","vars","variables","VAR_SYMBOL","fromEntries","entries","map","k","v","replace"],"sourceRoot":"../../../src","sources":["native/api.tsx"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAGA,IAAAE,eAAA,GAAAF,OAAA;AAUA,IAAAG,aAAA,GAAAH,OAAA;AACA,IAAAI,eAAA,GAAAJ,OAAA;AACA,IAAAK,WAAA,GAAAL,OAAA;AAOA,IAAAM,QAAA,GAAAN,OAAA;AAxBA;;AAkCA,MAAMO,cAAsE,GAAG;EAC7EC,SAAS,EAAE;AACb,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,MAAc,GAAGA,CAC5BC,aAAkC,EAClCC,OAAiC,GAAGJ,cAAc,EAClDK,OAAuB,KACpB;EACH,IAAIC,SAAc;EAClB;;EAEA,MAAMC,OAAO,GAAG,IAAAC,6BAAe,EAACJ,OAAO,CAAC;EAExC,IAAIC,OAAO,EAAEI,WAAW,EAAE;IACxBH,SAAS,GAAII,KAA0B,IAAK;MAC1C,OAAO,IAAAC,8BAAc,EAACR,aAAa,EAAEO,KAAK,EAAEH,OAAO,CAAC;IACtD,CAAC;EACH,CAAC,MAAM;IACLD,SAAS,GAAII,KAA0B,IAAK;MAC1C,OAAO,IAAAE,0BAAY,EAACT,aAAa,EAAEO,KAAK,EAAEH,OAAO,CAAC;IACpD,CAAC;EACH;EAEA,MAAMM,IAAI,GAAGV,aAAa,CAACW,WAAW,IAAIX,aAAa,CAACU,IAAI,IAAI,SAAS;EACzEP,SAAS,CAACQ,WAAW,GAAG,cAAcD,IAAI,EAAE;EAC5C,OAAOP,SAAS;AAClB,CAAC;AAACS,OAAA,CAAAb,MAAA,GAAAA,MAAA;AAEK,MAAMc,WAAwB,GAAAD,OAAA,CAAAC,WAAA,GAAG;EACtCC,GAAGA,CAAA,EAAG;IACJ,OAAOC,uBAAc,CAACD,GAAG,CAAC,CAAC,IAAIE,uBAAU,CAACC,cAAc,CAAC,CAAC,IAAI,OAAO;EACvE,CAAC;EACDC,GAAGA,CAACC,KAAK,EAAE;IACT,OAAOJ,uBAAc,CAACG,GAAG,CAACC,KAAK,KAAK,aAAa,GAAG,IAAI,GAAGA,KAAK,CAAC;EACnE;AACF,CAAC;AAEM,MAAMC,yBAAyB,GAAAR,OAAA,CAAAQ,yBAAA,GAAGC,iBAAiB;AAEnD,MAAMC,aAAa,GAAGA,CAI3BnB,SAAY,EACZoB,aAAoB,EACpBtB,OAAU,KACP;EACH,MAAM,CAACuB,MAAM,CAAC,GAAG,IAAAC,eAAQ,EAAC,MAAM,IAAApB,6BAAe,EAACJ,OAAO,CAAC,CAAC;EACzD,OAAO,IAAAQ,0BAAY,EAACN,SAAS,EAAEoB,aAAa,EAAEC,MAAM,CAAC;AACvD,CAAC;AAACZ,OAAA,CAAAU,aAAA,GAAAA,aAAA;AAEK,SAASD,iBAAiBA,CAACX,IAAY,EAAE;EAC9C,IAAIA,IAAI,CAACgB,UAAU,CAAC,IAAI,CAAC,EAAE;IACzBhB,IAAI,GAAGA,IAAI,CAACiB,KAAK,CAAC,CAAC,CAAC;EACtB;EAEA,MAAMC,kBAAkB,GAAG,IAAAC,iBAAU,EAACC,+BAAe,CAAC;EACtD,MAAM,GAAGC,WAAW,CAAC,GAAG,IAAAN,eAAQ,EAAC,CAAC,CAAC;EACnC,MAAM,CAACO,MAAM,CAAC,GAAG,IAAAP,eAAQ,EAAC,MAAM;IAC9B,MAAMO,MAAc,GAAG;MACrBC,SAAS,EAAE,IAAIC,GAAG,CAAC,CAAC;MACpBC,GAAG,EAAEA,CAAA,KAAMJ,WAAW,CAAEK,KAAK,IAAKA,KAAK,GAAG,CAAC;IAC7C,CAAC;IAED,MAAMtB,GAAW,GAAIuB,UAAU,IAAKA,UAAU,CAACvB,GAAG,CAACkB,MAAM,CAAC;IAE1D,OAAOM,MAAM,CAACC,MAAM,CAACP,MAAM,EAAE;MAAElB;IAAI,CAAC,CAAC;EACvC,CAAC,CAAC;EAEF,IAAA0B,gBAAS,EAAC,MAAM;IACd;IACA,IAAIR,MAAM,CAACC,SAAS,CAACQ,IAAI,KAAK,CAAC,EAAEV,WAAW,CAAEK,KAAK,IAAKA,KAAK,GAAG,CAAC,CAAC;IAClE,OAAO,MAAM,IAAAM,yBAAa,EAACV,MAAM,CAAC;EACpC,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EACZ,IAAAU,yBAAa,EAACV,MAAM,CAAC;EACrB,OAAO,IAAAW,qBAAY,EAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAACjC,IAAI,CAAC,CAAC,EAAEsB,MAAM,CAAClB,GAAG,EAAE;IAAEc;EAAmB,CAAC,CAAC;AAC9E;;AAEA;AACA;AACA;AACO,SAASgB,IAAIA,CAACC,SAA0C,EAAa;EAC1E,OAAOP,MAAM,CAACC,MAAM,CAClB;IAAE,CAACO,sBAAU,GAAG;EAAS,CAAC,EAC1BR,MAAM,CAACS,WAAW,CAChBT,MAAM,CAACU,OAAO,CAACH,SAAS,CAAC,CAACI,GAAG,CAAC,CAAC,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAED,CAAC,CAAC,CACrE,CACF,CAAC;AACH","ignoreList":[]}

package/dist/commonjs/native/conditions/attributes.js

@@ -7,7 +7,7 @@ exports.testAttributes = testAttributes;
 function testAttributes(queries, props, guards) {
   return queries.every(query => testAttribute(query, props, guards));
 }
-function testAttribute([type, prop, operator, testValue], props, guards) {
+function testAttribute([type, prop, operator, testValue, caseSensitivity], props, guards) {
   let value = undefined;
   if (props) {
     if (type === "a") {
@@ -21,21 +21,28 @@ function testAttribute([type, prop, operator, testValue], props, guards) {
   if (!operator) {
     return value !== undefined && value !== null && value !== false;
   }
+  if (operator === "!") return !value;
+  if (value === undefined || value === null || testValue === undefined) return false;
+  if (typeof value !== "string" && typeof value !== "number" && typeof value !== "boolean") return false;
+  let actual = String(value);
+  if (caseSensitivity === "i") {
+    // CSS attribute flags fold ASCII letters only, not Unicode characters.
+    actual = actual.replace(/[A-Z]/g, letter => letter.toLowerCase());
+    testValue = testValue.replace(/[A-Z]/g, letter => letter.toLowerCase());
+  }
   switch (operator) {
-    case "!":
-      return !value;
     case "=":
-      return value == testValue;
+      return actual === testValue;
     case "~=":
-      return testValue && value?.toString().split(" ").includes(testValue);
+      return testValue !== "" && actual.split(/[\t\n\f\r ]+/).includes(testValue);
     case "|=":
-      return testValue && value?.toString().startsWith(testValue + "-");
+      return actual === testValue || actual.startsWith(testValue + "-");
     case "^=":
-      return testValue && value?.toString().startsWith(testValue);
+      return testValue !== "" && actual.startsWith(testValue);
     case "$=":
-      return testValue && value?.toString().endsWith(testValue);
+      return testValue !== "" && actual.endsWith(testValue);
     case "*=":
-      return testValue && value?.toString().includes(testValue);
+      return testValue !== "" && actual.includes(testValue);
     default:
       operator;
       return false;

package/dist/commonjs/native/conditions/attributes.js.map

@@ -1 +1 @@
-{"version":3,"names":["testAttributes","queries","props","guards","every","query","testAttribute","type","prop","operator","testValue","value","undefined","dataSet","push","toString","split","includes","startsWith","endsWith"],"sourceRoot":"../../../../src","sources":["native/conditions/attributes.ts"],"mappings":";;;;;;AAIO,SAASA,cAAcA,CAC5BC,OAAyB,EACzBC,KAAiD,EACjDC,MAAqB,EACrB;EACA,OAAOF,OAAO,CAACG,KAAK,CAAEC,KAAK,IAAKC,aAAa,CAACD,KAAK,EAAEH,KAAK,EAAEC,MAAM,CAAC,CAAC;AACtE;AAEA,SAASG,aAAaA,CACpB,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,SAAS,CAAiB,EACjDR,KAAiD,EACjDC,MAAqB,EACrB;EACA,IAAIQ,KAAc,GAAGC,SAAS;EAE9B,IAAIV,KAAK,EAAE;IACT,IAAIK,IAAI,KAAK,GAAG,EAAE;MAChBI,KAAK,GAAGT,KAAK,CAACM,IAAI,CAAC;IACrB,CAAC,MAAM;MACL,MAAMK,OAAO,GAAGX,KAAK,CAACW,OAA8C;MACpEF,KAAK,GAAGE,OAAO,GAAGL,IAAI,CAAC;IACzB;EACF;EAEAL,MAAM,CAACW,IAAI,CAAC,CAACP,IAAI,EAAEC,IAAI,EAAEG,KAAK,CAAC,CAAC;EAEhC,IAAI,CAACF,QAAQ,EAAE;IACb,OAAOE,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,KAAK;EACjE;EAEA,QAAQF,QAAQ;IACd,KAAK,GAAG;MACN,OAAO,CAACE,KAAK;IACf,KAAK,GAAG;MACN,OAAOA,KAAK,IAAID,SAAS;IAC3B,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACC,KAAK,CAAC,GAAG,CAAC,CAACC,QAAQ,CAACP,SAAS,CAAC;IACtE,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACG,UAAU,CAACR,SAAS,GAAG,GAAG,CAAC;IACnE,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACG,UAAU,CAACR,SAAS,CAAC;IAC7D,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACI,QAAQ,CAACT,SAAS,CAAC;IAC3D,KAAK,IAAI;MACP,OAAOA,SAAS,IAAIC,KAAK,EAAEI,QAAQ,CAAC,CAAC,CAACE,QAAQ,CAACP,SAAS,CAAC;IAC3D;MACED,QAAQ;MACR,OAAO,KAAK;EAChB;AACF","ignoreList":[]}
+{"version":3,"names":["testAttributes","queries","props","guards","every","query","testAttribute","type","prop","operator","testValue","caseSensitivity","value","undefined","dataSet","push","actual","String","replace","letter","toLowerCase","split","includes","startsWith","endsWith"],"sourceRoot":"../../../../src","sources":["native/conditions/attributes.ts"],"mappings":";;;;;;AAIO,SAASA,cAAcA,CAC5BC,OAAyB,EACzBC,KAAiD,EACjDC,MAAqB,EACrB;EACA,OAAOF,OAAO,CAACG,KAAK,CAAEC,KAAK,IAAKC,aAAa,CAACD,KAAK,EAAEH,KAAK,EAAEC,MAAM,CAAC,CAAC;AACtE;AAEA,SAASG,aAAaA,CACpB,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,eAAe,CAAiB,EAClET,KAAiD,EACjDC,MAAqB,EACrB;EACA,IAAIS,KAAc,GAAGC,SAAS;EAE9B,IAAIX,KAAK,EAAE;IACT,IAAIK,IAAI,KAAK,GAAG,EAAE;MAChBK,KAAK,GAAGV,KAAK,CAACM,IAAI,CAAC;IACrB,CAAC,MAAM;MACL,MAAMM,OAAO,GAAGZ,KAAK,CAACY,OAA8C;MACpEF,KAAK,GAAGE,OAAO,GAAGN,IAAI,CAAC;IACzB;EACF;EAEAL,MAAM,CAACY,IAAI,CAAC,CAACR,IAAI,EAAEC,IAAI,EAAEI,KAAK,CAAC,CAAC;EAEhC,IAAI,CAACH,QAAQ,EAAE;IACb,OAAOG,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAK,KAAK;EACjE;EAEA,IAAIH,QAAQ,KAAK,GAAG,EAAE,OAAO,CAACG,KAAK;EACnC,IAAIA,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,IAAIF,SAAS,KAAKG,SAAS,EAClE,OAAO,KAAK;EAEd,IACE,OAAOD,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,QAAQ,IACzB,OAAOA,KAAK,KAAK,SAAS,EAE1B,OAAO,KAAK;EACd,IAAII,MAAM,GAAGC,MAAM,CAACL,KAAK,CAAC;EAC1B,IAAID,eAAe,KAAK,GAAG,EAAE;IAC3B;IACAK,MAAM,GAAGA,MAAM,CAACE,OAAO,CAAC,QAAQ,EAAGC,MAAM,IAAKA,MAAM,CAACC,WAAW,CAAC,CAAC,CAAC;IACnEV,SAAS,GAAGA,SAAS,CAACQ,OAAO,CAAC,QAAQ,EAAGC,MAAM,IAAKA,MAAM,CAACC,WAAW,CAAC,CAAC,CAAC;EAC3E;EAEA,QAAQX,QAAQ;IACd,KAAK,GAAG;MACN,OAAOO,MAAM,KAAKN,SAAS;IAC7B,KAAK,IAAI;MACP,OACEA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACK,KAAK,CAAC,cAAc,CAAC,CAACC,QAAQ,CAACZ,SAAS,CAAC;IAExE,KAAK,IAAI;MACP,OAAOM,MAAM,KAAKN,SAAS,IAAIM,MAAM,CAACO,UAAU,CAACb,SAAS,GAAG,GAAG,CAAC;IACnE,KAAK,IAAI;MACP,OAAOA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACO,UAAU,CAACb,SAAS,CAAC;IACzD,KAAK,IAAI;MACP,OAAOA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACQ,QAAQ,CAACd,SAAS,CAAC;IACvD,KAAK,IAAI;MACP,OAAOA,SAAS,KAAK,EAAE,IAAIM,MAAM,CAACM,QAAQ,CAACZ,SAAS,CAAC;IACvD;MACED,QAAQ;MACR,OAAO,KAAK;EAChB;AACF","ignoreList":[]}

package/dist/commonjs/native/conditions/container-query.js

@@ -7,10 +7,9 @@ exports.DEFAULT_CONTAINER_NAME = void 0;
 exports.testContainerQueries = testContainerQueries;
 exports.testContainerQuery = testContainerQuery;
 var _reactivity = require("../reactivity.js");
+var _attributes = require("./attributes.js");
 /* eslint-disable */
 
-// import { testAttributes } from "./attributes";
-
 const DEFAULT_CONTAINER_NAME = exports.DEFAULT_CONTAINER_NAME = "c:___default___";
 function testContainerQueries(queries, inheritedContainers, guards, get) {
   return queries.every(query => {
@@ -25,14 +24,15 @@ function testContainerQuery(query, inheritedContainers, guards, get) {
     return false;
   }
 
-  // if (query.a && !testAttributes(query.a, container.props, guards)) {
-  //   return false;
-  // }
-
-  if (query.m && !testContainerMediaCondition(query.m, container, get)) {
+  // Ancestor snapshots have their own context guard. Their attributes must not
+  // be compared with this descendant's props by the ordinary attribute guards.
+  if (query.a && !(0, _attributes.testAttributes)(query.a, container.props, [])) {
+    return false;
+  }
+  if (query.m && !testContainerMediaCondition(query.m, container.key, get)) {
     return false;
   }
-  if (query.p && !testContainerPseudoCondition(query.p, container, get)) {
+  if (query.p && !testContainerPseudoCondition(query.p, container.key, get)) {
     return false;
   }
   return true;
@@ -83,11 +83,11 @@ function testContainerMediaCondition(condition, containerKey, get) {
           case ">":
             return left > right;
           case ">=":
-            return left > right;
+            return left >= right;
           case "<":
-            return left > right;
+            return left < right;
           case "<=":
-            return left > right;
+            return left <= right;
           default:
             condition[0];
             return false;

package/dist/commonjs/native/conditions/container-query.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactivity","require","DEFAULT_CONTAINER_NAME","exports","testContainerQueries","queries","inheritedContainers","guards","get","every","query","testContainerQuery","name","n","container","push","m","testContainerMediaCondition","p","testContainerPseudoCondition","containerKey","h","hoverFamily","a","activeFamily","f","focusFamily","condition","some","left","getContainerFeatureValue","right","containerWidthFamily","containerHeightFamily","width","height"],"sourceRoot":"../../../../src","sources":["native/conditions/container-query.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactivity","require","_attributes","DEFAULT_CONTAINER_NAME","exports","testContainerQueries","queries","inheritedContainers","guards","get","every","query","testContainerQuery","name","n","container","push","a","testAttributes","props","m","testContainerMediaCondition","key","p","testContainerPseudoCondition","containerKey","h","hoverFamily","activeFamily","f","focusFamily","condition","some","left","getContainerFeatureValue","right","containerWidthFamily","containerHeightFamily","width","height"],"sourceRoot":"../../../../src","sources":["native/conditions/container-query.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/native/conditions/media-query.js

@@ -40,7 +40,7 @@ function testComparison(mediaQuery, get) {
   const value = mediaQuery[2];
   switch (mediaQuery[1]) {
     case "dir":
-      return _reactNative.I18nManager.isRTL && value === "rtl" || value === "ltr";
+      return value === (_reactNative.I18nManager.isRTL ? "rtl" : "ltr");
     case "hover":
       return true;
     case "platform":

package/dist/commonjs/native/conditions/media-query.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_reactivity","testMediaQuery","mediaQueries","get","every","query","test","mediaQuery","some","testComparison","value","I18nManager","isRTL","Platform","OS","colorScheme","vw","vh","left","right","PixelRatio"],"sourceRoot":"../../../../src","sources":["native/conditions/media-query.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_reactivity","testMediaQuery","mediaQueries","get","every","query","test","mediaQuery","some","testComparison","value","I18nManager","isRTL","Platform","OS","colorScheme","vw","vh","left","right","PixelRatio"],"sourceRoot":"../../../../src","sources":["native/conditions/media-query.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/native/react/interaction.js

@@ -18,12 +18,17 @@ const defaultHandlers = {
   onFocus: () => {},
   onBlur: () => {}
 };
-function getInteractionHandler(weakKey, type, handler = defaultHandlers[type]) {
-  let cache = mainCache.get(weakKey);
-  if (!cache) {
-    cache = new WeakMap();
-    mainCache.set(weakKey, cache);
+function getInteractionHandler(weakKey, type, handler) {
+  handler ??= defaultHandlers[type];
+  let interactions = mainCache.get(weakKey);
+  if (!interactions) {
+    interactions = new Map();
+    mainCache.set(weakKey, interactions);
   }
+
+  // A caller may reuse one callback for events that update opposite states.
+  let cache = interactions.get(type);
+  if (!cache) interactions.set(type, cache = new WeakMap());
   let cached = cache.get(handler);
   if (!cached) {
     cached = event => {

package/dist/commonjs/native/react/interaction.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactivity","require","mainCache","WeakMap","defaultHandlers","onLayout","onHoverIn","onHoverOut","onPress","onPressIn","onPressOut","onFocus","onBlur","getInteractionHandler","weakKey","type","handler","cache","get","set","cached","event","containerLayoutFamily","nativeEvent","layout","hoverFamily","activeFamily","focusFamily"],"sourceRoot":"../../../../src","sources":["native/react/interaction.ts"],"mappings":";;;;;;AAGA,IAAAA,WAAA,GAAAC,OAAA;AAHA;;AAWA,MAAMC,SAAS,GAAG,IAAIC,OAAO,CAG3B,CAAC;AAcH,MAAMC,eAAiD,GAAG;EACxDC,QAAQ,EAAEA,CAAA,KAAM,CAAC,CAAC;EAClBC,SAAS,EAAEA,CAAA,KAAM,CAAC,CAAC;EACnBC,UAAU,EAAEA,CAAA,KAAM,CAAC,CAAC;EACpBC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,SAAS,EAAEA,CAAA,KAAM,CAAC,CAAC;EACnBC,UAAU,EAAEA,CAAA,KAAM,CAAC,CAAC;EACpBC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,MAAM,EAAEA,CAAA,KAAM,CAAC;AACjB,CAAC;AAEM,SAASC,qBAAqBA,CACnCC,OAAgB,EAChBC,IAAqB,EACrBC,OAAO,GAAGZ,eAAe,CAACW,IAAI,CAAC,EAC/B;EACA,IAAIE,KAAK,GAAGf,SAAS,CAACgB,GAAG,CAACJ,OAAO,CAAC;EAClC,IAAI,CAACG,KAAK,EAAE;IACVA,KAAK,GAAG,IAAId,OAAO,CAAC,CAAC;IACrBD,SAAS,CAACiB,GAAG,CAACL,OAAO,EAAEG,KAAK,CAAC;EAC/B;EAEA,IAAIG,MAAM,GAAGH,KAAK,CAACC,GAAG,CAACF,OAAO,CAAC;EAC/B,IAAI,CAACI,MAAM,EAAE;IACXA,MAAM,GAAIC,KAAU,IAAK;MACvB,IAAIL,OAAO,EAAE;QACXA,OAAO,CAACK,KAAK,CAAC;MAChB;MAEA,QAAQN,IAAI;QACV,KAAK,UAAU;UACb,IAAAO,iCAAqB,EAACR,OAAO,CAAC,CAACK,GAAG,CAC/BE,KAAK,CAAuBE,WAAW,CAACC,MAC3C,CAAC;UACD;QACF,KAAK,WAAW;UACd,IAAAC,uBAAW,EAACX,OAAO,CAAC,CAACK,GAAG,CAAC,IAAI,CAAC;UAC9B;QACF,KAAK,YAAY;UACf,IAAAM,uBAAW,EAACX,OAAO,CAAC,CAACK,GAAG,CAAC,KAAK,CAAC;UAC/B;QACF,KAAK,SAAS;UACZ;QACF,KAAK,WAAW;UACd,IAAAO,wBAAY,EAACZ,OAAO,CAAC,CAACK,GAAG,CAAC,IAAI,CAAC;UAC/B;QACF,KAAK,YAAY;UACf,IAAAO,wBAAY,EAACZ,OAAO,CAAC,CAACK,GAAG,CAAC,KAAK,CAAC;UAChC;QACF,KAAK,SAAS;UACZ,IAAAQ,uBAAW,EAACb,OAAO,CAAC,CAACK,GAAG,CAAC,IAAI,CAAC;UAC9B;QACF,KAAK,QAAQ;UACX,IAAAQ,uBAAW,EAACb,OAAO,CAAC,CAACK,GAAG,CAAC,KAAK,CAAC;UAC/B;MACJ;IACF,CAAC;IACDF,KAAK,CAACE,GAAG,CAACH,OAAO,EAAEI,MAAM,CAAC;EAC5B;EAEA,OAAOA,MAAM;AACf","ignoreList":[]}
+{"version":3,"names":["_reactivity","require","mainCache","WeakMap","defaultHandlers","onLayout","onHoverIn","onHoverOut","onPress","onPressIn","onPressOut","onFocus","onBlur","getInteractionHandler","weakKey","type","handler","interactions","get","Map","set","cache","cached","event","containerLayoutFamily","nativeEvent","layout","hoverFamily","activeFamily","focusFamily"],"sourceRoot":"../../../../src","sources":["native/react/interaction.ts"],"mappings":";;;;;;AAGA,IAAAA,WAAA,GAAAC,OAAA;AAHA;;AAWA,MAAMC,SAAS,GAAG,IAAIC,OAAO,CAG3B,CAAC;AAcH,MAAMC,eAAiD,GAAG;EACxDC,QAAQ,EAAEA,CAAA,KAAM,CAAC,CAAC;EAClBC,SAAS,EAAEA,CAAA,KAAM,CAAC,CAAC;EACnBC,UAAU,EAAEA,CAAA,KAAM,CAAC,CAAC;EACpBC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,SAAS,EAAEA,CAAA,KAAM,CAAC,CAAC;EACnBC,UAAU,EAAEA,CAAA,KAAM,CAAC,CAAC;EACpBC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,MAAM,EAAEA,CAAA,KAAM,CAAC;AACjB,CAAC;AAEM,SAASC,qBAAqBA,CACnCC,OAAgB,EAChBC,IAAqB,EACrBC,OAAwB,EACxB;EACAA,OAAO,KAAKZ,eAAe,CAACW,IAAI,CAAC;EACjC,IAAIE,YAAY,GAAGf,SAAS,CAACgB,GAAG,CAACJ,OAAO,CAAC;EACzC,IAAI,CAACG,YAAY,EAAE;IACjBA,YAAY,GAAG,IAAIE,GAAG,CAAC,CAAC;IACxBjB,SAAS,CAACkB,GAAG,CAACN,OAAO,EAAEG,YAAY,CAAC;EACtC;;EAEA;EACA,IAAII,KAAK,GAAGJ,YAAY,CAACC,GAAG,CAACH,IAAI,CAAC;EAClC,IAAI,CAACM,KAAK,EAAEJ,YAAY,CAACG,GAAG,CAACL,IAAI,EAAGM,KAAK,GAAG,IAAIlB,OAAO,CAAC,CAAE,CAAC;EAE3D,IAAImB,MAAM,GAAGD,KAAK,CAACH,GAAG,CAACF,OAAO,CAAC;EAC/B,IAAI,CAACM,MAAM,EAAE;IACXA,MAAM,GAAIC,KAAU,IAAK;MACvB,IAAIP,OAAO,EAAE;QACXA,OAAO,CAACO,KAAK,CAAC;MAChB;MAEA,QAAQR,IAAI;QACV,KAAK,UAAU;UACb,IAAAS,iCAAqB,EAACV,OAAO,CAAC,CAACM,GAAG,CAC/BG,KAAK,CAAuBE,WAAW,CAACC,MAC3C,CAAC;UACD;QACF,KAAK,WAAW;UACd,IAAAC,uBAAW,EAACb,OAAO,CAAC,CAACM,GAAG,CAAC,IAAI,CAAC;UAC9B;QACF,KAAK,YAAY;UACf,IAAAO,uBAAW,EAACb,OAAO,CAAC,CAACM,GAAG,CAAC,KAAK,CAAC;UAC/B;QACF,KAAK,SAAS;UACZ;QACF,KAAK,WAAW;UACd,IAAAQ,wBAAY,EAACd,OAAO,CAAC,CAACM,GAAG,CAAC,IAAI,CAAC;UAC/B;QACF,KAAK,YAAY;UACf,IAAAQ,wBAAY,EAACd,OAAO,CAAC,CAACM,GAAG,CAAC,KAAK,CAAC;UAChC;QACF,KAAK,SAAS;UACZ,IAAAS,uBAAW,EAACf,OAAO,CAAC,CAACM,GAAG,CAAC,IAAI,CAAC;UAC9B;QACF,KAAK,QAAQ;UACX,IAAAS,uBAAW,EAACf,OAAO,CAAC,CAACM,GAAG,CAAC,KAAK,CAAC;UAC/B;MACJ;IACF,CAAC;IACDC,KAAK,CAACD,GAAG,CAACJ,OAAO,EAAEM,MAAM,CAAC;EAC5B;EAEA,OAAOA,MAAM;AACf","ignoreList":[]}

package/dist/commonjs/native/react/rules.js

@@ -19,6 +19,7 @@ const INLINE_RULE_SYMBOL = exports.INLINE_RULE_SYMBOL = Symbol("react-native-css
 function updateRules(state,
 // Either update the state with new props or use the current props
 currentProps = state.currentProps, inheritedVariables = state.inheritedVariables, inheritedContainers = state.inheritedContainers, forceUpdate = false, isRerender = true) {
+  (0, _reactivity.cleanupEffect)(state.ruleEffect);
   const guards = [];
   const rules = new Set();
   if (forceUpdate) {
@@ -100,13 +101,19 @@ currentProps = state.currentProps, inheritedVariables = state.inheritedVariables
           containers = {
             ...inheritedContainers,
             // This container becomes the default container
-            [_containerQuery.DEFAULT_CONTAINER_NAME]: state.ruleEffectGetter
+            [_containerQuery.DEFAULT_CONTAINER_NAME]: {
+              key: state.ruleEffectGetter,
+              props: currentProps
+            }
           };
         }
 
         // This this component as the named container
         for (const name of rule.c) {
-          containers[name] = state.ruleEffectGetter;
+          containers[name] = {
+            key: state.ruleEffectGetter,
+            props: currentProps
+          };
         }
 
         // Enable hover/active/focus/layout handlers
@@ -154,10 +161,10 @@ currentProps = state.currentProps, inheritedVariables = state.inheritedVariables
       containers
     };
   }
-  if (usesVariables || variables) {
+  if (usesVariables || variables || inlineVariables.size) {
     rules.add(inheritedVariables);
     if (inlineVariables.size) {
-      variables = Object.assign({}, variables, inheritedVariables, ...Array.from(inlineVariables), {
+      variables = Object.assign({}, inheritedVariables, variables, ...Array.from(inlineVariables), {
         [_reactivity.VAR_SYMBOL]: true
       });
     }
@@ -179,7 +186,7 @@ currentProps = state.currentProps, inheritedVariables = state.inheritedVariables
   }
 
   // Remove this component from the old observer
-  state.stylesObs?.cleanup(state.ruleEffect);
+  state.stylesObs?.unsubscribe(state.styleEffect);
   return {
     ...state,
     currentProps,

package/dist/commonjs/native/react/rules.js.map

@@ -1 +1 @@
-{"version":3,"names":["_nativeInternal","require","_index","_containerQuery","_objects","_reactivity","_index2","INLINE_RULE_SYMBOL","exports","Symbol","updateRules","state","currentProps","inheritedVariables","inheritedContainers","forceUpdate","isRerender","guards","rules","Set","usesVariables","variables","containers","inlineVariables","animated","pressable","config","configs","source","shallowTarget","Array","isArray","target","push","styleRuleSet","classNames","split","className","StyleCollection","styles","get","ruleEffect","getDeepPath","item","VAR_SYMBOL","add","pushInlineRule","rule","Boolean","dv","a","v","c","activeFamily","ruleEffectGetter","testRule","DEFAULT_CONTAINER_NAME","name","hoverFamily","focusFamily","containerLayoutFamily","getRuleVariation","process","env","NODE_ENV","has","console","log","size","stylesObs","Object","assign","from","variable","stylesFamily","generateStateHash","cleanup","weakFamily","inlineRuleSet","hashKeyCount","hashKeyFamily","iterableKeys","inlineVars","keys","generateHash","MOD","PRIME","hash","product","key","num","toString"],"sourceRoot":"../../../../src","sources":["native/react/rules.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_nativeInternal","require","_index","_containerQuery","_objects","_reactivity","_index2","INLINE_RULE_SYMBOL","exports","Symbol","updateRules","state","currentProps","inheritedVariables","inheritedContainers","forceUpdate","isRerender","cleanupEffect","ruleEffect","guards","rules","Set","usesVariables","variables","containers","inlineVariables","animated","pressable","config","configs","source","shallowTarget","Array","isArray","target","push","styleRuleSet","classNames","split","className","StyleCollection","styles","get","getDeepPath","item","VAR_SYMBOL","add","pushInlineRule","rule","Boolean","dv","a","v","c","activeFamily","ruleEffectGetter","testRule","DEFAULT_CONTAINER_NAME","key","props","name","hoverFamily","focusFamily","containerLayoutFamily","getRuleVariation","process","env","NODE_ENV","has","console","log","size","stylesObs","Object","assign","from","variable","stylesFamily","generateStateHash","unsubscribe","styleEffect","weakFamily","inlineRuleSet","hashKeyCount","hashKeyFamily","iterableKeys","inlineVars","keys","generateHash","MOD","PRIME","hash","product","num","toString"],"sourceRoot":"../../../../src","sources":["native/react/rules.ts"],"mappings":"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","ignoreList":[]}

package/dist/commonjs/native/react/useNativeCss.js

@@ -25,9 +25,6 @@ function useNativeCss(type, originalProps, configs = [{
   const inheritedVariables = (0, _react.useContext)(_nativeInternal.VariableContext);
   const inheritedContainers = (0, _react.useContext)(_reactivity.ContainerContext);
   const [state, setState] = (0, _react.useState)(() => {
-    // Both effects share the same observers to improve memory usage
-    const observers = new Set();
-
     /**
      * When fired, this effect will force the rules to be re-evaluated.
      * This will cause a re-render if there are different rules
@@ -35,7 +32,7 @@ function useNativeCss(type, originalProps, configs = [{
      * Use this when a rule condition changes, e.g FastRefresh or media queries
      */
     const ruleEffect = {
-      observers,
+      observers: new Set(),
       run: () => setState(state => (0, _rules.updateRules)(state))
     };
 
@@ -46,12 +43,12 @@ function useNativeCss(type, originalProps, configs = [{
      * Use this when a value changes, e.g vm units or light / dark mode
      */
     const styleEffect = {
-      observers,
+      observers: new Set(),
       run: () => setState(state => ({
         ...state
       }))
     };
-    return (0, _rules.updateRules)({
+    const initialState = (0, _rules.updateRules)({
       ruleEffect,
       ruleEffectGetter: observable => observable.get(ruleEffect),
       styleEffect,
@@ -60,10 +57,35 @@ function useNativeCss(type, originalProps, configs = [{
       inheritedVariables,
       pressable: type === _reactNative.View ? false : undefined
     }, originalProps, inheritedVariables, inheritedContainers, false, false);
+    // State initializers may be discarded by React StrictMode. Subscribe once
+    // the component commits instead of retaining an abandoned initializer.
+    (0, _reactivity.cleanupEffect)(ruleEffect);
+    return initialState;
   });
 
-  // Both effects share the same observers, so we only need to cleanup one of them
-  (0, _react.useEffect)(() => () => (0, _reactivity.cleanupEffect)(state.ruleEffect), [state.ruleEffect]);
+  // Distinguishes a fresh mount from an effect replay (Activity, StrictMode)
+  const hasCommittedRef = (0, _react.useRef)(false);
+  (0, _react.useEffect)(() => {
+    // Reconnect subscriptions after React replays an effect setup.
+    if (state.ruleEffect.observers.size === 0) {
+      if (hasCommittedRef.current || (0, _reactivity.hasChangedDependencies)(state.ruleEffect)) {
+        // Replay, or conditions changed since the initializer: recalculate.
+        state.ruleEffect.run();
+        state.styleEffect.run();
+      } else {
+        // Fresh mount: resubscribe to the initializer's dependencies.
+        // styleEffect resubscribes itself during render.
+        for (const observable of state.ruleEffect.dependencies ?? []) {
+          observable.get(state.ruleEffect);
+        }
+      }
+    }
+    hasCommittedRef.current = true;
+    return () => {
+      (0, _reactivity.cleanupEffect)(state.ruleEffect);
+      (0, _reactivity.cleanupEffect)(state.styleEffect);
+    };
+  }, [state.ruleEffect, state.styleEffect]);
 
   // Check if our derived state has changed (e.g the className prop)
   if ((0, _guards.testGuards)(state, originalProps, inheritedVariables, inheritedContainers)) {
@@ -76,7 +98,7 @@ function useNativeCss(type, originalProps, configs = [{
     // We can bail on rendering as the result of this render will be discarded
     return /*#__PURE__*/(0, _react.createElement)(_react.Fragment);
   }
-  let props = (0, _index.getStyledProps)(state, originalProps);
+  let props = (0, _index.getStyledProps)(state, originalProps, type === _reactNative.Image ? adaptImageProps : undefined);
   if (type === _reactNative.View && props?.onPress) {
     type = _reactNative.Pressable;
   }
@@ -91,8 +113,14 @@ function useNativeCss(type, originalProps, configs = [{
     type = _nativeInternal.VariableContext.Provider;
   }
   if (state.containers) {
+    // Publish a new props snapshot even when this component's own rules did not
+    // change. Descendants can depend on an ancestor attribute through a group.
+    const containers = Object.fromEntries(Object.entries(state.containers).map(([name, container]) => [name, container.key === state.ruleEffectGetter ? {
+      key: container.key,
+      props: originalProps
+    } : inheritedContainers[name] ?? container]));
     props = {
-      value: state.containers,
+      value: containers,
       children: /*#__PURE__*/(0, _react.createElement)(type, props)
     };
     type = _reactivity.ContainerContext.Provider;
@@ -121,7 +149,10 @@ function mappingToConfig(mapping) {
         target: value.split(".")
       };
     } else if (typeof value === "object") {
-      const nativeStyleMapping = value.nativeStyleMapping;
+      // Keep the declared deprecated alias working. The current spelling wins
+      // when both are provided, including an intentionally empty mapping.
+      const mapping = value.nativeStyleMapping ?? value.nativeStyleToProp;
+      const nativeStyleMapping = mapping ? Object.fromEntries(Object.entries(mapping).map(([k, v]) => [k, v === true ? k : v])) : undefined;
       if (Array.isArray(value)) {
         return {
           source: key,
@@ -163,4 +194,22 @@ function mappingToConfig(mapping) {
     throw new Error(`styled(): Invalid mapping for ${key}: ${value}`);
   });
 }
+
+// Apply native Image fitting before normal, inline, and important props merge.
+// The compiler's contentFit mapping remains available to Expo Image adapters.
+function adaptImageProps(props) {
+  if (!props || !("contentFit" in props)) return props;
+  const {
+    contentFit,
+    style,
+    ...rest
+  } = props;
+  return {
+    ...rest,
+    style: {
+      ..._reactNative.StyleSheet.flatten(style),
+      objectFit: contentFit
+    }
+  };
+}
 //# sourceMappingURL=useNativeCss.js.map

package/dist/commonjs/native/react/useNativeCss.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_nativeInternal","_guards","_reactivity","_reanimated","_index","_rules","useNativeCss","type","originalProps","configs","source","target","inheritedVariables","useContext","VariableContext","inheritedContainers","ContainerContext","state","setState","useState","observers","Set","ruleEffect","run","updateRules","styleEffect","ruleEffectGetter","observable","get","pressable","View","undefined","useEffect","cleanupEffect","testGuards","createElement","Fragment","props","getStyledProps","onPress","Pressable","animated","animatedComponentFamily","variables","value","children","Provider","containers","mappingToConfig","mapping","Object","entries","flatMap","key","split","nativeStyleMapping","Array","isArray","length","Error"],"sourceRoot":"../../../../src","sources":["native/react/useNativeCss.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_nativeInternal","_guards","_reactivity","_reanimated","_index","_rules","useNativeCss","type","originalProps","configs","source","target","inheritedVariables","useContext","VariableContext","inheritedContainers","ContainerContext","state","setState","useState","ruleEffect","observers","Set","run","updateRules","styleEffect","initialState","ruleEffectGetter","observable","get","pressable","View","undefined","cleanupEffect","hasCommittedRef","useRef","useEffect","size","current","hasChangedDependencies","dependencies","testGuards","createElement","Fragment","props","getStyledProps","Image","adaptImageProps","onPress","Pressable","animated","animatedComponentFamily","variables","value","children","Provider","containers","Object","fromEntries","entries","map","name","container","key","mappingToConfig","mapping","flatMap","split","nativeStyleMapping","nativeStyleToProp","k","v","Array","isArray","length","Error","contentFit","style","rest","StyleSheet","flatten","objectFit"],"sourceRoot":"../../../../src","sources":["native/react/useNativeCss.ts"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AASA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,eAAA,GAAAF,OAAA;AAGA,IAAAG,OAAA,GAAAH,OAAA;AACA,IAAAI,WAAA,GAAAJ,OAAA;AASA,IAAAK,WAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAP,OAAA;AA3BA;;AA6DA;AACA;AACA;AACO,SAASQ,YAAYA,CAC1BC,IAAwB,EACxBC,aAAqD,EACrDC,OAAiB,GAAG,CAAC;EAAEC,MAAM,EAAE,WAAW;EAAEC,MAAM,EAAE;AAAQ,CAAC,CAAC,EAC9D;EACA,MAAMC,kBAAkB,GAAG,IAAAC,iBAAU,EAACC,+BAAe,CAAC;EACtD,MAAMC,mBAAmB,GAAG,IAAAF,iBAAU,EAACG,4BAAgB,CAAC;EAExD,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAG,IAAAC,eAAQ,EAAC,MAAsB;IACvD;AACJ;AACA;AACA;AACA;AACA;IACI,MAAMC,UAAkB,GAAG;MACzBC,SAAS,EAAE,IAAIC,GAAG,CAAC,CAAC;MACpBC,GAAG,EAAEA,CAAA,KAAML,QAAQ,CAAED,KAAK,IAAK,IAAAO,kBAAW,EAACP,KAAK,CAAC;IACnD,CAAC;;IAED;AACJ;AACA;AACA;AACA;AACA;IACI,MAAMQ,WAAmB,GAAG;MAC1BJ,SAAS,EAAE,IAAIC,GAAG,CAAC,CAAC;MACpBC,GAAG,EAAEA,CAAA,KAAML,QAAQ,CAAED,KAAK,KAAM;QAAE,GAAGA;MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,MAAMS,YAAY,GAAG,IAAAF,kBAAW,EAC9B;MACEJ,UAAU;MACVO,gBAAgB,EAAGC,UAAU,IAAKA,UAAU,CAACC,GAAG,CAACT,UAAU,CAAC;MAC5DK,WAAW;MACXhB,OAAO;MACPM,mBAAmB;MACnBH,kBAAkB;MAClBkB,SAAS,EAAEvB,IAAI,KAAKwB,iBAAI,GAAG,KAAK,GAAGC;IACrC,CAAC,EACDxB,aAAa,EACbI,kBAAkB,EAClBG,mBAAmB,EACnB,KAAK,EACL,KACF,CAAC;IACD;IACA;IACA,IAAAkB,yBAAa,EAACb,UAAU,CAAC;IACzB,OAAOM,YAAY;EACrB,CAAC,CAAC;;EAEF;EACA,MAAMQ,eAAe,GAAG,IAAAC,aAAM,EAAC,KAAK,CAAC;EAErC,IAAAC,gBAAS,EAAC,MAAM;IACd;IACA,IAAInB,KAAK,CAACG,UAAU,CAACC,SAAS,CAACgB,IAAI,KAAK,CAAC,EAAE;MACzC,IAAIH,eAAe,CAACI,OAAO,IAAI,IAAAC,kCAAsB,EAACtB,KAAK,CAACG,UAAU,CAAC,EAAE;QACvE;QACAH,KAAK,CAACG,UAAU,CAACG,GAAG,CAAC,CAAC;QACtBN,KAAK,CAACQ,WAAW,CAACF,GAAG,CAAC,CAAC;MACzB,CAAC,MAAM;QACL;QACA;QACA,KAAK,MAAMK,UAAU,IAAIX,KAAK,CAACG,UAAU,CAACoB,YAAY,IAAI,EAAE,EAAE;UAC5DZ,UAAU,CAACC,GAAG,CAACZ,KAAK,CAACG,UAAU,CAAC;QAClC;MACF;IACF;IACAc,eAAe,CAACI,OAAO,GAAG,IAAI;IAC9B,OAAO,MAAM;MACX,IAAAL,yBAAa,EAAChB,KAAK,CAACG,UAAU,CAAC;MAC/B,IAAAa,yBAAa,EAAChB,KAAK,CAACQ,WAAW,CAAC;IAClC,CAAC;EACH,CAAC,EAAE,CAACR,KAAK,CAACG,UAAU,EAAEH,KAAK,CAACQ,WAAW,CAAC,CAAC;;EAEzC;EACA,IACE,IAAAgB,kBAAU,EAACxB,KAAK,EAAET,aAAa,EAAEI,kBAAkB,EAAEG,mBAAmB,CAAC,EACzE;IACA;AACJ;AACA;AACA;IACIG,QAAQ,CACN,IAAAM,kBAAW,EACTP,KAAK,EACLT,aAAa,EACbI,kBAAkB,EAClBG,mBAAmB,EACnB,IACF,CACF,CAAC;;IAED;IACA,oBAAO,IAAA2B,oBAAa,EAACC,eAAQ,CAAC;EAChC;EAEA,IAAIC,KAAK,GAAG,IAAAC,qBAAc,EACxB5B,KAAK,EACLT,aAAa,EACbD,IAAI,KAAKuC,kBAAK,GAAGC,eAAe,GAAGf,SACrC,CAAC;EAED,IAAIzB,IAAI,KAAKwB,iBAAI,IAAIa,KAAK,EAAEI,OAAO,EAAE;IACnCzC,IAAI,GAAG0C,sBAAS;EAClB;EAEA,IAAIhC,KAAK,CAACiC,QAAQ,EAAE;IAClB3C,IAAI,GAAG,IAAA4C,mCAAuB,EAAC5C,IAAI,CAAC;EACtC;EAEA,IAAIU,KAAK,CAACmC,SAAS,EAAE;IACnBR,KAAK,GAAG;MACNS,KAAK,EAAEpC,KAAK,CAACmC,SAAS;MACtBE,QAAQ,eAAE,IAAAZ,oBAAa,EAACnC,IAAI,EAAEqC,KAAK;IACrC,CAAC;IACDrC,IAAI,GAAGO,+BAAe,CAACyC,QAAQ;EACjC;EAEA,IAAItC,KAAK,CAACuC,UAAU,EAAE;IACpB;IACA;IACA,MAAMA,UAAU,GAAGC,MAAM,CAACC,WAAW,CACnCD,MAAM,CAACE,OAAO,CAAC1C,KAAK,CAACuC,UAAU,CAAC,CAACI,GAAG,CAAC,CAAC,CAACC,IAAI,EAAEC,SAAS,CAAC,KAAK,CAC1DD,IAAI,EACJC,SAAS,CAACC,GAAG,KAAK9C,KAAK,CAACU,gBAAgB,GACpC;MAAEoC,GAAG,EAAED,SAAS,CAACC,GAAG;MAAEnB,KAAK,EAAEpC;IAAc,CAAC,GAC3CO,mBAAmB,CAAC8C,IAAI,CAAC,IAAIC,SAAU,CAC7C,CACH,CAAC;IACDlB,KAAK,GAAG;MACNS,KAAK,EAAEG,UAAU;MACjBF,QAAQ,eAAE,IAAAZ,oBAAa,EAACnC,IAAI,EAAEqC,KAAK;IACrC,CAAC;IACDrC,IAAI,GAAGS,4BAAgB,CAACuC,QAAQ;EAClC;EAEA,oBAAO,IAAAb,oBAAa,EAACnC,IAAI,EAAEqC,KAAK,CAAC;AACnC;;AAEA;AACA;AACA;AACO,SAASoB,eAAeA,CAACC,OAAiC,EAAE;EACjE,OAAOR,MAAM,CAACE,OAAO,CAACM,OAAO,CAAC,CAACC,OAAO,CAAC,CAAC,CAACH,GAAG,EAAEV,KAAK,CAAC,KAAa;IAC/D,IAAIA,KAAK,KAAK,IAAI,EAAE;MAClB,OAAO;QACL3C,MAAM,EAAEqD,GAAG;QACXpD,MAAM,EAAEoD;MACV,CAAC;IACH,CAAC,MAAM,IAAIV,KAAK,KAAK,KAAK,EAAE;MAC1B,OAAO;QAAE3C,MAAM,EAAEqD,GAAG;QAAEpD,MAAM,EAAE;MAAM,CAAC;IACvC,CAAC,MAAM,IAAI,OAAO0C,KAAK,KAAK,QAAQ,EAAE;MACpC,OAAO;QAAE3C,MAAM,EAAEqD,GAAG;QAAEpD,MAAM,EAAE0C,KAAK,CAACc,KAAK,CAAC,GAAG;MAAE,CAAC;IAClD,CAAC,MAAM,IAAI,OAAOd,KAAK,KAAK,QAAQ,EAAE;MACpC;MACA;MACA,MAAMY,OAAO,GAAGZ,KAAK,CAACe,kBAAkB,IAAIf,KAAK,CAACgB,iBAAiB;MACnE,MAAMD,kBAAkB,GAAGH,OAAO,GAC9BR,MAAM,CAACC,WAAW,CAChBD,MAAM,CAACE,OAAO,CAACM,OAAO,CAAC,CAACL,GAAG,CAAC,CAAC,CAACU,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,EAAEC,CAAC,KAAK,IAAI,GAAGD,CAAC,GAAGC,CAAC,CAAC,CACjE,CAAC,GACDvC,SAAS;MAEb,IAAIwC,KAAK,CAACC,OAAO,CAACpB,KAAK,CAAC,EAAE;QACxB,OAAO;UAAE3C,MAAM,EAAEqD,GAAG;UAAEpD,MAAM,EAAE0C,KAAK;UAAEe;QAAmB,CAAC;MAC3D;MAEA,IAAI,QAAQ,IAAIf,KAAK,EAAE;QACrB,IAAIA,KAAK,CAAC1C,MAAM,KAAK,KAAK,EAAE;UAC1B,OAAO;YAAED,MAAM,EAAEqD,GAAG;YAAEpD,MAAM,EAAE,KAAK;YAAEyD;UAAmB,CAAC;QAC3D,CAAC,MAAM,IAAI,OAAOf,KAAK,CAAC1C,MAAM,KAAK,QAAQ,EAAE;UAC3C,MAAMA,MAAM,GAAG0C,KAAK,CAAC1C,MAAM,CAACwD,KAAK,CAAC,GAAG,CAAC;UAEtC,IAAIxD,MAAM,CAAC+D,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO;cAAEhE,MAAM,EAAEqD,GAAG;cAAEpD,MAAM,EAAEA,MAAM,CAAC,CAAC,CAAE;cAAEyD;YAAmB,CAAC;UAChE,CAAC,MAAM;YACL,OAAO;cAAE1D,MAAM,EAAEqD,GAAG;cAAEpD,MAAM;cAAEyD;YAAmB,CAAC;UACpD;QACF,CAAC,MAAM,IAAII,KAAK,CAACC,OAAO,CAACpB,KAAK,CAAC1C,MAAM,CAAC,EAAE;UACtC,OAAO;YAAED,MAAM,EAAEqD,GAAG;YAAEpD,MAAM,EAAE0C,KAAK,CAAC1C,MAAM;YAAEyD;UAAmB,CAAC;QAClE;MACF;IACF;IAEA,MAAM,IAAIO,KAAK,CAAC,iCAAiCZ,GAAG,KAAKV,KAAK,EAAE,CAAC;EACnE,CAAC,CAAC;AACJ;;AAEA;AACA;AACA,SAASN,eAAeA,CAACH,KAAsC,EAAE;EAC/D,IAAI,CAACA,KAAK,IAAI,EAAE,YAAY,IAAIA,KAAK,CAAC,EAAE,OAAOA,KAAK;EACpD,MAAM;IAAEgC,UAAU;IAAEC,KAAK;IAAE,GAAGC;EAAK,CAAC,GAAGlC,KAAK;EAC5C,OAAO;IACL,GAAGkC,IAAI;IACPD,KAAK,EAAE;MAAE,GAAGE,uBAAU,CAACC,OAAO,CAACH,KAAK,CAAC;MAAEI,SAAS,EAAEL;IAAW;EAC/D,CAAC;AACH","ignoreList":[]}

package/dist/commonjs/native/react/usePassthrough.js

@@ -32,8 +32,11 @@ function usePassthrough(type, {
     if (Array.isArray(target)) {
       for (let i = 0; i < target.length - 1; i++) {
         const prop = target[i];
-        props[prop] ??= {};
-        targetProps = props[prop];
+        const value = targetProps[prop];
+        targetProps[prop] = Array.isArray(value) ? [...value] : {
+          ...value
+        };
+        targetProps = targetProps[prop];
       }
       target = target[target.length - 1];
     }

package/dist/commonjs/native/react/usePassthrough.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_rules","cache","Map","usePassthrough","type","props","configs","config","source","target","classNames","styles","get","undefined","INLINE_RULE_SYMBOL","targetProps","Array","isArray","i","length","prop","createElement"],"sourceRoot":"../../../../src","sources":["native/react/usePassthrough.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAHA;;AAMA,MAAME,KAAK,GAAG,IAAIC,GAAG,CAA8B,CAAC;AAE7C,SAASC,cAAcA,CAC5BC,IAAwB,EACxB;EAAE,GAAGC;AAA2B,CAAC,EACjCC,OAAiB,EACjB;EACA,KAAK,MAAMC,MAAM,IAAID,OAAO,EAAE;IAC5B,IAAI;MAAEE,MAAM;MAAEC;IAAO,CAAC,GAAGF,MAAM;IAE/B,MAAMG,UAAU,GAAGL,KAAK,CAACG,MAAM,CAAC;IAEhC,IAAIG,MAAM,GAAGV,KAAK,CAACW,GAAG,CAACJ,MAAM,CAAC;IAC9B,IAAIG,MAAM,KAAKE,SAAS,EAAE;MACxBF,MAAM,GAAG;QAAE,CAACG,yBAAkB,GAAGJ;MAAW,CAAC;IAC/C;IAEA,OAAOL,KAAK,CAACG,MAAM,CAAC;IAEpB,IAAIE,UAAU,KAAKG,SAAS,IAAIJ,MAAM,KAAK,KAAK,EAAE;MAChD;IACF;IAEA,IAAIM,WAAW,GAAGV,KAAK;IAEvB,IAAIW,KAAK,CAACC,OAAO,CAACR,MAAM,CAAC,EAAE;MACzB,KAAK,IAAIS,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGT,MAAM,CAACU,MAAM,GAAG,CAAC,EAAED,CAAC,EAAE,EAAE;QAC1C,MAAME,IAAI,GAAGX,MAAM,CAACS,CAAC,CAAE;QACvBb,KAAK,CAACe,IAAI,CAAC,KAAK,CAAC,CAAC;QAClBL,WAAW,GAAGV,KAAK,CAACe,IAAI,CAAC;MAC3B;MACAX,MAAM,GAAGA,MAAM,CAACA,MAAM,CAACU,MAAM,GAAG,CAAC,CAAE;IACrC;IAEA,IAAIH,KAAK,CAACC,OAAO,CAACF,WAAW,CAACN,MAAM,CAAC,CAAC,EAAE;MACtCM,WAAW,CAACN,MAAM,CAAC,GAAG,CAAC,GAAGM,WAAW,CAACN,MAAM,CAAC,EAAEE,MAAM,CAAC;IACxD,CAAC,MAAM,IAAII,WAAW,CAACN,MAAM,CAAC,EAAE;MAC9BM,WAAW,CAACN,MAAM,CAAC,GAAG,CAACM,WAAW,CAACN,MAAM,CAAC,EAAEE,MAAM,CAAC;IACrD,CAAC,MAAM;MACLI,WAAW,CAACN,MAAM,CAAC,GAAGE,MAAM;IAC9B;EACF;EAEA,oBAAO,IAAAU,oBAAa,EAACjB,IAAI,EAAEC,KAAK,CAAC;AACnC","ignoreList":[]}
+{"version":3,"names":["_react","require","_rules","cache","Map","usePassthrough","type","props","configs","config","source","target","classNames","styles","get","undefined","INLINE_RULE_SYMBOL","targetProps","Array","isArray","i","length","prop","value","createElement"],"sourceRoot":"../../../../src","sources":["native/react/usePassthrough.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAHA;;AAMA,MAAME,KAAK,GAAG,IAAIC,GAAG,CAA8B,CAAC;AAE7C,SAASC,cAAcA,CAC5BC,IAAwB,EACxB;EAAE,GAAGC;AAA2B,CAAC,EACjCC,OAAiB,EACjB;EACA,KAAK,MAAMC,MAAM,IAAID,OAAO,EAAE;IAC5B,IAAI;MAAEE,MAAM;MAAEC;IAAO,CAAC,GAAGF,MAAM;IAE/B,MAAMG,UAAU,GAAGL,KAAK,CAACG,MAAM,CAAC;IAEhC,IAAIG,MAAM,GAAGV,KAAK,CAACW,GAAG,CAACJ,MAAM,CAAC;IAC9B,IAAIG,MAAM,KAAKE,SAAS,EAAE;MACxBF,MAAM,GAAG;QAAE,CAACG,yBAAkB,GAAGJ;MAAW,CAAC;IAC/C;IAEA,OAAOL,KAAK,CAACG,MAAM,CAAC;IAEpB,IAAIE,UAAU,KAAKG,SAAS,IAAIJ,MAAM,KAAK,KAAK,EAAE;MAChD;IACF;IAEA,IAAIM,WAAW,GAAGV,KAAK;IAEvB,IAAIW,KAAK,CAACC,OAAO,CAACR,MAAM,CAAC,EAAE;MACzB,KAAK,IAAIS,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGT,MAAM,CAACU,MAAM,GAAG,CAAC,EAAED,CAAC,EAAE,EAAE;QAC1C,MAAME,IAAI,GAAGX,MAAM,CAACS,CAAC,CAAE;QACvB,MAAMG,KAAK,GAAGN,WAAW,CAACK,IAAI,CAAC;QAC/BL,WAAW,CAACK,IAAI,CAAC,GAAGJ,KAAK,CAACC,OAAO,CAACI,KAAK,CAAC,GAAG,CAAC,GAAGA,KAAK,CAAC,GAAG;UAAE,GAAGA;QAAM,CAAC;QACpEN,WAAW,GAAGA,WAAW,CAACK,IAAI,CAAC;MACjC;MACAX,MAAM,GAAGA,MAAM,CAACA,MAAM,CAACU,MAAM,GAAG,CAAC,CAAE;IACrC;IAEA,IAAIH,KAAK,CAACC,OAAO,CAACF,WAAW,CAACN,MAAM,CAAC,CAAC,EAAE;MACtCM,WAAW,CAACN,MAAM,CAAC,GAAG,CAAC,GAAGM,WAAW,CAACN,MAAM,CAAC,EAAEE,MAAM,CAAC;IACxD,CAAC,MAAM,IAAII,WAAW,CAACN,MAAM,CAAC,EAAE;MAC9BM,WAAW,CAACN,MAAM,CAAC,GAAG,CAACM,WAAW,CAACN,MAAM,CAAC,EAAEE,MAAM,CAAC;IACrD,CAAC,MAAM;MACLI,WAAW,CAACN,MAAM,CAAC,GAAGE,MAAM;IAC9B;EACF;EAEA,oBAAO,IAAAW,oBAAa,EAAClB,IAAI,EAAEC,KAAK,CAAC;AACnC","ignoreList":[]}