@tamagui/web 1.73.0 → 1.73.2

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 (72) hide show
  1. package/dist/cjs/createComponent.js +26 -21
  2. package/dist/cjs/createComponent.js.map +1 -1
  3. package/dist/cjs/createComponent.native.js +7 -2
  4. package/dist/cjs/createComponent.native.js.map +1 -1
  5. package/dist/cjs/createTamagui.js +0 -1
  6. package/dist/cjs/createTamagui.js.map +1 -1
  7. package/dist/cjs/createTamagui.native.js +0 -1
  8. package/dist/cjs/createTamagui.native.js.map +1 -1
  9. package/dist/cjs/helpers/getSplitStyles.js +8 -7
  10. package/dist/cjs/helpers/getSplitStyles.js.map +1 -1
  11. package/dist/cjs/helpers/getSplitStyles.native.js +6 -5
  12. package/dist/cjs/helpers/getSplitStyles.native.js.map +1 -1
  13. package/dist/cjs/helpers/getStylesAtomic.js +16 -11
  14. package/dist/cjs/helpers/getStylesAtomic.js.map +2 -2
  15. package/dist/cjs/hooks/useTheme.js +6 -6
  16. package/dist/cjs/hooks/useTheme.js.map +2 -2
  17. package/dist/cjs/hooks/useTheme.native.js +6 -6
  18. package/dist/cjs/hooks/useTheme.native.js.map +2 -2
  19. package/dist/cjs/views/Text.js +0 -1
  20. package/dist/cjs/views/Text.js.map +1 -1
  21. package/dist/cjs/views/Text.native.js +0 -1
  22. package/dist/cjs/views/Text.native.js.map +1 -1
  23. package/dist/esm/createComponent.js +26 -21
  24. package/dist/esm/createComponent.js.map +1 -1
  25. package/dist/esm/createTamagui.js +0 -1
  26. package/dist/esm/createTamagui.js.map +1 -1
  27. package/dist/esm/helpers/getSplitStyles.js +14 -8
  28. package/dist/esm/helpers/getSplitStyles.js.map +1 -1
  29. package/dist/esm/helpers/getStylesAtomic.js +14 -10
  30. package/dist/esm/helpers/getStylesAtomic.js.map +2 -2
  31. package/dist/esm/hooks/useTheme.js +4 -4
  32. package/dist/esm/hooks/useTheme.js.map +2 -2
  33. package/dist/esm/views/Text.js +0 -1
  34. package/dist/esm/views/Text.js.map +1 -1
  35. package/package.json +9 -9
  36. package/src/createComponent.tsx +39 -27
  37. package/src/createTamagui.ts +0 -1
  38. package/src/helpers/getSplitStyles.tsx +26 -7
  39. package/src/helpers/getStylesAtomic.ts +19 -15
  40. package/src/hooks/useTheme.tsx +2 -2
  41. package/src/types.tsx +11 -5
  42. package/src/views/Text.tsx +0 -2
  43. package/types/createComponent.d.ts.map +1 -1
  44. package/types/createTamagui.d.ts.map +1 -1
  45. package/types/helpers/getSplitStyles.d.ts.map +1 -1
  46. package/types/helpers/getStylesAtomic.d.ts +1 -0
  47. package/types/helpers/getStylesAtomic.d.ts.map +1 -1
  48. package/types/types.d.ts +6 -3
  49. package/types/types.d.ts.map +1 -1
  50. package/types/views/Text.d.ts.map +1 -1
  51. package/dist/cjs/helpers/getAnimationDriver.js +0 -28
  52. package/dist/cjs/helpers/getAnimationDriver.js.map +0 -6
  53. package/dist/cjs/helpers/getAnimationDriver.native.js +0 -29
  54. package/dist/cjs/helpers/getAnimationDriver.native.js.map +0 -6
  55. package/dist/cjs/hooks/useAnimationDriver.js +0 -26
  56. package/dist/cjs/hooks/useAnimationDriver.js.map +0 -6
  57. package/dist/cjs/hooks/useAnimationDriver.native.js +0 -27
  58. package/dist/cjs/hooks/useAnimationDriver.native.js.map +0 -6
  59. package/dist/cjs/views/AnimationDriverProvider.js +0 -26
  60. package/dist/cjs/views/AnimationDriverProvider.js.map +0 -6
  61. package/dist/cjs/views/AnimationDriverProvider.native.js +0 -27
  62. package/dist/cjs/views/AnimationDriverProvider.native.js.map +0 -6
  63. package/dist/esm/helpers/getAnimationDriver.js +0 -8
  64. package/dist/esm/helpers/getAnimationDriver.js.map +0 -6
  65. package/dist/esm/hooks/useAnimationDriver.js +0 -8
  66. package/dist/esm/hooks/useAnimationDriver.js.map +0 -6
  67. package/dist/esm/views/AnimationDriverProvider.js +0 -7
  68. package/dist/esm/views/AnimationDriverProvider.js.map +0 -6
  69. package/types/helpers/getAnimationDriver.d.ts.map +0 -1
  70. package/types/hooks/useAnimationDriver.d.ts.map +0 -1
  71. package/types/views/AnimationDriverProvider.d.ts +0 -9
  72. package/types/views/AnimationDriverProvider.d.ts.map +0 -1
