@tamagui/web 1.86.5 → 1.86.6

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.
@@ -21,7 +21,7 @@ var import_helpers = require("@tamagui/helpers"), import_constants = require("..
21
21
  function getThemeCSSRules(props) {
22
22
  const cssRuleSets = [];
23
23
  if (!process.env.TAMAGUI_DOES_SSR_CSS || process.env.TAMAGUI_DOES_SSR_CSS === "mutates-themes" || process.env.TAMAGUI_DOES_SSR_CSS === "false") {
24
- const { config, themeName, theme, names } = props, hasDarkLight = config.themes && ("light" in config.themes || "dark" in config.themes), CNP = `.${import_constants.THEME_CLASSNAME_PREFIX}`;
24
+ const { config, themeName, theme, names } = props, hasDarkLight = props.hasDarkLight ?? (config.themes && ("light" in config.themes || "dark" in config.themes)), CNP = `.${import_constants.THEME_CLASSNAME_PREFIX}`;
25
25
  let vars = "";
26
26
  for (const themeKey in theme) {
27
27
  const variable = theme[themeKey];
@@ -34,7 +34,7 @@ function getThemeCSSRules(props) {
34
34
  for (const subName of names) {
35
35
  const isDark = isDarkBase || subName.startsWith("dark_"), isLight = !isDark && (isLightBase || subName.startsWith("light_"));
36
36
  if (!(isDark || isLight)) {
37
- selectorsSet.add(`:root:root ${CNP}${subName}`);
37
+ selectorsSet.add(`${CNP}${subName}`);
38
38
  continue;
39
39
  }
40
40
  const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`, order = isDark ? ["dark", "light"] : ["light", "dark"], [stronger, weaker] = order, numSelectors = Math.round(maxDepth * 1.5);
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/getThemeCSSRules.ts"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA2B,6BAE3B,mBAAuC,mCACvC,wBAA2C,8BAE3C,6BAAsC;AAE/B,SAAS,iBAAiB,OAK9B;AACD,QAAM,cAAwB,CAAC;AAK/B,MACE,CAAC,QAAQ,IAAI,wBACb,QAAQ,IAAI,yBAAyB,oBACrC,QAAQ,IAAI,yBAAyB,SACrC;AACA,UAAM,EAAE,QAAQ,WAAW,OAAO,MAAM,IAAI,OAGtC,eACJ,OAAO,WAAW,WAAW,OAAO,UAAU,UAAU,OAAO,SAC3D,MAAM,IAAI,uCAAsB;AACtC,QAAI,OAAO;AAIX,eAAW,YAAY,OAAO;AAC5B,YAAM,WAAW,MAAM,QAAQ;AAC/B,UAAI,QAAa;AAEjB,MAAK,iDAAsB,IAAI,SAAS,GAAG,IAGzC,QAAQ,iDAAsB,IAAI,SAAS,GAAG,EAAG,WAFjD,QAAQ,SAAS,KAKnB,QAAQ,SAAK,2BAAW,UAAU,EAAE,CAAC,IAAI,KAAK;AAAA,IAChD;AAEA,UAAM,aAAa,cAAc,QAC3B,cAAc,cAAc,SAC5B,gBAAgB,MAAM,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,EAAE,GACnD,eAAe,IAAI,IAAI,cAAc,cAAc,gBAAgB,CAAC,CAAC;AAI3E,QAAI,cAAc;AAChB,YAAM,WAAW,OAAO,uBAAuB;AAE/C,iBAAW,WAAW,OAAO;AAC3B,cAAM,SAAS,cAAc,QAAQ,WAAW,OAAO,GACjD,UAAU,CAAC,WAAW,eAAe,QAAQ,WAAW,QAAQ;AAEtE,YAAI,EAAE,UAAU,UAAU;AAGxB,uBAAa,IAAI,cAAc,GAAG,GAAG,OAAO,EAAE;AAC9C;AAAA,QACF;AAEA,cAAM,gBAAgB,GAAG,GAAG,GAAG,QAAQ,QAAQ,kBAAkB,EAAE,CAAC,IAC9D,QAAQ,SAAS,CAAC,QAAQ,OAAO,IAAI,CAAC,SAAS,MAAM,GACrD,CAAC,UAAU,MAAM,IAAI,OACrB,eAAe,KAAK,MAAM,WAAW,GAAG;AAE9C,iBAAS,QAAQ,GAAG,QAAQ,cAAc,SAAS;AACjD,gBAAM,QAAQ,QAAQ,MAAM;AAG5B,cAAI,SAAS,QAAQ;AACnB;AAGF,gBAAM,UAAU,IAAI,MAAM,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,QAC5C,GAAG,GAAG,GAAG,MAAM,MAAM,IAAI,WAAW,MAAM,EAClD;AAED,cAAI,kBAAkB,QAAQ,SAAS,IAAI,QAAQ,MAAM,CAAC,IAAI;AAE9D,cAAI,OAAO;AACT,kBAAM,CAAC,QAAQ,QAAQ,GAAG,IAAI,IAAI;AAClC,8BAAkB,CAAC,QAAQ,GAAG,MAAM,MAAM;AAAA,UAC5C;AAEA,gBAAM,qBAAqB,gBAAgB,gBAAgB,SAAS,CAAC,GAC/D,oBACJ,kBAAkB,qBAAqB,KAAK;AAG9C,uBAAa,IAAI,GAAG,gBAAgB,KAAK,GAAG,CAAC,IAAI,iBAAiB,GAAG,KAAK,CAAC;AAAA,QAI7E;AAAA,MACF;AAAA,IACF;AAEA,UAAM,YAAY,CAAC,GAAG,YAAY,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,cAAc,CAAC,CAAC,GAiB/D,MAAM,GAPY,UACrB,IAAI,CAAC,MAEG,QADS,YAAY,CAAC,KAAK,OAAO,uBAAuB,KAAK,GAC/C,GAAG,CAAC,EAC3B,EACA,KAAK,IAAI,CAEkB,KAAK,IAAI;AAGvC,QAFA,YAAY,KAAK,GAAG,GAEhB,OAAO,6BAA6B;AACtC,YAAM,WAAW,MAAM,aACnB,kBAAc,wCAAiB,MAAM,UAAU,CAAC,MAChD,IACE,WAAW,MAAM,QAAQ,aAAS,wCAAiB,MAAM,KAAK,CAAC,KAAK,IAEpE,YAAY,QAAQ,QAAQ,GAAG,QAAQ,KACvC,SAAS,UAAU,WAAW,MAAM,GACpC,WAAW,SAAS,SAAS,SAe7B,aAAa,GAdW,UAC3B,IAAI,CAAC,MAAM;AACV,YAAI,KAAK,gBAAgB,MAAM;AAAe,iBAAO;AACrD,YACG,YAAU,EAAE,WAAW,aAAa,KACpC,CAAC,UAAU,EAAE,WAAW,YAAY;AAIvC,iBAAO,EAAE,QAAQ,sBAAsB,EAAE,EAAE,KAAK;AAAA,MAClD,CAAC,EACA,OAAO,OAAO,EACd,KAAK,IAAI,CAE+B,KAAK,IAAI,KAC9C,wBAAwB,+BAA+B,QAAQ;AAAA,MACrE,SAAS;AAAA,MACT,UAAU;AAAA;AAEV,kBAAY,KAAK,qBAAqB;AAAA,IACxC;AAEA,QAAI,OAAO,iBAAiB;AAC1B,YAAM,qBAAqB,cAAc,IAAI,CAAC,MAAM,GAAG,CAAC,cAAc,EAAE,KAAK,IAAI,GAC3E,QAAQ,OAAO,gBAAgB,KAAY;AACjD,UAAI,OAAO;AACT,cAAM,SAAS,OAAO,QAAQ,KAAK,EAChC;AAAA,UAAQ,CAAC,CAAC,GAAG,CAAC,MACb,IACI,GAAG,MAAM,oBAAoB,eAAe,CAAC,QAAI,wCAAiB,CAAC,CAAC,KACpE,CAAC;AAAA,QACP,EACC,KAAK,GAAG,GACLA,OAAM,GAAG,kBAAkB,KAAK,MAAM;AAC5C,oBAAY,KAAKA,IAAG;AAAA,MACtB;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,eAAe,WACf,gBAAgB,YAChB,cAAc,CAAC,MACnB,MAAM,gBACN,MAAM,iBACN,EAAE,WAAW,UAAU,KACvB,EAAE,WAAW,WAAW;",
4
+ "mappings": "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",
5
5
  "names": ["css"]
6
6
  }
@@ -5,7 +5,7 @@ import { tokensValueToVariable } from "./registerCSSVariable";
5
5
  function getThemeCSSRules(props) {
6
6
  const cssRuleSets = [];
7
7
  if (!process.env.TAMAGUI_DOES_SSR_CSS || process.env.TAMAGUI_DOES_SSR_CSS === "mutates-themes" || process.env.TAMAGUI_DOES_SSR_CSS === "false") {
8
- const { config, themeName, theme, names } = props, hasDarkLight = config.themes && ("light" in config.themes || "dark" in config.themes), CNP = `.${THEME_CLASSNAME_PREFIX}`;
8
+ const { config, themeName, theme, names } = props, hasDarkLight = props.hasDarkLight ?? (config.themes && ("light" in config.themes || "dark" in config.themes)), CNP = `.${THEME_CLASSNAME_PREFIX}`;
9
9
  let vars = "";
10
10
  for (const themeKey in theme) {
11
11
  const variable = theme[themeKey];
@@ -18,7 +18,7 @@ function getThemeCSSRules(props) {
18
18
  for (const subName of names) {
19
19
  const isDark = isDarkBase || subName.startsWith("dark_"), isLight = !isDark && (isLightBase || subName.startsWith("light_"));
20
20
  if (!(isDark || isLight)) {
21
- selectorsSet.add(`:root:root ${CNP}${subName}`);
21
+ selectorsSet.add(`${CNP}${subName}`);
22
22
  continue;
23
23
  }
24
24
  const childSelector = `${CNP}${subName.replace(/^(dark|light)_/, "")}`, order = isDark ? ["dark", "light"] : ["light", "dark"], [stronger, weaker] = order, numSelectors = Math.round(maxDepth * 1.5);
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/helpers/getThemeCSSRules.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": ["css"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/web",
3
- "version": "1.86.5",
3
+ "version": "1.86.6",
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.86.5",
31
- "@tamagui/constants": "1.86.5",
32
- "@tamagui/helpers": "1.86.5",
33
- "@tamagui/normalize-css-color": "1.86.5",
34
- "@tamagui/timer": "1.86.5",
35
- "@tamagui/use-did-finish-ssr": "1.86.5",
36
- "@tamagui/use-event": "1.86.5",
37
- "@tamagui/use-force-update": "1.86.5",
30
+ "@tamagui/compose-refs": "1.86.6",
31
+ "@tamagui/constants": "1.86.6",
32
+ "@tamagui/helpers": "1.86.6",
33
+ "@tamagui/normalize-css-color": "1.86.6",
34
+ "@tamagui/timer": "1.86.6",
35
+ "@tamagui/use-did-finish-ssr": "1.86.6",
36
+ "@tamagui/use-event": "1.86.6",
37
+ "@tamagui/use-force-update": "1.86.6",
38
38
  "react": "^18.2.0",
39
39
  "react-dom": "^18.2.0"
40
40
  },
41
41
  "devDependencies": {
42
- "@tamagui/build": "1.86.5",
42
+ "@tamagui/build": "1.86.6",
43
43
  "@testing-library/react": "^14.0.0",
44
44
  "csstype": "^3.0.10",
45
45
  "typescript": "^5.2.2",
@@ -10,6 +10,7 @@ export function getThemeCSSRules(props: {
10
10
  themeName: string
11
11
  theme: ThemeParsed
12
12
  names: string[]
13
+ hasDarkLight?: boolean
13
14
  }) {
14
15
  const cssRuleSets: string[] = []
15
16
 
@@ -25,7 +26,9 @@ export function getThemeCSSRules(props: {
25
26
 
26
27
  // special case for SSR
27
28
  const hasDarkLight =
28
- config.themes && ('light' in config.themes || 'dark' in config.themes)
29
+ props.hasDarkLight ??
30
+ (config.themes && ('light' in config.themes || 'dark' in config.themes))
31
+
29
32
  const CNP = `.${THEME_CLASSNAME_PREFIX}`
30
33
  let vars = ''
31
34
 
@@ -61,7 +64,7 @@ export function getThemeCSSRules(props: {
61
64
  if (!(isDark || isLight)) {
62
65
  // neither light nor dark subtheme, just generate one selector with :root:root which
63
66
  // will override all :root light/dark selectors generated below
64
- selectorsSet.add(`:root:root ${CNP}${subName}`)
67
+ selectorsSet.add(`${CNP}${subName}`)
65
68
  continue
66
69
  }
67
70
 
@@ -104,12 +107,6 @@ export function getThemeCSSRules(props: {
104
107
 
105
108
  const selectors = [...selectorsSet].sort((a, b) => a.localeCompare(b))
106
109
 
107
- // let specificity = 1 //themeName.split('_').length
108
-
109
- // if (themeName.includes('accent_Button')) {
110
- // specificity = 2
111
- // }
112
-
113
110
  // only do our :root attach if it's not light/dark - not support sub themes on root saves a lot of effort/size
114
111
  // this isBaseTheme logic could probably be done more efficiently above
115
112
  const selectorsString = selectors
@@ -4,5 +4,6 @@ export declare function getThemeCSSRules(props: {
4
4
  themeName: string;
5
5
  theme: ThemeParsed;
6
6
  names: string[];
7
+ hasDarkLight?: boolean;
7
8
  }): string[];
8
9
  //# sourceMappingURL=getThemeCSSRules.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAG/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;CAChB,YAiKA"}
1
+ {"version":3,"file":"getThemeCSSRules.d.ts","sourceRoot":"","sources":["../../src/helpers/getThemeCSSRules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAG/D,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,MAAM,EAAE,kBAAkB,CAAA;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,WAAW,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,YA6JA"}