@tamagui/core 1.0.1-beta.136 → 1.0.1-beta.139

package/dist/esm/helpers/getThemeCSSRules.js

@@ -0,0 +1,74 @@
+import { THEME_CLASSNAME_PREFIX } from "../constants/constants";
+import { tokensValueToVariable } from "./registerCSSVariable";
+function getThemeCSSRules({
+  config,
+  themeName,
+  theme,
+  names
+}) {
+  const cssRuleSets = [];
+  const hasDarkLight = "light" in config.themes && "dark" in config.themes;
+  const CNP = `.${THEME_CLASSNAME_PREFIX}`;
+  let vars = "";
+  for (const themeKey in theme) {
+    const variable = theme[themeKey];
+    let value = null;
+    if (variable.isFloating || !tokensValueToVariable.has(variable.val)) {
+      value = variable.val;
+    } else {
+      value = tokensValueToVariable.get(variable.val).variable;
+    }
+    vars += `--${themeKey}:${value};`;
+  }
+  const isDarkOrLightBase = themeName === "dark" || themeName === "light";
+  const selectors = names.map((name) => {
+    return `${CNP}${name}`;
+  });
+  if (hasDarkLight) {
+    for (const subName of names) {
+      const isDark = isDarkOrLightBase || subName.startsWith("dark_");
+      const max = config.maxDarkLightNesting ?? 3;
+      if (!isDark && !subName.startsWith("light_")) {
+        selectors.push(`:root:root ${CNP}${subName}`);
+        continue;
+      }
+      const childSelector = `${CNP}${subName.replace(isDark ? "dark_" : "light_", "")}`;
+      const order = isDark ? ["dark", "light"] : ["light", "dark"];
+      if (isDarkOrLightBase) {
+        order.reverse();
+      }
+      const [stronger, weaker] = order;
+      const numSelectors = Math.round(max * 1.5);
+      for (let pi = 0; pi < numSelectors; pi++) {
+        const isOdd = pi % 2 === 1;
+        if (isOdd && pi < 3)
+          continue;
+        const parents = new Array(pi + 1).fill(void 0).map((_, psi) => {
+          return `${CNP}${psi % 2 === 0 ? stronger : weaker}`;
+        });
+        let parentSelectors = parents.length > 1 ? parents.slice(1) : parents;
+        if (isOdd) {
+          const [_first, second, ...rest] = parentSelectors;
+          parentSelectors = [second, ...rest, second];
+        }
+        const lastParentSelector = parentSelectors[parentSelectors.length - 1];
+        selectors.push(`${parentSelectors.join(" ")} ${childSelector === lastParentSelector ? "" : childSelector}`);
+      }
+    }
+  }
+  const rootSep = config.themeClassNameOnRoot ? "" : " ";
+  const css = `${selectors.map((x) => `:root${rootSep}${x}`).join(", ")} {${vars}}`;
+  cssRuleSets.push(css);
+  if (config.shouldAddPrefersColorThemes && isDarkOrLightBase) {
+    const isDark = themeName.startsWith("dark");
+    cssRuleSets.push(`@media(prefers-color-scheme: ${isDark ? "dark" : "light"}) {
+body { background:${theme.background}; color: ${theme.color} }
+:root {${vars} } 
+}`);
+  }
+  return cssRuleSets;
+}
+export {
+  getThemeCSSRules
+};
+//# sourceMappingURL=getThemeCSSRules.js.map

