@tamagui/core 1.0.1-rc.9 → 1.0.2

package/dist/cjs/helpers/ThemeManager.js

@@ -59,9 +59,9 @@ class ThemeManager {
       this.updateState(props, false);
       return;
     }
-    if (!parentManager) {
-      throw new Error("Must set up root first");
-    }
+    if (!parentManager)
+      throw `\u274C`;
+    this.themeListeners = parentManager.themeListeners;
     if (hasNoThemeUpdatingProps(props)) {
       return parentManager;
     }
@@ -105,9 +105,9 @@ class ThemeManager {
   }
   getStateShouldChange(nextState, state = this.state) {
     if (!(nextState == null ? void 0 : nextState.theme) || nextState.theme === (state == null ? void 0 : state.theme)) {
-      return null;
+      return false;
     }
-    return nextState;
+    return true;
   }
   getState(props = this.props, parentManager = this.parentManager) {
     return getState(props, parentManager) || (process.env.TAMAGUI_TARGET === "native" ? (parentManager == null ? void 0 : parentManager.state) || null : null);
@@ -132,6 +132,7 @@ class ThemeManager {
     }
   }
   notify() {
+    console.log("notify", this.themeListeners.size, this.themeListeners);
     this.themeListeners.forEach((cb) => cb(this.state.name, this));
   }
   onChangeTheme(cb) {
@@ -177,18 +178,7 @@ function getState(props, parentManager) {
   const max = base.length;
   const min = componentName && !nextName ? max : 0;
   if (process.env.NODE_ENV === "development" && props.debug === "verbose")
-    [
-      console.groupCollapsed("ThemeManager.getState()", props, {
-        parentName,
-        parentBaseTheme,
-        base,
-        min,
-        max,
-        isParentAComponentTheme
-      }),
-      console.trace(),
-      console.groupEnd()
-    ];
+    [console.groupCollapsed("ThemeManager.getState()", props, { parentName, parentBaseTheme, base, min, max, isParentAComponentTheme }), console.trace(), console.groupEnd()];
   for (let i = max; i >= min; i--) {
     let prefix = base.slice(0, i).join(import_constants.THEME_NAME_SEPARATOR);
     if (props.inverse) {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/ThemeManager.tsx"],
-  "sourcesContent": ["import { getThemes } from '../config'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from '../constants/constants'\nimport { getThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { ThemeParsed, ThemeProps } from '../types'\n\ntype ThemeListener = (name: string | null, themeManager: ThemeManager) => void\n\nexport type SetActiveThemeProps = {\n  className?: string\n  parentManager?: ThemeManager | null\n  name?: string | null\n  theme?: any\n  reset?: boolean\n}\n\nexport type ThemeManagerState = {\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n  parentName?: string\n}\n\nconst emptyState: ThemeManagerState = { name: '' }\n\nexport function hasNoThemeUpdatingProps(props: ThemeProps) {\n  return !(props.name || props.componentName || props.inverse || props.reset)\n}\n\nexport class ThemeManager {\n  themeListeners = new Set<ThemeListener>()\n  parentManager: ThemeManager | null = null\n  state: ThemeManagerState = emptyState\n\n  constructor(\n    public props: ThemeProps = {},\n    parentManager?: ThemeManager | 'root' | null | undefined\n  ) {\n    if (parentManager === 'root') {\n      this.updateState(props, false)\n      return\n    }\n    if (!parentManager) {\n      throw new Error('Must set up root first')\n    }\n    // no change no props\n    if (hasNoThemeUpdatingProps(props)) {\n      return parentManager\n    }\n    if (parentManager) {\n      this.parentManager = parentManager\n    }\n    const updatedState = this.getStateIfChanged(props)\n    if (updatedState) {\n      this.state = updatedState\n      return\n    }\n    return parentManager || this\n  }\n\n  updateState(\n    props: ThemeProps & { forceTheme?: ThemeParsed } = this.props || {},\n    notify = true\n  ) {\n    const shouldFlush = (() => {\n      if (props.forceTheme) {\n        this.state.theme = props.forceTheme\n        this.state.name = props.name || ''\n        return true\n      }\n      const nextState = this.getStateIfChanged(props)\n      if (nextState) {\n        this.state = nextState\n        return true\n      }\n    })()\n    if (shouldFlush) {\n      // reset any derived state\n      this.#allKeys = null\n      notify && this.notify()\n      return this.state\n    }\n  }\n\n  getStateIfChanged(\n    props = this.props,\n    state: ThemeManagerState | null = this.state,\n    parentManager = this.parentManager\n  ) {\n    const _ = this.getState(props, parentManager)\n    // is removing\n    if (state && state !== emptyState && !_) {\n      return parentManager?.state\n    }\n    if (this.getStateShouldChange(_, state)) {\n      return _\n    }\n  }\n\n  getStateShouldChange(\n    nextState: ThemeManagerState | null,\n    state: ThemeManagerState | null = this.state\n  ) {\n    if (!nextState?.theme || nextState.theme === state?.theme) {\n      return null\n    }\n    return nextState\n  }\n\n  getState(props = this.props, parentManager = this.parentManager) {\n    return (\n      getState(props, parentManager) ||\n      (process.env.TAMAGUI_TARGET === 'native' ? parentManager?.state || null : null)\n    )\n  }\n\n  #allKeys: Set<string> | null = null\n  get allKeys() {\n    this.#allKeys ??= new Set([\n      ...(this.parentManager?.allKeys || []),\n      ...Object.keys(this.state.theme || {}),\n    ])\n    return this.#allKeys\n  }\n\n  // gets value going up to parents\n  getValue(key: string, state?: ThemeManagerState) {\n    let theme = (state || this.state).theme\n    let manager = this as ThemeManager | null\n    while (theme && manager) {\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = manager.parentManager\n      theme = manager?.state.theme\n    }\n  }\n\n  notify() {\n    this.themeListeners.forEach((cb) => cb(this.state.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n}\n\nfunction getNextThemeClassName(name: string, isInverting = false) {\n  const next = `${THEME_CLASSNAME_PREFIX}${name}`\n  if (isInverting) {\n    return next\n  }\n  return next.replace('light_', '').replace('dark_', '')\n}\n\nconst cache = new WeakMap<ThemeProps, [ThemeManager, ThemeManagerState | null]>()\n\nfunction getState(\n  props: ThemeProps,\n  parentManager?: ThemeManager | null\n): ThemeManagerState | null {\n  const cached = cache.get(props)\n  if (cached && cached[0] === parentManager) {\n    return cached[1]\n  }\n\n  const themes = getThemes()\n\n  if (props.name && props.reset) {\n    throw new Error('Cannot reset + set new name')\n  }\n  if (props.reset && !parentManager?.parentManager) {\n    throw new Error('Cannot reset no grandparent exists')\n  }\n\n  let result: ThemeManagerState | null = null\n\n  const nextName = props.reset\n    ? parentManager?.parentManager?.state?.name || ''\n    : props.name || ''\n  const { componentName } = props\n  const parentName = parentManager?.state?.name || ''\n\n  // components look for most specific, fallback upwards\n  const base = parentName.split(THEME_NAME_SEPARATOR)\n  const lastSegment = base[base.length - 1]\n  const isParentAComponentTheme =\n    parentName && lastSegment[0].toUpperCase() === lastSegment[0]\n  if (isParentAComponentTheme) {\n    base.pop() // always remove componentName they can't nest\n  }\n  const parentBaseTheme = isParentAComponentTheme\n    ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)\n    : parentName\n  const max = base.length\n  const min =\n    componentName && !nextName\n      ? max // component name only don't search upwards\n      : 0\n\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose')\n    [\n      // eslint-disable-next-line no-console\n      console.groupCollapsed('ThemeManager.getState()', props, {\n        parentName,\n        parentBaseTheme,\n        base,\n        min,\n        max,\n        isParentAComponentTheme,\n      }),\n      // eslint-disable-next-line no-console\n      console.trace(),\n      // eslint-disable-next-line no-console\n      console.groupEnd(),\n    ]\n\n  for (let i = max; i >= min; i--) {\n    let prefix = base.slice(0, i).join(THEME_NAME_SEPARATOR)\n    if (props.inverse) {\n      prefix = inverseThemeName(prefix)\n    }\n    const potentials: string[] = []\n    if (prefix && prefix !== parentBaseTheme) {\n      potentials.push(prefix)\n    }\n    if (nextName) {\n      potentials.unshift(prefix ? `${prefix}_${nextName}` : nextName)\n    }\n    if (i === 1) {\n      const lastSegment = potentials.findIndex((x) => !x.includes('_'))\n      if (lastSegment > 0) {\n        potentials.splice(lastSegment, 0, nextName) // last try prefer our new name to parent\n      }\n    }\n    if (componentName) {\n      // components only look for component themes\n      if (nextName) {\n        potentials.push(\n          `${prefix.slice(\n            0,\n            prefix.indexOf(THEME_NAME_SEPARATOR)\n          )}_${nextName}_${componentName}`\n        )\n      }\n      potentials.push(`${prefix}_${componentName}`)\n      if (nextName) {\n        potentials.unshift(`${prefix}_${nextName}_${componentName}`)\n      }\n    }\n\n    const found = potentials.find((t) => t in themes)\n\n    // eslint-disable-next-line no-console\n    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose')\n      console.log('getState found', found, 'from', potentials, 'parentName', parentName)\n\n    if (found) {\n      // optimization return null if not changed\n      if (found === parentName) {\n        break\n      }\n      result = {\n        name: found,\n        theme: getThemeUnwrapped(themes[found]),\n        className: getNextThemeClassName(found, props.inverse),\n        parentName,\n      }\n      break\n    }\n  }\n\n  if (parentManager) {\n    cache.set(props, [parentManager, result])\n  }\n\n  return result\n}\n\nconst inverseThemeName = (themeName: string) => {\n  return themeName.startsWith('light')\n    ? themeName.replace(/^light/, 'dark')\n    : themeName.replace(/^dark/, 'light')\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { getThemes } from '../config'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from '../constants/constants'\nimport { getThemeUnwrapped } from '../hooks/getThemeUnwrapped'\nimport { ThemeParsed, ThemeProps } from '../types'\n\ntype ThemeListener = (name: string | null, themeManager: ThemeManager) => void\n\nexport type SetActiveThemeProps = {\n  className?: string\n  parentManager?: ThemeManager | null\n  name?: string | null\n  theme?: any\n  reset?: boolean\n}\n\nexport type ThemeManagerState = {\n  name: string\n  theme?: ThemeParsed | null\n  className?: string\n  parentName?: string\n}\n\nconst emptyState: ThemeManagerState = { name: '' }\n\nexport function hasNoThemeUpdatingProps(props: ThemeProps) {\n  return !(props.name || props.componentName || props.inverse || props.reset)\n}\n\nexport class ThemeManager {\n  themeListeners = new Set<ThemeListener>()\n  parentManager: ThemeManager | null = null\n  state: ThemeManagerState = emptyState\n\n  constructor(\n    public props: ThemeProps = {},\n    parentManager?: ThemeManager | 'root' | null | undefined\n  ) {\n    if (parentManager === 'root') {\n      this.updateState(props, false)\n      return\n    }\n    if (!parentManager) throw `\u274C`\n    // copy over listeners\n    this.themeListeners = parentManager.themeListeners\n\n    // no change no props\n    if (hasNoThemeUpdatingProps(props)) {\n      return parentManager\n    }\n    if (parentManager) {\n      this.parentManager = parentManager\n    }\n    const updatedState = this.getStateIfChanged(props)\n    if (updatedState) {\n      this.state = updatedState\n      return\n    }\n    return parentManager || this\n  }\n\n  updateState(\n    props: ThemeProps & { forceTheme?: ThemeParsed } = this.props || {},\n    notify = true\n  ) {\n    const shouldFlush = (() => {\n      if (props.forceTheme) {\n        this.state.theme = props.forceTheme\n        this.state.name = props.name || ''\n        return true\n      }\n      const nextState = this.getStateIfChanged(props)\n      if (nextState) {\n        this.state = nextState\n        return true\n      }\n    })()\n    if (shouldFlush) {\n      // reset any derived state\n      this.#allKeys = null\n      notify && this.notify()\n      return this.state\n    }\n  }\n\n  getStateIfChanged(\n    props = this.props,\n    state: ThemeManagerState | null = this.state,\n    parentManager = this.parentManager\n  ) {\n    const _ = this.getState(props, parentManager)\n    // is removing\n    if (state && state !== emptyState && !_) {\n      return parentManager?.state\n    }\n    if (this.getStateShouldChange(_, state)) {\n      return _\n    }\n  }\n\n  getStateShouldChange(\n    nextState: ThemeManagerState | null,\n    state: ThemeManagerState | null = this.state\n  ) {\n    if (!nextState?.theme || nextState.theme === state?.theme) {\n      return false\n    }\n    return true\n  }\n\n  getState(props = this.props, parentManager = this.parentManager) {\n    return (\n      getState(props, parentManager) ||\n      (process.env.TAMAGUI_TARGET === 'native' ? parentManager?.state || null : null)\n    )\n  }\n\n  #allKeys: Set<string> | null = null\n  get allKeys() {\n    this.#allKeys ??= new Set([\n      ...(this.parentManager?.allKeys || []),\n      ...Object.keys(this.state.theme || {}),\n    ])\n    return this.#allKeys\n  }\n\n  // gets value going up to parents\n  getValue(key: string, state?: ThemeManagerState) {\n    let theme = (state || this.state).theme\n    let manager = this as ThemeManager | null\n    while (theme && manager) {\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = manager.parentManager\n      theme = manager?.state.theme\n    }\n  }\n\n  notify() {\n    console.log('notify', this.themeListeners.size, this.themeListeners)\n    this.themeListeners.forEach((cb) => cb(this.state.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n}\n\nfunction getNextThemeClassName(name: string, isInverting = false) {\n  const next = `${THEME_CLASSNAME_PREFIX}${name}`\n  if (isInverting) {\n    return next\n  }\n  return next.replace('light_', '').replace('dark_', '')\n}\n\nconst cache = new WeakMap<ThemeProps, [ThemeManager, ThemeManagerState | null]>()\n\nfunction getState(\n  props: ThemeProps,\n  parentManager?: ThemeManager | null\n): ThemeManagerState | null {\n  const cached = cache.get(props)\n  if (cached && cached[0] === parentManager) {\n    return cached[1]\n  }\n\n  const themes = getThemes()\n\n  if (props.name && props.reset) {\n    throw new Error('Cannot reset + set new name')\n  }\n  if (props.reset && !parentManager?.parentManager) {\n    throw new Error('Cannot reset no grandparent exists')\n  }\n\n  let result: ThemeManagerState | null = null\n\n  const nextName = props.reset\n    ? parentManager?.parentManager?.state?.name || ''\n    : props.name || ''\n  const { componentName } = props\n  const parentName = parentManager?.state?.name || ''\n\n  // components look for most specific, fallback upwards\n  const base = parentName.split(THEME_NAME_SEPARATOR)\n  const lastSegment = base[base.length - 1]\n  const isParentAComponentTheme =\n    parentName && lastSegment[0].toUpperCase() === lastSegment[0]\n  if (isParentAComponentTheme) {\n    base.pop() // always remove componentName they can't nest\n  }\n  const parentBaseTheme = isParentAComponentTheme\n    ? base.slice(0, base.length).join(THEME_NAME_SEPARATOR)\n    : parentName\n  const max = base.length\n  const min =\n    componentName && !nextName\n      ? max // component name only don't search upwards\n      : 0\n\n  // prettier-ignore\n  // eslint-disable-next-line no-console\n  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') [ console.groupCollapsed('ThemeManager.getState()', props, { parentName,   parentBaseTheme,   base,   min,   max,   isParentAComponentTheme }), console.trace(), console.groupEnd() ]\n\n  for (let i = max; i >= min; i--) {\n    let prefix = base.slice(0, i).join(THEME_NAME_SEPARATOR)\n    if (props.inverse) {\n      prefix = inverseThemeName(prefix)\n    }\n    const potentials: string[] = []\n    if (prefix && prefix !== parentBaseTheme) {\n      potentials.push(prefix)\n    }\n    if (nextName) {\n      potentials.unshift(prefix ? `${prefix}_${nextName}` : nextName)\n    }\n    if (i === 1) {\n      const lastSegment = potentials.findIndex((x) => !x.includes('_'))\n      if (lastSegment > 0) {\n        potentials.splice(lastSegment, 0, nextName) // last try prefer our new name to parent\n      }\n    }\n    if (componentName) {\n      // components only look for component themes\n      if (nextName) {\n        potentials.push(\n          `${prefix.slice(\n            0,\n            prefix.indexOf(THEME_NAME_SEPARATOR)\n          )}_${nextName}_${componentName}`\n        )\n      }\n      potentials.push(`${prefix}_${componentName}`)\n      if (nextName) {\n        potentials.unshift(`${prefix}_${nextName}_${componentName}`)\n      }\n    }\n\n    const found = potentials.find((t) => t in themes)\n\n    // eslint-disable-next-line no-console\n    if (process.env.NODE_ENV === 'development' && props.debug === 'verbose')\n      console.log('getState found', found, 'from', potentials, 'parentName', parentName)\n\n    if (found) {\n      // optimization return null if not changed\n      if (found === parentName) {\n        break\n      }\n      result = {\n        name: found,\n        theme: getThemeUnwrapped(themes[found]),\n        className: getNextThemeClassName(found, props.inverse),\n        parentName,\n      }\n      break\n    }\n  }\n\n  if (parentManager) {\n    cache.set(props, [parentManager, result])\n  }\n\n  return result\n}\n\nconst inverseThemeName = (themeName: string) => {\n  return themeName.startsWith('light')\n    ? themeName.replace(/^light/, 'dark')\n    : themeName.replace(/^dark/, 'light')\n}\n"],
+  "mappings": "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",
   "names": ["lastSegment"]
 }

package/dist/cjs/helpers/Unwrap.js

@@ -0,0 +1,29 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var Unwrap_exports = {};
+__export(Unwrap_exports, {
+  Unwrap: () => Unwrap
+});
+module.exports = __toCommonJS(Unwrap_exports);
+const Unwrap = Symbol();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Unwrap
+});
+//# sourceMappingURL=Unwrap.js.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/helpers/Unwrap.tsx"],
+  "sourcesContent": ["export const Unwrap = Symbol()\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,SAAS,OAAO;",
+  "names": []
+}

package/dist/cjs/helpers/cache.js

@@ -21,21 +21,17 @@ __export(cache_exports, {
   cache: () => cache
 });
 module.exports = __toCommonJS(cache_exports);
-class Cache {
-  constructor() {
-    this.v = {};
-  }
-  get(key, valStr) {
-    var _a;
-    return (_a = this.v[key]) == null ? void 0 : _a[valStr];
-  }
-  set(key, valStr, object) {
+const v = {};
+const cache = {
+  get: (key, valStr) => {
     var _a;
-    (_a = this.v)[key] ?? (_a[key] = {});
-    this.v[key][valStr] = object;
+    return (_a = v[key]) == null ? void 0 : _a[valStr];
+  },
+  set: (key, valStr, object) => {
+    v[key] ?? (v[key] = {});
+    v[key][valStr] = object;
   }
-}
-const cache = new Cache();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cache

package/dist/cjs/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": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;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;AAXhD;AAYI,eAAK,GAAL,mBAAgB,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) => v[key]?.[valStr],\n  set: (key: string, valStr: string, object: any) => {\n    v[key] ??= {}\n    v[key][valStr] = object\n  },\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,MAAM,IAAyB,CAAC;AAEzB,MAAM,QAAQ;AAAA,EACnB,KAAK,CAAC,KAAa,WAAgB;AAPrC;AAOwC,mBAAE,SAAF,mBAAS;AAAA;AAAA,EAC/C,KAAK,CAAC,KAAa,QAAgB,WAAgB;AACjD,wBAAW,CAAC;AACZ,MAAE,KAAK,UAAU;AAAA,EACnB;AACF;",
   "names": []
 }

package/dist/cjs/helpers/expandStyle.js

@@ -3,9 +3,9 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+var __export = (target, all2) => {
+  for (var name in all2)
+    __defProp(target, name, { get: all2[name], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -22,6 +22,7 @@ __export(expandStyle_exports, {
 });
 module.exports = __toCommonJS(expandStyle_exports);
 var import_constants = require("@tamagui/constants");
+var _a;
 function expandStyle(key, value) {
   if (process.env.TAMAGUI_TARGET === "web") {
     if (key === "flex") {
@@ -41,63 +42,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,
   ...import_constants.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}`);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   expandStyle

package/dist/cjs/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": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAsB;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,0BAAS;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;AAAA;AAAA;AAAA;AAAA;AAKA,uBAAsB;AALtB;AAOO,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,0BAAS;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/cjs/helpers/getBoundingClientRect.js

@@ -22,13 +22,10 @@ __export(getBoundingClientRect_exports, {
 });
 module.exports = __toCommonJS(getBoundingClientRect_exports);
 const getBoundingClientRect = (node) => {
-  if (!node)
+  var _a;
+  if (!node || node.nodeType !== 1)
     return;
-  if (node.nodeType !== 1)
-    return;
-  if (node.getBoundingClientRect) {
-    return node.getBoundingClientRect();
-  }
+  return (_a = node.getBoundingClientRect) == null ? void 0 : _a.call(node);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/helpers/getBoundingClientRect.tsx"],
-  "sourcesContent": ["export const getBoundingClientRect = (node: HTMLElement | null): void | DOMRect => {\n  if (!node) return\n  if (node.nodeType !== 1) return\n  if (node.getBoundingClientRect) {\n    return node.getBoundingClientRect()\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,wBAAwB,CAAC,SAA6C;AACjF,MAAI,CAAC;AAAM;AACX,MAAI,KAAK,aAAa;AAAG;AACzB,MAAI,KAAK,uBAAuB;AAC9B,WAAO,KAAK,sBAAsB;AAAA,EACpC;AACF;",
+  "sourcesContent": ["export const getBoundingClientRect = (node: HTMLElement | null): void | DOMRect => {\n  if (!node || node.nodeType !== 1) return\n  return node.getBoundingClientRect?.()\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,wBAAwB,CAAC,SAA6C;AAAnF;AACE,MAAI,CAAC,QAAQ,KAAK,aAAa;AAAG;AAClC,UAAO,UAAK,0BAAL;AACT;",
   "names": []
 }

package/dist/cjs/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": {
@@ -455,7 +446,10 @@ const getSplitStyles = (props, staticConfig, theme, state, parentSplitStyles, la
             }
           }
         } else {
-          const isDisabled = !state[descriptor.stateKey || descriptor.name];
+          let isDisabled = !state[descriptor.stateKey || descriptor.name];
+          if (import_constants.isWeb && !import_constants.isClient && isEnter) {
+            isDisabled = false;
+          }
           if (!isDisabled) {
             usedKeys[key] || (usedKeys[key] = 1);
           }