@tamagui/web 1.28.1 → 1.28.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (55) hide show
  1. package/dist/cjs/createComponent.js +22 -19
  2. package/dist/cjs/createComponent.js.map +1 -1
  3. package/dist/cjs/helpers/createPropMapper.js +22 -2
  4. package/dist/cjs/helpers/createPropMapper.js.map +1 -1
  5. package/dist/cjs/helpers/getSplitStyles.js +4 -3
  6. package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
  7. package/dist/cjs/helpers/getVariantExtras.js +2 -2
  8. package/dist/cjs/helpers/getVariantExtras.js.map +1 -1
  9. package/dist/cjs/helpers/themeable.js +5 -2
  10. package/dist/cjs/helpers/themeable.js.map +1 -1
  11. package/dist/cjs/hooks/useMedia.js +7 -5
  12. package/dist/cjs/hooks/useMedia.js.map +1 -1
  13. package/dist/cjs/hooks/useTheme.js +38 -26
  14. package/dist/cjs/hooks/useTheme.js.map +1 -1
  15. package/dist/cjs/hooks/useThemeName.js.map +1 -1
  16. package/dist/cjs/views/Theme.js +23 -34
  17. package/dist/cjs/views/Theme.js.map +1 -1
  18. package/dist/esm/createComponent.js +22 -19
  19. package/dist/esm/createComponent.js.map +1 -1
  20. package/dist/esm/helpers/createPropMapper.js +22 -2
  21. package/dist/esm/helpers/createPropMapper.js.map +1 -1
  22. package/dist/esm/helpers/getSplitStyles.js +3 -2
  23. package/dist/esm/helpers/getSplitStyles.js.map +1 -1
  24. package/dist/esm/helpers/getVariantExtras.js +2 -2
  25. package/dist/esm/helpers/getVariantExtras.js.map +1 -1
  26. package/dist/esm/helpers/themeable.js +5 -2
  27. package/dist/esm/helpers/themeable.js.map +1 -1
  28. package/dist/esm/hooks/useMedia.js +5 -4
  29. package/dist/esm/hooks/useMedia.js.map +1 -1
  30. package/dist/esm/hooks/useTheme.js +40 -27
  31. package/dist/esm/hooks/useTheme.js.map +1 -1
  32. package/dist/esm/hooks/useThemeName.js.map +1 -1
  33. package/dist/esm/views/Theme.js +24 -35
  34. package/dist/esm/views/Theme.js.map +1 -1
  35. package/package.json +9 -9
  36. package/src/createComponent.tsx +36 -22
  37. package/src/helpers/createPropMapper.ts +27 -2
  38. package/src/helpers/getSplitStyles.tsx +3 -4
  39. package/src/helpers/getVariantExtras.tsx +3 -2
  40. package/src/helpers/themeable.tsx +8 -2
  41. package/src/hooks/useMedia.tsx +3 -3
  42. package/src/hooks/useTheme.tsx +52 -37
  43. package/src/hooks/useThemeName.tsx +1 -0
  44. package/src/views/Theme.tsx +43 -54
  45. package/types/createComponent.d.ts.map +1 -1
  46. package/types/helpers/createPropMapper.d.ts.map +1 -1
  47. package/types/helpers/getSplitStyles.d.ts.map +1 -1
  48. package/types/helpers/getVariantExtras.d.ts +1 -1
  49. package/types/helpers/getVariantExtras.d.ts.map +1 -1
  50. package/types/helpers/themeable.d.ts.map +1 -1
  51. package/types/hooks/useMedia.d.ts +2 -1
  52. package/types/hooks/useMedia.d.ts.map +1 -1
  53. package/types/hooks/useTheme.d.ts.map +1 -1
  54. package/types/hooks/useThemeName.d.ts.map +1 -1
  55. package/types/views/Theme.d.ts.map +1 -1
@@ -9,6 +9,7 @@ import {
9
9
  ThemeManager,
10
10
  ThemeManagerState,
11
11
  getNonComponentParentManager,
12
+ hasNoThemeUpdatingProps,
12
13
  } from '../helpers/ThemeManager'
13
14
  import { ThemeManagerContext } from '../helpers/ThemeManagerContext'
14
15
  import type { ThemeParsed, ThemeProps } from '../types'
@@ -171,18 +172,18 @@ export const useChangeThemeEffect = (
171
172
  disable,
172
173
  } = props
