@wiajs/core 1.0.11 → 1.1.2

package/dist/{core.cmn.js → core.cjs}

@@ -1,6 +1,6 @@
 /*!
-  * wia core v1.0.10
-  * (c) 2015-2023 Sibyl Yu and contributors
+  * wia core v1.1.2
+  * (c) 2015-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 'use strict';
@@ -105,6 +105,10 @@ function clampInt(min, max, input) {
   return input < min ? min : input > max ? max : input;
 }
 
+function clampDouble(min, max, input) {
+  return input < min ? min : input > max ? max : input;
+}
+
 function sanitizeDegreesDouble(degrees) {
   return (degrees %= 360) < 0 && (degrees += 360), degrees;
 }
@@ -165,6 +169,10 @@ function yFromLstar(lstar) {
   return 100 * labInvf((lstar + 16) / 116);
 }
 
+function lstarFromY(y) {
+  return 116 * labF(y / 100) - 16;
+}
+
 function linearized(rgbComponent) {
   const normalized = rgbComponent / 255;
   return normalized <= .040449936 ? normalized / 12.92 * 100 : 100 * Math.pow((normalized + .055) / 1.055, 2.4);
@@ -246,6 +254,14 @@ class Cam16 {
     const alpha = 0 === this.chroma || 0 === this.j ? 0 : this.chroma / Math.sqrt(this.j / 100), t = Math.pow(alpha / Math.pow(1.64 - Math.pow(.29, viewingConditions.n), .73), 1 / .9), hRad = this.hue * Math.PI / 180, eHue = .25 * (Math.cos(hRad + 2) + 3.8), ac = viewingConditions.aw * Math.pow(this.j / 100, 1 / viewingConditions.c / viewingConditions.z), p1 = eHue * (5e4 / 13) * viewingConditions.nc * viewingConditions.ncb, p2 = ac / viewingConditions.nbb, hSin = Math.sin(hRad), hCos = Math.cos(hRad), gamma = 23 * (p2 + .305) * t / (23 * p1 + 11 * t * hCos + 108 * t * hSin), a = gamma * hCos, b = gamma * hSin, rA = (460 * p2 + 451 * a + 288 * b) / 1403, gA = (460 * p2 - 891 * a - 261 * b) / 1403, bA = (460 * p2 - 220 * a - 6300 * b) / 1403, rCBase = Math.max(0, 27.13 * Math.abs(rA) / (400 - Math.abs(rA))), rC = signum(rA) * (100 / viewingConditions.fl) * Math.pow(rCBase, 1 / .42), gCBase = Math.max(0, 27.13 * Math.abs(gA) / (400 - Math.abs(gA))), gC = signum(gA) * (100 / viewingConditions.fl) * Math.pow(gCBase, 1 / .42), bCBase = Math.max(0, 27.13 * Math.abs(bA) / (400 - Math.abs(bA))), bC = signum(bA) * (100 / viewingConditions.fl) * Math.pow(bCBase, 1 / .42), rF = rC / viewingConditions.rgbD[0], gF = gC / viewingConditions.rgbD[1], bF = bC / viewingConditions.rgbD[2];
     return argbFromXyz(1.86206786 * rF - 1.01125463 * gF + .14918677 * bF, .38752654 * rF + .62144744 * gF - .00897398 * bF, -.0158415 * rF - .03412294 * gF + 1.04996444 * bF);
   }
+  static fromXyzInViewingConditions(x, y, z, viewingConditions) {
+    const rC = .401288 * x + .650173 * y - .051461 * z, gC = -.250268 * x + 1.204414 * y + .045854 * z, bC = -.002079 * x + .048952 * y + .953127 * z, rD = viewingConditions.rgbD[0] * rC, gD = viewingConditions.rgbD[1] * gC, bD = viewingConditions.rgbD[2] * bC, rAF = Math.pow(viewingConditions.fl * Math.abs(rD) / 100, .42), gAF = Math.pow(viewingConditions.fl * Math.abs(gD) / 100, .42), bAF = Math.pow(viewingConditions.fl * Math.abs(bD) / 100, .42), rA = 400 * signum(rD) * rAF / (rAF + 27.13), gA = 400 * signum(gD) * gAF / (gAF + 27.13), bA = 400 * signum(bD) * bAF / (bAF + 27.13), a = (11 * rA + -12 * gA + bA) / 11, b = (rA + gA - 2 * bA) / 9, u = (20 * rA + 20 * gA + 21 * bA) / 20, p2 = (40 * rA + 20 * gA + bA) / 20, atanDegrees = 180 * Math.atan2(b, a) / Math.PI, hue = atanDegrees < 0 ? atanDegrees + 360 : atanDegrees >= 360 ? atanDegrees - 360 : atanDegrees, hueRadians = hue * Math.PI / 180, ac = p2 * viewingConditions.nbb, J = 100 * Math.pow(ac / viewingConditions.aw, viewingConditions.c * viewingConditions.z), Q = 4 / viewingConditions.c * Math.sqrt(J / 100) * (viewingConditions.aw + 4) * viewingConditions.fLRoot, huePrime = hue < 20.14 ? hue + 360 : hue, t = 5e4 / 13 * (1 / 4 * (Math.cos(huePrime * Math.PI / 180 + 2) + 3.8)) * viewingConditions.nc * viewingConditions.ncb * Math.sqrt(a * a + b * b) / (u + .305), alpha = Math.pow(t, .9) * Math.pow(1.64 - Math.pow(.29, viewingConditions.n), .73), C = alpha * Math.sqrt(J / 100), M = C * viewingConditions.fLRoot, s = 50 * Math.sqrt(alpha * viewingConditions.c / (viewingConditions.aw + 4)), jstar = (1 + 100 * .007) * J / (1 + .007 * J), mstar = Math.log(1 + .0228 * M) / .0228, astar = mstar * Math.cos(hueRadians), bstar = mstar * Math.sin(hueRadians);
+    return new Cam16(hue, C, J, Q, M, s, jstar, astar, bstar);
+  }
+  xyzInViewingConditions(viewingConditions) {
+    const alpha = 0 === this.chroma || 0 === this.j ? 0 : this.chroma / Math.sqrt(this.j / 100), t = Math.pow(alpha / Math.pow(1.64 - Math.pow(.29, viewingConditions.n), .73), 1 / .9), hRad = this.hue * Math.PI / 180, eHue = .25 * (Math.cos(hRad + 2) + 3.8), ac = viewingConditions.aw * Math.pow(this.j / 100, 1 / viewingConditions.c / viewingConditions.z), p1 = eHue * (5e4 / 13) * viewingConditions.nc * viewingConditions.ncb, p2 = ac / viewingConditions.nbb, hSin = Math.sin(hRad), hCos = Math.cos(hRad), gamma = 23 * (p2 + .305) * t / (23 * p1 + 11 * t * hCos + 108 * t * hSin), a = gamma * hCos, b = gamma * hSin, rA = (460 * p2 + 451 * a + 288 * b) / 1403, gA = (460 * p2 - 891 * a - 261 * b) / 1403, bA = (460 * p2 - 220 * a - 6300 * b) / 1403, rCBase = Math.max(0, 27.13 * Math.abs(rA) / (400 - Math.abs(rA))), rC = signum(rA) * (100 / viewingConditions.fl) * Math.pow(rCBase, 1 / .42), gCBase = Math.max(0, 27.13 * Math.abs(gA) / (400 - Math.abs(gA))), gC = signum(gA) * (100 / viewingConditions.fl) * Math.pow(gCBase, 1 / .42), bCBase = Math.max(0, 27.13 * Math.abs(bA) / (400 - Math.abs(bA))), bC = signum(bA) * (100 / viewingConditions.fl) * Math.pow(bCBase, 1 / .42), rF = rC / viewingConditions.rgbD[0], gF = gC / viewingConditions.rgbD[1], bF = bC / viewingConditions.rgbD[2];
+    return [ 1.86206786 * rF - 1.01125463 * gF + .14918677 * bF, .38752654 * rF + .62144744 * gF - .00897398 * bF, -.0158415 * rF - .03412294 * gF + 1.04996444 * bF ];
+  }
 }
 
 class HctSolver {
@@ -406,6 +422,10 @@ class Hct {
     this.internalHue = cam.hue, this.internalChroma = cam.chroma, this.internalTone = lstarFromArgb(argb), 
     this.argb = argb;
   }
+  inViewingConditions(vc) {
+    const viewedInVc = Cam16.fromInt(this.toInt()).xyzInViewingConditions(vc), recastInVc = Cam16.fromXyzInViewingConditions(viewedInVc[0], viewedInVc[1], viewedInVc[2], ViewingConditions.make());
+    return Hct.from(recastInVc.hue, recastInVc.chroma, lstarFromY(viewedInVc[1]));
+  }
 }
 
 class Blend {
@@ -423,22 +443,562 @@ class Blend {
   }
 }
 
+class Contrast {
+  static ratioOfTones(toneA, toneB) {
+    return toneA = clampDouble(0, 100, toneA), toneB = clampDouble(0, 100, toneB), Contrast.ratioOfYs(yFromLstar(toneA), yFromLstar(toneB));
+  }
+  static ratioOfYs(y1, y2) {
+    const lighter = y1 > y2 ? y1 : y2;
+    return (lighter + 5) / ((lighter === y2 ? y1 : y2) + 5);
+  }
+  static lighter(tone, ratio) {
+    if (tone < 0 || tone > 100) return -1;
+    const darkY = yFromLstar(tone), lightY = ratio * (darkY + 5) - 5, realContrast = Contrast.ratioOfYs(lightY, darkY), delta = Math.abs(realContrast - ratio);
+    if (realContrast < ratio && delta > .04) return -1;
+    const returnValue = lstarFromY(lightY) + .4;
+    return returnValue < 0 || returnValue > 100 ? -1 : returnValue;
+  }
+  static darker(tone, ratio) {
+    if (tone < 0 || tone > 100) return -1;
+    const lightY = yFromLstar(tone), darkY = (lightY + 5) / ratio - 5, realContrast = Contrast.ratioOfYs(lightY, darkY), delta = Math.abs(realContrast - ratio);
+    if (realContrast < ratio && delta > .04) return -1;
+    const returnValue = lstarFromY(darkY) - .4;
+    return returnValue < 0 || returnValue > 100 ? -1 : returnValue;
+  }
+  static lighterUnsafe(tone, ratio) {
+    const lighterSafe = Contrast.lighter(tone, ratio);
+    return lighterSafe < 0 ? 100 : lighterSafe;
+  }
+  static darkerUnsafe(tone, ratio) {
+    const darkerSafe = Contrast.darker(tone, ratio);
+    return darkerSafe < 0 ? 0 : darkerSafe;
+  }
+}
+
+class DislikeAnalyzer {
+  static isDisliked(hct) {
+    const huePasses = Math.round(hct.hue) >= 90 && Math.round(hct.hue) <= 111, chromaPasses = Math.round(hct.chroma) > 16, tonePasses = Math.round(hct.tone) < 65;
+    return huePasses && chromaPasses && tonePasses;
+  }
+  static fixIfDisliked(hct) {
+    return DislikeAnalyzer.isDisliked(hct) ? Hct.from(hct.hue, hct.chroma, 70) : hct;
+  }
+}
+
+class DynamicColor {
+  static fromPalette(args) {
+    return new DynamicColor(args.name ?? "", args.palette, args.tone, args.isBackground ?? !1, args.background, args.secondBackground, args.contrastCurve, args.toneDeltaPair);
+  }
+  constructor(name, palette, tone, isBackground, background, secondBackground, contrastCurve, toneDeltaPair) {
+    if (this.name = name, this.palette = palette, this.tone = tone, this.isBackground = isBackground, 
+    this.background = background, this.secondBackground = secondBackground, this.contrastCurve = contrastCurve, 
+    this.toneDeltaPair = toneDeltaPair, this.hctCache = new Map, !background && secondBackground) throw new Error(`Color ${name} has secondBackgrounddefined, but background is not defined.`);
+    if (!background && contrastCurve) throw new Error(`Color ${name} has contrastCurvedefined, but background is not defined.`);
+    if (background && !contrastCurve) throw new Error(`Color ${name} has backgrounddefined, but contrastCurve is not defined.`);
+  }
+  getArgb(scheme) {
+    return this.getHct(scheme).toInt();
+  }
+  getHct(scheme) {
+    const cachedAnswer = this.hctCache.get(scheme);
+    if (null != cachedAnswer) return cachedAnswer;
+    const tone = this.getTone(scheme), answer = this.palette(scheme).getHct(tone);
+    return this.hctCache.size > 4 && this.hctCache.clear(), this.hctCache.set(scheme, answer), 
+    answer;
+  }
+  getTone(scheme) {
+    const decreasingContrast = scheme.contrastLevel < 0;
+    if (this.toneDeltaPair) {
+      const toneDeltaPair = this.toneDeltaPair(scheme), roleA = toneDeltaPair.roleA, roleB = toneDeltaPair.roleB, delta = toneDeltaPair.delta, polarity = toneDeltaPair.polarity, stayTogether = toneDeltaPair.stayTogether, bgTone = this.background(scheme).getTone(scheme), aIsNearer = "nearer" === polarity || "lighter" === polarity && !scheme.isDark || "darker" === polarity && scheme.isDark, nearer = aIsNearer ? roleA : roleB, farther = aIsNearer ? roleB : roleA, amNearer = this.name === nearer.name, expansionDir = scheme.isDark ? 1 : -1, nContrast = nearer.contrastCurve.getContrast(scheme.contrastLevel), fContrast = farther.contrastCurve.getContrast(scheme.contrastLevel), nInitialTone = nearer.tone(scheme);
+      let nTone = Contrast.ratioOfTones(bgTone, nInitialTone) >= nContrast ? nInitialTone : DynamicColor.foregroundTone(bgTone, nContrast);
+      const fInitialTone = farther.tone(scheme);
+      let fTone = Contrast.ratioOfTones(bgTone, fInitialTone) >= fContrast ? fInitialTone : DynamicColor.foregroundTone(bgTone, fContrast);
+      return decreasingContrast && (nTone = DynamicColor.foregroundTone(bgTone, nContrast), 
+      fTone = DynamicColor.foregroundTone(bgTone, fContrast)), (fTone - nTone) * expansionDir >= delta || (fTone = clampDouble(0, 100, nTone + delta * expansionDir), 
+      (fTone - nTone) * expansionDir >= delta || (nTone = clampDouble(0, 100, fTone - delta * expansionDir))), 
+      50 <= nTone && nTone < 60 ? expansionDir > 0 ? (nTone = 60, fTone = Math.max(fTone, nTone + delta * expansionDir)) : (nTone = 49, 
+      fTone = Math.min(fTone, nTone + delta * expansionDir)) : 50 <= fTone && fTone < 60 && (stayTogether ? expansionDir > 0 ? (nTone = 60, 
+      fTone = Math.max(fTone, nTone + delta * expansionDir)) : (nTone = 49, fTone = Math.min(fTone, nTone + delta * expansionDir)) : fTone = expansionDir > 0 ? 60 : 49), 
+      amNearer ? nTone : fTone;
+    }
+    {
+      let answer = this.tone(scheme);
+      if (null == this.background) return answer;
+      const bgTone = this.background(scheme).getTone(scheme), desiredRatio = this.contrastCurve.getContrast(scheme.contrastLevel);
+      if (Contrast.ratioOfTones(bgTone, answer) >= desiredRatio || (answer = DynamicColor.foregroundTone(bgTone, desiredRatio)), 
+      decreasingContrast && (answer = DynamicColor.foregroundTone(bgTone, desiredRatio)), 
+      this.isBackground && 50 <= answer && answer < 60 && (answer = Contrast.ratioOfTones(49, bgTone) >= desiredRatio ? 49 : 60), 
+      this.secondBackground) {
+        const [bg1, bg2] = [ this.background, this.secondBackground ], [bgTone1, bgTone2] = [ bg1(scheme).getTone(scheme), bg2(scheme).getTone(scheme) ], [upper, lower] = [ Math.max(bgTone1, bgTone2), Math.min(bgTone1, bgTone2) ];
+        if (Contrast.ratioOfTones(upper, answer) >= desiredRatio && Contrast.ratioOfTones(lower, answer) >= desiredRatio) return answer;
+        const lightOption = Contrast.lighter(upper, desiredRatio), darkOption = Contrast.darker(lower, desiredRatio), availables = [];
+        -1 !== lightOption && availables.push(lightOption), -1 !== darkOption && availables.push(darkOption);
+        return DynamicColor.tonePrefersLightForeground(bgTone1) || DynamicColor.tonePrefersLightForeground(bgTone2) ? lightOption < 0 ? 100 : lightOption : 1 === availables.length ? availables[0] : darkOption < 0 ? 0 : darkOption;
+      }
+      return answer;
+    }
+  }
+  static foregroundTone(bgTone, ratio) {
+    const lighterTone = Contrast.lighterUnsafe(bgTone, ratio), darkerTone = Contrast.darkerUnsafe(bgTone, ratio), lighterRatio = Contrast.ratioOfTones(lighterTone, bgTone), darkerRatio = Contrast.ratioOfTones(darkerTone, bgTone);
+    if (DynamicColor.tonePrefersLightForeground(bgTone)) {
+      const negligibleDifference = Math.abs(lighterRatio - darkerRatio) < .1 && lighterRatio < ratio && darkerRatio < ratio;
+      return lighterRatio >= ratio || lighterRatio >= darkerRatio || negligibleDifference ? lighterTone : darkerTone;
+    }
+    return darkerRatio >= ratio || darkerRatio >= lighterRatio ? darkerTone : lighterTone;
+  }
+  static tonePrefersLightForeground(tone) {
+    return Math.round(tone) < 60;
+  }
+  static toneAllowsLightForeground(tone) {
+    return Math.round(tone) <= 49;
+  }
+  static enableLightForeground(tone) {
+    return DynamicColor.tonePrefersLightForeground(tone) && !DynamicColor.toneAllowsLightForeground(tone) ? 49 : tone;
+  }
+}
+
+var Variant;
+
+!function(Variant) {
+  Variant[Variant.MONOCHROME = 0] = "MONOCHROME", Variant[Variant.NEUTRAL = 1] = "NEUTRAL", 
+  Variant[Variant.TONAL_SPOT = 2] = "TONAL_SPOT", Variant[Variant.VIBRANT = 3] = "VIBRANT", 
+  Variant[Variant.EXPRESSIVE = 4] = "EXPRESSIVE", Variant[Variant.FIDELITY = 5] = "FIDELITY", 
+  Variant[Variant.CONTENT = 6] = "CONTENT", Variant[Variant.RAINBOW = 7] = "RAINBOW", 
+  Variant[Variant.FRUIT_SALAD = 8] = "FRUIT_SALAD";
+}(Variant || (Variant = {}));
+
+class ContrastCurve {
+  constructor(low, normal, medium, high) {
+    this.low = low, this.normal = normal, this.medium = medium, this.high = high;
+  }
+  getContrast(contrastLevel) {
+    return contrastLevel <= -1 ? this.low : contrastLevel < 0 ? lerp(this.low, this.normal, (contrastLevel - -1) / 1) : contrastLevel < .5 ? lerp(this.normal, this.medium, (contrastLevel - 0) / .5) : contrastLevel < 1 ? lerp(this.medium, this.high, (contrastLevel - .5) / .5) : this.high;
+  }
+}
+
+class ToneDeltaPair {
+  constructor(roleA, roleB, delta, polarity, stayTogether) {
+    this.roleA = roleA, this.roleB = roleB, this.delta = delta, this.polarity = polarity, 
+    this.stayTogether = stayTogether;
+  }
+}
+
+function isFidelity(scheme) {
+  return scheme.variant === Variant.FIDELITY || scheme.variant === Variant.CONTENT;
+}
+
+function isMonochrome(scheme) {
+  return scheme.variant === Variant.MONOCHROME;
+}
+
+function findDesiredChromaByTone(hue, chroma, tone, byDecreasingTone) {
+  let answer = tone, closestToChroma = Hct.from(hue, chroma, tone);
+  if (closestToChroma.chroma < chroma) {
+    let chromaPeak = closestToChroma.chroma;
+    for (;closestToChroma.chroma < chroma; ) {
+      answer += byDecreasingTone ? -1 : 1;
+      const potentialSolution = Hct.from(hue, chroma, answer);
+      if (chromaPeak > potentialSolution.chroma) break;
+      if (Math.abs(potentialSolution.chroma - chroma) < .4) break;
+      Math.abs(potentialSolution.chroma - chroma) < Math.abs(closestToChroma.chroma - chroma) && (closestToChroma = potentialSolution), 
+      chromaPeak = Math.max(chromaPeak, potentialSolution.chroma);
+    }
+  }
+  return answer;
+}
+
+function viewingConditionsForAlbers(scheme) {
+  return ViewingConditions.make(void 0, void 0, scheme.isDark ? 30 : 80, void 0, void 0);
+}
+
+function performAlbers(prealbers, scheme) {
+  const albersd = prealbers.inViewingConditions(viewingConditionsForAlbers(scheme));
+  return DynamicColor.tonePrefersLightForeground(prealbers.tone) && !DynamicColor.toneAllowsLightForeground(albersd.tone) ? DynamicColor.enableLightForeground(prealbers.tone) : DynamicColor.enableLightForeground(albersd.tone);
+}
+
+class MaterialDynamicColors {
+  static highestSurface(s) {
+    return s.isDark ? MaterialDynamicColors.surfaceBright : MaterialDynamicColors.surfaceDim;
+  }
+}
+
+MaterialDynamicColors.contentAccentToneDelta = 15, MaterialDynamicColors.primaryPaletteKeyColor = DynamicColor.fromPalette({
+  name: "primary_palette_key_color",
+  palette: s => s.primaryPalette,
+  tone: s => s.primaryPalette.keyColor.tone
+}), MaterialDynamicColors.secondaryPaletteKeyColor = DynamicColor.fromPalette({
+  name: "secondary_palette_key_color",
+  palette: s => s.secondaryPalette,
+  tone: s => s.secondaryPalette.keyColor.tone
+}), MaterialDynamicColors.tertiaryPaletteKeyColor = DynamicColor.fromPalette({
+  name: "tertiary_palette_key_color",
+  palette: s => s.tertiaryPalette,
+  tone: s => s.tertiaryPalette.keyColor.tone
+}), MaterialDynamicColors.neutralPaletteKeyColor = DynamicColor.fromPalette({
+  name: "neutral_palette_key_color",
+  palette: s => s.neutralPalette,
+  tone: s => s.neutralPalette.keyColor.tone
+}), MaterialDynamicColors.neutralVariantPaletteKeyColor = DynamicColor.fromPalette({
+  name: "neutral_variant_palette_key_color",
+  palette: s => s.neutralVariantPalette,
+  tone: s => s.neutralVariantPalette.keyColor.tone
+}), MaterialDynamicColors.background = DynamicColor.fromPalette({
+  name: "background",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 6 : 98,
+  isBackground: !0
+}), MaterialDynamicColors.onBackground = DynamicColor.fromPalette({
+  name: "on_background",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 90 : 10,
+  background: s => MaterialDynamicColors.background,
+  contrastCurve: new ContrastCurve(3, 3, 4.5, 7)
+}), MaterialDynamicColors.surface = DynamicColor.fromPalette({
+  name: "surface",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 6 : 98,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceDim = DynamicColor.fromPalette({
+  name: "surface_dim",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 6 : 87,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceBright = DynamicColor.fromPalette({
+  name: "surface_bright",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 24 : 98,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceContainerLowest = DynamicColor.fromPalette({
+  name: "surface_container_lowest",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 4 : 100,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceContainerLow = DynamicColor.fromPalette({
+  name: "surface_container_low",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 10 : 96,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceContainer = DynamicColor.fromPalette({
+  name: "surface_container",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 12 : 94,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceContainerHigh = DynamicColor.fromPalette({
+  name: "surface_container_high",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 17 : 92,
+  isBackground: !0
+}), MaterialDynamicColors.surfaceContainerHighest = DynamicColor.fromPalette({
+  name: "surface_container_highest",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 22 : 90,
+  isBackground: !0
+}), MaterialDynamicColors.onSurface = DynamicColor.fromPalette({
+  name: "on_surface",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 90 : 10,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.surfaceVariant = DynamicColor.fromPalette({
+  name: "surface_variant",
+  palette: s => s.neutralVariantPalette,
+  tone: s => s.isDark ? 30 : 90,
+  isBackground: !0
+}), MaterialDynamicColors.onSurfaceVariant = DynamicColor.fromPalette({
+  name: "on_surface_variant",
+  palette: s => s.neutralVariantPalette,
+  tone: s => s.isDark ? 80 : 30,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11)
+}), MaterialDynamicColors.inverseSurface = DynamicColor.fromPalette({
+  name: "inverse_surface",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 90 : 20
+}), MaterialDynamicColors.inverseOnSurface = DynamicColor.fromPalette({
+  name: "inverse_on_surface",
+  palette: s => s.neutralPalette,
+  tone: s => s.isDark ? 20 : 95,
+  background: s => MaterialDynamicColors.inverseSurface,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.outline = DynamicColor.fromPalette({
+  name: "outline",
+  palette: s => s.neutralVariantPalette,
+  tone: s => s.isDark ? 60 : 50,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1.5, 3, 4.5, 7)
+}), MaterialDynamicColors.outlineVariant = DynamicColor.fromPalette({
+  name: "outline_variant",
+  palette: s => s.neutralVariantPalette,
+  tone: s => s.isDark ? 30 : 80,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7)
+}), MaterialDynamicColors.shadow = DynamicColor.fromPalette({
+  name: "shadow",
+  palette: s => s.neutralPalette,
+  tone: s => 0
+}), MaterialDynamicColors.scrim = DynamicColor.fromPalette({
+  name: "scrim",
+  palette: s => s.neutralPalette,
+  tone: s => 0
+}), MaterialDynamicColors.surfaceTint = DynamicColor.fromPalette({
+  name: "surface_tint",
+  palette: s => s.primaryPalette,
+  tone: s => s.isDark ? 80 : 40,
+  isBackground: !0
+}), MaterialDynamicColors.primary = DynamicColor.fromPalette({
+  name: "primary",
+  palette: s => s.primaryPalette,
+  tone: s => isMonochrome(s) ? s.isDark ? 100 : 0 : s.isDark ? 80 : 40,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.primaryContainer, MaterialDynamicColors.primary, 15, "nearer", !1)
+}), MaterialDynamicColors.onPrimary = DynamicColor.fromPalette({
+  name: "on_primary",
+  palette: s => s.primaryPalette,
+  tone: s => isMonochrome(s) ? s.isDark ? 10 : 90 : s.isDark ? 20 : 100,
+  background: s => MaterialDynamicColors.primary,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.primaryContainer = DynamicColor.fromPalette({
+  name: "primary_container",
+  palette: s => s.primaryPalette,
+  tone: s => isFidelity(s) ? performAlbers(s.sourceColorHct, s) : isMonochrome(s) ? s.isDark ? 85 : 25 : s.isDark ? 30 : 90,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.primaryContainer, MaterialDynamicColors.primary, 15, "nearer", !1)
+}), MaterialDynamicColors.onPrimaryContainer = DynamicColor.fromPalette({
+  name: "on_primary_container",
+  palette: s => s.primaryPalette,
+  tone: s => isFidelity(s) ? DynamicColor.foregroundTone(MaterialDynamicColors.primaryContainer.tone(s), 4.5) : isMonochrome(s) ? s.isDark ? 0 : 100 : s.isDark ? 90 : 10,
+  background: s => MaterialDynamicColors.primaryContainer,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.inversePrimary = DynamicColor.fromPalette({
+  name: "inverse_primary",
+  palette: s => s.primaryPalette,
+  tone: s => s.isDark ? 40 : 80,
+  background: s => MaterialDynamicColors.inverseSurface,
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11)
+}), MaterialDynamicColors.secondary = DynamicColor.fromPalette({
+  name: "secondary",
+  palette: s => s.secondaryPalette,
+  tone: s => s.isDark ? 80 : 40,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.secondaryContainer, MaterialDynamicColors.secondary, 15, "nearer", !1)
+}), MaterialDynamicColors.onSecondary = DynamicColor.fromPalette({
+  name: "on_secondary",
+  palette: s => s.secondaryPalette,
+  tone: s => isMonochrome(s) ? s.isDark ? 10 : 100 : s.isDark ? 20 : 100,
+  background: s => MaterialDynamicColors.secondary,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.secondaryContainer = DynamicColor.fromPalette({
+  name: "secondary_container",
+  palette: s => s.secondaryPalette,
+  tone: s => {
+    const initialTone = s.isDark ? 30 : 90;
+    if (isMonochrome(s)) return s.isDark ? 30 : 85;
+    if (!isFidelity(s)) return initialTone;
+    let answer = findDesiredChromaByTone(s.secondaryPalette.hue, s.secondaryPalette.chroma, initialTone, !s.isDark);
+    return answer = performAlbers(s.secondaryPalette.getHct(answer), s), answer;
+  },
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.secondaryContainer, MaterialDynamicColors.secondary, 15, "nearer", !1)
+}), MaterialDynamicColors.onSecondaryContainer = DynamicColor.fromPalette({
+  name: "on_secondary_container",
+  palette: s => s.secondaryPalette,
+  tone: s => isFidelity(s) ? DynamicColor.foregroundTone(MaterialDynamicColors.secondaryContainer.tone(s), 4.5) : s.isDark ? 90 : 10,
+  background: s => MaterialDynamicColors.secondaryContainer,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.tertiary = DynamicColor.fromPalette({
+  name: "tertiary",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? s.isDark ? 90 : 25 : s.isDark ? 80 : 40,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.tertiaryContainer, MaterialDynamicColors.tertiary, 15, "nearer", !1)
+}), MaterialDynamicColors.onTertiary = DynamicColor.fromPalette({
+  name: "on_tertiary",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? s.isDark ? 10 : 90 : s.isDark ? 20 : 100,
+  background: s => MaterialDynamicColors.tertiary,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.tertiaryContainer = DynamicColor.fromPalette({
+  name: "tertiary_container",
+  palette: s => s.tertiaryPalette,
+  tone: s => {
+    if (isMonochrome(s)) return s.isDark ? 60 : 49;
+    if (!isFidelity(s)) return s.isDark ? 30 : 90;
+    const albersTone = performAlbers(s.tertiaryPalette.getHct(s.sourceColorHct.tone), s), proposedHct = s.tertiaryPalette.getHct(albersTone);
+    return DislikeAnalyzer.fixIfDisliked(proposedHct).tone;
+  },
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.tertiaryContainer, MaterialDynamicColors.tertiary, 15, "nearer", !1)
+}), MaterialDynamicColors.onTertiaryContainer = DynamicColor.fromPalette({
+  name: "on_tertiary_container",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? s.isDark ? 0 : 100 : isFidelity(s) ? DynamicColor.foregroundTone(MaterialDynamicColors.tertiaryContainer.tone(s), 4.5) : s.isDark ? 90 : 10,
+  background: s => MaterialDynamicColors.tertiaryContainer,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.error = DynamicColor.fromPalette({
+  name: "error",
+  palette: s => s.errorPalette,
+  tone: s => s.isDark ? 80 : 40,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.errorContainer, MaterialDynamicColors.error, 15, "nearer", !1)
+}), MaterialDynamicColors.onError = DynamicColor.fromPalette({
+  name: "on_error",
+  palette: s => s.errorPalette,
+  tone: s => s.isDark ? 20 : 100,
+  background: s => MaterialDynamicColors.error,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.errorContainer = DynamicColor.fromPalette({
+  name: "error_container",
+  palette: s => s.errorPalette,
+  tone: s => s.isDark ? 30 : 90,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.errorContainer, MaterialDynamicColors.error, 15, "nearer", !1)
+}), MaterialDynamicColors.onErrorContainer = DynamicColor.fromPalette({
+  name: "on_error_container",
+  palette: s => s.errorPalette,
+  tone: s => s.isDark ? 90 : 10,
+  background: s => MaterialDynamicColors.errorContainer,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.primaryFixed = DynamicColor.fromPalette({
+  name: "primary_fixed",
+  palette: s => s.primaryPalette,
+  tone: s => isMonochrome(s) ? 40 : 90,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.primaryFixed, MaterialDynamicColors.primaryFixedDim, 10, "lighter", !0)
+}), MaterialDynamicColors.primaryFixedDim = DynamicColor.fromPalette({
+  name: "primary_fixed_dim",
+  palette: s => s.primaryPalette,
+  tone: s => isMonochrome(s) ? 30 : 80,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.primaryFixed, MaterialDynamicColors.primaryFixedDim, 10, "lighter", !0)
+}), MaterialDynamicColors.onPrimaryFixed = DynamicColor.fromPalette({
+  name: "on_primary_fixed",
+  palette: s => s.primaryPalette,
+  tone: s => isMonochrome(s) ? 100 : 10,
+  background: s => MaterialDynamicColors.primaryFixedDim,
+  secondBackground: s => MaterialDynamicColors.primaryFixed,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.onPrimaryFixedVariant = DynamicColor.fromPalette({
+  name: "on_primary_fixed_variant",
+  palette: s => s.primaryPalette,
+  tone: s => isMonochrome(s) ? 90 : 30,
+  background: s => MaterialDynamicColors.primaryFixedDim,
+  secondBackground: s => MaterialDynamicColors.primaryFixed,
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11)
+}), MaterialDynamicColors.secondaryFixed = DynamicColor.fromPalette({
+  name: "secondary_fixed",
+  palette: s => s.secondaryPalette,
+  tone: s => isMonochrome(s) ? 80 : 90,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.secondaryFixed, MaterialDynamicColors.secondaryFixedDim, 10, "lighter", !0)
+}), MaterialDynamicColors.secondaryFixedDim = DynamicColor.fromPalette({
+  name: "secondary_fixed_dim",
+  palette: s => s.secondaryPalette,
+  tone: s => isMonochrome(s) ? 70 : 80,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.secondaryFixed, MaterialDynamicColors.secondaryFixedDim, 10, "lighter", !0)
+}), MaterialDynamicColors.onSecondaryFixed = DynamicColor.fromPalette({
+  name: "on_secondary_fixed",
+  palette: s => s.secondaryPalette,
+  tone: s => 10,
+  background: s => MaterialDynamicColors.secondaryFixedDim,
+  secondBackground: s => MaterialDynamicColors.secondaryFixed,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.onSecondaryFixedVariant = DynamicColor.fromPalette({
+  name: "on_secondary_fixed_variant",
+  palette: s => s.secondaryPalette,
+  tone: s => isMonochrome(s) ? 25 : 30,
+  background: s => MaterialDynamicColors.secondaryFixedDim,
+  secondBackground: s => MaterialDynamicColors.secondaryFixed,
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11)
+}), MaterialDynamicColors.tertiaryFixed = DynamicColor.fromPalette({
+  name: "tertiary_fixed",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? 40 : 90,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.tertiaryFixed, MaterialDynamicColors.tertiaryFixedDim, 10, "lighter", !0)
+}), MaterialDynamicColors.tertiaryFixedDim = DynamicColor.fromPalette({
+  name: "tertiary_fixed_dim",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? 30 : 80,
+  isBackground: !0,
+  background: s => MaterialDynamicColors.highestSurface(s),
+  contrastCurve: new ContrastCurve(1, 1, 3, 7),
+  toneDeltaPair: s => new ToneDeltaPair(MaterialDynamicColors.tertiaryFixed, MaterialDynamicColors.tertiaryFixedDim, 10, "lighter", !0)
+}), MaterialDynamicColors.onTertiaryFixed = DynamicColor.fromPalette({
+  name: "on_tertiary_fixed",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? 100 : 10,
+  background: s => MaterialDynamicColors.tertiaryFixedDim,
+  secondBackground: s => MaterialDynamicColors.tertiaryFixed,
+  contrastCurve: new ContrastCurve(4.5, 7, 11, 21)
+}), MaterialDynamicColors.onTertiaryFixedVariant = DynamicColor.fromPalette({
+  name: "on_tertiary_fixed_variant",
+  palette: s => s.tertiaryPalette,
+  tone: s => isMonochrome(s) ? 90 : 30,
+  background: s => MaterialDynamicColors.tertiaryFixedDim,
+  secondBackground: s => MaterialDynamicColors.tertiaryFixed,
+  contrastCurve: new ContrastCurve(3, 4.5, 7, 11)
+});
+
 class TonalPalette {
   static fromInt(argb) {
     const hct = Hct.fromInt(argb);
-    return TonalPalette.fromHueAndChroma(hct.hue, hct.chroma);
+    return TonalPalette.fromHct(hct);
   }
-  static fromHueAndChroma(hue, chroma) {
-    return new TonalPalette(hue, chroma);
+  static fromHct(hct) {
+    return new TonalPalette(hct.hue, hct.chroma, hct);
   }
-  constructor(hue, chroma) {
-    this.hue = hue, this.chroma = chroma, this.cache = new Map;
+  static fromHueAndChroma(hue, chroma) {
+    return new TonalPalette(hue, chroma, TonalPalette.createKeyColor(hue, chroma));
+  }
+  constructor(hue, chroma, keyColor) {
+    this.hue = hue, this.chroma = chroma, this.keyColor = keyColor, this.cache = new Map;
+  }
+  static createKeyColor(hue, chroma) {
+    let smallestDeltaHct = Hct.from(hue, chroma, 50), smallestDelta = Math.abs(smallestDeltaHct.chroma - chroma);
+    for (let delta = 1; delta < 50; delta += 1) {
+      if (Math.round(chroma) === Math.round(smallestDeltaHct.chroma)) return smallestDeltaHct;
+      const hctAdd = Hct.from(hue, chroma, 50 + delta), hctAddDelta = Math.abs(hctAdd.chroma - chroma);
+      hctAddDelta < smallestDelta && (smallestDelta = hctAddDelta, smallestDeltaHct = hctAdd);
+      const hctSubtract = Hct.from(hue, chroma, 50 - delta), hctSubtractDelta = Math.abs(hctSubtract.chroma - chroma);
+      hctSubtractDelta < smallestDelta && (smallestDelta = hctSubtractDelta, smallestDeltaHct = hctSubtract);
+    }
+    return smallestDeltaHct;
   }
   tone(tone) {
     let argb = this.cache.get(tone);
     return void 0 === argb && (argb = Hct.from(this.hue, this.chroma, tone).toInt(), 
     this.cache.set(tone, argb)), argb;
   }
+  getHct(tone) {
+    return Hct.fromInt(this.tone(tone));
+  }
 }
 
 class CorePalette {
@@ -1475,7 +2035,7 @@ class Event {
     const eventsArray = Array.isArray(events) ? events : events.split(' ');
 
     // 本对象事件
-    // ['local:event'] or ['.event']，不向父组件传递
+    // ['local::event'] or ['.event']，不向父组件传递
     const selfEvents = eventsArray.map(ev => ev.replace(/local::|^[.]/, ''));
 
     // 非本对象事件，向上传递时，转换为对象，记录来源
@@ -1650,6 +2210,12 @@ class Page extends Event {
     this.emit('pageBack', this);
   }
 
+  change(view) {
+    this.emit('local::change', view);
+    // 向上触发跨页面事件，存在安全问题
+    this.emit('pageChange', this);
+  }
+
   hide(view) {
     this.emit('local::hide', view);
     // 向上触发跨页面事件，存在安全问题
@@ -1665,13 +2231,16 @@ class Page extends Event {
 
 /**
  * Wia app、router等继承类，通过模块化扩展类功能
+ * 使用 use 装载，注解可能完成类似功能
+ * 不装载则需在代码中按普通泪，单独引用、创建、使用
+ * 装载的模块可能影响其他模块
  */
 
 class Module extends Event {
   constructor(params = {}, parents = []) {
     super(params, parents);
-    const self = this;
-    self.params = params;
+    const self = this;
+    self.params = params;
   }
 
   // eslint-disable-next-line
@@ -1711,10 +2280,7 @@ class Module extends Event {
     if (!instance.modules) return;
 
     // 从原型中获得的模块类引用
-    const module =
-      typeof moduleName === 'string'
-        ? instance.modules[moduleName]
-        : moduleName;
+    const module = typeof moduleName === 'string' ? instance.modules[moduleName] : moduleName;
     if (!module) return;
 
     // 扩展实例的方法和属性，Extend instance methods and props
@@ -1731,8 +2297,16 @@ class Module extends Event {
 
     // 将扩展模块中的on加载到实例的事件侦听中，比如 init 在实例初始化时被调用
     if (module.on && instance.on) {
-      Object.keys(module.on).forEach(moduleEventName => {
-        instance.on(moduleEventName, module.on[moduleEventName]);
+      Object.keys(module.on).forEach(eventName => {
+        // 避免模块事件异常溢出影响其他模块
+        const fn = () => {
+          try {
+            module.on[eventName]();
+          } catch (e) {
+            console.log(`${moduleName}.on${eventName} exp:${e.message}`);
+          }
+        };
+        instance.on(eventName, fn);
       });
     }
 
@@ -1742,10 +2316,8 @@ class Module extends Event {
       Object.keys(module.vnode).forEach(vnodeId => {
         Object.keys(module.vnode[vnodeId]).forEach(hookName => {
           const handler = module.vnode[vnodeId][hookName];
-          if (!instance.vnodeHooks[hookName])
-            instance.vnodeHooks[hookName] = {};
-          if (!instance.vnodeHooks[hookName][vnodeId])
-            instance.vnodeHooks[hookName][vnodeId] = [];
+          if (!instance.vnodeHooks[hookName]) instance.vnodeHooks[hookName] = {};
+          if (!instance.vnodeHooks[hookName][vnodeId]) instance.vnodeHooks[hookName][vnodeId] = [];
           instance.vnodeHooks[hookName][vnodeId].push(handler.bind(instance));
         });
       });
@@ -1784,9 +2356,7 @@ class Module extends Event {
   static installModule(module, ...params) {
     const Class = this;
     if (!Class.prototype.modules) Class.prototype.modules = {};
-    const name =
-      module.name ||
-      `${Object.keys(Class.prototype.modules).length}_${$.now()}`;
+    const name = module.name || `${Object.keys(Class.prototype.modules).length}_${$.now()}`;
     // 原型属性中引用该模块类，类实例
     Class.prototype.modules[name] = module;
     // 模块如果定义了原型，则将模块原型加载到类原型
@@ -1809,7 +2379,7 @@ class Module extends Event {
   }
 
   /**
-   * 加载类扩展模块到类
+   * 加载扩展模块到类
    * @param {*} module
    * @param  {...any} params
    */
@@ -3076,7 +3646,7 @@ class App extends Module {
     const app = this;
     if (!app.colorsStyleEl) {
       app.colorsStyleEl = document.createElement('style');
-      document.head.appendChild(app.colorsStyleEl);
+      document.head.prepend(app.colorsStyleEl);
     }
 
     app.colorsStyleEl.textContent = colorThemeCSSStyles(app.colors);
@@ -3169,8 +3739,8 @@ class App extends Module {
     const app = this;
     const html = document.querySelector('html');
     if (app.mq.dark && app.mq.light) {
-      app.mq.dark.addListener(app.colorSchemeListener);
-      app.mq.light.addListener(app.colorSchemeListener);
+      app.mq.dark.addEventListener('change', app.colorSchemeListener);
+      app.mq.light.addEventListener('change', app.colorSchemeListener);
     }
     if (app.mq.dark && app.mq.dark.matches) {
       html.classList.add('dark');
@@ -3187,8 +3757,8 @@ class App extends Module {
     if (!window.matchMedia) return;
 
     const app = this;
-    if (app.mq.dark) app.mq.dark.removeListener(app.colorSchemeListener);
-    if (app.mq.light) app.mq.light.removeListener(app.colorSchemeListener);
+    if (app.mq.dark) app.mq.dark.removeEventListener('change', app.colorSchemeListener);
+    if (app.mq.light) app.mq.light.removeEventListener('change', app.colorSchemeListener);
   }
 
   setDarkMode(mode) {