@multiplatform.one/theme 7.90.0 → 7.90.2

package/src/theme/createThemes.ts

@@ -859,6 +859,60 @@ const houseAccentKeys = [
   "selectedColor",
 ] as const;
 
+type HouseAccent = {
+  accent: Record<(typeof houseAccentKeys)[number], string>;
+  accentSteps: Record<string, string>;
+};
+
+function isFullRamp(steps: (string | undefined)[]): steps is string[] {
+  return !steps.includes(undefined);
+}
+
+function houseAccentOf(
+  base: Record<string, string>,
+  blue: Record<string, string>,
+): HouseAccent | null {
+  const steps = Array.from({ length: 12 }, (_, index) => base[`accent${index + 1}`]);
+  if (!isAchromaticRamp(steps)) return null;
+  const ramp: (string | undefined)[] = Array.from(
+    { length: 12 },
+    (_, index) => base[`blue${index + 1}`] || undefined,
+  );
+  const surfaces = [base.color1, base.color2, base.color3, base.color4].map(luminanceOf);
+  if (!isFullRamp(ramp) || surfaces.includes(null)) return null;
+  const holdsInk = (lum: number) =>
+    surfaces.every((surface) => contrastRatio(lum, surface as number) >= aaTextContrastRatio);
+  return {
+    accent: {
+      accentBackground: blue.accentBackground,
+      accentColor:
+        walkToHoldingInk(ramp[10], ramp[11], holdsInk) ??
+        nearestHoldingStep(ramp[10], ramp, holdsInk),
+      selectedBackground: blue.selectedBackground,
+      selectedColor: blue.selectedColor,
+    },
+    accentSteps: Object.fromEntries(ramp.map((step, index) => [`accent${index + 1}`, step])),
+  };
+}
+
+function heldTheme(
+  name: string,
+  theme: Record<string, string>,
+  scheme: "light" | "dark",
+  base: Record<string, string>,
+  solid: Record<string, string>,
+  { accent, accentSteps }: HouseAccent,
+): Record<string, string> | null {
+  if (name === scheme) return { ...theme, ...accent, ...accentSteps };
+  const [, scope] = name.split("_");
+  if (!name.startsWith(`${scheme}_`) || (childrenHues as readonly string[]).includes(scope))
+    return null;
+  if (scope === "accent") return { ...solid };
+  const followed = houseAccentKeys.filter((key) => key in theme && theme[key] === base[key]);
+  if (followed.length === 0) return null;
+  return { ...theme, ...Object.fromEntries(followed.map((key) => [key, accent[key]])) };
+}
+
 /**
  * FZ-10073 (Clay, rv_4ef347aae208f200: "Neutral gray"). The house look is the
  * scheme root: v5's grey page and white cards (LC-151) under Apple's system
@@ -879,38 +933,11 @@ function holdHouseAccent(
     const blue = themes[`${scheme}_blue`];
     const solid = themes[`${scheme}_blue_accent`];
     if (!base || !blue || !solid) continue;
-    const steps = Array.from({ length: 12 }, (_, index) => base[`accent${index + 1}`]);
-    if (!isAchromaticRamp(steps)) continue;
-    const ramp = Array.from({ length: 12 }, (_, index) => base[`blue${index + 1}`]);
-    const surfaces = [base.color1, base.color2, base.color3, base.color4].map(luminanceOf);
-    if (ramp.some((step) => !step) || surfaces.some((lum) => lum === null)) continue;
-    const holdsInk = (lum: number) =>
-      surfaces.every((surface) => contrastRatio(lum, surface as number) >= aaTextContrastRatio);
-    const accent: Record<(typeof houseAccentKeys)[number], string> = {
-      accentBackground: blue.accentBackground,
-      accentColor:
-        walkToHoldingInk(ramp[10], ramp[11], holdsInk) ??
-        nearestHoldingStep(ramp[10], ramp, holdsInk),
-      selectedBackground: blue.selectedBackground,
-      selectedColor: blue.selectedColor,
-    };
-    const accentSteps = Object.fromEntries(ramp.map((step, index) => [`accent${index + 1}`, step]));
+    const house = houseAccentOf(base, blue);
+    if (!house) continue;
     for (const [name, theme] of Object.entries(themes)) {
-      if (name === scheme) {
-        out[name] = { ...theme, ...accent, ...accentSteps };
-        continue;
-      }
-      const [, scope] = name.split("_");
-      if (!name.startsWith(`${scheme}_`) || (childrenHues as readonly string[]).includes(scope))
-        continue;
-      if (scope === "accent") {
-        out[name] = { ...solid };
-        continue;
-      }
-      const followed = houseAccentKeys.filter((key) => key in theme && theme[key] === base[key]);
-      if (followed.length > 0) {
-        out[name] = { ...theme, ...Object.fromEntries(followed.map((key) => [key, accent[key]])) };
-      }
+      const held = heldTheme(name, theme, scheme, base, solid, house);
+      if (held) out[name] = held;
     }
   }
   return out;

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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"}