@multiplatform.one/theme 9.0.1 → 9.0.3

package/dist/esm/theme/touchManipulation.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["pressableSelectors","touchManipulationCss","join"],"sources":["../../../src/theme/touchManipulation.ts"],"sourcesContent":[null],"mappings":"AASO,IAAAA,kBAAM,IACX,WACA,WACA,cACA,mBACA,iBACA,gBACA,qBACA,0BACA,6BACA,mBACA,mBACA,qBACA,kBACA,iBACF;AAEO,IAAAC,oBAAM,aAAuBD,kBAAU,CAAAE,IAAmB,KAAK;AAAK;AAAA;AAAA","ignoreList":[]}
+{"version":3,"names":["pressableSelectors","touchManipulationCss","join"],"sources":["touchManipulation.native.js"],"sourcesContent":["var pressableSelectors = [\n  \"a[href]\",\n  \"summary\",\n  \"label[for]\",\n  '[role=\"button\"]',\n  '[role=\"link\"]',\n  '[role=\"tab\"]',\n  '[role=\"menuitem\"]',\n  '[role=\"menuitemradio\"]',\n  '[role=\"menuitemcheckbox\"]',\n  '[role=\"option\"]',\n  '[role=\"switch\"]',\n  '[role=\"checkbox\"]',\n  '[role=\"radio\"]',\n  '[tabindex=\"0\"]'\n];\nvar touchManipulationCss = `:where(${pressableSelectors.join(\", \")}),\nbutton {\n  touch-action: manipulation;\n}`;\nexport {\n  pressableSelectors,\n  touchManipulationCss\n};\n//# sourceMappingURL=touchManipulation.js.map\n"],"mappings":"AAAA,IAAIA,kBAAkB,GAAG,CACvB,SAAS,EACT,SAAS,EACT,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,mBAAmB,EACnB,wBAAwB,EACxB,2BAA2B,EAC3B,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,gBAAgB,CACjB;AACD,IAAIC,oBAAoB,GAAG,UAAUD,kBAAkB,CAACE,IAAI,CAAC,IAAI,CAAC;AAClE;AACA;AACA,EAAE;AACF,SACEF,kBAAkB,EAClBC,oBAAoB","ignoreList":[]}