package/dist/esm/helpers/getThemeCSSRules.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/getThemeCSSRules.ts"],
+  "sourcesContent": ["import { THEME_CLASSNAME_PREFIX } from '../constants/constants'\nimport { Variable } from '../createVariable'\nimport { CreateTamaguiProps, ThemeObject } from '../types'\nimport { tokensValueToVariable } from './registerCSSVariable'\n\nexport function getThemeCSSRules({\n  config,\n  themeName,\n  theme,\n  names,\n}: {\n  config: CreateTamaguiProps\n  themeName: string\n  theme: ThemeObject\n  names: string[]\n}) {\n  const cssRuleSets: string[] = []\n\n  // special case for SSR\n  const hasDarkLight = 'light' in config.themes && 'dark' in config.themes\n  const CNP = `.${THEME_CLASSNAME_PREFIX}`\n  let vars = ''\n\n  // themeToVariableToValueMap.set(theme, {})\n  // const varToValMap = themeToVariableToValueMap.get(theme)\n  for (const themeKey in theme) {\n    const variable = theme[themeKey] as Variable\n    let value: any = null\n    // if (varToValMap) {\n    //   varToValMap[variable.variable] = variable.val\n    // }\n    if (variable.isFloating || !tokensValueToVariable.has(variable.val)) {\n      value = variable.val\n    } else {\n      value = tokensValueToVariable.get(variable.val)!.variable\n    }\n    vars += `--${themeKey}:${value};`\n  }\n\n  const isDarkOrLightBase = themeName === 'dark' || themeName === 'light'\n  const selectors = names.map((name) => {\n    return `${CNP}${name}`\n  })\n\n  // since we dont specify dark/light in classnames we have to do an awkward specificity war\n  // use config.maxDarkLightNesting to determine how deep you can nest until it breaks\n  if (hasDarkLight) {\n    for (const subName of names) {\n      const isDark = isDarkOrLightBase || subName.startsWith('dark_')\n      const max = config.maxDarkLightNesting ?? 3\n\n      if (!isDark && !subName.startsWith('light_')) {\n        // neither light nor dark subtheme, just generate one selector with :root:root which\n        // will override all :root light/dark selectors generated below\n        selectors.push(`:root:root ${CNP}${subName}`)\n        continue\n      }\n\n      const childSelector = `${CNP}${subName.replace(isDark ? 'dark_' : 'light_', '')}`\n      const order = isDark ? ['dark', 'light'] : ['light', 'dark']\n      if (isDarkOrLightBase) {\n        order.reverse()\n      }\n      const [stronger, weaker] = order\n      const numSelectors = Math.round(max * 1.5)\n\n      for (let pi = 0; pi < numSelectors; pi++) {\n        const isOdd = pi % 2 === 1\n        if (isOdd && pi < 3) continue\n        const parents = new Array(pi + 1).fill(undefined).map((_, psi) => {\n          return `${CNP}${psi % 2 === 0 ? stronger : weaker}`\n        })\n        let parentSelectors = parents.length > 1 ? parents.slice(1) : parents\n        if (isOdd) {\n          const [_first, second, ...rest] = parentSelectors\n          parentSelectors = [second, ...rest, second]\n        }\n        // avoid .t_light .t_light at the end (make sure child is unique from last parent)\n        const lastParentSelector = parentSelectors[parentSelectors.length - 1]\n        selectors.push(\n          `${parentSelectors.join(' ')} ${\n            childSelector === lastParentSelector ? '' : childSelector\n          }`\n        )\n      }\n    }\n  }\n\n  const rootSep = config.themeClassNameOnRoot ? '' : ' '\n  const css = `${selectors.map((x) => `:root${rootSep}${x}`).join(', ')} {${vars}}`\n  cssRuleSets.push(css)\n\n  if (config.shouldAddPrefersColorThemes && isDarkOrLightBase) {\n    // add media prefers for dark/light base\n    const isDark = themeName.startsWith('dark')\n    cssRuleSets.push(\n      `@media(prefers-color-scheme: ${isDark ? 'dark' : 'light'}) {\nbody { background:${theme.background}; color: ${theme.color} }\n:root {${vars} } \n}`\n    )\n  }\n\n  return cssRuleSets\n}\n"],
+  "mappings": "AAAA;AAGA;AAEO,0BAA0B;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,GAMC;AACD,QAAM,cAAwB,CAAC;AAG/B,QAAM,eAAe,WAAW,OAAO,UAAU,UAAU,OAAO;AAClE,QAAM,MAAM,IAAI;AAChB,MAAI,OAAO;AAIX,aAAW,YAAY,OAAO;AAC5B,UAAM,WAAW,MAAM;AACvB,QAAI,QAAa;AAIjB,QAAI,SAAS,cAAc,CAAC,sBAAsB,IAAI,SAAS,GAAG,GAAG;AACnE,cAAQ,SAAS;AAAA,IACnB,OAAO;AACL,cAAQ,sBAAsB,IAAI,SAAS,GAAG,EAAG;AAAA,IACnD;AACA,YAAQ,KAAK,YAAY;AAAA,EAC3B;AAEA,QAAM,oBAAoB,cAAc,UAAU,cAAc;AAChE,QAAM,YAAY,MAAM,IAAI,CAAC,SAAS;AACpC,WAAO,GAAG,MAAM;AAAA,EAClB,CAAC;AAID,MAAI,cAAc;AAChB,eAAW,WAAW,OAAO;AAC3B,YAAM,SAAS,qBAAqB,QAAQ,WAAW,OAAO;AAC9D,YAAM,MAAM,OAAO,uBAAuB;AAE1C,UAAI,CAAC,UAAU,CAAC,QAAQ,WAAW,QAAQ,GAAG;AAG5C,kBAAU,KAAK,cAAc,MAAM,SAAS;AAC5C;AAAA,MACF;AAEA,YAAM,gBAAgB,GAAG,MAAM,QAAQ,QAAQ,SAAS,UAAU,UAAU,EAAE;AAC9E,YAAM,QAAQ,SAAS,CAAC,QAAQ,OAAO,IAAI,CAAC,SAAS,MAAM;AAC3D,UAAI,mBAAmB;AACrB,cAAM,QAAQ;AAAA,MAChB;AACA,YAAM,CAAC,UAAU,UAAU;AAC3B,YAAM,eAAe,KAAK,MAAM,MAAM,GAAG;AAEzC,eAAS,KAAK,GAAG,KAAK,cAAc,MAAM;AACxC,cAAM,QAAQ,KAAK,MAAM;AACzB,YAAI,SAAS,KAAK;AAAG;AACrB,cAAM,UAAU,IAAI,MAAM,KAAK,CAAC,EAAE,KAAK,MAAS,EAAE,IAAI,CAAC,GAAG,QAAQ;AAChE,iBAAO,GAAG,MAAM,MAAM,MAAM,IAAI,WAAW;AAAA,QAC7C,CAAC;AACD,YAAI,kBAAkB,QAAQ,SAAS,IAAI,QAAQ,MAAM,CAAC,IAAI;AAC9D,YAAI,OAAO;AACT,gBAAM,CAAC,QAAQ,WAAW,QAAQ;AAClC,4BAAkB,CAAC,QAAQ,GAAG,MAAM,MAAM;AAAA,QAC5C;AAEA,cAAM,qBAAqB,gBAAgB,gBAAgB,SAAS;AACpE,kBAAU,KACR,GAAG,gBAAgB,KAAK,GAAG,KACzB,kBAAkB,qBAAqB,KAAK,eAEhD;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,QAAM,UAAU,OAAO,uBAAuB,KAAK;AACnD,QAAM,MAAM,GAAG,UAAU,IAAI,CAAC,MAAM,QAAQ,UAAU,GAAG,EAAE,KAAK,IAAI,MAAM;AAC1E,cAAY,KAAK,GAAG;AAEpB,MAAI,OAAO,+BAA+B,mBAAmB;AAE3D,UAAM,SAAS,UAAU,WAAW,MAAM;AAC1C,gBAAY,KACV,gCAAgC,SAAS,SAAS;AAAA,oBACpC,MAAM,sBAAsB,MAAM;AAAA,SAC7C;AAAA,EAEL;AAAA,EACF;AAEA,SAAO;AACT;",
+  "names": []
+}

package/dist/esm/helpers/getThemeCSSRules.native.js

@@ -0,0 +1,7 @@
+function getThemeCSSRules() {
+  return [];
+}
+export {
+  getThemeCSSRules
+};
+//# sourceMappingURL=getThemeCSSRules.native.js.map

package/dist/esm/helpers/getThemeCSSRules.native.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/getThemeCSSRules.native.ts"],
+  "sourcesContent": ["export function getThemeCSSRules() {\n  return []\n}\n"],
+  "mappings": "AAAO,4BAA4B;AACjC,SAAO,CAAC;AACV;",
+  "names": []
+}

package/dist/esm/helpers/getVariantExtras.js

