@tamagui/core 1.81.4 → 1.82.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/native.js CHANGED
@@ -1060,6 +1060,7 @@ var require_validStyleProps_native = __commonJS({
1060
1060
  borderTopWidth: !0,
1061
1061
  borderWidth: !0,
1062
1062
  transform: !0,
1063
+ transformOrigin: !0,
1063
1064
  alignContent: !0,
1064
1065
  alignItems: !0,
1065
1066
  alignSelf: !0,
@@ -1564,36 +1565,6 @@ var require_insertStyleRule_native = __commonJS({
1564
1565
  }
1565
1566
  });
1566
1567
 
1567
- // ../web/dist/cjs/helpers/createProxy.native.js
1568
- var require_createProxy_native = __commonJS({
1569
- "../web/dist/cjs/helpers/createProxy.native.js"(exports, module2) {
1570
- "use strict";
1571
- var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
1572
- for (var name in all)
1573
- __defProp2(target, name, { get: all[name], enumerable: !0 });
1574
- }, __copyProps2 = (to, from, except, desc) => {
1575
- if (from && typeof from == "object" || typeof from == "function")
1576
- for (let key of __getOwnPropNames2(from))
1577
- !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
1578
- return to;
1579
- }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), createProxy_exports = {};
1580
- __export2(createProxy_exports, {
1581
- createProxy: () => createProxy
1582
- });
1583
- module2.exports = __toCommonJS2(createProxy_exports);
1584
- function createProxy(target, handler) {
1585
- return process.env.NODE_ENV === "development" && (typeof target != "object" || !target) && console.warn(
1586
- "Invalid object given for proxy:",
1587
- target,
1588
- `
1589
-
1590
- This can be due to a missing theme or configuration given to Tamagui.`,
1591
- new Error().stack
1592
- ), new Proxy(target || {}, handler);
1593
- }
1594
- }
1595
- });
1596
-
1597
1568
  // ../web/dist/cjs/helpers/matchMedia.native.js
1598
1569
  var require_matchMedia_native = __commonJS({
1599
1570
  "../web/dist/cjs/helpers/matchMedia.native.js"(exports, module2) {
@@ -1682,117 +1653,6 @@ var require_pseudoDescriptors_native = __commonJS({
1682
1653
  }
1683
1654
  });
1684
1655
 
1685
- // ../web/dist/cjs/helpers/objectIdentityKey.native.js
1686
- var require_objectIdentityKey_native = __commonJS({
1687
- "../web/dist/cjs/helpers/objectIdentityKey.native.js"(exports, module2) {
1688
- "use strict";
1689
- var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
1690
- for (var name in all)
1691
- __defProp2(target, name, { get: all[name], enumerable: !0 });
1692
- }, __copyProps2 = (to, from, except, desc) => {
1693
- if (from && typeof from == "object" || typeof from == "function")
1694
- for (let key of __getOwnPropNames2(from))
1695
- !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
1696
- return to;
1697
- }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), objectIdentityKey_exports = {};
1698
- __export2(objectIdentityKey_exports, {
1699
- objectIdentityKey: () => objectIdentityKey
1700
- });
1701
- module2.exports = __toCommonJS2(objectIdentityKey_exports);
1702
- function objectIdentityKey(obj) {
1703
- let k = "";
1704
- for (let key in obj) {
1705
- k += key;
1706
- let arg = obj[key], type = typeof arg;
1707
- if (!arg || type !== "object" && type !== "function")
1708
- k += type + arg;
1709
- else if (cache.has(arg))
1710
- k += cache.get(arg);
1711
- else {
1712
- let v = Math.random();
1713
- cache.set(arg, v), k += v;
1714
- }
1715
- }
1716
- return k;
1717
- }
1718
- var cache = /* @__PURE__ */ new WeakMap();
1719
- }
1720
- });
1721
-
1722
- // ../web/dist/cjs/helpers/createStyledContext.native.js
1723
- var require_createStyledContext_native = __commonJS({
1724
- "../web/dist/cjs/helpers/createStyledContext.native.js"(exports, module2) {
1725
- "use strict";
1726
- var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
1727
- for (var name in all)
1728
- __defProp2(target, name, { get: all[name], enumerable: !0 });
1729
- }, __copyProps2 = (to, from, except, desc) => {
1730
- if (from && typeof from == "object" || typeof from == "function")
1731
- for (let key of __getOwnPropNames2(from))
1732
- !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
1733
- return to;
1734
- }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), createStyledContext_exports = {};
1735
- __export2(createStyledContext_exports, {
1736
- createStyledContext: () => createStyledContext
1737
- });
1738
- module2.exports = __toCommonJS2(createStyledContext_exports);
1739
- var import_react3 = require("react"), import_objectIdentityKey = require_objectIdentityKey_native(), import_jsx_runtime = require("react/jsx-runtime");
1740
- function createStyledContext(defaultValues) {
1741
- let OGContext = (0, import_react3.createContext)(defaultValues), OGProvider = OGContext.Provider, Context = OGContext, scopedContexts = /* @__PURE__ */ new Map(), Provider = ({
1742
- children,
1743
- scope,
1744
- ...values
1745
- }) => {
1746
- let next = (0, import_react3.useMemo)(() => ({
1747
- // this ! is a workaround for ts error
1748
- ...defaultValues,
1749
- ...values
1750
- }), [(0, import_objectIdentityKey.objectIdentityKey)(values)]), Provider2 = OGProvider;
1751
- if (scope) {
1752
- let ScopedContext = scopedContexts.get(scope);
1753
- ScopedContext || (ScopedContext = (0, import_react3.createContext)(defaultValues), scopedContexts.set(scope, ScopedContext)), Provider2 = ScopedContext.Provider;
1754
- }
1755
- return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Provider2, { value: next, children });
1756
- }, useStyledContext = (scope) => {
1757
- let context = scope ? scopedContexts.get(scope) : OGContext;
1758
- return (0, import_react3.useContext)(context);
1759
- };
1760
- return Context.Provider = Provider, Context.props = defaultValues, Context.context = OGContext, Context.useStyledContext = useStyledContext, Context;
1761
- }
1762
- }
1763
- });
1764
-
1765
- // ../web/dist/cjs/contexts/ComponentContext.native.js
1766
- var require_ComponentContext_native = __commonJS({
1767
- "../web/dist/cjs/contexts/ComponentContext.native.js"(exports, module2) {
1768
- "use strict";
1769
- var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
1770
- for (var name in all)
1771
- __defProp2(target, name, { get: all[name], enumerable: !0 });
1772
- }, __copyProps2 = (to, from, except, desc) => {
1773
- if (from && typeof from == "object" || typeof from == "function")
1774
- for (let key of __getOwnPropNames2(from))
1775
- !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
1776
- return to;
1777
- }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), ComponentContext_exports = {};
1778
- __export2(ComponentContext_exports, {
1779
- ComponentContext: () => ComponentContext
1780
- });
1781
- module2.exports = __toCommonJS2(ComponentContext_exports);
1782
- var import_createStyledContext = require_createStyledContext_native(), ComponentContext = (0, import_createStyledContext.createStyledContext)({
1783
- disableSSR: void 0,
1784
- inText: !1,
1785
- language: null,
1786
- animationDriver: null,
1787
- groups: {
1788
- emit: null,
1789
- subscribe: null,
1790
- state: {}
1791
- }
1792
- });
1793
- }
1794
- });
1795
-
1796
1656
  // ../web/dist/cjs/hooks/useDisableSSR.native.js
