@multiplatform.one/theme 7.88.6 → 7.88.7

package/src/theme/accentOnSurface.spec.tsx

@@ -60,7 +60,8 @@ interface Seen {
 function Probe({ seen }: { seen: Seen }) {
   const theme = useTheme() as unknown as Record<string, { val?: string } | undefined>;
   seen.name = useThemeName();
-  seen.accent = useAccentOnSurface();
+  const accent = useAccentOnSurface();
+  seen.accent = accent.startsWith("$") ? (theme[accent.slice(1)]?.val ?? accent) : accent;
   seen.identity = useIdentityInkOnSurface();
   seen.surfaces = [theme.color1?.val ?? "", theme.color2?.val ?? ""];
   seen.accentSteps = Array.from({ length: 12 }, (_, i) => theme[`accent${i + 1}`]?.val ?? "");

package/src/theme/createDefaultThemeConfig.spec.ts

@@ -452,10 +452,10 @@ describe("the v5 theme matrix", () => {
   // `theme="accent"` follows a picked colour; the budget moved 260 -> 280 KB.
   // FZ-7970 (LC-160) dedupes values another rule already puts on the element:
   // 280,833 -> 263,241 bytes, and the budget ratchets down to 264 KB.
-  it("ships 478 themes and the heading-scope category fonts in under 264 KB of CSS (the v4 matrix and stock spread shipped 913 KB)", async () => {
+  it("ships 478 themes and the heading-scope category fonts in under 265 KB of CSS (the v4 matrix and stock spread shipped 913 KB)", async () => {
     const { createTamagui: build } = await vi.importActual<typeof import("tamagui")>("tamagui");
     const css = build(config.tamagui).getCSS();
     expect(Object.keys(themes)).toHaveLength(478);
-    expect(Buffer.byteLength(css, "utf8")).toBeLessThan(264_000);
+    expect(Buffer.byteLength(css, "utf8")).toBeLessThan(265_000);
   });
 });

package/src/theme/createThemes.ts

@@ -23,6 +23,10 @@ import {
 } from "./colorRules";
 import { pickSecondaryInk } from "./defaults/builderOptions";
 import { themeRampHues } from "./ramps";
+import { withAccentOnSurface } from "./accentInk";
+import { tintHueNames } from "./tintHues";
+
+export { tintHueNames };
 
 /**
  * MPO-40. Radix step 11 targets its own surface, but intent ink also paints on
@@ -168,43 +172,6 @@ function sanitizeGetTheme(
   };
 }
 
-// Radix hue names whose sub-themes act as decorative TINTS (Tint.tsx cycling,
-// the storybook `color` global). Under a tint,
-// surfaces/borders/solids keep the hue but TEXT must stay readable neutral:
-// muted/secondary text and user-authored content must never render saturated
-// accent (SB-D-14/SB-D-20). Exported so theme-identity consumers (chart
-// palette) share the one tint registry.
-export const tintHueNames = new Set([
-  "amber",
-  "blue",
-  "bronze",
-  "brown",
-  "crimson",
-  "cyan",
-  "gold",
-  "grass",
-  "gray",
-  "green",
-  "indigo",
-  "lime",
-  "mauve",
-  "mint",
-  "olive",
-  "orange",
-  "pink",
-  "plum",
-  "purple",
-  "red",
-  "sage",
-  "sand",
-  "sky",
-  "slate",
-  "teal",
-  "tomato",
-  "violet",
-  "yellow",
-]);
-
 // Text-tier tokens re-anchored to the neutral scheme ramp inside tint themes.
 const tintNeutralTextKeys = [
   "color",
@@ -1032,14 +999,18 @@ export function createThemesBuilder(
   const initialTheme = tamaguiCreateThemes(
     createThemesProps as Parameters<typeof tamaguiCreateThemes>[0],
   );
-  const themes = holdFocusRingAccent(
-    holdColorThemeAccent(
-      holdSwitchTrack(
-        holdSyntaxFloor(
-          holdNamedInkFloor(
-            holdSelectedState(
-              holdAccentFloor(
-                holdSelectionSurface(neutralizeSemanticEntryText(neutralizeTintText(initialTheme))),
+  const themes = withAccentOnSurface(
+    holdFocusRingAccent(
+      holdColorThemeAccent(
+        holdSwitchTrack(
+          holdSyntaxFloor(
+            holdNamedInkFloor(
+              holdSelectedState(
+                holdAccentFloor(
+                  holdSelectionSurface(
+                    neutralizeSemanticEntryText(neutralizeTintText(initialTheme)),
+                  ),
+                ),
               ),
             ),
           ),
@@ -1071,10 +1042,13 @@ export function createThemesBuilder(
       const createdTheme = tamaguiCreateThemes(
         addThemeProps as Parameters<typeof tamaguiCreateThemes>[0],
       );
-      return {
+      return withAccentOnSurface({
         [`dark_${name}`]: createdTheme.dark_accent,
         [`light_${name}`]: createdTheme.light_accent,
-      } as Record<`dark_${K}` | `light_${K}`, typeof createdTheme.dark_accent>;
+      } as Record<string, Record<string, string>>) as Record<
+        `dark_${K}` | `light_${K}`,
+        typeof createdTheme.dark_accent
+      >;
     },
   };
 }

package/src/theme/readableColor.ts

@@ -1,5 +1,13 @@
 import { useMemo } from "react";
-import { useTheme as useTamaguiTheme, useThemeName } from "tamagui";
+import { isWeb, useTheme as useTamaguiTheme, useThemeName } from "tamagui";
+import {
+  accentStepKeys,
+  chromaOf,
+  identityKeys,
+  pickIdentityInk,
+  resolveAccentOnSurface,
+  resolveIdentityInk,
+} from "./accentInk";
 import {
   aaTextContrastRatio,
   contrastRatio,
@@ -10,7 +18,8 @@ import {
   relativeLuminance,
 } from "./colorRules";
 import { isDarkThemeName } from "./controlTiers";
-import { tintHueNames } from "./createThemes";
+
+export { resolveAccentOnSurface, resolveIdentityInk };
 
 /**
  * Live-theme contrast helpers for text on solids and accent ink on surfaces.
@@ -99,100 +108,6 @@ export function useLegibleInkOn(fill_: string | undefined, preferred: string): s
   }, [fill, preferred, preferredValue, paper, ink]);
 }
 
-/** Below this sRGB chroma a step reads as grey, not as a hue. */
-const IDENTITY_CHROMA_FLOOR = 0.1;
-
-function chromaOf(hex: string): number {
-  const rgb = [1, 3, 5].map((offset) => parseInt(hex.slice(offset, offset + 2), 16) / 255);
-  return Math.max(...rgb) - Math.min(...rgb);
-}
-
-function surfaceLuminances(surfaces: readonly (string | undefined)[]): number[] | null {
-  const lums: number[] = [];
-  for (const surface of surfaces) {
-    const hex = surface ? normalizeToHex(surface) : null;
-    if (!hex) return null;
-    lums.push(relativeLuminance(hex));
-  }
-  return lums;
-}
-
-function pickIdentityInk(
-  candidates: readonly (string | undefined)[],
-  surfaces: readonly (string | undefined)[],
-): string | undefined {
-  const surfaceLums = surfaceLuminances(surfaces);
-  if (!surfaceLums) return undefined;
-  let best: string | undefined;
-  let bestChroma = IDENTITY_CHROMA_FLOOR;
-  for (const candidate of candidates) {
-    const hex = candidate ? normalizeToHex(candidate) : null;
-    if (!candidate || !hex) continue;
-    const lum = relativeLuminance(hex);
-    if (surfaceLums.some((surface) => contrastRatio(lum, surface) < aaTextContrastRatio)) continue;
-    const chroma = chromaOf(hex);
-    if (chroma > bestChroma) {
-      bestChroma = chroma;
-      best = candidate;
-    }
-  }
-  return best;
-}
-
-/**
- * Pure resolver behind {@link useIdentityInkOnSurface}: the most chromatic
- * candidate that clears AA text contrast on every surface, else `ink`.
- */
-export function resolveIdentityInk({
-  candidates,
-  surfaces,
-  ink,
-}: {
-  candidates: readonly (string | undefined)[];
-  surfaces: readonly (string | undefined)[];
-  ink: string;
-}): string {
-  return pickIdentityInk(candidates, surfaces) ?? ink;
-}
-
-/**
- * Pure resolver behind {@link useAccentOnSurface}. The identity hue first
- * (`identity`, see {@link useIdentityInkOnSurface}), so a colour theme's
- * accent ink is that colour. With no hue, the accent ramp's least-contrast
- * step that still clears AA on every surface, else `ink`.
- */
-export function resolveAccentOnSurface({
-  identity,
-  accentSteps,
-  surfaces,
-  ink,
-}: {
-  identity: readonly (string | undefined)[];
-  accentSteps: readonly (string | undefined)[];
-  surfaces: readonly (string | undefined)[];
-  ink: string;
-}): string {
-  const hued = pickIdentityInk(identity, surfaces);
-  if (hued) return hued;
-  const surfaceLums = surfaceLuminances(surfaces);
-  if (!surfaceLums) return ink;
-  let best: string | undefined;
-  let bestMin = Number.POSITIVE_INFINITY;
-  for (const step of accentSteps) {
-    const hex = step ? normalizeToHex(step) : null;
-    if (!step || !hex) continue;
-    const stepLum = relativeLuminance(hex);
-    const min = Math.min(...surfaceLums.map((surface) => contrastRatio(stepLum, surface)));
-    if (min >= aaTextContrastRatio && min < bestMin) {
-      bestMin = min;
-      best = step;
-    }
-  }
-  return best ?? ink;
-}
-
-const accentStepKeys = Array.from({ length: 12 }, (_, index) => `accent${index + 1}`);
-
 /**
  * The live theme's identity candidates and page surfaces. Under a tint
  * (`dark_orange`) the hue is the tint's own ramp, whose text tiers the build
@@ -202,9 +117,7 @@ const accentStepKeys = Array.from({ length: 12 }, (_, index) => `accent${index +
 function useIdentityInputs() {
   const themeName = (useThemeName() as string | undefined) ?? "";
   const theme = useTamaguiTheme() as unknown as Record<string, { val?: unknown } | undefined>;
-  const hue = themeName.split("_")[1];
-  const isTint = hue !== undefined && tintHueNames.has(hue as never);
-  const keys = isTint ? ["color8", "color9", "color10", `${hue}11`, `${hue}12`] : accentStepKeys;
+  const keys = identityKeys(themeName);
   return {
     candidates: keys.map((key) => resolveTokenValue(theme, key)),
     accentSteps: accentStepKeys.map((key) => resolveTokenValue(theme, key)),
@@ -226,13 +139,15 @@ function useIdentityInputs() {
  */
 export function useAccentOnSurface(): string {
   const { candidates, accentSteps, c1, c2, ink } = useIdentityInputs();
+  const theme = useTamaguiTheme() as unknown as Record<string, { val?: unknown } | undefined>;
   const candidateKey = candidates.join("|");
   const stepKey = accentSteps.join("|");
-  return useMemo(
+  const picked = useMemo(
     () => resolveAccentOnSurface({ identity: candidates, accentSteps, surfaces: [c1, c2], ink }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [candidateKey, stepKey, c1, c2, ink],
   );
+  return isWeb && theme.accentOnSurface?.val === picked ? "$accentOnSurface" : picked;
 }
 
 /**

package/src/theme/tintHues.ts

@@ -0,0 +1,36 @@
+// Radix hue names whose sub-themes act as decorative TINTS (Tint.tsx cycling,
+// the storybook `color` global). Under a tint,
+// surfaces/borders/solids keep the hue but TEXT must stay readable neutral:
+// muted/secondary text and user-authored content must never render saturated
+// accent (SB-D-14/SB-D-20). Exported so theme-identity consumers (chart
+// palette) share the one tint registry.
+export const tintHueNames = new Set([
+  "amber",
+  "blue",
+  "bronze",
+  "brown",
+  "crimson",
+  "cyan",
+  "gold",
+  "grass",
+  "gray",
+  "green",
+  "indigo",
+  "lime",
+  "mauve",
+  "mint",
+  "olive",
+  "orange",
+  "pink",
+  "plum",
+  "purple",
+  "red",
+  "sage",
+  "sand",
+  "sky",
+  "slate",
+  "teal",
+  "tomato",
+  "violet",
+  "yellow",
+]);

package/types/theme/accentInk.d.ts

@@ -0,0 +1,34 @@
+export declare function chromaOf(hex: string): number;
+export declare function pickIdentityInk(candidates: readonly (string | undefined)[], surfaces: readonly (string | undefined)[]): string | undefined;
+/**
+ * Pure resolver behind {@link useIdentityInkOnSurface}: the most chromatic
+ * candidate that clears AA text contrast on every surface, else `ink`.
+ */
+export declare function resolveIdentityInk({ candidates, surfaces, ink, }: {
+    candidates: readonly (string | undefined)[];
+    surfaces: readonly (string | undefined)[];
+    ink: string;
+}): string;
+/**
+ * Pure resolver behind {@link useAccentOnSurface}. The identity hue first
+ * (`identity`, see {@link useIdentityInkOnSurface}), so a colour theme's
+ * accent ink is that colour. With no hue, the accent ramp's least-contrast
+ * step that still clears AA on every surface, else `ink`.
+ */
+export declare function resolveAccentOnSurface({ identity, accentSteps, surfaces, ink, }: {
+    identity: readonly (string | undefined)[];
+    accentSteps: readonly (string | undefined)[];
+    surfaces: readonly (string | undefined)[];
+    ink: string;
+}): string;
+export declare const accentStepKeys: string[];
+/** The identity candidates' keys for `themeName`: a tint's own ramp, else the accent ramp. */
+export declare function identityKeys(themeName: string): string[];
+/**
+ * FZ-9608. Every theme with the ink {@link useAccentOnSurface} picks inside it,
+ * as `accentOnSurface`. On web the hook then hands back `$accentOnSurface`, so
+ * consumers paint a CSS variable that follows a light/dark flip with no
+ * re-render. A picked literal stayed on the scheme it was picked in.
+ */
+export declare function withAccentOnSurface(themes: Record<string, Record<string, string>>): Record<string, Record<string, string>>;
+//# sourceMappingURL=accentInk.d.ts.map

package/types/theme/accentInk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"accentInk.d.ts","sourceRoot":"","sources":["../../src/theme/accentInk.ts"],"names":[],"mappings":"AAYA,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAG5C;AAYD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,EAC3C,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GACxC,MAAM,GAAG,SAAS,CAiBpB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,UAAU,EACV,QAAQ,EACR,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC5C,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,MAAM,CAET;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,GAAG,GACJ,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,WAAW,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC7C,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,MAAM,CAkBT;AAED,eAAO,MAAM,cAAc,UAAiE,CAAC;AAE7F,8FAA8F;AAC9F,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAKxD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC7C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAcxC"}

package/types/theme/createThemes.d.ts

@@ -1,4 +1,6 @@
 import { createThemes as tamaguiCreateThemes } from "@tamagui/theme-builder";
+import { tintHueNames } from "./tintHues";
+export { tintHueNames };
 export declare const houseTemplates: {
     light_surface1: {
         background: number;
@@ -496,7 +498,6 @@ export interface CreateThemesBuilderOptions {
     grandChildrenThemes?: Parameters<typeof tamaguiCreateThemes>[0]["grandChildrenThemes"];
     getTheme?: (props: GetThemeProps) => Record<string, string | number | null | undefined>;
 }
-export declare const tintHueNames: Set<string>;
 export declare function createThemesBuilder(baseTheme: BaseThemeBuilderDefinition, accentTheme: ThemeBuilderDefinition, options?: CreateThemesBuilderOptions): {
     themes(): Record<string, Record<string, string>>;
     addTheme<K extends string>(name: K, theme: ThemeBuilderDefinition): Record<`dark_${K}` | `light_${K}`, {

package/types/theme/createThemes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createThemes.d.ts","sourceRoot":"","sources":["../../src/theme/createThemes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createThemes.d.ts","sourceRoot":"","sources":["../../src/theme/createThemes.ts"],"names":[],"mappings":"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"}

package/types/theme/readableColor.d.ts

@@ -1,3 +1,5 @@
+import { resolveAccentOnSurface, resolveIdentityInk } from "./accentInk";
+export { resolveAccentOnSurface, resolveIdentityInk };
 /**
  * Readable text/glyph color to sit ON `fill` (a token like "$color8" or a
  * resolved value, such as the wash from `useAccentTintedSurface`): the
@@ -27,27 +29,6 @@ export declare function resolveLegibleInkOn({ fill, preferred, paper, ink, }: {
  * its exact paint; a replacement comes back as a concrete color.
  */
 export declare function useLegibleInkOn(fill_: string | undefined, preferred: string): string;
-/**
- * Pure resolver behind {@link useIdentityInkOnSurface}: the most chromatic
- * candidate that clears AA text contrast on every surface, else `ink`.
- */
-export declare function resolveIdentityInk({ candidates, surfaces, ink, }: {
-    candidates: readonly (string | undefined)[];
-    surfaces: readonly (string | undefined)[];
-    ink: string;
-}): string;
-/**
- * Pure resolver behind {@link useAccentOnSurface}. The identity hue first
- * (`identity`, see {@link useIdentityInkOnSurface}), so a colour theme's
- * accent ink is that colour. With no hue, the accent ramp's least-contrast
- * step that still clears AA on every surface, else `ink`.
- */
-export declare function resolveAccentOnSurface({ identity, accentSteps, surfaces, ink, }: {
-    identity: readonly (string | undefined)[];
-    accentSteps: readonly (string | undefined)[];
-    surfaces: readonly (string | undefined)[];
-    ink: string;
-}): string;
 /**
  * Accent-hued text/link ink readable on the page surfaces (color1/color2),
  * shared by links, Toast, DatePicker, table filters, Button and every other

package/types/theme/readableColor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"readableColor.d.ts","sourceRoot":"","sources":["../../src/theme/readableColor.ts"],"names":[],"mappings":"AA6BA;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAU/E;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,SAAS,EACT,KAAK,EACL,GAAG,GACJ,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,MAAM,GAAG,SAAS,CAarB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAYpF;AA0CD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,EACjC,UAAU,EACV,QAAQ,EACR,GAAG,GACJ,EAAE;IACD,UAAU,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC5C,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,MAAM,CAET;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,GAAG,GACJ,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,WAAW,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC7C,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,MAAM,CAkBT;AAyBD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAS3C;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAQhD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI;IAChC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;CACb,CASA;AAID,MAAM,WAAW,+BAA+B;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,EACzC,KAAK,EACL,KAAK,GACN,EAAE,+BAA+B,GAAG,MAAM,GAAG,SAAS,CAmBtD;AAED,wEAAwE;AACxE,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAK3D;AAKD,MAAM,WAAW,wBAAwB;IACvC,6DAA6D;IAC7D,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,sDAAsD;IACtD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,GAAG,EACH,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,GAAG,GACJ,EAAE,wBAAwB,GAAG,MAAM,CAOnC;AAED,iFAAiF;AACjF,wBAAgB,eAAe,IAAI,MAAM,CASxC"}
+{"version":3,"file":"readableColor.d.ts","sourceRoot":"","sources":["../../src/theme/readableColor.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,aAAa,CAAC;AAYrB,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,CAAC;AAiBtD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAU/E;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,SAAS,EACT,KAAK,EACL,GAAG,GACJ,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,MAAM,GAAG,SAAS,CAarB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAYpF;AAqBD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAW3C;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAQhD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI;IAChC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;CACb,CASA;AAID,MAAM,WAAW,+BAA+B;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,EACzC,KAAK,EACL,KAAK,GACN,EAAE,+BAA+B,GAAG,MAAM,GAAG,SAAS,CAmBtD;AAED,wEAAwE;AACxE,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAK3D;AAKD,MAAM,WAAW,wBAAwB;IACvC,6DAA6D;IAC7D,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,sDAAsD;IACtD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAC1C,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,GAAG,EACH,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,GAAG,GACJ,EAAE,wBAAwB,GAAG,MAAM,CAOnC;AAED,iFAAiF;AACjF,wBAAgB,eAAe,IAAI,MAAM,CASxC"}

package/types/theme/tintHues.d.ts

@@ -0,0 +1,2 @@
+export declare const tintHueNames: Set<string>;
+//# sourceMappingURL=tintHues.d.ts.map

package/types/theme/tintHues.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tintHues.d.ts","sourceRoot":"","sources":["../../src/theme/tintHues.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY,aA6BvB,CAAC"}