@@ -12,20 +12,20 @@ function getVariantExtras(props, languageContext, theme, defaultProps, avoidDefa
     theme,
     props: avoidDefaultProps ? props : new Proxy(props, {
       get(target, key) {
-        if (Reflect.has(target, key)) {
-          return Reflect.get(target, key);
-        }
         const shorthand = conf.inverseShorthands[key];
         if (shorthand && Reflect.has(target, shorthand)) {
           return Reflect.get(target, shorthand);
         }
+        if (Reflect.has(target, key)) {
+          return Reflect.get(target, key);
+        }
         if (defaultProps) {
-          if (Reflect.has(defaultProps, key)) {
-            return Reflect.get(defaultProps, key);
-          }
           if (shorthand && Reflect.has(defaultProps, shorthand)) {
             return Reflect.get(defaultProps, shorthand);
           }
+          if (Reflect.has(defaultProps, key)) {
+            return Reflect.get(defaultProps, key);
+          }
         }
       }
     })

package/dist/esm/helpers/getVariantExtras.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getVariantExtras.tsx"],
-  "sourcesContent": ["import { getConfig } from '../conf'\nimport { GenericFonts } from '../types'\nimport { LanguageContextType } from '../views/FontLanguage.types'\n\nconst extrasCache = new WeakMap()\n\nexport function getVariantExtras(\n  props: any,\n  languageContext?: LanguageContextType,\n  theme?: any,\n  defaultProps?: any,\n  avoidDefaultProps = false\n) {\n  const conf = getConfig()\n\n  if (extrasCache.has(props)) {\n    return extrasCache.get(props)\n  }\n\n  const fonts = languageContext\n    ? getFontsForLanguage(conf.fontsParsed, languageContext)\n    : conf.fontsParsed\n\n  const next = {\n    fonts,\n    tokens: conf.tokensParsed,\n    theme,\n    // TODO do this in splitstlye\n    // we avoid passing in default props for media queries because that would confuse things like SizableText.size:\n    props: avoidDefaultProps\n      ? props\n      : new Proxy(props, {\n          // handles shorthands\n          get(target, key) {\n            if (Reflect.has(target, key)) {\n              return Reflect.get(target, key)\n            }\n            const shorthand = conf.inverseShorthands[key as any]\n            if (shorthand && Reflect.has(target, shorthand)) {\n              return Reflect.get(target, shorthand)\n            }\n            // these props may be extracted into classNames, but we still want to access them\n            // at runtime, so we proxy back to defaultProps but don't pass them\n            if (defaultProps) {\n              if (Reflect.has(defaultProps, key)) {\n                return Reflect.get(defaultProps, key)\n              }\n              if (shorthand && Reflect.has(defaultProps, shorthand)) {\n                return Reflect.get(defaultProps, shorthand)\n              }\n            }\n          },\n        }),\n  }\n\n  extrasCache.set(props, next)\n\n  return next\n}\n\nconst fontLanguageCache = new WeakMap()\n\nexport function getFontsForLanguage(fonts: GenericFonts, language: LanguageContextType) {\n  if (fontLanguageCache.has(language)) {\n    return fontLanguageCache.get(language)\n  }\n  const next = {\n    ...fonts,\n    ...Object.fromEntries(\n      Object.entries(language).map(([name, lang]) => {\n        if (lang === 'default') {\n          return []\n        }\n        const langKey = `$${name}_${lang}`\n        return [`$${name}`, fonts[langKey]]\n      })\n    ),\n  }\n  fontLanguageCache.set(language, next)\n  return next\n}\n"],
-  "mappings": "AAAA;AAIA,MAAM,cAAc,oBAAI,QAAQ;AAEzB,0BACL,OACA,iBACA,OACA,cACA,oBAAoB,OACpB;AACA,QAAM,OAAO,UAAU;AAEvB,MAAI,YAAY,IAAI,KAAK,GAAG;AAC1B,WAAO,YAAY,IAAI,KAAK;AAAA,EAC9B;AAEA,QAAM,QAAQ,kBACV,oBAAoB,KAAK,aAAa,eAAe,IACrD,KAAK;AAET,QAAM,OAAO;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IAGA,OAAO,oBACH,QACA,IAAI,MAAM,OAAO;AAAA,MAEf,IAAI,QAAQ,KAAK;AACf,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AACA,cAAM,YAAY,KAAK,kBAAkB;AACzC,YAAI,aAAa,QAAQ,IAAI,QAAQ,SAAS,GAAG;AAC/C,iBAAO,QAAQ,IAAI,QAAQ,SAAS;AAAA,QACtC;AAGA,YAAI,cAAc;AAChB,cAAI,QAAQ,IAAI,cAAc,GAAG,GAAG;AAClC,mBAAO,QAAQ,IAAI,cAAc,GAAG;AAAA,UACtC;AACA,cAAI,aAAa,QAAQ,IAAI,cAAc,SAAS,GAAG;AACrD,mBAAO,QAAQ,IAAI,cAAc,SAAS;AAAA,UAC5C;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACP;AAEA,cAAY,IAAI,OAAO,IAAI;AAE3B,SAAO;AACT;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,6BAA6B,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ,GAAG;AACnC,WAAO,kBAAkB,IAAI,QAAQ;AAAA,EACvC;AACA,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO,YACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,UAAU;AAC7C,UAAI,SAAS,WAAW;AACtB,eAAO,CAAC;AAAA,MACV;AACA,YAAM,UAAU,IAAI,QAAQ;AAC5B,aAAO,CAAC,IAAI,QAAQ,MAAM,QAAQ;AAAA,IACpC,CAAC,CACH;AAAA,EACF;AACA,oBAAkB,IAAI,UAAU,IAAI;AACpC,SAAO;AACT;",
+  "sourcesContent": ["import { getConfig } from '../conf'\nimport { GenericFonts } from '../types'\nimport { LanguageContextType } from '../views/FontLanguage.types'\n\nconst extrasCache = new WeakMap()\n\nexport function getVariantExtras(\n  props: any,\n  languageContext?: LanguageContextType,\n  theme?: any,\n  defaultProps?: any,\n  avoidDefaultProps = false\n) {\n  const conf = getConfig()\n\n  if (extrasCache.has(props)) {\n    return extrasCache.get(props)\n  }\n\n  const fonts = languageContext\n    ? getFontsForLanguage(conf.fontsParsed, languageContext)\n    : conf.fontsParsed\n\n  const next = {\n    fonts,\n    tokens: conf.tokensParsed,\n    theme,\n    // TODO do this in splitstlye\n    // we avoid passing in default props for media queries because that would confuse things like SizableText.size:\n    props: avoidDefaultProps\n      ? props\n      : new Proxy(props, {\n          // handles shorthands\n          get(target, key) {\n            const shorthand = conf.inverseShorthands[key as any]\n            // shorthands before longhand because a styled() with longhand combined with inline shorthand\n            // shorthand will always be the overriding key\n            if (shorthand && Reflect.has(target, shorthand)) {\n              return Reflect.get(target, shorthand)\n            }\n            if (Reflect.has(target, key)) {\n              return Reflect.get(target, key)\n            }\n            // these props may be extracted into classNames, but we still want to access them\n            // at runtime, so we proxy back to defaultProps but don't pass them\n            if (defaultProps) {\n              if (shorthand && Reflect.has(defaultProps, shorthand)) {\n                return Reflect.get(defaultProps, shorthand)\n              }\n              if (Reflect.has(defaultProps, key)) {\n                return Reflect.get(defaultProps, key)\n              }\n            }\n          },\n        }),\n  }\n\n  extrasCache.set(props, next)\n\n  return next\n}\n\nconst fontLanguageCache = new WeakMap()\n\nexport function getFontsForLanguage(fonts: GenericFonts, language: LanguageContextType) {\n  if (fontLanguageCache.has(language)) {\n    return fontLanguageCache.get(language)\n  }\n  const next = {\n    ...fonts,\n    ...Object.fromEntries(\n      Object.entries(language).map(([name, lang]) => {\n        if (lang === 'default') {\n          return []\n        }\n        const langKey = `$${name}_${lang}`\n        return [`$${name}`, fonts[langKey]]\n      })\n    ),\n  }\n  fontLanguageCache.set(language, next)\n  return next\n}\n"],
+  "mappings": "AAAA;AAIA,MAAM,cAAc,oBAAI,QAAQ;AAEzB,0BACL,OACA,iBACA,OACA,cACA,oBAAoB,OACpB;AACA,QAAM,OAAO,UAAU;AAEvB,MAAI,YAAY,IAAI,KAAK,GAAG;AAC1B,WAAO,YAAY,IAAI,KAAK;AAAA,EAC9B;AAEA,QAAM,QAAQ,kBACV,oBAAoB,KAAK,aAAa,eAAe,IACrD,KAAK;AAET,QAAM,OAAO;AAAA,IACX;AAAA,IACA,QAAQ,KAAK;AAAA,IACb;AAAA,IAGA,OAAO,oBACH,QACA,IAAI,MAAM,OAAO;AAAA,MAEf,IAAI,QAAQ,KAAK;AACf,cAAM,YAAY,KAAK,kBAAkB;AAGzC,YAAI,aAAa,QAAQ,IAAI,QAAQ,SAAS,GAAG;AAC/C,iBAAO,QAAQ,IAAI,QAAQ,SAAS;AAAA,QACtC;AACA,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAGA,YAAI,cAAc;AAChB,cAAI,aAAa,QAAQ,IAAI,cAAc,SAAS,GAAG;AACrD,mBAAO,QAAQ,IAAI,cAAc,SAAS;AAAA,UAC5C;AACA,cAAI,QAAQ,IAAI,cAAc,GAAG,GAAG;AAClC,mBAAO,QAAQ,IAAI,cAAc,GAAG;AAAA,UACtC;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACP;AAEA,cAAY,IAAI,OAAO,IAAI;AAE3B,SAAO;AACT;AAEA,MAAM,oBAAoB,oBAAI,QAAQ;AAE/B,6BAA6B,OAAqB,UAA+B;AACtF,MAAI,kBAAkB,IAAI,QAAQ,GAAG;AACnC,WAAO,kBAAkB,IAAI,QAAQ;AAAA,EACvC;AACA,QAAM,OAAO;AAAA,IACX,GAAG;AAAA,IACH,GAAG,OAAO,YACR,OAAO,QAAQ,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,UAAU;AAC7C,UAAI,SAAS,WAAW;AACtB,eAAO,CAAC;AAAA,MACV;AACA,YAAM,UAAU,IAAI,QAAQ;AAC5B,aAAO,CAAC,IAAI,QAAQ,MAAM,QAAQ;AAAA,IACpC,CAAC,CACH;AAAA,EACF;AACA,oBAAkB,IAAI,UAAU,IAAI;AACpC,SAAO;AACT;",
   "names": []
 }