package/dist/esm/theme/useResolvedKnobs.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useContext","useMemo","useThemeName","useTouchSurface","defaultKnobs","resolveKnobs","usePresetContext","defaultIntents","clampSurfaceSize","SurfaceContext","usePrefersReducedMotion","_type_of","obj","Symbol","constructor","IntentContext","useIntentContext","solidButtonIntents","Set","solidPaletteThemes","useResolvedKnobs","options","_ref","_ref1","_ref2","_ref3","_ref4","touch","presetCtx","contextIntent","prefersReducedMotion","themeName","scheme","startsWith","surfaceCtx","useStyledContext","surfaceSize","size","painted","intent","component","override","sizeOverride","baseKnobs","preset","knobs","overrides","merged","_ref5","intentOverrides","intents","knobOverrides","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","iterator","_step","next","done","key","value","err","return","componentOverride"],"sources":["../../../src/theme/useResolvedKnobs.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createContext","useContext","useMemo","useThemeName","useTouchSurface","defaultKnobs","resolveKnobs","usePresetContext","defaultIntents","clampSurfaceSize","SurfaceContext","usePrefersReducedMotion","_type_of","obj","Symbol","constructor","IntentContext","useIntentContext","solidButtonIntents","Set","solidPaletteThemes","useResolvedKnobs","options","_ref","_ref1","_ref2","_ref3","_ref4","touch","presetCtx","contextIntent","prefersReducedMotion","themeName","scheme","startsWith","surfaceCtx","useStyledContext","surfaceSize","size","painted","intent","component","override","sizeOverride","baseKnobs","preset","knobs","overrides","merged","_ref5","intentOverrides","intents","knobOverrides","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","iterator","_step","next","done","key","value","err","return","componentOverride","animation","sizeToken","resolved","String","has","labelColor","fillStyle","knobProps","body","color"],"sources":["useResolvedKnobs.native.js"],"sourcesContent":["import { createContext, useContext, useMemo } from \"react\";\nimport { useThemeName } from \"tamagui\";\nimport { useTouchSurface } from \"./useTouchSurface\";\nimport { defaultKnobs } from \"./knobs\";\nimport { resolveKnobs } from \"./resolveKnobs\";\nimport { usePresetContext } from \"./PresetContext\";\nimport { defaultIntents } from \"./intents\";\nimport { clampSurfaceSize, SurfaceContext } from \"./Surface\";\nimport { usePrefersReducedMotion } from \"./reducedMotion\";\nfunction _type_of(obj) {\n  \"@swc/helpers - typeof\";\n  return obj && typeof Symbol !== \"undefined\" && obj.constructor === Symbol ? \"symbol\" : typeof obj;\n}\nvar IntentContext = createContext(null);\nfunction useIntentContext() {\n  return useContext(IntentContext);\n}\nvar solidButtonIntents = /* @__PURE__ */ new Set([\n  \"error\",\n  \"warning\",\n  \"success\"\n]);\nvar solidPaletteThemes = /* @__PURE__ */ new Set([\n  \"accent\"\n]);\nfunction useResolvedKnobs(options) {\n  var _ref, _ref1, _ref2, _ref3, _ref4;\n  var touch = useTouchSurface();\n  var presetCtx = usePresetContext();\n  var contextIntent = useIntentContext();\n  var prefersReducedMotion = usePrefersReducedMotion();\n  var themeName = useThemeName();\n  var scheme = (themeName === null || themeName === void 0 ? void 0 : themeName.startsWith(\"dark\")) ? \"dark\" : \"light\";\n  var surfaceCtx = SurfaceContext.useStyledContext();\n  var surfaceSize = (_ref = surfaceCtx === null || surfaceCtx === void 0 ? void 0 : surfaceCtx.size) !== null && _ref !== void 0 ? _ref : \"unset\";\n  var painted = (_ref1 = (_ref2 = options === null || options === void 0 ? void 0 : options.painted) !== null && _ref2 !== void 0 ? _ref2 : surfaceCtx === null || surfaceCtx === void 0 ? void 0 : surfaceCtx.painted) !== null && _ref1 !== void 0 ? _ref1 : false;\n  var intent = (_ref3 = (_ref4 = options === null || options === void 0 ? void 0 : options.intent) !== null && _ref4 !== void 0 ? _ref4 : contextIntent) !== null && _ref3 !== void 0 ? _ref3 : void 0;\n  var component = options === null || options === void 0 ? void 0 : options.component;\n  var override = options === null || options === void 0 ? void 0 : options.override;\n  var sizeOverride = options === null || options === void 0 ? void 0 : options.size;\n  return useMemo(function() {\n    var baseKnobs = presetCtx ? {\n      ...presetCtx.preset.knobs,\n      ...presetCtx.overrides\n    } : {\n      ...defaultKnobs\n    };\n    var merged = baseKnobs;\n    if (intent) {\n      var _ref5;\n      var intentOverrides = (_ref5 = presetCtx === null || presetCtx === void 0 ? void 0 : presetCtx.preset.intents[intent]) !== null && _ref5 !== void 0 ? _ref5 : defaultIntents[intent];\n      if (intentOverrides) {\n        var knobOverrides = {};\n        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n        try {\n          for (var _iterator = Object.entries(intentOverrides)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n            var [key, value] = _step.value;\n            if (typeof value === \"string\") {\n              knobOverrides[key] = value;\n            }\n          }\n        } catch (err) {\n          _didIteratorError = true;\n          _iteratorError = err;\n        } finally {\n          try {\n            if (!_iteratorNormalCompletion && _iterator.return != null) {\n              _iterator.return();\n            }\n          } finally {\n            if (_didIteratorError) {\n              throw _iteratorError;\n            }\n          }\n        }\n        merged = {\n          ...merged,\n          ...knobOverrides\n        };\n        if (component) {\n          var componentOverride = intentOverrides[component];\n          if (componentOverride && (typeof componentOverride === \"undefined\" ? \"undefined\" : _type_of(componentOverride)) === \"object\") {\n            merged = {\n              ...merged,\n              ...componentOverride\n            };\n          }\n        }\n      }\n    }\n    if (prefersReducedMotion) {\n      merged = {\n        ...merged,\n        animation: \"none\"\n      };\n    }\n    var sizeToken = clampSurfaceSize(sizeOverride !== null && sizeOverride !== void 0 ? sizeOverride : \"unset\", surfaceSize);\n    var resolved = resolveKnobs(merged, override, scheme, {\n      touch,\n      sizeToken: sizeToken === \"unset\" ? void 0 : String(sizeToken),\n      painted\n    });\n    if (intent && component === \"Button\" && solidButtonIntents.has(intent)) {\n      var labelColor = merged.fillStyle === \"filled\" ? \"$color\" : \"$color11\";\n      return {\n        ...resolved,\n        knobProps: {\n          ...resolved.knobProps,\n          body: {\n            ...resolved.knobProps.body,\n            color: labelColor\n          }\n        }\n      };\n    }\n    return resolved;\n  }, [\n    presetCtx,\n    intent,\n    component,\n    override,\n    sizeOverride,\n    prefersReducedMotion,\n    surfaceSize,\n    painted,\n    scheme,\n    touch\n  ]);\n}\nexport {\n  IntentContext,\n  solidButtonIntents,\n  solidPaletteThemes,\n  useIntentContext,\n  useResolvedKnobs\n};\n//# sourceMappingURL=useResolvedKnobs.js.map\n"],"mappings":"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","ignoreList":[]}

