vditor 3.10.3 → 3.10.5

package/src/ts/markdown/speechRender.ts

@@ -5,56 +5,63 @@ declare global {
         vditorSpeechRange: Range;
     }
 }
+
 export const speechRender = (element: HTMLElement, lang: keyof II18n = "zh_CN") => {
     if (typeof speechSynthesis === "undefined" || typeof SpeechSynthesisUtterance === "undefined") {
         return;
     }
+
+    const getVoice = () => {
+        const voices = speechSynthesis.getVoices();
+        let currentVoice: SpeechSynthesisVoice;
+        let defaultVoice;
+        voices.forEach((item) => {
+            if (item.lang === lang.replace("_", "-")) {
+                currentVoice = item;
+            }
+            if (item.default) {
+                defaultVoice = item;
+            }
+        });
+        if (!currentVoice) {
+            currentVoice = defaultVoice;
+        }
+        return currentVoice;
+    };
+
     let playSVG = '<svg><use xlink:href="#vditor-icon-play"></use></svg>';
     let pauseSVG = '<svg><use xlink:href="#vditor-icon-pause"></use></svg>';
     if (!document.getElementById("vditorIconScript")) {
         playSVG = '<svg viewBox="0 0 32 32"><path d="M3.436 0l25.128 16-25.128 16v-32z"></path></svg>';
         pauseSVG = '<svg viewBox="0 0 32 32"><path d="M20.617 0h9.128v32h-9.128v-32zM2.255 32v-32h9.128v32h-9.128z"></path></svg>';
     }
-    let speechDom: HTMLDivElement = document.querySelector(".vditor-speech");
+
+    let speechDom: HTMLButtonElement = document.querySelector(".vditor-speech");
     if (!speechDom) {
-        speechDom = document.createElement("div");
+        speechDom = document.createElement("button");
         speechDom.className = "vditor-speech";
-        document.body.insertAdjacentElement("beforeend", speechDom);
-
-        const getVoice = () => {
-            const voices = speechSynthesis.getVoices();
-            let currentVoice;
-            let defaultVoice;
-            voices.forEach((item) => {
-                if (item.lang === lang.replace("_", "-")) {
-                    currentVoice = item;
-                }
-                if (item.default) {
-                    defaultVoice = item;
-                }
-            });
-            if (!currentVoice) {
-                currentVoice = defaultVoice;
-            }
-            return currentVoice;
-        };
-
+        element.insertAdjacentElement("beforeend", speechDom);
         if (speechSynthesis.onvoiceschanged !== undefined) {
             speechSynthesis.onvoiceschanged = getVoice;
         }
+    }
+    const voice = getVoice();
+    const utterThis = new SpeechSynthesisUtterance();
+    utterThis.voice = voice;
+    utterThis.onend = utterThis.onerror = () => {
+        speechDom.style.display = "none";
+        speechSynthesis.cancel();
+        speechDom.classList.remove("vditor-speech--current");
+        speechDom.innerHTML = playSVG;
+    };
 
-        const voice = getVoice();
-        speechDom.onclick = () => {
-            if (speechDom.className === "vditor-speech") {
-                const utterThis = new SpeechSynthesisUtterance(speechDom.getAttribute("data-text"));
-                utterThis.voice = voice;
-                utterThis.onend = () => {
-                    speechDom.className = "vditor-speech";
-                    speechSynthesis.cancel();
-                    speechDom.innerHTML = playSVG;
-                };
+    element.addEventListener(window.ontouchstart !== undefined ? "touchend" : "click", (event) => {
+        const target = event.target as HTMLElement
+        if (target.classList.contains("vditor-speech") || target.parentElement.classList.contains("vditor-speech")) {
+            if (!speechDom.classList.contains("vditor-speech--current")) {
+                utterThis.text = speechDom.getAttribute("data-text");
                 speechSynthesis.speak(utterThis);
-                speechDom.className = "vditor-speech vditor-speech--current";
+                speechDom.classList.add("vditor-speech--current");
                 speechDom.innerHTML = pauseSVG;
             } else {
                 if (speechSynthesis.speaking) {
@@ -67,35 +74,34 @@ export const speechRender = (element: HTMLElement, lang: keyof II18n = "zh_CN")
                     }
                 }
             }
-
             setSelectionFocus(window.vditorSpeechRange);
-        };
-
-        document.body.addEventListener("click", () => {
-            if (getSelection().toString().trim() === "" && speechDom.style.display === "block") {
-                speechDom.className = "vditor-speech";
-                speechSynthesis.cancel();
-                speechDom.style.display = "none";
-            }
-        });
-    }
+            element.focus();
+            return;
+        }
 
-    element.addEventListener("mouseup", (event: MouseEvent) => {
-        const text = getSelection().toString().trim();
+        speechDom.style.display = "none";
         speechSynthesis.cancel();
-        if (getSelection().toString().trim() === "") {
-            if (speechDom.style.display === "block") {
-                speechDom.className = "vditor-speech";
-                speechDom.style.display = "none";
-            }
+        speechDom.classList.remove("vditor-speech--current");
+        speechDom.innerHTML = playSVG;
+
+        if (getSelection().rangeCount === 0) {
             return;
         }
-        window.vditorSpeechRange = getSelection().getRangeAt(0).cloneRange();
-        const rect = getSelection().getRangeAt(0).getBoundingClientRect();
+        const range = getSelection().getRangeAt(0)
+        const text = range.toString().trim();
+        if (!text) {
+            return;
+        }
+        window.vditorSpeechRange = range.cloneRange();
+        const rect = range.getBoundingClientRect();
         speechDom.innerHTML = playSVG;
         speechDom.style.display = "block";
         speechDom.style.top = (rect.top + rect.height + document.querySelector("html").scrollTop - 20) + "px";
-        speechDom.style.left = (event.clientX + 2) + "px";
+        if (window.ontouchstart !== undefined) {
+            speechDom.style.left = ((event as TouchEvent).changedTouches[(event as TouchEvent).changedTouches.length - 1].pageX + 2) + "px";
+        } else {
+            speechDom.style.left = ((event as MouseEvent).clientX + 2) + "px";
+        }
         speechDom.setAttribute("data-text", text);
     });
 };

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/ui/setCodeTheme.ts

@@ -9,7 +9,7 @@ export const setCodeTheme = (codeTheme: string, cdn = Constants.CDN) => {
     const href = `${cdn}/dist/js/highlight.js/styles/${codeTheme}.css`;
     if (!vditorHljsStyle) {
         addStyle(href, "vditorHljsStyle");
-    } else if (vditorHljsStyle.href !== href) {
+    } else if (vditorHljsStyle.getAttribute('href') !== href) {
         vditorHljsStyle.remove();
         addStyle(href, "vditorHljsStyle");
     }

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") {