@tamagui/core 1.0.1-rc.12 → 1.0.1-rc.15

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/insertStyleRule.tsx"],
-  "sourcesContent": ["import type { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors: Record<string, string> = {}\nconst allRules: Record<string, string> = {}\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      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\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\n\n// multiple sheets could have the same ids so we have to count\n\nconst scannedNum = new WeakMap<CSSStyleSheet, number>()\nconst totalSheetSelectors = new Map<string, number>()\nconst referencesInSheet = new WeakMap<CSSStyleSheet>()\n\nexport function listenForSheetChanges() {\n  if (!isClient) return\n  function handleNode(node: Node, remove = false) {\n    if (node instanceof HTMLStyleElement && node.sheet) {\n      updateSheetStyles(node.sheet, remove)\n    }\n  }\n  const mo = new MutationObserver((entries) => {\n    for (const entry of entries) {\n      entry.addedNodes.forEach((node) => handleNode(node))\n      entry.removedNodes.forEach((node) => handleNode(node, true))\n    }\n  })\n  mo.observe(document.head, {\n    childList: true,\n  })\n}\n\nexport function scanAllSheets() {\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    updateSheetStyles(sheet)\n  }\n}\n\nfunction track(id: string, remove = false) {\n  const next = (totalSheetSelectors.get(id) || 0) + (remove ? -1 : 1)\n  totalSheetSelectors.set(id, next)\n  return next\n}\n\nfunction updateSheetStyles(sheet: CSSStyleSheet, remove = false) {\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    return\n  }\n\n  const len = rules.length\n  const lastScanned = scannedNum.get(sheet) || 0\n\n  if (!remove) {\n    // avoid work dumb but works\n    if (lastScanned === len) {\n      return\n    }\n  }\n\n  for (let i = lastScanned; i < len; i++) {\n    const rule = rules[i]\n    const response = getTamaguiSelector(rule)\n    if (!response) {\n      return\n    }\n\n    const [identifier, cssRule] = response\n\n    // track references\n    const total = track(identifier, remove)\n\n    if (remove) {\n      if (total === 0) {\n        delete allSelectors[identifier]\n      }\n    } else {\n      if (!(identifier in allSelectors)) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform\n          ? addTransform(identifier, cssRule.cssText, cssRule)\n          : true\n        if (shouldInsert) {\n          allSelectors[identifier] = cssRule.cssText\n        }\n      }\n    }\n  }\n\n  scannedNum.set(sheet, len)\n}\n\nfunction getTamaguiSelector(\n  rule: CSSRule | null\n): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    const text = rule.selectorText\n    // .startsWith('._')\n    if (text[0] === '.' && text[1] === '_') {\n      return [text.slice(1), rule]\n    }\n    if (text.startsWith(':root') && text.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(text), 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\nconst sheet = isClient\n  ? document.head.appendChild(document.createElement('style')).sheet\n  : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules.join(' ')\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  if (!rulesToInsert.length) return\n  if (isClient && !sheet) {\n    if (process.env.NODE_ENV === 'development') throw 'impossible'\n    return\n  }\n  for (const { identifier, rules } of rulesToInsert) {\n    if (identifier in allSelectors) continue\n    allSelectors[identifier] =\n      process.env.NODE_ENV === 'development' ? rules.join('\\n') : ' '\n    updateRules(identifier, rules)\n    if (sheet) {\n      for (const rule of rules) {\n        sheet.insertRule(rule, sheet.cssRules.length)\n      }\n    }\n  }\n}\n\nconst IS_STATIC = process.env.IS_STATIC === 'is_static'\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  if (IS_STATIC) {\n    return true\n  }\n  return !(styleObject.identifier in allSelectors)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { StyleObject } from '@tamagui/helpers'\n\nconst allSelectors: Record<string, string> = {}\nconst allRules: Record<string, string> = {}\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      console.error(`\u274C Invalid transform, likely used deg/% improperly ${identifier}`)\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\n\n// multiple sheets could have the same ids so we have to count\n\nconst scannedNum = new WeakMap<CSSStyleSheet, number>()\nconst totalSheetSelectors = new Map<string, number>()\n\nexport function listenForSheetChanges() {\n  if (!isClient) return\n  function handleNode(node: Node, remove = false) {\n    if (node instanceof HTMLStyleElement && node.sheet) {\n      updateSheetStyles(node.sheet, remove)\n    }\n  }\n  const mo = new MutationObserver((entries) => {\n    for (const entry of entries) {\n      entry.addedNodes.forEach((node) => handleNode(node))\n      entry.removedNodes.forEach((node) => handleNode(node, true))\n    }\n  })\n  mo.observe(document.head, {\n    childList: true,\n  })\n}\n\nexport function scanAllSheets() {\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    updateSheetStyles(sheet)\n  }\n}\n\nfunction track(id: string, remove = false) {\n  const next = (totalSheetSelectors.get(id) || 0) + (remove ? -1 : 1)\n  totalSheetSelectors.set(id, next)\n  return next\n}\n\nfunction updateSheetStyles(sheet: CSSStyleSheet, remove = false) {\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    return\n  }\n\n  const len = rules.length\n  const lastScanned = scannedNum.get(sheet) || 0\n\n  if (!remove) {\n    // avoid work dumb but works\n    if (lastScanned === len) {\n      return\n    }\n  }\n\n  for (let i = lastScanned; i < len; i++) {\n    const rule = rules[i]\n    const response = getTamaguiSelector(rule)\n    if (!response) {\n      return\n    }\n\n    const [identifier, cssRule] = response\n\n    // track references\n    const total = track(identifier, remove)\n\n    if (remove) {\n      if (total === 0) {\n        delete allSelectors[identifier]\n      }\n    } else {\n      if (!(identifier in allSelectors)) {\n        const isTransform = identifier.startsWith('_transform')\n        const shouldInsert = isTransform\n          ? addTransform(identifier, cssRule.cssText, cssRule)\n          : true\n        if (shouldInsert) {\n          allSelectors[identifier] = cssRule.cssText\n        }\n      }\n    }\n  }\n\n  scannedNum.set(sheet, len)\n}\n\nfunction getTamaguiSelector(\n  rule: CSSRule | null\n): readonly [string, CSSStyleRule] | null {\n  if (rule instanceof CSSStyleRule) {\n    const text = rule.selectorText\n    // .startsWith('._')\n    if (text[0] === '.' && text[1] === '_') {\n      return [text.slice(1), rule]\n    }\n    if (text.startsWith(':root') && text.includes('._')) {\n      return [getIdentifierFromTamaguiSelector(text), 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\nconst sheet = isClient\n  ? document.head.appendChild(document.createElement('style')).sheet\n  : null\n\nexport function updateRules(identifier: string, rules: string[]) {\n  if (allRules[identifier]) return false\n  allRules[identifier] = rules.join(' ')\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  if (!rulesToInsert.length) return\n  if (isClient && !sheet) {\n    if (process.env.NODE_ENV === 'development') throw 'impossible'\n    return\n  }\n  for (const { identifier, rules } of rulesToInsert) {\n    if (identifier in allSelectors) continue\n    allSelectors[identifier] =\n      process.env.NODE_ENV === 'development' ? rules.join('\\n') : ' '\n    updateRules(identifier, rules)\n    if (sheet) {\n      for (const rule of rules) {\n        sheet.insertRule(rule, sheet.cssRules.length)\n      }\n    }\n  }\n}\n\nconst IS_STATIC = process.env.IS_STATIC === 'is_static'\n\nexport function shouldInsertStyleRules(styleObject: PartialStyleObject) {\n  if (IS_STATIC) {\n    return true\n  }\n  return !(styleObject.identifier in allSelectors)\n}\n"],
+  "mappings": "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",
   "names": ["sheet"]
 }