package/dist/esm/theme/useTouchSurface.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isTouchable","isWeb","isWebTouchable","useDidFinishSSR","useTouchSurface","didFinishSSR"],"sources":["../../../src/theme/useTouchSurface.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,EAAaC,KAAA,EAAOC,cAAA,QAAsB;AACnD,SAASC,eAAA,QAAuB;AAGzB,SAASC,gBAAA,EAA2B;EACzC,IAAAC,YAAM,GAAAF,eAAe;EACrB,QAAQ,CAACF,KAAA,IAASI,YAAA,MAAkBL,WAAA,IAAeE,cAAA;AACrD","ignoreList":[]}
+{"version":3,"names":["isTouchable","isWeb","isWebTouchable","useDidFinishSSR","useTouchSurface","didFinishSSR"],"sources":["useTouchSurface.native.js"],"sourcesContent":["import { isTouchable, isWeb, isWebTouchable } from \"@multiplatform.one/platform\";\nimport { useDidFinishSSR } from \"tamagui\";\nfunction useTouchSurface() {\n  var didFinishSSR = useDidFinishSSR();\n  return (!isWeb || didFinishSSR) && (isTouchable || isWebTouchable);\n}\nexport {\n  useTouchSurface\n};\n//# sourceMappingURL=useTouchSurface.js.map\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,KAAK,EAAEC,cAAc,QAAQ,6BAA6B;AAChF,SAASC,eAAe,QAAQ,SAAS;AACzC,SAASC,eAAeA,CAAA,EAAG;EACzB,IAAIC,YAAY,GAAGF,eAAe,CAAC,CAAC;EACpC,OAAO,CAAC,CAACF,KAAK,IAAII,YAAY,MAAML,WAAW,IAAIE,cAAc,CAAC;AACpE;AACA,SACEE,eAAe","ignoreList":[]}

package/dist/esm/theme/v3TokenRoles.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["v3TokenRoles","backgroundChrome","backgroundStrong","backgroundSunk","backgroundScrim","hairline","hairlineStrong","colorSubtle","colorMuted","colorInverse","grabColor","good","goodSoft","warning","warningSoft","critical","criticalSoft","info","idle","accentSoft","accentOn","accentText","accentBorder","spark","wall1","wall2","wall3","wall4","plate","plateBorder","plateInk","platePaper","platePewter","plateRingHi","plateRingLo","stoppedWash"],"sources":["../../../src/theme/v3TokenRoles.ts"],"sourcesContent":[null],"mappings":"AAYO,IAAAA,YAAM;EACXC,gBAAA,EAAkB;EAClBC,gBAAA,EAAkB;EAClBC,cAAA,EAAgB;EAChBC,eAAA,EAAiB;EACjBC,QAAA,EAAU;EACVC,cAAA,EAAgB;EAChBC,WAAA,EAAa;EACbC,UAAA,EAAY;EACZC,YAAA,EAAc;EACdC,SAAA,EAAW;EACXC,IAAA,EAAM;EACNC,QAAA,EAAU;EACVC,OAAA,EAAS;EACTC,WAAA,EAAa;EACbC,QAAA,EAAU;EACVC,YAAA,EAAc;EACdC,IAAA,EAAM;EACNC,IAAA,EAAM;EACNC,UAAA,EAAY;EACZC,QAAA,EAAU;EACVC,UAAA,EAAY;EACZC,YAAA,EAAc;EACdC,KAAA,EAAO;EACPC,KAAA,EAAO;EACPC,KAAA,EAAO;EACPC,KAAA,EAAO;EACPC,KAAA,EAAO;EACPC,KAAA,EAAO;EACPC,WAAA,EAAa;EACbC,QAAA,EAAU;EACVC,UAAA,EAAY;EACZC,WAAA,EAAa;EACbC,WAAA,EAAa;EACbC,WAAA,EAAa;EACbC,WAAA,EAAa;AACf","ignoreList":[]}
+{"version":3,"names":["v3TokenRoles","backgroundChrome","backgroundStrong","backgroundSunk","backgroundScrim","hairline","hairlineStrong","colorSubtle","colorMuted","colorInverse","grabColor","good","goodSoft","warning","warningSoft","critical","criticalSoft","info","idle","accentSoft","accentOn","accentText","accentBorder","spark","wall1","wall2","wall3","wall4","plate","plateBorder","plateInk","platePaper","platePewter","plateRingHi","plateRingLo","stoppedWash"],"sources":["v3TokenRoles.native.js"],"sourcesContent":["var v3TokenRoles = {\n  backgroundChrome: \"background\",\n  backgroundStrong: \"color3\",\n  backgroundSunk: \"color3\",\n  backgroundScrim: \"shadow4\",\n  hairline: \"borderColorHairline\",\n  hairlineStrong: \"borderColor\",\n  colorSubtle: \"textMuted\",\n  colorMuted: \"textMuted\",\n  colorInverse: \"color1\",\n  grabColor: \"color8\",\n  good: \"green9\",\n  goodSoft: \"green3\",\n  warning: \"yellow9\",\n  warningSoft: \"yellow3\",\n  critical: \"red9\",\n  criticalSoft: \"red3\",\n  info: \"blue9\",\n  idle: \"textMuted\",\n  accentSoft: \"selectedBackground\",\n  accentOn: \"accentColor\",\n  accentText: \"selectedColor\",\n  accentBorder: \"accentBackground\",\n  spark: \"accentBackground\",\n  wall1: \"springboard\",\n  wall2: \"springboard\",\n  wall3: \"springboard\",\n  wall4: \"springboard\",\n  plate: \"springboard\",\n  plateBorder: \"springboard\",\n  plateInk: \"springboard\",\n  platePaper: \"springboard\",\n  platePewter: \"springboard\",\n  plateRingHi: \"springboard\",\n  plateRingLo: \"springboard\",\n  stoppedWash: \"springboard\"\n};\nexport {\n  v3TokenRoles\n};\n//# sourceMappingURL=v3TokenRoles.js.map\n"],"mappings":"AAAA,IAAIA,YAAY,GAAG;EACjBC,gBAAgB,EAAE,YAAY;EAC9BC,gBAAgB,EAAE,QAAQ;EAC1BC,cAAc,EAAE,QAAQ;EACxBC,eAAe,EAAE,SAAS;EAC1BC,QAAQ,EAAE,qBAAqB;EAC/BC,cAAc,EAAE,aAAa;EAC7BC,WAAW,EAAE,WAAW;EACxBC,UAAU,EAAE,WAAW;EACvBC,YAAY,EAAE,QAAQ;EACtBC,SAAS,EAAE,QAAQ;EACnBC,IAAI,EAAE,QAAQ;EACdC,QAAQ,EAAE,QAAQ;EAClBC,OAAO,EAAE,SAAS;EAClBC,WAAW,EAAE,SAAS;EACtBC,QAAQ,EAAE,MAAM;EAChBC,YAAY,EAAE,MAAM;EACpBC,IAAI,EAAE,OAAO;EACbC,IAAI,EAAE,WAAW;EACjBC,UAAU,EAAE,oBAAoB;EAChCC,QAAQ,EAAE,aAAa;EACvBC,UAAU,EAAE,eAAe;EAC3BC,YAAY,EAAE,kBAAkB;EAChCC,KAAK,EAAE,kBAAkB;EACzBC,KAAK,EAAE,aAAa;EACpBC,KAAK,EAAE,aAAa;EACpBC,KAAK,EAAE,aAAa;EACpBC,KAAK,EAAE,aAAa;EACpBC,KAAK,EAAE,aAAa;EACpBC,WAAW,EAAE,aAAa;EAC1BC,QAAQ,EAAE,aAAa;EACvBC,UAAU,EAAE,aAAa;EACzBC,WAAW,EAAE,aAAa;EAC1BC,WAAW,EAAE,aAAa;EAC1BC,WAAW,EAAE,aAAa;EAC1BC,WAAW,EAAE;AACf,CAAC;AACD,SACEnC,YAAY","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/theme",
-  "version": "9.0.1",
+  "version": "9.0.3",
   "description": "Tamagui theme system for multiplatform.one",
   "keywords": [
     "multiplatform",
@@ -163,8 +163,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@multiplatform.one/platform": "^9.0.1",
-    "@multiplatform.one/store": "^9.0.1",
+    "@multiplatform.one/platform": "^9.0.3",
+    "@multiplatform.one/store": "^9.0.3",
     "@tamagui/animations-react-native": "2.7.6",
     "@tamagui/colors": "2.7.6",
     "@tamagui/config": "2.7.6",
@@ -180,8 +180,8 @@
   },
   "devDependencies": {
     "@expo/prebuild-config": "55.0.18",
-    "@multiplatform.one/config": "9.0.1",
-    "@multiplatform.one/test-utils": "9.0.1",
+    "@multiplatform.one/config": "9.0.3",
+    "@multiplatform.one/test-utils": "9.0.3",
     "@tamagui/animations-css": "2.7.6",
     "@tamagui/animations-reanimated": "2.7.6",
     "@tamagui/build": "2.7.6",

package/src/theme/createThemes.ts

@@ -447,55 +447,79 @@ function holdSelectionSurface(
  * change moves them with it. Edge states keep their offsets from the medium
  * edge. Light keeps v5's edges.
  */
+function ownerScope(scopes: string[], name: string): string {
+  return scopes
+    .filter((scope) => name === scope || name.startsWith(`${scope}_`))
+    .reduce((longest, scope) => (scope.length > longest.length ? scope : longest), "");
+}
+
+function clearsDarkGrounds(color: string | undefined, grounds: number[]): boolean {
+  const brightest = Math.max(...grounds);
+  const luminance = luminanceOf(color);
+  return (
+    luminance !== null &&
+    luminance > brightest &&
+    grounds.every((ground) => contrastRatio(luminance, ground) >= darkHairlineContrast)
+  );
+}
+
+interface DarkHairline {
+  ramp: (string | undefined)[];
+  hairline: number;
+}
+
+function darkHairlineOf(scope: Record<string, string>): DarkHairline | undefined {
+  const ramp = Array.from({ length: 12 }, (_, index) => scope[`color${index + 1}`]);
+  const grounds = [scope.background, scope.color4].map((color) => luminanceOf(color));
+  if (grounds.some((ground) => ground === null)) return undefined;
+  const hairline = ramp.findIndex(
+    (color, index) => index < 11 && clearsDarkGrounds(color, grounds as number[]),
+  );
+  return hairline < 0 ? undefined : { ramp, hairline };
+}
+
+const darkEdgeStateKeys = [
+  "borderColor",
+  "borderColorHover",
+  "borderColorFocus",
+  "borderColorPress",
+];
+
+function darkEdgesOf(
+  name: string,
+  theme: Record<string, string>,
+  scopeName: string,
+  scope: Record<string, string>,
+  { ramp, hairline }: DarkHairline,
+): Record<string, string> {
+  const medium = hairline + 1;
+  const surface = name === scopeName || theme.background === scope.color4;
+  const step = ramp.indexOf(theme.borderColor);
+  const shift = surface && step >= 0 ? medium - step : 0;
+  const moved: Record<string, string> = {};
+  if ("borderColorHairline" in theme || name === scopeName)
+    moved.borderColorHairline = ramp[hairline]!;
+  if (shift <= 0) return moved;
+  for (const key of darkEdgeStateKeys) {
+    const at = ramp.indexOf(theme[key]);
+    if (at >= 0) moved[key] = ramp[Math.min(11, at + shift)]!;
+  }
+  return moved;
+}
+
 function holdDarkEdges(
   themes: Record<string, Record<string, string>>,
 ): Record<string, Record<string, string>> {
   const out: Record<string, Record<string, string>> = { ...themes };
   const scopes = Object.keys(themes).filter((name) => /^dark(_[a-z]+)?$/.test(name));
-  const ownerOf = (name: string) =>
-    scopes
-      .filter((scope) => name === scope || name.startsWith(`${scope}_`))
-      .reduce((longest, scope) => (scope.length > longest.length ? scope : longest), "");
   for (const scopeName of scopes) {
     if (/_(accent|active)$/.test(scopeName)) continue;
     const scope = themes[scopeName]!;
-    const ramp = Array.from({ length: 12 }, (_, index) => scope[`color${index + 1}`]);
-    const grounds = [scope.background, scope.color4].map((color) => luminanceOf(color));
-    if (grounds.some((ground) => ground === null)) continue;
-    const brightest = Math.max(...(grounds as number[]));
-    const clears = (color: string | undefined) => {
-      const luminance = luminanceOf(color);
-      return (
-        luminance !== null &&
-        luminance > brightest &&
-        (grounds as number[]).every(
-          (ground) => contrastRatio(luminance, ground) >= darkHairlineContrast,
-        )
-      );
-    };
-    const hairline = ramp.findIndex((color, index) => index < 11 && clears(color));
-    if (hairline < 0) continue;
-    const medium = hairline + 1;
+    const pick = darkHairlineOf(scope);
+    if (!pick) continue;
     for (const [name, theme] of Object.entries(themes)) {
-      if (ownerOf(name) !== scopeName) continue;
-      const surface = name === scopeName || theme.background === scope.color4;
-      const step = ramp.indexOf(theme.borderColor);
-      const shift = surface && step >= 0 ? medium - step : 0;
-      const moved: Record<string, string> = {};
-      if ("borderColorHairline" in theme || name === scopeName)
-        moved.borderColorHairline = ramp[hairline]!;
-      if (shift > 0) {
-        for (const key of [
-          "borderColor",
-          "borderColorHover",
-          "borderColorFocus",
-          "borderColorPress",
-        ]) {
-          const at = ramp.indexOf(theme[key]);
-          if (at >= 0) moved[key] = ramp[Math.min(11, at + shift)]!;
-        }
-      }
-      out[name] = { ...out[name], ...moved };
+      if (ownerScope(scopes, name) !== scopeName) continue;
+      out[name] = { ...out[name], ...darkEdgesOf(name, theme, scopeName, scope, pick) };
     }
   }
   return out;
@@ -512,63 +536,132 @@ function holdDarkEdges(
  * Picks sit on the scheme roots and a scope overrides only where its own
  * differs: one copy per component sub-theme overruns the CSS budget.
  */
+function firstClearing(neutral: string[], grounds: (string | undefined)[]): number {
+  const lums = grounds.map((ground) => luminanceOf(ground));
+  if (lums.some((lum) => lum === null)) return -1;
+  const darkest = Math.min(...(lums as number[]));
+  const brightest = Math.max(...(lums as number[]));
+  const light = isLightGround(grounds[0]!);
+  return neutral.findIndex((color) => {
+    const lum = luminanceOf(color);
+    return (
+      lum !== null &&
+      (light ? lum < darkest : lum > brightest) &&
+      (lums as number[]).every((ground) => contrastRatio(lum, ground) >= minContrastRatio)
+    );
+  });
+}
+
+function inheritedValue(
+  out: Record<string, Record<string, string>>,
+  themes: Record<string, Record<string, string>>,
+  name: string,
+  key: string,
+): string | undefined {
+  for (let at = name; at; at = at.slice(0, Math.max(0, at.lastIndexOf("_")))) {
+    const value = (out[at] ?? themes[at])?.[key];
+    if (value !== undefined) return value;
+    if (!at.includes("_")) break;
+  }
+  return undefined;
+}
+
+function nearestStep(ramp: (string | undefined)[], color: string | undefined): number {
+  const lum = luminanceOf(color);
+  if (lum === null) return -1;
+  return ramp.reduce(
+    (best, step, index) =>
+      Math.abs((luminanceOf(step) ?? 2) - lum) < Math.abs((luminanceOf(ramp[best]) ?? 2) - lum)
+        ? index
+        : best,
+    0,
+  );
+}
+
+interface FieldEdges {
+  borderColorField: string;
+  borderColorFieldHover: string;
+}
+
+function fieldEdgesOf(
+  themes: Record<string, Record<string, string>>,
+  out: Record<string, Record<string, string>>,
+  neutral: string[],
+  scopeName: string,
+): FieldEdges | undefined {
+  const scope = themes[scopeName]!;
+  const field = `${scopeName}_Input`;
+  const edge = firstClearing(neutral, [
+    scope.background,
+    inheritedValue(out, themes, field, "background"),
+  ]);
+  if (edge < 0) return undefined;
+  const ramp = Array.from({ length: 12 }, (_, index) => scope[`color${index + 1}`]);
+  const rest = nearestStep(ramp, inheritedValue(out, themes, field, "borderColor"));
+  const hover = nearestStep(ramp, inheritedValue(out, themes, field, "borderColorHover"));
+  return {
+    borderColorField: neutral[edge]!,
+    borderColorFieldHover: neutral[Math.min(11, Math.max(edge, edge + hover - rest))]!,
+  };
+}
+
+function intentFieldEdges(
+  themes: Record<string, Record<string, string>>,
+  out: Record<string, Record<string, string>>,
+  scopeName: string,
+  pages: (string | undefined)[],
+): FieldEdges {
+  const scope = themes[scopeName]!;
+  const field = `${scopeName}_Input`;
+  const ramp = Array.from({ length: 12 }, (_, index) => scope[`color${index + 1}`]!);
+  const edge = firstClearing(ramp, [...pages, inheritedValue(out, themes, field, "background")]);
+  if (edge < 0)
+    return {
+      borderColorField: inheritedValue(out, themes, field, "borderColor")!,
+      borderColorFieldHover: inheritedValue(out, themes, field, "borderColorHover")!,
+    };
+  return { borderColorField: ramp[edge]!, borderColorFieldHover: ramp[Math.min(11, edge + 1)]! };
+}
+
+interface ControlEdgeRoot {
+  scheme: "light" | "dark";
+  neutral: string[];
+  pages: (string | undefined)[];
+  rootFields: FieldEdges;
+  rootControl: number;
+}
+
+function controlEdgePatch(
+  themes: Record<string, Record<string, string>>,
+  out: Record<string, Record<string, string>>,
+  scopeName: string,
+  { scheme, neutral, pages, rootFields, rootControl }: ControlEdgeRoot,
+): Record<string, string> {
+  const scope = themes[scopeName]!;
+  const patch: Record<string, string> = {};
+  if (scheme === "dark" && "switchTrackOff" in scope)
+    patch.switchTrackOffBorder = scope.switchTrackOff!;
+  if (semanticIntentNames.has(scopeName.slice(scheme.length + 1)))
+    return Object.assign(patch, intentFieldEdges(themes, out, scopeName, pages));
+  const fields = fieldEdgesOf(themes, out, neutral, scopeName);
+  if (fields) {
+    for (const [key, value] of Object.entries(fields))
+      if (value !== rootFields[key as keyof FieldEdges]) patch[key] = value;
+  }
+  const control = firstClearing(neutral, [scope.background]);
+  if (control >= 0 && control !== rootControl) patch.borderColorControl = neutral[control]!;
+  return patch;
+}
+
 function holdControlEdges(
   themes: Record<string, Record<string, string>>,
 ): Record<string, Record<string, string>> {
   const out: Record<string, Record<string, string>> = { ...themes };
-  const firstClearing = (neutral: string[], grounds: (string | undefined)[]) => {
-    const lums = grounds.map((ground) => luminanceOf(ground));
-    if (lums.some((lum) => lum === null)) return -1;
-    const darkest = Math.min(...(lums as number[]));
-    const brightest = Math.max(...(lums as number[]));
-    const light = isLightGround(grounds[0]!);
-    return neutral.findIndex((color) => {
-      const lum = luminanceOf(color);
-      return (
-        lum !== null &&
-        (light ? lum < darkest : lum > brightest) &&
-        (lums as number[]).every((ground) => contrastRatio(lum, ground) >= minContrastRatio)
-      );
-    });
-  };
-  const resolved = (name: string, key: string): string | undefined => {
-    for (let at = name; at; at = at.slice(0, Math.max(0, at.lastIndexOf("_")))) {
-      const value = (out[at] ?? themes[at])?.[key];
-      if (value !== undefined) return value;
-      if (!at.includes("_")) break;
-    }
-    return undefined;
-  };
   for (const scheme of ["light", "dark"] as const) {
     const root = themes[scheme];
     if (!root) continue;
     const neutral = Array.from({ length: 12 }, (_, index) => root[`color${index + 1}`]!);
-    const fieldEdges = (scopeName: string) => {
-      const scope = themes[scopeName]!;
-      const field = `${scopeName}_Input`;
-      const edge = firstClearing(neutral, [scope.background, resolved(field, "background")]);
-      if (edge < 0) return undefined;
-      const ramp = Array.from({ length: 12 }, (_, index) => scope[`color${index + 1}`]);
-      const stepOf = (color: string | undefined) => {
-        const lum = luminanceOf(color);
-        if (lum === null) return -1;
-        return ramp.reduce(
-          (best, step, index) =>
-            Math.abs((luminanceOf(step) ?? 2) - lum) <
-            Math.abs((luminanceOf(ramp[best]) ?? 2) - lum)
-              ? index
-              : best,
-          0,
-        );
-      };
-      const rest = stepOf(resolved(field, "borderColor"));
-      const hover = stepOf(resolved(field, "borderColorHover"));
-      return {
-        borderColorField: neutral[edge]!,
-        borderColorFieldHover: neutral[Math.min(11, Math.max(edge, edge + hover - rest))]!,
-      };
-    };
-    const rootFields = fieldEdges(scheme);
+    const rootFields = fieldEdgesOf(themes, out, neutral, scheme);
     const rootControl = firstClearing(neutral, [root.background]);
     if (!rootFields || rootControl < 0) continue;
     out[scheme] = {
@@ -586,27 +679,9 @@ function holdControlEdges(
         .filter((name) => !semanticIntentNames.has(name.slice(scheme.length + 1)))
         .map((name) => themes[name]!.background),
     ];
+    const context: ControlEdgeRoot = { scheme, neutral, pages, rootFields, rootControl };
     for (const scopeName of scopes) {
-      const scope = themes[scopeName]!;
-      const patch: Record<string, string> = {};
-      if (scheme === "dark" && "switchTrackOff" in scope)
-        patch.switchTrackOffBorder = scope.switchTrackOff!;
-      if (semanticIntentNames.has(scopeName.slice(scheme.length + 1))) {
-        const field = `${scopeName}_Input`;
-        const ramp = Array.from({ length: 12 }, (_, index) => scope[`color${index + 1}`]!);
-        const edge = firstClearing(ramp, [...pages, resolved(field, "background")]);
-        patch.borderColorField = edge < 0 ? resolved(field, "borderColor")! : ramp[edge]!;
-        patch.borderColorFieldHover =
-          edge < 0 ? resolved(field, "borderColorHover")! : ramp[Math.min(11, edge + 1)]!;
-      } else {
-        const fields = fieldEdges(scopeName);
-        if (fields) {
-          for (const [key, value] of Object.entries(fields))
-            if (value !== rootFields[key as keyof typeof rootFields]) patch[key] = value;
-        }
-        const control = firstClearing(neutral, [scope.background]);
-        if (control >= 0 && control !== rootControl) patch.borderColorControl = neutral[control]!;
-      }
+      const patch = controlEdgePatch(themes, out, scopeName, context);
       if (Object.keys(patch).length > 0) out[scopeName] = { ...out[scopeName], ...patch };
     }
   }
@@ -753,26 +828,33 @@ function holdSwitchTrack(
     // root's off track leaves the band or the plate floor there.
     for (const intent of semanticIntentNames) {
       const scope = themes[`${scheme}_${intent}`];
-      const off = luminanceOf(paint.switchTrackOff);
-      if (!scope?.color4 || !scope.color5 || off === null) continue;
-      const holds =
-        inSwitchOffBand(paint.switchTrackOff, scope.color4) &&
-        [scope.color4, scope.color5].every(
-          (ground) => contrastRatio(off, luminanceOf(ground) ?? off) >= plateContrastRatio,
-        );
-      if (holds) continue;
-      const track = switchTrackPaint(
-        base,
-        scope.accentBackground ?? base.accentBackground,
-        scope.color4,
-        [base.color4, scope.color4, scope.color5],
-      );
+      const track = intentSwitchTrack(base, scope, paint);
       if (track) out[`${scheme}_${intent}`] = { ...scope, ...track };
     }
   }
   return out;
 }
 
+function intentSwitchTrack(
+  base: Record<string, string>,
+  scope: Record<string, string> | undefined,
+  paint: Record<string, string>,
+): Record<string, string> | undefined {
+  const off = luminanceOf(paint.switchTrackOff);
+  if (!scope?.color4 || !scope.color5 || off === null) return undefined;
+  const holds =
+    inSwitchOffBand(paint.switchTrackOff, scope.color4) &&
+    [scope.color4, scope.color5].every(
+      (ground) => contrastRatio(off, luminanceOf(ground) ?? off) >= plateContrastRatio,
+    );
+  if (holds) return undefined;
+  return switchTrackPaint(base, scope.accentBackground ?? base.accentBackground, scope.color4, [
+    base.color4,
+    scope.color4,
+    scope.color5,
+  ]);
+}
+
 interface SwitchTrackCandidate {
   color: string;
   lum: number;
@@ -1079,14 +1161,12 @@ function holdColorThemeAccent(
           (isLightGround(scope.background) ? [] : [scope.color4, scope.color5]).every(
             (ground) => contrastRatio(rootOn, luminanceOf(ground) ?? rootOn) >= plateContrastRatio,
           ));
+      const trackGrounds = isLightGround(scope.background)
+        ? []
+        : [base.color4, scope.color4, scope.color5];
       const track = rootHolds
         ? undefined
-        : switchTrackPaint(
-            base,
-            fill,
-            switchGround,
-            isLightGround(scope.background) ? [] : [base.color4, scope.color4, scope.color5],
-          );
+        : switchTrackPaint(base, fill, switchGround, trackGrounds);
       for (const [name, theme] of Object.entries(themes)) {
         if (name === scopeName) {
           out[name] = { ...theme, ...accent, ...track };
@@ -1236,25 +1316,37 @@ function holdHouseIdentityInk(
     const base = themes[scheme];
     const blueInk = themes[`${scheme}_blue`]?.identityInk;
     if (!base?.identityInk || !blueInk || base.identityInk === blueInk) continue;
-    const held = Array.from({ length: 12 }, (_, index) => index + 1).every(
-      (step) =>
-        base[`accent${step}`] !== undefined && base[`accent${step}`] === base[`blue${step}`],
-    );
-    if (!held) continue;
+    if (!accentIsBlue(base)) continue;
     for (const [name, theme] of Object.entries(themes)) {
-      if (name !== scheme && !name.startsWith(`${scheme}_`)) continue;
-      const scope = name.split("_")[1];
-      if (scope === "accent" || (childrenHues as readonly string[]).includes(scope)) continue;
-      if (theme.identityInk !== base.identityInk) continue;
-      const values = resolveThemeThroughParents(themes, name);
-      if (pickIdentityInk([blueInk], pageSurfaces(name, values)) === blueInk) {
+      if (takesBlueInk(themes, scheme, name, theme, base, blueInk))
         out[name] = { ...theme, identityInk: blueInk };
-      }
     }
   }
   return out;
 }
 
+function accentIsBlue(base: Record<string, string>): boolean {
+  return Array.from({ length: 12 }, (_, index) => index + 1).every(
+    (step) => base[`accent${step}`] !== undefined && base[`accent${step}`] === base[`blue${step}`],
+  );
+}
+
+function takesBlueInk(
+  themes: Record<string, Record<string, string>>,
+  scheme: "light" | "dark",
+  name: string,
+  theme: Record<string, string>,
+  base: Record<string, string>,
+  blueInk: string,
+): boolean {
+  if (name !== scheme && !name.startsWith(`${scheme}_`)) return false;
+  const scope = name.split("_")[1];
+  if (scope === "accent" || (childrenHues as readonly string[]).includes(scope)) return false;
+  if (theme.identityInk !== base.identityInk) return false;
+  const values = resolveThemeThroughParents(themes, name);
+  return pickIdentityInk([blueInk], pageSurfaces(name, values)) === blueInk;
+}
+
 const defaultLightShadows: Shadows = {
   shadow1: "rgba(0,0,0,0.04)",
   shadow2: "rgba(0,0,0,0.08)",

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