@tamagui/core 1.0.1-beta.77 → 1.0.1-beta.80

package/dist/cjs/index.js

@@ -18,8 +18,6 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  RNWTextProps: () => import_types_rnw.RNWTextProps,
-  RNWViewProps: () => import_types_rnw.RNWViewProps,
   expandStyles: () => import_generateAtomicStyles.expandStyles,
   getConfig: () => import_conf.getConfig,
   getHasConfigured: () => import_conf.getHasConfigured,
@@ -40,7 +38,6 @@ __reExport(src_exports, require("./createVariables"), module.exports);
 __reExport(src_exports, require("./insertFont"), module.exports);
 __reExport(src_exports, require("./styled"), module.exports);
 __reExport(src_exports, require("./types"), module.exports);
-var import_types_rnw = require("./types-rnw");
 var import_conf = require("./conf");
 __reExport(src_exports, require("./constants/constants"), module.exports);
 __reExport(src_exports, require("./constants/platform"), module.exports);
@@ -84,8 +81,6 @@ __reExport(src_exports, require("@tamagui/use-force-update"), module.exports);
 __reExport(src_exports, require("@tamagui/helpers"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  RNWTextProps,
-  RNWViewProps,
   expandStyles,
   getConfig,
   getHasConfigured,

package/dist/cjs/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/index.ts"],
-  "sourcesContent": ["export * from './Tamagui'\nexport * from './createComponent'\nexport * from './createShorthands'\nexport * from './createTheme'\nexport * from './createTamagui'\nexport * from './createFont'\nexport * from './createTokens'\nexport * from './createVariable'\nexport * from './createVariables'\nexport * from './insertFont'\nexport * from './styled'\nexport * from './types'\n// for type portability\nexport { RNWTextProps, RNWViewProps } from './types-rnw'\nexport { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } from './conf'\n\nexport * from './constants/constants'\nexport * from './constants/platform'\nexport * from './constants/rnw'\n\nexport * from './helpers/calc'\nexport * from './helpers/createShallowUpdate'\nexport * from './helpers/getStackSize'\nexport * from './helpers/getVariantExtras'\nexport * from './helpers/getExpandedShorthands'\nexport * from './helpers/getSize'\nexport * from './helpers/getSplitStyles'\nexport * from './helpers/getStylesAtomic'\nexport * from './helpers/pseudoDescriptors'\nexport * from './helpers/mergeProps'\nexport { expandStyles } from './helpers/generateAtomicStyles'\nexport * from './helpers/getTextSize'\nexport * from './helpers/isObj'\nexport * from './helpers/isTamaguiElement'\nexport * from './helpers/isTamaguiComponent'\nexport * from './helpers/matchMedia'\nexport * from './helpers/themeable'\nexport * from './helpers/withStaticProperties'\n\nexport * from './contexts/ButtonInsideButtonContext'\n\nexport * from './hooks/useConstant'\nexport * from './hooks/useId'\nexport * from './hooks/useIsMounted'\nexport * from './hooks/useIsTouchDevice'\nexport * from './hooks/useMedia'\nexport * from './hooks/usePressable'\nexport * from './hooks/useTheme'\nexport * from './hooks/useUnmountEffect'\n\nexport * from './views/Slot'\nexport * from './views/Stack'\nexport * from './views/Text'\nexport * from './views/TextAncestorContext'\nexport * from './views/Theme'\nexport * from './views/ThemeInverse'\nexport * from './views/ThemeProvider'\nexport * from './views/ThemeReset'\n\nexport * from '@tamagui/use-force-update'\nexport * from '@tamagui/helpers'\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,oBAXd;AAaA,uBAA2C;AAC3C,kBAAoF;AAEpF,wBAAc,kCAhBd;AAiBA,wBAAc,iCAjBd;AAkBA,wBAAc,4BAlBd;AAoBA,wBAAc,2BApBd;AAqBA,wBAAc,0CArBd;AAsBA,wBAAc,mCAtBd;AAuBA,wBAAc,uCAvBd;AAwBA,wBAAc,4CAxBd;AAyBA,wBAAc,8BAzBd;AA0BA,wBAAc,qCA1Bd;AA2BA,wBAAc,sCA3Bd;AA4BA,wBAAc,wCA5Bd;AA6BA,wBAAc,iCA7Bd;AA8BA,kCAA6B;AAC7B,wBAAc,kCA/Bd;AAgCA,wBAAc,4BAhCd;AAiCA,wBAAc,uCAjCd;AAkCA,wBAAc,yCAlCd;AAmCA,wBAAc,iCAnCd;AAoCA,wBAAc,gCApCd;AAqCA,wBAAc,2CArCd;AAuCA,wBAAc,iDAvCd;AAyCA,wBAAc,gCAzCd;AA0CA,wBAAc,0BA1Cd;AA2CA,wBAAc,iCA3Cd;AA4CA,wBAAc,qCA5Cd;AA6CA,wBAAc,6BA7Cd;AA8CA,wBAAc,iCA9Cd;AA+CA,wBAAc,6BA/Cd;AAgDA,wBAAc,qCAhDd;AAkDA,wBAAc,yBAlDd;AAmDA,wBAAc,0BAnDd;AAoDA,wBAAc,yBApDd;AAqDA,wBAAc,wCArDd;AAsDA,wBAAc,0BAtDd;AAuDA,wBAAc,iCAvDd;AAwDA,wBAAc,kCAxDd;AAyDA,wBAAc,+BAzDd;AA2DA,wBAAc,sCA3Dd;AA4DA,wBAAc,6BA5Dd;",
+  "sourcesContent": ["export * from './Tamagui'\nexport * from './createComponent'\nexport * from './createShorthands'\nexport * from './createTheme'\nexport * from './createTamagui'\nexport * from './createFont'\nexport * from './createTokens'\nexport * from './createVariable'\nexport * from './createVariables'\nexport * from './insertFont'\nexport * from './styled'\nexport * from './types'\n// for type portability\nexport type { RNWTextProps, RNWViewProps } from './types-rnw'\nexport { getHasConfigured, getConfig, getThemes, getTokens, onConfiguredOnce } from './conf'\n\nexport * from './constants/constants'\nexport * from './constants/platform'\nexport * from './constants/rnw'\n\nexport * from './helpers/calc'\nexport * from './helpers/createShallowUpdate'\nexport * from './helpers/getStackSize'\nexport * from './helpers/getVariantExtras'\nexport * from './helpers/getExpandedShorthands'\nexport * from './helpers/getSize'\nexport * from './helpers/getSplitStyles'\nexport * from './helpers/getStylesAtomic'\nexport * from './helpers/pseudoDescriptors'\nexport * from './helpers/mergeProps'\nexport { expandStyles } from './helpers/generateAtomicStyles'\nexport * from './helpers/getTextSize'\nexport * from './helpers/isObj'\nexport * from './helpers/isTamaguiElement'\nexport * from './helpers/isTamaguiComponent'\nexport * from './helpers/matchMedia'\nexport * from './helpers/themeable'\nexport * from './helpers/withStaticProperties'\n\nexport * from './contexts/ButtonInsideButtonContext'\n\nexport * from './hooks/useConstant'\nexport * from './hooks/useId'\nexport * from './hooks/useIsMounted'\nexport * from './hooks/useIsTouchDevice'\nexport * from './hooks/useMedia'\nexport * from './hooks/usePressable'\nexport * from './hooks/useTheme'\nexport * from './hooks/useUnmountEffect'\n\nexport * from './views/Slot'\nexport * from './views/Stack'\nexport * from './views/Text'\nexport * from './views/TextAncestorContext'\nexport * from './views/Theme'\nexport * from './views/ThemeInverse'\nexport * from './views/ThemeProvider'\nexport * from './views/ThemeReset'\n\nexport * from '@tamagui/use-force-update'\nexport * from '@tamagui/helpers'\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,wBAAc,sBAAd;AACA,wBAAc,8BADd;AAEA,wBAAc,+BAFd;AAGA,wBAAc,0BAHd;AAIA,wBAAc,4BAJd;AAKA,wBAAc,yBALd;AAMA,wBAAc,2BANd;AAOA,wBAAc,6BAPd;AAQA,wBAAc,8BARd;AASA,wBAAc,yBATd;AAUA,wBAAc,qBAVd;AAWA,wBAAc,oBAXd;AAcA,kBAAoF;AAEpF,wBAAc,kCAhBd;AAiBA,wBAAc,iCAjBd;AAkBA,wBAAc,4BAlBd;AAoBA,wBAAc,2BApBd;AAqBA,wBAAc,0CArBd;AAsBA,wBAAc,mCAtBd;AAuBA,wBAAc,uCAvBd;AAwBA,wBAAc,4CAxBd;AAyBA,wBAAc,8BAzBd;AA0BA,wBAAc,qCA1Bd;AA2BA,wBAAc,sCA3Bd;AA4BA,wBAAc,wCA5Bd;AA6BA,wBAAc,iCA7Bd;AA8BA,kCAA6B;AAC7B,wBAAc,kCA/Bd;AAgCA,wBAAc,4BAhCd;AAiCA,wBAAc,uCAjCd;AAkCA,wBAAc,yCAlCd;AAmCA,wBAAc,iCAnCd;AAoCA,wBAAc,gCApCd;AAqCA,wBAAc,2CArCd;AAuCA,wBAAc,iDAvCd;AAyCA,wBAAc,gCAzCd;AA0CA,wBAAc,0BA1Cd;AA2CA,wBAAc,iCA3Cd;AA4CA,wBAAc,qCA5Cd;AA6CA,wBAAc,6BA7Cd;AA8CA,wBAAc,iCA9Cd;AA+CA,wBAAc,6BA/Cd;AAgDA,wBAAc,qCAhDd;AAkDA,wBAAc,yBAlDd;AAmDA,wBAAc,0BAnDd;AAoDA,wBAAc,yBApDd;AAqDA,wBAAc,wCArDd;AAsDA,wBAAc,0BAtDd;AAuDA,wBAAc,iCAvDd;AAwDA,wBAAc,kCAxDd;AAyDA,wBAAc,+BAzDd;AA2DA,wBAAc,sCA3Dd;AA4DA,wBAAc,6BA5Dd;",
   "names": []
 }

package/dist/esm/ThemeManager.js

@@ -72,7 +72,7 @@ class ThemeManager {
       return {
         name,
         theme: themes[name],
-        className: this.#getClassName(name)
+        className: this.getClassName(name)
       };
     }
     const parentIsReset = (_a = this.parentManager) == null ? void 0 : _a.reset;
@@ -84,7 +84,7 @@ class ThemeManager {
         ];
         for (const name2 of names) {
           if (name2 in themes) {
-            const className = this.#getClassName(name2);
+            const className = this.getClassName(name2);
             return { name: name2, theme: themes[name2], className };
           }
         }
@@ -131,10 +131,10 @@ class ThemeManager {
     return {
       name: nextName,
       theme,
-      className: this.#getClassName(nextName)
+      className: this.getClassName(nextName)
     };
   }
-  #getClassName(name) {
+  getClassName(name) {
     return `${THEME_CLASSNAME_PREFIX}${name} t_Theme`.replace("light_", "").replace("dark_", "");
   }
   track(uuid, keys) {

package/dist/esm/ThemeManager.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/ThemeManager.tsx"],
-  "sourcesContent": ["import { createContext } from 'react'\n\nimport { getThemes } from './conf'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from './constants/constants'\nimport { ThemeObject, Themes } 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}\n\nexport type GetNextThemeProps = {\n  themes?: Themes\n  name?: string | null\n  componentName?: string | null\n  reset?: boolean\n}\n\nexport class ThemeManager {\n  keys = new Map<any, Set<string>>()\n  listeners = new Map<any, Function>()\n  themeListeners = new Set<ThemeListener>()\n  className: string | null = null\n\n  constructor(\n    public name: string = '',\n    public theme: ThemeObject | null = null,\n    public parentManager: ThemeManager | null = null,\n    public reset: boolean = false\n  ) {\n    // find the nearest different parentManager\n    let parent = parentManager\n    let tries = 0\n    while (true) {\n      tries++\n      if (tries > 10) {\n        throw new Error(`Nested 10 of the same theme in a row, likely error`)\n      }\n      if (!parent) break\n      if (parent.name === name) {\n        // go up if same\n        parent = parent.parentManager\n      } else {\n        this.parentManager = parent\n        break\n      }\n    }\n  }\n\n  get parentName() {\n    return this.parentManager?.name || null\n  }\n\n  get fullName(): string {\n    return this.getNextTheme().name || this.name || ''\n    // const parentName = this.parentManager?.fullName || ''\n    // const name = this.name || ''\n    // const parts = [...new Set([...`${parentName}_${name}`.split('_')])].filter(Boolean)\n    // return parts.join('_')\n  }\n\n  // gets value going up to parents\n  getValue(key: string) {\n    let theme = this.theme\n    let manager = this as ThemeManager | null\n    while (true) {\n      if (!theme) return\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = this.parentManager\n      if (!manager) {\n        return\n      }\n      if (manager.theme === theme) {\n        return\n      }\n      theme = manager.theme\n    }\n  }\n\n  update({ name, theme, className }: SetActiveThemeProps = {}) {\n    // className compare on web, avoids light/dark re-renders\n    const nameChanged = name !== this.name\n    if (!nameChanged) {\n      return false\n    }\n    this.className = className || null\n    this.name = name || ''\n    this.theme = theme\n    this.notifyListeners()\n    return true\n  }\n\n  getNextTheme(props: GetNextThemeProps = {}, debug?: any) {\n    const { themes = getThemes(), name, componentName } = props\n\n    if (props.reset && name) {\n      return {\n        name: name,\n        theme: themes[name],\n        className: this.#getClassName(name),\n      }\n    }\n\n    const parentIsReset = this.parentManager?.reset\n\n    if (!name) {\n      if (componentName) {\n        // allow for _Card_Button or just _Button\n        const names = [\n          `${this.name}_${componentName}`,\n          `${withoutComponentName(this.name)}_${componentName}`,\n        ]\n        for (const name of names) {\n          if (name in themes) {\n            const className = this.#getClassName(name)\n            return { name, theme: themes[name], className }\n          }\n        }\n      }\n      return {\n        name: this.name,\n        theme: this.theme,\n      }\n    }\n\n    let nextName = name || this.name || ''\n    let parentName = parentIsReset ? this.parentName || this.fullName : this.fullName\n\n    while (true) {\n      if (nextName in themes) {\n        break\n      }\n      nextName = `${parentName}_${name}`\n      if (nextName in themes) {\n        break\n      }\n      if (!parentName.includes(THEME_NAME_SEPARATOR)) {\n        // not found!\n        console.warn('theme not found', name)\n        // this happens in next during _document.getInitialProps and has a terrible/non-existent stack trace\n        // throw new Error(`Theme not found: ${name}`)\n        break\n      }\n      // go up one\n      parentName = parentName.slice(0, parentName.lastIndexOf(THEME_NAME_SEPARATOR))\n    }\n\n    if (componentName) {\n      // allow for _Card_Button or just _Button\n      const names = [\n        `${nextName}_${componentName}`,\n        `${withoutComponentName(nextName)}_${componentName}`,\n      ]\n      for (const name of names) {\n        if (name in themes) {\n          nextName = name\n        }\n      }\n    }\n\n    let theme = themes[nextName]\n    if (!theme) {\n      theme = themes[`light_${nextName}`]\n    }\n\n    if (process.env.NODE_ENV === 'development' && debug) {\n      console.log('getNextTheme', { props, nextName, parentName }, this)\n    }\n\n    return {\n      name: nextName,\n      theme,\n      className: this.#getClassName(nextName),\n    }\n  }\n\n  #getClassName(name: string) {\n    return `${THEME_CLASSNAME_PREFIX}${name} t_Theme`.replace('light_', '').replace('dark_', '')\n  }\n\n  track(uuid: any, keys: Set<string>) {\n    if (!this.name) return\n    this.keys.set(uuid, keys)\n  }\n\n  notifyListeners() {\n    if (!this.name) {\n      this.keys.clear()\n    }\n    for (const [uuid, keys] of this.keys.entries()) {\n      if (keys.size) {\n        this.listeners.get(uuid)?.()\n      }\n    }\n    this.themeListeners.forEach((cb) => cb(this.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n\n  onUpdate(uuid: any, cb: Function) {\n    this.listeners.set(uuid, cb)\n    return () => {\n      this.listeners.delete(uuid)\n      this.keys.delete(uuid)\n    }\n  }\n}\n\nexport const ThemeManagerContext = createContext<ThemeManager | null>(null)\nexport const emptyManager = new ThemeManager()\n\nconst withoutComponentName = (name: string) => name.replace(/(\\_[A-Z][a-zA-Z]+)+$/g, '')\n"],
-  "mappings": "AAAA;AAEA;AACA;AAmBO,MAAM,aAAa;AAAA,EAMxB,YACS,OAAe,IACf,QAA4B,MAC5B,gBAAqC,MACrC,QAAiB,OACxB;AAJO;AACA;AACA;AACA;AATT,gBAAO,oBAAI,IAAsB;AACjC,qBAAY,oBAAI,IAAmB;AACnC,0BAAiB,oBAAI,IAAmB;AACxC,qBAA2B;AASzB,QAAI,SAAS;AACb,QAAI,QAAQ;AACZ,WAAO,MAAM;AACX;AACA,UAAI,QAAQ,IAAI;AACd,cAAM,IAAI,MAAM,oDAAoD;AAAA,MACtE;AACA,UAAI,CAAC;AAAQ;AACb,UAAI,OAAO,SAAS,MAAM;AAExB,iBAAS,OAAO;AAAA,MAClB,OAAO;AACL,aAAK,gBAAgB;AACrB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,IAAI,aAAa;AArDnB;AAsDI,WAAO,YAAK,kBAAL,mBAAoB,SAAQ;AAAA,EACrC;AAAA,EAEA,IAAI,WAAmB;AACrB,WAAO,KAAK,aAAa,EAAE,QAAQ,KAAK,QAAQ;AAAA,EAKlD;AAAA,EAGA,SAAS,KAAa;AACpB,QAAI,QAAQ,KAAK;AACjB,QAAI,UAAU;AACd,WAAO,MAAM;AACX,UAAI,CAAC;AAAO;AACZ,UAAI,OAAO,OAAO;AAChB,eAAO,MAAM;AAAA,MACf;AACA,gBAAU,KAAK;AACf,UAAI,CAAC,SAAS;AACZ;AAAA,MACF;AACA,UAAI,QAAQ,UAAU,OAAO;AAC3B;AAAA,MACF;AACA,cAAQ,QAAQ;AAAA,IAClB;AAAA,EACF;AAAA,EAEA,OAAO,EAAE,MAAM,OAAO,cAAmC,CAAC,GAAG;AAE3D,UAAM,cAAc,SAAS,KAAK;AAClC,QAAI,CAAC,aAAa;AAChB,aAAO;AAAA,IACT;AACA,SAAK,YAAY,aAAa;AAC9B,SAAK,OAAO,QAAQ;AACpB,SAAK,QAAQ;AACb,SAAK,gBAAgB;AACrB,WAAO;AAAA,EACT;AAAA,EAEA,aAAa,QAA2B,CAAC,GAAG,OAAa;AAlG3D;AAmGI,UAAM,EAAE,SAAS,UAAU,GAAG,MAAM,kBAAkB;AAEtD,QAAI,MAAM,SAAS,MAAM;AACvB,aAAO;AAAA,QACL;AAAA,QACA,OAAO,OAAO;AAAA,QACd,WAAW,KAAK,cAAc,IAAI;AAAA,MACpC;AAAA,IACF;AAEA,UAAM,gBAAgB,WAAK,kBAAL,mBAAoB;AAE1C,QAAI,CAAC,MAAM;AACT,UAAI,eAAe;AAEjB,cAAM,QAAQ;AAAA,UACZ,GAAG,KAAK,QAAQ;AAAA,UAChB,GAAG,qBAAqB,KAAK,IAAI,KAAK;AAAA,QACxC;AACA,mBAAW,SAAQ,OAAO;AACxB,cAAI,SAAQ,QAAQ;AAClB,kBAAM,YAAY,KAAK,cAAc,KAAI;AACzC,mBAAO,EAAE,aAAM,OAAO,OAAO,QAAO,UAAU;AAAA,UAChD;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,QACL,MAAM,KAAK;AAAA,QACX,OAAO,KAAK;AAAA,MACd;AAAA,IACF;AAEA,QAAI,WAAW,QAAQ,KAAK,QAAQ;AACpC,QAAI,aAAa,gBAAgB,KAAK,cAAc,KAAK,WAAW,KAAK;AAEzE,WAAO,MAAM;AACX,UAAI,YAAY,QAAQ;AACtB;AAAA,MACF;AACA,iBAAW,GAAG,cAAc;AAC5B,UAAI,YAAY,QAAQ;AACtB;AAAA,MACF;AACA,UAAI,CAAC,WAAW,SAAS,oBAAoB,GAAG;AAE9C,gBAAQ,KAAK,mBAAmB,IAAI;AAGpC;AAAA,MACF;AAEA,mBAAa,WAAW,MAAM,GAAG,WAAW,YAAY,oBAAoB,CAAC;AAAA,IAC/E;AAEA,QAAI,eAAe;AAEjB,YAAM,QAAQ;AAAA,QACZ,GAAG,YAAY;AAAA,QACf,GAAG,qBAAqB,QAAQ,KAAK;AAAA,MACvC;AACA,iBAAW,SAAQ,OAAO;AACxB,YAAI,SAAQ,QAAQ;AAClB,qBAAW;AAAA,QACb;AAAA,MACF;AAAA,IACF;AAEA,QAAI,QAAQ,OAAO;AACnB,QAAI,CAAC,OAAO;AACV,cAAQ,OAAO,SAAS;AAAA,IAC1B;AAEA,QAAI,QAAQ,IAAI,aAAa,iBAAiB,OAAO;AACnD,cAAQ,IAAI,gBAAgB,EAAE,OAAO,UAAU,WAAW,GAAG,IAAI;AAAA,IACnE;AAEA,WAAO;AAAA,MACL,MAAM;AAAA,MACN;AAAA,MACA,WAAW,KAAK,cAAc,QAAQ;AAAA,IACxC;AAAA,EACF;AAAA,EAEA,cAAc,MAAc;AAC1B,WAAO,GAAG,yBAAyB,eAAe,QAAQ,UAAU,EAAE,EAAE,QAAQ,SAAS,EAAE;AAAA,EAC7F;AAAA,EAEA,MAAM,MAAW,MAAmB;AAClC,QAAI,CAAC,KAAK;AAAM;AAChB,SAAK,KAAK,IAAI,MAAM,IAAI;AAAA,EAC1B;AAAA,EAEA,kBAAkB;AA/LpB;AAgMI,QAAI,CAAC,KAAK,MAAM;AACd,WAAK,KAAK,MAAM;AAAA,IAClB;AACA,eAAW,CAAC,MAAM,SAAS,KAAK,KAAK,QAAQ,GAAG;AAC9C,UAAI,KAAK,MAAM;AACb,mBAAK,UAAU,IAAI,IAAI,MAAvB;AAAA,MACF;AAAA,IACF;AACA,SAAK,eAAe,QAAQ,CAAC,OAAO,GAAG,KAAK,MAAM,IAAI,CAAC;AAAA,EACzD;AAAA,EAEA,cAAc,IAAmB;AAC/B,SAAK,eAAe,IAAI,EAAE;AAC1B,WAAO,MAAM;AACX,WAAK,eAAe,OAAO,EAAE;AAAA,IAC/B;AAAA,EACF;AAAA,EAEA,SAAS,MAAW,IAAc;AAChC,SAAK,UAAU,IAAI,MAAM,EAAE;AAC3B,WAAO,MAAM;AACX,WAAK,UAAU,OAAO,IAAI;AAC1B,WAAK,KAAK,OAAO,IAAI;AAAA,IACvB;AAAA,EACF;AACF;AAEO,MAAM,sBAAsB,cAAmC,IAAI;AACnE,MAAM,eAAe,IAAI,aAAa;AAE7C,MAAM,uBAAuB,CAAC,SAAiB,KAAK,QAAQ,yBAAyB,EAAE;",
+  "sourcesContent": ["import { createContext } from 'react'\n\nimport { getThemes } from './conf'\nimport { THEME_CLASSNAME_PREFIX, THEME_NAME_SEPARATOR } from './constants/constants'\nimport { ThemeObject, Themes } 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}\n\nexport type GetNextThemeProps = {\n  themes?: Themes\n  name?: string | null\n  componentName?: string | null\n  reset?: boolean\n}\n\nexport class ThemeManager {\n  keys = new Map<any, Set<string>>()\n  listeners = new Map<any, Function>()\n  themeListeners = new Set<ThemeListener>()\n  className: string | null = null\n\n  constructor(\n    public name: string = '',\n    public theme: ThemeObject | null = null,\n    public parentManager: ThemeManager | null = null,\n    public reset: boolean = false\n  ) {\n    // find the nearest different parentManager\n    let parent = parentManager\n    let tries = 0\n    while (true) {\n      tries++\n      if (tries > 10) {\n        throw new Error(`Nested 10 of the same theme in a row, likely error`)\n      }\n      if (!parent) break\n      if (parent.name === name) {\n        // go up if same\n        parent = parent.parentManager\n      } else {\n        this.parentManager = parent\n        break\n      }\n    }\n  }\n\n  get parentName() {\n    return this.parentManager?.name || null\n  }\n\n  get fullName(): string {\n    return this.getNextTheme().name || this.name || ''\n    // const parentName = this.parentManager?.fullName || ''\n    // const name = this.name || ''\n    // const parts = [...new Set([...`${parentName}_${name}`.split('_')])].filter(Boolean)\n    // return parts.join('_')\n  }\n\n  // gets value going up to parents\n  getValue(key: string) {\n    let theme = this.theme\n    let manager = this as ThemeManager | null\n    while (true) {\n      if (!theme) return\n      if (key in theme) {\n        return theme[key]\n      }\n      manager = this.parentManager\n      if (!manager) {\n        return\n      }\n      if (manager.theme === theme) {\n        return\n      }\n      theme = manager.theme\n    }\n  }\n\n  update({ name, theme, className }: SetActiveThemeProps = {}) {\n    // className compare on web, avoids light/dark re-renders\n    const nameChanged = name !== this.name\n    if (!nameChanged) {\n      return false\n    }\n    this.className = className || null\n    this.name = name || ''\n    this.theme = theme\n    this.notifyListeners()\n    return true\n  }\n\n  getNextTheme(props: GetNextThemeProps = {}, debug?: any) {\n    const { themes = getThemes(), name, componentName } = props\n\n    if (props.reset && name) {\n      return {\n        name: name,\n        theme: themes[name],\n        className: this.getClassName(name),\n      }\n    }\n\n    const parentIsReset = this.parentManager?.reset\n\n    if (!name) {\n      if (componentName) {\n        // allow for _Card_Button or just _Button\n        const names = [\n          `${this.name}_${componentName}`,\n          `${withoutComponentName(this.name)}_${componentName}`,\n        ]\n        for (const name of names) {\n          if (name in themes) {\n            const className = this.getClassName(name)\n            return { name, theme: themes[name], className }\n          }\n        }\n      }\n      return {\n        name: this.name,\n        theme: this.theme,\n      }\n    }\n\n    let nextName = name || this.name || ''\n    let parentName = parentIsReset ? this.parentName || this.fullName : this.fullName\n\n    while (true) {\n      if (nextName in themes) {\n        break\n      }\n      nextName = `${parentName}_${name}`\n      if (nextName in themes) {\n        break\n      }\n      if (!parentName.includes(THEME_NAME_SEPARATOR)) {\n        // not found!\n        console.warn('theme not found', name)\n        // this happens in next during _document.getInitialProps and has a terrible/non-existent stack trace\n        // throw new Error(`Theme not found: ${name}`)\n        break\n      }\n      // go up one\n      parentName = parentName.slice(0, parentName.lastIndexOf(THEME_NAME_SEPARATOR))\n    }\n\n    if (componentName) {\n      // allow for _Card_Button or just _Button\n      const names = [\n        `${nextName}_${componentName}`,\n        `${withoutComponentName(nextName)}_${componentName}`,\n      ]\n      for (const name of names) {\n        if (name in themes) {\n          nextName = name\n        }\n      }\n    }\n\n    let theme = themes[nextName]\n    if (!theme) {\n      theme = themes[`light_${nextName}`]\n    }\n\n    if (process.env.NODE_ENV === 'development' && debug) {\n      console.log('getNextTheme', { props, nextName, parentName }, this)\n    }\n\n    return {\n      name: nextName,\n      theme,\n      className: this.getClassName(nextName),\n    }\n  }\n\n  getClassName(name: string) {\n    return `${THEME_CLASSNAME_PREFIX}${name} t_Theme`.replace('light_', '').replace('dark_', '')\n  }\n\n  track(uuid: any, keys: Set<string>) {\n    if (!this.name) return\n    this.keys.set(uuid, keys)\n  }\n\n  notifyListeners() {\n    if (!this.name) {\n      this.keys.clear()\n    }\n    for (const [uuid, keys] of this.keys.entries()) {\n      if (keys.size) {\n        this.listeners.get(uuid)?.()\n      }\n    }\n    this.themeListeners.forEach((cb) => cb(this.name, this))\n  }\n\n  onChangeTheme(cb: ThemeListener) {\n    this.themeListeners.add(cb)\n    return () => {\n      this.themeListeners.delete(cb)\n    }\n  }\n\n  onUpdate(uuid: any, cb: Function) {\n    this.listeners.set(uuid, cb)\n    return () => {\n      this.listeners.delete(uuid)\n      this.keys.delete(uuid)\n    }\n  }\n}\n\nexport const ThemeManagerContext = createContext<ThemeManager | null>(null)\nexport const emptyManager = new ThemeManager()\n\nconst withoutComponentName = (name: string) => name.replace(/(\\_[A-Z][a-zA-Z]+)+$/g, '')\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/esm/constants/rnw.js

@@ -1,10 +1,5 @@
-const interopRequire = (x) => "default" in x ? x.default : x;
-const rnw = {};
-if (process.env.IS_STATIC === "is_static") {
-  Object.assign(rnw, interopRequire(require("react-native-web/dist/cjs/tamagui-exports")));
-} else if (process.env.TAMAGUI_TARGET === "web") {
-  Object.assign(rnw, interopRequire(require("react-native-web").TamaguiExports));
-}
+import * as RNW from "react-native-web";
+const rnw = RNW.TamaguiExports;
 export {
   rnw
 };

package/dist/esm/constants/rnw.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/constants/rnw.tsx"],
-  "sourcesContent": ["const interopRequire = (x: any) => ('default' in x ? x.default : x)\nexport const rnw: any = {}\n\n// in static mode, require them directly since we can't import react-native-web at all (it has flow stuff in it)\nif (process.env.IS_STATIC === 'is_static') {\n  Object.assign(rnw, interopRequire(require('react-native-web/dist/cjs/tamagui-exports')))\n} else if (process.env.TAMAGUI_TARGET === 'web') {\n  Object.assign(rnw, interopRequire(require('react-native-web').TamaguiExports))\n}\n"],
-  "mappings": "AAAA,MAAM,iBAAiB,CAAC,MAAY,aAAa,IAAI,EAAE,UAAU;AAC1D,MAAM,MAAW,CAAC;AAGzB,IAAI,QAAQ,IAAI,cAAc,aAAa;AACzC,SAAO,OAAO,KAAK,eAAe,QAAQ,2CAA2C,CAAC,CAAC;AACzF,WAAW,QAAQ,IAAI,mBAAmB,OAAO;AAC/C,SAAO,OAAO,KAAK,eAAe,QAAQ,kBAAkB,EAAE,cAAc,CAAC;AAC/E;",
+  "sourcesContent": ["import * as RNW from 'react-native-web'\n\nexport const rnw = RNW.TamaguiExports\n\n// const interopRequire = (x: any) => ('default' in x ? x.default : x)\n// export const rnw: any = {}\n\n// // in static mode, require them directly since we can't import react-native-web at all (it has flow stuff in it)\n// if (process.env.IS_STATIC === 'is_static') {\n//   Object.assign(rnw, interopRequire(require('react-native-web/dist/cjs/tamagui-exports')))\n// } else if (process.env.TAMAGUI_TARGET === 'web') {\n//   Object.assign(rnw, interopRequire(require('react-native-web').TamaguiExports))\n// }\n"],
+  "mappings": "AAAA;AAEO,MAAM,MAAM,IAAI;",
   "names": []
 }

package/dist/esm/createComponent.js

@@ -782,8 +782,8 @@ function createComponent(configIn, ParentComponent) {
     defaultNativeStyle = {};
     const validStyles2 = staticConfig.validStyles || stylePropsView;
     if (!isWeb) {
-      for (const key in defaults) {
-        const val = defaults[key];
+      for (const key in staticConfig.defaultProps) {
+        const val = staticConfig.defaultProps[key];
         if (typeof val === "string" && val[0] === "$" || !validStyles2[key] || val[0] === "_") {
           defaults[key] = val;
         } else {
@@ -866,7 +866,8 @@ const Spacer = createComponent({
       vertical: {
         width: 0,
         minWidth: 0
-      }
+      },
+      both: {}
     }
   },
   defaultVariants: {