173
174
 
174
- let parentManager = useContext(ThemeManagerContext)
175
-
176
- if (!disable) {
177
- parentManager = getNonComponentParentManager(parentManager)
178
- }
175
+ const ogParentManager = useContext(ThemeManagerContext)
176
+ const hasThemeUpdatingProps = !hasNoThemeUpdatingProps(props)
177
+ const parentManager = disable
178
+ ? ogParentManager
179
+ : getNonComponentParentManager(ogParentManager)
179
180
 
180
181
  if (disable) {
181
- if (!parentManager) throw `❌`
182
+ if (!ogParentManager) throw `❌`
182
183
  return {
183
184
  isNewTheme: false,
184
- ...parentManager.state,
185
- themeManager: parentManager,
185
+ ...ogParentManager.state,
186
+ themeManager: ogParentManager,
186
187
  }
187
188
  }
188
189
 
@@ -304,44 +305,53 @@ export const useChangeThemeEffect = (
304
305
  }
305
306
 
306
307
  // returns previous theme manager if no change
307
- let themeManager: ThemeManager
308
+ let themeManager: ThemeManager = parentManager!
308
309
  let state: ThemeManagerState | undefined
309
310
 
310
311
  const getNewThemeManager = () => {
311
312
  return new ThemeManager(props, root ? 'root' : parentManager)
312
313
  }
313
314
 