@@ -29,7 +29,12 @@ import {
29
29
  import { createMediaStyle } from "./createMediaStyle";
30
30
  import { fixStyles } from "./expandStyles";
31
31
  import { getGroupPropParts } from "./getGroupPropParts";
32
- import { generateAtomicStyles, getStylesAtomic, styleToCSS } from "./getStylesAtomic";
32
+ import {
33
+ generateAtomicStyles,
34
+ getStylesAtomic,
35
+ styleToCSS,
36
+ transformsToString
37
+ } from "./getStylesAtomic";
33
38
  import {
34
39
  insertStyleRules,
35
40
  insertedTransforms,
@@ -238,7 +243,7 @@ current`, {
238
243
  for (const [key, val] of expanded) {
239
244
  if (val == null || key in usedKeys)
240
245
  continue;
241
- if (isPseudo = key in validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && isMediaKey(key), isMediaOrPseudo = isMedia || isPseudo, isVariant = variants && key in variants, (inlineProps?.has(key) || IS_STATIC && inlineWhenUnflattened?.has(key)) && (viewProps[key] = props[key] ?? val), isHOC && (isMediaOrPseudo || parentStaticConfig?.variants?.[keyInit])) {
246
+ if (isPseudo = key in validPseudoKeys, isMedia = !isPseudo && !isValidStyleKeyInit && isMediaKey(key), isMediaOrPseudo = isMedia || isPseudo, isVariant = variants && key in variants, (inlineProps?.has(key) || IS_STATIC && inlineWhenUnflattened?.has(key)) && (viewProps[key] = props[key] ?? val), styleProps.noExpand && isPseudo || isHOC && (isMediaOrPseudo || parentStaticConfig?.variants?.[keyInit])) {
242
247
  passDownProp(viewProps, key, val, isMediaOrPseudo), process.env.NODE_ENV === "development" && debug === "verbose" && (console.groupCollapsed(` - passing down prop ${key}`), console.log({ val, after: { ...viewProps[key] } }), console.groupEnd());
243
248
  continue;
244
249
  }
@@ -293,12 +298,13 @@ current`, {
293
298
  mergeStyle(styleState, pkey, defaultVal);
294
299
  }
295
300
  } else {
296
- const curImportance = usedKeys[importance] || 0, shouldMerge = importance >= curImportance;
297
- shouldMerge && (pseudos ||= {}, pseudos[key] ||= {}, pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2), usedKeys[pkey] ||= 1), process.env.NODE_ENV === "development" && debug === "verbose" && console.log(" subKey", pkey, shouldMerge, {
301
+ const curImportance = usedKeys[pkey] || 0, shouldMerge = importance >= curImportance;
302
+ shouldMerge && (pseudos ||= {}, pseudos[key] ||= {}, pseudos[key][pkey] = val2, mergeStyle(styleState, pkey, val2), usedKeys[pkey] = Math.max(usedKeys[pkey], importance)), process.env.NODE_ENV === "development" && debug === "verbose" && console.log(" subKey", pkey, shouldMerge, {
298
303
  importance,
299
304
  curImportance,
300
305
  pkey,
301
- val: val2
306
+ val: val2,
307
+ transforms: { ...styleState.transforms }
302
308
  });
303
309
  }
304
310
  }
@@ -426,16 +432,16 @@ current`, {
426
432
  if (process.env.NODE_ENV === "development" && debug === "verbose") {
427
433
  console.groupCollapsed(" \u2714\uFE0F expand complete", keyInit);
428
434
  try {
429
- console.log("style", { ...style }), console.log("viewProps", { ...viewProps });
435
+ console.log("style", { ...style }), console.log("transforms", { ...transforms }), console.log("viewProps", { ...viewProps });
430
436
  } catch {
431
437
  }
432
438
  console.groupEnd();
433
439
  }
434
440
  }
435
441
  }
436
- if (props.style && mergeStyleProp(styleState, props.style), !styleProps.noNormalize && (fixStyles(style), isWeb && !staticConfig.isReactNative && styleToCSS(style), styleState.transforms && Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
442
+ if (props.style && mergeStyleProp(styleState, props.style), !styleProps.noNormalize && (fixStyles(style), isWeb && !staticConfig.isReactNative && styleToCSS(style), styleState.transforms && (Object.entries(styleState.transforms).sort(([a], [b]) => a.localeCompare(b)).forEach(([key, val]) => {
437
443
  mergeTransform(style, key, val, !0);
438
- }), parentSplitStyles)) {
444
+ }), !staticConfig.isReactNative && !styleProps.isAnimated && Array.isArray(style.transform) && (style.transform = transformsToString(style.transform))), parentSplitStyles)) {
439
445
  if (shouldDoClasses)
440
446
  for (const key in parentSplitStyles.classNames) {
441
447
  const val = parentSplitStyles.classNames[key];
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/getSplitStyles.tsx"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["keyInit", "isMediaOrPseudo", "val", "key", "style", "mediaState", "conf"]
6
6
  }
@@ -18,6 +18,17 @@ function getStylesAtomic(stylesIn, debug) {
18
18
  return res = [...res, ...generateAtomicStyles(stylesIn)], process.env.NODE_ENV === "development" && debug === "verbose" && console.log(" \u{1FAAE} getStylesAtomic", { stylesIn, res }), res;
19
19
  }
20
20
  let conf;
21
+ function transformsToString(transforms) {
22
+ return transforms.map(
23
+ // { scale: 2 } => 'scale(2)'
24
+ // { translateX: 20 } => 'translateX(20px)'
25
+ // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
26
+ (transform) => {
27
+ const type = Object.keys(transform)[0], value = transform[type];
28
+ return type === "matrix" || type === "matrix3d" ? `${type}(${value.join(",")})` : `${type}(${normalizeValueWithProperty(value, type)})`;
29
+ }
30
+ ).join(" ");
31
+ }
21
32
  const generateAtomicStyles = (style, pseudo) => {
22
33
  if (!style)
23
34
  return [];
@@ -29,15 +40,7 @@ const generateAtomicStyles = (style, pseudo) => {
29
40
  let val = style[key];
30
41
  if (val == null)
31
42
  continue;
32
- key === "transform" && Array.isArray(style.transform) && (val = val.map(
33
- // { scale: 2 } => 'scale(2)'
34
- // { translateX: 20 } => 'translateX(20px)'
35
- // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
36
- (transform) => {
37
- const type = Object.keys(transform)[0], value2 = transform[type];
38
- return type === "matrix" || type === "matrix3d" ? `${type}(${value2.join(",")})` : `${type}(${normalizeValueWithProperty(value2, type)})`;
39
- }
40
- ).join(" "));
43
+ key === "transform" && Array.isArray(style.transform) && (val = transformsToString(val));
41
44
  const value = normalizeValueWithProperty(val, key), hash = simpleHash(`${value}`), pseudoPrefix = pseudo ? `0${pseudo.name}-` : "", identifier = `_${conf.inverseShorthands[key] || key}-${pseudoPrefix}${hash}`, rules = createAtomicRules(identifier, key, value, pseudo), styleObject = {
42
45
  property: key,
43
46
  pseudo: pseudo?.name,
@@ -133,6 +136,7 @@ const boxNone = createDeclarationBlock([["pointerEvents", "auto"]], !0), boxOnly
133
136
  export {
134
137
  generateAtomicStyles,
135
138
  getStylesAtomic,
136
- styleToCSS
139
+ styleToCSS,
140
+ transformsToString
137
141
  };
138
142
  //# sourceMappingURL=getStylesAtomic.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/getStylesAtomic.ts"],
4
- "mappings": "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",
5
- "names": ["value"]
4
+ "mappings": "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",
5
+ "names": []
6
6
  }
@@ -41,7 +41,7 @@ const useTheme = (props = emptyProps) => {
41
41
  If this is intended and you are using Tamagui without any themes, you can disable this warning by setting the environment variable TAMAGUI_DISABLE_NO_THEME_WARNING=1`
42
42
  );
