@ones-editor/editor 2.6.9-beta.1 → 2.7.0

package/dist/index.js

@@ -10759,7 +10759,7 @@ var __publicField = (obj, key, value) => {
     if (parsedShortcut.key.length === 1) {
       return parsedShortcut.key === event.key.toUpperCase();
     }
-    return parsedShortcut.key.toUpperCase() === event.key.toUpperCase() || !(event.isComposing === false && event.key.toLowerCase() === "process") && parsedShortcut.key.toUpperCase() === event.code.toUpperCase();
+    return parsedShortcut.key.toUpperCase() === event.key.toUpperCase() || parsedShortcut.key.toUpperCase() === event.code.toUpperCase();
   }
   function updateUrl(url, query2) {
     return queryString.stringifyUrl({
@@ -10910,22 +10910,29 @@ var __publicField = (obj, key, value) => {
     return elementFont;
   }
   function getTextWidth(text2, font) {
-    const canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement("canvas"));
-    const context = canvas.getContext("2d");
-    if (!context) {
-      return 200;
-    }
-    if (typeof font === "string") {
-      if (!font) {
-        context.font = getStyleFont(window.getComputedStyle(document.body));
-      } else {
-        context.font = font;
+    try {
+      if (window.fakebrowser) {
+        return 200;
+      }
+      const canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement("canvas"));
+      const context = canvas.getContext("2d");
+      if (!context) {
+        return 200;
       }
-    } else if (font instanceof Element) {
-      context.font = getStyleFont(window.getComputedStyle(font));
+      if (typeof font === "string") {
+        if (!font) {
+          context.font = getStyleFont(window.getComputedStyle(document.body));
+        } else {
+          context.font = font;
+        }
+      } else if (font instanceof Element) {
+        context.font = getStyleFont(window.getComputedStyle(font));
+      }
+      const metrics = context.measureText(text2);
+      return metrics.width + 4;
+    } catch (err) {
+      return 200;
     }
-    const metrics = context.measureText(text2);
-    return metrics.width + 4;
   }
   const logger$4N = getLogger("editor-clipboard");
   async function setClipboardDataByEvent(items, event) {
@@ -74032,12 +74039,16 @@ ${codeText}
     });
   }
   const StyleTags = {
+    i: "style-italic",
+    b: "style-bold",
     u: "style-underline",
     strong: "style-bold",
     em: "style-italic",
     del: "style-strikethrough",
     superscript: "style-superscript",
-    subscript: "style-subscript"
+    sup: "style-superscript",
+    subscript: "style-subscript",
+    sub: "style-subscript"
   };
   function applyHtmlToText(htm, attributes) {
     const html = htm.toLowerCase();
@@ -74185,6 +74196,18 @@ ${codeText}
       }
       if (token.type === "html") {
         const html = token.text;
+        const testBr = html.trim().toLowerCase();
+        if (testBr === "<br>" || testBr === "<br/>" || testBr === "<br />") {
+          return [{
+            insert: " ",
+            attributes: {
+              id: genId(),
+              created: Date.now(),
+              box: true,
+              type: "br"
+            }
+          }];
+        }
         applyHtmlToText(html, attributes);
         applyColorTagToText(html, attributes);
         applyFontSizeTagToText(html, attributes);
@@ -74219,6 +74242,22 @@ ${codeText}
           }
         }];
       }
+      if (token.type === "image") {
+        const href = token.href || "";
+        if (href) {
+          const boxData = {
+            id: genId(),
+            created: Date.now(),
+            box: true,
+            type: "image",
+            src: href
+          };
+          return [{
+            insert: " ",
+            attributes: boxData
+          }];
+        }
+      }
       logger$Q.warn(`unknown token in text: ${JSON.stringify(token)}`);
       return [];
     });
@@ -74235,6 +74274,15 @@ ${codeText}
   }
   function paragraphToBlocks(token, options) {
     const { text: text2, children } = options.tokensToTextWithChildren(token.tokens, options);
+    if (text2.length > 0 && toPlainText(text2).trim().toUpperCase() === "[TOC]") {
+      const tocBlock = {
+        id: genId(),
+        type: "embed",
+        embedType: "toc",
+        embedData: {}
+      };
+      return [tocBlock];
+    }
     const blocks = [];
     if (text2.length > 0) {
       blocks.push({
@@ -74560,15 +74608,24 @@ ${codeText}
       children: []
     };
     const groups = groupTokens(tokens);
-    groups.forEach((tokens2, index2) => {
-      const token = tokens2[0];
+    groups.forEach((childTokens, index2) => {
       if (index2 === 0) {
+        const token = childTokens[0];
         if (isInlineToken(token)) {
-          ret.text = tokensToText(tokens2, {}, options);
+          ret.text = tokensToText(childTokens, {}, options);
           return;
         }
       }
-      ret.children.push(...tokensToBlocks(tokens2, options));
+      if (childTokens.every((token) => isInlineToken(token))) {
+        const blockText = tokensToText(childTokens, {}, options);
+        ret.children.push({
+          id: genId(),
+          type: "text",
+          text: blockText
+        });
+        return;
+      }
+      ret.children.push(...tokensToBlocks(childTokens, options));
     });
     return ret;
   }
@@ -74619,7 +74676,11 @@ ${codeText}
     };
     const rootBlocks = tokensToBlocks(tokens, tokenToBlockOptions);
     if (rootBlocks.length === 0) {
-      return null;
+      rootBlocks.push({
+        id: genId(),
+        type: "text",
+        text: []
+      });
     }
     doc2.blocks.root.push(...rootBlocks);
     return doc2;
@@ -75881,8 +75942,8 @@ ${content}
       const container = document.createElement("div");
       container.classList.add("highlight-text-wizdoc");
       const code = document.createElement("pre");
+      code.textContent = base64;
       container.appendChild(code);
-      code.innerText = base64;
       node.insertAdjacentElement("beforebegin", container);
       node.remove();
       return;
@@ -92478,7 +92539,7 @@ ${data2.plantumlText}
         }
       }
     });
-    editor.version = "2.6.9-beta.1";
+    editor.version = "2.7.0";
     return editor;
   }
   function isDoc(doc2) {
@@ -92591,7 +92652,7 @@ ${data2.plantumlText}
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.6.9-beta.1";
+    editor.version = "2.7.0";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,26 +1,34 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.6.9-beta.1",
+  "version": "2.7.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@better-scroll/core": "^2.5.0",
     "@excalidraw/excalidraw": "0.15.3",
     "@guyplusplus/turndown-plugin-gfm": "^1.0.7",
+    "@types/jsdom": "^21.1.1",
+    "@types/lodash.clonedeep": "^4.5.7",
     "@types/lodash.findlastindex": "^4.6.7",
+    "@types/node": "^18.15.11",
     "axios": "^1.2.6",
     "blueimp-md5": "^2.19.0",
     "buffer": "^6.0.3",
+    "chardet": "^2.0.0",
+    "commander": "9.0.0",
     "css-color-converter": "^2.0.0",
     "docx": "^7.2.0",
     "dom-to-image": "^2.6.0",
     "events": "^3.3.0",
     "fast-sha256": "^1.3.0",
     "flowchart.js": "^1.17.1",
+    "fs-extra": "^11.2.0",
     "graphemer": "^1.4.0",
     "html-entities": "^2.0.6",
+    "iconv-lite": "^0.6.3",
     "image-size": "^1.0.0",
     "js-base64": "*",
+    "jsdom": "^22.0.0",
     "kiwi-intl": "^1.2.6-beta.0",
     "lodash": "^4.0.8",
     "lodash-es": "4.17.21",