@xforge-dev/forge-kit 0.22.0 → 0.22.1

package/dist/theme-provider.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
-import { DEFAULT_THEME, THEME_COLOR_KEY, THEME_MODE_KEY, THEME_SYNC_KEY, isColorTheme, isThemeMode, parseThemeCookie, themeCookie, } from './theme.js';
+import { DEFAULT_THEME, hostThemeCookieExpiry, THEME_COLOR_KEY, THEME_MODE_KEY, THEME_SYNC_KEY, isColorTheme, isThemeMode, parseThemeCookie, writeThemeCookie, } from './theme.js';
 const Context = createContext(undefined);
 function safeStorage() {
     try {
@@ -39,7 +39,7 @@ export function storeForgeTheme(theme) {
     storage?.setItem(THEME_MODE_KEY, theme.mode);
     storage?.setItem(THEME_COLOR_KEY, theme.color);
     if (readSync(storage))
-        document.cookie = themeCookie(theme);
+        writeThemeCookie(theme);
 }
 function apply(theme) {
     const root = document.documentElement;
@@ -66,7 +66,7 @@ export function ForgeThemeProvider({ children, onChange }) {
         setThemeState(next);
         apply(next);
         if (share && readSync(storage))
-            document.cookie = themeCookie(next);
+            writeThemeCookie(next);
         if (!same(local, next)) {
             storage?.setItem(THEME_MODE_KEY, next.mode);
             storage?.setItem(THEME_COLOR_KEY, next.color);
@@ -79,6 +79,10 @@ export function ForgeThemeProvider({ children, onChange }) {
         const storage = safeStorage();
         setSyncState(readSync(storage));
         const adopt = () => {
+            // A stale host-only copy would shadow the shared cookie: drop it before reading.
+            const expiry = hostThemeCookieExpiry();
+            if (expiry)
+                document.cookie = expiry;
             const next = resolveTheme(storage, document.cookie);
             // The first app visited seeds the shared theme for the others.
             const seed = readSync(storage) && !parseThemeCookie(document.cookie);
@@ -114,7 +118,7 @@ export function ForgeThemeProvider({ children, onChange }) {
         setSyncState(sync);
         // Turning sync on shares this app's current theme rather than jumping to another app's.
         if (sync)
-            document.cookie = themeCookie(current.current);
+            writeThemeCookie(current.current);
     }, []);
     const value = useMemo(() => ({ theme: theme.mode, setTheme, colorTheme: theme.color, setColorTheme, syncTheme, setSyncTheme }), [theme, setTheme, setColorTheme, syncTheme, setSyncTheme]);
     return _jsx(Context.Provider, { value: value, children: children });

package/dist/theme.d.ts

@@ -67,6 +67,14 @@ export declare function isColorTheme(value: unknown): value is ForgeColorTheme;
 export declare function parseThemeCookie(cookie: string): ForgeTheme | null;
 /** The `document.cookie` assignment that stores `theme` for every Forge app. */
 export declare function themeCookie(theme: ForgeTheme, domain?: string): string;
+/**
+ * The `document.cookie` assignment that deletes a host-only theme cookie, or null where the theme cookie is host-only
+ * anyway (no shared domain). A host-only copy left over from before the shared domain was set sorts ahead of the
+ * shared cookie, so it would win every read and a new pick would never stick.
+ */
+export declare function hostThemeCookieExpiry(domain?: string): string | null;
+/** Writes the shared theme cookie, dropping any stale host-only copy first. */
+export declare function writeThemeCookie(theme: ForgeTheme, domain?: string): void;
 /**
  * Inline `<head>` script that applies the theme before first paint: the shared
  * cookie when this app syncs, otherwise localStorage. Keep in step with

package/dist/theme.js

@@ -53,6 +53,21 @@ export function themeCookie(theme, domain) {
         .filter(Boolean)
         .join('; ');
 }
+/**
+ * The `document.cookie` assignment that deletes a host-only theme cookie, or null where the theme cookie is host-only
+ * anyway (no shared domain). A host-only copy left over from before the shared domain was set sorts ahead of the
+ * shared cookie, so it would win every read and a new pick would never stick.
+ */
+export function hostThemeCookieExpiry(domain) {
+    return forgeCookieOptions(domain).domain ? `${THEME_COOKIE}=; Path=/; Max-Age=0` : null;
+}
+/** Writes the shared theme cookie, dropping any stale host-only copy first. */
+export function writeThemeCookie(theme, domain) {
+    const expiry = hostThemeCookieExpiry(domain);
+    if (expiry)
+        document.cookie = expiry;
+    document.cookie = themeCookie(theme, domain);
+}
 /**
  * Inline `<head>` script that applies the theme before first paint: the shared
  * cookie when this app syncs, otherwise localStorage. Keep in step with

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xforge-dev/forge-kit",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Shared auth, app registry and UI for xForge apps",
   "license": "MIT",
   "repository": {