package/dist/esm/helpers/insertStyleRule.js

@@ -44,7 +44,12 @@ function updateInserted() {
     const sheet2 = sheets[i];
     if (!sheet2)
       continue;
-    const rules = sheet2.cssRules;
+    let rules;
+    try {
+      rules = sheet2.cssRules;
+    } catch {
+      continue;
+    }
     const len = rules.length;
     const lastScanned = scannedNum.get(sheet2) ?? 0;
     if (lastScanned === len) {

package/dist/esm/helpers/insertStyleRule.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "sourcesContent": ["// this needs to check if its inserted already? 99% of the time it is\n// this should avoid re-inserts, but need to test the perf trade-offs\n// i tested with the site itself and the initial insert was trivial\n\nimport { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors = {}\nconst allRules = {}\nexport const insertedTransforms = {}\n\nexport const getAllSelectors = () => allSelectors\nexport const getAllRules = () => Object.values(allRules)\nexport const getAllTransforms = () => insertedTransforms\n\n// keep transforms in map for merging later\nfunction addTransform(identifier: string, css: string, rule?: CSSRule) {\n  const s = css.indexOf('transform:')\n  if (s === -1) {\n    if (process.env.NODE_ENV === 'development') {\n      // sometimes getting empty style rules from webpack... :/ only in dev\n      if (css.indexOf('{ }')) {\n        console.log('wah wah')\n        return false\n      }\n      console.groupCollapsed(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\n      console.log('rule:', rule)\n      console.trace()\n      console.groupEnd()\n    } else {\n      console.warn(`Missing transform`, identifier, css, rule)\n    }\n    return false\n  }\n  const startI = s + 'transform:'.length\n  const endI = css.indexOf(';')\n  const value = css.slice(startI, endI)\n  if (!insertedTransforms[identifier]) {\n    insertedTransforms[identifier] = value\n    return true\n  }\n  return false\n}\n\nconst isClient = typeof document !== 'undefined'\n\n// gets existing ones (client side)\n// takes ~0.1ms for a fairly large page\n// used now for three things:\n//   1. debugging at dev time\n//   2. avoid duplicate insert styles at runtime\n//   3. used now for merging transforms atomically\nconst scannedNum = new WeakMap<CSSStyleSheet, number>()\n\nexport function updateInserted() {\n  if (process.env.NODE_ENV === 'test') return\n  if (!isClient) return\n  const sheets = document.styleSheets\n  if (!sheets) return\n  for (let i = 0; i < sheets.length; i++) {\n    const sheet = sheets[i]\n    if (!sheet) continue\n    const rules = sheet.cssRules\n    const len = rules.length\n    const lastScanned = scannedNum.get(sheet) ?? 0\n    if (lastScanned === len) {\n      continue\n    }\n    for (let i = lastScanned; i < len; i++) {\n      const rule = rules[i]\n      const response = getTamaguiSelector(rule)\n      if (!response) {\n        continue\n      }\n      const [identifier, cssRule] = response\n      if (!allSelectors[identifier]) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform ? addTransform(identifier, cssRule.cssText, cssRule) : true\n        if (shouldInsert) {\n          allSelectors[identifier] = process.env.NODE_ENV === 'development' ? cssRule.cssText : true\n        }\n      }\n    }\n    scannedNum.set(sheet, i)\n  }\n}\n\nfunction getTamaguiSelector(rule: CSSRule | null): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    if (rule.selectorText.startsWith('._')) {\n      return [rule.selectorText.slice(1), rule]\n    }\n    if (rule.selectorText.startsWith(':root') && rule.selectorText.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(rule.selectorText), rule]\n    }\n  } else if (rule instanceof CSSMediaRule) {\n    // tamagui only ever inserts 1 rule per media\n    if (rule.cssRules.length > 1) return null\n    return getTamaguiSelector(rule.cssRules[0])\n  }\n  return null\n}\n\nconst getIdentifierFromTamaguiSelector = (selector: string) =>\n  selector\n    .replace(/(:root)+\\s+/, '')\n    .replace(/:[a-z]+$/, '')\n    .slice(1)\n\n// move this to probably inside createTamagui\nupdateInserted()\n\nconst sheet = isClient ? document.head.appendChild(document.createElement('style')).sheet : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules\n  if (identifier.startsWith('_transform')) {\n    return addTransform(identifier, rules[0])\n  }\n  return true\n}\n\n// [property, identifier, rules]\nexport type PartialStyleObject = Pick<StyleObject, 'identifier' | 'property' | 'rules'>\nexport type RulesToInsert = PartialStyleObject[]\n\nexport function insertStyleRules(rulesToInsert: RulesToInsert) {\n  // // pointerevents can have more than one, others could to needs some refactor\n  for (const { identifier, rules } of rulesToInsert) {\n    if (allSelectors[identifier] || !sheet) return\n    allSelectors[identifier] = process.env.NODE_ENV === 'development' ? rules : true\n    updateRules(identifier, rules)\n    for (const rule of rules) {\n      sheet.insertRule(rule, sheet.cssRules.length)\n    }\n  }\n}\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  return !allSelectors[styleObject.identifier]\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["// this needs to check if its inserted already? 99% of the time it is\n// this should avoid re-inserts, but need to test the perf trade-offs\n// i tested with the site itself and the initial insert was trivial\n\nimport { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors = {}\nconst allRules = {}\nexport const insertedTransforms = {}\n\nexport const getAllSelectors = () => allSelectors\nexport const getAllRules = () => Object.values(allRules)\nexport const getAllTransforms = () => insertedTransforms\n\n// keep transforms in map for merging later\nfunction addTransform(identifier: string, css: string, rule?: CSSRule) {\n  const s = css.indexOf('transform:')\n  if (s === -1) {\n    if (process.env.NODE_ENV === 'development') {\n      // sometimes getting empty style rules from webpack... :/ only in dev\n      if (css.indexOf('{ }')) {\n        console.log('wah wah')\n        return false\n      }\n      console.groupCollapsed(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\n      console.log('rule:', rule)\n      console.trace()\n      console.groupEnd()\n    } else {\n      console.warn(`Missing transform`, identifier, css, rule)\n    }\n    return false\n  }\n  const startI = s + 'transform:'.length\n  const endI = css.indexOf(';')\n  const value = css.slice(startI, endI)\n  if (!insertedTransforms[identifier]) {\n    insertedTransforms[identifier] = value\n    return true\n  }\n  return false\n}\n\nconst isClient = typeof document !== 'undefined'\n\n// gets existing ones (client side)\n// takes ~0.1ms for a fairly large page\n// used now for three things:\n//   1. debugging at dev time\n//   2. avoid duplicate insert styles at runtime\n//   3. used now for merging transforms atomically\nconst scannedNum = new WeakMap<CSSStyleSheet, number>()\n\nexport function updateInserted() {\n  if (process.env.NODE_ENV === 'test') return\n  if (!isClient) return\n  const sheets = document.styleSheets\n  if (!sheets) return\n  for (let i = 0; i < sheets.length; i++) {\n    const sheet = sheets[i]\n    if (!sheet) continue\n\n    // avoid errors on cross origin sheets\n    // https://stackoverflow.com/questions/49993633/uncaught-domexception-failed-to-read-the-cssrules-property\n    let rules: CSSRuleList\n    try {\n      rules = sheet.cssRules\n    } catch {\n      continue\n    }\n\n    const len = rules.length\n    const lastScanned = scannedNum.get(sheet) ?? 0\n    if (lastScanned === len) {\n      continue\n    }\n    for (let i = lastScanned; i < len; i++) {\n      const rule = rules[i]\n      const response = getTamaguiSelector(rule)\n      if (!response) {\n        continue\n      }\n      const [identifier, cssRule] = response\n      if (!allSelectors[identifier]) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform ? addTransform(identifier, cssRule.cssText, cssRule) : true\n        if (shouldInsert) {\n          allSelectors[identifier] = process.env.NODE_ENV === 'development' ? cssRule.cssText : true\n        }\n      }\n    }\n    scannedNum.set(sheet, i)\n  }\n}\n\nfunction getTamaguiSelector(rule: CSSRule | null): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    if (rule.selectorText.startsWith('._')) {\n      return [rule.selectorText.slice(1), rule]\n    }\n    if (rule.selectorText.startsWith(':root') && rule.selectorText.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(rule.selectorText), rule]\n    }\n  } else if (rule instanceof CSSMediaRule) {\n    // tamagui only ever inserts 1 rule per media\n    if (rule.cssRules.length > 1) return null\n    return getTamaguiSelector(rule.cssRules[0])\n  }\n  return null\n}\n\nconst getIdentifierFromTamaguiSelector = (selector: string) =>\n  selector\n    .replace(/(:root)+\\s+/, '')\n    .replace(/:[a-z]+$/, '')\n    .slice(1)\n\n// move this to probably inside createTamagui\nupdateInserted()\n\nconst sheet = isClient ? document.head.appendChild(document.createElement('style')).sheet : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules\n  if (identifier.startsWith('_transform')) {\n    return addTransform(identifier, rules[0])\n  }\n  return true\n}\n\n// [property, identifier, rules]\nexport type PartialStyleObject = Pick<StyleObject, 'identifier' | 'property' | 'rules'>\nexport type RulesToInsert = PartialStyleObject[]\n\nexport function insertStyleRules(rulesToInsert: RulesToInsert) {\n  // // pointerevents can have more than one, others could to needs some refactor\n  for (const { identifier, rules } of rulesToInsert) {\n    if (allSelectors[identifier] || !sheet) return\n    allSelectors[identifier] = process.env.NODE_ENV === 'development' ? rules : true\n    updateRules(identifier, rules)\n    for (const rule of rules) {\n      sheet.insertRule(rule, sheet.cssRules.length)\n    }\n  }\n}\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  return !allSelectors[styleObject.identifier]\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/helpers/mergeProps.js

@@ -1,25 +1,29 @@
-const mergeProps = (a, b, leaveOutClassNames = false) => {
-  var _a, _b;
+const mergeProps = (a, b, leaveOutClassNames = false, inverseShorthands) => {
   const out = {};
   const outCns = leaveOutClassNames ? {} : null;
   for (const key in a) {
-    if (!(key in b)) {
-      if (leaveOutClassNames && ((_a = a[key]) == null ? void 0 : _a[0]) === "_") {
-        outCns[key] = a[key];
-      } else {
-        out[key] = a[key];
-      }
-    }
+    mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands);
   }
   for (const key in b) {
-    if (leaveOutClassNames && ((_b = b[key]) == null ? void 0 : _b[0]) === "_") {
-      outCns[key] = b[key];
-    } else {
-      out[key] = b[key];
-    }
+    mergeProp(out, outCns, b, void 0, key, leaveOutClassNames, inverseShorthands);
   }
   return [out, outCns];
 };
+function mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands) {
+  const val = a[key];
+  const shorthand = inverseShorthands ? inverseShorthands[key] : null;
+  if (b && (key in b || shorthand && shorthand in b)) {
+    return;
+  }
+  if (shorthand) {
+    key = shorthand;
+  }
+  if (leaveOutClassNames && (val == null ? void 0 : val[0]) === "_") {
+    outCns[key] = val;
+  } else {
+    out[key] = val;
+  }
+}
 export {
   mergeProps
 };

package/dist/esm/helpers/mergeProps.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/mergeProps.ts"],
-  "sourcesContent": ["/**\n * Preserves prop ordering, so that the order most closely matches the last spread objects\n * Useful for having { ...defaultProps, ...props } that ensure props ordering is always kept\n *\n *    Given:\n *      mergeProps({ a: 1, b: 2 }, { b: 1, a: 2 })\n *    The final key order will be:\n *      b, a\n */\n\nexport const mergeProps = (a: Object, b: Object, leaveOutClassNames = false) => {\n  const out: Record<string, string> = {}\n  const outCns: Record<string, string> = leaveOutClassNames ? {} : (null as any)\n\n  for (const key in a) {\n    if (!(key in b)) {\n      if (leaveOutClassNames && a[key]?.[0] === '_') {\n        outCns[key] = a[key]\n      } else {\n        out[key] = a[key]\n      }\n    }\n  }\n\n  for (const key in b) {\n    if (leaveOutClassNames && b[key]?.[0] === '_') {\n      outCns[key] = b[key]\n    } else {\n      out[key] = b[key]\n    }\n  }\n\n  return [out, outCns] as const\n}\n"],
-  "mappings": "AAUO,MAAM,aAAa,CAAC,GAAW,GAAW,qBAAqB,UAAU;AAVhF;AAWE,QAAM,MAA8B,CAAC;AACrC,QAAM,SAAiC,qBAAqB,CAAC,IAAK;AAElE,aAAW,OAAO,GAAG;AACnB,QAAI,CAAE,QAAO,IAAI;AACf,UAAI,sBAAsB,SAAE,SAAF,mBAAS,QAAO,KAAK;AAC7C,eAAO,OAAO,EAAE;AAAA,MAClB,OAAO;AACL,YAAI,OAAO,EAAE;AAAA,MACf;AAAA,IACF;AAAA,EACF;AAEA,aAAW,OAAO,GAAG;AACnB,QAAI,sBAAsB,SAAE,SAAF,mBAAS,QAAO,KAAK;AAC7C,aAAO,OAAO,EAAE;AAAA,IAClB,OAAO;AACL,UAAI,OAAO,EAAE;AAAA,IACf;AAAA,EACF;AAEA,SAAO,CAAC,KAAK,MAAM;AACrB;",
+  "sourcesContent": ["/**\n * Preserves prop ordering, so that the order most closely matches the last spread objects\n * Useful for having { ...defaultProps, ...props } that ensure props ordering is always kept\n *\n *    Given:\n *      mergeProps({ a: 1, b: 2 }, { b: 1, a: 2 })\n *    The final key order will be:\n *      b, a\n *\n * Handles a couple special tamagui cases\n *   - classNames can be extracted out separately\n *   - shorthands can be expanded before merging\n */\n\ntype StringRecord = Record<string, string>\n\nexport const mergeProps = (\n  a: Object,\n  b: Object,\n  leaveOutClassNames = false,\n  inverseShorthands?: StringRecord\n) => {\n  const out: StringRecord = {}\n  const outCns: StringRecord = leaveOutClassNames ? {} : (null as any)\n  for (const key in a) {\n    mergeProp(out, outCns, a, b, key, leaveOutClassNames, inverseShorthands)\n  }\n  for (const key in b) {\n    mergeProp(out, outCns, b, undefined, key, leaveOutClassNames, inverseShorthands)\n  }\n  return [out, outCns] as const\n}\n\nfunction mergeProp(\n  out: StringRecord,\n  outCns: StringRecord,\n  a: Object,\n  b: Object | undefined,\n  key: string,\n  leaveOutClassNames: boolean,\n  inverseShorthands?: StringRecord\n) {\n  const val = a[key]\n  const shorthand = inverseShorthands ? inverseShorthands[key] : null\n  if (b && (key in b || (shorthand && shorthand in b))) {\n    return\n  }\n  if (shorthand) {\n    key = shorthand\n  }\n  if (leaveOutClassNames && val?.[0] === '_') {\n    outCns[key] = val\n  } else {\n    out[key] = val\n  }\n}\n"],
+  "mappings": "AAgBO,MAAM,aAAa,CACxB,GACA,GACA,qBAAqB,OACrB,sBACG;AACH,QAAM,MAAoB,CAAC;AAC3B,QAAM,SAAuB,qBAAqB,CAAC,IAAK;AACxD,aAAW,OAAO,GAAG;AACnB,cAAU,KAAK,QAAQ,GAAG,GAAG,KAAK,oBAAoB,iBAAiB;AAAA,EACzE;AACA,aAAW,OAAO,GAAG;AACnB,cAAU,KAAK,QAAQ,GAAG,QAAW,KAAK,oBAAoB,iBAAiB;AAAA,EACjF;AACA,SAAO,CAAC,KAAK,MAAM;AACrB;AAEA,mBACE,KACA,QACA,GACA,GACA,KACA,oBACA,mBACA;AACA,QAAM,MAAM,EAAE;AACd,QAAM,YAAY,oBAAoB,kBAAkB,OAAO;AAC/D,MAAI,KAAM,QAAO,KAAM,aAAa,aAAa,IAAK;AACpD;AAAA,EACF;AACA,MAAI,WAAW;AACb,UAAM;AAAA,EACR;AACA,MAAI,sBAAsB,4BAAM,QAAO,KAAK;AAC1C,WAAO,OAAO;AAAA,EAChB,OAAO;AACL,QAAI,OAAO;AAAA,EACb;AACF;",
   "names": []
 }

package/dist/esm/helpers/themes.js

@@ -0,0 +1,54 @@
+import { createVariable, isVariable } from "../createVariable";
+import { GetThemeUnwrapped } from "../hooks/getThemeUnwrapped";
+function ensureThemeVariable(theme, key) {
+  const val = theme[key];
+  const themeKey = key;
+  if (!isVariable(val)) {
+    theme[key] = createVariable({
+      key: themeKey,
+      name: themeKey,
+      val
+    });
+  } else {
+    if (val.name !== themeKey) {
+      theme[key] = createVariable({
+        key: val.name,
+        name: themeKey,
+        val: val.val
+      });
+    }
+  }
+}
+function proxyThemeToParents(themeName, theme, themes) {
+  const cur = [];
+  const parents = themeName.split("_").slice(0, -1).map((part) => {
+    cur.push(part);
+    return cur.join("_");
+  });
+  const hasParents = parents.length;
+  return new Proxy(theme, {
+    get(target, key) {
+      if (key === GetThemeUnwrapped) {
+        return theme;
+      }
+      if (!hasParents || Reflect.has(target, key)) {
+        return Reflect.get(target, key);
+      }
+      for (let i = parents.length - 1; i >= 0; i--) {
+        const parent = themes[parents[i]];
+        if (!parent) {
+          continue;
+        }
+        if (Reflect.has(parent, key)) {
+          return Reflect.get(parent, key);
+        }
+      }
+      return Reflect.get(target, key);
+    }
+  });
+}
+export {
+  ensureThemeVariable,
+  proxyThemeToParents
+};
+//# sourceMappingURL=themes.js.map

package/dist/esm/helpers/themes.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/themes.ts"],
+  "sourcesContent": ["import { createVariable, isVariable } from '../createVariable'\nimport { GetThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { CreateTamaguiProps } from '../types'\n\n// mutates, freeze after\n// shared by createTamagui so extracted here\nexport function ensureThemeVariable(theme: any, key: string) {\n  const val = theme[key]\n  const themeKey = key\n  if (!isVariable(val)) {\n    theme[key] = createVariable({\n      key: themeKey,\n      name: themeKey,\n      val,\n    })\n  } else {\n    if (val.name !== themeKey) {\n      // rename to theme name\n      theme[key] = createVariable({\n        key: val.name,\n        name: themeKey,\n        val: val.val,\n      })\n    }\n  }\n}\n\nexport function proxyThemeToParents(\n  themeName: string,\n  theme: any,\n  themes: CreateTamaguiProps['themes']\n) {\n  // we could test if this is better as just a straight object spread or fancier proxy\n  const cur: string[] = []\n  // if theme is dark_blue_alt1_Button\n  // this will be the parent names in order: ['dark', 'dark_blue', 'dark_blue_alt1\"]\n  const parents = themeName\n    .split('_')\n    .slice(0, -1)\n    .map((part) => {\n      cur.push(part)\n      return cur.join('_')\n    })\n\n  const hasParents = parents.length\n\n  // proxy fallback values to parent theme values\n  return new Proxy(theme, {\n    get(target, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      }\n      if (!hasParents || Reflect.has(target, key)) {\n        return Reflect.get(target, key)\n      }\n      // check parents\n      for (let i = parents.length - 1; i >= 0; i--) {\n        const parent = themes[parents[i]]\n        if (!parent) {\n          continue\n        }\n        if (Reflect.has(parent, key)) {\n          return Reflect.get(parent, key)\n        }\n      }\n      return Reflect.get(target, key)\n    },\n  })\n}\n"],
+  "mappings": "AAAA;AACA;AAKO,6BAA6B,OAAY,KAAa;AAC3D,QAAM,MAAM,MAAM;AAClB,QAAM,WAAW;AACjB,MAAI,CAAC,WAAW,GAAG,GAAG;AACpB,UAAM,OAAO,eAAe;AAAA,MAC1B,KAAK;AAAA,MACL,MAAM;AAAA,MACN;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,QAAI,IAAI,SAAS,UAAU;AAEzB,YAAM,OAAO,eAAe;AAAA,QAC1B,KAAK,IAAI;AAAA,QACT,MAAM;AAAA,QACN,KAAK,IAAI;AAAA,MACX,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEO,6BACL,WACA,OACA,QACA;AAEA,QAAM,MAAgB,CAAC;AAGvB,QAAM,UAAU,UACb,MAAM,GAAG,EACT,MAAM,GAAG,EAAE,EACX,IAAI,CAAC,SAAS;AACb,QAAI,KAAK,IAAI;AACb,WAAO,IAAI,KAAK,GAAG;AAAA,EACrB,CAAC;AAEH,QAAM,aAAa,QAAQ;AAG3B,SAAO,IAAI,MAAM,OAAO;AAAA,IACtB,IAAI,QAAQ,KAAK;AACf,UAAI,QAAQ,mBAAmB;AAC7B,eAAO;AAAA,MACT;AACA,UAAI,CAAC,cAAc,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC3C,eAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,MAChC;AAEA,eAAS,IAAI,QAAQ,SAAS,GAAG,KAAK,GAAG,KAAK;AAC5C,cAAM,SAAS,OAAO,QAAQ;AAC9B,YAAI,CAAC,QAAQ;AACX;AAAA,QACF;AACA,YAAI,QAAQ,IAAI,QAAQ,GAAG,GAAG;AAC5B,iBAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,QAChC;AAAA,MACF;AACA,aAAO,QAAQ,IAAI,QAAQ,GAAG;AAAA,IAChC;AAAA,EACF,CAAC;AACH;",
+  "names": []
+}

