@ones-editor/editor 3.0.1-beta.8 → 3.0.2-beta.1

package/dist/index.js

@@ -8948,7 +8948,7 @@ div.editor-root.compact.no-heading-collapse.no-block-menu > .editor-content {
   display: none;
 }
 .error-info-bar[data-type=error] .content {
-  background: rgba(0, 36, 90, 0.0392156863);
+  background: #f6f7f9;
   color: #575859;
 }
 .error-info-bar[data-type=warning] .content {
@@ -24745,6 +24745,15 @@ var __publicField = (obj, key, value) => {
     }
     return new EditorSimpleSelectionRange(editor, { anchor: startPos, focus: endPos != null ? endPos : startPos });
   }
+  function apiResultToDocVersions(versions) {
+    if (Array.isArray(versions)) {
+      return versions.map((v, index2, arr) => ({
+        ...v,
+        versionIndex: arr.length - index2
+      }));
+    }
+    return versions;
+  }
   const logger$48 = getLogger("create-text-op");
   function createTextOp(text2, attributes) {
     assert(logger$48, text2, "text is empty");
@@ -38820,7 +38829,7 @@ ${codeText}
       const server = this.apiServer();
       const api = `${server}/versions?withExtra=true`;
       const ret = await this.request(api);
-      const versions = ret.data.versions;
+      const versions = apiResultToDocVersions(ret.data.versions);
       versions.forEach((v) => {
         if (v.extra) {
           v.extra = JSON.parse(v.extra);
@@ -40695,7 +40704,7 @@ ${codeText}
       const ret = await this.request(api, {
         params
       });
-      const versions = ret.data.versions;
+      const versions = apiResultToDocVersions(ret.data.versions);
       versions.forEach((v) => {
         if (v.extra) {
           v.extra = JSON.parse(v.extra);
@@ -53246,59 +53255,57 @@ ${codeText}
     async handleBeforePasteDoc(editor, doc2) {
       const groupIds = /* @__PURE__ */ new Map();
       const startIds = /* @__PURE__ */ new Map();
-      Object.values(doc2.blocks).forEach((blocks) => {
-        blocks.forEach((block, index2) => {
-          if (block.type === "list") {
-            if (index2 === 0) {
-              const startBlock = editor.selection.startBlock;
-              if (isListBlock(startBlock)) {
-                const { start, groupId: groupId2, level, type } = getListBlockProperties(startBlock);
-                const newType = getListType(block);
+      doc2.blocks.root.forEach((block, index2) => {
+        if (block.type === "list") {
+          if (index2 === 0) {
+            const startBlock = editor.selection.startBlock;
+            if (isListBlock(startBlock)) {
+              const { start, groupId: groupId2, level, type } = getListBlockProperties(startBlock);
+              const newType = getListType(block);
+              const oldGroupId = block.groupId;
+              block.groupId = groupId2;
+              block.start = start;
+              block.level = level;
+              const data2 = makeListBlockTypeData(type);
+              Object.assign(block, data2);
+              if (level === block.level && type === newType) {
+                groupIds.set(oldGroupId, groupId2);
+                startIds.set(groupId2, start);
+              }
+              this.fixStartByList = new FixStartByWillDeletedList(editor, startBlock);
+              return;
+            }
+            const preBlock = getPrevBlock(startBlock);
+            if (preBlock && isListBlock(preBlock)) {
+              const { start, groupId: groupId2, level, type } = getListBlockProperties(preBlock);
+              const newType = getListType(block);
+              if (level === block.level && type === newType) {
                 const oldGroupId = block.groupId;
                 block.groupId = groupId2;
-                block.start = start;
+                block.start = start + 1;
                 block.level = level;
-                const data2 = makeListBlockTypeData(type);
-                Object.assign(block, data2);
-                if (level === block.level && type === newType) {
-                  groupIds.set(oldGroupId, groupId2);
-                  startIds.set(groupId2, start);
-                }
-                this.fixStartByList = new FixStartByWillDeletedList(editor, startBlock);
+                groupIds.set(oldGroupId, groupId2);
+                startIds.set(groupId2, start + 1);
+                this.fixStartByList = new FixStartByWillDeletedList(editor, preBlock);
                 return;
               }
-              const preBlock = getPrevBlock(startBlock);
-              if (preBlock && isListBlock(preBlock)) {
-                const { start, groupId: groupId2, level, type } = getListBlockProperties(preBlock);
-                const newType = getListType(block);
-                if (level === block.level && type === newType) {
-                  const oldGroupId = block.groupId;
-                  block.groupId = groupId2;
-                  block.start = start + 1;
-                  block.level = level;
-                  groupIds.set(oldGroupId, groupId2);
-                  startIds.set(groupId2, start + 1);
-                  this.fixStartByList = new FixStartByWillDeletedList(editor, preBlock);
-                  return;
-                }
-              }
-            }
-            const groupId = groupIds.get(block.groupId);
-            if (!groupId) {
-              const newGroupId = genId();
-              groupIds.set(block.groupId, newGroupId);
-              block.groupId = newGroupId;
-              block.start = 1;
-              startIds.set(newGroupId, 1);
-            } else {
-              const start = startIds.get(groupId);
-              assert(logger$21, start, "start is null");
-              block.start = start + 1;
-              block.groupId = groupId;
-              startIds.set(groupId, start + 1);
             }
           }
-        });
+          const groupId = groupIds.get(block.groupId);
+          if (!groupId) {
+            const newGroupId = genId();
+            groupIds.set(block.groupId, newGroupId);
+            block.groupId = newGroupId;
+            block.start = 1;
+            startIds.set(newGroupId, 1);
+          } else {
+            const start = startIds.get(groupId);
+            assert(logger$21, start, "start is null");
+            block.start = start + 1;
+            block.groupId = groupId;
+            startIds.set(groupId, start + 1);
+          }
+        }
       });
       return false;
     }
@@ -67331,6 +67338,7 @@ ${codeText}
       });
       editor.addListener("blur", this.removePlaceholder);
       editor.addListener("focus", this.applyPlaceholder);
+      editor.blockHooks.push(this);
     }
     destroy(editor) {
       editor.removeListener("selectionChanged", this.handleSelectionChange);
@@ -67415,6 +67423,11 @@ ${codeText}
     handleUpdateCompositionText(editor) {
       this.applyPlaceholder(editor);
     }
+    update(editor, path, container, blockElement, blockData) {
+      if (path.length === 1 && this.isDocumentTitleBlock(path[0].containerId, path[0].blockIndex)) {
+        blockElement.setAttribute("data-document-title", "");
+      }
+    }
     removePlaceholder(editor) {
       removeAllPlaceholders(editor);
     }
@@ -75476,6 +75489,11 @@ ${codeText}
         });
       });
       __publicField(this, "handleClose", () => {
+        const activeElem = document.activeElement;
+        const tagName = activeElem ? activeElem.tagName.toLowerCase() : "";
+        if (tagName === "input" || tagName === "textarea") {
+          return;
+        }
         this.editor.focus();
       });
       __publicField(this, "handleSelectionChange", () => {
@@ -78865,14 +78883,13 @@ ${docStr}
         insertIndex += 1;
       } else {
         editor.clearSelectedContents();
-        const { blockId } = editor.selection.range.start;
+        const { blockId, offset } = editor.selection.range.start;
         const block = editor.getBlockById(blockId);
         insertIndex = getBlockIndex(block);
         container = getParentContainer(block);
-        if (!isEmptyTextBlock(editor, block)) {
+        if (!isEmptyTextBlock(editor, block) && offset > 0) {
           insertIndex += 1;
-        }
-        if (isRootContainer(container) && insertIndex === 0) {
+        } else if (isRootContainer(container) && insertIndex === 0 && isTitleBlock$2(block)) {
           insertIndex += 1;
         }
       }
@@ -81583,6 +81600,9 @@ ${docStr}
     var _a;
     let name;
     if (ver.version !== -1) {
+      if (typeof ver.versionIndex === "number") {
+        return `v${ver.versionIndex}`;
+      }
       const date = new Date((_a = ver.created) != null ? _a : ver.version);
       name = formatDate(date, "YYYY-MM-DD hh:mm");
     } else {
@@ -81890,11 +81910,6 @@ ${docStr}
       };
       versions.forEach((ver, index2) => {
         addVersion(ver, false, versions, ver.created === this.options.versions[0].created);
-        if (ver.minorVersions && ver.minorVersions.length > 0) {
-          ver.minorVersions.forEach((v) => {
-            addVersion(v, true, versions, false);
-          });
-        }
       });
       return versionListFragment;
     }
@@ -81956,6 +81971,16 @@ ${docStr}
       }
     }
     getVersionItemByVersionNum(version) {
+      if (typeof version === "string" && version.startsWith("v")) {
+        const index2 = Number.parseInt(version.substring(1), 10);
+        const versionItem2 = Array.from(this.versionsList.children).find(
+          (e2) => e2.versionData.versionIndex === index2
+        );
+        if (this.isVersionElement(versionItem2)) {
+          return versionItem2;
+        }
+        return null;
+      }
       const versionItem = Array.from(this.versionsList.children).find(
         (e2) => e2.versionData.version.toString() === `${version}`
       );
@@ -83358,7 +83383,10 @@ ${docStr}
       const versionList2 = new VersionList({
         enableEdit: ((_a = this.versionOptions) == null ? void 0 : _a.enableEdit) || false,
         getDisabledTip: (_b = this.versionOptions) == null ? void 0 : _b.getDisabledTip,
-        versions,
+        versions: versions.map((i, index2, arr) => ({
+          ...i,
+          versionIndex: arr.length - index2
+        })),
         versionHelper: this.versionHelper,
         useCreatedBy: (_c = this.versionOptions) == null ? void 0 : _c.useCreatedBy,
         onSelectVersion: this.handleSelectVersion,
@@ -91418,7 +91446,7 @@ ${data2.plantumlText}
   })(ReservedMediaSrcType || {});
   const DefaultMaxSize = 10 * 1024 * 1024;
   const DefaultAudioExt = ["wav", "mp3", "aac", "ogg", "webm", "flac"];
-  const DefaultVideoExt = ["ogg", "mp4", "webm"];
+  const DefaultVideoExt = ["ogg", "mp4", "webm", "mov", "avi"];
   const noop = () => {
   };
   function getMediaOptionsFromEditor(editor) {
@@ -93376,7 +93404,7 @@ ${JSON.stringify(error2, null, 2)}`);
     return void 0;
   }
   function inlineStyleFontFamily(text2) {
-    return attributesOfText(text2, "inline-style-font-family");
+    return void 0;
   }
   function inlineStyleBackgroundColor(text2) {
     const color = attributesOfText(text2, "inline-style-background-color");
@@ -93403,7 +93431,7 @@ ${JSON.stringify(error2, null, 2)}`);
       subScript: !!attributesOfText(text2, "style-sub"),
       math: attributesOfText(text2, "type") === "math" ? attributesOfText(text2, "src") : void 0,
       mention: isMention,
-      fontFamily: inlineStyleFontFamily(text2),
+      fontFamily: inlineStyleFontFamily(),
       background: inlineStyleBackgroundColor(text2),
       color: isMention ? "338fe5" : styleColorToColor(attributeOfStyleColor(text2, "style-color-", 6)) || inlineStyleColor(text2),
       highlight: attributeOfStyleColor(text2, "style-bg-color-", 13)
@@ -95960,7 +95988,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.1-beta.8";
+    editor.version = "3.0.2-beta.1";
     return editor;
   }
   function isDoc(doc2) {
@@ -96094,7 +96122,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "3.0.1-beta.8";
+    editor.version = "3.0.2-beta.1";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -142186,6 +142214,7 @@ ${JSON.stringify(error2, null, 2)}`);
   exports2.addMonths = addMonths;
   exports2.adjustSelectionPos = adjustSelectionPos$1;
   exports2.animateScrollTo = animateScrollTo;
+  exports2.apiResultToDocVersions = apiResultToDocVersions;
   exports2.applyPlaceholderToBlock = applyPlaceholderToBlock;
   exports2.assert = assert;
   exports2.autoShowHideTemplates = autoShowHideTemplates;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "3.0.1-beta.8",
+  "version": "3.0.2-beta.1",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {