@tamagui/core 2.0.0-1768427228811 → 2.0.0-1768586279389

package/dist/native.cjs

@@ -1953,14 +1953,14 @@ function requireNormalizeColor() {
     return (int % 360 + 360) % 360 / 360;
   }
   function parse1(str) {
-    const num = parseFloat(str);
-    if (num < 0) {
+    const num2 = parseFloat(str);
+    if (num2 < 0) {
       return 0;
     }
-    if (num > 1) {
+    if (num2 > 1) {
       return 255;
     }
-    return Math.round(num * 255);
+    return Math.round(num2 * 255);
   }
   function parsePercentage(str) {
     const int = parseFloat(str);
@@ -8438,9 +8438,179 @@ var getTokens = function() {
 };
 function setupDev(conf2) {
 }
-var cache$4 = /* @__PURE__ */ new Map(), cacheSize = 0, simpleHash = function(strIn) {
+var matchMediaImpl = matchMediaFallback, matchMedia$1 = function() {
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) args[_key] = arguments[_key];
+  return matchMediaImpl(...args);
+};
+function matchMediaFallback(query2) {
+  return !process.env.IS_STATIC && false, {
+    match: function(a, b2) {
+      return false;
+    },
+    addListener: function() {
+    },
+    removeListener: function() {
+    },
+    matches: false
+  };
+}
+function setupMatchMedia(_2) {
+  matchMediaImpl = _2, globalThis.matchMedia = _2;
+}
+exports.mediaState = // development only safeguard
+{};
+var mediaQueryConfig = {}, getMedia = function() {
+  return exports.mediaState;
+}, mediaKeys = /* @__PURE__ */ new Set(), mediaKeyRegex = /\$(platform|theme|group)-/, getMediaKey = function(key) {
+  if (key[0] !== "$") return false;
+  if (mediaKeys.has(key)) return true;
+  var match = key.match(mediaKeyRegex);
+  return match ? match[1] : false;
+}, initState, mediaKeysOrdered, getMediaKeyImportance = function(key) {
+  return mediaKeysOrdered.indexOf(key) + 100;
+}, dispose = /* @__PURE__ */ new Set(), mediaVersion = 0, configureMedia = function(config) {
+  var {
+    media
+  } = config, mediaQueryDefaultActive = getSetting("mediaQueryDefaultActive");
+  if (media) {
+    mediaVersion++;
+    for (var key in media) exports.mediaState[key] = (mediaQueryDefaultActive == null ? void 0 : mediaQueryDefaultActive[key]) || false, mediaKeys.add(`$${key}`);
+    Object.assign(mediaQueryConfig, media), initState = __spreadValues({}, exports.mediaState), mediaKeysOrdered = Object.keys(media), setupMediaListeners();
+  }
+};
+function unlisten() {
+  dispose.forEach(function(cb) {
+    return cb();
+  }), dispose.clear();
+}
+var setupVersion = -1;
+function setupMediaListeners() {
+  var _loop2 = function(key2) {
+    var str = mediaObjectToString(mediaQueryConfig[key2]), getMatch = function() {
+      return matchMedia$1(str);
+    }, match = getMatch();
+    if (!match) throw new Error("⚠️ No match");
+    match.addListener(update2), dispose.add(function() {
+      match.removeListener(update2);
+    });
+    function update2() {
+      var next = !!getMatch().matches;
+      next !== exports.mediaState[key2] && (exports.mediaState = __spreadProps(__spreadValues({}, exports.mediaState), {
+        [key2]: next
+      }), updateMediaListeners());
+    }
+    update2();
+  };
+  if (!process.env.IS_STATIC && setupVersion !== mediaVersion) {
+    setupVersion = mediaVersion, unlisten();
+    for (var key in mediaQueryConfig) _loop2(key);
+  }
+}
+var listeners = /* @__PURE__ */ new Set();
+function updateMediaListeners() {
+  listeners.forEach(function(cb) {
+    return cb(exports.mediaState);
+  });
+}
+var States = /* @__PURE__ */ new WeakMap();
+function setMediaShouldUpdate(ref, enabled, keys) {
+  var cur = States.get(ref);
+  (!cur || cur.enabled !== enabled || keys) && States.set(ref, __spreadProps(__spreadValues({}, cur), {
+    enabled,
+    keys
+  }));
+}
+function subscribe(subscriber) {
+  return listeners.add(subscriber), function() {
+    listeners.delete(subscriber);
+  };
+}
+function useMedia(componentContext, debug) {
+  var componentState = componentContext ? States.get(componentContext) : null, internalRef = React.useRef(null);
+  internalRef.current || (internalRef.current = {
+    keys: /* @__PURE__ */ new Set(),
+    lastState: exports.mediaState
+  }), internalRef.current.pendingState && (internalRef.current.lastState = internalRef.current.pendingState, internalRef.current.pendingState = void 0);
+  var {
+    keys
+  } = internalRef.current;
+  keys.size && keys.clear();
+  var state = React.useSyncExternalStore(subscribe, function() {
+    var curKeys2 = (componentState == null ? void 0 : componentState.keys) || keys, {
+      lastState,
+      pendingState
+    } = internalRef.current;
+    if (!curKeys2.size) return lastState;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+    try {
+      for (var _iterator = curKeys2[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var key = _step.value;
+        if (exports.mediaState[key] !== (pendingState || lastState)[key]) return false, (componentContext == null ? void 0 : componentContext.mediaEmit) ? (componentContext.mediaEmit(exports.mediaState), internalRef.current.pendingState = exports.mediaState, lastState) : (internalRef.current.lastState = exports.mediaState, exports.mediaState);
+      }
+    } catch (err) {
+      _didIteratorError = true, _iteratorError = err;
+    } finally {
+      try {
+        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+      } finally {
+        if (_didIteratorError) throw _iteratorError;
+      }
+    }
+    return lastState;
+  }, getServerSnapshot);
+  return new Proxy(state, {
+    get(_2, key) {
+      return !disableMediaTouch && typeof key == "string" && keys.add(key), Reflect.get(state, key);
+    }
+  });
+}
+var getServerSnapshot = function() {
+  return initState;
+}, disableMediaTouch = false;
+function _disableMediaTouch(val) {
+  disableMediaTouch = val;
+}
+function getMediaState(mediaGroups, layout) {
+  disableMediaTouch = true;
+  var res;
+  try {
+    res = Object.fromEntries([...mediaGroups].map(function(mediaKey) {
+      return [mediaKey, mediaKeyMatch(mediaKey, layout)];
+    }));
+  } finally {
+    disableMediaTouch = false;
+  }
+  return res;
+}
+var getMediaImportanceIfMoreImportant = function(mediaKey, key, styleState, isSizeMedia) {
+  var importance = isSizeMedia ? getMediaKeyImportance(mediaKey) : defaultMediaImportance, usedKeys = styleState.usedKeys;
+  return !usedKeys[key] || importance > usedKeys[key] ? importance : null;
+};
+function camelToHyphen(str) {
+  return str.replace(/[A-Z]/g, function(m) {
+    return `-${m.toLowerCase()}`;
+  }).toLowerCase();
+}
+var cache$4 = /* @__PURE__ */ new WeakMap();
+function mediaObjectToString(query2, key) {
+  if (typeof query2 == "string") return query2;
+  if (cache$4.has(query2)) return cache$4.get(query2);
+  var res = Object.entries(query2).map(function(param) {
+    var [feature, value] = param;
+    return feature = camelToHyphen(feature), typeof value == "string" ? `(${feature}: ${value})` : (typeof value == "number" && /[height|width]$/.test(feature) && (value = `${value}px`), `(${feature}: ${value})`);
+  }).join(" and ");
+  return cache$4.set(query2, res), res;
+}
+function mediaKeyMatch(key, dimensions2) {
+  var mediaQueries = mediaQueryConfig[key], result = Object.keys(mediaQueries).every(function(query2) {
+    var expectedVal = +mediaQueries[query2], isMax = query2.startsWith("max"), isWidth = query2.endsWith("Width"), givenVal = dimensions2[isWidth ? "width" : "height"];
+    return isMax ? givenVal < expectedVal : givenVal > expectedVal;
+  });
+  return result;
+}
+var cache$3 = /* @__PURE__ */ new Map(), cacheSize = 0, simpleHash = function(strIn) {
   var hashMin = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 10;
-  if (cache$4.has(strIn)) return cache$4.get(strIn);
+  if (cache$3.has(strIn)) return cache$3.get(strIn);
   var str = strIn;
   str[0] === "v" && str.startsWith("var(") && (str = str.slice(6, str.length - 1));
   for (var hash = 0, valids = "", added = 0, len = str.length, i = 0; i < len; i++) {
@@ -8458,7 +8628,7 @@ var cache$4 = /* @__PURE__ */ new Map(), cacheSize = 0, simpleHash = function(st
     hash = hashChar(hash, str[i]);
   }
   var res = valids + (hash ? Math.abs(hash) : "");
-  return cacheSize > 1e4 && (cache$4.clear(), cacheSize = 0), cache$4.set(strIn, res), cacheSize++, res;
+  return cacheSize > 1e4 && (cache$3.clear(), cacheSize = 0), cache$3.set(strIn, res), cacheSize++, res;
 }, hashChar = function(hash, c) {
   return Math.imul(31, hash) + c.charCodeAt(0) | 0;
 };
@@ -8546,13 +8716,14 @@ var webOnlyStylePropsView = {
   borderLeftStyle: true,
   borderRightStyle: true,
   borderTopStyle: true,
-  boxSizing: true,
+  // boxSizing: now supported in RN 0.77+ (New Architecture)
   caretColor: true,
   clipPath: true,
   contain: true,
   containerType: true,
   content: true,
   cursor: true,
+  // NOTE: cursor is supported on iOS 17+ for trackpad/stylus
   float: true,
   mask: true,
   maskBorder: true,
@@ -8571,13 +8742,10 @@ var webOnlyStylePropsView = {
   maskRepeat: true,
   maskSize: true,
   maskType: true,
-  mixBlendMode: true,
+  // mixBlendMode: now supported in RN 0.77+ (New Architecture)
   objectFit: true,
   objectPosition: true,
-  outlineOffset: true,
-  outlineStyle: true,
-  outlineWidth: true,
-  outlineColor: true,
+  // outline*: now supported in RN 0.77+ (New Architecture)
   overflowBlock: true,
   overflowInline: true,
   overflowX: true,
@@ -8633,7 +8801,7 @@ var textColors = {
   zIndex: {
     zIndex: true
   },
-  color: __spreadValues({
+  color: __spreadProps(__spreadValues({
     backgroundColor: true,
     borderColor: true,
     borderBlockStartColor: true,
@@ -8649,7 +8817,10 @@ var textColors = {
     borderEndColor: true,
     borderStartColor: true,
     shadowColor: true
-  }, textColors)
+  }, textColors), {
+    // outlineColor is supported on RN 0.77+ (New Architecture)
+    outlineColor: true
+  })
 }, stylePropsUnitless = {
   WebkitLineClamp: true,
   animationIterationCount: true,
@@ -8702,7 +8873,7 @@ var textColors = {
   rotateY: true,
   rotateX: true,
   rotateZ: true
-}, stylePropsView = __spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
+}, stylePropsView = __spreadProps(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
   backfaceVisibility: true,
   borderBottomEndRadius: true,
   borderBottomStartRadius: true,
@@ -8792,12 +8963,13 @@ var textColors = {
   elevationAndroid: true
 } : {}), {
   boxShadow: true,
-  filter: true
-}), !process.env.REACT_NATIVE_PRE_77 && {
+  filter: true,
+  // RN 0.76/0.77+ style props (New Architecture)
   boxSizing: true,
   mixBlendMode: true,
+  isolation: true,
   outlineColor: true,
-  outlineSpread: true,
+  outlineOffset: true,
   outlineStyle: true,
   outlineWidth: true
 }), stylePropsFont = {
@@ -8917,6 +9089,26 @@ function px(value) {
 function getOppositeScheme(scheme) {
   return scheme === "dark" ? "light" : "dark";
 }
+var colorStyleKeys = {
+  backgroundColor: true,
+  borderColor: true,
+  borderTopColor: true,
+  borderRightColor: true,
+  borderBottomColor: true,
+  borderLeftColor: true,
+  borderBlockColor: true,
+  borderBlockEndColor: true,
+  borderBlockStartColor: true,
+  color: true,
+  shadowColor: true,
+  textDecorationColor: true,
+  textShadowColor: true,
+  tintColor: true,
+  outlineColor: true
+};
+function isColorStyleKey(key) {
+  return colorStyleKeys[key] === true;
+}
 function getDynamicVal(param) {
   var {
     scheme,
@@ -9166,11 +9358,11 @@ function doesRootSchemeMatchSystem() {
   var _getRootThemeState;
   return ((_getRootThemeState = getRootThemeState()) === null || _getRootThemeState === void 0 ? void 0 : _getRootThemeState.scheme) === Appearance.getColorScheme();
 }
-var cache$3 = /* @__PURE__ */ new Map(), curKeys, curProps, curState, emptyObject = {};
+var cache$2 = /* @__PURE__ */ new Map(), curKeys, curProps, curState, emptyObject = {};
 function getThemeProxied(_props, _state, _keys) {
   if (!(_state == null ? void 0 : _state.theme)) return emptyObject;
-  if (curKeys = _keys, curProps = _props, curState = _state, cache$3.has(curState.theme)) {
-    var proxied = cache$3.get(curState.theme);
+  if (curKeys = _keys, curProps = _props, curState = _state, cache$2.has(curState.theme)) {
+    var proxied = cache$2.get(curState.theme);
     return proxied;
   }
   var config = getConfig();
@@ -9202,7 +9394,7 @@ function getThemeProxied(_props, _state, _keys) {
     });
     return [[key, proxied2], [`$${key}`, proxied2]];
   }));
-  return cache$3.set(_state.theme, proxied1), proxied1;
+  return cache$2.set(_state.theme, proxied1), proxied1;
 }
 var EMPTY = {}, useTheme = function() {
   var [theme] = useThemeWithState(EMPTY), res = theme;
@@ -9218,10 +9410,14 @@ var _withStableStyle = function(Component, styleProvider) {
       _expressions = []
     } = _a, rest = __objRest(_a, [
       "_expressions"
-    ]), theme = useTheme();
+    ]), theme = useTheme(), hasMediaKeys = _expressions.some(function(expr) {
+      return typeof expr == "string";
+    }), media = hasMediaKeys ? useMedia() : null, resolvedExpressions = media ? _expressions.map(function(expr) {
+      return typeof expr == "string" ? media[expr] : expr;
+    }) : _expressions;
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Component, __spreadValues({
       ref,
-      style: styleProvider(theme, _expressions)
+      style: styleProvider(theme, resolvedExpressions)
     }, rest));
   });
 };
@@ -9254,176 +9450,6 @@ var defaultComponentState = {
 }), defaultComponentStateShouldEnter = __spreadProps(__spreadValues({}, defaultComponentState), {
   unmounted: "should-enter"
 });
-var matchMediaImpl = matchMediaFallback, matchMedia$1 = function() {
-  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) args[_key] = arguments[_key];
-  return matchMediaImpl(...args);
-};
-function matchMediaFallback(query2) {
-  return !process.env.IS_STATIC && false, {
-    match: function(a, b2) {
-      return false;
-    },
-    addListener: function() {
-    },
-    removeListener: function() {
-    },
-    matches: false
-  };
-}
-function setupMatchMedia(_2) {
-  matchMediaImpl = _2, globalThis.matchMedia = _2;
-}
-exports.mediaState = // development only safeguard
-{};
-var mediaQueryConfig = {}, getMedia = function() {
-  return exports.mediaState;
-}, mediaKeys = /* @__PURE__ */ new Set(), mediaKeyRegex = /\$(platform|theme|group)-/, getMediaKey = function(key) {
-  if (key[0] !== "$") return false;
-  if (mediaKeys.has(key)) return true;
-  var match = key.match(mediaKeyRegex);
-  return match ? match[1] : false;
-}, initState, mediaKeysOrdered, getMediaKeyImportance = function(key) {
-  return mediaKeysOrdered.indexOf(key) + 100;
-}, dispose = /* @__PURE__ */ new Set(), mediaVersion = 0, configureMedia = function(config) {
-  var {
-    media
-  } = config, mediaQueryDefaultActive = getSetting("mediaQueryDefaultActive");
-  if (media) {
-    mediaVersion++;
-    for (var key in media) exports.mediaState[key] = (mediaQueryDefaultActive == null ? void 0 : mediaQueryDefaultActive[key]) || false, mediaKeys.add(`$${key}`);
-    Object.assign(mediaQueryConfig, media), initState = __spreadValues({}, exports.mediaState), mediaKeysOrdered = Object.keys(media), setupMediaListeners();
-  }
-};
-function unlisten() {
-  dispose.forEach(function(cb) {
-    return cb();
-  }), dispose.clear();
-}
-var setupVersion = -1;
-function setupMediaListeners() {
-  var _loop2 = function(key2) {
-    var str = mediaObjectToString(mediaQueryConfig[key2]), getMatch = function() {
-      return matchMedia$1(str);
-    }, match = getMatch();
-    if (!match) throw new Error("⚠️ No match");
-    match.addListener(update2), dispose.add(function() {
-      match.removeListener(update2);
-    });
-    function update2() {
-      var next = !!getMatch().matches;
-      next !== exports.mediaState[key2] && (exports.mediaState = __spreadProps(__spreadValues({}, exports.mediaState), {
-        [key2]: next
-      }), updateMediaListeners());
-    }
-    update2();
-  };
-  if (!process.env.IS_STATIC && setupVersion !== mediaVersion) {
-    setupVersion = mediaVersion, unlisten();
-    for (var key in mediaQueryConfig) _loop2(key);
-  }
-}
-var listeners = /* @__PURE__ */ new Set();
-function updateMediaListeners() {
-  listeners.forEach(function(cb) {
-    return cb(exports.mediaState);
-  });
-}
-var States = /* @__PURE__ */ new WeakMap();
-function setMediaShouldUpdate(ref, enabled, keys) {
-  var cur = States.get(ref);
-  (!cur || cur.enabled !== enabled || keys) && States.set(ref, __spreadProps(__spreadValues({}, cur), {
-    enabled,
-    keys
-  }));
-}
-function subscribe(subscriber) {
-  return listeners.add(subscriber), function() {
-    listeners.delete(subscriber);
-  };
-}
-function useMedia(componentContext, debug) {
-  var componentState = componentContext ? States.get(componentContext) : null, internalRef = React.useRef(null);
-  internalRef.current || (internalRef.current = {
-    keys: /* @__PURE__ */ new Set(),
-    lastState: exports.mediaState
-  }), internalRef.current.pendingState && (internalRef.current.lastState = internalRef.current.pendingState, internalRef.current.pendingState = void 0);
-  var {
-    keys
-  } = internalRef.current;
-  keys.size && keys.clear();
-  var state = React.useSyncExternalStore(subscribe, function() {
-    var curKeys2 = (componentState == null ? void 0 : componentState.keys) || keys, {
-      lastState,
-      pendingState
-    } = internalRef.current;
-    if (!curKeys2.size) return lastState;
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-    try {
-      for (var _iterator = curKeys2[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var key = _step.value;
-        if (exports.mediaState[key] !== (pendingState || lastState)[key]) return false, (componentContext == null ? void 0 : componentContext.mediaEmit) ? (componentContext.mediaEmit(exports.mediaState), internalRef.current.pendingState = exports.mediaState, lastState) : (internalRef.current.lastState = exports.mediaState, exports.mediaState);
-      }
-    } catch (err) {
-      _didIteratorError = true, _iteratorError = err;
-    } finally {
-      try {
-        !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
-      } finally {
-        if (_didIteratorError) throw _iteratorError;
-      }
-    }
-    return lastState;
-  }, getServerSnapshot);
-  return new Proxy(state, {
-    get(_2, key) {
-      return !disableMediaTouch && typeof key == "string" && keys.add(key), Reflect.get(state, key);
-    }
-  });
-}
-var getServerSnapshot = function() {
-  return initState;
-}, disableMediaTouch = false;
-function _disableMediaTouch(val) {
-  disableMediaTouch = val;
-}
-function getMediaState(mediaGroups, layout) {
-  disableMediaTouch = true;
-  var res;
-  try {
-    res = Object.fromEntries([...mediaGroups].map(function(mediaKey) {
-      return [mediaKey, mediaKeyMatch(mediaKey, layout)];
-    }));
-  } finally {
-    disableMediaTouch = false;
-  }
-  return res;
-}
-var getMediaImportanceIfMoreImportant = function(mediaKey, key, styleState, isSizeMedia) {
-  var importance = isSizeMedia ? getMediaKeyImportance(mediaKey) : defaultMediaImportance, usedKeys = styleState.usedKeys;
-  return !usedKeys[key] || importance > usedKeys[key] ? importance : null;
-};
-function camelToHyphen(str) {
-  return str.replace(/[A-Z]/g, function(m) {
-    return `-${m.toLowerCase()}`;
-  }).toLowerCase();
-}
-var cache$2 = /* @__PURE__ */ new WeakMap();
-function mediaObjectToString(query2, key) {
-  if (typeof query2 == "string") return query2;
-  if (cache$2.has(query2)) return cache$2.get(query2);
-  var res = Object.entries(query2).map(function(param) {
-    var [feature, value] = param;
-    return feature = camelToHyphen(feature), typeof value == "string" ? `(${feature}: ${value})` : (typeof value == "number" && /[height|width]$/.test(feature) && (value = `${value}px`), `(${feature}: ${value})`);
-  }).join(" and ");
-  return cache$2.set(query2, res), res;
-}
-function mediaKeyMatch(key, dimensions2) {
-  var mediaQueries = mediaQueryConfig[key], result = Object.keys(mediaQueries).every(function(query2) {
-    var expectedVal = +mediaQueries[query2], isMax = query2.startsWith("max"), isWidth = query2.endsWith("Width"), givenVal = dimensions2[isWidth ? "width" : "height"];
-    return isMax ? givenVal < expectedVal : givenVal > expectedVal;
-  });
-  return result;
-}
 function getGroupPropParts(groupProp) {
   var mediaQueries = getMedia(), [_2, name, part3, part4] = groupProp.split("-"), pseudo, media = part3 in mediaQueries ? part3 : void 0;
   return media ? pseudo = part4 : pseudo = part3, {
@@ -9635,9 +9661,58 @@ var _loop = function(parent) {
   EXPANSIONS[parent] = EXPANSIONS[parent].map(function(k) {
     return `${prefix}${k}`;
   });
+}, num = function(v) {
+  return Number.parseFloat(v) || 0;
+}, parseBoxShadowStr = function(s2) {
+  return s2.split(/,(?![^(]*\))/).map(function(sh) {
+    var p = sh.trim().split(/\s+/), i = p[0] === "inset" ? 1 : 0, o = {
+      offsetX: num(p[i++]),
+      offsetY: num(p[i++])
+    };
+    return p[0] === "inset" && (o.inset = true), p[i] && /^-?[\d.]/.test(p[i]) && (o.blurRadius = num(p[i++])), p[i] && /^-?[\d.]/.test(p[i]) && (o.spreadDistance = num(p[i++])), p[i] && (o.color = p.slice(i).join(" ")), o;
+  });
+}, simpleFilters = /* @__PURE__ */ new Set(["brightness", "opacity", "contrast", "grayscale", "invert", "saturate", "sepia", "blur"]), parseFilterStr = function(s2) {
+  var r = [], _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+  try {
+    for (var _iterator = s2.matchAll(/(\w+)\(([^)]+)\)/g)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var [, fn, val] = _step.value, n = +val || 0;
+      if (simpleFilters.has(fn)) r.push({
+        [fn]: n
+      });
+      else if (fn === "hueRotate" || fn === "hue-rotate") r.push({
+        hueRotate: val
+      });
+      else if (fn === "dropShadow" || fn === "drop-shadow") {
+        var p = val.trim().split(/\s+/), ds = {
+          offsetX: num(p[0]),
+          offsetY: num(p[1])
+        };
+        p[2] && /^-?[\d.]/.test(p[2]) ? (ds.blurRadius = num(p[2]), p[3] && (ds.color = p.slice(3).join(" "))) : p[2] && (ds.color = p.slice(2).join(" ")), r.push({
+          dropShadow: ds
+        });
+      }
+    }
+  } catch (err) {
+    _didIteratorError = true, _iteratorError = err;
+  } finally {
+    try {
+      !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
+    } finally {
+      if (_didIteratorError) throw _iteratorError;
+    }
+  }
+  return r;
 };
 function expandStyle(key, value) {
   if (isAndroid && key === "elevationAndroid") return [["elevation", value]];
+  if (key === "boxShadow") {
+    if (typeof value == "string") return [["boxShadow", parseBoxShadowStr(value)]];
+    if (value && !Array.isArray(value)) return [["boxShadow", [value]]];
+  }
+  if (key === "filter") {
+    if (typeof value == "string") return [["filter", parseFilterStr(value)]];
+    if (value && !Array.isArray(value)) return [["filter", [value]]];
+  }
   if (key in EXPANSIONS) return EXPANSIONS[key].map(function(key2) {
     return [key2, value];
   });
@@ -9646,18 +9721,17 @@ function expandStyle(key, value) {
   });
   if (key in webToNativeDynamicExpansion) return webToNativeDynamicExpansion[key](value);
 }
-var all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], xy = ["X", "Y"], EXPANSIONS = __spreadValues({
+var all = ["Top", "Right", "Bottom", "Left"], horiz = ["Right", "Left"], vert = ["Top", "Bottom"], EXPANSIONS = {
   borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
   borderRadius: ["TopLeftRadius", "TopRightRadius", "BottomRightRadius", "BottomLeftRadius"],
   borderWidth: ["TopWidth", "RightWidth", "BottomWidth", "LeftWidth"],
   margin: all,
   marginHorizontal: horiz,
   marginVertical: vert,
-  overscrollBehavior: xy,
   padding: all,
   paddingHorizontal: horiz,
   paddingVertical: vert
-}, isWeb);
+};
 for (var parent in EXPANSIONS) _loop(parent);
 var cache$1 = /* @__PURE__ */ new WeakMap(), getVariantExtras = function(styleState) {
   if (cache$1.has(styleState)) return cache$1.get(styleState);
@@ -9797,14 +9871,47 @@ function _type_of$3(obj) {
   "@swc/helpers - typeof";
   return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-var shorthandStringProps = {
-  boxShadow: 1,
-  border: 1,
-  borderTop: 1,
-  borderRight: 1,
-  borderBottom: 1,
-  borderLeft: 1,
-  background: 1
+var resolveTok = function(v, cat, sp, ss) {
+  if (typeof v == "string" && v[0] === "$") {
+    var r = getTokenForKey(cat, v, sp, ss);
+    return cat === "size" ? r != null && +r || 0 : r != null ? String(r) : v;
+  }
+  return cat === "size" ? typeof v == "number" ? v : +v || 0 : v;
+}, boxShadowObjResolve = function(v, sp, ss) {
+  return (Array.isArray(v) ? v : [v]).map(function(o) {
+    return __spreadValues(__spreadValues(__spreadValues(__spreadProps(__spreadValues({}, o.inset && {
+      inset: true
+    }), {
+      offsetX: resolveTok(o.offsetX, "size", sp, ss),
+      offsetY: resolveTok(o.offsetY, "size", sp, ss)
+    }), o.blurRadius != null && {
+      blurRadius: resolveTok(o.blurRadius, "size", sp, ss)
+    }), o.spreadDistance != null && {
+      spreadDistance: resolveTok(o.spreadDistance, "size", sp, ss)
+    }), o.color != null && {
+      color: resolveTok(o.color, "color", sp, ss)
+    });
+  });
+}, filterObjResolve = function(v, sp, ss) {
+  return (Array.isArray(v) ? v : [v]).map(function(o) {
+    if ("blur" in o) return {
+      blur: resolveTok(o.blur, "size", sp, ss)
+    };
+    if ("dropShadow" in o) {
+      var ds = o.dropShadow;
+      return {
+        dropShadow: __spreadValues(__spreadValues({
+          offsetX: resolveTok(ds.offsetX, "size", sp, ss),
+          offsetY: resolveTok(ds.offsetY, "size", sp, ss)
+        }, ds.blurRadius != null && {
+          blurRadius: resolveTok(ds.blurRadius, "size", sp, ss)
+        }), ds.color != null && {
+          color: resolveTok(ds.color, "color", sp, ss)
+        })
+      };
+    }
+    return o;
+  });
 }, propMapper = function(key, value, styleState, disabled, map) {
   if (disabled) return map(key, value);
   if (lastFontFamilyToken = null, !(!isAndroid && key === "elevationAndroid")) {
@@ -9833,13 +9940,13 @@ var shorthandStringProps = {
     }
     styleProps2.disableExpandShorthands || key in conf2.shorthands && (key = conf2.shorthands[key]);
     var originalValue = value;
-    if (value != null && (value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : (
-      /* Handle CSS shorthand strings with embedded $variables (e.g., boxShadow="0 0 10px $red") */
-      key in shorthandStringProps && typeof value == "string" && value.includes("$") ? value = value.replace(/\$[\w.-]+/g, function(token) {
-        var resolved = getTokenForKey("color", token, styleProps2, styleState);
-        return resolved != null ? String(resolved) : token;
-      }) : isVariable(value) ? value = resolveVariableValue(key, value, styleProps2.resolveValues) : isRemValue(value) && (value = resolveRem(value))
-    )), value != null) {
+    if (value != null && (key === "boxShadow" && (typeof value > "u" ? "undefined" : _type_of$3(value)) === "object" ? value = boxShadowObjResolve(value, styleProps2, styleState) : key === "filter" && (typeof value > "u" ? "undefined" : _type_of$3(value)) === "object" ? value = filterObjResolve(value, styleProps2, styleState) : typeof value == "string" && value[0] === "$" ? value = getTokenForKey(key, value, styleProps2, styleState) : key === "boxShadow" && typeof value == "string" && value.includes("$") ? value = value.replace(/(\$[\w.-]+)/g, function(t2) {
+      var cat = /^\$-?\d/.test(t2) ? "size" : "color", r = getTokenForKey(cat, t2, styleProps2, styleState);
+      return r != null ? String(r) : t2;
+    }) : key === "filter" && typeof value == "string" && value.includes("$") ? value = value.replace(/(\$[\w.-]+)/g, function(t2) {
+      var cat = /^\$-?\d/.test(t2) ? "size" : "color", r = getTokenForKey(cat, t2, styleProps2, styleState);
+      return r != null ? String(r) : t2;
+    }) : isVariable(value) ? value = resolveVariableValue(key, value, styleProps2.resolveValues) : isRemValue(value) && (value = resolveRem(value))), value != null) {
       key === "fontFamily" && lastFontFamilyToken && (styleState.fontFamily = lastFontFamilyToken);
       var expanded = styleProps2.noExpand ? null : expandStyle(key, value);
       if (expanded) for (var max = expanded.length, i = 0; i < max; i++) {
@@ -10210,12 +10317,16 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
             }
             var mediaStyle1 = getSubStyle(styleState, key4, val2, true), importanceBump = 0;
             if (isThemeMedia) {
-              if (dynamicThemeAccess = true, isIos && getSetting("fastSchemeChange")) {
+              if (isIos && getSetting("fastSchemeChange")) {
                 var _styleState3;
                 (_styleState3 = styleState).style || (_styleState3.style = {});
-                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1);
+                var scheme = mediaKeyShort, oppositeScheme = getOppositeScheme(mediaKeyShort), themeOriginalValues = styleOriginalValues.get(mediaStyle1), isCurrentScheme = themeName === scheme || themeName.startsWith(scheme);
                 for (var subKey1 in mediaStyle1) {
                   var _$val1 = extractValueFromDynamic(mediaStyle1[subKey1], scheme), existing = styleState.style[subKey1];
+                  if (!isColorStyleKey(subKey1)) {
+                    dynamicThemeAccess = true, isCurrentScheme ? mediaStyle1[subKey1] = _$val1 : delete mediaStyle1[subKey1];
+                    continue;
+                  }
                   if (existing == null ? void 0 : existing.dynamic) existing.dynamic[scheme] = _$val1, mediaStyle1[subKey1] = existing;
                   else {
                     var oppositeVal = extractValueFromDynamic(existing, oppositeScheme);
@@ -10226,7 +10337,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
                     }), mergeStyle(styleState, subKey1, mediaStyle1[subKey1], priority, false, themeOriginalValues == null ? void 0 : themeOriginalValues[subKey1]);
                   }
                 }
-              } else if (!(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
+              } else if (dynamicThemeAccess = true, !(themeName === mediaKeyShort || themeName.startsWith(mediaKeyShort))) return;
             } else if (isGroupMedia) {
               var _groupContext_groupName, _componentState_group, groupInfo = getGroupPropParts(mediaKeyShort), groupName = groupInfo.name, groupState = groupContext == null || (_groupContext_groupName = groupContext[groupName]) === null || _groupContext_groupName === void 0 ? void 0 : _groupContext_groupName.state, groupPseudoKey = groupInfo.pseudo, groupMediaKey = groupInfo.media;
               if (!groupState) {
@@ -10285,9 +10396,7 @@ var getSplitStyles = function(props, staticConfig, theme, themeName, componentSt
     inlineWhenUnflattened,
     parentStaticConfig,
     acceptsClassName
-  } = staticConfig, viewProps = {}, mediaState = styleProps2.mediaState || exports.mediaState, shouldDoClasses = acceptsClassName && isWeb, rulesToInsert = void 0, classNames = {}, pseudos = null;
-  props.space;
-  var hasMedia = false, dynamicThemeAccess, pseudoGroups, mediaGroups;
+  } = staticConfig, viewProps = {}, mediaState = styleProps2.mediaState || exports.mediaState, shouldDoClasses = acceptsClassName && isWeb, rulesToInsert = void 0, classNames = {}, pseudos = null, hasMedia = false, dynamicThemeAccess, pseudoGroups, mediaGroups;
   props.className || "";
   var mediaStylesSeen = 0, validStyles$1 = staticConfig.validStyles || (staticConfig.isText || staticConfig.isInput ? stylePropsText : validStyles);
   var styleState = {