1797
1657
  var require_useDisableSSR_native = __commonJS({
1798
1658
  "../web/dist/cjs/hooks/useDisableSSR.native.js"(exports, module2) {
@@ -1807,17 +1667,12 @@ var require_useDisableSSR_native = __commonJS({
1807
1667
  return to;
1808
1668
  }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), useDisableSSR_exports = {};
1809
1669
  __export2(useDisableSSR_exports, {
1810
- getDisableSSR: () => getDisableSSR,
1811
- useDisableSSR: () => useDisableSSR
1670
+ getDisableSSR: () => getDisableSSR
1812
1671
  });
1813
1672
  module2.exports = __toCommonJS2(useDisableSSR_exports);
1814
- var import_react3 = require("react"), import_config = require_config_native(), import_ComponentContext = require_ComponentContext_native();
1815
- function useDisableSSR() {
1816
- let componentContext = (0, import_react3.useContext)(import_ComponentContext.ComponentContext);
1817
- return getDisableSSR(componentContext);
1818
- }
1673
+ var import_config = require_config_native();
1819
1674
  function getDisableSSR(componentContext) {
1820
- return componentContext.disableSSR ?? (0, import_config.getConfig)().disableSSR;
1675
+ return (componentContext == null ? void 0 : componentContext.disableSSR) ?? (0, import_config.getConfig)().disableSSR;
1821
1676
  }
1822
1677
  }
1823
1678
  });
@@ -1853,9 +1708,9 @@ var require_useMedia_native = __commonJS({
1853
1708
  useMedia: () => useMedia2
1854
1709
  });
1855
1710
  module2.exports = __toCommonJS2(useMedia_exports);