package/dist/esm/hooks/useId.js

@@ -1,31 +1,4 @@
-import * as React from "react";
-import { isWeb, useIsomorphicLayoutEffect } from "../constants/platform";
-let serverHandoffComplete = false;
-let id = 0;
-function genId() {
-  return ++id;
-}
-function useId(providedId) {
-  if (isWeb) {
-    if (typeof React.useId === "function") {
-      let id3 = React.useId();
-      return providedId != null ? providedId : id3;
-    }
-  }
-  let initialId = providedId ?? (serverHandoffComplete ? genId() : null);
-  let [id2, setId] = React.useState(initialId);
-  useIsomorphicLayoutEffect(() => {
-    if (id2 === null) {
-      setId(genId());
-    }
-  }, []);
-  React.useEffect(() => {
-    if (serverHandoffComplete === false) {
-      serverHandoffComplete = true;
-    }
-  }, []);
-  return providedId ?? id2 ?? void 0;
-}
+import { useId } from "react";
 export {
   useId
 };

package/dist/esm/hooks/useId.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useId.tsx"],
-  "sourcesContent": ["/*\n * Welcome to @reach/auto-id!\n\n * Let's see if we can make sense of why this hook exists and its\n * implementation.\n *\n * Some background:\n *   1. Accessibility APIs rely heavily on element IDs\n *   2. Requiring developers to put IDs on every element in Reach UI is both\n *      cumbersome and error-prone\n *   3. With a component model, we can generate IDs for them!\n *\n * Solution 1: Generate random IDs.\n *\n * This works great as long as you don't server render your app. When React (in\n * the client) tries to reuse the markup from the server, the IDs won't match\n * and React will then recreate the entire DOM tree.\n *\n * Solution 2: Increment an integer\n *\n * This sounds great. Since we're rendering the exact same tree on the server\n * and client, we can increment a counter and get a deterministic result between\n * client and server. Also, JS integers can go up to nine-quadrillion. I'm\n * pretty sure the tab will be closed before an app never needs\n * 10 quadrillion IDs!\n *\n * Problem solved, right?\n *\n * Ah, but there's a catch! React's concurrent rendering makes this approach\n * non-deterministic. While the client and server will end up with the same\n * elements in the end, depending on suspense boundaries (and possibly some user\n * input during the initial render) the incrementing integers won't always match\n * up.\n *\n * Solution 3: Don't use IDs at all on the server; patch after first render.\n *\n * What we've done here is solution 2 with some tricks. With this approach, the\n * ID returned is an empty string on the first render. This way the server and\n * client have the same markup no matter how wild the concurrent rendering may\n * have gotten.\n *\n * After the render, we patch up the components with an incremented ID. This\n * causes a double render on any components with `useId`. Shouldn't be a problem\n * since the components using this hook should be small, and we're only updating\n * the ID attribute on the DOM, nothing big is happening.\n *\n * It doesn't have to be an incremented number, though--we could do generate\n * random strings instead, but incrementing a number is probably the cheapest\n * thing we can do.\n *\n * Additionally, we only do this patchup on the very first client render ever.\n * Any calls to `useId` that happen dynamically in the client will be\n * populated immediately with a value. So, we only get the double render after\n * server hydration and never again, SO BACK OFF ALRIGHT?\n */\n\nimport * as React from 'react'\n\nimport { isWeb, useIsomorphicLayoutEffect } from '../constants/platform'\n\nlet serverHandoffComplete = false\nlet id = 0\nfunction genId() {\n  return ++id\n}\n\n/* eslint-disable react-hooks/rules-of-hooks */\n\n/**\n * useId\n *\n * Autogenerate IDs to facilitate WAI-ARIA and server rendering.\n *\n * Note: The returned ID will initially be `null` and will update after a\n * component mounts. Users may need to supply their own ID if they need\n * consistent values for SSR.\n *\n * @see Docs https://reach.tech/auto-id\n */\nfunction useId(idFromProps: string): string\nfunction useId(idFromProps: number): number\nfunction useId(idFromProps: string | number): string | number\nfunction useId(idFromProps: string | undefined | null): string | undefined\nfunction useId(idFromProps: number | undefined | null): number | undefined\nfunction useId(idFromProps: string | number | undefined | null): string | number | undefined\nfunction useId(): string | undefined\n\nfunction useId(providedId?: number | string | undefined | null) {\n  // TODO: Remove error flag when updating internal deps to React 18. None of\n  // our tricks will play well with concurrent rendering anyway.\n\n  // native doesn't support until next react-native version, need to remove eventually\n  if (isWeb) {\n    if (typeof React.useId === 'function') {\n      let id = React.useId()\n      return providedId != null ? providedId : id\n    }\n  }\n\n  // If this instance isn't part of the initial render, we don't have to do the\n  // double render/patch-up dance. We can just generate the ID and return it.\n  let initialId = providedId ?? (serverHandoffComplete ? genId() : null)\n  let [id, setId] = React.useState(initialId)\n\n  useIsomorphicLayoutEffect(() => {\n    if (id === null) {\n      // Patch the ID after render. We do this in `useLayoutEffect` to avoid any\n      // rendering flicker, though it'll make the first render slower (unlikely\n      // to matter, but you're welcome to measure your app and let us know if\n      // it's a problem).\n      setId(genId())\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [])\n\n  React.useEffect(() => {\n    if (serverHandoffComplete === false) {\n      // Flag all future uses of `useId` to skip the update dance. This is in\n      // `useEffect` because it goes after `useLayoutEffect`, ensuring we don't\n      // accidentally bail out of the patch-up dance prematurely.\n      serverHandoffComplete = true\n    }\n  }, [])\n\n  return providedId ?? id ?? undefined\n}\n\nexport { useId }\n"],
-  "mappings": "AAwDA;AAEA;AAEA,IAAI,wBAAwB;AAC5B,IAAI,KAAK;AACT,iBAAiB;AACf,SAAO,EAAE;AACX;AAuBA,eAAe,YAAiD;AAK9D,MAAI,OAAO;AACT,QAAI,OAAO,MAAM,UAAU,YAAY;AACrC,UAAI,MAAK,MAAM,MAAM;AACrB,aAAO,cAAc,OAAO,aAAa;AAAA,IAC3C;AAAA,EACF;AAIA,MAAI,YAAY,cAAe,yBAAwB,MAAM,IAAI;AACjE,MAAI,CAAC,KAAI,SAAS,MAAM,SAAS,SAAS;AAE1C,4BAA0B,MAAM;AAC9B,QAAI,QAAO,MAAM;AAKf,YAAM,MAAM,CAAC;AAAA,IACf;AAAA,EAEF,GAAG,CAAC,CAAC;AAEL,QAAM,UAAU,MAAM;AACpB,QAAI,0BAA0B,OAAO;AAInC,8BAAwB;AAAA,IAC1B;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,SAAO,cAAc,OAAM;AAC7B;",
+  "sourcesContent": ["export { useId } from 'react'\n"],
+  "mappings": "AAAA;",
   "names": []
 }