314
- if (prev?.themeManager) {
315
- themeManager = prev.themeManager
316
-
317
- // this could be a bit better, problem is on toggling light/dark the state is actually
318
- // showing light even when the last was dark. but technically allso onChangeTheme should
319
- // basically always call on a change, so i'm wondering if we even need the shouldUpdate
320
- // at all anymore. this forces updates onChangeTheme for all dynamic style accessed components
321
- // which is correct, potentially in the future we can avoid forceChange and just know to
322
- // update if keys.length is set + onChangeTheme called
323
- const forceChange = Boolean(keys?.length)
324
- const next = themeManager.getState(props, parentManager)
325
- const nextState = getShouldUpdateTheme(themeManager, next, prev.state, forceChange)
326
-
327
- if (nextState) {
328
- state = nextState
329
-
330
- if (!prev.isNewTheme || !isWeb) {
331
- themeManager = getNewThemeManager()
315
+ // only if has updating theme props
316
+ if (hasThemeUpdatingProps) {
317
+ if (prev?.themeManager) {
318
+ themeManager = prev.themeManager
319
+
320
+ // this could be a bit better, problem is on toggling light/dark the state is actually
321
+ // showing light even when the last was dark. but technically allso onChangeTheme should
322
+ // basically always call on a change, so i'm wondering if we even need the shouldUpdate
323
+ // at all anymore. this forces updates onChangeTheme for all dynamic style accessed components
324
+ // which is correct, potentially in the future we can avoid forceChange and just know to
325
+ // update if keys.length is set + onChangeTheme called
326
+ const forceChange = Boolean(keys?.length)
327
+ const next = themeManager.getState(props, parentManager)
328
+ const nextState = getShouldUpdateTheme(
329
+ themeManager,
330
+ next,
331
+ prev.state,
332
+ forceChange
333
+ )
334
+
335
+ if (nextState) {
336
+ state = nextState
337
+
338
+ if (!prev.isNewTheme || !isWeb) {
339
+ themeManager = getNewThemeManager()
340
+ } else {
341
+ themeManager.updateState(nextState, true)
342
+ }
332
343
  } else {
333
- themeManager.updateState(nextState, true)
334
- }
335
- } else {
336
- if (prev.isNewTheme) {
337
- // reset to parent
338
- if (parentManager && !next) {
339
- themeManager = parentManager
344
+ if (prev.isNewTheme) {
345
+ // reset to parent
346
+ if (parentManager && !next) {
347
+ themeManager = parentManager
348
+ }
340
349
  }
341
350
  }
351
+ } else {
352
+ themeManager = getNewThemeManager()
353
+ state = { ...themeManager.state }
342
354
  }
343
- } else {
344
- themeManager = getNewThemeManager()
345
355
  }
346
356
 
347
357
  const isNewTheme = Boolean(themeManager !== parentManager)
@@ -350,7 +360,12 @@ export const useChangeThemeEffect = (
350
360
  const mounted = !props.inverse ? true : root || prev?.mounted
351
361
 
352
362
  if (!state) {
353
- state = isNewTheme ? { ...themeManager.state } : { ...parentManager!.state }
363
+ if (isNewTheme) {
364
+ state = { ...themeManager.state }
365
+ } else {
366
+ state = ogParentManager!.state
367
+ themeManager = ogParentManager!
368
+ }
354
369
  }
355
370
 
356
371
  if (!force && state.name === prev?.state.name) {
@@ -10,6 +10,7 @@ export function useThemeName(opts?: { parent?: true }): ThemeName {
10
10
  const config = getConfig()
11
11
  return config.themes[Object.keys(config.themes)[0]] as any
12
12
  }
13
+
13
14
  const manager = useContext(ThemeManagerContext)
14
15
  const [name, setName] = useState(manager?.state.name || '')
15
16
 
@@ -57,64 +57,53 @@ export function useThemedChildren(
57
57
  const shouldRenderChildrenWithTheme =
58
58
  isNewTheme || hasEverThemed.current || forceClassName || isRoot
59
59
 
60
- return useMemo(() => {
61
- if (!shouldRenderChildrenWithTheme) {
62
- return children
63
- }
60
+ if (!shouldRenderChildrenWithTheme) {
61
+ return children
62
+ }
64
63
 
65
- // be sure to memoize shouldReset to avoid reparenting
66
- let next = Children.toArray(children)
64
+ // be sure to memoize shouldReset to avoid reparenting
67
65
 
68
- // each children of these children wont get the theme
69
- if (shallow && themeManager) {
70
- next = next.map((child) => {
71
- return isValidElement(child)
72
- ? cloneElement(
73
- child,
74
- undefined,
75
- <Theme name={themeManager.state.parentName}>
76
- {(child as any).props.children}
77
- </Theme>
78
- )
79
- : child
80
- })
81
- }
66
+ // each children of these children wont get the theme
67
+ if (shallow && themeManager) {
68
+ let next = Children.toArray(children)
69
+ next = next.map((child) => {
70
+ return isValidElement(child)
71
+ ? cloneElement(
72
+ child,
73
+ undefined,
74
+ <Theme name={themeManager.state.parentName}>
75
+ {(child as any).props.children}
76
+ </Theme>
77
+ )
78
+ : child
79
+ })
80
+ }
82
81
 
83
- const wrapped = (
84
- <ThemeManagerContext.Provider value={themeManager}>
85
- {next}
86
- </ThemeManagerContext.Provider>
87
- )
82
+ const wrapped = (
83
+ <ThemeManagerContext.Provider value={themeManager}>
84
+ {children}
85
+ </ThemeManagerContext.Provider>
86
+ )
88
87
 
89
- if (forceClassName === false) {
90
- return wrapped
91
- }
88
+ if (forceClassName === false) {
89
+ return wrapped
90
+ }
92
91
 
93
- if (isWeb && !props.passPropsToChildren) {
94
- // in order to provide currentColor, set color by default
95
- const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''
96
- const colorStyle = themeColor
97
- ? {
98
- color: themeColor,
99
- }
100
- : undefined
101
-
102
- return (
103
- <span className={`${className || ''} _dsp_contents is_Theme`} style={colorStyle}>
104
- {wrapped}
105
- </span>
106
- )
107
- }
92
+ if (isWeb && !props.passPropsToChildren) {
93
+ // in order to provide currentColor, set color by default
94
+ const themeColor = theme && isNewTheme ? variableToString(theme.color) : ''
95
+ const colorStyle = themeColor
96
+ ? {
97
+ color: themeColor,
98
+ }
99
+ : undefined
100
+
101
+ return (
102
+ <span className={`${className || ''} _dsp_contents is_Theme`} style={colorStyle}>
103
+ {wrapped}
104
+ </span>
105
+ )
106
+ }
108
107
 
109
- return wrapped
110
- }, [
111
- forceClassName,
112
- props.passPropsToChildren,
113
- shouldRenderChildrenWithTheme,
114
- themeManager,
115
- children,
116
- theme,
117
- isNewTheme,
118
- className,
119
- ])
108
+ return wrapped
120
109
  }
@@ -1 +1 @@
1
- {"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AASA,OAAO,KAUN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAmBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,cAAc,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EAC1D,eAAe,CAAC,EAAE,iBAAiB,wDAi2BpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,sDA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAkGxD"}
1
+ {"version":3,"file":"createComponent.d.ts","sourceRoot":"","sources":["../src/createComponent.tsx"],"names":[],"mappings":"AASA,OAAO,KAUN,MAAM,OAAO,CAAA;AAkBd,OAAO,EACL,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,qBAAqB,EACrB,cAAc,EAIf,MAAM,SAAS,CAAA;AAoBhB,eAAO,MAAM,qBAAqB,EAAE,qBAMnC,CAAA;AAmBD,eAAO,MAAM,QAAQ,eAAsB,CAAA;AAqB3C,wBAAgB,eAAe,CAC7B,kBAAkB,SAAS,MAAM,GAAG,EAAE,EACtC,GAAG,GAAG,cAAc,EACpB,SAAS,GAAG,KAAK,EAEjB,cAAc,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,kBAAkB,EAC1D,eAAe,CAAC,EAAE,iBAAiB,wDA+2BpC;AAGD,eAAO,MAAM,QAAQ;YAAW;QAAE,QAAQ,CAAC,EAAE,GAAG,CAAA;KAAE;;CAAmB,CAAA;AAMrE,eAAO,MAAM,MAAM,sDA8CjB,CAAA;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAAA;IACnC,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAA;IAC1B,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC3B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,mBAkGxD"}
@@ -1 +1 @@
1
- {"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,UAAU,EAEV,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAQjB,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN,OAAO,GACP,UAAU,GACV,MAAM,GACN,iBAAiB,CAAA;AAErB,eAAO,MAAM,gBAAgB,iBAAkB,kBAAkB,eAsGhE,CAAA;AA0GD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBA2BtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA"}
1
+ {"version":3,"file":"createPropMapper.d.ts","sourceRoot":"","sources":["../../src/helpers/createPropMapper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAGV,UAAU,EAEV,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,UAAU,CAAA;AAQjB,MAAM,MAAM,oBAAoB,GAC5B,MAAM,GACN,OAAO,GACP,UAAU,GACV,MAAM,GACN,iBAAiB,CAAA;AAErB,eAAO,MAAM,gBAAgB,iBAAkB,kBAAkB,eAsGhE,CAAA;AAmID,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,qBAAqB,sBA2BtF;AAMD,eAAO,MAAM,uBAAuB,cAAe,GAAG,QAErD,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EAMd,eAAe,EACf,kBAAkB,EAElB,qBAAqB,EACrB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAkBzF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,UAAU,EAAE,gBAAgB,CAAA;IAC5B,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,eAAe,CAAA;IACtB,IAAI,EAAE,qBAAqB,CAAA;IAC3B,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,EACtB,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAY7B,eAAO,MAAM,cAAc,EAAE,aAs2B5B,CAAA;AAuHD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cAkCF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA;AA2BD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA"}
1
+ {"version":3,"file":"getSplitStyles.d.ts","sourceRoot":"","sources":["../../src/helpers/getSplitStyles.tsx"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EAMd,eAAe,EACf,kBAAkB,EAElB,qBAAqB,EACrB,cAAc,EACd,WAAW,EAEZ,MAAM,UAAU,CAAA;AACjB,OAAO,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAkBzF,KAAK,aAAa,GAAG;IACnB,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,UAAU,EAAE,gBAAgB,CAAA;IAC5B,YAAY,EAAE,kBAAkB,CAAA;IAChC,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAC9B,KAAK,EAAE,eAAe,CAAA;IACtB,IAAI,EAAE,qBAAqB,CAAA;IAC3B,eAAe,CAAC,EAAE,iBAAiB,CAAA;IACnC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D,MAAM,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAA;AAMhE,KAAK,aAAa,GAAG,CACnB,KAAK,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC7B,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,eAAe,EACtB,iBAAiB,CAAC,EAAE,cAAc,GAAG,IAAI,EACzC,eAAe,CAAC,EAAE,mBAAmB,EAErC,WAAW,CAAC,EAAE,MAAM,EACpB,KAAK,CAAC,EAAE,SAAS,KACd,cAAc,CAAA;AAEnB,eAAO,MAAM,UAAU,MAAM,CAAA;AAS7B,eAAO,MAAM,cAAc,EAAE,aAw2B5B,CAAA;AAuHD,eAAO,MAAM,WAAW,eACV,aAAa,UACjB,MAAM,WACL,MAAM,sBACK,OAAO,wBACL,OAAO,KAC5B,cAkCF,CAAA;AAOD,eAAO,MAAM,cAAc,EAAE,aAU5B,CAAA;AA2BD,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import { GenericFonts } from '../types';
2
2
  import { LanguageContextType } from '../views/FontLanguage.types';
3
- export declare function getVariantExtras(props: any, languageContext?: LanguageContextType, theme?: any, defaultProps?: any, avoidDefaultProps?: boolean): any;
3
+ export declare function getVariantExtras(props: any, languageContext?: LanguageContextType, theme?: any, defaultProps?: any, avoidDefaultProps?: boolean, fontFamily?: string): any;
4
4
  export declare function getFontsForLanguage(fonts: GenericFonts, language: LanguageContextType): any;
5
5
  //# sourceMappingURL=getVariantExtras.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAKjE,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,GAAG,EACV,eAAe,CAAC,EAAE,mBAAmB,EACrC,KAAK,CAAC,EAAE,GAAG,EACX,YAAY,CAAC,EAAE,GAAG,EAClB,iBAAiB,UAAQ,OA2D1B;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}
1
+ {"version":3,"file":"getVariantExtras.d.ts","sourceRoot":"","sources":["../../src/helpers/getVariantExtras.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AAKjE,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,GAAG,EACV,eAAe,CAAC,EAAE,mBAAmB,EACrC,KAAK,CAAC,EAAE,GAAG,EACX,YAAY,CAAC,EAAE,GAAG,EAClB,iBAAiB,UAAQ,EACzB,UAAU,CAAC,EAAE,MAAM,OA2DpB;AAID,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,mBAAmB,OAkBrF"}
@@ -1 +1 @@
1
- {"version":3,"file":"themeable.d.ts","sourceRoot":"","sources":["../../src/helpers/themeable.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAG7D,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,EAC7D,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,8HA6BrC"}
1
+ {"version":3,"file":"themeable.d.ts","sourceRoot":"","sources":["../../src/helpers/themeable.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAG7D,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,EAC7D,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,8HAmCrC"}
@@ -2,7 +2,8 @@ import type { MediaQueries, MediaQueryKey, MediaQueryObject, MediaQueryState, Ta
2
2
  export declare let mediaState: MediaQueryState;
3
3
  export declare const mediaQueryConfig: MediaQueries;
4
4
  export declare const getMedia: () => MediaQueryState;
5
- export declare const mediaKeysWithAndWithout$: Set<string>;
5
+ export declare const mediaKeys: Set<string>;
6
+ export declare const isMediaKey: (key: string) => boolean;
6
7
  export declare const getInitialMediaState: () => MediaQueryState;
7
8
  export declare const getMediaKeyImportance: (key: string) => number;
8
9
  export declare const configureMedia: (config: TamaguiInternalConfig) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAGjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAChD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AACxC,eAAO,MAAM,wBAAwB,aAAoB,CAAA;AAIzD,eAAO,MAAM,oBAAoB,uBAEhC,CAAA;AAGD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAMhD,CAAA;AAID,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAe3D,CAAA;AAaD,wBAAgB,mBAAmB,SA+BlC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,QAK9D;AAiBD,KAAK,aAAa,GAAG;KAClB,GAAG,IAAI,aAAa,GAAG,OAAO;CAChC,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAYD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,aAAa,CA4C9D;AAED;;;;;;;;;KASK;AACL,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAClD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GACpC;KAEA,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAqCA;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,kBAIxC,CAAA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WASxC;AAMD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,UAgBnE"}
1
+ {"version":3,"file":"useMedia.d.ts","sourceRoot":"","sources":["../../src/hooks/useMedia.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACtB,MAAM,UAAU,CAAA;AAGjB,eAAO,IAAI,UAAU,EAAE,eAmBN,CAAA;AAEjB,eAAO,MAAM,gBAAgB,EAAE,YAAiB,CAAA;AAChD,eAAO,MAAM,QAAQ,uBAAmB,CAAA;AACxC,eAAO,MAAM,SAAS,aAAoB,CAAA;AAC1C,eAAO,MAAM,UAAU,QAAS,MAAM,YAAuB,CAAA;AAI7D,eAAO,MAAM,oBAAoB,uBAEhC,CAAA;AAGD,eAAO,MAAM,qBAAqB,QAAS,MAAM,WAMhD,CAAA;AAID,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAc3D,CAAA;AAaD,wBAAgB,mBAAmB,SA+BlC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,qBAAqB,QAK9D;AAiBD,KAAK,aAAa,GAAG;KAClB,GAAG,IAAI,aAAa,GAAG,OAAO;CAChC,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,aAAa,EAAE,CAAA;CACtB,CAAA;AAID,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,6BAEhE;AAYD,wBAAgB,QAAQ,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,GAAG,aAAa,CA4C9D;AAED;;;;;;;;;KASK;AACL,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,MAAM,EAClD,KAAK,EAAE,CAAC,EACR,IAAI,CAAC,EAAE;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GACpC;KAEA,GAAG,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,EAAE,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;CACjE,CAqCA;AAED,eAAO,MAAM,iCAAiC,aAClC,MAAM,OACX,MAAM,mBACM,OAAO,MAAM,EAAE,MAAM,CAAC,kBAIxC,CAAA;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,GAAG,EACV,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,WASxC;AAMD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,UAgBnE"}
@@ -1 +1 @@
1
- {"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAOA,OAAO,EACL,YAAY,EAGb,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAIvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAoBD,KAAK,cAAc,GAAG;KACnB,GAAG,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG;QAC7C,GAAG,EAAE,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;KAC5C;CACF,CAAA;AAED,eAAO,MAAM,QAAQ,WAAW,UAAU,KAAgB,cAEzD,CAAA;AAED,eAAO,MAAM,iBAAiB,UAAW,UAAU;;gBAnCrC,OAAO;kBACL,YAAY,GAAG,IAAI;UAC3B,MAAM;;QA0Eb,CAAA;AAED,wBAAgB,eAAe,CAC7B,EACE,KAAK,EACL,YAAY,GACb,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG;IACjC,KAAK,EAAE,WAAW,CAAA;CACnB,EACD,IAAI,CAAC,EAAE,MAAM,EAAE,GACd,cAAc,CA6ChB;AAED,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAE1D,eAAO,MAAM,oBAAoB,UACxB,UAAU,yBAEV,MAAM,EAAE,kBACC,MAAM,OAAO,KAC5B,oBAoOF,CAAA"}
1
+ {"version":3,"file":"useTheme.d.ts","sourceRoot":"","sources":["../../src/hooks/useTheme.tsx"],"names":[],"mappings":"AAOA,OAAO,EACL,YAAY,EAIb,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAIvD,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,WAAW,GAAG,IAAI,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAoBD,KAAK,cAAc,GAAG;KACnB,GAAG,IAAI,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG;QAC7C,GAAG,EAAE,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;KAC5C;CACF,CAAA;AAED,eAAO,MAAM,QAAQ,WAAW,UAAU,KAAgB,cAEzD,CAAA;AAED,eAAO,MAAM,iBAAiB,UAAW,UAAU;;gBAnCrC,OAAO;kBACL,YAAY,GAAG,IAAI;UAC3B,MAAM;;QA0Eb,CAAA;AAED,wBAAgB,eAAe,CAC7B,EACE,KAAK,EACL,YAAY,GACb,EAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG;IACjC,KAAK,EAAE,WAAW,CAAA;CACnB,EACD,IAAI,CAAC,EAAE,MAAM,EAAE,GACd,cAAc,CA6ChB;AAED,eAAO,MAAM,mBAAmB,mBAA0B,CAAA;AAE1D,eAAO,MAAM,oBAAoB,UACxB,UAAU,yBAEV,MAAM,EAAE,kBACC,MAAM,OAAO,KAC5B,oBAkPF,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"useThemeName.d.ts","sourceRoot":"","sources":["../../src/hooks/useThemeName.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,CAmBhE"}
1
+ {"version":3,"file":"useThemeName.d.ts","sourceRoot":"","sources":["../../src/hooks/useThemeName.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AAEpC,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,CAoBhE"}
@@ -1 +1 @@
1
- {"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAGrD,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,OA0BtC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE;IACL,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,EACD,MAAM,UAAQ,OAwEf"}
1
+ {"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../src/views/Theme.tsx"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAwB,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAGrD,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,OA0BtC;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,GAAG,EACb,KAAK,EAAE;IACL,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,KAAK,CAAC,EAAE,SAAS,CAAA;CAClB,EACD,MAAM,UAAQ,OA6Df"}