fix: load default options in webview

since it is not serializable
markmap · Dec 20, 2024 · 3df8521 · 3df8521
1 parent 1b6082e
commit 3df8521
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -127,7 +127,7 @@
     "husky": "^8.0.3",
     "lodash.debounce": "^4.0.8",
     "markmap-common": "0.18.0",
-    "markmap-lib": "0.18.0",
+    "markmap-lib": "0.18.1",
     "markmap-render": "0.18.0",
     "markmap-toolbar": "0.18.0",
     "markmap-view": "0.18.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app.ts b/src/app.ts
@@ -1,6 +1,7 @@
 import type { INode } from 'markmap-common';
 import { Toolbar } from 'markmap-toolbar';
 import {
+  defaultOptions,
   deriveOptions,
   type IMarkmapJSONOptions,
   type Markmap,
@@ -14,14 +15,17 @@ let root: INode | undefined;
 let style: HTMLStyleElement;
 let active:
   | {
-      node: INode;
-      el: Element;
-    }
+    node: INode;
+    el: Element;
+  }
   | undefined;
 
 const handlers = {
   async setData(data: { root?: INode; jsonOptions?: IMarkmapJSONOptions }) {
-    await mm.setData((root = data.root), deriveOptions(data.jsonOptions) || {});
+    await mm.setData((root = data.root), {
+      ...defaultOptions,
+      ...deriveOptions(data.jsonOptions),
+    });
     if (firstTime) {
       mm.fit();
       firstTime = false;

diff --git a/src/extension.ts b/src/extension.ts
@@ -1,7 +1,7 @@
 import debounce from 'lodash.debounce';
 import { JSItem, type CSSItem } from 'markmap-common';
 import { fillTemplate } from 'markmap-render';
-import { defaultOptions, type IMarkmapJSONOptions } from 'markmap-view';
+import { type IMarkmapJSONOptions } from 'markmap-view';
 import {
   ColorThemeKind,
   CustomTextEditorProvider,
@@ -49,7 +49,7 @@ async function writeFile(targetUri: Uri, text: string) {
 class MarkmapEditor implements CustomTextEditorProvider {
   private webviewPanelMap = new Map<TextDocument, WebviewPanel>();
 
-  constructor(private context: ExtensionContext) { }
+  constructor(private context: ExtensionContext) {}
 
   private resolveAssetPath(relPath: string) {
     return Utils.joinPath(this.context.extensionUri, relPath);
@@ -165,7 +165,6 @@ class MarkmapEditor implements CustomTextEditorProvider {
         data: {
           root,
           jsonOptions: {
-            ...defaultOptions,
             ...globalOptions,
             ...(frontmatter as any)?.markmap,
           },
@@ -193,11 +192,11 @@ class MarkmapEditor implements CustomTextEditorProvider {
         styles: [
           ...(customCSS
             ? [
-              {
-                type: 'style',
-                data: customCSS,
-              } as CSSItem,
-            ]
+                {
+                  type: 'style',
+                  data: customCSS,
+                } as CSSItem,
+              ]
             : []),
         ],
         scripts: [