@wirecore/wirelayer-tokens 0.5.1 → 0.7.0

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.
@@ -1 +1 @@
1
- {"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../src/color.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,IAAI;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AAqBD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAGhE;AAED,kEAAkE;AAClE,eAAO,MAAM,OAAO,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,YAC+B,CAAC;AAEvF,qEAAqE;AACrE,wBAAgB,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAYjF;AAED,oCAAoC;AACpC,eAAO,MAAM,KAAK,GAAI,aAAa,IAAI,WAOpB,CAAC;AAEpB,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAiBzC;AAED,mGAAmG;AACnG,wBAAgB,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,SAAI,GAAG,IAAI,CAI/D;AAED,wBAAgB,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,GAAG,MAAM,CAEnD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,MAAM,CAGjD"}
1
+ {"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../src/color.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,IAAI;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACb;AAqBD,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAGhE;AAED,kEAAkE;AAClE,eAAO,MAAM,OAAO,GAAI,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,YAC+B,CAAC;AAEvF,qEAAqE;AACrE,wBAAgB,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAYjF;AAED,oCAAoC;AACpC,eAAO,MAAM,KAAK,GAAI,aAAa,IAAI,WAOpB,CAAC;AAEpB,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAqBzC;AAED,mGAAmG;AACnG,wBAAgB,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,SAAI,GAAG,IAAI,CAI/D;AAED,wBAAgB,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,GAAG,MAAM,CAEnD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,MAAM,CAGjD"}
package/dist/color.js CHANGED
@@ -56,7 +56,11 @@ export function parse(color) {
56
56
  }
57
57
  const oklch = color.match(/^oklch\(([^)]+)\)$/)?.[1];
58
58
  if (oklch) {
59
- const [l = 0, c = 0, h = 0] = oklch.trim().split(/\s+/).map(Number);
59
+ // Minified CSS writes the lightness in percent: `oklch(47% .13 155)`; 100% chroma is 0.4 (CSS Color 4)
60
+ const [l = 0, c = 0, h = 0] = oklch
61
+ .trim()
62
+ .split(/\s+/)
63
+ .map((part, i) => (part.endsWith('%') ? (parseFloat(part) / 100) * (i === 1 ? 0.4 : 1) : Number(part)));
60
64
  return oklchToRgb(l, c, h);
61
65
  }
62
66
  throw new Error(`Unsupported colour: ${color}`);