1856
- var import_constants3 = require_index_native3(), import_react3 = require("react"), import_config = require_config_native(), import_createProxy = require_createProxy_native(), import_matchMedia = require_matchMedia_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_useDisableSSR = require_useDisableSSR_native(), mediaState2 = (
1711
+ var import_constants3 = require_index_native3(), import_react3 = require("react"), import_config = require_config_native(), import_matchMedia = require_matchMedia_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), import_useDisableSSR = require_useDisableSSR_native(), mediaState2 = (
1857
1712
  // development only safeguard
1858
- process.env.NODE_ENV === "development" ? (0, import_createProxy.createProxy)(
1713
+ process.env.NODE_ENV === "development" ? new Proxy(
1859
1714
  {},
1860
1715
  {
1861
1716
  get(target, key) {
@@ -1927,7 +1782,7 @@ var require_useMedia_native = __commonJS({
1927
1782
  return listeners.add(subscriber), () => listeners.delete(subscriber);
1928
1783
  }
1929
1784
  function useMedia2(uid, componentContext) {
1930
- let internal = (0, import_react3.useRef)(), initialState = ((componentContext ? (0, import_useDisableSSR.getDisableSSR)(componentContext) : (0, import_useDisableSSR.useDisableSSR)()) || !import_constants3.isWeb ? mediaState2 : initState) || {}, state = (0, import_react3.useSyncExternalStore)(
1785
+ let internal = (0, import_react3.useRef)(), initialState = ((0, import_useDisableSSR.getDisableSSR)(componentContext) || !import_constants3.isWeb ? mediaState2 : initState) || {}, state = (0, import_react3.useSyncExternalStore)(
1931
1786
  subscribe,
1932
1787
  () => {
1933
1788
  if (!internal.current)
@@ -2153,6 +2008,117 @@ var require_constants_native2 = __commonJS({
2153
2008
  }
2154
2009
  });
2155
2010
 
2011
+ // ../web/dist/cjs/helpers/objectIdentityKey.native.js
2012
+ var require_objectIdentityKey_native = __commonJS({
2013
+ "../web/dist/cjs/helpers/objectIdentityKey.native.js"(exports, module2) {
2014
+ "use strict";
2015
+ var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
2016
+ for (var name in all)
2017
+ __defProp2(target, name, { get: all[name], enumerable: !0 });
2018
+ }, __copyProps2 = (to, from, except, desc) => {
2019
+ if (from && typeof from == "object" || typeof from == "function")
2020
+ for (let key of __getOwnPropNames2(from))
2021
+ !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
2022
+ return to;
2023
+ }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), objectIdentityKey_exports = {};
2024
+ __export2(objectIdentityKey_exports, {
2025
+ objectIdentityKey: () => objectIdentityKey
2026
+ });
2027
+ module2.exports = __toCommonJS2(objectIdentityKey_exports);
2028
+ function objectIdentityKey(obj) {
2029
+ let k = "";
2030
+ for (let key in obj) {
2031
+ k += key;
2032
+ let arg = obj[key], type = typeof arg;
2033
+ if (!arg || type !== "object" && type !== "function")
2034
+ k += type + arg;
2035
+ else if (cache.has(arg))
2036
+ k += cache.get(arg);
2037
+ else {
2038
+ let v = Math.random();
2039
+ cache.set(arg, v), k += v;
2040
+ }
2041
+ }
2042
+ return k;
2043
+ }
2044
+ var cache = /* @__PURE__ */ new WeakMap();
2045
+ }
2046
+ });
2047
+
2048
+ // ../web/dist/cjs/helpers/createStyledContext.native.js
2049
+ var require_createStyledContext_native = __commonJS({
2050
+ "../web/dist/cjs/helpers/createStyledContext.native.js"(exports, module2) {
2051
+ "use strict";
2052
+ var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
2053
+ for (var name in all)
2054
+ __defProp2(target, name, { get: all[name], enumerable: !0 });
2055
+ }, __copyProps2 = (to, from, except, desc) => {
2056
+ if (from && typeof from == "object" || typeof from == "function")
2057
+ for (let key of __getOwnPropNames2(from))
2058
+ !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
2059
+ return to;
2060
+ }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), createStyledContext_exports = {};
2061
+ __export2(createStyledContext_exports, {
2062
+ createStyledContext: () => createStyledContext
2063
+ });
2064
+ module2.exports = __toCommonJS2(createStyledContext_exports);
2065
+ var import_react3 = require("react"), import_objectIdentityKey = require_objectIdentityKey_native(), import_jsx_runtime = require("react/jsx-runtime");
2066
+ function createStyledContext(defaultValues) {
2067
+ let OGContext = (0, import_react3.createContext)(defaultValues), OGProvider = OGContext.Provider, Context = OGContext, scopedContexts = /* @__PURE__ */ new Map(), Provider = ({
2068
+ children,
2069
+ scope,
2070
+ ...values
2071
+ }) => {
2072
+ let next = (0, import_react3.useMemo)(() => ({
2073
+ // this ! is a workaround for ts error
2074
+ ...defaultValues,
2075
+ ...values
2076
+ }), [(0, import_objectIdentityKey.objectIdentityKey)(values)]), Provider2 = OGProvider;
2077
+ if (scope) {
2078
+ let ScopedContext = scopedContexts.get(scope);
2079
+ ScopedContext || (ScopedContext = (0, import_react3.createContext)(defaultValues), scopedContexts.set(scope, ScopedContext)), Provider2 = ScopedContext.Provider;
2080
+ }
2081
+ return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Provider2, { value: next, children });
2082
+ }, useStyledContext = (scope) => {
2083
+ let context = scope ? scopedContexts.get(scope) : OGContext;
2084
+ return (0, import_react3.useContext)(context);
2085
+ };
2086
+ return Context.Provider = Provider, Context.props = defaultValues, Context.context = OGContext, Context.useStyledContext = useStyledContext, Context;
2087
+ }
2088
+ }
2089
+ });
2090
+
2091
+ // ../web/dist/cjs/contexts/ComponentContext.native.js
2092
+ var require_ComponentContext_native = __commonJS({
2093
+ "../web/dist/cjs/contexts/ComponentContext.native.js"(exports, module2) {
2094
+ "use strict";
2095
+ var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
2096
+ for (var name in all)
2097
+ __defProp2(target, name, { get: all[name], enumerable: !0 });
2098
+ }, __copyProps2 = (to, from, except, desc) => {
2099
+ if (from && typeof from == "object" || typeof from == "function")
2100
+ for (let key of __getOwnPropNames2(from))
2101
+ !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
2102
+ return to;
2103
+ }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), ComponentContext_exports = {};
2104
+ __export2(ComponentContext_exports, {
2105
+ ComponentContext: () => ComponentContext
2106
+ });
2107
+ module2.exports = __toCommonJS2(ComponentContext_exports);
2108
+ var import_createStyledContext = require_createStyledContext_native(), ComponentContext = (0, import_createStyledContext.createStyledContext)({
2109
+ disableSSR: void 0,
2110
+ inText: !1,
2111
+ language: null,
2112
+ animationDriver: null,
2113
+ groups: {
2114
+ emit: null,
2115
+ subscribe: null,
2116
+ state: {}
2117
+ }
2118
+ });
2119
+ }
2120
+ });
2121
+
2156
2122
  // ../web/dist/cjs/defaultComponentState.native.js
2157
2123
  var require_defaultComponentState_native = __commonJS({
2158
2124
  "../web/dist/cjs/defaultComponentState.native.js"(exports, module2) {
@@ -2931,10 +2897,10 @@ var require_normalizeColor_native = __commonJS({
2931
2897
  rgba: () => import_normalize_css_color2.rgba
2932
2898
  });
2933
2899
  module2.exports = __toCommonJS2(normalizeColor_exports);
2934
- var import_constants3 = require_index_native3(), import_normalize_css_color = require_index_native7(), import_normalize_css_color2 = require_index_native7(), normalizeColor = (color, opacity) => {
2900
+ var import_normalize_css_color = require_index_native7(), import_normalize_css_color2 = require_index_native7(), normalizeColor = (color, opacity) => {
2935
2901
  if (!color)
2936
2902
  return;
2937
- if (color[0] === "$" || color[0] === "v" && color.startsWith("var(") || import_constants3.isWeb && opacity === 1)
2903
+ if (color[0] === "$" || color.startsWith("var("))
2938
2904
  return color;
2939
2905
  let colorProcessed = (0, import_normalize_css_color.normalizeCSSColor)(color);
2940
2906
  if (colorProcessed != null) {
@@ -3060,7 +3026,7 @@ var require_expandStyles_native = __commonJS({
3060
3026
  function fixStyles(style) {
3061
3027
  "elevationAndroid" in style && (style.elevation = style.elevationAndroid, delete style.elevationAndroid), (style.shadowRadius || style.shadowColor || style.shadowOpacity || style.shadowOffset) && Object.assign(style, (0, import_normalizeShadow.normalizeShadow)(style));
3062
3028
  for (let key in borderDefaults)
3063
- key in style && !style[borderDefaults[key]] && (style[borderDefaults[key]] = "solid");
3029
+ key in style && (style[borderDefaults[key]] ||= "solid");
3064
3030
  }
3065
3031
  var nativeStyle = import_constants3.isWeb ? null : "borderStyle", borderDefaults = {
3066
3032
  borderWidth: "borderStyle",
@@ -3235,7 +3201,7 @@ var require_getVariantExtras_native = __commonJS({
3235
3201
  getVariantExtras: () => getVariantExtras
3236
3202
  });
3237
3203
  module2.exports = __toCommonJS2(getVariantExtras_exports);
3238
- var import_createVariable = require_createVariable_native(), import_createProxy = require_createProxy_native();
3204
+ var import_createVariable = require_createVariable_native();
3239
3205
  function getVariantExtras(styleState) {
3240
3206
  let { curProps, conf, context, theme } = styleState, fonts = conf.fontsParsed;
3241
3207
  context != null && context.language && (fonts = getFontsForLanguage(conf.fontsParsed, context.language));
@@ -3250,7 +3216,7 @@ var require_getVariantExtras_native = __commonJS({
3250
3216
  font: fonts[fontFamily] || fonts[styleState.conf.defaultFont],
3251
3217
  // TODO do this in splitstlye
3252
3218
  // we avoid passing in default props for media queries because that would confuse things like SizableText.size:
3253
- props: (0, import_createProxy.createProxy)(curProps, {
3219
+ props: new Proxy(curProps, {
3254
3220
  // handles shorthands
3255
3221
  get(target, key) {
3256
3222
  let shorthand = conf.inverseShorthands[key];
@@ -3325,7 +3291,7 @@ var require_propMapper_native = __commonJS({
3325
3291
  module2.exports = __toCommonJS2(propMapper_exports);
3326
3292
  var import_constants3 = require_index_native3(), import_helpers = require_index_native4(), import_config = require_config_native(), import_isDevTools = require_isDevTools_native(), import_createVariable = require_createVariable_native(), import_expandStyle = require_expandStyle_native(), import_expandStylesAndRemoveNullishValues = require_expandStylesAndRemoveNullishValues_native(), import_getVariantExtras = require_getVariantExtras_native(), import_isObj = require_isObj_native(), import_pseudoDescriptors = require_pseudoDescriptors_native(), propMapper = (key, value, styleStateIn, subPropsIn) => {
3327
3293
  var _a;
3328
- if (!import_constants3.isAndroid && key === "elevationAndroid")
3294
+ if (lastFontFamilyToken = null, !import_constants3.isAndroid && key === "elevationAndroid")
3329
3295
  return;
3330
3296
  if (value === "unset") {
3331
3297
  let unsetVal = (_a = styleStateIn.conf.unset) == null ? void 0 : _a[key];
@@ -3354,7 +3320,7 @@ var require_propMapper_native = __commonJS({
3354
3320
  let result = (styleProps.noExpand ? null : (0, import_expandStyle.expandStyle)(key, value)) || [
3355
3321
  [key, value]
3356
3322
  ];
3357
- return key === "fontFamily" && fontFamilyCache.set(result, lastFontFamilyToken), result;
3323
+ return key === "fontFamily" && lastFontFamilyToken && fontFamilyCache.set(result, lastFontFamilyToken), result;
3358
3324
  }
3359
3325
  }, resolveVariants = (key, value, styleProps, styleState, parentVariantKey) => {
3360
3326
  let { staticConfig, conf, debug } = styleState, { variants } = staticConfig;
@@ -4098,9 +4064,8 @@ var require_proxyThemeVariables_native = __commonJS({
4098
4064
  proxyThemeVariables: () => proxyThemeVariables
4099
4065
  });
4100
4066
  module2.exports = __toCommonJS2(proxyThemeVariables_exports);
4101
- var import_createProxy = require_createProxy_native();
4102
4067
  function proxyThemeVariables(obj) {
4103
- return (0, import_createProxy.createProxy)(obj || {}, {
4068
+ return new Proxy(obj || {}, {
4104
4069
  has(target, key) {
4105
4070
  return Reflect.has(target, removeStarting$(key));
4106
4071
  },
@@ -4284,28 +4249,6 @@ var require_ThemeManager_native = __commonJS({
4284
4249
  }
4285
4250
  });
4286
4251
 
4287
- // ../web/dist/cjs/hooks/getThemeUnwrapped.native.js
4288
- var require_getThemeUnwrapped_native = __commonJS({
4289
- "../web/dist/cjs/hooks/getThemeUnwrapped.native.js"(exports, module2) {
4290
- "use strict";
4291
- var __defProp2 = Object.defineProperty, __getOwnPropDesc2 = Object.getOwnPropertyDescriptor, __getOwnPropNames2 = Object.getOwnPropertyNames, __hasOwnProp2 = Object.prototype.hasOwnProperty, __export2 = (target, all) => {
4292
- for (var name in all)
4293
- __defProp2(target, name, { get: all[name], enumerable: !0 });
4294
- }, __copyProps2 = (to, from, except, desc) => {
4295
- if (from && typeof from == "object" || typeof from == "function")
4296
- for (let key of __getOwnPropNames2(from))
4297
- !__hasOwnProp2.call(to, key) && key !== except && __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
4298
- return to;
4299
- }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), getThemeUnwrapped_exports = {};
4300
- __export2(getThemeUnwrapped_exports, {
4301
- GetThemeUnwrapped: () => GetThemeUnwrapped,
4302
- getThemeUnwrapped: () => getThemeUnwrapped
4303
- });
4304
- module2.exports = __toCommonJS2(getThemeUnwrapped_exports);
4305
- var getThemeUnwrapped = (theme) => (theme == null ? void 0 : theme[GetThemeUnwrapped]) || theme, GetThemeUnwrapped = Symbol();
4306
- }
4307
- });
4308
-
4309
4252
  // ../web/dist/cjs/hooks/useTheme.native.js
4310
4253
  var require_useTheme_native = __commonJS({
4311
4254
  "../web/dist/cjs/hooks/useTheme.native.js"(exports, module2) {
@@ -4327,7 +4270,7 @@ var require_useTheme_native = __commonJS({
4327
4270
  useThemeWithState: () => useThemeWithState
4328
4271
  });
4329
4272
  module2.exports = __toCommonJS2(useTheme_exports);
4330
- var import_constants3 = require_index_native3(), import_react3 = require("react"), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_createProxy = require_createProxy_native(), import_createShallowSetState = require_createShallowSetState_native(), import_ThemeManager = require_ThemeManager_native(), import_ThemeManagerContext = require_ThemeManagerContext_native(), import_getThemeUnwrapped = require_getThemeUnwrapped_native(), emptyProps = { name: null }, cached;
4273
+ var import_constants3 = require_index_native3(), import_react3 = require("react"), import_config = require_config_native(), import_createVariable = require_createVariable_native(), import_createShallowSetState = require_createShallowSetState_native(), import_ThemeManager = require_ThemeManager_native(), import_ThemeManagerContext = require_ThemeManagerContext_native(), emptyProps = { name: null }, cached;
4331
4274
  function getDefaultThemeProxied() {
4332
4275
  if (cached)
4333
4276
  return cached;
@@ -4368,7 +4311,7 @@ If this is intended and you are using Tamagui without any themes, you can disabl
4368
4311
  function track(key) {
4369
4312
  keys && !keys.includes(key) && (keys.push(key), process.env.NODE_ENV === "development" && debug && console.info(` \u{1F3A8} useTheme() tracking new key: ${key}`));
4370
4313
  }
4371
- return (0, import_createProxy.createProxy)(theme, {
4314
+ return new Proxy(theme, {
4372
4315
  has(_, key) {
4373
4316
  if (Reflect.has(theme, key))
4374
4317
  return !0;
@@ -4376,8 +4319,6 @@ If this is intended and you are using Tamagui without any themes, you can disabl
4376
4319
  return key[0] === "$" && (key = key.slice(1)), themeManager == null ? void 0 : themeManager.allKeys.has(key);
4377
4320
  },
4378
4321
  get(_, key) {
4379
- if (key === import_getThemeUnwrapped.GetThemeUnwrapped)
4380
- return theme;
4381
4322
  if (
4382
4323
  // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
4383
4324
  // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
@@ -4578,6 +4519,7 @@ var require_ThemeDebug_native = __commonJS({
4578
4519
  }) {
4579
4520
  return children;
4580
4521
  }
4522
+ ThemeDebug.displayName = "ThemeDebug";
4581
4523
  }
4582
4524
  });
4583
4525
 
@@ -4623,6 +4565,7 @@ var require_Theme_native = __commonJS({
4623
4565
  }, [props.children, disableDirectChildTheme]);
4624
4566
  return useThemedChildren(themeState, children, props, isRoot);
4625
4567
  });
4568
+ Theme.displayName = "Theme";
4626
4569
  Theme.avoidForwardRef = !0;
4627
4570
  function useThemedChildren(themeState, children, props, isRoot = !1, avoidWrap = !1) {
4628
4571
  let { themeManager, isNewTheme } = themeState, { shallow, forceClassName } = props, hasEverThemed = (0, import_react3.useRef)(!1);
@@ -4766,7 +4709,11 @@ var require_Slot_native = __commonJS({
4766
4709
  );
4767
4710
  }
4768
4711
  return import_react3.Children.count(children) > 1 ? import_react3.Children.only(null) : null;
4769
- }), Slottable = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children }), pressMap = import_constants3.isWeb ? {
4712
+ });
4713
+ Slot.displayName = "Slot";
4714
+ var Slottable = ({ children }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children });
4715
+ Slottable.displayName = "Slottable";
4716
+ var pressMap = import_constants3.isWeb ? {
4770
4717
  onPress: "onClick",
4771
4718
  onPressOut: "onMouseUp",
4772
4719
  onPressIn: "onMouseDown"
@@ -5160,7 +5107,7 @@ If you meant to do this, you can disable this warning - either change untilMeasu
5160
5107
  fontFamily && fontFamily[0] === "$" && (fontFamily = fontFamily.slice(1));
5161
5108
  let fontFamilyClassName = fontFamily ? `font_${fontFamily}` : "", style = avoidAnimationStyle ? splitStyles.style : animationStyles || splitStyles.style, className;
5162
5109
  asChild === "except-style" || asChild === "except-style-web" || (viewProps.style = style);
5163
- let runtimePressStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusStyle), attachFocus = !!(runtimePressStyle || onFocus || onBlur), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onLongPress || onClick), runtimeHoverStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = runtimeHoverStyle || onHoverIn || onHoverOut, isHoverable = import_constants3.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), handlesPressEvents = !(import_constants3.isWeb || asChild), shouldAttach = !!(attachFocus || attachPress || isHoverable || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle);
5110
+ let runtimePressStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.pressStyle), runtimeFocusStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.focusStyle), attachFocus = !!(runtimePressStyle || onFocus || onBlur), attachPress = !!(groupName || runtimePressStyle || onPress || onPressOut || onPressIn || onLongPress || onClick), runtimeHoverStyle = !disabled && noClassNames && (pseudos == null ? void 0 : pseudos.hoverStyle), needsHoverState = runtimeHoverStyle || onHoverIn || onHoverOut, isHoverable = import_constants3.isWeb && !!(groupName || needsHoverState || onMouseEnter || onMouseLeave), shouldAttach = !!(attachFocus || attachPress || isHoverable || runtimePressStyle || runtimeHoverStyle || runtimeFocusStyle);
5164
5111
  process.env.NODE_ENV === "development" && time && time`events-setup`;
5165
5112
  let events = shouldAttach && !isDisabled && !props.asChild ? {
5166
5113
  onPressOut: attachPress ? (e) => {
@@ -5280,7 +5227,6 @@ If you meant to do this, you can disable this warning - either change untilMeasu
5280
5227
  defaultProps,
5281
5228
  splitStyles,
5282
5229
  animationStyles,
5283
- handlesPressEvents,
5284
5230
  willBeAnimated,
5285
5231
  isStringElement,
5286
5232
  classNamesIn: (_m = props.className) == null ? void 0 : _m.split(" "),
@@ -5596,11 +5542,10 @@ var require_proxyThemeToParents_native = __commonJS({
5596
5542
  }, __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: !0 }), mod), proxyThemeToParents_exports = {};
5597
5543
  __export2(proxyThemeToParents_exports, {
5598
5544
  proxyThemeToParents: () => proxyThemeToParents,
5599
- proxyThemesToParents: () => proxyThemesToParents,
5600
- themesRaw: () => themesRaw
5545
+ proxyThemesToParents: () => proxyThemesToParents
5601
5546
  });
5602
5547
  module2.exports = __toCommonJS2(proxyThemeToParents_exports);
5603
- var import_config = require_config_native(), import_getThemeUnwrapped = require_getThemeUnwrapped_native(), themesRaw = {};
5548
+ var import_config = require_config_native(), themesRaw = {};
5604
5549
  function proxyThemesToParents(dedupedThemes) {
5605
5550
  for (let { names, theme } of dedupedThemes)
5606
5551
  for (let name of names)
@@ -5617,9 +5562,7 @@ var require_proxyThemeToParents_native = __commonJS({
5617
5562
  let cur = [], parents = themeName.split("_").slice(0, -1).map((part) => (cur.push(part), cur.join("_"))), numParents = parents.length;
5618
5563
  return new Proxy(theme, {
5619
5564
  get(target, key) {
5620
- if (key === import_getThemeUnwrapped.GetThemeUnwrapped)
5621
- return theme;
5622
- if (key == null || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
5565
+ if (!key || // dont ask me, idk why but on hermes you can see that useTheme()[undefined] passes in STRING undefined to proxy
5623
5566
  // if someone is crazy enough to use "undefined" as a theme key then this not working is on them
5624
5567
  key == "undefined" || Reflect.has(target, key))
5625
5568
  return Reflect.get(target, key);
@@ -5628,7 +5571,7 @@ var require_proxyThemeToParents_native = __commonJS({
5628
5571
  if (parent && Reflect.has(parent, key))
5629
5572
  return Reflect.get(parent, key);
5630
5573
  }
5631
- return (0, import_config.getTokenObject)(key) ?? Reflect.get(target, key);
5574
+ return (0, import_config.getTokenObject)(key);
5632
5575
  }
5633
5576
  });
5634
5577
  }
@@ -5679,14 +5622,14 @@ var require_themes_native = __commonJS({
5679
5622
  module2.exports = __toCommonJS2(themes_exports);
5680
5623
  var import_createVariable = require_createVariable_native();
5681
5624
  function ensureThemeVariable(theme, key) {
5682
- let val = theme[key], themeKey = key;
5683
- (0, import_createVariable.isVariable)(val) ? val.name !== themeKey && (theme[key] = (0, import_createVariable.createVariable)({
5625
+ let val = theme[key];
5626
+ (0, import_createVariable.isVariable)(val) ? val.name !== key && (theme[key] = (0, import_createVariable.createVariable)({
5684
5627
  key: val.name,
5685
- name: themeKey,
5628
+ name: key,
5686
5629
  val: val.val
5687
5630
  })) : theme[key] = (0, import_createVariable.createVariable)({
5688
- key: themeKey,
5689
- name: themeKey,
5631
+ key,
5632
+ name: key,
5690
5633
  val
5691
5634
  });
5692
5635
  }
@@ -6036,31 +5979,18 @@ var require_mergeVariants_native = __commonJS({
6036
5979
  mergeVariants: () => mergeVariants
6037
5980
  });
6038
5981
  module2.exports = __toCommonJS2(mergeVariants_exports);
6039
- var mergeVariants = (parentVariants, ourVariants) => {
5982
+ var mergeVariants = (parentVariants, ourVariants, level = 0) => {
6040
5983
  let variants = {};
6041
5984
  for (let key in ourVariants) {
6042
5985
  let parentVariant = parentVariants == null ? void 0 : parentVariants[key], ourVariant = ourVariants[key];
6043
- if (!parentVariant || typeof ourVariant == "function") {
6044
- variants[key] = ourVariant;
6045
- continue;
6046
- }
6047
- if (parentVariant && !ourVariant) {
6048
- variants[key] = parentVariant[key];
6049
- continue;
6050
- }
6051
- variants[key] = {};
6052
- for (let subKey in ourVariant) {
6053
- let val = ourVariant[subKey], parentVal = parentVariant == null ? void 0 : parentVariant[subKey];
6054
- typeof val == "function" || !parentVal || typeof parentVal == "function" ? variants[key][subKey] = val : variants[key][subKey] = {
6055
- // keep order
6056
- ...parentVal,
6057
- ...val
6058
- };
6059
- }
6060
- parentVariant && (variants[key] = {
5986
+ !parentVariant || typeof ourVariant == "function" ? variants[key] = ourVariant : parentVariant && !ourVariant ? variants[key] = parentVariant[key] : level === 0 ? variants[key] = mergeVariants(
5987
+ parentVariant,
5988
+ ourVariant,
5989
+ level + 1
5990
+ ) : variants[key] = {
6061
5991
  ...parentVariant,
6062
- ...variants[key]
6063
- });
5992
+ ...ourVariant
5993
+ };
6064
5994
  }
6065
5995
  return {
6066
5996
  ...parentVariants,
@@ -6413,6 +6343,7 @@ var require_Stack_native = __commonJS({
6413
6343
  defaultProps: import_constants3.stackDefaultStyles,
6414
6344
  validStyles: import_helpers.validStyles
6415
6345
  });
6346
+ Stack2.displayName = "Stack";
6416
6347
  }
6417
6348
  });
6418
6349
 
@@ -6519,7 +6450,10 @@ var require_Text_native = __commonJS({
6519
6450
  Text: () => Text2
6520
6451
  });
6521
6452
  module2.exports = __toCommonJS2(Text_exports);
6522
- var import_helpers = require_index_native4(), import_createComponent = require_createComponent_native(), Text2 = (0, import_createComponent.createComponent)({
6453
+ var import_helpers = require_index_native4(), import_createComponent = require_createComponent_native(), ellipsisStyle = {
6454
+ numberOfLines: 1,
6455
+ lineBreakMode: "clip"
6456
+ }, Text2 = (0, import_createComponent.createComponent)({
6523
6457
  acceptsClassName: !0,
6524
6458
  isText: !0,
6525
6459
  defaultProps: {
@@ -6532,11 +6466,14 @@ var require_Text_native = __commonJS({
6532
6466
  ellipsizeMode: {
6533
6467
  "...": () => null
6534
6468
  },
6469
+ /**
6470
+ * @deprecated Use ellipsis instead
6471
+ */
6535
6472
  ellipse: {
6536
- true: {
6537
- numberOfLines: 1,
6538
- lineBreakMode: "clip"
6539
- }
6473
+ true: ellipsisStyle
6474
+ },
6475
+ ellipsis: {
6476
+ true: ellipsisStyle
6540
6477
  }
6541
6478
  },
6542
6479
  validStyles: {
@@ -6544,6 +6481,7 @@ var require_Text_native = __commonJS({
6544
6481
  ...import_helpers.stylePropsTextOnly
6545
6482
  }
6546
6483
  });
6484
+ Text2.displayName = "Text";
6547
6485
  }
6548
6486
  });
6549
6487
 
@@ -6605,6 +6543,7 @@ var require_FontLanguage_native = __commonJS({
6605
6543
  let language = (0, import_react3.useMemo)(() => props, [JSON.stringify(props)]);
6606
6544
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ComponentContext.ComponentContext.Provider, { language, children });
6607
6545
  };
6546
+ FontLanguage.displayName = "FontLanguage";
6608
6547
  }
6609
6548
  });
6610
6549
 
@@ -6657,6 +6596,7 @@ var require_TamaguiProvider_native = __commonJS({
6657
6596
  }
6658
6597
  ) });
6659
6598
  }
6599
+ TamaguiProvider.displayName = "TamaguiProvider";
6660
6600
  }
6661
6601
  });
6662
6602
 
@@ -6681,6 +6621,7 @@ var require_Configuration_native = __commonJS({
6681
6621
  let current = (0, import_react3.useContext)(import_ComponentContext.ComponentContext);
6682
6622
  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ComponentContext.ComponentContext.Provider, { ...current, ...props });
6683
6623
  };
6624
+ Configuration.displayName = "Configuration";
6684
6625
  }
6685
6626
  });
6686
6627
 
@@ -7261,7 +7202,7 @@ var View = import_web.View, Stack = import_web.Stack, Text = import_web.Text, ba
7261
7202
  return viewProps;
7262
7203
  },
7263
7204
  useEvents(viewProps, events, { pseudos }, setStateShallow, staticConfig) {
7264
- if (events != null && events.onFocus && (viewProps.onFocus = events.onFocus), events != null && events.onBlur && (viewProps.onBlur = events.onBlur), staticConfig.isInput) {
7205
+ if (events && (events.onFocus && (viewProps.onFocus = events.onFocus), events.onBlur && (viewProps.onBlur = events.onBlur)), staticConfig.isInput) {
7265
7206
  if (events) {
7266
7207
  let { onPressIn, onPressOut, onPress } = events, inputEvents = {
7267
7208
  onPressIn,
@@ -7271,8 +7212,12 @@ var View = import_web.View, Stack = import_web.Stack, Text = import_web.Text, ba
7271
7212
  }
7272
7213
  } else {
7273
7214
  events && viewProps.hitSlop && (events.hitSlop = viewProps.hitSlop);
7274
- let pressability = usePressability(events || null);
7275
- if (events && events.onPress)
7215
+ let pressability = usePressability(events);
7216
+ if (events && (process.env.NODE_ENV === "development" && viewProps.debug && console.info(
7217
+ `Checking for press ${!!events.onPress} then applying pressability props: ${Object.keys(
7218
+ pressability || {}
7219
+ )}`
7220
+ ), events.onPress))
7276
7221
  for (let key in pressability) {
7277
7222
  let og = viewProps[key], val = pressability[key];
7278
7223
  viewProps[key] = og && !dontComposePressabilityKeys[key] ? (0, import_web.composeEventHandlers)(og, val) : val;