@commonpub/layer 0.63.0 → 0.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commonpub/layer",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "type": "module",
   "main": "./nuxt.config.ts",
   "files": [
@@ -54,15 +54,15 @@
     "vue-router": "^4.3.0",
     "zod": "^4.3.6",
     "@commonpub/auth": "0.8.0",
-    "@commonpub/config": "0.19.0",
     "@commonpub/editor": "0.7.11",
-    "@commonpub/schema": "0.35.0",
+    "@commonpub/config": "0.19.0",
     "@commonpub/docs": "0.6.3",
     "@commonpub/learning": "0.5.2",
     "@commonpub/server": "2.82.0",
-    "@commonpub/ui": "0.10.0",
     "@commonpub/protocol": "0.13.0",
-    "@commonpub/explainer": "0.7.15"
+    "@commonpub/explainer": "0.7.15",
+    "@commonpub/ui": "0.11.0",
+    "@commonpub/schema": "0.35.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",

package/pages/admin/theme/index.vue

@@ -155,14 +155,45 @@ async function removeTheme(themeId: string): Promise<void> {
 // --- Create / Capture / Import ---
 
 function createBlank(): void {
+  // "New custom theme" forks the CURRENTLY ACTIVE theme so you start from the
+  // look on screen, not a blank Classic slate. (It previously seeded an empty,
+  // base-parented theme — which is why saving reverted everything to Classic.)
+  const active = instanceDefault.value;
+  const customId = parseCustomThemeId(active);
+
+  // Active theme is itself a custom theme → copy its stored tokens directly
+  // (computed-style capture can't reconstruct a custom theme's full set).
+  if (customId && themesApi.data.value) {
+    const src = themesApi.data.value.custom.find((t) => t.id === customId);
+    if (src) {
+      const seed = {
+        id: nextAvailableId(`${src.id}-copy`),
+        name: `${src.name} (copy)`,
+        description: src.description ?? '',
+        family: 'custom',
+        isDark: src.isDark,
+        parentTheme: src.parentTheme,
+        tokens: { ...src.tokens },
+      };
+      sessionStorage.setItem('cpub-theme-editor-seed', JSON.stringify(seed));
+      router.push('/admin/theme/edit/__new');
+      return;
+    }
+  }
+
+  // Built-in / registered active theme → capture its applied tokens so the new
+  // theme reproduces the current look (a custom theme renders as base + tokens,
+  // so a complete capture is what keeps it from falling back to Classic).
+  const detected = detectAppliedOverrides();
+  const isBuiltInParent = themesApi.data.value?.builtIn.some((t) => t.id === active) ?? false;
   const seed = {
     id: nextAvailableId('my-theme'),
     name: 'My theme',
-    description: '',
+    description: detected.count ? `Forked from the active theme (${detected.count} tokens).` : '',
     family: 'custom',
-    isDark: false,
-    parentTheme: 'base',
-    tokens: {},
+    isDark: detected.isDark,
+    parentTheme: isBuiltInParent ? active : 'base',
+    tokens: detected.tokens,
   };
   sessionStorage.setItem('cpub-theme-editor-seed', JSON.stringify(seed));
   router.push('/admin/theme/edit/__new');