package/dist/color.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"color.js","sourceRoot":"","sources":["../src/color.ts"],"names":[],"mappings":"AAAA,sFAAsF;AACtF,uFAAuF;AACvF,+DAA+D;AAS/D,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;AACjE,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,EAAE,CAC9B,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;AAC5F,MAAM,MAAM,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AAEtH,qFAAqF;AACrF,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;IAClD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,YAAY,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,YAAY,GAAG,CAAC,GAAG,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,YAAY,GAAG,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO;QACH,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE;QACzD,CAAC,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE;QAC1D,CAAC,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,WAAW,GAAG,EAAE;KAC5D,CAAC;AACN,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS;IACtD,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED,kEAAkE;AAClE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,EAAE,CACvD,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;AAEvF,qEAAqE;AACrE,MAAM,UAAU,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAQ;IACxC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,GAAG,YAAY,GAAG,EAAE,GAAG,WAAW,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,CAAC;IACnE,MAAM,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE,GAAG,WAAW,GAAG,EAAE,CAAC;IACpE,OAAO;QACH,CAAC,EAAE,YAAY,GAAG,EAAE,GAAG,WAAW,GAAG,EAAE,GAAG,YAAY,GAAG,EAAE;QAC3D,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;QACpB,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,GAAG,GAAG;KACvD,CAAC;AACN,CAAC;AAED,oCAAoC;AACpC,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAQ,EAAE,EAAE,CACvC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;KACR,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACb,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;KAC3B,QAAQ,CAAC,EAAE,CAAC;KACZ,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CACxB;KACA,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;AAEpB,MAAM,UAAU,KAAK,CAAC,KAAa;IAC/B,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAClD,IAAI,GAAG,EAAE,CAAC;QACN,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAA6B,CAAC;QAC5G,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;IAC7B,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACpD,IAAI,IAAI,EAAE,CAAC;QACP,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC;IACrD,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrD,IAAI,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpE,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAC;AACpD,CAAC;AAED,mGAAmG;AACnG,MAAM,UAAU,IAAI,CAAC,GAAS,EAAE,MAAY,EAAE,OAAO,GAAG,CAAC;IACrD,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;IAC9B,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;IAClE,OAAO,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/F,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAQ;IACvC,OAAO,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,CAAO,EAAE,CAAO;IACrC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAqB,CAAC;IAC7F,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"color.js","sourceRoot":"","sources":["../src/color.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { type ColorSet, type ColorToken, type Mode, type Theme } from './tokens.js';
1
+ import { type ColorSet, type ColorToken, type Mode, type OptionalColorToken, type Theme } from './tokens.js';
2
2
  export interface ContrastResult {
3
3
  name: string;
4
4
  ratio: number;
@@ -12,7 +12,7 @@ export declare function checkTheme(theme: Theme): (ContrastResult & {
12
12
  })[];
13
13
  /** A way to meet a missed contrast: a token and its new value, with the ratio the pair then reaches */
14
14
  export interface ContrastFix {
15
- token: ColorToken;
15
+ token: ColorToken | OptionalColorToken;
16
16
  value: string;
17
17
  ratio: number;
18
18
  }
@@ -21,7 +21,8 @@ export interface ContrastSuggestion extends ContrastResult {
21
21
  mode: Mode;
22
22
  /**
23
23
  * The nearest colour that meets it – its lightness moved in OKLCH, the hue kept (the chroma only lowered where
24
- * sRGB needs it) – without breaking another pair
24
+ * sRGB needs it) – without breaking another pair. For a missed hover of the primary colour this is a
25
+ * `primary-hover` that meets every hover pair, so the primary colour itself can stay.
25
26
  */
26
27
  color?: ContrastFix;
27
28
  /** A light or dark text colour (`on-*`) that meets it */
@@ -29,8 +30,8 @@ export interface ContrastSuggestion extends ContrastResult {
29
30
  }
30
31
  /**
31
32
  * The pairs `checkTheme` reports, each with suggestions: the nearest variant of a colour of the pair that meets it
32
- * (lightness moved in OKLCH, hue and chroma kept) and/or a light or dark `on-*` colour. Tokens the theme sets
33
- * itself are tried first. Empty when the theme passes.
33
+ * (lightness moved in OKLCH, hue and chroma kept) and/or a light or dark `on-*` colour. `primary-hover` is tried
34
+ * first for the hover pairs, then the tokens the theme sets itself. Empty when the theme passes.
34
35
  */
35
36
  export declare function suggestThemeFixes(theme: Theme): ContrastSuggestion[];
36
37
  //# sourceMappingURL=contrast.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"contrast.d.ts","sourceRoot":"","sources":["../src/contrast.ts"],"names":[],"mappings":"AAIA,OAAO,EAAqC,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAwBvH,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACf;AASD,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,MAAM,EAAE,QAAQ,GAAG,cAAc,EAAE,CAsJhE;AAED,4GAA4G;AAC5G,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,EAAE,CAM5E;AAED,uGAAuG;AACvG,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,8DAA8D;AAC9D,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,IAAI,EAAE,IAAI,CAAC;IACX;;;OAGG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,yDAAyD;IACzD,EAAE,CAAC,EAAE,WAAW,CAAC;CACpB;AAMD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,kBAAkB,EAAE,CAsDpE"}
1
+ {"version":3,"file":"contrast.d.ts","sourceRoot":"","sources":["../src/contrast.ts"],"names":[],"mappings":"AAIA,OAAO,EAMH,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,kBAAkB,EACvB,KAAK,KAAK,EACb,MAAM,aAAa,CAAC;AA6BrB,MAAM,WAAW,cAAc;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACf;AASD,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,MAAM,EAAE,QAAQ,GAAG,cAAc,EAAE,CA6LhE;AAED,4GAA4G;AAC5G,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,EAAE,CAM5E;AAED,uGAAuG;AACvG,MAAM,WAAW,WAAW;IACxB,KAAK,EAAE,UAAU,GAAG,kBAAkB,CAAC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,8DAA8D;AAC9D,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,IAAI,EAAE,IAAI,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,yDAAyD;IACzD,EAAE,CAAC,EAAE,WAAW,CAAC;CACpB;AAQD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,kBAAkB,EAAE,CAwEpE"}
package/dist/contrast.js CHANGED
@@ -2,17 +2,22 @@
2
2
  // and exported so projects can test their own themes:
3
3
  // expect(checkTheme(myTheme)).toEqual([])
4
4
  import { contrast, inGamut, oklchToRgb, over, parse, rgbToOklch, toHex } from './color.js';
5
- import { colorTokens, modes, resolveColors } from './tokens.js';
5
+ import { colorTokens, colorValue, modes, optionalColorTokens, resolveColors, } from './tokens.js';
6
6
  /** 4.5:1 for text (1.4.3), 3:1 for UI component boundaries, selected states and icons (1.4.11). */
7
7
  const TEXT = 4.5;
8
8
  const NON_TEXT = 3;
9
- /** Must match the `hover:opacity-*` of the solid button variants in @wirecore/wirelayer-recipes. */
9
+ /**
10
+ * Must match the `hover:opacity-*` of the solid button variants in @wirecore/wirelayer-recipes – and the fade of solid
11
+ * primary buttons without `primary-hover` (`color-mix(… var(--wc-primary) 85%, transparent)`, the text stays).
12
+ */
10
13
  const HOVER_OPACITY = 0.85;
11
14
  /** Info and warn buttons fade less on hover (`hover:opacity-90`) – at 85 % white text would drop below 4.5:1. */
12
15
  const HOVER_OPACITY_LIGHT_FILL = 0.9;
13
16
  /** Tinted ("soft") buttons: `bg-<colour>/10`, on hover `/14` (the tint of badges and alert icons). */
17
+ const SOFT_TINT = 0.1;
14
18
  const SOFT_HOVER_TINT = 0.14;
15
19
  /** Tinted avatar as a button (`color`, `as="button"`): 14 % of the colour on the card, on hover 18 % */
20
+ const AVATAR_TINT = 0.14;
16
21
  const AVATAR_HOVER_TINT = 0.18;
17
22
  /**
18
23
  * Editor colours – must match `editorColorTokens`/`editorColorValue` in @wirecore/wirelayer-recipes: text moved 25 % towards
@@ -25,9 +30,14 @@ const statuses = ['success', 'info', 'warn', 'danger'];
25
30
  const surfaces = ['bg', 'bg-2', 'card'];
26
31
  /** Every foreground/background combination the components use, with its required ratio. */
27
32
  export function contrastPairs(colors) {
28
- const color = (token) => parse(colors[token]);
33
+ /** Optional tokens the set does not have give the token they follow (`accent` → `primary`) */
34
+ const color = (token) => parse(colorValue(colors, token));
29
35
  /** A token painted onto an opaque surface, optionally with Tailwind opacity (`bg-success/14`). */
30
36
  const on = (token, surface, opacity = 1) => over(color(token), color(surface), opacity);
37
+ /** Text of a tinted button or avatar on hover: primary turns `primary-hover` (itself without it) */
38
+ const hoverText = (tone) => color(tone === 'primary' ? 'primary-hover' : tone);
39
+ /** The accent is checked once a theme sets it – until then it is the primary colour, checked above */
40
+ const accent = colors.accent !== undefined || colors['on-accent'] !== undefined;
31
41
  const pair = (name, foreground, background, min) => ({
32
42
  name,
33
43
  foreground,
@@ -56,9 +66,18 @@ export function contrastPairs(colors) {
56
66
  pair('danger: text-on-danger on bg-danger', color('on-danger'), color('danger'), TEXT),
57
67
  pair('info: text-on-info on bg-info', color('on-info'), color('info'), TEXT),
58
68
  pair('warn: text-on-warn on bg-warn', color('on-warn'), color('warn'), TEXT),
59
- // Hover of solid buttons (`hover:opacity-85` fades text and background onto the page)
69
+ // Second brand colour: text on it and as text on the surfaces
70
+ ...(accent
71
+ ? [
72
+ pair('accent: text-on-accent on bg-accent', color('on-accent'), color('accent'), TEXT),
73
+ ...surfaces.map((surface) => pair(`text-accent on ${surface}`, color('accent'), color(surface), TEXT)),
74
+ ]
75
+ : []),
76
+ // Hover of solid primary buttons: the `primary-hover` fill – without it the fill fades to 85 % onto the page
77
+ // and the text stays
78
+ ...surfaces.map((surface) => pair(`primary hover on ${surface}`, color('on-primary'), colors['primary-hover'] !== undefined ? color('primary-hover') : on('primary', surface, HOVER_OPACITY), TEXT)),
79
+ // Hover of the other solid buttons (`hover:opacity-85` fades text and background onto the page)
60
80
  ...[
61
- ['primary', 'on-primary', 'primary'],
62
81
  ['success', 'on-success', 'success'],
63
82
  ['danger', 'on-danger', 'danger'],
64
83
  ].flatMap(([variant, text, fill]) => surfaces.map((surface) => pair(`${variant} hover on ${surface}`, on(text, surface, HOVER_OPACITY), on(fill, surface, HOVER_OPACITY), TEXT))),
@@ -69,13 +88,17 @@ export function contrastPairs(colors) {
69
88
  // Button colour "contrast" (bg-fg text-bg), faded on hover
70
89
  ...surfaces.map((surface) => pair(`contrast hover on ${surface}`, on('bg', surface, HOVER_OPACITY), on('fg', surface, HOVER_OPACITY), TEXT)),
71
90
  // Coloured outline/text/soft buttons: text in the colour on the page and on its tint (hover); primary as
72
- // text colour (status colours are covered above)
91
+ // text colour (status colours are covered above). On hover the primary text turns `primary-hover`.
73
92
  ...surfaces.map((surface) => pair(`text-primary on ${surface}`, color('primary'), color(surface), TEXT)),
74
- ...surfaces.flatMap((surface) => ['primary', ...statuses].map((tone) => pair(`soft ${tone} hover: text-${tone} on bg-${tone}/14 (${surface})`, color(tone), on(tone, surface, SOFT_HOVER_TINT), TEXT))),
93
+ // Tinted primary at rest: soft buttons (/10) and avatars (14 % on the card) – not covered by the hover pairs
94
+ // once `primary-hover` changes the text there
95
+ ...surfaces.map((surface) => pair(`soft primary: text-primary on bg-primary/10 (${surface})`, color('primary'), on('primary', surface, SOFT_TINT), TEXT)),
96
+ pair('avatar primary: text-primary on primary/14 (card)', color('primary'), on('primary', 'card', AVATAR_TINT), TEXT),
97
+ ...surfaces.flatMap((surface) => ['primary', ...statuses].map((tone) => pair(`soft ${tone} hover: text-${tone} on bg-${tone}/14 (${surface})`, hoverText(tone), on(tone, surface, SOFT_HOVER_TINT), TEXT))),
75
98
  // Tinted avatar buttons on hover (the avatar mixes its tint with the card)
76
- ...['primary', ...statuses].map((tone) => pair(`avatar ${tone} hover: text-${tone} on ${tone}/18 (card)`, color(tone), on(tone, 'card', AVATAR_HOVER_TINT), TEXT)),
99
+ ...['primary', ...statuses].map((tone) => pair(`avatar ${tone} hover: text-${tone} on ${tone}/18 (card)`, hoverText(tone), on(tone, 'card', AVATAR_HOVER_TINT), TEXT)),
77
100
  // Outline/text buttons in a colour: hover tint /8 on every surface
78
- ...surfaces.flatMap((surface) => ['primary', ...statuses].map((tone) => pair(`${tone} outline hover: text on bg-${tone}/8 (${surface})`, color(tone), on(tone, surface, 0.08), TEXT))),
101
+ ...surfaces.flatMap((surface) => ['primary', ...statuses].map((tone) => pair(`${tone} outline hover: text on bg-${tone}/8 (${surface})`, hoverText(tone), on(tone, surface, 0.08), TEXT))),
79
102
  // Highlight: marked text on the tint of its search term
80
103
  ...['bg', 'card'].flatMap((surface) => ['primary', ...statuses].map((tone) => pair(`highlight: text-fg on bg-${tone}/25 (${surface})`, color('fg'), on(tone, surface, 0.25), TEXT))),
81
104
  // Editor: every text colour on the surfaces and on every background colour (default text included)
@@ -113,10 +136,12 @@ export function checkTheme(theme) {
113
136
  const ON_COLORS = ['#FFFFFF', '#050505'];
114
137
  /** Steps of the OKLCH lightness while searching the nearest colour that meets a pair */
115
138
  const LIGHTNESS_STEP = 0.005;
139
+ /** Tokens tried first when a pair depends on them: a hover colour of its own keeps the primary colour */
140
+ const PREFERRED = ['primary-hover'];
116
141
  /**
117
142
  * The pairs `checkTheme` reports, each with suggestions: the nearest variant of a colour of the pair that meets it
118
- * (lightness moved in OKLCH, hue and chroma kept) and/or a light or dark `on-*` colour. Tokens the theme sets
119
- * itself are tried first. Empty when the theme passes.
143
+ * (lightness moved in OKLCH, hue and chroma kept) and/or a light or dark `on-*` colour. `primary-hover` is tried
144
+ * first for the hover pairs, then the tokens the theme sets itself. Empty when the theme passes.
120
145
  */
121
146
  export function suggestThemeFixes(theme) {
122
147
  return modes.flatMap((mode) => {
@@ -132,27 +157,36 @@ export function suggestThemeFixes(theme) {
132
157
  cache.set(key, (results = contrastPairs({ ...colors, [token]: value })));
133
158
  return results;
134
159
  };
135
- /** Meets the pair and every pair that passed before still passes */
136
- const fixes = (results, name) => {
160
+ /** The names of the pairs whose ratio changes with the token */
161
+ const dependents = new Map();
162
+ for (const token of [...colorTokens, ...optionalColorTokens]) {
163
+ const shifted = pairsWith(token, toHex(over(parse('#808080'), parse(colorValue(colors, token)), 0.5)));
164
+ const changed = before.filter((result) => Math.abs(shifted.find((pair) => pair.name === result.name).ratio - result.ratio) > 1e-6);
165
+ dependents.set(token, new Set(changed.map((result) => result.name)));
166
+ }
167
+ /**
168
+ * Meets the pair and every pair that passed before still passes – a preferred token (`primary-hover`) has to
169
+ * meet every pair that depends on it, so one value fixes all of them
170
+ */
171
+ const fixes = (token, results, name) => {
137
172
  const own = results.find((result) => result.name === name);
138
- const broken = results.some((result) => result.ratio < result.min && !failing.has(result.name));
173
+ const together = PREFERRED.includes(token) ? dependents.get(token) : new Set();
174
+ const broken = results.some((result) => result.ratio < result.min && (!failing.has(result.name) || together.has(result.name)));
139
175
  return own.ratio >= own.min && !broken ? own.ratio : undefined;
140
176
  };
141
177
  const own = theme.colors[mode] ?? {};
178
+ const rank = (token) => (PREFERRED.includes(token) ? 2 : 0) + Number(token in own);
142
179
  return before
143
180
  .filter((result) => result.ratio < result.min)
144
181
  .map((result) => {
145
182
  // The tokens the pair depends on: changing them changes its ratio
146
- const involved = colorTokens.filter((token) => {
147
- const shifted = pairsWith(token, toHex(over(parse('#808080'), parse(colors[token]), 0.5)));
148
- return Math.abs(shifted.find((pair) => pair.name === result.name).ratio - result.ratio) > 1e-6;
149
- });
150
- const ordered = [...involved].sort((a, b) => Number(b in own) - Number(a in own));
183
+ const involved = [...colorTokens, ...optionalColorTokens].filter((token) => dependents.get(token).has(result.name));
184
+ const ordered = [...involved].sort((a, b) => rank(b) - rank(a));
151
185
  const suggestion = { ...result, mode };
152
186
  // Translucent tokens (lines) keep their alpha – no opaque replacement for them
153
- const opaque = ordered.filter((name) => !name.startsWith('on-') && parse(colors[name]).a === 1);
187
+ const opaque = ordered.filter((name) => !name.startsWith('on-') && parse(colorValue(colors, name)).a === 1);
154
188
  for (const token of opaque) {
155
- const fix = nearestLightness(colors[token], token, (value) => fixes(pairsWith(token, value), result.name));
189
+ const fix = nearestLightness(colorValue(colors, token), token, (value) => fixes(token, pairsWith(token, value), result.name));
156
190
  if (fix) {
157
191
  suggestion.color = fix;
158
192
  break;
@@ -160,8 +194,8 @@ export function suggestThemeFixes(theme) {
160
194
  }
161
195
  for (const token of ordered.filter((name) => name.startsWith('on-'))) {
162
196
  for (const value of ON_COLORS) {
163
- const ratio = fixes(pairsWith(token, value), result.name);
164
- if (ratio !== undefined && value.toLowerCase() !== colors[token].toLowerCase()) {
197
+ const ratio = fixes(token, pairsWith(token, value), result.name);
198
+ if (ratio !== undefined && value.toLowerCase() !== colorValue(colors, token).toLowerCase()) {
165
199
  suggestion.on = { token, value, ratio };
166
200
  break;
167
201
  }
@@ -1 +1 @@
1
- {"version":3,"file":"contrast.js","sourceRoot":"","sources":["../src/contrast.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contrast.js","sourceRoot":"","sources":["../src/contrast.ts"],"names":[],"mappings":"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"}
package/dist/native.css CHANGED
@@ -28,6 +28,9 @@
28
28
  --color-on-warn: #FFFFFF;
29
29
  --color-primary: #0A0A0A;
30
30
  --color-on-primary: #FFFFFF;
31
+ --color-accent: #0A0A0A;
32
+ --color-on-accent: #FFFFFF;
33
+ --color-primary-hover: #0A0A0A;
31
34
  }
32
35
  @variant dark {
33
36
  --color-bg: #050505;
@@ -49,6 +52,9 @@
49
52
  --color-on-warn: #050505;
50
53
  --color-primary: #F4F4F4;
51
54
  --color-on-primary: #050505;
55
+ --color-accent: #F4F4F4;
56
+ --color-on-accent: #050505;
57
+ --color-primary-hover: #F4F4F4;
52
58
  }
53
59
  @variant ocean-light {
54
60
  --color-bg: #FFFFFF;
@@ -70,6 +76,9 @@
70
76
  --color-on-warn: #FFFFFF;
71
77
  --color-primary: oklch(0.48 0.17 255);
72
78
  --color-on-primary: #FFFFFF;
79
+ --color-accent: oklch(0.48 0.17 255);
80
+ --color-on-accent: #FFFFFF;
81
+ --color-primary-hover: oklch(0.48 0.17 255);
73
82
  }
74
83
  @variant ocean-dark {
75
84
  --color-bg: #050505;
@@ -91,6 +100,9 @@
91
100
  --color-on-warn: #050505;
92
101
  --color-primary: oklch(0.72 0.13 250);
93
102
  --color-on-primary: #050505;
103
+ --color-accent: oklch(0.72 0.13 250);
104
+ --color-on-accent: #050505;
105
+ --color-primary-hover: oklch(0.72 0.13 250);
94
106
  }
95
107
  @variant violet-light {
96
108
  --color-bg: #FFFFFF;
@@ -112,6 +124,9 @@
112
124
  --color-on-warn: #FFFFFF;
113
125
  --color-primary: oklch(0.49 0.2 295);
114
126
  --color-on-primary: #FFFFFF;
127
+ --color-accent: oklch(0.49 0.2 295);
128
+ --color-on-accent: #FFFFFF;
129
+ --color-primary-hover: oklch(0.49 0.2 295);
115
130
  }
116
131
  @variant violet-dark {
117
132
  --color-bg: #050505;
@@ -133,6 +148,9 @@
133
148
  --color-on-warn: #050505;
134
149
  --color-primary: oklch(0.74 0.15 295);
135
150
  --color-on-primary: #050505;
151
+ --color-accent: oklch(0.74 0.15 295);
152
+ --color-on-accent: #050505;
153
+ --color-primary-hover: oklch(0.74 0.15 295);
136
154
  }
137
155
  @variant teal-light {
138
156
  --color-bg: #FFFFFF;
@@ -154,6 +172,9 @@
154
172
  --color-on-warn: #FFFFFF;
155
173
  --color-primary: oklch(0.45 0.1 190);
156
174
  --color-on-primary: #FFFFFF;
175
+ --color-accent: oklch(0.45 0.1 190);
176
+ --color-on-accent: #FFFFFF;
177
+ --color-primary-hover: oklch(0.45 0.1 190);
157
178
  }
158
179
  @variant teal-dark {
159
180
  --color-bg: #050505;
@@ -175,6 +196,9 @@
175
196
  --color-on-warn: #050505;
176
197
  --color-primary: oklch(0.76 0.11 190);
177
198
  --color-on-primary: #050505;
199
+ --color-accent: oklch(0.76 0.11 190);
200
+ --color-on-accent: #050505;
201
+ --color-primary-hover: oklch(0.76 0.11 190);
178
202
  }
179
203
  }
180
204
  }
@@ -188,4 +212,5 @@
188
212
  --radius-card: 20px;
189
213
  --radius-panel: 28px;
190
214
  --radius-popup: 12px;
215
+ --radius-dialog: 14px;
191
216
  }
@@ -1 +1 @@
1
- {"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAKlF,4EAA4E;AAC5E,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,MAAM,IAAI,WAAuD,CAAC;AAEjH,sGAAsG;AACtG,eAAO,MAAM,iBAAiB,GAAI,OAAM,KAAK,EAAW,aAGA,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,WAAW;;;;;;CAMd,CAAC;AAEX,+GAA+G;AAC/G,eAAO,MAAM,gBAAgB,GAAI,OAAO,KAAK,WAQ1B,CAAC"}
1
+ {"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiE,KAAK,IAAI,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AAKnH,4EAA4E;AAC5E,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,MAAM,IAAI,WAAuD,CAAC;AAEjH,sGAAsG;AACtG,eAAO,MAAM,iBAAiB,GAAI,OAAM,KAAK,EAAW,aAGA,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,WAAW;;;;;;CAMd,CAAC;AAEX,+GAA+G;AAC/G,eAAO,MAAM,gBAAgB,GAAI,OAAO,KAAK,WAa1B,CAAC"}
package/dist/native.js CHANGED
@@ -1,4 +1,4 @@
1
- import { modes, resolveColors, themes } from './tokens.js';
1
+ import { colorValue, modes, optionalColorTokens, resolveColors, themes } from './tokens.js';
2
2
  // React Native (Uniwind) knows only flat themes, so every theme × mode pair becomes one Uniwind theme.
3
3
  // The default theme keeps Uniwind's built-in `light`/`dark` (and with it the system setting).
4
4
  /** Uniwind theme name of a theme in a mode, e.g. `dark` or `ocean-dark`. */
@@ -21,7 +21,12 @@ export const nativeFonts = {
21
21
  /** `@variant` blocks with all colours of a theme, for `@layer theme { :root { … } }` in a Uniwind CSS file. */
22
22
  export const themeToNativeCss = (theme) => modes
23
23
  .map((mode) => {
24
- const declarations = Object.entries(resolveColors(theme, mode))
24
+ const colors = resolveColors(theme, mode);
25
+ // Uniwind gets fixed values: optional tokens the theme does not set get the colour of the token they follow
26
+ const declarations = Object.entries({
27
+ ...colors,
28
+ ...Object.fromEntries(optionalColorTokens.map((token) => [token, colorValue(colors, token)])),
29
+ })
25
30
  .map(([token, value]) => ` --color-${token}: ${value};`)
26
31
  .join('\n');
27
32
  return ` @variant ${nativeThemeName(theme.name, mode)} {\n${declarations}\n }`;
@@ -1 +1 @@
1
- {"version":3,"file":"native.js","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,EAAyB,MAAM,aAAa,CAAC;AAElF,uGAAuG;AACvG,8FAA8F;AAE9F,4EAA4E;AAC5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,IAAU,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC;AAEjH,sGAAsG;AACtG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAgB,MAAM,EAAE,EAAE,CACxD,IAAI;KACC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;KAC1E,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAY,CAAC,CAAC,CAAC;AAEzD;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACvB,IAAI,EAAE,6BAA6B;IACnC,aAAa,EAAE,4BAA4B;IAC3C,eAAe,EAAE,8BAA8B;IAC/C,WAAW,EAAE,0BAA0B;IACvC,IAAI,EAAE,0BAA0B;CAC1B,CAAC;AAEX,+GAA+G;AAC/G,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,EAAE,CAC7C,KAAK;KACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IACV,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,uBAAuB,KAAK,KAAK,KAAK,GAAG,CAAC;SAClE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,OAAO,oBAAoB,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,YAAY,aAAa,CAAC;AACjG,CAAC,CAAC;KACD,IAAI,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"native.js","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,EAAyB,MAAM,aAAa,CAAC;AAEnH,uGAAuG;AACvG,8FAA8F;AAE9F,4EAA4E;AAC5E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,IAAU,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,IAAI,EAAE,CAAC,CAAC;AAEjH,sGAAsG;AACtG,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAgB,MAAM,EAAE,EAAE,CACxD,IAAI;KACC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;KAC1E,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAY,CAAC,CAAC,CAAC;AAEzD;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACvB,IAAI,EAAE,6BAA6B;IACnC,aAAa,EAAE,4BAA4B;IAC3C,eAAe,EAAE,8BAA8B;IAC/C,WAAW,EAAE,0BAA0B;IACvC,IAAI,EAAE,0BAA0B;CAC1B,CAAC;AAEX,+GAA+G;AAC/G,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,EAAE,CAC7C,KAAK;KACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IACV,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC1C,4GAA4G;IAC5G,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,GAAG,MAAM;QACT,GAAG,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;KAChG,CAAC;SACG,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,uBAAuB,KAAK,KAAK,KAAK,GAAG,CAAC;SAClE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,OAAO,oBAAoB,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,YAAY,aAAa,CAAC;AACjG,CAAC,CAAC;KACD,IAAI,CAAC,IAAI,CAAC,CAAC"}
package/dist/resolve.d.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import { type ColorSet } from './tokens.js';
2
2
  /**
3
3
  * The colours of the tokens as they apply to `element` right now (mode, theme and own overrides included): hex,
4
- * `#rrggbbaa` for translucent ones (line, glow). A value the browser cannot paint stays as written.
4
+ * `#rrggbbaa` for translucent ones (line, glow). A value the browser cannot paint stays as written. Optional tokens
5
+ * the theme does not set (`accent` …) get the colour of the token they follow.
5
6
  */
6
7
  export declare function resolveTokens(element?: Element): ColorSet;
7
8
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAe,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEzD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAE,OAAkC,GAAG,QAAQ,CAKnF;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAW5D"}
1
+ {"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,EAA4D,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEtG;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,GAAE,OAAkC,GAAG,QAAQ,CAMnF;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAW5D"}
package/dist/resolve.js CHANGED
@@ -1,14 +1,19 @@
1
1
  // The colour tokens as fixed values at runtime – for canvas libraries (xterm.js, charts) that cannot read CSS
2
2
  // variables. Browser only.
3
3
  import { parse, toHex } from './color.js';
4
- import { colorTokens } from './tokens.js';
4
+ import { colorTokens, optionalColorFallbacks, optionalColorTokens } from './tokens.js';
5
5
  /**
6
6
  * The colours of the tokens as they apply to `element` right now (mode, theme and own overrides included): hex,
7
- * `#rrggbbaa` for translucent ones (line, glow). A value the browser cannot paint stays as written.
7
+ * `#rrggbbaa` for translucent ones (line, glow). A value the browser cannot paint stays as written. Optional tokens
8
+ * the theme does not set (`accent` …) get the colour of the token they follow.
8
9
  */
9
10
  export function resolveTokens(element = document.documentElement) {
10
11
  const style = getComputedStyle(element);
11
- return Object.fromEntries(colorTokens.map((token) => [token, toFixedColor(style.getPropertyValue(`--wc-${token}`).trim())]));
12
+ const value = (token) => toFixedColor(style.getPropertyValue(`--wc-${token}`).trim());
13
+ const base = Object.fromEntries(colorTokens.map((token) => [token, value(token)]));
14
+ for (const token of optionalColorTokens)
15
+ base[token] = value(token) || base[optionalColorFallbacks[token]];
16
+ return base;
12
17
  }
13
18
  /**
14
19
  * Calls `onChange` whenever the token colours may have changed: another mode or theme on the page (`data-mode`,
@@ -1 +1 @@
1
- {"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"AAAA,8GAA8G;AAC9G,2BAA2B;AAC3B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,mBAAmB,EAAiB,MAAM,aAAa,CAAC;AAEtG;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,UAAmB,QAAQ,CAAC,eAAe;IACrE,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,gBAAgB,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9F,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAa,CAAC;IAC/F,KAAK,MAAM,KAAK,IAAI,mBAAmB;QAAE,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3G,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,QAAoB;IAC5C,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACtE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAClF,IAAI,QAAQ,CAAC,IAAI;QAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAC1F,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACzG,MAAM,EAAE,gBAAgB,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/C,OAAO,GAAG,EAAE;QACR,QAAQ,CAAC,UAAU,EAAE,CAAC;QACtB,MAAM,EAAE,mBAAmB,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC,CAAC;AACN,CAAC;AAED,SAAS,YAAY,CAAC,KAAa;IAC/B,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IACzB,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QACxC,OAAO,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChG,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC;IACxC,CAAC;AACL,CAAC;AAED,IAAI,MAAmD,CAAC;AAExD,6EAA6E;AAC7E,SAAS,YAAY,CAAC,KAAa;IAC/B,IAAI,OAAO,GAAG,KAAK,WAAW,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACpF,MAAM,KAAK,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;IACzB,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC5B,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1E,MAAM,GAAG,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACvE,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAClE,CAAC"}
package/dist/theme.css CHANGED
@@ -168,6 +168,10 @@
168
168
  --color-on-warn: var(--wc-on-warn);
169
169
  --color-primary: var(--wc-primary);
170
170
  --color-on-primary: var(--wc-on-primary);
171
+ /* Optional tokens: without a value of the theme they follow another token (accent → primary …) */
172
+ --color-accent: var(--wc-accent, var(--wc-primary));
173
+ --color-on-accent: var(--wc-on-accent, var(--wc-on-primary));
174
+ --color-primary-hover: var(--wc-primary-hover, var(--wc-primary));
171
175
  --tracking-display: -0.05em;
172
176
  --tracking-heading: -0.045em;
173
177
  --tracking-label: 0.08em;
@@ -179,6 +183,7 @@
179
183
  --radius-card: 20px;
180
184
  --radius-panel: 28px;
181
185
  --radius-popup: 12px;
186
+ --radius-dialog: 14px;
182
187
  }
183
188
 
184
189
  /* Animations that read variables set on the element itself (by Ark): "inline" puts the value into the utility.
package/dist/tokens.d.ts CHANGED
@@ -3,7 +3,19 @@ export declare const modes: readonly ["light", "dark"];
3
3
  export type Mode = (typeof modes)[number];
4
4
  export declare const colorTokens: readonly ["bg", "bg-2", "card", "fg", "muted", "line", "line-2", "line-strong", "glow", "success", "warn", "danger", "info", "on-success", "on-danger", "on-info", "on-warn", "primary", "on-primary"];
5
5
  export type ColorToken = (typeof colorTokens)[number];
6
- export type ColorSet = Record<ColorToken, string>;
6
+ /**
7
+ * Colours a theme may set, but does not have to – without them they follow another token (`optionalColorFallbacks`),
8
+ * so existing themes stay as they are:
9
+ * - `accent` / `on-accent`: a second brand colour and the text on it (`bg-accent`, `text-accent`, `text-on-accent`)
10
+ * - `primary-hover`: the primary colour on hover – the fill of solid primary buttons and the text of tinted ones
11
+ * (soft, outline, text, avatar buttons). Without it the fill fades to 85 % and the text stays `primary`.
12
+ */
13
+ export declare const optionalColorTokens: readonly ["accent", "on-accent", "primary-hover"];
14
+ export type OptionalColorToken = (typeof optionalColorTokens)[number];
15
+ /** The token an optional token follows when a theme does not set it */
16
+ export declare const optionalColorFallbacks: Record<OptionalColorToken, ColorToken>;
17
+ /** All colours of a mode: the base tokens, plus the optional ones a theme sets */
18
+ export type ColorSet = Record<ColorToken, string> & Partial<Record<OptionalColorToken, string>>;
7
19
  /**
8
20
  * Base colours (theme "wirecore") per mode. Every text/UI pair meets WCAG 2.2 AA – see contrast.ts,
9
21
  * enforced for every theme by test/contrast.test.ts. `primary` drives primary buttons and all selected
@@ -11,8 +23,8 @@ export type ColorSet = Record<ColorToken, string>;
11
23
  */
12
24
  export declare const colors: Record<Mode, ColorSet>;
13
25
  /**
14
- * A theme overrides any base colours per mode – typically `primary` and `on-primary`.
15
- * It is switched with `data-theme="<name>"` and combines with `data-mode`.
26
+ * A theme overrides any base colours per mode – typically `primary` and `on-primary` – and may set the optional ones
27
+ * (`accent`, `on-accent`, `primary-hover`). It is switched with `data-theme="<name>"` and combines with `data-mode`.
16
28
  */
17
29
  export interface Theme {
18
30
  name: string;
@@ -23,8 +35,10 @@ export interface Theme {
23
35
  export declare const defineTheme: (theme: Theme) => Theme;
24
36
  /** Built-in themes. All of them pass the WCAG AA contrast checks in both modes. */
25
37
  export declare const themes: Theme[];
26
- /** Base colours with the theme's overrides applied. */
38
+ /** Base colours with the theme's overrides applied – optional tokens only where the theme sets them. */
27
39
  export declare const resolveColors: (theme: Theme, mode: Mode) => ColorSet;
40
+ /** The value of a token in a colour set – an optional one that is not set gives the token it follows */
41
+ export declare const colorValue: (set: ColorSet, token: ColorToken | OptionalColorToken) => string;
28
42
  export declare const fonts: {
29
43
  sans: string[];
30
44
  mono: string[];
@@ -35,6 +49,8 @@ export declare const radius: {
35
49
  panel: string;
36
50
  /** Floating surfaces: menus, list boxes, popovers, pickers */
37
51
  popup: string;
52
+ /** Dialogs and the fullscreen view of Gallery */
53
+ dialog: string;
38
54
  };
39
55
  export declare const tracking: {
40
56
  display: string;
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,kHAAkH;AAClH,eAAO,MAAM,KAAK,4BAA6B,CAAC;AAChD,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,eAAO,MAAM,WAAW,wMAoBd,CAAC;AACX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAElD;;;;GAIG;AACH,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CA2CzC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CAC3C;AAED,qFAAqF;AACrF,eAAO,MAAM,WAAW,GAAI,OAAO,KAAK,KAAG,KAAc,CAAC;AAE1D,mFAAmF;AACnF,eAAO,MAAM,MAAM,EAAE,KAAK,EA0BzB,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,EAAE,MAAM,IAAI,KAAG,QAAwD,CAAC;AAElH,eAAO,MAAM,KAAK;;;CAGjB,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,MAAM;;;IAGf,8DAA8D;;CAEjE,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,eAAO,MAAM,KAAK,6BAA8B,CAAC;AACjD,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,2DAA2D;AAC3D,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAI7F,CAAC"}
1
+ {"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,kHAAkH;AAClH,eAAO,MAAM,KAAK,4BAA6B,CAAC;AAChD,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,eAAO,MAAM,WAAW,wMAoBd,CAAC;AACX,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtD;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,mDAAoD,CAAC;AACrF,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtE,uEAAuE;AACvE,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,kBAAkB,EAAE,UAAU,CAIzE,CAAC;AAEF,kFAAkF;AAClF,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC;AAEhG;;;;GAIG;AACH,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CA2CzC,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,KAAK;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;CAC3C;AAED,qFAAqF;AACrF,eAAO,MAAM,WAAW,GAAI,OAAO,KAAK,KAAG,KAAc,CAAC;AAE1D,mFAAmF;AACnF,eAAO,MAAM,MAAM,EAAE,KAAK,EA0BzB,CAAC;AAEF,wGAAwG;AACxG,eAAO,MAAM,aAAa,GAAI,OAAO,KAAK,EAAE,MAAM,IAAI,KAAG,QAAwD,CAAC;AAIlH,wGAAwG;AACxG,eAAO,MAAM,UAAU,GAAI,KAAK,QAAQ,EAAE,OAAO,UAAU,GAAG,kBAAkB,KAAG,MACc,CAAC;AAElG,eAAO,MAAM,KAAK;;;CAGjB,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,MAAM;;;IAGf,8DAA8D;;IAE9D,iDAAiD;;CAEpD,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,eAAO,MAAM,KAAK,6BAA8B,CAAC;AACjD,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1C,2DAA2D;AAC3D,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAI7F,CAAC"}
package/dist/tokens.js CHANGED
@@ -21,6 +21,20 @@ export const colorTokens = [
21
21
  'primary',
22
22
  'on-primary',
23
23
  ];
24
+ /**
25
+ * Colours a theme may set, but does not have to – without them they follow another token (`optionalColorFallbacks`),
26
+ * so existing themes stay as they are:
27
+ * - `accent` / `on-accent`: a second brand colour and the text on it (`bg-accent`, `text-accent`, `text-on-accent`)
28
+ * - `primary-hover`: the primary colour on hover – the fill of solid primary buttons and the text of tinted ones
29
+ * (soft, outline, text, avatar buttons). Without it the fill fades to 85 % and the text stays `primary`.
30
+ */
31
+ export const optionalColorTokens = ['accent', 'on-accent', 'primary-hover'];
32
+ /** The token an optional token follows when a theme does not set it */
33
+ export const optionalColorFallbacks = {
34
+ accent: 'primary',
35
+ 'on-accent': 'on-primary',
36
+ 'primary-hover': 'primary',
37
+ };
24
38
  /**
25
39
  * Base colours (theme "wirecore") per mode. Every text/UI pair meets WCAG 2.2 AA – see contrast.ts,
26
40
  * enforced for every theme by test/contrast.test.ts. `primary` drives primary buttons and all selected
@@ -100,8 +114,11 @@ export const themes = [
100
114
  },
101
115
  },
102
116
  ];
103
- /** Base colours with the theme's overrides applied. */
117
+ /** Base colours with the theme's overrides applied – optional tokens only where the theme sets them. */
104
118
  export const resolveColors = (theme, mode) => ({ ...colors[mode], ...theme.colors[mode] });
119
+ const isOptionalColorToken = (token) => token in optionalColorFallbacks;
120
+ /** The value of a token in a colour set – an optional one that is not set gives the token it follows */
121
+ export const colorValue = (set, token) => isOptionalColorToken(token) ? (set[token] ?? set[optionalColorFallbacks[token]]) : set[token];
105
122
  export const fonts = {
106
123
  sans: ['"Schibsted Grotesk Variable"', '"Schibsted Grotesk"', 'ui-sans-serif', 'system-ui', 'sans-serif'],
107
124
  mono: ['"JetBrains Mono Variable"', '"JetBrains Mono"', 'ui-monospace', 'monospace'],
@@ -112,6 +129,8 @@ export const radius = {
112
129
  panel: '28px',
113
130
  /** Floating surfaces: menus, list boxes, popovers, pickers */
114
131
  popup: '12px',
132
+ /** Dialogs and the fullscreen view of Gallery */
133
+ dialog: '14px',
115
134
  };
116
135
  export const tracking = {
117
136
  display: '-0.05em',
@@ -1 +1 @@
1
- {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wirecore/wirelayer-tokens",
3
- "version": "0.5.1",
3
+ "version": "0.7.0",
4
4
  "description": "WireLayer design tokens and Tailwind v4 theme",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/color.ts CHANGED
@@ -75,7 +75,11 @@ export function parse(color: string): Rgba {
75
75
  }
76
76
  const oklch = color.match(/^oklch\(([^)]+)\)$/)?.[1];
77
77
  if (oklch) {
78
- const [l = 0, c = 0, h = 0] = oklch.trim().split(/\s+/).map(Number);
78
+ // Minified CSS writes the lightness in percent: `oklch(47% .13 155)`; 100% chroma is 0.4 (CSS Color 4)
79
+ const [l = 0, c = 0, h = 0] = oklch
80
+ .trim()
81
+ .split(/\s+/)
82
+ .map((part, i) => (part.endsWith('%') ? (parseFloat(part) / 100) * (i === 1 ? 0.4 : 1) : Number(part)));
79
83
  return oklchToRgb(l, c, h);
80
84
  }
81
85
  throw new Error(`Unsupported colour: ${color}`);
package/src/contrast.ts CHANGED
@@ -2,18 +2,34 @@
2
2
  // and exported so projects can test their own themes:
3
3
  // expect(checkTheme(myTheme)).toEqual([])
4
4
  import { contrast, inGamut, oklchToRgb, over, parse, rgbToOklch, toHex, type Rgba } from './color.js';
5
- import { colorTokens, modes, resolveColors, type ColorSet, type ColorToken, type Mode, type Theme } from './tokens.js';
5
+ import {
6
+ colorTokens,
7
+ colorValue,
8
+ modes,
9
+ optionalColorTokens,
10
+ resolveColors,
11
+ type ColorSet,
12
+ type ColorToken,
13
+ type Mode,
14
+ type OptionalColorToken,
15
+ type Theme,
16
+ } from './tokens.js';
6
17
 
7
18
  /** 4.5:1 for text (1.4.3), 3:1 for UI component boundaries, selected states and icons (1.4.11). */
8
19
  const TEXT = 4.5;
9
20
  const NON_TEXT = 3;
10
- /** Must match the `hover:opacity-*` of the solid button variants in @wirecore/wirelayer-recipes. */
21
+ /**
22
+ * Must match the `hover:opacity-*` of the solid button variants in @wirecore/wirelayer-recipes – and the fade of solid
23
+ * primary buttons without `primary-hover` (`color-mix(… var(--wc-primary) 85%, transparent)`, the text stays).
24
+ */
11
25
  const HOVER_OPACITY = 0.85;
12
26
  /** Info and warn buttons fade less on hover (`hover:opacity-90`) – at 85 % white text would drop below 4.5:1. */
13
27
  const HOVER_OPACITY_LIGHT_FILL = 0.9;
14
28
  /** Tinted ("soft") buttons: `bg-<colour>/10`, on hover `/14` (the tint of badges and alert icons). */
29
+ const SOFT_TINT = 0.1;
15
30
  const SOFT_HOVER_TINT = 0.14;
16
31
  /** Tinted avatar as a button (`color`, `as="button"`): 14 % of the colour on the card, on hover 18 % */
32
+ const AVATAR_TINT = 0.14;
17
33
  const AVATAR_HOVER_TINT = 0.18;
18
34
  /**
19
35
  * Editor colours – must match `editorColorTokens`/`editorColorValue` in @wirecore/wirelayer-recipes: text moved 25 % towards
@@ -41,9 +57,14 @@ interface Pair {
41
57
 
42
58
  /** Every foreground/background combination the components use, with its required ratio. */
43
59
  export function contrastPairs(colors: ColorSet): ContrastResult[] {
44
- const color = (token: ColorToken) => parse(colors[token]);
60
+ /** Optional tokens the set does not have give the token they follow (`accent` → `primary`) */
61
+ const color = (token: ColorToken | OptionalColorToken) => parse(colorValue(colors, token));
45
62
  /** A token painted onto an opaque surface, optionally with Tailwind opacity (`bg-success/14`). */
46
63
  const on = (token: ColorToken, surface: ColorToken, opacity = 1) => over(color(token), color(surface), opacity);
64
+ /** Text of a tinted button or avatar on hover: primary turns `primary-hover` (itself without it) */
65
+ const hoverText = (tone: ColorToken) => color(tone === 'primary' ? 'primary-hover' : tone);
66
+ /** The accent is checked once a theme sets it – until then it is the primary colour, checked above */
67
+ const accent = colors.accent !== undefined || colors['on-accent'] !== undefined;
47
68
  const pair = (name: string, foreground: Rgba, background: Rgba, min: number): Pair => ({
48
69
  name,
49
70
  foreground,
@@ -75,10 +96,28 @@ export function contrastPairs(colors: ColorSet): ContrastResult[] {
75
96
  pair('danger: text-on-danger on bg-danger', color('on-danger'), color('danger'), TEXT),
76
97
  pair('info: text-on-info on bg-info', color('on-info'), color('info'), TEXT),
77
98
  pair('warn: text-on-warn on bg-warn', color('on-warn'), color('warn'), TEXT),
78
- // Hover of solid buttons (`hover:opacity-85` fades text and background onto the page)
99
+ // Second brand colour: text on it and as text on the surfaces
100
+ ...(accent
101
+ ? [
102
+ pair('accent: text-on-accent on bg-accent', color('on-accent'), color('accent'), TEXT),
103
+ ...surfaces.map((surface) =>
104
+ pair(`text-accent on ${surface}`, color('accent'), color(surface), TEXT)
105
+ ),
106
+ ]
107
+ : []),
108
+ // Hover of solid primary buttons: the `primary-hover` fill – without it the fill fades to 85 % onto the page
109
+ // and the text stays
110
+ ...surfaces.map((surface) =>
111
+ pair(
112
+ `primary hover on ${surface}`,
113
+ color('on-primary'),
114
+ colors['primary-hover'] !== undefined ? color('primary-hover') : on('primary', surface, HOVER_OPACITY),
115
+ TEXT
116
+ )
117
+ ),
118
+ // Hover of the other solid buttons (`hover:opacity-85` fades text and background onto the page)
79
119
  ...(
80
120
  [
81
- ['primary', 'on-primary', 'primary'],
82
121
  ['success', 'on-success', 'success'],
83
122
  ['danger', 'on-danger', 'danger'],
84
123
  ] as const
@@ -117,13 +156,29 @@ export function contrastPairs(colors: ColorSet): ContrastResult[] {
117
156
  )
118
157
  ),
119
158
  // Coloured outline/text/soft buttons: text in the colour on the page and on its tint (hover); primary as
120
- // text colour (status colours are covered above)
159
+ // text colour (status colours are covered above). On hover the primary text turns `primary-hover`.
121
160
  ...surfaces.map((surface) => pair(`text-primary on ${surface}`, color('primary'), color(surface), TEXT)),
161
+ // Tinted primary at rest: soft buttons (/10) and avatars (14 % on the card) – not covered by the hover pairs
162
+ // once `primary-hover` changes the text there
163
+ ...surfaces.map((surface) =>
164
+ pair(
165
+ `soft primary: text-primary on bg-primary/10 (${surface})`,
166
+ color('primary'),
167
+ on('primary', surface, SOFT_TINT),
168
+ TEXT
169
+ )
170
+ ),
171
+ pair(
172
+ 'avatar primary: text-primary on primary/14 (card)',
173
+ color('primary'),
174
+ on('primary', 'card', AVATAR_TINT),
175
+ TEXT
176
+ ),
122
177
  ...surfaces.flatMap((surface) =>
123
178
  (['primary', ...statuses] as const).map((tone) =>
124
179
  pair(
125
180
  `soft ${tone} hover: text-${tone} on bg-${tone}/14 (${surface})`,
126
- color(tone),
181
+ hoverText(tone),
127
182
  on(tone, surface, SOFT_HOVER_TINT),
128
183
  TEXT
129
184
  )
@@ -133,7 +188,7 @@ export function contrastPairs(colors: ColorSet): ContrastResult[] {
133
188
  ...(['primary', ...statuses] as const).map((tone) =>
134
189
  pair(
135
190
  `avatar ${tone} hover: text-${tone} on ${tone}/18 (card)`,
136
- color(tone),
191
+ hoverText(tone),
137
192
  on(tone, 'card', AVATAR_HOVER_TINT),
138
193
  TEXT
139
194
  )
@@ -143,7 +198,7 @@ export function contrastPairs(colors: ColorSet): ContrastResult[] {
143
198
  (['primary', ...statuses] as const).map((tone) =>
144
199
  pair(
145
200
  `${tone} outline hover: text on bg-${tone}/8 (${surface})`,
146
- color(tone),
201
+ hoverText(tone),
147
202
  on(tone, surface, 0.08),
148
203
  TEXT
149
204
  )
@@ -203,7 +258,7 @@ export function checkTheme(theme: Theme): (ContrastResult & { mode: Mode })[] {
203
258
 
204
259
  /** A way to meet a missed contrast: a token and its new value, with the ratio the pair then reaches */
205
260
  export interface ContrastFix {
206
- token: ColorToken;
261
+ token: ColorToken | OptionalColorToken;
207
262
  value: string;
208
263
  ratio: number;
209
264
  }
@@ -213,7 +268,8 @@ export interface ContrastSuggestion extends ContrastResult {
213
268
  mode: Mode;
214
269
  /**
215
270
  * The nearest colour that meets it – its lightness moved in OKLCH, the hue kept (the chroma only lowered where
216
- * sRGB needs it) – without breaking another pair
271
+ * sRGB needs it) – without breaking another pair. For a missed hover of the primary colour this is a
272
+ * `primary-hover` that meets every hover pair, so the primary colour itself can stay.
217
273
  */
218
274
  color?: ContrastFix;
219
275
  /** A light or dark text colour (`on-*`) that meets it */
@@ -223,11 +279,13 @@ export interface ContrastSuggestion extends ContrastResult {
223
279
  const ON_COLORS = ['#FFFFFF', '#050505'];
224
280
  /** Steps of the OKLCH lightness while searching the nearest colour that meets a pair */
225
281
  const LIGHTNESS_STEP = 0.005;
282
+ /** Tokens tried first when a pair depends on them: a hover colour of its own keeps the primary colour */
283
+ const PREFERRED: readonly (ColorToken | OptionalColorToken)[] = ['primary-hover'];
226
284
 
227
285
  /**
228
286
  * The pairs `checkTheme` reports, each with suggestions: the nearest variant of a colour of the pair that meets it
229
- * (lightness moved in OKLCH, hue and chroma kept) and/or a light or dark `on-*` colour. Tokens the theme sets
230
- * itself are tried first. Empty when the theme passes.
287
+ * (lightness moved in OKLCH, hue and chroma kept) and/or a light or dark `on-*` colour. `primary-hover` is tried
288
+ * first for the hover pairs, then the tokens the theme sets itself. Empty when the theme passes.
231
289
  */
232
290
  export function suggestThemeFixes(theme: Theme): ContrastSuggestion[] {
233
291
  return modes.flatMap((mode) => {
@@ -236,34 +294,52 @@ export function suggestThemeFixes(theme: Theme): ContrastSuggestion[] {
236
294
  const failing = new Set(before.filter((result) => result.ratio < result.min).map((result) => result.name));
237
295
  // The pairs with one token changed – the same candidates come up for every missed pair
238
296
  const cache = new Map<string, ContrastResult[]>();
239
- const pairsWith = (token: ColorToken, value: string) => {
297
+ const pairsWith = (token: ColorToken | OptionalColorToken, value: string) => {
240
298
  const key = `${token} ${value}`;
241
299
  let results = cache.get(key);
242
300
  if (!results) cache.set(key, (results = contrastPairs({ ...colors, [token]: value })));
243
301
  return results;
244
302
  };
245
- /** Meets the pair and every pair that passed before still passes */
246
- const fixes = (results: ContrastResult[], name: string) => {
303
+ /** The names of the pairs whose ratio changes with the token */
304
+ const dependents = new Map<ColorToken | OptionalColorToken, Set<string>>();
305
+ for (const token of [...colorTokens, ...optionalColorTokens]) {
306
+ const shifted = pairsWith(token, toHex(over(parse('#808080'), parse(colorValue(colors, token)), 0.5)));
307
+ const changed = before.filter(
308
+ (result) => Math.abs(shifted.find((pair) => pair.name === result.name)!.ratio - result.ratio) > 1e-6
309
+ );
310
+ dependents.set(token, new Set(changed.map((result) => result.name)));
311
+ }
312
+ /**
313
+ * Meets the pair and every pair that passed before still passes – a preferred token (`primary-hover`) has to
314
+ * meet every pair that depends on it, so one value fixes all of them
315
+ */
316
+ const fixes = (token: ColorToken | OptionalColorToken, results: ContrastResult[], name: string) => {
247
317
  const own = results.find((result) => result.name === name)!;
248
- const broken = results.some((result) => result.ratio < result.min && !failing.has(result.name));
318
+ const together = PREFERRED.includes(token) ? dependents.get(token)! : new Set<string>();
319
+ const broken = results.some(
320
+ (result) => result.ratio < result.min && (!failing.has(result.name) || together.has(result.name))
321
+ );
249
322
  return own.ratio >= own.min && !broken ? own.ratio : undefined;
250
323
  };
251
324
  const own = theme.colors[mode] ?? {};
325
+ const rank = (token: ColorToken | OptionalColorToken) =>
326
+ (PREFERRED.includes(token) ? 2 : 0) + Number(token in own);
252
327
  return before
253
328
  .filter((result) => result.ratio < result.min)
254
329
  .map((result): ContrastSuggestion => {
255
330
  // The tokens the pair depends on: changing them changes its ratio
256
- const involved = colorTokens.filter((token) => {
257
- const shifted = pairsWith(token, toHex(over(parse('#808080'), parse(colors[token]), 0.5)));
258
- return Math.abs(shifted.find((pair) => pair.name === result.name)!.ratio - result.ratio) > 1e-6;
259
- });
260
- const ordered = [...involved].sort((a, b) => Number(b in own) - Number(a in own));
331
+ const involved = [...colorTokens, ...optionalColorTokens].filter((token) =>
332
+ dependents.get(token)!.has(result.name)
333
+ );
334
+ const ordered = [...involved].sort((a, b) => rank(b) - rank(a));
261
335
  const suggestion: ContrastSuggestion = { ...result, mode };
262
336
  // Translucent tokens (lines) keep their alpha – no opaque replacement for them
263
- const opaque = ordered.filter((name) => !name.startsWith('on-') && parse(colors[name]).a === 1);
337
+ const opaque = ordered.filter(
338
+ (name) => !name.startsWith('on-') && parse(colorValue(colors, name)).a === 1
339
+ );
264
340
  for (const token of opaque) {
265
- const fix = nearestLightness(colors[token], token, (value) =>
266
- fixes(pairsWith(token, value), result.name)
341
+ const fix = nearestLightness(colorValue(colors, token), token, (value) =>
342
+ fixes(token, pairsWith(token, value), result.name)
267
343
  );
268
344
  if (fix) {
269
345
  suggestion.color = fix;
@@ -272,8 +348,8 @@ export function suggestThemeFixes(theme: Theme): ContrastSuggestion[] {
272
348
  }
273
349
  for (const token of ordered.filter((name) => name.startsWith('on-'))) {
274
350
  for (const value of ON_COLORS) {
275
- const ratio = fixes(pairsWith(token, value), result.name);
276
- if (ratio !== undefined && value.toLowerCase() !== colors[token].toLowerCase()) {
351
+ const ratio = fixes(token, pairsWith(token, value), result.name);
352
+ if (ratio !== undefined && value.toLowerCase() !== colorValue(colors, token).toLowerCase()) {
277
353
  suggestion.on = { token, value, ratio };
278
354
  break;
279
355
  }
@@ -288,7 +364,7 @@ export function suggestThemeFixes(theme: Theme): ContrastSuggestion[] {
288
364
  /** The value of `token` with the nearest OKLCH lightness to `color` (either way) for which `meets` gives a ratio */
289
365
  function nearestLightness(
290
366
  color: string,
291
- token: ColorToken,
367
+ token: ColorToken | OptionalColorToken,
292
368
  meets: (value: string) => number | undefined
293
369
  ): ContrastFix | undefined {
294
370
  const { l, c, h } = rgbToOklch(parse(color));
package/src/native.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { modes, resolveColors, themes, type Mode, type Theme } from './tokens.js';
1
+ import { colorValue, modes, optionalColorTokens, resolveColors, themes, type Mode, type Theme } from './tokens.js';
2
2
 
3
3
  // React Native (Uniwind) knows only flat themes, so every theme × mode pair becomes one Uniwind theme.
4
4
  // The default theme keeps Uniwind's built-in `light`/`dark` (and with it the system setting).
@@ -28,7 +28,12 @@ export const nativeFonts = {
28
28
  export const themeToNativeCss = (theme: Theme) =>
29
29
  modes
30
30
  .map((mode) => {
31
- const declarations = Object.entries(resolveColors(theme, mode))
31
+ const colors = resolveColors(theme, mode);
32
+ // Uniwind gets fixed values: optional tokens the theme does not set get the colour of the token they follow
33
+ const declarations = Object.entries({
34
+ ...colors,
35
+ ...Object.fromEntries(optionalColorTokens.map((token) => [token, colorValue(colors, token)])),
36
+ })
32
37
  .map(([token, value]) => ` --color-${token}: ${value};`)
33
38
  .join('\n');
34
39
  return ` @variant ${nativeThemeName(theme.name, mode)} {\n${declarations}\n }`;
package/src/resolve.ts CHANGED
@@ -1,17 +1,19 @@
1
1
  // The colour tokens as fixed values at runtime – for canvas libraries (xterm.js, charts) that cannot read CSS
2
2
  // variables. Browser only.
3
3
  import { parse, toHex } from './color.js';
4
- import { colorTokens, type ColorSet } from './tokens.js';
4
+ import { colorTokens, optionalColorFallbacks, optionalColorTokens, type ColorSet } from './tokens.js';
5
5
 
6
6
  /**
7
7
  * The colours of the tokens as they apply to `element` right now (mode, theme and own overrides included): hex,
8
- * `#rrggbbaa` for translucent ones (line, glow). A value the browser cannot paint stays as written.
8
+ * `#rrggbbaa` for translucent ones (line, glow). A value the browser cannot paint stays as written. Optional tokens
9
+ * the theme does not set (`accent` …) get the colour of the token they follow.
9
10
  */
10
11
  export function resolveTokens(element: Element = document.documentElement): ColorSet {
11
12
  const style = getComputedStyle(element);
12
- return Object.fromEntries(
13
- colorTokens.map((token) => [token, toFixedColor(style.getPropertyValue(`--wc-${token}`).trim())])
14
- ) as ColorSet;
13
+ const value = (token: string) => toFixedColor(style.getPropertyValue(`--wc-${token}`).trim());
14
+ const base = Object.fromEntries(colorTokens.map((token) => [token, value(token)])) as ColorSet;
15
+ for (const token of optionalColorTokens) base[token] = value(token) || base[optionalColorFallbacks[token]];
16
+ return base;
15
17
  }
16
18
 
17
19
  /**
package/src/tokens.ts CHANGED
@@ -25,7 +25,25 @@ export const colorTokens = [
25
25
  ] as const;
26
26
  export type ColorToken = (typeof colorTokens)[number];
27
27
 
28
- export type ColorSet = Record<ColorToken, string>;
28
+ /**
29
+ * Colours a theme may set, but does not have to – without them they follow another token (`optionalColorFallbacks`),
30
+ * so existing themes stay as they are:
31
+ * - `accent` / `on-accent`: a second brand colour and the text on it (`bg-accent`, `text-accent`, `text-on-accent`)
32
+ * - `primary-hover`: the primary colour on hover – the fill of solid primary buttons and the text of tinted ones
33
+ * (soft, outline, text, avatar buttons). Without it the fill fades to 85 % and the text stays `primary`.
34
+ */
35
+ export const optionalColorTokens = ['accent', 'on-accent', 'primary-hover'] as const;
36
+ export type OptionalColorToken = (typeof optionalColorTokens)[number];
37
+
38
+ /** The token an optional token follows when a theme does not set it */
39
+ export const optionalColorFallbacks: Record<OptionalColorToken, ColorToken> = {
40
+ accent: 'primary',
41
+ 'on-accent': 'on-primary',
42
+ 'primary-hover': 'primary',
43
+ };
44
+
45
+ /** All colours of a mode: the base tokens, plus the optional ones a theme sets */
46
+ export type ColorSet = Record<ColorToken, string> & Partial<Record<OptionalColorToken, string>>;
29
47
 
30
48
  /**
31
49
  * Base colours (theme "wirecore") per mode. Every text/UI pair meets WCAG 2.2 AA – see contrast.ts,
@@ -78,8 +96,8 @@ export const colors: Record<Mode, ColorSet> = {
78
96
  };
79
97
 
80
98
  /**
81
- * A theme overrides any base colours per mode – typically `primary` and `on-primary`.
82
- * It is switched with `data-theme="<name>"` and combines with `data-mode`.
99
+ * A theme overrides any base colours per mode – typically `primary` and `on-primary` – and may set the optional ones
100
+ * (`accent`, `on-accent`, `primary-hover`). It is switched with `data-theme="<name>"` and combines with `data-mode`.
83
101
  */
84
102
  export interface Theme {
85
103
  name: string;
@@ -119,9 +137,15 @@ export const themes: Theme[] = [
119
137
  },
120
138
  ];
121
139
 
122
- /** Base colours with the theme's overrides applied. */
140
+ /** Base colours with the theme's overrides applied – optional tokens only where the theme sets them. */
123
141
  export const resolveColors = (theme: Theme, mode: Mode): ColorSet => ({ ...colors[mode], ...theme.colors[mode] });
124
142
 
143
+ const isOptionalColorToken = (token: string): token is OptionalColorToken => token in optionalColorFallbacks;
144
+
145
+ /** The value of a token in a colour set – an optional one that is not set gives the token it follows */
146
+ export const colorValue = (set: ColorSet, token: ColorToken | OptionalColorToken): string =>
147
+ isOptionalColorToken(token) ? (set[token] ?? set[optionalColorFallbacks[token]]) : set[token];
148
+
125
149
  export const fonts = {
126
150
  sans: ['"Schibsted Grotesk Variable"', '"Schibsted Grotesk"', 'ui-sans-serif', 'system-ui', 'sans-serif'],
127
151
  mono: ['"JetBrains Mono Variable"', '"JetBrains Mono"', 'ui-monospace', 'monospace'],
@@ -133,6 +157,8 @@ export const radius = {
133
157
  panel: '28px',
134
158
  /** Floating surfaces: menus, list boxes, popovers, pickers */
135
159
  popup: '12px',
160
+ /** Dialogs and the fullscreen view of Gallery */
161
+ dialog: '14px',
136
162
  };
137
163
 
138
164
  export const tracking = {