@nonamelego/dsh-catppuccin 0.6.5-beta.0 → 0.6.6-beta.0

package/lib/client.js

@@ -3449,6 +3449,46 @@ window.__ModuleLoader__.load({
 			}
 		];
 		//#endregion
+		//#region src/boot-palette.ts
+		/** Attribute marking the injected `<style>` so the Client can find it. */
+		const BOOT_PALETTE_ATTR = "data-dsh-catppuccin-boot";
+		//#endregion
+		//#region src/client/boot-palette.ts
+		/**
+		* Client half of the pre-paint palette (issue #30 补充, 2026-10-27).
+		*
+		* The Host injects a `<style data-dsh-catppuccin-boot>` into the index HTML so
+		* the first frame is already the persisted flavour (see `src/boot-palette.ts`).
+		* That sheet is only a stand-in: its selector is `html body` (0,0,2), which
+		* outranks the official `body` token block, so leaving it in place would pin
+		* every token and defeat later theme switches (the user picks Light or turns the
+		* flavour off and nothing changes).
+		*
+		* So it is removed the moment the flavour theme actually takes over — which is
+		* NOT the same instant as "setTheme was called":
+		*  - a reload where the runtime preference already equals the flavour id never
+		*    calls setTheme (see `applyDesired`'s early return), and
+		*  - a built-in pick (Light / Dark / System) must remove it too, because the
+		*    sheet belongs to a flavour that is no longer wanted.
+		* The restore effect therefore clears it from every one of those points plus a
+		* fallback timer and the effect teardown.
+		*/
+		/**
+		* Remove every injected pre-paint sheet from this document.
+		*
+		* Idempotent and safe when nothing was injected (hosts without the index
+		* injection seam, `flavor: off`, a document that already cleared it).
+		* @returns whether an element was actually removed (diagnostics and tests).
+		*/
+		function clearBootPalette() {
+			let removed = false;
+			for (const element of document.querySelectorAll(`[${BOOT_PALETTE_ATTR}]`)) {
+				element.remove();
+				removed = true;
+			}
+			return removed;
+		}
+		//#endregion
 		//#region src/client/shiki-tokens.ts
 		/**
 		* Canonical Catppuccin syntax colours per flavour.
@@ -4271,14 +4311,22 @@ window.__ModuleLoader__.load({
 			};
 			const AUTO_CHECK_BOOT_DELAY_MS = 3e3;
 			const AUTO_CHECK_INTERVAL_MS = 216e5;
+			/** How long the Host's pre-paint palette may survive before it is removed
+			*  unconditionally (issue #30 补充). Generous on purpose: removing it EARLY
+			*  re-exposes the official palette for one frame, which is the bug. */
+			const BOOT_PALETTE_FALLBACK_MS = 1e4;
 			let lastAutoResult = null;
 			let armAutoCheck;
 			ctx.effect(() => {
 				let liveBuiltinPick = null;
+				const bootPaletteFallback = window.setTimeout(() => {
+					clearBootPalette();
+				}, BOOT_PALETTE_FALLBACK_MS);
 				const originalSetTheme = theme.setTheme;
 				const restoreGuardSetTheme = (id) => {
 					liveBuiltinPick = isBuiltinPreference(id) ? id : null;
 					originalSetTheme.call(theme, id);
+					clearBootPalette();
 				};
 				theme.setTheme = restoreGuardSetTheme;
 				let restorePending = false;
@@ -4288,7 +4336,10 @@ window.__ModuleLoader__.load({
 					queueMicrotask(() => {
 						restorePending = false;
 						const preference = theme.getTheme().preference;
-						if (preference === desired) return;
+						if (preference === desired) {
+							clearBootPalette();
+							return;
+						}
 						if (builtinPickWins(preference, liveBuiltinPick)) return;
 						ensureThemeRegistered(desired);
 						try {
@@ -4301,11 +4352,17 @@ window.__ModuleLoader__.load({
 					const desired = readFlavor();
 					if (desired === "off") {
 						const preference = theme.getTheme().preference;
-						if (readExplicitFlavorOff() && flavorFromThemeId(preference) !== "off") scheduleRestore(readRestoredPreference());
+						if (readExplicitFlavorOff()) {
+							clearBootPalette();
+							if (flavorFromThemeId(preference) !== "off") scheduleRestore(readRestoredPreference());
+						}
 						return;
 					}
 					const preference = theme.getTheme().preference;
-					if (preference === desired) return;
+					if (preference === desired) {
+						clearBootPalette();
+						return;
+					}
 					if (builtinPickWins(preference, liveBuiltinPick)) return;
 					scheduleRestore(desired);
 				};
@@ -4402,6 +4459,8 @@ window.__ModuleLoader__.load({
 					offGlass();
 					disposer();
 					window.removeEventListener("storage", onStorage);
+					window.clearTimeout(bootPaletteFallback);
+					clearBootPalette();
 					window.clearTimeout(bootTimer);
 					window.clearInterval(intervalTimer);
 					cancelDurablePersist();