43
43
  const themeProxied = useMemo(() => !themeManager || !state?.theme ? {} : getThemeProxied(state.theme, themeManager, keys.current, props.debug), [state, themeManager]);
44
- return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(" \u{1F539} useTheme =>", name), console.log("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
44
+ return process.env.NODE_ENV === "development" && props.debug === "verbose" && (console.groupCollapsed(" \u{1F539} useTheme =>", state?.name), console.log("returning state", changedThemeState, "from props", props), console.groupEnd()), [changedThemeState, themeProxied];
45
45
  };
46
46
  function getThemeProxied(theme, themeManager, keys, debug) {
47
47
  return createProxy(theme, {
@@ -105,13 +105,13 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
105
105
  isNewTheme && themeManager && activeThemeManagers.add(themeManager), (isNewTheme || getShouldUpdateTheme(themeManager)) && setThemeState(createState);
106
106
  const selfListenerDispose = themeManager.onChangeTheme((_a, _b, forced) => {
107
107
  forced && setThemeState((prev) => createState(prev, !0));
108
- }), disposeChangeListener = parentManager?.onChangeTheme((name2, manager) => {
108
+ }), disposeChangeListener = parentManager?.onChangeTheme((name, manager) => {
109
109
  const force = shouldUpdate?.(), doUpdate = force ?? !!(keys?.length || isNewTheme);
110
110
  process.env.NODE_ENV === "development" && props.debug && console.log(" \u{1F538} onChange", themeManager.id, {
111
111
  force,
112
112
  doUpdate,
113
113
  props,
114
- name: name2,
114
+ name,
115
115
  manager,
116
116
  keys
117
117
  }), doUpdate && setThemeState(createState);
@@ -164,7 +164,7 @@ const activeThemeManagers = /* @__PURE__ */ new Set(), useChangeThemeEffect = (p
164
164
  themeManager2 = getNewThemeManager(), state2 = { ...themeManager2.state };
165
165
  }
166
166
  const isNewTheme2 = !!(themeManager2 !== parentManager || props.inverse), mounted2 = props.inverse ? isRoot || prev?.mounted : !0;
167
- if (state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager)), !force && state2.name === prev?.state?.name)
167
+ if (state2 || (isNewTheme2 ? state2 = themeManager2.state : (state2 = parentManager.state, themeManager2 = parentManager)), !force && state2?.name === prev?.state?.name)
168
168
  return prev;
169
169
  const response = {
170
170
  state: state2,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/hooks/useTheme.tsx"],
4
- "mappings": "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",
5
- "names": ["_", "name", "themeManager", "state", "isNewTheme", "mounted"]
4
+ "mappings": "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",
5
+ "names": ["_", "themeManager", "state", "isNewTheme", "mounted"]
6
6
  }
@@ -9,7 +9,6 @@ const ellipseStyle = {
9
9
  acceptsClassName: !0,
10
10
  isText: !0,
11
11
  defaultProps: {
12
- color: "$color",
13
12
  display: "inline",
14
13
  boxSizing: "border-box",
15
14
  wordWrap: "break-word",
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/views/Text.tsx"],
4
- "mappings": "AAAA,SAAS,oBAAoB,mBAAmB;AAEhD,SAAS,uBAAuB;AAGhC,MAAM,eAAe;AAAA,EACnB,UAAU;AAAA,EACV,UAAU;AAAA,EACV,cAAc;AAAA,EACd,YAAY;AACd,GAIa,OAAO,gBAAgD;AAAA,EAClE,kBAAkB;AAAA,EAClB,QAAQ;AAAA,EAER,cAEM;AAAA,IACE,OAAO;AAAA,IACP,SAAS;AAAA,IACT,WAAW;AAAA,IACX,UAAU;AAAA,IACV,QAAQ;AAAA,EACV;AAAA,EAON,uBAAuB,oBAAI,IAAI,CAAC,YAAY,CAAC;AAAA,EAE7C,UAAU;AAAA,IAEN,eAAe;AAAA,MACb,GAAG;AAAA,MAEH,WAAW,CAAC,kBACV,iBAAiB,IACb;AAAA,QACE,iBAAiB;AAAA,QACjB,iBAAiB;AAAA,QACjB,SAAS;AAAA,QACT,UAAU;AAAA,MACZ,IACA;AAAA,IACR;AAAA;AAAA,IAIF,eAAe;AAAA,MACb,OAAO,MAAM;AAAA,IACf;AAAA,IAGE,YAAY;AAAA,MACV,MAAM;AAAA,QACJ,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,MACA,OAAO;AAAA,QACL,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,IACF;AAAA,IAGF,SAAS;AAAA,MACP,MAEM;AAAA,IAKR;AAAA,EACF;AAAA,EAEA,YAAY,oBAAI,IAA2C,CAAC,CAAe;AAAA,EAE3E,aAAa;AAAA,IACX,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF,CAAC;",
4
+ "mappings": "AAAA,SAAS,oBAAoB,mBAAmB;AAEhD,SAAS,uBAAuB;AAGhC,MAAM,eAAe;AAAA,EACnB,UAAU;AAAA,EACV,UAAU;AAAA,EACV,cAAc;AAAA,EACd,YAAY;AACd,GAIa,OAAO,gBAAgD;AAAA,EAClE,kBAAkB;AAAA,EAClB,QAAQ;AAAA,EAER,cAEM;AAAA,IACE,SAAS;AAAA,IACT,WAAW;AAAA,IACX,UAAU;AAAA,IACV,QAAQ;AAAA,EACV;AAAA,EAMN,uBAAuB,oBAAI,IAAI,CAAC,YAAY,CAAC;AAAA,EAE7C,UAAU;AAAA,IAEN,eAAe;AAAA,MACb,GAAG;AAAA,MAEH,WAAW,CAAC,kBACV,iBAAiB,IACb;AAAA,QACE,iBAAiB;AAAA,QACjB,iBAAiB;AAAA,QACjB,SAAS;AAAA,QACT,UAAU;AAAA,MACZ,IACA;AAAA,IACR;AAAA;AAAA,IAIF,eAAe;AAAA,MACb,OAAO,MAAM;AAAA,IACf;AAAA,IAGE,YAAY;AAAA,MACV,MAAM;AAAA,QACJ,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,MACA,OAAO;AAAA,QACL,YAAY;AAAA,QACZ,QAAQ;AAAA,MACV;AAAA,IACF;AAAA,IAGF,SAAS;AAAA,MACP,MAEM;AAAA,IAKR;AAAA,EACF;AAAA,EAEA,YAAY,oBAAI,IAA2C,CAAC,CAAe;AAAA,EAE3E,aAAa;AAAA,IACX,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF,CAAC;",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/web",
3
- "version": "1.73.0",
3
+ "version": "1.73.2",
4
4
  "source": "src/index.ts",
5
5
  "main": "dist/cjs",
6
6
  "module": "dist/esm",
@@ -27,19 +27,19 @@
27
27
  "reset.css"
28
28
  ],
29
29
  "dependencies": {
30
- "@tamagui/compose-refs": "1.73.0",
31
- "@tamagui/constants": "1.73.0",
32
- "@tamagui/helpers": "1.73.0",
33
- "@tamagui/normalize-css-color": "1.73.0",
34
- "@tamagui/timer": "1.73.0",
35
- "@tamagui/use-did-finish-ssr": "1.73.0",
36
- "@tamagui/use-force-update": "1.73.0"
30
+ "@tamagui/compose-refs": "1.73.2",
31
+ "@tamagui/constants": "1.73.2",
32
+ "@tamagui/helpers": "1.73.2",
33
+ "@tamagui/normalize-css-color": "1.73.2",
34
+ "@tamagui/timer": "1.73.2",
35
+ "@tamagui/use-did-finish-ssr": "1.73.2",
36
+ "@tamagui/use-force-update": "1.73.2"
37
37
  },
38
38
  "peerDependencies": {
39
39
  "react": "*"
40
40
  },
41
41
  "devDependencies": {
42
- "@tamagui/build": "1.73.0",
42
+ "@tamagui/build": "1.73.2",
43
43
  "@testing-library/react": "^14.0.0",
44
44
  "csstype": "^3.0.10",
45
45
  "react": "^18.2.0",
@@ -57,6 +57,7 @@ import {
57
57
  TextProps,
58
58
  UseAnimationHook,
59
59
  UseAnimationProps,
60
+ WebOnlyPressEvents,
60
61
  } from './types'
61
62
  import { Slot } from './views/Slot'
62
63
  import { useThemedChildren } from './views/Theme'
@@ -224,6 +225,7 @@ export function createComponent<
224
225
  let overriddenContextProps: Object | undefined
225
226
  let contextValue: Object | null | undefined
226
227
  const { context } = staticConfig
228
+
227
229
  if (context) {
228
230
  contextValue = useContext(context)
229
231
  const { inverseShorthands } = getConfig()
@@ -956,10 +958,7 @@ export function createComponent<
956
958
  // check presence rather than value to prevent reparenting bugs
957
959
  // allows for onPress={x ? function : undefined} without re-ordering dom
958
960
  const shouldAttach = Boolean(
959
- attachPress ||
960
- isHoverable ||
961
- (noClassNames && 'pressStyle' in props) ||
962
- (isWeb && noClassNames && 'hoverStyle' in props)
961
+ attachPress || isHoverable || runtimePressStyle || runtimeHoverStyle
963
962
  )
964
963
 
965
964
  if (process.env.NODE_ENV === 'development' && time) time`events-setup`
@@ -1088,24 +1087,23 @@ export function createComponent<
1088
1087
  elementType = Slot
1089
1088
  // on native this is already merged into viewProps in hooks.useEvents
1090
1089
  if (process.env.TAMAGUI_TARGET === 'web') {
1091
- const passEvents = {
1092
- onPress,
1093
- onLongPress,
1094
- onPressIn,
1095
- onPressOut,
1096
- onHoverIn,
1097
- onHoverOut,
1098
- onMouseUp,
1099
- onMouseDown,
1100
- onMouseEnter,
1101
- onMouseLeave,
1102
- }
1103
- Object.assign(
1104
- viewProps,
1105
- asChild === 'web' || asChild === 'except-style-web'
1106
- ? getWebEvents(passEvents as any)
1107
- : passEvents
1090
+ const webStyleEvents = asChild === 'web' || asChild === 'except-style-web'
1091
+ const passEvents = getWebEvents(
1092
+ {
1093
+ onPress,
1094
+ onLongPress,
1095
+ onPressIn,
1096
+ onPressOut,
1097
+ onHoverIn,
1098
+ onHoverOut,
1099
+ onMouseUp,
1100
+ onMouseDown,
1101
+ onMouseEnter,
1102
+ onMouseLeave,
1103
+ },
1104
+ webStyleEvents
1108
1105
  )
1106
+ Object.assign(viewProps, passEvents)
1109
1107
  }
1110
1108
  }
1111
1109
 
@@ -1197,6 +1195,17 @@ export function createComponent<
1197
1195
  }
1198
1196
  }
1199
1197
 
1198
+ // ensure we override new context with syle resolved values
1199
+ if (staticConfig.context) {
1200
+ const contextProps = staticConfig.context.props
1201
+ for (const key in contextProps) {
1202
+ if (key in style || key in viewProps) {
1203
+ overriddenContextProps ||= {}
1204
+ overriddenContextProps[key] = style[key] ?? viewProps[key]
1205
+ }
1206
+ }
1207
+ }
1208
+
1200
1209
  if (overriddenContextProps) {
1201
1210
  const Provider = staticConfig.context!.Provider!
1202
1211
  content = (
@@ -1328,11 +1337,16 @@ export function createComponent<
1328
1337
  return res
1329
1338
  }
1330
1339
 
1331
- function getWebEvents<E extends TamaguiComponentEvents>(events: E) {
1340
+ type EventKeys = keyof (TamaguiComponentEvents & WebOnlyPressEvents)
1341
+ type EventLikeObject = {
1342
+ [key in EventKeys]?: any
1343
+ }
1344
+
1345
+ function getWebEvents<E extends EventLikeObject>(events: E, webStyle = true) {
1332
1346
  return {
1333
- onMouseEnter: events.onMouseEnter,
1334
- onMouseLeave: events.onMouseLeave,
1335
- onClick: events.onPress,
1347
+ onMouseEnter: events.onHoverIn ?? events.onMouseEnter,
1348
+ onMouseLeave: events.onHoverOut ?? events.onMouseLeave,
1349
+ [webStyle ? 'onClick' : 'onPress']: events.onPress,
1336
1350
  onMouseDown: events.onPressIn,
1337
1351
  onMouseUp: events.onPressOut,
1338
1352
  onTouchStart: events.onPressIn,
@@ -1529,8 +1543,6 @@ function isUnspaced(child: React.ReactNode) {
1529
1543
  return t?.['isVisuallyHidden'] || t?.['isUnspaced']
1530
1544
  }
1531
1545
 
1532
- const DefaultProps = new Map()
1533
-
1534
1546
  const AbsoluteFill: any = createComponent({
1535
1547
  defaultProps: {
1536
1548
  ...stackDefaultStyles,
@@ -256,7 +256,6 @@ ${runtimeStyles}`
256
256
 
257
257
  const config: TamaguiInternalConfig = {
258
258
  fonts: {},
259
- groupNames: [],
260
259
  settings: {},
261
260
  onlyAllowShorthands: false,
262
261
  fontLanguages: [],
@@ -55,7 +55,12 @@ import type {
55
55
  import { createMediaStyle } from './createMediaStyle'
56
56
  import { fixStyles } from './expandStyles'
57
57
  import { getGroupPropParts } from './getGroupPropParts'
58
- import { generateAtomicStyles, getStylesAtomic, styleToCSS } from './getStylesAtomic'
58
+ import {
59
+ generateAtomicStyles,
60
+ getStylesAtomic,
61
+ styleToCSS,
62
+ transformsToString,
63
+ } from './getStylesAtomic'
59
64
  import {
60
65
  insertStyleRules,
61
66
  insertedTransforms,
@@ -680,10 +685,11 @@ export const getSplitStyles: StyleSplitter = (
680
685
 
681
686
  // have to run this logic again here because expansions may need to be passed down
682
687
  // see StyledButtonVariantPseudoMerge test
683
- const isHOCShouldPassThrough =
684
- isHOC && (isMediaOrPseudo || parentStaticConfig?.variants?.[keyInit])
688
+ const shouldPassThrough =
689
+ (styleProps.noExpand && isPseudo) ||
690
+ (isHOC && (isMediaOrPseudo || parentStaticConfig?.variants?.[keyInit]))
685
691
 
686
- if (isHOCShouldPassThrough) {
692
+ if (shouldPassThrough) {
687
693
  passDownProp(viewProps, key, val, isMediaOrPseudo)
688
694
  if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
689
695
  console.groupCollapsed(` - passing down prop ${key}`)
@@ -694,7 +700,6 @@ export const getSplitStyles: StyleSplitter = (
694
700
  continue
695
701
  }
696
702
 
697
- // pseudo
698
703
  if (isPseudo) {
699
704
  if (!val) continue
700
705
 
@@ -811,7 +816,7 @@ export const getSplitStyles: StyleSplitter = (
811
816
  mergeStyle(styleState, pkey, defaultVal)
812
817
  }
813
818
  } else {
814
- const curImportance = usedKeys[importance] || 0
819
+ const curImportance = usedKeys[pkey] || 0
815
820
  const shouldMerge = importance >= curImportance
816
821
 
817
822
  if (shouldMerge) {
@@ -819,7 +824,7 @@ export const getSplitStyles: StyleSplitter = (
819
824
  pseudos[key] ||= {}
820
825
  pseudos[key][pkey] = val
821
826
  mergeStyle(styleState, pkey, val)
822
- usedKeys[pkey] ||= 1
827
+ usedKeys[pkey] = Math.max(usedKeys[pkey], importance)
823
828
  }
824
829
 
825
830
  if (process.env.NODE_ENV === 'development' && debug === 'verbose') {
@@ -829,6 +834,7 @@ export const getSplitStyles: StyleSplitter = (
829
834
  curImportance,
830
835
  pkey,
831
836
  val,
837
+ transforms: { ...styleState.transforms },
832
838
  })
833
839
  }
834
840
  }
@@ -1058,6 +1064,8 @@ export const getSplitStyles: StyleSplitter = (
1058
1064
  // biome-ignore lint/suspicious/noConsoleLog: <explanation>
1059
1065
  console.log('style', { ...style })
1060
1066
  // biome-ignore lint/suspicious/noConsoleLog: <explanation>
1067
+ console.log('transforms', { ...transforms })
1068
+ // biome-ignore lint/suspicious/noConsoleLog: <explanation>
1061
1069
  console.log('viewProps', { ...viewProps })
1062
1070
  } catch {
1063
1071
  // RN can run into PayloadTooLargeError: request entity too large
@@ -1102,6 +1110,17 @@ export const getSplitStyles: StyleSplitter = (
1102
1110
  .forEach(([key, val]) => {
1103
1111
  mergeTransform(style, key, val, true)
1104
1112
  })
1113
+
1114
+ // Button for example uses disableClassName: true but renders to a 'button' element, so needs this
1115
+ if (process.env.TAMAGUI_TARGET === 'web') {
1116
+ if (
1117
+ !staticConfig.isReactNative &&
1118
+ !styleProps.isAnimated &&
1119
+ Array.isArray(style.transform)
1120
+ ) {
1121
+ style.transform = transformsToString(style.transform) as any
1122
+ }
1123
+ }
1105
1124
  }
1106
1125
 
1107
1126
  // add in defaults if not set:
@@ -41,6 +41,24 @@ let conf: TamaguiInternalConfig
41
41
 
42
42
  // mutates...
43
43
 
44
+ export function transformsToString(transforms: any[]) {
45
+ return transforms
46
+ .map(
47
+ // { scale: 2 } => 'scale(2)'
48
+ // { translateX: 20 } => 'translateX(20px)'
49
+ // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
50
+ (transform) => {
51
+ const type = Object.keys(transform)[0]
52
+ const value = transform[type]
53
+ if (type === 'matrix' || type === 'matrix3d') {
54
+ return `${type}(${value.join(',')})`
55
+ }
56
+ return `${type}(${normalizeValueWithProperty(value, type)})`
57
+ }
58
+ )
59
+ .join(' ')
60
+ }
61
+
44
62
  export const generateAtomicStyles = (
45
63
  style: ViewStyleWithPseudos,
46
64
  pseudo?: PseudoDescriptor
@@ -59,21 +77,7 @@ export const generateAtomicStyles = (
59
77
 
60
78
  // transform
61
79
  if (key === 'transform' && Array.isArray(style.transform)) {
62
- val = (val as any[])
63
- .map(
64
- // { scale: 2 } => 'scale(2)'
65
- // { translateX: 20 } => 'translateX(20px)'
66
- // { matrix: [1,2,3,4,5,6] } => 'matrix(1,2,3,4,5,6)'
67
- (transform) => {
68
- const type = Object.keys(transform)[0]
69
- const value = transform[type]
70
- if (type === 'matrix' || type === 'matrix3d') {
71
- return `${type}(${value.join(',')})`
72
- }
73
- return `${type}(${normalizeValueWithProperty(value, type)})`
74
- }
75
- )
76
- .join(' ')
80
+ val = transformsToString(val)
77
81
  }
78
82
 
79
83
  const value = normalizeValueWithProperty(val, key)
@@ -109,7 +109,7 @@ export const useThemeWithState = (
109
109
  }, [state, themeManager])
110
110
 
111
111
  if (process.env.NODE_ENV === 'development' && props.debug === 'verbose') {
112
- console.groupCollapsed(' 🔹 useTheme =>', name)
112
+ console.groupCollapsed(' 🔹 useTheme =>', state?.name)
113
113
  // biome-ignore lint/suspicious/noConsoleLog: <explanation>
114
114
  console.log('returning state', changedThemeState, 'from props', props)
115
115
  console.groupEnd()
@@ -400,7 +400,7 @@ export const useChangeThemeEffect = (
400
400
  }
401
401
  }
402
402
 
403
- if (!force && state.name === prev?.state?.name) {
403
+ if (!force && state?.name === prev?.state?.name) {
404
404
  return prev
405
405
  }
406
406