vditor 3.10.4 → 3.10.6

package/src/index.ts

@@ -14,7 +14,7 @@ import {Preview} from "./ts/preview/index";
 import {Resize} from "./ts/resize/index";
 import {Editor} from "./ts/sv/index";
 import {inputEvent} from "./ts/sv/inputEvent";
-import {processAfterRender as processSVAfterRender} from "./ts/sv/process";
+import {processAfterRender as processSVAfterRender, processPaste} from "./ts/sv/process";
 import {Tip} from "./ts/tip/index";
 import {Toolbar} from "./ts/toolbar/index";
 import {disableToolbar, hidePanel} from "./ts/toolbar/setToolbar";
@@ -30,11 +30,13 @@ import {addScript, addScriptSync} from "./ts/util/addScript";
 import {getSelectText} from "./ts/util/getSelectText";
 import {Options} from "./ts/util/Options";
 import {processCodeRender} from "./ts/util/processCode";
-import {getCursorPosition, getEditorRange} from "./ts/util/selection";
+import {getCursorPosition, getEditorRange, insertHTML} from "./ts/util/selection";
 import {afterRenderEvent} from "./ts/wysiwyg/afterRenderEvent";
 import {WYSIWYG} from "./ts/wysiwyg/index";
 import {input} from "./ts/wysiwyg/input";
 import {renderDomByMd} from "./ts/wysiwyg/renderDomByMd";
