@ones-editor/editor 3.0.2-beta.3 → 3.0.2-beta.5

package/@ones-editor/versions/src/types.d.ts

@@ -7,6 +7,7 @@ export interface VersionDialogOptions {
     enableEdit?: boolean;
     textRenders?: OnesEditorBlockRenderer[];
     autoCompareWithLastVersion?: boolean;
+    compareWith?: VersionNum;
     getDisabledTip?: () => string | undefined;
     onMemoChanged?: (version: DocVersion) => void;
     onBeforeEditMemo?: () => Promise<boolean>;

package/dist/index.js

@@ -12484,6 +12484,7 @@ var __publicField = (obj, key, value) => {
           event.stopPropagation();
           return;
         }
+        this.editor.selection.caret.update();
         if (target instanceof HTMLElement && target.draggable) {
           this.editor.selectionHandler.handleMouseDown(event);
           this.editor.selectionHandler.stopSelection();
@@ -26478,23 +26479,23 @@ var __publicField = (obj, key, value) => {
     }
   }
   function moveInputToScreenCenter(editor) {
-    const container = getScrollContainer$1(editor.rootContainer);
+    let container = getScrollContainer$1(editor.rootContainer);
+    if (!editor.rootElement.contains(container)) {
+      container = editor.rootElement;
+    }
     const rect = container.getBoundingClientRect();
-    const scale = getElementScale(container);
-    const windowWidth = window.innerWidth;
-    const windowHeight = window.innerHeight;
-    const x1 = rect.left < 0 ? 0 : rect.left;
-    const y1 = rect.top < 0 ? 0 : rect.top;
-    const x2 = rect.right > windowWidth ? windowWidth : rect.right;
-    const y2 = rect.bottom > windowHeight ? windowHeight : rect.bottom;
+    const x1 = Math.max(rect.left, 0);
+    const y1 = Math.max(rect.top, 0);
+    const x2 = Math.min(rect.right, window.innerWidth);
+    const y2 = Math.min(rect.bottom, window.innerHeight);
     const centerX = (x1 + x2) / 2;
-    const centerY = (y1 + y2) / 2;
+    const centerY = y1 + (y2 - y1) / 4;
     const input2 = editor.input.inputElement;
     const inputHeight = input2.getBoundingClientRect().height;
-    const x = 0 - rect.left + centerX;
-    const y = 0 - rect.top + centerY + container.scrollTop - inputHeight / 2;
-    input2.style.left = `${x / scale}px`;
-    input2.style.top = `${y / scale}px`;
+    const x = centerX - rect.left;
+    const y = centerY - rect.top - inputHeight / 2;
+    input2.style.left = `${x}px`;
+    input2.style.top = `${y}px`;
   }
   const logger$3T = getLogger("editor-caret");
   function getFirefoxVersion() {
@@ -83447,20 +83448,33 @@ ${docStr}
       this.versionList = versionList2;
     }
     initViewVersion() {
-      var _a, _b;
-      const autoCompareWithLastVersion = (_a = this.versionOptions) == null ? void 0 : _a.autoCompareWithLastVersion;
+      var _a, _b, _c;
+      let compareWithVersion;
+      if ((_a = this.versionOptions) == null ? void 0 : _a.compareWith) {
+        compareWithVersion = this.versions.find((v) => {
+          var _a2, _b2;
+          if (v.version === ((_a2 = this.versionOptions) == null ? void 0 : _a2.compareWith)) {
+            return true;
+          }
+          if (getVersionName(v) === ((_b2 = this.versionOptions) == null ? void 0 : _b2.compareWith)) {
+            return true;
+          }
+          return false;
+        });
+      }
+      const autoCompareWithLastVersion = (_b = this.versionOptions) == null ? void 0 : _b.autoCompareWithLastVersion;
       assert(logger$y, this.versionList, "no versionList");
-      if ((_b = this.versionOptions) == null ? void 0 : _b.initSelectedVersion) {
+      if ((_c = this.versionOptions) == null ? void 0 : _c.initSelectedVersion) {
         const { initSelectedVersion: versionNumber } = this.versionOptions;
         const version2 = this.versionList.selectVersionByVersionNum(versionNumber);
         if (version2) {
-          this.viewVersion(version2, void 0, { autoCompareWithLastVersion });
+          this.viewVersion(version2, compareWithVersion, { autoCompareWithLastVersion });
           return;
         }
       }
       const version = this.versionList.activeVersion;
       if (version) {
-        this.viewVersion(version, void 0, { autoCompareWithLastVersion });
+        this.viewVersion(version, compareWithVersion, { autoCompareWithLastVersion });
       }
     }
     renderEditorLoading() {
@@ -96032,7 +96046,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.2-beta.3";
+    editor.version = "3.0.2-beta.5";
     return editor;
   }
   function isDoc(doc2) {
@@ -96166,7 +96180,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "3.0.2-beta.3";
+    editor.version = "3.0.2-beta.5";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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