package/dist/esm/hooks/useMedia.js

@@ -1,13 +1,13 @@
-import { useForceUpdate } from "@tamagui/use-force-update";
-import { useEffect, useRef } from "react";
+import { useMemo, useState } from "react";
 import { useIsomorphicLayoutEffect } from "../constants/platform";
 import { matchMedia } from "../helpers/matchMedia";
-import { useConstant } from "./useConstant";
+import { useSafeRef } from "./useSafeRef";
 const mediaState = {};
 const mediaQueryListeners = {};
 function addMediaQueryListener(key, cb) {
   mediaQueryListeners[key] = mediaQueryListeners[key] || /* @__PURE__ */ new Set();
   mediaQueryListeners[key].add(cb);
+  return () => removeMediaQueryListener(key, cb);
 }
 function removeMediaQueryListener(key, cb) {
   var _a;
@@ -18,114 +18,95 @@ const getMedia = () => {
   return mediaState;
 };
 const dispose = /* @__PURE__ */ new Set();
+let initialMediaState;
 const configureMedia = ({
   queries,
-  defaultActive = ["sm", "xs"]
+  defaultActive = {}
 } = {}) => {
   if (!queries)
     return;
-  if (mediaQueryConfig) {
-    if (JSON.stringify(queries) === JSON.stringify(mediaQueryConfig)) {
-      return;
+  if (initialMediaState) {
+    if (process.env.NODE_ENV === "development") {
+      if (JSON.stringify(queries) === JSON.stringify(mediaQueryConfig)) {
+        return;
+      }
     }
-    dispose.forEach((cb) => cb());
-    dispose.clear();
+    setupMediaListeners();
   }
   Object.assign(mediaQueryConfig, queries);
   for (const key in queries) {
-    const str = mediaObjectToString(queries[key]);
-    const propKey = `$${key}`;
-    try {
-      let update2 = function() {
-        const next = !!getMatch().matches;
-        if (next === mediaState[propKey])
-          return;
-        mediaState[propKey] = next;
-        const listeners = mediaQueryListeners[propKey];
-        if (listeners == null ? void 0 : listeners.size) {
-          for (const cb of [...listeners]) {
-            cb();
-          }
+    mediaState[key] = defaultActive[key] || false;
+  }
+  initialMediaState = { ...mediaState };
+};
+function unlisten() {
+  dispose.forEach((cb) => cb());
+  dispose.clear();
+}
+function setupMediaListeners() {
+  unlisten();
+  for (const key in mediaQueryConfig) {
+    let update2 = function() {
+      const next = !!getMatch().matches;
+      if (next === mediaState[key])
+        return;
+      mediaState[key] = next;
+      const listeners = mediaQueryListeners[key];
+      if (listeners == null ? void 0 : listeners.size) {
+        for (const cb of [...listeners]) {
+          cb();
         }
-      };
-      var update = update2;
-      const getMatch = () => matchMedia(str);
-      const match = getMatch();
-      if (!match || typeof match.addListener !== "function") {
-        throw new Error("\u26A0\uFE0F No match (seeing this in RN sometimes)");
       }
-      mediaState[propKey] = !!match.matches;
-      match.addListener(update2);
-      dispose.add(() => match.removeListener(update2));
-      update2();
-    } catch (err) {
-      console.error("Error running media query", str, err.message, err.stack);
-      const isDefaultActive = (defaultActive == null ? void 0 : defaultActive.includes(key)) ?? true;
-      mediaState[propKey] = isDefaultActive;
+    };
+    var update = update2;
+    const str = mediaObjectToString(mediaQueryConfig[key]);
+    const getMatch = () => matchMedia(str);
+    const match = getMatch();
+    if (!match) {
+      throw new Error("\u26A0\uFE0F No match");
     }
+    match.addListener(update2);
+    dispose.add(() => match.removeListener(update2));
+    update2();
   }
-};
+}
+function useMediaQueryListeners() {
+  useIsomorphicLayoutEffect(() => {
+    setupMediaListeners();
+    return unlisten;
+  }, []);
+}
 function useMedia() {
-  const forceUpdate = useForceUpdate();
-  const state = useRef();
-  if (!state.current) {
-    state.current = {
-      selections: {},
-      nextSelections: {},
-      isUnmounted: false,
-      isRendering: true
-    };
+  const [state, setState] = useState(initialMediaState);
+  const keys = useSafeRef({});
+  function updateState() {
+    setState((prev) => {
+      for (const key in keys.current) {
+        if (prev[key] !== mediaState[key]) {
+          return { ...mediaState };
+        }
+      }
+      return prev;
+    });
   }
-  state.current.isRendering = true;
   useIsomorphicLayoutEffect(() => {
-    const st = state.current;
-    st.isRendering = false;
-    for (const key in st.selections) {
-      if (!(key in st.nextSelections)) {
-        removeMediaQueryListener(key, forceUpdate);
-      }
-    }
-    for (const key in st.nextSelections) {
-      if (!(key in st.selections)) {
-        addMediaQueryListener(key, forceUpdate);
-      }
+    const listeners = [];
+    for (const key in keys.current) {
+      listeners.push(addMediaQueryListener(key, updateState));
     }
-  });
-  useEffect(() => {
+    updateState();
     return () => {
-      const st = state.current;
-      st.isUnmounted = true;
-      const allKeys = {
-        ...st.selections,
-        ...st.nextSelections
-      };
-      for (const key in allKeys) {
-        removeMediaQueryListener(key, forceUpdate);
-      }
+      listeners.forEach((cb) => cb());
     };
-  }, []);
-  return useConstant(() => {
-    const st = state.current;
-    return new Proxy(mediaState, {
-      get(target, key) {
-        if (key[0] !== "$") {
-          key = `$${key}`;
-        }
-        if (!(key in mediaState)) {
-          return Reflect.get(target, key);
-        }
-        if (!st.isUnmounted) {
-          if (st.isRendering) {
-            st.nextSelections[key] = true;
-          }
-        }
-        if (key in mediaState) {
-          return mediaState[key];
-        }
-        return Reflect.get(mediaState, key);
-      }
-    });
   });
+  return useMemo(() => new Proxy(state, {
+    get(_, key) {
+      if (!keys.current[key]) {
+        keys.current = { ...keys.current, [key]: true };
+      }
+      return Reflect.get(state, key);
+    }
+  }), [state, keys]);
 }
 function camelToHyphen(str) {
   return str.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`).toLowerCase();
@@ -153,6 +134,7 @@ export {
   mediaQueryConfig,
   mediaState,
   removeMediaQueryListener,
-  useMedia
+  useMedia,
+  useMediaQueryListeners
 };
 //# sourceMappingURL=useMedia.js.map