package/dist/cjs/hooks/useTheme.js

@@ -51,20 +51,13 @@ const useTheme = (props = emptyProps) => {
   const state = (0, import_useServerHooks.useServerRef)();
   if (import_constants.isClient && !state.current) {
     state.current = {
-      keys: /* @__PURE__ */ new Set(),
-      isRendering: true
+      keys: /* @__PURE__ */ new Set()
     };
   }
-  if (import_constants.isClient) {
-    state.current.isRendering = true;
-    (0, import_constants.useIsomorphicLayoutEffect)(() => {
-      state.current.isRendering = false;
-    });
-  }
   const { name, theme, themeManager, className, isNewTheme } = useChangeThemeEffect(
     props,
     false,
-    import_constants.isClient ? () => state.current.isRendering || state.current.keys.size > 0 : void 0
+    import_constants.isClient ? () => state.current.keys.size === 0 : void 0
   );
   if (process.env.NODE_ENV === "development") {
     if (import_constants.isWeb && isNewTheme && className === ((_a = themeManager == null ? void 0 : themeManager.parentManager) == null ? void 0 : _a.state.className)) {
@@ -133,12 +126,11 @@ function getThemeProxied({
         return theme[key];
       }
       const val = themeManager.getValue(key);
-      if (val) {
+      if (val && state) {
         if (import_constants.isClient) {
           return new Proxy(val, {
             get(_2, subkey) {
-              var _a;
-              if (subkey === "val" && ((_a = state == null ? void 0 : state.current) == null ? void 0 : _a.isRendering)) {
+              if (subkey === "val") {
                 state.current.keys.add(key);
               }
               return Reflect.get(val, subkey);
@@ -155,7 +147,7 @@ const GetIsNewTheme = Symbol();
 const getThemeManager = (theme) => theme == null ? void 0 : theme[GetThemeManager];
 const getThemeIsNewTheme = (theme) => theme == null ? void 0 : theme[GetIsNewTheme];
 const activeThemeManagers = /* @__PURE__ */ new Set();
-const useChangeThemeEffect = (props, root = false, shouldUpdate) => {
+const useChangeThemeEffect = (props, root = false, disableUpdate) => {
   if (import_constants.isRSC) {
     return {
       ...createState().state,
@@ -238,7 +230,7 @@ const useChangeThemeEffect = (props, root = false, shouldUpdate) => {
     };
   }
   function updateState() {
-    if ((shouldUpdate == null ? void 0 : shouldUpdate()) === false) {
+    if (disableUpdate == null ? void 0 : disableUpdate()) {
       return;
     }
     const next = themeManager.getState(props, parentManager);

package/dist/cjs/hooks/useTheme.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/hooks/useTheme.tsx"],
-  "sourcesContent": ["/* eslint-disable no-console */\nimport {\n  isClient,\n  isRSC,\n  isServer,\n  isWeb,\n  useIsomorphicLayoutEffect,\n} from '@tamagui/constants'\nimport { useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'\n\nimport { getConfig } from '../config'\nimport { isDevTools } from '../constants/isDevTools'\nimport { createProxy } from '../helpers/createProxy'\nimport {\n  ThemeManager,\n  ThemeManagerState,\n  hasNoThemeUpdatingProps,\n} from '../helpers/ThemeManager'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext'\nimport { ThemeParsed, ThemeProps } from '../types'\nimport { GetThemeUnwrapped } from './getThemeUnwrapped'\nimport { useServerRef } from './useServerHooks'\n\nexport type ChangedThemeResponse = {\n  themeManager: ThemeManager | null\n  name: string\n  isNewTheme?: boolean\n  theme?: ThemeParsed | null\n  className?: string\n}\n\nconst emptyProps = { name: null }\n\nfunction getDefaultThemeProxied() {\n  const config = getConfig()\n  const name = Object.keys(config.themes)[0]\n  return getThemeProxied({\n    theme: config.themes[name],\n    name,\n  })\n}\n\ninterface UseThemeState {\n  keys: Set<string>\n  isRendering: boolean\n}\n\nexport const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {\n  if (isRSC) {\n    return getDefaultThemeProxied()\n  }\n\n  const state = useServerRef() as React.MutableRefObject<UseThemeState>\n  if (isClient && !state.current) {\n    state.current = {\n      keys: new Set(),\n      isRendering: true,\n    }\n  }\n\n  // track key usage\n  if (isClient) {\n    state.current.isRendering = true\n    useIsomorphicLayoutEffect(() => {\n      state.current.isRendering = false\n    })\n  }\n\n  const { name, theme, themeManager, className, isNewTheme } = useChangeThemeEffect(\n    props,\n    false,\n    isClient ? () => state.current.isRendering || state.current.keys.size > 0 : undefined\n  )\n\n  if (process.env.NODE_ENV === 'development') {\n    // ensure we aren't creating too many ThemeManagers\n    if (\n      isWeb &&\n      isNewTheme &&\n      className === themeManager?.parentManager?.state.className\n    ) {\n      console.error('Should always change, duplicating ThemeMananger bug', themeManager)\n    }\n    if (props.debug === 'verbose') {\n      console.groupCollapsed('  \uD83D\uDD39 useTheme =>', name)\n      const logs = { ...props, name, className, ...(isDevTools && { theme }) }\n      for (const key in logs) {\n        console.log('  ', key, logs[key])\n      }\n      console.groupEnd()\n    }\n  }\n\n  if (!theme) {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn('No theme found', name, props, themeManager)\n    }\n    return getDefaultThemeProxied()\n  }\n\n  return useMemo(() => {\n    return getThemeProxied({\n      isNewTheme,\n      theme,\n      name,\n      className,\n      themeManager,\n      state,\n    })\n  }, [theme, isNewTheme, name, className, themeManager])\n}\n\nfunction getThemeProxied({\n  theme,\n  name,\n  className,\n  themeManager,\n  isNewTheme,\n  state,\n}: {\n  theme: any\n  name: string\n  className?: string\n  themeManager?: ThemeManager | null\n  isNewTheme?: boolean\n  state?: React.RefObject<UseThemeState>\n}) {\n  return createProxy(theme, {\n    has(_, key) {\n      if (typeof key === 'string') {\n        if (key[0] === '$') key = key.slice(1)\n        return themeManager?.allKeys.has(key)\n      }\n      return Reflect.has(theme, key)\n    },\n    get(_, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      } else if (key === GetThemeManager) {\n        return themeManager\n      } else if (key === GetIsNewTheme) {\n        return isNewTheme\n      } else if (key === 'name') {\n        return name\n      } else if (key === 'className') {\n        return className\n      } else if (\n        !name ||\n        key === '__proto__' ||\n        typeof key === 'symbol' ||\n        key === '$typeof'\n      ) {\n        return Reflect.get(_, key)\n      }\n      // auto convert variables to plain\n      if (key[0] === '$') key = key.slice(1)\n      if (!themeManager) {\n        return theme[key]\n      }\n      const val = themeManager.getValue(key)\n      if (val) {\n        if (isClient) {\n          return new Proxy(val as any, {\n            get(_, subkey) {\n              if (subkey === 'val' && state?.current?.isRendering) {\n                state.current.keys.add(key as any)\n              }\n              return Reflect.get(val, subkey)\n            },\n          })\n        }\n      }\n      return val\n    },\n  })\n}\n\nconst GetThemeManager = Symbol()\nconst GetIsNewTheme = Symbol()\n\nexport const getThemeManager = (theme: any): ThemeManager | undefined =>\n  theme?.[GetThemeManager]\nexport const getThemeIsNewTheme = (theme: any): ThemeManager | undefined =>\n  theme?.[GetIsNewTheme]\n\nexport const activeThemeManagers = new Set<ThemeManager>()\n\nexport const useChangeThemeEffect = (\n  props: ThemeProps,\n  root = false,\n  shouldUpdate?: () => boolean\n): ChangedThemeResponse => {\n  if (isRSC) {\n    // we need context working for this to work well\n    return {\n      ...createState().state,\n      themeManager: null,\n    }\n  }\n  const parentManager = useContext(ThemeManagerContext)\n\n  const {\n    debug,\n    // @ts-expect-error internal use only\n    disable,\n  } = props\n\n  if (disable) {\n    if (!parentManager) throw new Error('Disable topmost')\n    return {\n      ...parentManager.state,\n      isNewTheme: false,\n      themeManager: parentManager,\n    }\n  }\n\n  type State = {\n    isNewTheme: boolean\n    state: ThemeManagerState\n    themeManager: ThemeManager\n    mounted?: boolean\n  }\n\n  const [themeState, setThemeState] = useState<State>(createState)\n  const { isNewTheme, state, themeManager, mounted } = themeState\n\n  if (!isServer) {\n    useEffect(() => {\n      if (disable) return\n      // SSR safe inverse (because server can't know prefers scheme)\n      // could be done through fancy selectors like how we do prefers-media\n      // but may be a bit of explosion of selectors\n      if (props.inverse && !mounted) {\n        setThemeState({ ...themeState, mounted: true })\n        return\n      }\n      activeThemeManagers.add(themeManager)\n      const disposeChangeListener = parentManager?.onChangeTheme(() => {\n        if (!(isNewTheme || isWeb)) {\n          setThemeState({\n            ...themeState,\n            state: { ...themeManager.state },\n            isNewTheme: false,\n          })\n        } else {\n          updateState()\n        }\n      })\n      return () => {\n        activeThemeManagers.delete(themeManager)\n        disposeChangeListener?.()\n      }\n    }, [disable, state, isNewTheme, debug])\n  }\n\n  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)\n  const shouldReturnParentState = hasNoThemeUpdatingProps(props) || isInversingOnMount\n\n  if (shouldReturnParentState) {\n    if (!parentManager) throw 'impossible'\n    // prettier-ignore\n    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') console.log('useTheme hasNoThemeUpdatingProps', parentManager.state.name, 'isInversingOnMount', isInversingOnMount)\n    return {\n      ...parentManager.state,\n      className: isInversingOnMount ? '' : parentManager.state.className,\n      themeManager: parentManager,\n      isNewTheme: false,\n    }\n  }\n\n  // run inline in render\n  updateState()\n\n  return {\n    ...state,\n    isNewTheme,\n    themeManager,\n  }\n\n  function createState(prev?: State) {\n    // returns previous theme manager if no change\n    const _ = new ThemeManager(props, root ? 'root' : parentManager)\n\n    const isNewTheme = _ !== parentManager\n    // prettier-ignore\n    if (process.env.NODE_ENV === 'development' && debug) [console.groupCollapsed('useTheme create() isNewTheme', isNewTheme),console.log('parent.state.name', parentManager?.state.name, '\\n', 'props', props, '\\n', isClient ? parentManager : '', 'getState', isNewTheme && isClient ? _.getState(props) : '', '\\n', 'state', isClient ? { ..._.state } : ''),console.groupEnd()]\n    // only inverse relies on this for ssr\n    const mounted = !props.inverse ? true : root || prev?.mounted\n    return {\n      // ThemeManager returns parentManager if no change\n      isNewTheme,\n      state: { ..._.state },\n      themeManager: _,\n      mounted,\n    }\n  }\n\n  function updateState() {\n    if (shouldUpdate?.() === false) {\n      return\n    }\n\n    const next = themeManager.getState(props, parentManager)\n    const shouldChange = themeManager.getStateShouldChange(\n      next,\n      isNewTheme ? state : null\n    )\n    if (shouldChange) {\n      setThemeState(createState)\n    } else {\n      if (!next && parentManager?.state.name !== state.name) {\n        // were changing back to parent state\n        setThemeState(createState)\n      }\n    }\n  }\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/* eslint-disable no-console */\nimport { isClient, isRSC, isServer, isWeb } from '@tamagui/constants'\nimport { useContext, useEffect, useMemo, useState } from 'react'\n\nimport { getConfig } from '../config'\nimport { isDevTools } from '../constants/isDevTools'\nimport { createProxy } from '../helpers/createProxy'\nimport {\n  ThemeManager,\n  ThemeManagerState,\n  hasNoThemeUpdatingProps,\n} from '../helpers/ThemeManager'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext'\nimport { ThemeParsed, ThemeProps } from '../types'\nimport { GetThemeUnwrapped } from './getThemeUnwrapped'\nimport { useServerRef } from './useServerHooks'\n\nexport type ChangedThemeResponse = {\n  themeManager: ThemeManager | null\n  name: string\n  isNewTheme?: boolean\n  theme?: ThemeParsed | null\n  className?: string\n}\n\nconst emptyProps = { name: null }\n\nfunction getDefaultThemeProxied() {\n  const config = getConfig()\n  const name = Object.keys(config.themes)[0]\n  return getThemeProxied({\n    theme: config.themes[name],\n    name,\n  })\n}\n\ninterface UseThemeState {\n  keys: Set<string>\n}\n\nexport const useTheme = (props: ThemeProps = emptyProps): ThemeParsed => {\n  if (isRSC) {\n    return getDefaultThemeProxied()\n  }\n\n  const state = useServerRef() as React.MutableRefObject<UseThemeState>\n  if (isClient && !state.current) {\n    state.current = {\n      keys: new Set(),\n    }\n  }\n\n  const { name, theme, themeManager, className, isNewTheme } = useChangeThemeEffect(\n    props,\n    false,\n    isClient ? () => state.current.keys.size === 0 : undefined\n  )\n\n  if (process.env.NODE_ENV === 'development') {\n    // ensure we aren't creating too many ThemeManagers\n    if (\n      isWeb &&\n      isNewTheme &&\n      className === themeManager?.parentManager?.state.className\n    ) {\n      console.error('Should always change, duplicating ThemeMananger bug', themeManager)\n    }\n    if (props.debug === 'verbose') {\n      console.groupCollapsed('  \uD83D\uDD39 useTheme =>', name)\n      const logs = { ...props, name, className, ...(isDevTools && { theme }) }\n      for (const key in logs) {\n        console.log('  ', key, logs[key])\n      }\n      console.groupEnd()\n    }\n  }\n\n  if (!theme) {\n    if (process.env.NODE_ENV === 'development') {\n      console.warn('No theme found', name, props, themeManager)\n    }\n    return getDefaultThemeProxied()\n  }\n\n  return useMemo(() => {\n    return getThemeProxied({\n      isNewTheme,\n      theme,\n      name,\n      className,\n      themeManager,\n      state,\n    })\n  }, [theme, isNewTheme, name, className, themeManager])\n}\n\nfunction getThemeProxied({\n  theme,\n  name,\n  className,\n  themeManager,\n  isNewTheme,\n  state,\n}: {\n  theme: any\n  name: string\n  className?: string\n  themeManager?: ThemeManager | null\n  isNewTheme?: boolean\n  state?: React.RefObject<UseThemeState>\n}) {\n  return createProxy(theme, {\n    has(_, key) {\n      if (typeof key === 'string') {\n        if (key[0] === '$') key = key.slice(1)\n        return themeManager?.allKeys.has(key)\n      }\n      return Reflect.has(theme, key)\n    },\n    get(_, key) {\n      if (key === GetThemeUnwrapped) {\n        return theme\n      } else if (key === GetThemeManager) {\n        return themeManager\n      } else if (key === GetIsNewTheme) {\n        return isNewTheme\n      } else if (key === 'name') {\n        return name\n      } else if (key === 'className') {\n        return className\n      } else if (\n        !name ||\n        key === '__proto__' ||\n        typeof key === 'symbol' ||\n        key === '$typeof'\n      ) {\n        return Reflect.get(_, key)\n      }\n      // auto convert variables to plain\n      if (key[0] === '$') key = key.slice(1)\n      if (!themeManager) {\n        return theme[key]\n      }\n      const val = themeManager.getValue(key)\n      if (val && state) {\n        if (isClient) {\n          return new Proxy(val as any, {\n            get(_, subkey) {\n              if (subkey === 'val') {\n                state.current!.keys.add(key as any)\n              }\n              return Reflect.get(val, subkey)\n            },\n          })\n        }\n      }\n      return val\n    },\n  })\n}\n\nconst GetThemeManager = Symbol()\nconst GetIsNewTheme = Symbol()\n\nexport const getThemeManager = (theme: any): ThemeManager | undefined =>\n  theme?.[GetThemeManager]\nexport const getThemeIsNewTheme = (theme: any): ThemeManager | undefined =>\n  theme?.[GetIsNewTheme]\n\nexport const activeThemeManagers = new Set<ThemeManager>()\n\nexport const useChangeThemeEffect = (\n  props: ThemeProps,\n  root = false,\n  disableUpdate?: () => boolean\n): ChangedThemeResponse => {\n  if (isRSC) {\n    // we need context working for this to work well\n    return {\n      ...createState().state,\n      themeManager: null,\n    }\n  }\n  const parentManager = useContext(ThemeManagerContext)\n\n  const {\n    debug,\n    // @ts-expect-error internal use only\n    disable,\n  } = props\n\n  if (disable) {\n    if (!parentManager) throw new Error('Disable topmost')\n    return {\n      ...parentManager.state,\n      isNewTheme: false,\n      themeManager: parentManager,\n    }\n  }\n\n  type State = {\n    isNewTheme: boolean\n    state: ThemeManagerState\n    themeManager: ThemeManager\n    mounted?: boolean\n  }\n\n  const [themeState, setThemeState] = useState<State>(createState)\n  const { isNewTheme, state, themeManager, mounted } = themeState\n\n  if (!isServer) {\n    useEffect(() => {\n      if (disable) return\n      // SSR safe inverse (because server can't know prefers scheme)\n      // could be done through fancy selectors like how we do prefers-media\n      // but may be a bit of explosion of selectors\n      if (props.inverse && !mounted) {\n        setThemeState({ ...themeState, mounted: true })\n        return\n      }\n      activeThemeManagers.add(themeManager)\n      const disposeChangeListener = parentManager?.onChangeTheme(() => {\n        if (!(isNewTheme || isWeb)) {\n          setThemeState({\n            ...themeState,\n            state: { ...themeManager.state },\n            isNewTheme: false,\n          })\n        } else {\n          updateState()\n        }\n      })\n      return () => {\n        activeThemeManagers.delete(themeManager)\n        disposeChangeListener?.()\n      }\n    }, [disable, state, isNewTheme, debug])\n  }\n\n  const isInversingOnMount = Boolean(!themeState.mounted && props.inverse)\n  const shouldReturnParentState = hasNoThemeUpdatingProps(props) || isInversingOnMount\n\n  if (shouldReturnParentState) {\n    if (!parentManager) throw 'impossible'\n    // prettier-ignore\n    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') console.log('useTheme hasNoThemeUpdatingProps', parentManager.state.name, 'isInversingOnMount', isInversingOnMount)\n    return {\n      ...parentManager.state,\n      className: isInversingOnMount ? '' : parentManager.state.className,\n      themeManager: parentManager,\n      isNewTheme: false,\n    }\n  }\n\n  // run inline in render\n  updateState()\n\n  return {\n    ...state,\n    isNewTheme,\n    themeManager,\n  }\n\n  function createState(prev?: State) {\n    // returns previous theme manager if no change\n    const _ = new ThemeManager(props, root ? 'root' : parentManager)\n    const isNewTheme = _ !== parentManager\n    // prettier-ignore\n    if (process.env.NODE_ENV === 'development' && debug) [console.groupCollapsed('useTheme create() isNewTheme', isNewTheme),console.log('parent.state.name', parentManager?.state.name, '\\n', 'props', props, '\\n', isClient ? parentManager : '', 'getState', isNewTheme && isClient ? _.getState(props) : '', '\\n', 'state', isClient ? { ..._.state } : ''),console.groupEnd()]\n    // only inverse relies on this for ssr\n    const mounted = !props.inverse ? true : root || prev?.mounted\n    return {\n      // ThemeManager returns parentManager if no change\n      isNewTheme,\n      state: { ..._.state },\n      themeManager: _,\n      mounted,\n    }\n  }\n\n  function updateState() {\n    if (disableUpdate?.()) {\n      return\n    }\n    const next = themeManager.getState(props, parentManager)\n    const shouldChange = themeManager.getStateShouldChange(\n      next,\n      isNewTheme ? state : null\n    )\n    if (shouldChange) {\n      setThemeState(createState)\n    } else {\n      if (!next && parentManager?.state.name !== state.name) {\n        // were changing back to parent state\n        setThemeState(createState)\n      }\n    }\n  }\n}\n"],
+  "mappings": "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",
   "names": ["_", "isNewTheme", "mounted"]
 }

package/dist/cjs/views/Theme.js

@@ -39,15 +39,14 @@ function Theme(props) {
     return props.children;
   }
   const isRoot = !!props["_isRoot"];
-  const { name, theme, themeManager, isNewTheme, className } = (0, import_useTheme.useChangeThemeEffect)(
-    props,
-    isRoot
-  );
+  const { name, theme, themeManager, className } = (0, import_useTheme.useChangeThemeEffect)(props, isRoot);
   const disableThemeClass = props.disableThemeClass;
   const missingTheme = !(name && theme);
   let contents = (0, import_react.useMemo)(() => {
-    const next = props["data-themeable"] ? import_react.default.cloneElement(props.children, { ["data-themeable"]: true }) : props.children;
-    return missingTheme ? next : wrapThemeManagerContext(next, themeManager);
+    return wrapThemeManagerContext(
+      props["data-themeable"] ? import_react.default.cloneElement(props.children, { ["data-themeable"]: true }) : props.children,
+      themeManager
+    );
   }, [missingTheme, props.children, themeManager]);
   if (process.env.NODE_ENV === "development" && missingTheme) {
     name && !theme && console.warn(`No theme found by name ${name}`);
@@ -69,9 +68,8 @@ function Theme(props) {
   return contents;
 }
 function wrapThemeManagerContext(children, themeManager, shouldReset) {
-  if (!themeManager) {
+  if (!themeManager)
     return children;
-  }
   let next = children;
   if (shouldReset && themeManager) {
     next = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Theme, {

package/dist/cjs/views/Theme.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Theme.tsx"],
-  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport React, { useMemo } from 'react'\n\nimport { variableToString } from '../createVariable'\nimport { ThemeManager } from '../helpers/ThemeManager'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext'\nimport { useChangeThemeEffect } from '../hooks/useTheme'\nimport { ThemeProps } from '../types'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) {\n    return props.children\n  }\n\n  const isRoot = !!props['_isRoot']\n  const { name, theme, themeManager, isNewTheme, className } = useChangeThemeEffect(\n    props,\n    isRoot\n  )\n\n  const disableThemeClass = props.disableThemeClass\n  const missingTheme = !(name && theme)\n\n  // memo here, changing theme without re-rendering all children is a critical optimization\n  // may require some effort of end user to memoize but without this memo they'd have no option\n  let contents = useMemo(() => {\n    const next = props['data-themeable']\n      ? React.cloneElement(props.children, { ['data-themeable']: true })\n      : props.children\n\n    return missingTheme ? next : wrapThemeManagerContext(next, themeManager)\n  }, [missingTheme, props.children, themeManager])\n\n  if (process.env.NODE_ENV === 'development' && missingTheme) {\n    // eslint-disable-next-line no-console\n    name && !theme && console.warn(`No theme found by name ${name}`)\n    return props.children\n  }\n\n  if (disableThemeClass || missingTheme) {\n    return contents\n  }\n\n  if (isWeb) {\n    const cn = [props.className, className, '_dsp_contents'].filter(Boolean).join(' ')\n    contents = (\n      <span\n        className={cn}\n        style={{\n          // in order to provide currentColor, set color by default\n          color: variableToString(theme?.color),\n        }}\n      >\n        {contents}\n      </span>\n    )\n  }\n\n  return contents\n}\n\nexport function wrapThemeManagerContext(\n  children: any,\n  themeManager?: ThemeManager | null,\n  shouldReset?: boolean\n) {\n  // be sure to memoize themeManager to avoid reparenting\n  if (!themeManager) {\n    return children\n  }\n  // be sure to memoize shouldReset to avoid reparenting\n  let next = children\n  // TODO likely not necessary if we do reset logic now in useTheme?\n  // reset to parent theme\n  if (shouldReset && themeManager) {\n    next = <Theme name={themeManager.state.parentName}>{next}</Theme>\n  }\n  return (\n    <ThemeManagerContext.Provider value={themeManager}>\n      {next}\n    </ThemeManagerContext.Provider>\n  )\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA+CM;AA/CN,uBAAsB;AACtB,mBAA+B;AAE/B,4BAAiC;AAEjC,iCAAoC;AACpC,sBAAqC;AAG9B,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM,SAAS;AACjB,WAAO,MAAM;AAAA,EACf;AAEA,QAAM,SAAS,CAAC,CAAC,MAAM;AACvB,QAAM,EAAE,MAAM,OAAO,cAAc,YAAY,UAAU,QAAI;AAAA,IAC3D;AAAA,IACA;AAAA,EACF;AAEA,QAAM,oBAAoB,MAAM;AAChC,QAAM,eAAe,EAAE,QAAQ;AAI/B,MAAI,eAAW,sBAAQ,MAAM;AAC3B,UAAM,OAAO,MAAM,oBACf,aAAAA,QAAM,aAAa,MAAM,UAAU,EAAE,CAAC,mBAAmB,KAAK,CAAC,IAC/D,MAAM;AAEV,WAAO,eAAe,OAAO,wBAAwB,MAAM,YAAY;AAAA,EACzE,GAAG,CAAC,cAAc,MAAM,UAAU,YAAY,CAAC;AAE/C,MAAI,QAAQ,IAAI,aAAa,iBAAiB,cAAc;AAE1D,YAAQ,CAAC,SAAS,QAAQ,KAAK,0BAA0B,MAAM;AAC/D,WAAO,MAAM;AAAA,EACf;AAEA,MAAI,qBAAqB,cAAc;AACrC,WAAO;AAAA,EACT;AAEA,MAAI,wBAAO;AACT,UAAM,KAAK,CAAC,MAAM,WAAW,WAAW,eAAe,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AACjF,eACE,4CAAC;AAAA,MACC,WAAW;AAAA,MACX,OAAO;AAAA,QAEL,WAAO,wCAAiB,+BAAO,KAAK;AAAA,MACtC;AAAA,MAEC;AAAA,KACH;AAAA,EAEJ;AAEA,SAAO;AACT;AAEO,SAAS,wBACd,UACA,cACA,aACA;AAEA,MAAI,CAAC,cAAc;AACjB,WAAO;AAAA,EACT;AAEA,MAAI,OAAO;AAGX,MAAI,eAAe,cAAc;AAC/B,WAAO,4CAAC;AAAA,MAAM,MAAM,aAAa,MAAM;AAAA,MAAa;AAAA,KAAK;AAAA,EAC3D;AACA,SACE,4CAAC,+CAAoB,UAApB;AAAA,IAA6B,OAAO;AAAA,IAClC;AAAA,GACH;AAEJ;",
+  "sourcesContent": ["import { isWeb } from '@tamagui/constants'\nimport React, { useMemo } from 'react'\n\nimport { variableToString } from '../createVariable'\nimport { ThemeManager } from '../helpers/ThemeManager'\nimport { ThemeManagerContext } from '../helpers/ThemeManagerContext'\nimport { useChangeThemeEffect } from '../hooks/useTheme'\nimport { ThemeProps } from '../types'\n\nexport function Theme(props: ThemeProps) {\n  // @ts-expect-error only for internal views\n  if (props.disable) {\n    return props.children\n  }\n\n  const isRoot = !!props['_isRoot']\n  const { name, theme, themeManager, className } = useChangeThemeEffect(props, isRoot)\n  const disableThemeClass = props.disableThemeClass\n  const missingTheme = !(name && theme)\n\n  // memo here, changing theme without re-rendering all children is a critical optimization\n  // may require some effort of end user to memoize but without this memo they'd have no option\n  let contents = useMemo(() => {\n    return wrapThemeManagerContext(\n      props['data-themeable']\n        ? React.cloneElement(props.children, { ['data-themeable']: true })\n        : props.children,\n      themeManager\n    )\n  }, [missingTheme, props.children, themeManager])\n\n  if (process.env.NODE_ENV === 'development' && missingTheme) {\n    // eslint-disable-next-line no-console\n    name && !theme && console.warn(`No theme found by name ${name}`)\n    return props.children\n  }\n\n  if (disableThemeClass || missingTheme) {\n    return contents\n  }\n\n  if (isWeb) {\n    const cn = [props.className, className, '_dsp_contents'].filter(Boolean).join(' ')\n    contents = (\n      <span\n        className={cn}\n        style={{\n          // in order to provide currentColor, set color by default\n          color: variableToString(theme?.color),\n        }}\n      >\n        {contents}\n      </span>\n    )\n  }\n\n  return contents\n}\n\nexport function wrapThemeManagerContext(\n  children: any,\n  themeManager?: ThemeManager | null,\n  shouldReset?: boolean\n) {\n  // be sure to memoize themeManager to avoid reparenting\n  if (!themeManager) return children\n  // be sure to memoize shouldReset to avoid reparenting\n  let next = children\n  // TODO likely not necessary if we do reset logic now in useTheme?\n  // reset to parent theme\n  if (shouldReset && themeManager) {\n    next = <Theme name={themeManager.state.parentName}>{next}</Theme>\n  }\n  return (\n    <ThemeManagerContext.Provider value={themeManager}>\n      {next}\n    </ThemeManagerContext.Provider>\n  )\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA4CM;AA5CN,uBAAsB;AACtB,mBAA+B;AAE/B,4BAAiC;AAEjC,iCAAoC;AACpC,sBAAqC;AAG9B,SAAS,MAAM,OAAmB;AAEvC,MAAI,MAAM,SAAS;AACjB,WAAO,MAAM;AAAA,EACf;AAEA,QAAM,SAAS,CAAC,CAAC,MAAM;AACvB,QAAM,EAAE,MAAM,OAAO,cAAc,UAAU,QAAI,sCAAqB,OAAO,MAAM;AACnF,QAAM,oBAAoB,MAAM;AAChC,QAAM,eAAe,EAAE,QAAQ;AAI/B,MAAI,eAAW,sBAAQ,MAAM;AAC3B,WAAO;AAAA,MACL,MAAM,oBACF,aAAAA,QAAM,aAAa,MAAM,UAAU,EAAE,CAAC,mBAAmB,KAAK,CAAC,IAC/D,MAAM;AAAA,MACV;AAAA,IACF;AAAA,EACF,GAAG,CAAC,cAAc,MAAM,UAAU,YAAY,CAAC;AAE/C,MAAI,QAAQ,IAAI,aAAa,iBAAiB,cAAc;AAE1D,YAAQ,CAAC,SAAS,QAAQ,KAAK,0BAA0B,MAAM;AAC/D,WAAO,MAAM;AAAA,EACf;AAEA,MAAI,qBAAqB,cAAc;AACrC,WAAO;AAAA,EACT;AAEA,MAAI,wBAAO;AACT,UAAM,KAAK,CAAC,MAAM,WAAW,WAAW,eAAe,EAAE,OAAO,OAAO,EAAE,KAAK,GAAG;AACjF,eACE,4CAAC;AAAA,MACC,WAAW;AAAA,MACX,OAAO;AAAA,QAEL,WAAO,wCAAiB,+BAAO,KAAK;AAAA,MACtC;AAAA,MAEC;AAAA,KACH;AAAA,EAEJ;AAEA,SAAO;AACT;AAEO,SAAS,wBACd,UACA,cACA,aACA;AAEA,MAAI,CAAC;AAAc,WAAO;AAE1B,MAAI,OAAO;AAGX,MAAI,eAAe,cAAc;AAC/B,WAAO,4CAAC;AAAA,MAAM,MAAM,aAAa,MAAM;AAAA,MAAa;AAAA,KAAK;AAAA,EAC3D;AACA,SACE,4CAAC,+CAAoB,UAApB;AAAA,IAA6B,OAAO;AAAA,IAClC;AAAA,GACH;AAEJ;",
   "names": ["React"]
 }

package/dist/esm/helpers/cache.js

@@ -1,17 +1,14 @@
-class Cache {
-  constructor() {
-    this.v = {};
-  }
+const v = {};
+const cache = {
   get(key, valStr) {
     var _a;
-    return (_a = this.v[key]) == null ? void 0 : _a[valStr];
-  }
+    return (_a = v[key]) == null ? void 0 : _a[valStr];
+  },
   set(key, valStr, object) {
-    this.v[key] ??= {};
-    this.v[key][valStr] = object;
+    v[key] ??= {};
+    v[key][valStr] = object;
   }
-}
-const cache = new Cache();
+};
 export {
   cache
 };

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/cache.ts"],
-  "sourcesContent": ["type Value = Object | Array<any> | string | number\n\nexport type Style = { [key: string]: Value }\n\nclass Cache {\n  v: Record<string, any> = {}\n\n  get(key: string, valStr: string) {\n    return this.v[key]?.[valStr]\n  }\n\n  set(key: string, valStr: string, object: any) {\n    this.v[key] ??= {}\n    this.v[key][valStr] = object\n  }\n}\n\nexport const cache = new Cache()\n"],
-  "mappings": "AAIA,MAAM,MAAM;AAAA,EAAZ;AACE,aAAyB,CAAC;AAAA;AAAA,EAE1B,IAAI,KAAa,QAAgB;AAPnC;AAQI,YAAO,UAAK,EAAE,SAAP,mBAAc;AAAA,EACvB;AAAA,EAEA,IAAI,KAAa,QAAgB,QAAa;AAC5C,SAAK,EAAE,SAAS,CAAC;AACjB,SAAK,EAAE,KAAK,UAAU;AAAA,EACxB;AACF;AAEO,MAAM,QAAQ,IAAI,MAAM;",
+  "sourcesContent": ["type Value = Object | Array<any> | string | number\n\nexport type Style = { [key: string]: Value }\n\nconst v: Record<string, any> = {}\n\nexport const cache = {\n  get(key: string, valStr: string) {\n    return v[key]?.[valStr]\n  },\n\n  set(key: string, valStr: string, object: any) {\n    v[key] ??= {}\n    v[key][valStr] = object\n  },\n}\n"],
+  "mappings": "AAIA,MAAM,IAAyB,CAAC;AAEzB,MAAM,QAAQ;AAAA,EACnB,IAAI,KAAa,QAAgB;AAPnC;AAQI,YAAO,OAAE,SAAF,mBAAS;AAAA,EAClB;AAAA,EAEA,IAAI,KAAa,QAAgB,QAAa;AAC5C,MAAE,SAAS,CAAC;AACZ,MAAE,KAAK,UAAU;AAAA,EACnB;AACF;",
   "names": []
 }

package/dist/esm/helpers/expandStyle.js

@@ -1,3 +1,4 @@
+var _a;
 import { isWeb } from "@tamagui/constants";
 function expandStyle(key, value) {
   if (process.env.TAMAGUI_TARGET === "web") {
@@ -18,63 +19,50 @@ function expandStyle(key, value) {
       return;
     }
     switch (key) {
-      case "aspectRatio": {
-        return [[key, value.toString()]];
-      }
       case "textAlignVertical": {
         return [["verticalAlign", value === "center" ? "middle" : value]];
       }
-      case "textDecorationLine": {
-        return [["textDecorationLine", value]];
-      }
       case "writingDirection": {
         return [["direction", value]];
       }
     }
   }
-  const longKey = STYLE_SHORT_FORM_EXPANSIONS[key];
+  const longKey = EXPANSIONS[key];
   if (longKey) {
     return longKey.map((key2) => {
       return [key2, value];
     });
   }
 }
-const STYLE_SHORT_FORM_EXPANSIONS = {
-  borderColor: [
-    "borderTopColor",
-    "borderRightColor",
-    "borderBottomColor",
-    "borderLeftColor"
-  ],
+const all = ["Top", "Right", "Bottom", "Left"];
+const horiz = ["Right", "Left"];
+const vert = ["Top", "Bottom"];
+const xy = ["X", "Y"];
+const EXPANSIONS = {
+  borderColor: ["TopColor", "RightColor", "BottomColor", "LeftColor"],
   borderRadius: [
-    "borderTopLeftRadius",
-    "borderTopRightRadius",
-    "borderBottomRightRadius",
-    "borderBottomLeftRadius"
+    "TopLeftRadius",
+    "TopRightRadius",
+    "BottomRightRadius",
+    "BottomLeftRadius"
   ],
-  borderWidth: [
-    "borderTopWidth",
-    "borderRightWidth",
-    "borderBottomWidth",
-    "borderLeftWidth"
-  ],
-  margin: ["marginTop", "marginRight", "marginBottom", "marginLeft"],
-  marginHorizontal: ["marginRight", "marginLeft"],
-  marginVertical: ["marginTop", "marginBottom"],
-  overscrollBehavior: ["overscrollBehaviorX", "overscrollBehaviorY"],
-  padding: ["paddingTop", "paddingRight", "paddingBottom", "paddingLeft"],
-  paddingHorizontal: ["paddingRight", "paddingLeft"],
-  paddingVertical: ["paddingTop", "paddingBottom"],
+  borderWidth: ["TopWidth", "RightWidth", "BottomWidth", "LeftWidth"],
+  margin: all,
+  marginHorizontal: horiz,
+  marginVertical: vert,
+  overscrollBehavior: xy,
+  padding: all,
+  paddingHorizontal: horiz,
+  paddingVertical: vert,
   ...isWeb && {
-    borderStyle: [
-      "borderTopStyle",
-      "borderRightStyle",
-      "borderBottomStyle",
-      "borderLeftStyle"
-    ],
-    overflow: ["overflowX", "overflowY"]
+    borderStyle: ["TopStyle", "RightStyle", "BottomStyle", "LeftStyle"],
+    overflow: xy
   }
 };
+for (const parent in EXPANSIONS) {
+  const prefix = parent.slice(0, ((_a = /[A-Z]/.exec(parent)) == null ? void 0 : _a.index) ?? parent.length);
+  EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`);
+}
 export {
   expandStyle
 };

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/expandStyle.ts"],
-  "sourcesContent": ["/**\n * Some parts adapted from react-native-web\n * Copyright (c) Nicolas Gallagher licensed under the MIT license.\n */\n\nimport { isWeb } from '@tamagui/constants'\n\nexport function expandStyle(key: string, value: any) {\n  if (process.env.TAMAGUI_TARGET === 'web') {\n    if (key === 'flex') {\n      // The 'flex' property value in React Native must be a positive integer,\n      // 0, or -1.\n      if (value <= -1) {\n        return [\n          ['flexGrow', 0],\n          ['flexShrink', 1],\n          ['flexBasis', 'auto'],\n        ]\n      }\n      // normalizing to better align with native\n      // see spec for flex shorthand https://developer.mozilla.org/en-US/docs/Web/CSS/flex\n      if (value >= 0) {\n        return [\n          ['flexGrow', value],\n          ['flexShrink', 1],\n        ]\n      }\n      return\n    }\n\n    // web only\n    switch (key) {\n      case 'aspectRatio': {\n        return [[key, value.toString()]]\n      }\n\n      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n\n      case 'textDecorationLine': {\n        return [['textDecorationLine', value]]\n      }\n\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = STYLE_SHORT_FORM_EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst STYLE_SHORT_FORM_EXPANSIONS: Record<string, string[]> = {\n  borderColor: [\n    'borderTopColor',\n    'borderRightColor',\n    'borderBottomColor',\n    'borderLeftColor',\n  ],\n  borderRadius: [\n    'borderTopLeftRadius',\n    'borderTopRightRadius',\n    'borderBottomRightRadius',\n    'borderBottomLeftRadius',\n  ],\n  borderWidth: [\n    'borderTopWidth',\n    'borderRightWidth',\n    'borderBottomWidth',\n    'borderLeftWidth',\n  ],\n  margin: ['marginTop', 'marginRight', 'marginBottom', 'marginLeft'],\n  marginHorizontal: ['marginRight', 'marginLeft'],\n  marginVertical: ['marginTop', 'marginBottom'],\n  overscrollBehavior: ['overscrollBehaviorX', 'overscrollBehaviorY'],\n  padding: ['paddingTop', 'paddingRight', 'paddingBottom', 'paddingLeft'],\n  paddingHorizontal: ['paddingRight', 'paddingLeft'],\n  paddingVertical: ['paddingTop', 'paddingBottom'],\n  ...(isWeb && {\n    // react-native only supports borderStyle\n    borderStyle: [\n      'borderTopStyle',\n      'borderRightStyle',\n      'borderBottomStyle',\n      'borderLeftStyle',\n    ],\n    // react-native doesn't support X / Y\n    overflow: ['overflowX', 'overflowY'],\n  }),\n}\n"],
-  "mappings": "AAKA,SAAS,aAAa;AAEf,SAAS,YAAY,KAAa,OAAY;AACnD,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,QAAQ,QAAQ;AAGlB,UAAI,SAAS,IAAI;AACf,eAAO;AAAA,UACL,CAAC,YAAY,CAAC;AAAA,UACd,CAAC,cAAc,CAAC;AAAA,UAChB,CAAC,aAAa,MAAM;AAAA,QACtB;AAAA,MACF;AAGA,UAAI,SAAS,GAAG;AACd,eAAO;AAAA,UACL,CAAC,YAAY,KAAK;AAAA,UAClB,CAAC,cAAc,CAAC;AAAA,QAClB;AAAA,MACF;AACA;AAAA,IACF;AAGA,YAAQ;AAAA,WACD,eAAe;AAClB,eAAO,CAAC,CAAC,KAAK,MAAM,SAAS,CAAC,CAAC;AAAA,MACjC;AAAA,WAEK,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,WAEK,sBAAsB;AACzB,eAAO,CAAC,CAAC,sBAAsB,KAAK,CAAC;AAAA,MACvC;AAAA,WAEK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA;AAAA,EAEJ;AAEA,QAAM,UAAU,4BAA4B;AAC5C,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAACA,SAAQ;AAC1B,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,8BAAwD;AAAA,EAC5D,aAAa;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa;AAAA,IACX;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,QAAQ,CAAC,aAAa,eAAe,gBAAgB,YAAY;AAAA,EACjE,kBAAkB,CAAC,eAAe,YAAY;AAAA,EAC9C,gBAAgB,CAAC,aAAa,cAAc;AAAA,EAC5C,oBAAoB,CAAC,uBAAuB,qBAAqB;AAAA,EACjE,SAAS,CAAC,cAAc,gBAAgB,iBAAiB,aAAa;AAAA,EACtE,mBAAmB,CAAC,gBAAgB,aAAa;AAAA,EACjD,iBAAiB,CAAC,cAAc,eAAe;AAAA,EAC/C,GAAI,SAAS;AAAA,IAEX,aAAa;AAAA,MACX;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IAEA,UAAU,CAAC,aAAa,WAAW;AAAA,EACrC;AACF;",
+  "sourcesContent": ["/**\n * Some parts adapted from react-native-web\n * Copyright (c) Nicolas Gallagher licensed under the MIT license.\n */\n\nimport { isWeb } from '@tamagui/constants'\n\nexport function expandStyle(key: string, value: any) {\n  if (process.env.TAMAGUI_TARGET === 'web') {\n    if (key === 'flex') {\n      // The 'flex' property value in React Native must be a positive integer,\n      // 0, or -1.\n      if (value <= -1) {\n        return [\n          ['flexGrow', 0],\n          ['flexShrink', 1],\n          ['flexBasis', 'auto'],\n        ]\n      }\n      // normalizing to better align with native\n      // see spec for flex shorthand https://developer.mozilla.org/en-US/docs/Web/CSS/flex\n      if (value >= 0) {\n        return [\n          ['flexGrow', value],\n          ['flexShrink', 1],\n        ]\n      }\n      return\n    }\n\n    // web only\n    switch (key) {\n      case 'textAlignVertical': {\n        return [['verticalAlign', value === 'center' ? 'middle' : value]]\n      }\n      case 'writingDirection': {\n        return [['direction', value]]\n      }\n    }\n  }\n\n  const longKey = EXPANSIONS[key]\n  if (longKey) {\n    return longKey.map((key) => {\n      return [key, value]\n    })\n  }\n}\n\nconst all = ['Top', 'Right', 'Bottom', 'Left']\nconst horiz = ['Right', 'Left']\nconst vert = ['Top', 'Bottom']\nconst xy = ['X', 'Y']\n\nconst EXPANSIONS: Record<string, string[]> = {\n  borderColor: ['TopColor', 'RightColor', 'BottomColor', 'LeftColor'],\n  borderRadius: [\n    'TopLeftRadius',\n    'TopRightRadius',\n    'BottomRightRadius',\n    'BottomLeftRadius',\n  ],\n  borderWidth: ['TopWidth', 'RightWidth', 'BottomWidth', 'LeftWidth'],\n  margin: all,\n  marginHorizontal: horiz,\n  marginVertical: vert,\n  overscrollBehavior: xy,\n  padding: all,\n  paddingHorizontal: horiz,\n  paddingVertical: vert,\n  ...(isWeb && {\n    // react-native only supports borderStyle\n    borderStyle: ['TopStyle', 'RightStyle', 'BottomStyle', 'LeftStyle'],\n    // react-native doesn't support X / Y\n    overflow: xy,\n  }),\n}\n\nfor (const parent in EXPANSIONS) {\n  const prefix = parent.slice(0, /[A-Z]/.exec(parent)?.index ?? parent.length)\n  EXPANSIONS[parent] = EXPANSIONS[parent].map((k) => `${prefix}${k}`)\n}\n"],
+  "mappings": "AAAA;AAKA,SAAS,aAAa;AAEf,SAAS,YAAY,KAAa,OAAY;AACnD,MAAI,QAAQ,IAAI,mBAAmB,OAAO;AACxC,QAAI,QAAQ,QAAQ;AAGlB,UAAI,SAAS,IAAI;AACf,eAAO;AAAA,UACL,CAAC,YAAY,CAAC;AAAA,UACd,CAAC,cAAc,CAAC;AAAA,UAChB,CAAC,aAAa,MAAM;AAAA,QACtB;AAAA,MACF;AAGA,UAAI,SAAS,GAAG;AACd,eAAO;AAAA,UACL,CAAC,YAAY,KAAK;AAAA,UAClB,CAAC,cAAc,CAAC;AAAA,QAClB;AAAA,MACF;AACA;AAAA,IACF;AAGA,YAAQ;AAAA,WACD,qBAAqB;AACxB,eAAO,CAAC,CAAC,iBAAiB,UAAU,WAAW,WAAW,KAAK,CAAC;AAAA,MAClE;AAAA,WACK,oBAAoB;AACvB,eAAO,CAAC,CAAC,aAAa,KAAK,CAAC;AAAA,MAC9B;AAAA;AAAA,EAEJ;AAEA,QAAM,UAAU,WAAW;AAC3B,MAAI,SAAS;AACX,WAAO,QAAQ,IAAI,CAACA,SAAQ;AAC1B,aAAO,CAACA,MAAK,KAAK;AAAA,IACpB,CAAC;AAAA,EACH;AACF;AAEA,MAAM,MAAM,CAAC,OAAO,SAAS,UAAU,MAAM;AAC7C,MAAM,QAAQ,CAAC,SAAS,MAAM;AAC9B,MAAM,OAAO,CAAC,OAAO,QAAQ;AAC7B,MAAM,KAAK,CAAC,KAAK,GAAG;AAEpB,MAAM,aAAuC;AAAA,EAC3C,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,cAAc;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,EAClE,QAAQ;AAAA,EACR,kBAAkB;AAAA,EAClB,gBAAgB;AAAA,EAChB,oBAAoB;AAAA,EACpB,SAAS;AAAA,EACT,mBAAmB;AAAA,EACnB,iBAAiB;AAAA,EACjB,GAAI,SAAS;AAAA,IAEX,aAAa,CAAC,YAAY,cAAc,eAAe,WAAW;AAAA,IAElE,UAAU;AAAA,EACZ;AACF;AAEA,WAAW,UAAU,YAAY;AAC/B,QAAM,SAAS,OAAO,MAAM,KAAG,aAAQ,KAAK,MAAM,MAAnB,mBAAsB,UAAS,OAAO,MAAM;AAC3E,aAAW,UAAU,WAAW,QAAQ,IAAI,CAAC,MAAM,GAAG,SAAS,GAAG;AACpE;",
   "names": ["key"]
 }

package/dist/esm/helpers/getSplitStyles.js

@@ -302,20 +302,11 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
             }
             break;
           }
-          case "accessibilityControls": {
-            viewProps["aria-controls"] = processIDRefList(valInit);
-            break;
-          }
+          case "accessibilityLabelledBy":
+          case "accessibilityFlowTo":
+          case "accessibilityControls":
           case "accessibilityDescribedBy": {
-            viewProps["aria-describedby"] = processIDRefList(valInit);
-            break;
-          }
-          case "accessibilityFlowTo": {
-            viewProps["aria-flowto"] = processIDRefList(valInit);
-            break;
-          }
-          case "accessibilityLabelledBy": {
-            viewProps["aria-labelledby"] = processIDRefList(valInit);
+            viewProps[`aria-${keyInit.replace("accessibility", "").toLowerCase()}`] = processIDRefList(valInit);
             break;
           }
           case "accessibilityKeyShortcuts": {