@tamagui/config 3.0.0-beta.755.1 → 3.0.0-beta.804.1

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 (25) hide show
  1. package/dist/cjs/v6-base.cjs +33 -6
  2. package/dist/cjs/v6-base.native.cjs +34 -6
  3. package/dist/cjs/v6-base.native.js +34 -6
  4. package/dist/cjs/v6-base.native.js.map +1 -1
  5. package/dist/cjs/v6-themes.cjs +2 -2
  6. package/dist/cjs/v6-themes.native.cjs +3 -3
  7. package/dist/cjs/v6-themes.native.js +3 -3
  8. package/dist/cjs/v6-themes.native.js.map +1 -1
  9. package/dist/esm/v6-base.mjs +29 -2
  10. package/dist/esm/v6-base.mjs.map +1 -1
  11. package/dist/esm/v6-base.native.js +30 -2
  12. package/dist/esm/v6-base.native.js.map +1 -1
  13. package/dist/esm/v6-themes.mjs +1 -1
  14. package/dist/esm/v6-themes.mjs.map +1 -1
  15. package/dist/esm/v6-themes.native.js +1 -1
  16. package/dist/esm/v6-themes.native.js.map +1 -1
  17. package/package.json +12 -12
  18. package/src/v6-base.ts +83 -7
  19. package/src/v6-themes.ts +1 -1
  20. package/types/v6-base.d.ts +37 -5
  21. package/types/v6-base.d.ts.map +1 -1
  22. package/types/v6-themes.d.ts +1 -1
  23. package/types/v6-themes.d.ts.map +1 -1
  24. package/types/v6.d.ts +130 -1
  25. package/types/v6.d.ts.map +1 -1
package/dist/cjs/v6-base.cjs CHANGED
@@ -30,10 +30,10 @@ __export(v6_base_exports, {
30
30
  settings: () => settings,
31
31
  shorthands: () => import_v6.shorthands,
32
32
  tailwindSource: () => import_v6_tailwind_scales2.tailwindSource,
33
- toV6Themes: () => import_v6_themes.toV6Themes,
33
+ toV6Themes: () => import_v6_themes2.toV6Themes,
34
34
  tokens: () => tokens,
35
- v6RemovedThemeNames: () => import_tooling.v6RemovedThemeNames,
36
- v6ThemeNameReplacements: () => import_tooling.v6ThemeNameReplacements
35
+ v6RemovedThemeNames: () => import_v6_themes.v6RemovedThemeNames,
36
+ v6ThemeNameReplacements: () => import_v6_themes.v6ThemeNameReplacements
37
37
  });
38
38
  module.exports = __toCommonJS(v6_base_exports);
39
39
  var import_v6 = require("@tamagui/shorthands/v6");
@@ -41,11 +41,11 @@ var import_fonts = require("./fonts.cjs");
41
41
  var import_media = require("./media.cjs");
42
42
  var import_settings = require("./settings.cjs");
43
43
  var import_v6_tailwind_scales = require("./v6-tailwind-scales.generated.cjs");
44
+ var import_v6_themes = require("@tamagui/style-grammar/v6-themes");
44
45
  var import_fonts2 = require("./fonts.cjs");
45
46
  var import_media2 = require("./media.cjs");
46
47
  var import_v6_tailwind_scales2 = require("./v6-tailwind-scales.generated.cjs");