+import {execAfterRender} from "./ts/util/fixBrowserBehavior";
+import {accessLocalStorage} from "./ts/util/compatibility";
 
 class Vditor extends VditorMethod {
     public readonly version: string;
@@ -102,6 +104,10 @@ class Vditor extends VditorMethod {
         tip.show(error, 0)
     }
 
+    public updateToolbarConfig(options: IToolbarConfig) {
+        this.vditor.toolbar.updateConfig(this.vditor, options);
+    }
+
     /** 设置主题 */
     public setTheme(
         theme: "dark" | "classic",
@@ -204,7 +210,9 @@ class Vditor extends VditorMethod {
 
     /** 清除缓存 */
     public clearCache() {
-        localStorage.removeItem(this.vditor.options.cache.id);
+        if (this.vditor.options.cache.enable && accessLocalStorage()) {
+            localStorage.removeItem(this.vditor.options.cache.id);
+        }
     }
 
     /** 禁用缓存 */
@@ -264,6 +272,8 @@ class Vditor extends VditorMethod {
     public insertValue(value: string, render = true) {
         const range = getEditorRange(this.vditor);
         range.collapse(true);
+        // https://github.com/Vanessa219/vditor/issues/716
+        // https://github.com/Vanessa219/vditor/issues/917
         const tmpElement = document.createElement("template");
         tmpElement.innerHTML = value;
         range.insertNode(tmpElement.content.cloneNode(true));
@@ -286,6 +296,20 @@ class Vditor extends VditorMethod {
         }
     }
 
+    /** 在焦点处插入 Markdown */
+    public insertMD(md: string) {
+        // https://github.com/Vanessa219/vditor/issues/1640
+        if (this.vditor.currentMode === "ir") {
+            insertHTML(this.vditor.lute.Md2VditorIRDOM(md), this.vditor);
+        } else if (this.vditor.currentMode === "wysiwyg") {
+            insertHTML(this.vditor.lute.Md2VditorDOM(md), this.vditor);
+        } else {
+            processPaste(this.vditor, md);
+        }
+        this.vditor.outline.render(this.vditor);
+        execAfterRender(this.vditor);
+    }
+
     /** 设置编辑器内容 */
     public setValue(markdown: string, clearStack = false) {
         if (this.vditor.currentMode === "sv") {

package/src/ts/devtools/index.ts

@@ -20,7 +20,7 @@ export class DevTools {
             return;
         }
 
-        addScript(`${vditor.options.cdn}/dist/js/echarts/echarts.min.js`, "vditorEchartsScript").then(() => {
+        addScript(`${vditor.options.cdn}/dist/js/echarts/echarts.min.js?v=5.5.1`, "vditorEchartsScript").then(() => {
             if (!this.ASTChart) {
                 this.ASTChart = echarts.init(vditor.devtools.element.lastElementChild as HTMLDivElement);
             }

package/src/ts/ir/input.ts

@@ -57,6 +57,12 @@ export const input = (vditor: IVditor, range: Range, ignoreSpace = false, event?
             }
             return;
         }
+
+        // https://github.com/Vanessa219/vditor/issues/729
+        if (endSpace && /^#{1,6} $/.test(blockElement.textContent)) {
+            endSpace = false;
+        }
+
         if (endSpace) {
             const markerElement = hasClosestByClassName(range.startContainer, "vditor-ir__marker");
             if (markerElement) {

package/src/ts/ir/processKeydown.ts

@@ -92,7 +92,7 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
         }
         // 数学公式上无元素，按上或左将添加新块
         if ((codeRenderElement.getAttribute("data-type") === "math-block"
-            || codeRenderElement.getAttribute("data-type") === "html-block") &&
+                || codeRenderElement.getAttribute("data-type") === "html-block") &&
             insertBeforeBlock(vditor, event, range, codeRenderElement, preRenderElement.parentElement)) {
             return true;
         }
@@ -208,7 +208,7 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
         // 光标位于标题前，marker 后
         if (headingElement) {
             const headingLength = headingElement.firstElementChild.textContent.length;
-            if (getSelectPosition(headingElement, vditor.ir.element).start === headingLength) {
+            if (getSelectPosition(headingElement, vditor.ir.element).start === headingLength && headingLength !== 0) {
                 range.setStart(headingElement.firstElementChild.firstChild, headingLength - 1);
                 range.collapse(true);
                 setSelectionFocus(range);

package/src/ts/markdown/chartRender.ts

@@ -1,6 +1,7 @@
 import {Constants} from "../constants";
 import {addScript} from "../util/addScript";
 import {chartRenderAdapter} from "./adapterRender";
+import {looseJsonParse} from "../util/function";
 
 declare const echarts: {
     init(element: HTMLElement, theme?: string): IEChart;
@@ -9,8 +10,8 @@ declare const echarts: {
 export const chartRender = (element: (HTMLElement | Document) = document, cdn = Constants.CDN, theme: string) => {
     const echartsElements = chartRenderAdapter.getElements(element);
     if (echartsElements.length > 0) {
-        addScript(`${cdn}/dist/js/echarts/echarts.min.js`, "vditorEchartsScript").then(() => {
-            echartsElements.forEach((e: HTMLDivElement) => {
+        addScript(`${cdn}/dist/js/echarts/echarts.min.js?v=5.5.1`, "vditorEchartsScript").then(() => {
+            echartsElements.forEach(async (e: HTMLDivElement) => {
                 if (e.parentElement.classList.contains("vditor-wysiwyg__pre") ||
                     e.parentElement.classList.contains("vditor-ir__marker--pre")) {
                     return;
@@ -24,7 +25,7 @@ export const chartRender = (element: (HTMLElement | Document) = document, cdn =
                     if (e.getAttribute("data-processed") === "true") {
                         return;
                     }
-                    const option = JSON.parse(text);
+                    const option = await looseJsonParse(text);
                     echarts.init(e, theme === "dark" ? "dark" : undefined).setOption(option);
                     e.setAttribute("data-processed", "true");
                 } catch (error) {

package/src/ts/markdown/mindmapRender.ts

@@ -9,7 +9,7 @@ declare const echarts: {
 export const mindmapRender = (element: (HTMLElement | Document) = document, cdn = Constants.CDN, theme: string) => {
     const mindmapElements = mindmapRenderAdapter.getElements(element);
     if (mindmapElements.length > 0) {
-        addScript(`${cdn}/dist/js/echarts/echarts.min.js`, "vditorEchartsScript").then(() => {
+        addScript(`${cdn}/dist/js/echarts/echarts.min.js?v=5.5.1`, "vditorEchartsScript").then(() => {
             mindmapElements.forEach((e: HTMLDivElement) => {
                 if (e.parentElement.classList.contains("vditor-wysiwyg__pre") ||
                     e.parentElement.classList.contains("vditor-ir__marker--pre")) {

package/src/ts/sv/processKeydown.ts

@@ -95,8 +95,14 @@ export const processKeydown = (vditor: IVditor, event: KeyboardEvent) => {
             }
             // 第一个 marker 后 tab 进行缩进
             if (event.key === "Tab") {
-                listFirstMarkerElement.insertAdjacentHTML("beforebegin",
-                    `<span data-type="padding">${listFirstMarkerElement.textContent.replace(/\S/g, " ")}</span>`);
+                if (event.shiftKey) {
+                    if (listFirstMarkerElement.previousElementSibling.getAttribute("data-type") === "padding") {
+                        listFirstMarkerElement.previousElementSibling.remove();
+                    }
+                } else {
+                    listFirstMarkerElement.insertAdjacentHTML("beforebegin",
+                        `<span data-type="padding">${listFirstMarkerElement.textContent.replace(/\S/g, " ")}</span>`);
+                }
                 if (/^\d/.test(listFirstMarkerElement.textContent)) {
                     listFirstMarkerElement.textContent = listFirstMarkerElement.textContent.replace(/^\d{1,}/, "1");
                     range.selectNodeContents(listLastMarkerElement.firstChild);

package/src/ts/toolbar/Upload.ts

@@ -1,5 +1,5 @@
 import {Constants} from "../constants";
-import {uploadFiles} from "../upload";
+import {uploadFiles} from "../upload/index";
 import {getEventName} from "../util/compatibility";
 import {MenuItem} from "./MenuItem";
 

package/src/ts/toolbar/index.ts

@@ -69,6 +69,23 @@ export class Toolbar {
         }
     }
 
+    public updateConfig(vditor: IVditor, options: IToolbarConfig) {
+        vditor.options.toolbarConfig = Object.assign({
+            hide: false,
+            pin: false,
+        }, options);
+        if (vditor.options.toolbarConfig.hide) {
+            this.element.classList.add("vditor-toolbar--hide");
+        } else {
+            this.element.classList.remove("vditor-toolbar--hide");
+        }
+        if (vditor.options.toolbarConfig.pin) {
+            this.element.classList.add("vditor-toolbar--pin");
+        } else {
+            this.element.classList.remove("vditor-toolbar--pin");
+        }
+    }
+
     private genItem(vditor: IVditor, menuItem: IMenuItem, index: number) {
         let menuItemObj;
         switch (menuItem.name) {

package/src/ts/ui/initUI.ts

@@ -5,12 +5,6 @@ import {accessLocalStorage} from "../util/compatibility";
 import {setContentTheme} from "./setContentTheme";
 import {setTheme} from "./setTheme";
 
-declare global {
-  interface Window {
-    visualViewport: HTMLElement;
-  }
-}
-
 export const initUI = (vditor: IVditor) => {
   vditor.element.innerHTML = "";
   vditor.element.classList.add("vditor");

package/src/ts/util/addScript.ts

@@ -18,7 +18,7 @@ export const addScript = (path: string, id: string) => {
     return new Promise((resolve, reject) => {
         if (document.getElementById(id)) {
             // 脚本加载后再次调用直接返回
-            resolve();
+            resolve(true);
             return false;
         }
         const scriptElement = document.createElement("script");
@@ -33,11 +33,11 @@ export const addScript = (path: string, id: string) => {
             if (document.getElementById(id)) {
                 // 循环调用需清除 DOM 中的 script 标签
                 scriptElement.remove();
-                resolve();
+                resolve(true);
                 return false;
             }
             scriptElement.id = id;
-            resolve();
+            resolve(true);
         };
     });
 };

package/src/ts/util/fixBrowserBehavior.ts

@@ -1290,6 +1290,10 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
             return ["", Lute.WalkContinue];
         }
 
+        if (vditor.options.upload.renderLinkDest) {
+            return vditor.options.upload.renderLinkDest(vditor, node, entering);
+        }
+
         const src = node.TokensStr();
         if (node.__internal_object__.Parent.Type === 34 && src && src.indexOf("file://") === -1 &&
             vditor.options.upload.linkToImgUrl) {
@@ -1448,7 +1452,7 @@ export const paste = async (vditor: IVditor, event: (ClipboardEvent | DragEvent)
             }
         } else if (textPlain.trim() !== "" && files.length === 0) {
             const range = getEditorRange(vditor);
-            if (range.toString() !== ""  && vditor.lute.IsValidLinkDest(textPlain)) {
+            if (range.toString() !== "" && vditor.lute.IsValidLinkDest(textPlain)) {
                 textPlain = `[${range.toString()}](${textPlain})`;
             }
             if (vditor.currentMode === "ir") {

package/src/ts/util/function.ts

@@ -9,3 +9,7 @@ export const getSearch = (key: string, link = window.location.search) => {
     const urlSearchParams = new URLSearchParams(params.substring(0, hashIndex >= 0 ? hashIndex : undefined));
     return urlSearchParams.get(key);
 };
+
+export const looseJsonParse = (text: string) => {
+    return Function(`"use strict";return (${text})`)();
+};

package/src/ts/wysiwyg/index.ts

@@ -380,6 +380,11 @@ class WYSIWYG {
                 }
             }
 
+            // https://github.com/Vanessa219/vditor/issues/729
+            if (endSpace && /^#{1,6} $/.test(blockElement.textContent)) {
+                endSpace = false;
+            }
+
             const headingElement = hasClosestByHeadings(getSelection().getRangeAt(0).startContainer);
             if (headingElement && headingElement.textContent === "") {
                 // heading 为空删除 https://github.com/Vanessa219/vditor/issues/150

package/src/ts/wysiwyg/input.ts

@@ -2,7 +2,7 @@ import {
     getTopList,
     hasClosestBlock, hasClosestByAttribute, hasTopClosestByTag,
 } from "../util/hasClosest";
-import { hasClosestByTag} from "../util/hasClosestByHeadings";
+import {hasClosestByTag} from "../util/hasClosestByHeadings";
 import {log} from "../util/log";
 import {processCodeRender} from "../util/processCode";
 import {setRangeByWbr} from "../util/selection";