@ones-editor/editor 2.1.7-beta.19 → 2.1.7-beta.20

package/@ones-editor/ui-base/src/dropdown/index.d.ts

@@ -28,6 +28,7 @@ export declare class Dropdown {
     close(): void;
     destroy(): void;
     updateItems(items: CommandItem[]): void;
+    getItems(): CommandItem[];
     setText(text: string): void;
     clear(): void;
     setLabels(labels: string[]): void;

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

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

package/@ones-editor/versions/src/version-dialog/versions-dropdown.d.ts

@@ -18,8 +18,10 @@ export default class VersionsDropdown {
     createFilterMemoedFilterItem: (hasLastVersion: boolean) => HTMLDivElement;
     setVersions(versions: DocVersion[]): void;
     setCurrentVersion(ver: DocVersion, compareWithVersion?: DocVersion): void;
+    setCompareWithVersion(compareWithVersion: DocVersion | null): void;
     resetItems(): void;
     filterItems: (item: CommandItem, keywords: string) => boolean;
+    getLastVersion(): DocVersion | null;
     handleClose: () => void;
     handleClear: () => void;
     handleClickItem: (item: CommandItem) => void;

package/dist/index.js

@@ -41058,6 +41058,9 @@ ${codeText}
       this.items = items;
       this.autoSuggest.handleSearchText("");
     }
+    getItems() {
+      return this.items;
+    }
     setText(text2) {
       this.text.innerText = text2;
       this.input.value = text2;
@@ -77470,6 +77473,26 @@ ${content}
       this.compareWithVersion = compareWithVersion != null ? compareWithVersion : null;
       this.resetItems();
     }
+    setCompareWithVersion(compareWithVersion) {
+      this.compareWithVersion = compareWithVersion;
+      if (compareWithVersion) {
+        const index2 = this.dropdown.getItems().findIndex((item) => {
+          const version = item.data;
+          if (version) {
+            if (version.version === compareWithVersion.version && version.created === compareWithVersion.created) {
+              return true;
+            }
+          }
+          return false;
+        });
+        if (index2 !== -1) {
+          const item = this.dropdown.getItems()[index2];
+          this.dropdown.setText(item.name);
+        }
+      } else {
+        this.dropdown.setText("");
+      }
+    }
     resetItems() {
       var _a;
       if (this.versions.length === 0) {
@@ -77585,6 +77608,13 @@ ${content}
       }
       this.dropdown.updateItems(items);
     }
+    getLastVersion() {
+      const lastItem = this.dropdown.getItems().find((item) => item.id === "last-version");
+      if (lastItem) {
+        return lastItem.data;
+      }
+      return null;
+    }
   }
   class VersionInfoHeader {
     constructor(parent, options) {
@@ -77639,10 +77669,16 @@ ${content}
         var _a, _b;
         (_b = (_a = this.versionOptions) == null ? void 0 : _a.onHelp) == null ? void 0 : _b.call(_a);
       });
-      __publicField(this, "viewVersion", async (version, compareWithVersion) => {
-        var _a, _b, _c, _d;
+      __publicField(this, "viewVersion", async (version, compareWithVersion, options) => {
+        var _a, _b, _c, _d, _e;
         const isLatest = this.versions[0].created === version.created;
         this.components.infoHeader.setVersion(version, compareWithVersion, isLatest);
+        if (!compareWithVersion && (options == null ? void 0 : options.autoCompareWithLastVersion)) {
+          compareWithVersion = (_a = this.components.infoHeader.dropdown.getLastVersion()) != null ? _a : void 0;
+          if (compareWithVersion) {
+            this.components.infoHeader.dropdown.setCompareWithVersion(compareWithVersion);
+          }
+        }
         if (this.oldViewer) {
           this.oldViewer.destroy();
           this.oldViewer = null;
@@ -77650,7 +77686,7 @@ ${content}
         if (!this.versionList) {
           return;
         }
-        if (((_a = this.versionOptions) == null ? void 0 : _a.onWillChangeVersion) && !await this.versionOptions.onWillChangeVersion(this, version)) {
+        if (((_b = this.versionOptions) == null ? void 0 : _b.onWillChangeVersion) && !await this.versionOptions.onWillChangeVersion(this, version)) {
           return;
         }
         this.renderEditorLoading();
@@ -77673,14 +77709,14 @@ ${content}
         const viewer = this.provider.createHistoryEditor(editorElement, historyDoc);
         viewer.editorBlockRenders.registerRender(new OnesEditorHistoryRender());
         viewer.editorBoxes.registerBoxClass(HistoryDeletedTextBox);
-        (_c = (_b = this.versionOptions) == null ? void 0 : _b.textRenders) == null ? void 0 : _c.forEach((render) => viewer.editorBlockRenders.registerRender(render));
+        (_d = (_c = this.versionOptions) == null ? void 0 : _c.textRenders) == null ? void 0 : _d.forEach((render) => viewer.editorBlockRenders.registerRender(render));
         addClass(viewer.rootElement, HistoryClass.HISTORY);
         try {
           await playHistoryData(historyDoc, this.versionHelper, historyData);
         } finally {
           this.oldViewer = viewer;
         }
-        if ((_d = this.versionOptions) == null ? void 0 : _d.onVersionChanged) {
+        if ((_e = this.versionOptions) == null ? void 0 : _e.onVersionChanged) {
           this.versionOptions.onVersionChanged(this, viewer, version);
         }
       });
@@ -77740,19 +77776,20 @@ ${content}
       this.versionList = versionList2;
     }
     initViewVersion() {
-      var _a;
+      var _a, _b;
+      const autoCompareWithLastVersion = (_a = this.versionOptions) == null ? void 0 : _a.autoCompareWithLastVersion;
       assert(logger$r, this.versionList, "no versionList");
-      if ((_a = this.versionOptions) == null ? void 0 : _a.initSelectedVersion) {
+      if ((_b = this.versionOptions) == null ? void 0 : _b.initSelectedVersion) {
         const { initSelectedVersion: versionNumber } = this.versionOptions;
         const version2 = this.versionList.selectVersionByVersionNum(versionNumber);
         if (version2) {
-          this.viewVersion(version2);
+          this.viewVersion(version2, void 0, { autoCompareWithLastVersion });
           return;
         }
       }
       const version = this.versionList.activeVersion;
       if (version) {
-        this.viewVersion(version);
+        this.viewVersion(version, void 0, { autoCompareWithLastVersion });
       }
     }
     renderEditorLoading() {
@@ -87818,7 +87855,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.1.7-beta.19";
+    editor.version = "2.1.7-beta.20";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -87937,7 +87974,7 @@ ${data2.flowchartText}
       }
     }
     OnesEditorToolbar.register(editor);
-    editor.version = "2.1.7-beta.19";
+    editor.version = "2.1.7-beta.20";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.1.7-beta.19",
+  "version": "2.1.7-beta.20",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",