47
- var import_tooling = require("@tamagui/style-grammar/tooling");
48
- var import_v6_themes = require("./v6-themes.cjs");
48
+ var import_v6_themes2 = require("./v6-themes.cjs");
49
49
  const tokens = {
50
50
  space: import_v6_tailwind_scales.tailwindSpace,
51
51
  size: import_v6_tailwind_scales.tailwindSize,
@@ -84,6 +84,33 @@ const fonts = {
84
84
  heading: withTailwindTypeScale(import_fonts.fonts.heading)
85
85
  };
86
86
  const settings = { ...import_settings.settings };
87
+ function themesWithColorScales(themes, scales) {
88
+ const light = {};
89
+ const dark = {};
90
+ for (const name in scales) {
91
+ const scale = scales[name];
92
+ if (scale.light.length !== 12 || scale.dark.length !== 12) {
93
+ throw new Error(`color scale "${name}" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);
94
+ }
95
+ scale.light.forEach((value, index) => {
96
+ light[`${name}${index + 1}`] = value;
97
+ });
98
+ scale.dark.forEach((value, index) => {
99
+ dark[`${name}${index + 1}`] = value;
100
+ });
101
+ }
102
+ return {
103
+ ...themes,
104
+ light: {
105
+ ...themes.light,
106
+ ...light
107
+ },
108
+ dark: {
109
+ ...themes.dark,
110
+ ...dark
111
+ }
112
+ };
113
+ }
87
114
  const alignedConfig = {
88
115
  media: import_media.media,
89
116
  shorthands: import_v6.shorthands,
@@ -94,7 +121,7 @@ const alignedConfig = {
94
121
  function createV6Config(colors) {
95
122
  return {
96
123
  ...alignedConfig,
97
- themes: colors.themes,
124
+ themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,
98
125
  tokens: colors.colorTokens ? {
99
126
  ...tokens,
100
127
  color: colors.colorTokens
package/dist/cjs/v6-base.native.cjs CHANGED
@@ -32,10 +32,10 @@ __export(v6_base_exports, {
32
32
  settings: () => settings,
33
33
  shorthands: () => import_v6.shorthands,
34
34
  tailwindSource: () => import_v6_tailwind_scales2.tailwindSource,
35
- toV6Themes: () => import_v6_themes.toV6Themes,
35
+ toV6Themes: () => import_v6_themes2.toV6Themes,
36
36
  tokens: () => tokens,
37
- v6RemovedThemeNames: () => import_tooling.v6RemovedThemeNames,
38
- v6ThemeNameReplacements: () => import_tooling.v6ThemeNameReplacements
37
+ v6RemovedThemeNames: () => import_v6_themes.v6RemovedThemeNames,
38
+ v6ThemeNameReplacements: () => import_v6_themes.v6ThemeNameReplacements
39
39
  });
40
40
  module.exports = __toCommonJS(v6_base_exports);
41
41
  var import_v6 = require("@tamagui/shorthands/v6");
@@ -43,11 +43,11 @@ var import_fonts = require("./fonts.native.js");
43
43
  var import_media = require("./media.native.js");
44
44
  var import_settings = require("./settings.native.js");
45
45
  var import_v6_tailwind_scales = require("./v6-tailwind-scales.generated.native.js");
46
+ var import_v6_themes = require("@tamagui/style-grammar/v6-themes");
46
47
  var import_fonts2 = require("./fonts.native.js");
47
48
  var import_media2 = require("./media.native.js");
48
49
  var import_v6_tailwind_scales2 = require("./v6-tailwind-scales.generated.native.js");
49
- var import_tooling = require("@tamagui/style-grammar/tooling");
50
- var import_v6_themes = require("./v6-themes.native.js");
50
+ var import_v6_themes2 = require("./v6-themes.native.js");
51
51
  var tokens = {
52
52
  space: import_v6_tailwind_scales.tailwindSpace,
53
53
  size: import_v6_tailwind_scales.tailwindSize,
@@ -86,6 +86,34 @@ var fonts = {
86
86
  heading: withTailwindTypeScale(import_fonts.fonts.heading)
87
87
  };
88
88
  var settings = { ...import_settings.settings };
89
+ function themesWithColorScales(themes, scales) {
90
+ var _loop = function(name2) {
91
+ var scale = scales[name2];
92
+ if (scale.light.length !== 12 || scale.dark.length !== 12) {
93
+ throw new Error(`color scale "${name2}" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);
94
+ }
95
+ scale.light.forEach(function(value, index) {
96
+ light[`${name2}${index + 1}`] = value;
97
+ });
98
+ scale.dark.forEach(function(value, index) {
99
+ dark[`${name2}${index + 1}`] = value;
100
+ });
101
+ };
102
+ var light = {};
103
+ var dark = {};
104
+ for (var name in scales) _loop(name);
105
+ return {
106
+ ...themes,
107
+ light: {
108
+ ...themes.light,
109
+ ...light
110
+ },
111
+ dark: {
112
+ ...themes.dark,
113
+ ...dark
114
+ }
115
+ };
116
+ }
89
117
  var alignedConfig = {
90
118
  media: import_media.media,
91
119
  shorthands: import_v6.shorthands,
@@ -96,7 +124,7 @@ var alignedConfig = {
96
124
  function createV6Config(colors) {
97
125
  return {
98
126
  ...alignedConfig,
99
- themes: colors.themes,
127
+ themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,
100
128
  tokens: colors.colorTokens ? {
101
129
  ...tokens,
102
130
  color: colors.colorTokens
package/dist/cjs/v6-base.native.js CHANGED
@@ -32,10 +32,10 @@ __export(v6_base_exports, {
32
32
  settings: () => settings,
33
33
  shorthands: () => import_v6.shorthands,
34
34
  tailwindSource: () => import_v6_tailwind_scales2.tailwindSource,
35
- toV6Themes: () => import_v6_themes.toV6Themes,
35
+ toV6Themes: () => import_v6_themes2.toV6Themes,
36
36
  tokens: () => tokens,
37
- v6RemovedThemeNames: () => import_tooling.v6RemovedThemeNames,
38
- v6ThemeNameReplacements: () => import_tooling.v6ThemeNameReplacements
37
+ v6RemovedThemeNames: () => import_v6_themes.v6RemovedThemeNames,
38
+ v6ThemeNameReplacements: () => import_v6_themes.v6ThemeNameReplacements
39
39
  });
40
40
  module.exports = __toCommonJS(v6_base_exports);
41
41
  var import_v6 = require("@tamagui/shorthands/v6");
@@ -43,11 +43,11 @@ var import_fonts = require("./fonts.native.js");
43
43
  var import_media = require("./media.native.js");
44
44
  var import_settings = require("./settings.native.js");
45
45
  var import_v6_tailwind_scales = require("./v6-tailwind-scales.generated.native.js");
46
+ var import_v6_themes = require("@tamagui/style-grammar/v6-themes");
46
47
  var import_fonts2 = require("./fonts.native.js");
47
48
  var import_media2 = require("./media.native.js");
48
49
  var import_v6_tailwind_scales2 = require("./v6-tailwind-scales.generated.native.js");
49
- var import_tooling = require("@tamagui/style-grammar/tooling");
50
- var import_v6_themes = require("./v6-themes.native.js");
50
+ var import_v6_themes2 = require("./v6-themes.native.js");
51
51
  var tokens = {
52
52
  space: import_v6_tailwind_scales.tailwindSpace,
53
53
  size: import_v6_tailwind_scales.tailwindSize,
@@ -86,6 +86,34 @@ var fonts = {
86
86
  heading: withTailwindTypeScale(import_fonts.fonts.heading)
87
87
  };
88
88
  var settings = { ...import_settings.settings };
89
+ function themesWithColorScales(themes, scales) {
90
+ var _loop = function(name2) {
91
+ var scale = scales[name2];
92
+ if (scale.light.length !== 12 || scale.dark.length !== 12) {
93
+ throw new Error(`color scale "${name2}" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);
94
+ }
95
+ scale.light.forEach(function(value, index) {
96
+ light[`${name2}${index + 1}`] = value;
97
+ });
98
+ scale.dark.forEach(function(value, index) {
99
+ dark[`${name2}${index + 1}`] = value;
100
+ });
101
+ };
102
+ var light = {};
103
+ var dark = {};
104
+ for (var name in scales) _loop(name);
105
+ return {
106
+ ...themes,
107
+ light: {
108
+ ...themes.light,
109
+ ...light
110
+ },
111
+ dark: {
112
+ ...themes.dark,
113
+ ...dark
114
+ }
115
+ };
116
+ }
89
117
  var alignedConfig = {
90
118
  media: import_media.media,
91
119
  shorthands: import_v6.shorthands,
@@ -96,7 +124,7 @@ var alignedConfig = {
96
124
  function createV6Config(colors) {
97
125
  return {
98
126
  ...alignedConfig,
99
- themes: colors.themes,
127
+ themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,
100
128
  tokens: colors.colorTokens ? {
101
129
  ...tokens,
102
130
  color: colors.colorTokens
package/dist/cjs/v6-base.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-base.native.js","names":[],"sources":["cjs/v6-base.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar v6_base_exports = {};\n__export(v6_base_exports, {\n breakpoints: () => import_media2.breakpoints,\n createSystemFont: () => import_fonts2.createSystemFont,\n createV6Config: () => createV6Config,\n fonts: () => fonts,\n media: () => import_media2.media,\n mediaQueryDefaultActive: () => import_media2.mediaQueryDefaultActive,\n selectionStyles: () => import_settings.selectionStyles,\n settings: () => settings,\n shorthands: () => import_v6.shorthands,\n tailwindSource: () => import_v6_tailwind_scales2.tailwindSource,\n toV6Themes: () => import_v6_themes.toV6Themes,\n tokens: () => tokens,\n v6RemovedThemeNames: () => import_tooling.v6RemovedThemeNames,\n v6ThemeNameReplacements: () => import_tooling.v6ThemeNameReplacements\n});\nmodule.exports = __toCommonJS(v6_base_exports);\nvar import_v6 = require(\"@tamagui/shorthands/v6\");\nvar import_fonts = require(\"./fonts\");\nvar import_media = require(\"./media\");\nvar import_settings = require(\"./settings\");\nvar import_v6_tailwind_scales = require(\"./v6-tailwind-scales.generated\");\nvar import_fonts2 = require(\"./fonts\");\nvar import_media2 = require(\"./media\");\nvar import_v6_tailwind_scales2 = require(\"./v6-tailwind-scales.generated\");\nvar import_tooling = require(\"@tamagui/style-grammar/tooling\");\nvar import_v6_themes = require(\"./v6-themes\");\nvar tokens = {\n space: import_v6_tailwind_scales.tailwindSpace,\n size: import_v6_tailwind_scales.tailwindSize,\n radius: {\n 0: 0,\n 1: 3,\n 2: 5,\n 3: 7,\n 4: 9,\n 5: 10,\n 6: 16,\n 7: 19,\n 8: 22,\n 9: 26,\n 10: 34,\n 11: 42,\n 12: 50,\n ...import_v6_tailwind_scales.tailwindRadius\n }\n};\nfunction withTailwindTypeScale(font) {\n return {\n ...font,\n size: {\n ...font.size,\n ...import_v6_tailwind_scales.tailwindFontSize\n },\n lineHeight: {\n ...font.lineHeight,\n ...import_v6_tailwind_scales.tailwindLineHeight\n }\n };\n}\nvar fonts = {\n body: withTailwindTypeScale(import_fonts.fonts.body),\n heading: withTailwindTypeScale(import_fonts.fonts.heading)\n};\nvar settings = {\n ...import_settings.settings\n};\nvar alignedConfig = {\n media: import_media.media,\n shorthands: import_v6.shorthands,\n fonts,\n selectionStyles: import_settings.selectionStyles,\n settings\n};\nfunction createV6Config(colors) {\n return {\n ...alignedConfig,\n themes: colors.themes,\n tokens: colors.colorTokens ? {\n ...tokens,\n color: colors.colorTokens\n } : tokens\n };\n}\n//# sourceMappingURL=v6-base.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,kBAAkB,CAAC;AACvB,SAAS,iBAAiB;CACxB,mBAAmB,cAAc;CACjC,wBAAwB,cAAc;CACtC,sBAAsB;CACtB,aAAa;CACb,aAAa,cAAc;CAC3B,+BAA+B,cAAc;CAC7C,uBAAuB,gBAAgB;CACvC,gBAAgB;CAChB,kBAAkB,UAAU;CAC5B,sBAAsB,2BAA2B;CACjD,kBAAkB,iBAAiB;CACnC,cAAc;CACd,2BAA2B,eAAe;CAC1C,+BAA+B,eAAe;AAChD,CAAC;AACD,OAAO,UAAU,aAAa,eAAe;AAC7C,IAAI,YAAY,QAAQ,wBAAwB;AAChD,IAAI,eAAe,QAAQ,mBAAS;AACpC,IAAI,eAAe,QAAQ,mBAAS;AACpC,IAAI,kBAAkB,QAAQ,sBAAY;AAC1C,IAAI,4BAA4B,QAAQ,0CAAgC;AACxE,IAAI,gBAAgB,QAAQ,mBAAS;AACrC,IAAI,gBAAgB,QAAQ,mBAAS;AACrC,IAAI,6BAA6B,QAAQ,0CAAgC;AACzE,IAAI,iBAAiB,QAAQ,gCAAgC;AAC7D,IAAI,mBAAmB,QAAQ,uBAAa;AAC5C,IAAI,SAAS;CACX,OAAO,0BAA0B;CACjC,MAAM,0BAA0B;CAChC,QAAQ;EACN,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,GAAG,0BAA0B;CAC/B;AACF;AACA,SAAS,sBAAsB,MAAM;CACnC,OAAO;EACL,GAAG;EACH,MAAM;GACJ,GAAG,KAAK;GACR,GAAG,0BAA0B;EAC/B;EACA,YAAY;GACV,GAAG,KAAK;GACR,GAAG,0BAA0B;EAC/B;CACF;AACF;AACA,IAAI,QAAQ;CACV,MAAM,sBAAsB,aAAa,MAAM,IAAI;CACnD,SAAS,sBAAsB,aAAa,MAAM,OAAO;AAC3D;AACA,IAAI,WAAW,EACb,GAAG,gBAAgB,SACrB;AACA,IAAI,gBAAgB;CAClB,OAAO,aAAa;CACpB,YAAY,UAAU;CACtB;CACA,iBAAiB,gBAAgB;CACjC;AACF;AACA,SAAS,eAAe,QAAQ;CAC9B,OAAO;EACL,GAAG;EACH,QAAQ,OAAO;EACf,QAAQ,OAAO,cAAc;GAC3B,GAAG;GACH,OAAO,OAAO;EAChB,IAAI;CACN;AACF"}
1
+ {"version":3,"file":"v6-base.native.js","names":[],"sources":["cjs/v6-base.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar v6_base_exports = {};\n__export(v6_base_exports, {\n breakpoints: () => import_media2.breakpoints,\n createSystemFont: () => import_fonts2.createSystemFont,\n createV6Config: () => createV6Config,\n fonts: () => fonts,\n media: () => import_media2.media,\n mediaQueryDefaultActive: () => import_media2.mediaQueryDefaultActive,\n selectionStyles: () => import_settings.selectionStyles,\n settings: () => settings,\n shorthands: () => import_v6.shorthands,\n tailwindSource: () => import_v6_tailwind_scales2.tailwindSource,\n toV6Themes: () => import_v6_themes2.toV6Themes,\n tokens: () => tokens,\n v6RemovedThemeNames: () => import_v6_themes.v6RemovedThemeNames,\n v6ThemeNameReplacements: () => import_v6_themes.v6ThemeNameReplacements\n});\nmodule.exports = __toCommonJS(v6_base_exports);\nvar import_v6 = require(\"@tamagui/shorthands/v6\");\nvar import_fonts = require(\"./fonts\");\nvar import_media = require(\"./media\");\nvar import_settings = require(\"./settings\");\nvar import_v6_tailwind_scales = require(\"./v6-tailwind-scales.generated\");\nvar import_v6_themes = require(\"@tamagui/style-grammar/v6-themes\");\nvar import_fonts2 = require(\"./fonts\");\nvar import_media2 = require(\"./media\");\nvar import_v6_tailwind_scales2 = require(\"./v6-tailwind-scales.generated\");\nvar import_v6_themes2 = require(\"./v6-themes\");\nvar tokens = {\n space: import_v6_tailwind_scales.tailwindSpace,\n size: import_v6_tailwind_scales.tailwindSize,\n radius: {\n 0: 0,\n 1: 3,\n 2: 5,\n 3: 7,\n 4: 9,\n 5: 10,\n 6: 16,\n 7: 19,\n 8: 22,\n 9: 26,\n 10: 34,\n 11: 42,\n 12: 50,\n ...import_v6_tailwind_scales.tailwindRadius\n }\n};\nfunction withTailwindTypeScale(font) {\n return {\n ...font,\n size: {\n ...font.size,\n ...import_v6_tailwind_scales.tailwindFontSize\n },\n lineHeight: {\n ...font.lineHeight,\n ...import_v6_tailwind_scales.tailwindLineHeight\n }\n };\n}\nvar fonts = {\n body: withTailwindTypeScale(import_fonts.fonts.body),\n heading: withTailwindTypeScale(import_fonts.fonts.heading)\n};\nvar settings = {\n ...import_settings.settings\n};\nfunction themesWithColorScales(themes, scales) {\n var _loop = function(name2) {\n var scale = scales[name2];\n if (scale.light.length !== 12 || scale.dark.length !== 12) {\n throw new Error(`color scale \"${name2}\" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);\n }\n scale.light.forEach(function(value, index) {\n light[`${name2}${index + 1}`] = value;\n });\n scale.dark.forEach(function(value, index) {\n dark[`${name2}${index + 1}`] = value;\n });\n };\n var light = {};\n var dark = {};\n for (var name in scales) _loop(name);\n return {\n ...themes,\n light: {\n ...themes.light,\n ...light\n },\n dark: {\n ...themes.dark,\n ...dark\n }\n };\n}\nvar alignedConfig = {\n media: import_media.media,\n shorthands: import_v6.shorthands,\n fonts,\n selectionStyles: import_settings.selectionStyles,\n settings\n};\nfunction createV6Config(colors) {\n return {\n ...alignedConfig,\n themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,\n tokens: colors.colorTokens ? {\n ...tokens,\n color: colors.colorTokens\n } : tokens\n };\n}\n//# sourceMappingURL=v6-base.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,kBAAkB,CAAC;AACvB,SAAS,iBAAiB;CACxB,mBAAmB,cAAc;CACjC,wBAAwB,cAAc;CACtC,sBAAsB;CACtB,aAAa;CACb,aAAa,cAAc;CAC3B,+BAA+B,cAAc;CAC7C,uBAAuB,gBAAgB;CACvC,gBAAgB;CAChB,kBAAkB,UAAU;CAC5B,sBAAsB,2BAA2B;CACjD,kBAAkB,kBAAkB;CACpC,cAAc;CACd,2BAA2B,iBAAiB;CAC5C,+BAA+B,iBAAiB;AAClD,CAAC;AACD,OAAO,UAAU,aAAa,eAAe;AAC7C,IAAI,YAAY,QAAQ,wBAAwB;AAChD,IAAI,eAAe,QAAQ,mBAAS;AACpC,IAAI,eAAe,QAAQ,mBAAS;AACpC,IAAI,kBAAkB,QAAQ,sBAAY;AAC1C,IAAI,4BAA4B,QAAQ,0CAAgC;AACxE,IAAI,mBAAmB,QAAQ,kCAAkC;AACjE,IAAI,gBAAgB,QAAQ,mBAAS;AACrC,IAAI,gBAAgB,QAAQ,mBAAS;AACrC,IAAI,6BAA6B,QAAQ,0CAAgC;AACzE,IAAI,oBAAoB,QAAQ,uBAAa;AAC7C,IAAI,SAAS;CACX,OAAO,0BAA0B;CACjC,MAAM,0BAA0B;CAChC,QAAQ;EACN,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,GAAG,0BAA0B;CAC/B;AACF;AACA,SAAS,sBAAsB,MAAM;CACnC,OAAO;EACL,GAAG;EACH,MAAM;GACJ,GAAG,KAAK;GACR,GAAG,0BAA0B;EAC/B;EACA,YAAY;GACV,GAAG,KAAK;GACR,GAAG,0BAA0B;EAC/B;CACF;AACF;AACA,IAAI,QAAQ;CACV,MAAM,sBAAsB,aAAa,MAAM,IAAI;CACnD,SAAS,sBAAsB,aAAa,MAAM,OAAO;AAC3D;AACA,IAAI,WAAW,EACb,GAAG,gBAAgB,SACrB;AACA,SAAS,sBAAsB,QAAQ,QAAQ;CAC7C,IAAI,QAAQ,SAAS,OAAO;EAC1B,IAAI,QAAQ,OAAO;EACnB,IAAI,MAAM,MAAM,WAAW,MAAM,MAAM,KAAK,WAAW,IAAI;GACzD,MAAM,IAAI,MAAM,gBAAgB,MAAM,mDAAmD,MAAM,MAAM,OAAO,GAAG,MAAM,KAAK,QAAQ;EACpI;EACA,MAAM,MAAM,QAAQ,SAAS,OAAO,OAAO;GACzC,MAAM,GAAG,QAAQ,QAAQ,OAAO;EAClC,CAAC;EACD,MAAM,KAAK,QAAQ,SAAS,OAAO,OAAO;GACxC,KAAK,GAAG,QAAQ,QAAQ,OAAO;EACjC,CAAC;CACH;CACA,IAAI,QAAQ,CAAC;CACb,IAAI,OAAO,CAAC;CACZ,KAAK,IAAI,QAAQ,QAAQ,MAAM,IAAI;CACnC,OAAO;EACL,GAAG;EACH,OAAO;GACL,GAAG,OAAO;GACV,GAAG;EACL;EACA,MAAM;GACJ,GAAG,OAAO;GACV,GAAG;EACL;CACF;AACF;AACA,IAAI,gBAAgB;CAClB,OAAO,aAAa;CACpB,YAAY,UAAU;CACtB;CACA,iBAAiB,gBAAgB;CACjC;AACF;AACA,SAAS,eAAe,QAAQ;CAC9B,OAAO;EACL,GAAG;EACH,QAAQ,OAAO,SAAS,sBAAsB,OAAO,QAAQ,OAAO,MAAM,IAAI,OAAO;EACrF,QAAQ,OAAO,cAAc;GAC3B,GAAG;GACH,OAAO,OAAO;EAChB,IAAI;CACN;AACF"}
package/dist/cjs/v6-themes.cjs CHANGED
@@ -21,13 +21,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
21
21
  var v6_themes_exports = {};
22
22
  __export(v6_themes_exports, { toV6Themes: () => toV6Themes });
23
23
  module.exports = __toCommonJS(v6_themes_exports);
24
- var import_tooling = require("@tamagui/style-grammar/tooling");
24
+ var import_v6_themes = require("@tamagui/style-grammar/v6-themes");
25
25
  function toV6Themes(themes) {
26
26
  const convertedThemes = /* @__PURE__ */ new WeakMap();
27
27
  return Object.fromEntries(Object.entries(themes).map(([themeName, theme]) => {
28
28
  let convertedTheme = convertedThemes.get(theme);
29
29
  if (!convertedTheme) {
30
- convertedTheme = Object.fromEntries(Object.entries(theme).filter(([name]) => !import_tooling.v6RemovedThemeNames.includes(name)).map(([name, value]) => [import_tooling.v6ThemeNameReplacements[name] ?? name, value]));
30
+ convertedTheme = Object.fromEntries(Object.entries(theme).filter(([name]) => !import_v6_themes.v6RemovedThemeNames.includes(name)).map(([name, value]) => [import_v6_themes.v6ThemeNameReplacements[name] ?? name, value]));
31
31
  convertedThemes.set(theme, convertedTheme);
32
32
  }
33
33
  return [themeName, convertedTheme];
package/dist/cjs/v6-themes.native.cjs CHANGED
@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
23
23
  var v6_themes_exports = {};
24
24
  __export(v6_themes_exports, { toV6Themes: () => toV6Themes });
25
25
  module.exports = __toCommonJS(v6_themes_exports);
26
- var import_tooling = require("@tamagui/style-grammar/tooling");
26
+ var import_v6_themes = require("@tamagui/style-grammar/v6-themes");
27
27
  function toV6Themes(themes) {
28
28
  var convertedThemes = /* @__PURE__ */ new WeakMap();
29
29
  return Object.fromEntries(Object.entries(themes).map(function(param) {
@@ -32,11 +32,11 @@ function toV6Themes(themes) {
32
32
  if (!convertedTheme) {
33
33
  convertedTheme = Object.fromEntries(Object.entries(theme).filter(function(param2) {
34
34
  var [name] = param2;
35
- return !import_tooling.v6RemovedThemeNames.includes(name);
35
+ return !import_v6_themes.v6RemovedThemeNames.includes(name);
36
36
  }).map(function(param2) {
37
37
  var [name, value] = param2;
38
38
  var _v6ThemeNameReplacements_name;
39
- return [(_v6ThemeNameReplacements_name = import_tooling.v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name, value];
39
+ return [(_v6ThemeNameReplacements_name = import_v6_themes.v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name, value];
40
40
  }));
41
41
  convertedThemes.set(theme, convertedTheme);
42
42
  }
package/dist/cjs/v6-themes.native.js CHANGED
@@ -23,7 +23,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
23
23
  var v6_themes_exports = {};
24
24
  __export(v6_themes_exports, { toV6Themes: () => toV6Themes });
25
25
  module.exports = __toCommonJS(v6_themes_exports);
26
- var import_tooling = require("@tamagui/style-grammar/tooling");
26
+ var import_v6_themes = require("@tamagui/style-grammar/v6-themes");
27
27
  function toV6Themes(themes) {
28
28
  var convertedThemes = /* @__PURE__ */ new WeakMap();
29
29
  return Object.fromEntries(Object.entries(themes).map(function(param) {
@@ -32,11 +32,11 @@ function toV6Themes(themes) {
32
32
  if (!convertedTheme) {
33
33
  convertedTheme = Object.fromEntries(Object.entries(theme).filter(function(param2) {
34
34
  var [name] = param2;
35
- return !import_tooling.v6RemovedThemeNames.includes(name);
35
+ return !import_v6_themes.v6RemovedThemeNames.includes(name);
36
36
  }).map(function(param2) {
37
37
  var [name, value] = param2;
38
38
  var _v6ThemeNameReplacements_name;
39
- return [(_v6ThemeNameReplacements_name = import_tooling.v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name, value];
39
+ return [(_v6ThemeNameReplacements_name = import_v6_themes.v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name, value];
40
40
  }));
41
41
  convertedThemes.set(theme, convertedTheme);
42
42
  }
package/dist/cjs/v6-themes.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-themes.native.js","names":[],"sources":["cjs/v6-themes.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar v6_themes_exports = {};\n__export(v6_themes_exports, {\n toV6Themes: () => toV6Themes\n});\nmodule.exports = __toCommonJS(v6_themes_exports);\nvar import_tooling = require(\"@tamagui/style-grammar/tooling\");\nfunction toV6Themes(themes) {\n var convertedThemes = /* @__PURE__ */ new WeakMap();\n return Object.fromEntries(Object.entries(themes).map(function(param) {\n var [themeName, theme] = param;\n var convertedTheme = convertedThemes.get(theme);\n if (!convertedTheme) {\n convertedTheme = Object.fromEntries(Object.entries(theme).filter(function(param2) {\n var [name] = param2;\n return !import_tooling.v6RemovedThemeNames.includes(name);\n }).map(function(param2) {\n var [name, value] = param2;\n var _v6ThemeNameReplacements_name;\n return [\n (_v6ThemeNameReplacements_name = import_tooling.v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name,\n value\n ];\n }));\n convertedThemes.set(theme, convertedTheme);\n }\n return [\n themeName,\n convertedTheme\n ];\n }));\n}\n//# sourceMappingURL=v6-themes.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,oBAAoB,CAAC;AACzB,SAAS,mBAAmB,EAC1B,kBAAkB,WACpB,CAAC;AACD,OAAO,UAAU,aAAa,iBAAiB;AAC/C,IAAI,iBAAiB,QAAQ,gCAAgC;AAC7D,SAAS,WAAW,QAAQ;CAC1B,IAAI,kCAAkC,IAAI,QAAQ;CAClD,OAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CAAC,IAAI,SAAS,OAAO;EACnE,IAAI,CAAC,WAAW,SAAS;EACzB,IAAI,iBAAiB,gBAAgB,IAAI,KAAK;EAC9C,IAAI,CAAC,gBAAgB;GACnB,iBAAiB,OAAO,YAAY,OAAO,QAAQ,KAAK,CAAC,CAAC,OAAO,SAAS,QAAQ;IAChF,IAAI,CAAC,QAAQ;IACb,OAAO,CAAC,eAAe,oBAAoB,SAAS,IAAI;GAC1D,CAAC,CAAC,CAAC,IAAI,SAAS,QAAQ;IACtB,IAAI,CAAC,MAAM,SAAS;IACpB,IAAI;IACJ,OAAO,EACJ,gCAAgC,eAAe,wBAAwB,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,MACtK,KACF;GACF,CAAC,CAAC;GACF,gBAAgB,IAAI,OAAO,cAAc;EAC3C;EACA,OAAO,CACL,WACA,cACF;CACF,CAAC,CAAC;AACJ"}
1
+ {"version":3,"file":"v6-themes.native.js","names":[],"sources":["cjs/v6-themes.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar v6_themes_exports = {};\n__export(v6_themes_exports, {\n toV6Themes: () => toV6Themes\n});\nmodule.exports = __toCommonJS(v6_themes_exports);\nvar import_v6_themes = require(\"@tamagui/style-grammar/v6-themes\");\nfunction toV6Themes(themes) {\n var convertedThemes = /* @__PURE__ */ new WeakMap();\n return Object.fromEntries(Object.entries(themes).map(function(param) {\n var [themeName, theme] = param;\n var convertedTheme = convertedThemes.get(theme);\n if (!convertedTheme) {\n convertedTheme = Object.fromEntries(Object.entries(theme).filter(function(param2) {\n var [name] = param2;\n return !import_v6_themes.v6RemovedThemeNames.includes(name);\n }).map(function(param2) {\n var [name, value] = param2;\n var _v6ThemeNameReplacements_name;\n return [\n (_v6ThemeNameReplacements_name = import_v6_themes.v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name,\n value\n ];\n }));\n convertedThemes.set(theme, convertedTheme);\n }\n return [\n themeName,\n convertedTheme\n ];\n }));\n}\n//# sourceMappingURL=v6-themes.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,oBAAoB,CAAC;AACzB,SAAS,mBAAmB,EAC1B,kBAAkB,WACpB,CAAC;AACD,OAAO,UAAU,aAAa,iBAAiB;AAC/C,IAAI,mBAAmB,QAAQ,kCAAkC;AACjE,SAAS,WAAW,QAAQ;CAC1B,IAAI,kCAAkC,IAAI,QAAQ;CAClD,OAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CAAC,IAAI,SAAS,OAAO;EACnE,IAAI,CAAC,WAAW,SAAS;EACzB,IAAI,iBAAiB,gBAAgB,IAAI,KAAK;EAC9C,IAAI,CAAC,gBAAgB;GACnB,iBAAiB,OAAO,YAAY,OAAO,QAAQ,KAAK,CAAC,CAAC,OAAO,SAAS,QAAQ;IAChF,IAAI,CAAC,QAAQ;IACb,OAAO,CAAC,iBAAiB,oBAAoB,SAAS,IAAI;GAC5D,CAAC,CAAC,CAAC,IAAI,SAAS,QAAQ;IACtB,IAAI,CAAC,MAAM,SAAS;IACpB,IAAI;IACJ,OAAO,EACJ,gCAAgC,iBAAiB,wBAAwB,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,MACxK,KACF;GACF,CAAC,CAAC;GACF,gBAAgB,IAAI,OAAO,cAAc;EAC3C;EACA,OAAO,CACL,WACA,cACF;CACF,CAAC,CAAC;AACJ"}
package/dist/esm/v6-base.mjs CHANGED
@@ -3,7 +3,7 @@ import { createSystemFont, fonts as fonts$1 } from "./fonts.mjs";
3
3
  import { breakpoints, media, media as media2, mediaQueryDefaultActive } from "./media.mjs";
4
4
  import { selectionStyles, settings as settings$1 } from "./settings.mjs";
5
5
  import { tailwindFontSize, tailwindLineHeight, tailwindRadius, tailwindSize, tailwindSource, tailwindSpace } from "./v6-tailwind-scales.generated.mjs";
6
- import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/tooling";
6
+ import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/v6-themes";
7
7
  import { toV6Themes } from "./v6-themes.mjs";
8
8
 
9
9
  const tokens = {
@@ -44,6 +44,33 @@ const fonts = {
44
44
  heading: withTailwindTypeScale(fonts$1.heading)
45
45
  };
46
46
  const settings = { ...settings$1 };
47
+ function themesWithColorScales(themes, scales) {
48
+ const light = {};
49
+ const dark = {};
50
+ for (const name in scales) {
51
+ const scale = scales[name];
52
+ if (scale.light.length !== 12 || scale.dark.length !== 12) {
53
+ throw new Error(`color scale "${name}" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);
54
+ }
55
+ scale.light.forEach((value, index) => {
56
+ light[`${name}${index + 1}`] = value;
57
+ });
58
+ scale.dark.forEach((value, index) => {
59
+ dark[`${name}${index + 1}`] = value;
60
+ });
61
+ }
62
+ return {
63
+ ...themes,
64
+ light: {
65
+ ...themes.light,
66
+ ...light
67
+ },
68
+ dark: {
69
+ ...themes.dark,
70
+ ...dark
71
+ }
72
+ };
73
+ }
47
74
  const alignedConfig = {
48
75
  media,
49
76
  shorthands,
@@ -54,7 +81,7 @@ const alignedConfig = {
54
81
  function createV6Config(colors) {
55
82
  return {
56
83
  ...alignedConfig,
57
- themes: colors.themes,
84
+ themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,
58
85
  tokens: colors.colorTokens ? {
59
86
  ...tokens,
60
87
  color: colors.colorTokens
package/dist/esm/v6-base.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-base.js","names":["systemFonts","baseSettings"],"sources":["esm/v6-base.js"],"sourcesContent":["import { shorthands } from \"@tamagui/shorthands/v6\";\nimport { fonts as systemFonts } from \"./fonts\";\nimport { media } from \"./media\";\nimport { selectionStyles, settings as baseSettings } from \"./settings\";\nimport {\n tailwindFontSize,\n tailwindLineHeight,\n tailwindRadius,\n tailwindSize,\n tailwindSpace\n} from \"./v6-tailwind-scales.generated\";\nimport { createSystemFont } from \"./fonts\";\nimport { breakpoints, media as media2, mediaQueryDefaultActive } from \"./media\";\nimport { tailwindSource } from \"./v6-tailwind-scales.generated\";\nimport {\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n} from \"@tamagui/style-grammar/tooling\";\nimport { toV6Themes } from \"./v6-themes\";\nconst tokens = {\n space: tailwindSpace,\n size: tailwindSize,\n radius: {\n 0: 0,\n 1: 3,\n 2: 5,\n 3: 7,\n 4: 9,\n 5: 10,\n 6: 16,\n 7: 19,\n 8: 22,\n 9: 26,\n 10: 34,\n 11: 42,\n 12: 50,\n ...tailwindRadius\n }\n};\nfunction withTailwindTypeScale(font) {\n return {\n ...font,\n size: { ...font.size, ...tailwindFontSize },\n lineHeight: { ...font.lineHeight, ...tailwindLineHeight }\n };\n}\nconst fonts = {\n body: withTailwindTypeScale(systemFonts.body),\n heading: withTailwindTypeScale(systemFonts.heading)\n};\nconst settings = {\n ...baseSettings\n};\nconst alignedConfig = {\n media,\n shorthands,\n fonts,\n selectionStyles,\n settings\n};\nfunction createV6Config(colors) {\n return {\n ...alignedConfig,\n themes: colors.themes,\n tokens: colors.colorTokens ? { ...tokens, color: colors.colorTokens } : tokens\n };\n}\nexport {\n breakpoints,\n createSystemFont,\n createV6Config,\n fonts,\n media2 as media,\n mediaQueryDefaultActive,\n selectionStyles,\n settings,\n shorthands,\n tailwindSource,\n toV6Themes,\n tokens,\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n};\n//# sourceMappingURL=v6-base.js.map\n"],"mappings":";;;;;;;;;AAmBA,MAAM,SAAS;CACb,OAAO;CACP,MAAM;CACN,QAAQ;EACN,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,GAAG;CACL;AACF;AACA,SAAS,sBAAsB,MAAM;CACnC,OAAO;EACL,GAAG;EACH,MAAM;GAAE,GAAG,KAAK;GAAM,GAAG;EAAiB;EAC1C,YAAY;GAAE,GAAG,KAAK;GAAY,GAAG;EAAmB;CAC1D;AACF;AACA,MAAM,QAAQ;CACZ,MAAM,sBAAsBA,QAAY,IAAI;CAC5C,SAAS,sBAAsBA,QAAY,OAAO;AACpD;AACA,MAAM,WAAW,EACf,GAAGC,WACL;AACA,MAAM,gBAAgB;CACpB;CACA;CACA;CACA;CACA;AACF;AACA,SAAS,eAAe,QAAQ;CAC9B,OAAO;EACL,GAAG;EACH,QAAQ,OAAO;EACf,QAAQ,OAAO,cAAc;GAAE,GAAG;GAAQ,OAAO,OAAO;EAAY,IAAI;CAC1E;AACF"}
1
+ {"version":3,"file":"v6-base.js","names":["systemFonts","baseSettings"],"sources":["esm/v6-base.js"],"sourcesContent":["import { shorthands } from \"@tamagui/shorthands/v6\";\nimport { fonts as systemFonts } from \"./fonts\";\nimport { media } from \"./media\";\nimport { selectionStyles, settings as baseSettings } from \"./settings\";\nimport {\n tailwindFontSize,\n tailwindLineHeight,\n tailwindRadius,\n tailwindSize,\n tailwindSpace\n} from \"./v6-tailwind-scales.generated\";\nimport {\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n} from \"@tamagui/style-grammar/v6-themes\";\nimport { createSystemFont } from \"./fonts\";\nimport { breakpoints, media as media2, mediaQueryDefaultActive } from \"./media\";\nimport { tailwindSource } from \"./v6-tailwind-scales.generated\";\nimport { toV6Themes } from \"./v6-themes\";\nconst tokens = {\n space: tailwindSpace,\n size: tailwindSize,\n radius: {\n 0: 0,\n 1: 3,\n 2: 5,\n 3: 7,\n 4: 9,\n 5: 10,\n 6: 16,\n 7: 19,\n 8: 22,\n 9: 26,\n 10: 34,\n 11: 42,\n 12: 50,\n ...tailwindRadius\n }\n};\nfunction withTailwindTypeScale(font) {\n return {\n ...font,\n size: { ...font.size, ...tailwindFontSize },\n lineHeight: { ...font.lineHeight, ...tailwindLineHeight }\n };\n}\nconst fonts = {\n body: withTailwindTypeScale(systemFonts.body),\n heading: withTailwindTypeScale(systemFonts.heading)\n};\nconst settings = {\n ...baseSettings\n};\nfunction themesWithColorScales(themes, scales) {\n const light = {};\n const dark = {};\n for (const name in scales) {\n const scale = scales[name];\n if (scale.light.length !== 12 || scale.dark.length !== 12) {\n throw new Error(\n `color scale \"${name}\" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`\n );\n }\n scale.light.forEach((value, index) => {\n light[`${name}${index + 1}`] = value;\n });\n scale.dark.forEach((value, index) => {\n dark[`${name}${index + 1}`] = value;\n });\n }\n return {\n ...themes,\n light: { ...themes.light, ...light },\n dark: { ...themes.dark, ...dark }\n };\n}\nconst alignedConfig = {\n media,\n shorthands,\n fonts,\n selectionStyles,\n settings\n};\nfunction createV6Config(colors) {\n return {\n ...alignedConfig,\n themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,\n tokens: colors.colorTokens ? { ...tokens, color: colors.colorTokens } : tokens\n };\n}\nexport {\n breakpoints,\n createSystemFont,\n createV6Config,\n fonts,\n media2 as media,\n mediaQueryDefaultActive,\n selectionStyles,\n settings,\n shorthands,\n tailwindSource,\n toV6Themes,\n tokens,\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n};\n//# sourceMappingURL=v6-base.js.map\n"],"mappings":";;;;;;;;;AAmBA,MAAM,SAAS;CACb,OAAO;CACP,MAAM;CACN,QAAQ;EACN,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,GAAG;CACL;AACF;AACA,SAAS,sBAAsB,MAAM;CACnC,OAAO;EACL,GAAG;EACH,MAAM;GAAE,GAAG,KAAK;GAAM,GAAG;EAAiB;EAC1C,YAAY;GAAE,GAAG,KAAK;GAAY,GAAG;EAAmB;CAC1D;AACF;AACA,MAAM,QAAQ;CACZ,MAAM,sBAAsBA,QAAY,IAAI;CAC5C,SAAS,sBAAsBA,QAAY,OAAO;AACpD;AACA,MAAM,WAAW,EACf,GAAGC,WACL;AACA,SAAS,sBAAsB,QAAQ,QAAQ;CAC7C,MAAM,QAAQ,CAAC;CACf,MAAM,OAAO,CAAC;CACd,KAAK,MAAM,QAAQ,QAAQ;EACzB,MAAM,QAAQ,OAAO;EACrB,IAAI,MAAM,MAAM,WAAW,MAAM,MAAM,KAAK,WAAW,IAAI;GACzD,MAAM,IAAI,MACR,gBAAgB,KAAK,mDAAmD,MAAM,MAAM,OAAO,GAAG,MAAM,KAAK,QAC3G;EACF;EACA,MAAM,MAAM,SAAS,OAAO,UAAU;GACpC,MAAM,GAAG,OAAO,QAAQ,OAAO;EACjC,CAAC;EACD,MAAM,KAAK,SAAS,OAAO,UAAU;GACnC,KAAK,GAAG,OAAO,QAAQ,OAAO;EAChC,CAAC;CACH;CACA,OAAO;EACL,GAAG;EACH,OAAO;GAAE,GAAG,OAAO;GAAO,GAAG;EAAM;EACnC,MAAM;GAAE,GAAG,OAAO;GAAM,GAAG;EAAK;CAClC;AACF;AACA,MAAM,gBAAgB;CACpB;CACA;CACA;CACA;CACA;AACF;AACA,SAAS,eAAe,QAAQ;CAC9B,OAAO;EACL,GAAG;EACH,QAAQ,OAAO,SAAS,sBAAsB,OAAO,QAAQ,OAAO,MAAM,IAAI,OAAO;EACrF,QAAQ,OAAO,cAAc;GAAE,GAAG;GAAQ,OAAO,OAAO;EAAY,IAAI;CAC1E;AACF"}
package/dist/esm/v6-base.native.js CHANGED
@@ -3,7 +3,7 @@ import { createSystemFont, fonts as fonts$1 } from "./fonts.native.js";
3
3
  import { breakpoints, media, media as media2, mediaQueryDefaultActive } from "./media.native.js";
4
4
  import { selectionStyles, settings as settings$1 } from "./settings.native.js";
5
5
  import { tailwindFontSize, tailwindLineHeight, tailwindRadius, tailwindSize, tailwindSource, tailwindSpace } from "./v6-tailwind-scales.generated.native.js";
6
- import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/tooling";
6
+ import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/v6-themes";
7
7
  import { toV6Themes } from "./v6-themes.native.js";
8
8
 
9
9
  var tokens = {
@@ -44,6 +44,34 @@ var fonts = {
44
44
  heading: withTailwindTypeScale(fonts$1.heading)
45
45
  };
46
46
  var settings = { ...settings$1 };
47
+ function themesWithColorScales(themes, scales) {
48
+ var _loop = function(name2) {
49
+ var scale = scales[name2];
50
+ if (scale.light.length !== 12 || scale.dark.length !== 12) {
51
+ throw new Error(`color scale "${name2}" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);
52
+ }
53
+ scale.light.forEach(function(value, index) {
54
+ light[`${name2}${index + 1}`] = value;
55
+ });
56
+ scale.dark.forEach(function(value, index) {
57
+ dark[`${name2}${index + 1}`] = value;
58
+ });
59
+ };
60
+ var light = {};
61
+ var dark = {};
62
+ for (var name in scales) _loop(name);
63
+ return {
64
+ ...themes,
65
+ light: {
66
+ ...themes.light,
67
+ ...light
68
+ },
69
+ dark: {
70
+ ...themes.dark,
71
+ ...dark
72
+ }
73
+ };
74
+ }
47
75
  var alignedConfig = {
48
76
  media,
49
77
  shorthands,
@@ -54,7 +82,7 @@ var alignedConfig = {
54
82
  function createV6Config(colors) {
55
83
  return {
56
84
  ...alignedConfig,
57
- themes: colors.themes,
85
+ themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,
58
86
  tokens: colors.colorTokens ? {
59
87
  ...tokens,
60
88
  color: colors.colorTokens
package/dist/esm/v6-base.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-base.native.js","names":["systemFonts","baseSettings"],"sources":["esm/v6-base.native.js"],"sourcesContent":["import { shorthands } from \"@tamagui/shorthands/v6\";\nimport { fonts as systemFonts } from \"./fonts\";\nimport { media } from \"./media\";\nimport { selectionStyles, settings as baseSettings } from \"./settings\";\nimport { tailwindFontSize, tailwindLineHeight, tailwindRadius, tailwindSize, tailwindSpace } from \"./v6-tailwind-scales.generated\";\nimport { createSystemFont } from \"./fonts\";\nimport { breakpoints, media as media2, mediaQueryDefaultActive } from \"./media\";\nimport { tailwindSource } from \"./v6-tailwind-scales.generated\";\nimport { v6RemovedThemeNames, v6ThemeNameReplacements } from \"@tamagui/style-grammar/tooling\";\nimport { toV6Themes } from \"./v6-themes\";\nvar tokens = {\n space: tailwindSpace,\n size: tailwindSize,\n radius: {\n 0: 0,\n 1: 3,\n 2: 5,\n 3: 7,\n 4: 9,\n 5: 10,\n 6: 16,\n 7: 19,\n 8: 22,\n 9: 26,\n 10: 34,\n 11: 42,\n 12: 50,\n ...tailwindRadius\n }\n};\nfunction withTailwindTypeScale(font) {\n return {\n ...font,\n size: {\n ...font.size,\n ...tailwindFontSize\n },\n lineHeight: {\n ...font.lineHeight,\n ...tailwindLineHeight\n }\n };\n}\nvar fonts = {\n body: withTailwindTypeScale(systemFonts.body),\n heading: withTailwindTypeScale(systemFonts.heading)\n};\nvar settings = {\n ...baseSettings\n};\nvar alignedConfig = {\n media,\n shorthands,\n fonts,\n selectionStyles,\n settings\n};\nfunction createV6Config(colors) {\n return {\n ...alignedConfig,\n themes: colors.themes,\n tokens: colors.colorTokens ? {\n ...tokens,\n color: colors.colorTokens\n } : tokens\n };\n}\nexport {\n breakpoints,\n createSystemFont,\n createV6Config,\n fonts,\n media2 as media,\n mediaQueryDefaultActive,\n selectionStyles,\n settings,\n shorthands,\n tailwindSource,\n toV6Themes,\n tokens,\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n};\n//# sourceMappingURL=v6-base.js.map\n"],"mappings":";;;;;;;;;AAUA,IAAI,SAAS;CACX,OAAO;CACP,MAAM;CACN,QAAQ;EACN,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,GAAG;CACL;AACF;AACA,SAAS,sBAAsB,MAAM;CACnC,OAAO;EACL,GAAG;EACH,MAAM;GACJ,GAAG,KAAK;GACR,GAAG;EACL;EACA,YAAY;GACV,GAAG,KAAK;GACR,GAAG;EACL;CACF;AACF;AACA,IAAI,QAAQ;CACV,MAAM,sBAAsBA,QAAY,IAAI;CAC5C,SAAS,sBAAsBA,QAAY,OAAO;AACpD;AACA,IAAI,WAAW,EACb,GAAGC,WACL;AACA,IAAI,gBAAgB;CAClB;CACA;CACA;CACA;CACA;AACF;AACA,SAAS,eAAe,QAAQ;CAC9B,OAAO;EACL,GAAG;EACH,QAAQ,OAAO;EACf,QAAQ,OAAO,cAAc;GAC3B,GAAG;GACH,OAAO,OAAO;EAChB,IAAI;CACN;AACF"}
1
+ {"version":3,"file":"v6-base.native.js","names":["systemFonts","baseSettings"],"sources":["esm/v6-base.native.js"],"sourcesContent":["import { shorthands } from \"@tamagui/shorthands/v6\";\nimport { fonts as systemFonts } from \"./fonts\";\nimport { media } from \"./media\";\nimport { selectionStyles, settings as baseSettings } from \"./settings\";\nimport { tailwindFontSize, tailwindLineHeight, tailwindRadius, tailwindSize, tailwindSpace } from \"./v6-tailwind-scales.generated\";\nimport { v6RemovedThemeNames, v6ThemeNameReplacements } from \"@tamagui/style-grammar/v6-themes\";\nimport { createSystemFont } from \"./fonts\";\nimport { breakpoints, media as media2, mediaQueryDefaultActive } from \"./media\";\nimport { tailwindSource } from \"./v6-tailwind-scales.generated\";\nimport { toV6Themes } from \"./v6-themes\";\nvar tokens = {\n space: tailwindSpace,\n size: tailwindSize,\n radius: {\n 0: 0,\n 1: 3,\n 2: 5,\n 3: 7,\n 4: 9,\n 5: 10,\n 6: 16,\n 7: 19,\n 8: 22,\n 9: 26,\n 10: 34,\n 11: 42,\n 12: 50,\n ...tailwindRadius\n }\n};\nfunction withTailwindTypeScale(font) {\n return {\n ...font,\n size: {\n ...font.size,\n ...tailwindFontSize\n },\n lineHeight: {\n ...font.lineHeight,\n ...tailwindLineHeight\n }\n };\n}\nvar fonts = {\n body: withTailwindTypeScale(systemFonts.body),\n heading: withTailwindTypeScale(systemFonts.heading)\n};\nvar settings = {\n ...baseSettings\n};\nfunction themesWithColorScales(themes, scales) {\n var _loop = function(name2) {\n var scale = scales[name2];\n if (scale.light.length !== 12 || scale.dark.length !== 12) {\n throw new Error(`color scale \"${name2}\" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`);\n }\n scale.light.forEach(function(value, index) {\n light[`${name2}${index + 1}`] = value;\n });\n scale.dark.forEach(function(value, index) {\n dark[`${name2}${index + 1}`] = value;\n });\n };\n var light = {};\n var dark = {};\n for (var name in scales) _loop(name);\n return {\n ...themes,\n light: {\n ...themes.light,\n ...light\n },\n dark: {\n ...themes.dark,\n ...dark\n }\n };\n}\nvar alignedConfig = {\n media,\n shorthands,\n fonts,\n selectionStyles,\n settings\n};\nfunction createV6Config(colors) {\n return {\n ...alignedConfig,\n themes: colors.scales ? themesWithColorScales(colors.themes, colors.scales) : colors.themes,\n tokens: colors.colorTokens ? {\n ...tokens,\n color: colors.colorTokens\n } : tokens\n };\n}\nexport {\n breakpoints,\n createSystemFont,\n createV6Config,\n fonts,\n media2 as media,\n mediaQueryDefaultActive,\n selectionStyles,\n settings,\n shorthands,\n tailwindSource,\n toV6Themes,\n tokens,\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n};\n//# sourceMappingURL=v6-base.js.map\n"],"mappings":";;;;;;;;;AAUA,IAAI,SAAS;CACX,OAAO;CACP,MAAM;CACN,QAAQ;EACN,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,GAAG;EACH,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,GAAG;CACL;AACF;AACA,SAAS,sBAAsB,MAAM;CACnC,OAAO;EACL,GAAG;EACH,MAAM;GACJ,GAAG,KAAK;GACR,GAAG;EACL;EACA,YAAY;GACV,GAAG,KAAK;GACR,GAAG;EACL;CACF;AACF;AACA,IAAI,QAAQ;CACV,MAAM,sBAAsBA,QAAY,IAAI;CAC5C,SAAS,sBAAsBA,QAAY,OAAO;AACpD;AACA,IAAI,WAAW,EACb,GAAGC,WACL;AACA,SAAS,sBAAsB,QAAQ,QAAQ;CAC7C,IAAI,QAAQ,SAAS,OAAO;EAC1B,IAAI,QAAQ,OAAO;EACnB,IAAI,MAAM,MAAM,WAAW,MAAM,MAAM,KAAK,WAAW,IAAI;GACzD,MAAM,IAAI,MAAM,gBAAgB,MAAM,mDAAmD,MAAM,MAAM,OAAO,GAAG,MAAM,KAAK,QAAQ;EACpI;EACA,MAAM,MAAM,QAAQ,SAAS,OAAO,OAAO;GACzC,MAAM,GAAG,QAAQ,QAAQ,OAAO;EAClC,CAAC;EACD,MAAM,KAAK,QAAQ,SAAS,OAAO,OAAO;GACxC,KAAK,GAAG,QAAQ,QAAQ,OAAO;EACjC,CAAC;CACH;CACA,IAAI,QAAQ,CAAC;CACb,IAAI,OAAO,CAAC;CACZ,KAAK,IAAI,QAAQ,QAAQ,MAAM,IAAI;CACnC,OAAO;EACL,GAAG;EACH,OAAO;GACL,GAAG,OAAO;GACV,GAAG;EACL;EACA,MAAM;GACJ,GAAG,OAAO;GACV,GAAG;EACL;CACF;AACF;AACA,IAAI,gBAAgB;CAClB;CACA;CACA;CACA;CACA;AACF;AACA,SAAS,eAAe,QAAQ;CAC9B,OAAO;EACL,GAAG;EACH,QAAQ,OAAO,SAAS,sBAAsB,OAAO,QAAQ,OAAO,MAAM,IAAI,OAAO;EACrF,QAAQ,OAAO,cAAc;GAC3B,GAAG;GACH,OAAO,OAAO;EAChB,IAAI;CACN;AACF"}
package/dist/esm/v6-themes.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/tooling";
1
+ import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/v6-themes";
2
2
 
3
3
  function toV6Themes(themes) {
4
4
  const convertedThemes = /* @__PURE__ */ new WeakMap();
package/dist/esm/v6-themes.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-themes.js","names":[],"sources":["esm/v6-themes.js"],"sourcesContent":["import {\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n} from \"@tamagui/style-grammar/tooling\";\nfunction toV6Themes(themes) {\n const convertedThemes = /* @__PURE__ */ new WeakMap();\n return Object.fromEntries(\n Object.entries(themes).map(([themeName, theme]) => {\n let convertedTheme = convertedThemes.get(theme);\n if (!convertedTheme) {\n convertedTheme = Object.fromEntries(\n Object.entries(theme).filter(\n ([name]) => !v6RemovedThemeNames.includes(name)\n ).map(([name, value]) => [\n v6ThemeNameReplacements[name] ?? name,\n value\n ])\n );\n convertedThemes.set(theme, convertedTheme);\n }\n return [themeName, convertedTheme];\n })\n );\n}\nexport {\n toV6Themes\n};\n//# sourceMappingURL=v6-themes.js.map\n"],"mappings":";;;AAIA,SAAS,WAAW,QAAQ;CAC1B,MAAM,kCAAkC,IAAI,QAAQ;CACpD,OAAO,OAAO,YACZ,OAAO,QAAQ,MAAM,CAAC,CAAC,KAAK,CAAC,WAAW,WAAW;EACjD,IAAI,iBAAiB,gBAAgB,IAAI,KAAK;EAC9C,IAAI,CAAC,gBAAgB;GACnB,iBAAiB,OAAO,YACtB,OAAO,QAAQ,KAAK,CAAC,CAAC,QACnB,CAAC,UAAU,CAAC,oBAAoB,SAAS,IAAI,CAChD,CAAC,CAAC,KAAK,CAAC,MAAM,WAAW,CACvB,wBAAwB,SAAS,MACjC,KACF,CAAC,CACH;GACA,gBAAgB,IAAI,OAAO,cAAc;EAC3C;EACA,OAAO,CAAC,WAAW,cAAc;CACnC,CAAC,CACH;AACF"}
1
+ {"version":3,"file":"v6-themes.js","names":[],"sources":["esm/v6-themes.js"],"sourcesContent":["import {\n v6RemovedThemeNames,\n v6ThemeNameReplacements\n} from \"@tamagui/style-grammar/v6-themes\";\nfunction toV6Themes(themes) {\n const convertedThemes = /* @__PURE__ */ new WeakMap();\n return Object.fromEntries(\n Object.entries(themes).map(([themeName, theme]) => {\n let convertedTheme = convertedThemes.get(theme);\n if (!convertedTheme) {\n convertedTheme = Object.fromEntries(\n Object.entries(theme).filter(\n ([name]) => !v6RemovedThemeNames.includes(name)\n ).map(([name, value]) => [\n v6ThemeNameReplacements[name] ?? name,\n value\n ])\n );\n convertedThemes.set(theme, convertedTheme);\n }\n return [themeName, convertedTheme];\n })\n );\n}\nexport {\n toV6Themes\n};\n//# sourceMappingURL=v6-themes.js.map\n"],"mappings":";;;AAIA,SAAS,WAAW,QAAQ;CAC1B,MAAM,kCAAkC,IAAI,QAAQ;CACpD,OAAO,OAAO,YACZ,OAAO,QAAQ,MAAM,CAAC,CAAC,KAAK,CAAC,WAAW,WAAW;EACjD,IAAI,iBAAiB,gBAAgB,IAAI,KAAK;EAC9C,IAAI,CAAC,gBAAgB;GACnB,iBAAiB,OAAO,YACtB,OAAO,QAAQ,KAAK,CAAC,CAAC,QACnB,CAAC,UAAU,CAAC,oBAAoB,SAAS,IAAI,CAChD,CAAC,CAAC,KAAK,CAAC,MAAM,WAAW,CACvB,wBAAwB,SAAS,MACjC,KACF,CAAC,CACH;GACA,gBAAgB,IAAI,OAAO,cAAc;EAC3C;EACA,OAAO,CAAC,WAAW,cAAc;CACnC,CAAC,CACH;AACF"}
package/dist/esm/v6-themes.native.js CHANGED
@@ -1,4 +1,4 @@
1
- import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/tooling";
1
+ import { v6RemovedThemeNames, v6ThemeNameReplacements } from "@tamagui/style-grammar/v6-themes";
2
2
 
3
3
  function toV6Themes(themes) {
4
4
  var convertedThemes = /* @__PURE__ */ new WeakMap();
package/dist/esm/v6-themes.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-themes.native.js","names":[],"sources":["esm/v6-themes.native.js"],"sourcesContent":["import { v6RemovedThemeNames, v6ThemeNameReplacements } from \"@tamagui/style-grammar/tooling\";\nfunction toV6Themes(themes) {\n var convertedThemes = /* @__PURE__ */ new WeakMap();\n return Object.fromEntries(Object.entries(themes).map(function(param) {\n var [themeName, theme] = param;\n var convertedTheme = convertedThemes.get(theme);\n if (!convertedTheme) {\n convertedTheme = Object.fromEntries(Object.entries(theme).filter(function(param2) {\n var [name] = param2;\n return !v6RemovedThemeNames.includes(name);\n }).map(function(param2) {\n var [name, value] = param2;\n var _v6ThemeNameReplacements_name;\n return [\n (_v6ThemeNameReplacements_name = v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name,\n value\n ];\n }));\n convertedThemes.set(theme, convertedTheme);\n }\n return [\n themeName,\n convertedTheme\n ];\n }));\n}\nexport {\n toV6Themes\n};\n//# sourceMappingURL=v6-themes.js.map\n"],"mappings":";;;AACA,SAAS,WAAW,QAAQ;CAC1B,IAAI,kCAAkC,IAAI,QAAQ;CAClD,OAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CAAC,IAAI,SAAS,OAAO;EACnE,IAAI,CAAC,WAAW,SAAS;EACzB,IAAI,iBAAiB,gBAAgB,IAAI,KAAK;EAC9C,IAAI,CAAC,gBAAgB;GACnB,iBAAiB,OAAO,YAAY,OAAO,QAAQ,KAAK,CAAC,CAAC,OAAO,SAAS,QAAQ;IAChF,IAAI,CAAC,QAAQ;IACb,OAAO,CAAC,oBAAoB,SAAS,IAAI;GAC3C,CAAC,CAAC,CAAC,IAAI,SAAS,QAAQ;IACtB,IAAI,CAAC,MAAM,SAAS;IACpB,IAAI;IACJ,OAAO,EACJ,gCAAgC,wBAAwB,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,MACvJ,KACF;GACF,CAAC,CAAC;GACF,gBAAgB,IAAI,OAAO,cAAc;EAC3C;EACA,OAAO,CACL,WACA,cACF;CACF,CAAC,CAAC;AACJ"}
1
+ {"version":3,"file":"v6-themes.native.js","names":[],"sources":["esm/v6-themes.native.js"],"sourcesContent":["import { v6RemovedThemeNames, v6ThemeNameReplacements } from \"@tamagui/style-grammar/v6-themes\";\nfunction toV6Themes(themes) {\n var convertedThemes = /* @__PURE__ */ new WeakMap();\n return Object.fromEntries(Object.entries(themes).map(function(param) {\n var [themeName, theme] = param;\n var convertedTheme = convertedThemes.get(theme);\n if (!convertedTheme) {\n convertedTheme = Object.fromEntries(Object.entries(theme).filter(function(param2) {\n var [name] = param2;\n return !v6RemovedThemeNames.includes(name);\n }).map(function(param2) {\n var [name, value] = param2;\n var _v6ThemeNameReplacements_name;\n return [\n (_v6ThemeNameReplacements_name = v6ThemeNameReplacements[name]) !== null && _v6ThemeNameReplacements_name !== void 0 ? _v6ThemeNameReplacements_name : name,\n value\n ];\n }));\n convertedThemes.set(theme, convertedTheme);\n }\n return [\n themeName,\n convertedTheme\n ];\n }));\n}\nexport {\n toV6Themes\n};\n//# sourceMappingURL=v6-themes.js.map\n"],"mappings":";;;AACA,SAAS,WAAW,QAAQ;CAC1B,IAAI,kCAAkC,IAAI,QAAQ;CAClD,OAAO,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CAAC,IAAI,SAAS,OAAO;EACnE,IAAI,CAAC,WAAW,SAAS;EACzB,IAAI,iBAAiB,gBAAgB,IAAI,KAAK;EAC9C,IAAI,CAAC,gBAAgB;GACnB,iBAAiB,OAAO,YAAY,OAAO,QAAQ,KAAK,CAAC,CAAC,OAAO,SAAS,QAAQ;IAChF,IAAI,CAAC,QAAQ;IACb,OAAO,CAAC,oBAAoB,SAAS,IAAI;GAC3C,CAAC,CAAC,CAAC,IAAI,SAAS,QAAQ;IACtB,IAAI,CAAC,MAAM,SAAS;IACpB,IAAI;IACJ,OAAO,EACJ,gCAAgC,wBAAwB,WAAW,QAAQ,kCAAkC,KAAK,IAAI,gCAAgC,MACvJ,KACF;GACF,CAAC,CAAC;GACF,gBAAgB,IAAI,OAAO,cAAc;EAC3C;EACA,OAAO,CACL,WACA,cACF;CACF,CAAC,CAAC;AACJ"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/config",
3
- "version": "3.0.0-beta.755.1",
3
+ "version": "3.0.0-beta.804.1",
4
4
  "type": "module",
5
5
  "sideEffects": false,
6
6
  "files": [
@@ -167,20 +167,20 @@
167
167
  "clean:build": "tamagui-build clean:build"
168
168
  },
169
169
  "dependencies": {
170
- "@tamagui/animations-css": "3.0.0-beta.755.1",
171
- "@tamagui/animations-motion": "3.0.0-beta.755.1",
172
- "@tamagui/animations-react-native": "3.0.0-beta.755.1",
173
- "@tamagui/animations-reanimated": "3.0.0-beta.755.1",
174
- "@tamagui/create-system-font": "3.0.0-beta.755.1",
175
- "@tamagui/shorthands": "3.0.0-beta.755.1",
176
- "@tamagui/style-grammar": "3.0.0-beta.755.1",
177
- "@tamagui/themes": "3.0.0-beta.755.1",
178
- "@tamagui/web": "3.0.0-beta.755.1"
170
+ "@tamagui/animations-css": "3.0.0-beta.804.1",
171
+ "@tamagui/animations-motion": "3.0.0-beta.804.1",
172
+ "@tamagui/animations-react-native": "3.0.0-beta.804.1",
173
+ "@tamagui/animations-reanimated": "3.0.0-beta.804.1",
174
+ "@tamagui/create-system-font": "3.0.0-beta.804.1",
175
+ "@tamagui/shorthands": "3.0.0-beta.804.1",
176
+ "@tamagui/style-grammar": "3.0.0-beta.804.1",
177
+ "@tamagui/themes": "3.0.0-beta.804.1",
178
+ "@tamagui/web": "3.0.0-beta.804.1"
179
179
  },
180
180
  "devDependencies": {
181
181
  "@csstools/color-helpers": "6.1.0",
182
- "@tamagui/build": "3.0.0-beta.755.1",
183
- "@tamagui/cli": "3.0.0-beta.755.1",
182
+ "@tamagui/build": "3.0.0-beta.804.1",
183
+ "@tamagui/cli": "3.0.0-beta.804.1",
184
184
  "tailwindcss": "4.3.0"
185
185
  },
186
186
  "repository": {
package/src/v6-base.ts CHANGED
@@ -12,16 +12,17 @@ import {
12
12
  tailwindSize,
13
13
  tailwindSpace,
14
14
  } from './v6-tailwind-scales.generated'
15
+ import {
16
+ v6RemovedThemeNames,
17
+ v6ThemeNameReplacements,
18
+ } from '@tamagui/style-grammar/v6-themes'
15
19
 
16
20
  export { shorthands }
17
21
  export { createSystemFont } from './fonts'
18
22
  export { breakpoints, media, mediaQueryDefaultActive } from './media'
19
23
  export { selectionStyles }
20
24
  export { tailwindSource } from './v6-tailwind-scales.generated'
21
- export {
22
- v6RemovedThemeNames,
23
- v6ThemeNameReplacements,
24
- } from '@tamagui/style-grammar/tooling'
25
+ export { v6RemovedThemeNames, v6ThemeNameReplacements }
25
26
  export { toV6Themes, type V6Theme, type V6Themes } from './v6-themes'
26
27
  // space and size deliberately remain separate configured domains even though their default
27
28
  // values coincide. z-index is literal, so its identity scale is not configured as tokens.
@@ -73,6 +74,75 @@ export type V6Colors = {
73
74
  themes: NonNullable<CreateTamaguiProps['themes']>
74
75
  /** flat named colors added at tokens.color */
75
76
  colorTokens?: Record<string, string>
77
+ /** extra 12-step color scales merged into the light and dark base themes */
78
+ scales?: V6ColorScales
79
+ }
80
+
81
+ type Twelve<Value> = readonly [
82
+ Value,
83
+ Value,
84
+ Value,
85
+ Value,
86
+ Value,
87
+ Value,
88
+ Value,
89
+ Value,
90
+ Value,
91
+ Value,
92
+ Value,
93
+ Value,
94
+ ]
95
+
96
+ /** one 12-step scale, light and dark values from step 1 (faintest) to 12 (strongest) */
97
+ export type V6ColorScale = {
98
+ light: Twelve<string>
99
+ dark: Twelve<string>
100
+ }
101
+
102
+ export type V6ColorScales = Record<string, V6ColorScale>
103
+
104
+ type ScaleStep = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12
105
+
106
+ type ColorScaleThemeKeys<Scales extends V6ColorScales> = {
107
+ [Name in keyof Scales & string as `${Name}${ScaleStep}`]: string
108
+ }
109
+
110
+ type WithColorScales<
111
+ Themes extends Record<string, object>,
112
+ Scales extends V6ColorScales,
113
+ > = {
114
+ [Name in keyof Themes]: Name extends 'light' | 'dark'
115
+ ? Themes[Name] & ColorScaleThemeKeys<Scales>
116
+ : Themes[Name]
117
+ }
118
+
119
+ // scale keys land only on the base light/dark themes; every subtheme reaches
120
+ // them through parent fallback, so the CSS carries each value once
121
+ function themesWithColorScales<
122
+ Themes extends Record<string, object>,
123
+ Scales extends V6ColorScales,
124
+ >(themes: Themes, scales: Scales): WithColorScales<Themes, Scales> {
125
+ const light: Record<string, string> = {}
126
+ const dark: Record<string, string> = {}
127
+ for (const name in scales) {
128
+ const scale = scales[name]
129
+ if (scale.light.length !== 12 || scale.dark.length !== 12) {
130
+ throw new Error(
131
+ `color scale "${name}" needs exactly 12 light and 12 dark values, got ${scale.light.length}/${scale.dark.length}`
132
+ )
133
+ }
134
+ scale.light.forEach((value, index) => {
135
+ light[`${name}${index + 1}`] = value
136
+ })
137
+ scale.dark.forEach((value, index) => {
138
+ dark[`${name}${index + 1}`] = value
139
+ })
140
+ }
141
+ return {
142
+ ...themes,
143
+ light: { ...themes.light, ...light },
144
+ dark: { ...themes.dark, ...dark },
145
+ } as WithColorScales<Themes, Scales>
76
146
  }
77
147
 
78
148
  const alignedConfig = {
@@ -87,26 +157,32 @@ const alignedConfig = {
87
157
  export function createV6Config<
88
158
  Themes extends NonNullable<CreateTamaguiProps['themes']>,
89
159
  ColorTokens extends Record<string, string>,
160
+ Scales extends V6ColorScales = Record<never, V6ColorScale>,
90
161
  >(colors: {
91
162
  themes: Themes
92
163
  colorTokens: ColorTokens
164
+ scales?: Scales
93
165
  }): typeof alignedConfig & {
94
- themes: Themes
166
+ themes: WithColorScales<Themes, Scales>
95
167
  tokens: typeof tokens & { color: ColorTokens }
96
168
  }
97
169
  export function createV6Config<
98
170
  Themes extends NonNullable<CreateTamaguiProps['themes']>,
171
+ Scales extends V6ColorScales = Record<never, V6ColorScale>,
99
172
  >(colors: {
100
173
  themes: Themes
101
174
  colorTokens?: undefined
175
+ scales?: Scales
102
176
  }): typeof alignedConfig & {
103
- themes: Themes
177
+ themes: WithColorScales<Themes, Scales>
104
178
  tokens: typeof tokens
105
179
  }
106
180
  export function createV6Config(colors: V6Colors) {
107
181
  return {
108
182
  ...alignedConfig,
109
- themes: colors.themes,
183
+ themes: colors.scales
184
+ ? themesWithColorScales(colors.themes, colors.scales)
185
+ : colors.themes,
110
186
  tokens: colors.colorTokens ? { ...tokens, color: colors.colorTokens } : tokens,
111
187
  }
112
188
  }
package/src/v6-themes.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import {
2
2
  v6RemovedThemeNames,
3
3
  v6ThemeNameReplacements,
4
- } from '@tamagui/style-grammar/tooling'
4
+ } from '@tamagui/style-grammar/v6-themes'
5
5
 
6
6
  export type V6Theme<Theme> = {
7
7
  [Name in keyof Theme as Name extends (typeof v6RemovedThemeNames)[number]
package/types/v6-base.d.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import { shorthands } from '@tamagui/shorthands/v6';
2
2
  import type { CreateTamaguiProps } from '@tamagui/web';
3
3
  import { selectionStyles } from './settings';
4
+ import { v6RemovedThemeNames, v6ThemeNameReplacements } from '@tamagui/style-grammar/v6-themes';
4
5
  export { shorthands };
5
6
  export { createSystemFont } from './fonts';
6
7
  export { breakpoints, media, mediaQueryDefaultActive } from './media';
7
8
  export { selectionStyles };
8
9
  export { tailwindSource } from './v6-tailwind-scales.generated';
9
- export { v6RemovedThemeNames, v6ThemeNameReplacements, } from '@tamagui/style-grammar/tooling';
10
+ export { v6RemovedThemeNames, v6ThemeNameReplacements };
10
11
  export { toV6Themes, type V6Theme, type V6Themes } from './v6-themes';
11
12
  export declare const tokens: {
12
13
  readonly space: {
@@ -252,6 +253,35 @@ export type V6Colors = {
252
253
  themes: NonNullable<CreateTamaguiProps['themes']>;
253
254
  /** flat named colors added at tokens.color */
254
255
  colorTokens?: Record<string, string>;
256
+ /** extra 12-step color scales merged into the light and dark base themes */
257
+ scales?: V6ColorScales;
258
+ };
259
+ type Twelve<Value> = readonly [
260
+ Value,
261
+ Value,
262
+ Value,
263
+ Value,
264
+ Value,
265
+ Value,
266
+ Value,
267
+ Value,
268
+ Value,
269
+ Value,
270
+ Value,
271
+ Value
272
+ ];
273
+ /** one 12-step scale, light and dark values from step 1 (faintest) to 12 (strongest) */
274
+ export type V6ColorScale = {
275
+ light: Twelve<string>;
276
+ dark: Twelve<string>;
277
+ };
278
+ export type V6ColorScales = Record<string, V6ColorScale>;
279
+ type ScaleStep = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
280
+ type ColorScaleThemeKeys<Scales extends V6ColorScales> = {
281
+ [Name in keyof Scales & string as `${Name}${ScaleStep}`]: string;
282
+ };
283
+ type WithColorScales<Themes extends Record<string, object>, Scales extends V6ColorScales> = {
284
+ [Name in keyof Themes]: Name extends 'light' | 'dark' ? Themes[Name] & ColorScaleThemeKeys<Scales> : Themes[Name];
255
285
  };
256
286
  declare const alignedConfig: {
257
287
  media: {
@@ -490,20 +520,22 @@ declare const alignedConfig: {
490
520
  };
491
521
  };
492
522
  /** Compose the aligned v6 base with a colors pack into a createTamagui-ready config. */
493
- export declare function createV6Config<Themes extends NonNullable<CreateTamaguiProps['themes']>, ColorTokens extends Record<string, string>>(colors: {
523
+ export declare function createV6Config<Themes extends NonNullable<CreateTamaguiProps['themes']>, ColorTokens extends Record<string, string>, Scales extends V6ColorScales = Record<never, V6ColorScale>>(colors: {
494
524
  themes: Themes;
495
525
  colorTokens: ColorTokens;
526
+ scales?: Scales;
496
527
  }): typeof alignedConfig & {
497
- themes: Themes;
528
+ themes: WithColorScales<Themes, Scales>;
498
529
  tokens: typeof tokens & {
499
530
  color: ColorTokens;
500
531
  };
501
532
  };
502
- export declare function createV6Config<Themes extends NonNullable<CreateTamaguiProps['themes']>>(colors: {
533
+ export declare function createV6Config<Themes extends NonNullable<CreateTamaguiProps['themes']>, Scales extends V6ColorScales = Record<never, V6ColorScale>>(colors: {
503
534
  themes: Themes;
504
535
  colorTokens?: undefined;
536
+ scales?: Scales;
505
537
  }): typeof alignedConfig & {
506
- themes: Themes;
538
+ themes: WithColorScales<Themes, Scales>;
507
539
  tokens: typeof tokens;
508
540
  };
509
541
  //# sourceMappingURL=v6-base.d.ts.map
package/types/v6-base.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-base.d.ts","sourceRoot":"","sources":["../src/v6-base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAGtD,OAAO,EAAE,eAAe,EAA4B,MAAM,YAAY,CAAA;AAStE,OAAO,EAAE,UAAU,EAAE,CAAA;AACrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AACrE,OAAO,EAAE,eAAe,EAAE,CAAA;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EACL,mBAAmB,EACnB,uBAAuB,GACxB,MAAM,gCAAgC,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGrE,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAIZ,CAAC;oBACD,CAAC;oBACD,CAAC;oBACD,CAAC;oBACD,CAAC;oBACD,EAAE;oBACF,EAAE;oBACF,EAAE;oBACF,EAAE;oBACF,EAAE;qBACD,EAAE;qBACF,EAAE;qBACF,EAAE;;CAGA,CAAA;AAUV,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGkC,CAAA;AAEpD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAEqB,CAAA;AAE1C,MAAM,MAAM,UAAU,GAAG,OAAO,QAAQ,CAAA;AAExC;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,8CAA8C;IAC9C,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACrC,CAAA;AAED,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAMlB,CAAA;AAED,wFAAwF;AACxF,wBAAgB,cAAc,CAC5B,MAAM,SAAS,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,EACxD,WAAW,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1C,MAAM,EAAE;IACR,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,WAAW,CAAA;CACzB,GAAG,OAAO,aAAa,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,MAAM,GAAG;QAAE,KAAK,EAAE,WAAW,CAAA;KAAE,CAAA;CAC/C,CAAA;AACD,wBAAgB,cAAc,CAC5B,MAAM,SAAS,WAAW,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,EACxD,MAAM,EAAE;IACR,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,SAAS,CAAA;CACxB,GAAG,OAAO,aAAa,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,MAAM,CAAA;CACtB,CAAA"}
1
+ {"version":3,"file":"v6-base.d.ts","sourceRoot":"","sources":["../src/v6-base.ts"],"names":[],"mappings":"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"}
package/types/v6-themes.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { v6RemovedThemeNames, v6ThemeNameReplacements } from '@tamagui/style-grammar/tooling';
1
+ import { v6RemovedThemeNames, v6ThemeNameReplacements } from '@tamagui/style-grammar/v6-themes';
2
2
  export type V6Theme<Theme> = {
3
3
  [Name in keyof Theme as Name extends (typeof v6RemovedThemeNames)[number] ? never : Name extends keyof typeof v6ThemeNameReplacements ? (typeof v6ThemeNameReplacements)[Name] : Name]: Theme[Name];
4
4
  };
package/types/v6-themes.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6-themes.d.ts","sourceRoot":"","sources":["../src/v6-themes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,gCAAgC,CAAA;AAEvC,MAAM,MAAM,OAAO,CAAC,KAAK,IAAI;KAC1B,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,GACrE,KAAK,GACL,IAAI,SAAS,MAAM,OAAO,uBAAuB,GAC/C,CAAC,OAAO,uBAAuB,CAAC,CAAC,IAAI,CAAC,GACtC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;CACzB,CAAA;AAED,MAAM,MAAM,QAAQ,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;KAC3D,IAAI,IAAI,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAA;AAED,kEAAkE;AAClE,wBAAgB,UAAU,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9D,MAAM,EAAE,MAAM,GACb,QAAQ,CAAC,MAAM,CAAC,CAyBlB"}
1
+ {"version":3,"file":"v6-themes.d.ts","sourceRoot":"","sources":["../src/v6-themes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,uBAAuB,EACxB,MAAM,kCAAkC,CAAA;AAEzC,MAAM,MAAM,OAAO,CAAC,KAAK,IAAI;KAC1B,IAAI,IAAI,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,GACrE,KAAK,GACL,IAAI,SAAS,MAAM,OAAO,uBAAuB,GAC/C,CAAC,OAAO,uBAAuB,CAAC,CAAC,IAAI,CAAC,GACtC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;CACzB,CAAA;AAED,MAAM,MAAM,QAAQ,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;KAC3D,IAAI,IAAI,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CAC9C,CAAA;AAED,kEAAkE;AAClE,wBAAgB,UAAU,CAAC,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9D,MAAM,EAAE,MAAM,GACb,QAAQ,CAAC,MAAM,CAAC,CAyBlB"}
package/types/v6.d.ts CHANGED
@@ -992,7 +992,136 @@ export declare const defaultConfig: {
992
992
  styleCompat: "web";
993
993
  };
994
994
  } & {
995
- themes: Themes;
995
+ themes: {
996
+ dark: Theme & {};
997
+ dark_accent: Theme;
998
+ dark_accent_level2: Theme;
999
+ dark_accent_level2_level2: Theme;
1000
+ dark_accent_level2_level2_level2: Theme;
1001
+ dark_accent_level2_level2_level3: Theme;
1002
+ dark_accent_level2_level2_level4: Theme;
1003
+ dark_accent_level2_level3: Theme;
1004
+ dark_accent_level2_level4: Theme;
1005
+ dark_accent_level3: Theme;
1006
+ dark_accent_level3_level2: Theme;
1007
+ dark_accent_level3_level3: Theme;
1008
+ dark_accent_level3_level4: Theme;
1009
+ dark_accent_level4: Theme;
1010
+ dark_brand: Theme;
1011
+ dark_brand_level2: Theme;
1012
+ dark_brand_level2_level2: Theme;
1013
+ dark_brand_level2_level2_level2: Theme;
1014
+ dark_brand_level2_level2_level3: Theme;
1015
+ dark_brand_level2_level2_level4: Theme;
1016
+ dark_brand_level2_level3: Theme;
1017
+ dark_brand_level2_level4: Theme;
1018
+ dark_brand_level3: Theme;
1019
+ dark_brand_level3_level2: Theme;
1020
+ dark_brand_level3_level3: Theme;
1021
+ dark_brand_level3_level4: Theme;
1022
+ dark_brand_level4: Theme;
1023
+ dark_green: Theme;
1024
+ dark_green_level2: Theme;
1025
+ dark_green_level3: Theme;
1026
+ dark_green_level4: Theme;
1027
+ dark_inverse: Theme;
1028
+ dark_inverse_level2: Theme;
1029
+ dark_inverse_level2_level2: Theme;
1030
+ dark_inverse_level2_level2_level2: Theme;
1031
+ dark_inverse_level2_level2_level3: Theme;
1032
+ dark_inverse_level2_level2_level4: Theme;
1033
+ dark_inverse_level2_level3: Theme;
1034
+ dark_inverse_level2_level4: Theme;
1035
+ dark_inverse_level3: Theme;
1036
+ dark_inverse_level3_level2: Theme;
1037
+ dark_inverse_level3_level3: Theme;
1038
+ dark_inverse_level3_level4: Theme;
1039
+ dark_inverse_level4: Theme;
1040
+ dark_level2: Theme;
1041
+ dark_level2_level2: Theme;
1042
+ dark_level2_level2_level2: Theme;
1043
+ dark_level2_level2_level3: Theme;
1044
+ dark_level2_level2_level4: Theme;
1045
+ dark_level2_level3: Theme;
1046
+ dark_level2_level4: Theme;
1047
+ dark_level3: Theme;
1048
+ dark_level3_level2: Theme;
1049
+ dark_level3_level3: Theme;
1050
+ dark_level3_level4: Theme;
1051
+ dark_level4: Theme;
1052
+ dark_red: Theme;
1053
+ dark_red_level2: Theme;
1054
+ dark_red_level3: Theme;
1055
+ dark_red_level4: Theme;
1056
+ dark_yellow: Theme;
1057
+ dark_yellow_level2: Theme;
1058
+ dark_yellow_level3: Theme;
1059
+ dark_yellow_level4: Theme;
1060
+ light: Theme & {};
1061
+ light_accent: Theme;
1062
+ light_accent_level2: Theme;
1063
+ light_accent_level2_level2: Theme;
1064
+ light_accent_level2_level2_level2: Theme;
1065
+ light_accent_level2_level2_level3: Theme;
1066
+ light_accent_level2_level2_level4: Theme;
1067
+ light_accent_level2_level3: Theme;
1068
+ light_accent_level2_level4: Theme;
1069
+ light_accent_level3: Theme;
1070
+ light_accent_level3_level2: Theme;
1071
+ light_accent_level3_level3: Theme;
1072
+ light_accent_level3_level4: Theme;
1073
+ light_accent_level4: Theme;
1074
+ light_brand: Theme;
1075
+ light_brand_level2: Theme;
1076
+ light_brand_level2_level2: Theme;
1077
+ light_brand_level2_level2_level2: Theme;
1078
+ light_brand_level2_level2_level3: Theme;
1079
+ light_brand_level2_level2_level4: Theme;
1080
+ light_brand_level2_level3: Theme;
1081
+ light_brand_level2_level4: Theme;
1082
+ light_brand_level3: Theme;
1083
+ light_brand_level3_level2: Theme;
1084
+ light_brand_level3_level3: Theme;
1085
+ light_brand_level3_level4: Theme;
1086
+ light_brand_level4: Theme;
1087
+ light_green: Theme;
1088
+ light_green_level2: Theme;
1089
+ light_green_level3: Theme;
1090
+ light_green_level4: Theme;
1091
+ light_inverse: Theme;
1092
+ light_inverse_level2: Theme;
1093
+ light_inverse_level2_level2: Theme;
1094
+ light_inverse_level2_level2_level2: Theme;
1095
+ light_inverse_level2_level2_level3: Theme;
1096
+ light_inverse_level2_level2_level4: Theme;
1097
+ light_inverse_level2_level3: Theme;
1098
+ light_inverse_level2_level4: Theme;
1099
+ light_inverse_level3: Theme;
1100
+ light_inverse_level3_level2: Theme;
1101
+ light_inverse_level3_level3: Theme;
1102
+ light_inverse_level3_level4: Theme;
1103
+ light_inverse_level4: Theme;
1104
+ light_level2: Theme;
1105
+ light_level2_level2: Theme;
1106
+ light_level2_level2_level2: Theme;
1107
+ light_level2_level2_level3: Theme;
1108
+ light_level2_level2_level4: Theme;
1109
+ light_level2_level3: Theme;
1110
+ light_level2_level4: Theme;
1111
+ light_level3: Theme;
1112
+ light_level3_level2: Theme;
1113
+ light_level3_level3: Theme;
1114
+ light_level3_level4: Theme;
1115
+ light_level4: Theme;
1116
+ light_red: Theme;
1117
+ light_red_level2: Theme;
1118
+ light_red_level3: Theme;
1119
+ light_red_level4: Theme;
1120
+ light_yellow: Theme;
1121
+ light_yellow_level2: Theme;
1122
+ light_yellow_level3: Theme;
1123
+ light_yellow_level4: Theme;
1124
+ };
996
1125
  tokens: {
997
1126
  readonly space: {
998
1127
  readonly '0': 0;
package/types/v6.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"v6.d.ts","sourceRoot":"","sources":["../src/v6.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,MAAM,EAEN,KAAK,KAAK,EACV,KAAK,UAAU,EACf,KAAK,MAAM,EACZ,MAAM,iBAAiB,CAAA;AAKxB,cAAc,WAAW,CAAA;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,CAAA;AACjC,YAAY,EAAE,KAAK,IAAI,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,IAAI,QAAQ,EAAE,CAAA;AAEhF,sFAAsF;AACtF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGC,CAAA;AAEpB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGT,CAAA;AAEV,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAsD,CAAA"}
1
+ {"version":3,"file":"v6.d.ts","sourceRoot":"","sources":["../src/v6.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,MAAM,EAEN,KAAK,KAAK,EACV,KAAK,UAAU,EACf,KAAK,MAAM,EACZ,MAAM,iBAAiB,CAAA;AAKxB,cAAc,WAAW,CAAA;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,CAAA;AACjC,YAAY,EAAE,KAAK,IAAI,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,IAAI,QAAQ,EAAE,CAAA;AAEhF,sFAAsF;AACtF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGC,CAAA;AAEpB,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGT,CAAA;AAEV,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAsD,CAAA"}