@ones-editor/editor 3.0.12-beta.2 → 3.0.12-beta.4

package/@ones-editor/versions/src/history-doc/history-doc.d.ts

@@ -8,7 +8,7 @@ export default class HistoryDoc extends EventCallbacks<OnesEditorDocCallbacks> i
     beginBatchUpdate(): number;
     endBatchUpdate(): number;
     toJSON(): DocObject;
-    applyingOps(): boolean;
+    applyingRemoteOps(): boolean;
     getContainerBlocks(containerId: string): DocBlock[];
     findContainerBlocks(containerId: string): DocBlock[];
     getBlockData(containerId: string, blockIndex: number): DocBlock;

package/dist/error-handler/index.d.ts

@@ -8,7 +8,8 @@ export default class DefaultErrorHandler implements ErrorHandler {
     private _dirtyFlag;
     private _connectionFlag;
     private _offlineFlag;
-    private _errorMessage;
+    private _pendingErrorMessage;
+    private _showErrorDebounced;
     constructor();
     destroy(): void;
     private _handleOffline;

package/dist/index.js

@@ -29007,7 +29007,7 @@ var __publicField = (obj, key, value) => {
         if (rangeInBlock(deletedBlock, range)) {
           logger$3q.debug("adjust selection because remote deleted current block");
           const newRange = moveSelectionBeforeDeleteBlock(editor, deletedBlock);
-          this.setRange(newRange, { noScroll: true });
+          this.setRange(newRange, { noScroll: true, local: false });
         }
       });
       this.editor = editor;
@@ -29083,7 +29083,13 @@ var __publicField = (obj, key, value) => {
       }
       const old = this._range;
       this._range = newRange;
-      this.selectionChanged();
+      if ((options == null ? void 0 : options.local) === false) {
+        setTimeout(() => {
+          this.selectionChanged();
+        });
+      } else {
+        this.selectionChanged();
+      }
       this.updateFocusedBlock(old);
       if (hasClass(this.editor.rootContainer, "select-all")) {
         if (!newRange.isSimple() || !allSelected(this.editor, newRange)) {
@@ -30798,9 +30804,9 @@ ${codeText}
     endBatchUpdate() {
       return this.externalDoc.endBatchUpdate();
     }
-    applyingOps() {
+    applyingRemoteOps() {
       var _a, _b;
-      return ((_b = (_a = this.externalDoc).applyingOps) == null ? void 0 : _b.call(_a)) || false;
+      return ((_b = (_a = this.externalDoc).applyingRemoteOps) == null ? void 0 : _b.call(_a)) || false;
     }
     registerLocalEvents(events2) {
       this.localEvents.push(events2);
@@ -32721,7 +32727,7 @@ ${codeText}
     rawData() {
       return this.doc;
     }
-    applyingOps() {
+    applyingRemoteOps() {
       return false;
     }
     getContainerBlocks(containerId) {
@@ -38382,6 +38388,8 @@ ${codeText}
       __publicField(this, "closed", false);
       __publicField(this, "connection");
       __publicField(this, "ws");
+      __publicField(this, "visibilityListenerRegistered", false);
+      __publicField(this, "connectionDisconnected", false);
       __publicField(this, "token", null);
       __publicField(this, "resourceToken", null);
       __publicField(this, "authMessage");
@@ -38435,8 +38443,20 @@ ${codeText}
         this.emit("connectionError", err);
       });
       __publicField(this, "handleDisconnected", (reason) => {
+        this.connectionDisconnected = true;
         this.emit("disconnected", reason);
       });
+      __publicField(this, "handleVisibilityChange", () => {
+        var _a, _b;
+        const state = document.visibilityState || "unknown";
+        if (state === "visible") {
+          const readyState = (_a = this.ws) == null ? void 0 : _a.readyState;
+          const wsActive = readyState === ReconnectingWebSocket__default.default.CONNECTING || readyState === ReconnectingWebSocket__default.default.OPEN;
+          if (!wsActive || this.connectionDisconnected) {
+            (_b = this.ws) == null ? void 0 : _b.reconnect();
+          }
+        }
+      });
       this.url = url;
       this.renewTokenFunc = renewTokenFunc;
       this.authMessage = authMessage;
@@ -38503,6 +38523,7 @@ ${codeText}
         maxReconnectionDelay: 2500 * 5,
         minReconnectionDelay: 1e3 * 5
       });
+      this.registerVisibilityListener();
       this.connection = Object.create(Connection.prototype);
       assert(logger$2$, this.connection, "no this.connection");
       const thatWs = this.ws;
@@ -38549,6 +38570,7 @@ ${codeText}
             if (!this.ready) {
               this.emit("ready");
               this.ready = true;
+              this.connectionDisconnected = false;
             }
           }
           try {
@@ -38638,12 +38660,27 @@ ${codeText}
       if ((_d = this.connection) == null ? void 0 : _d._ping)
         window.clearInterval(this.connection._ping);
       this.connection = void 0;
+      this.unregisterVisibilityListener();
       (_e = this.ws) == null ? void 0 : _e.close();
       this.ws = void 0;
       if (logout) {
         this.logout();
       }
     }
+    registerVisibilityListener() {
+      if (this.visibilityListenerRegistered) {
+        return;
+      }
+      this.visibilityListenerRegistered = true;
+      window.addEventListener("visibilitychange", this.handleVisibilityChange);
+    }
+    unregisterVisibilityListener() {
+      if (!this.visibilityListenerRegistered) {
+        return;
+      }
+      this.visibilityListenerRegistered = false;
+      window.removeEventListener("visibilitychange", this.handleVisibilityChange);
+    }
   }
   getLogger("utils/file");
   function fixMethodArrayBuffer() {
@@ -39706,7 +39743,7 @@ ${codeText}
       __publicField(this, "disableLogout");
       __publicField(this, "destroyed", false);
       __publicField(this, "editStatus");
-      __publicField(this, "_applyingOps", false);
+      __publicField(this, "_applyingRemoteOps", false);
       __publicField(this, "handleNothingPending", () => {
         this.setStatus("clean");
       });
@@ -39891,14 +39928,16 @@ ${codeText}
           return;
         }
         try {
-          this._applyingOps = true;
           const local = !!source;
+          if (!local) {
+            this._applyingRemoteOps = true;
+          }
           parseOps(ops, this, local);
         } catch (err) {
           logger$2U.error(err);
           throw err;
         } finally {
-          this._applyingOps = false;
+          this._applyingRemoteOps = false;
         }
       });
       this.options = options;
@@ -39923,8 +39962,8 @@ ${codeText}
       }
       return this.batching;
     }
-    applyingOps() {
-      return this._applyingOps;
+    applyingRemoteOps() {
+      return this._applyingRemoteOps;
     }
     static async load(options) {
       try {
@@ -53541,7 +53580,7 @@ ${codeText}
     handleDeleteBlock: (editor, block) => {
       var _a, _b;
       if (isListBlock(block)) {
-        if ((_b = (_a = editor.doc).applyingOps) == null ? void 0 : _b.call(_a)) {
+        if ((_b = (_a = editor.doc).applyingRemoteOps) == null ? void 0 : _b.call(_a)) {
           return;
         }
         const fixStart = new FixStartByWillDeletedList(editor, block);
@@ -82949,7 +82988,7 @@ ${docStr}
     toJSON() {
       return cloneDeep__default.default(this.docObject);
     }
-    applyingOps() {
+    applyingRemoteOps() {
       return false;
     }
     getContainerBlocks(containerId) {
@@ -88392,7 +88431,12 @@ ${data2.flowchartText}
   function getBlockProperties$3(editor, block) {
     const properties = getStandardEmbedBlockProperties(editor, block, {
       handleExecuteCommand: (editor2, block2, item) => {
+        var _a, _b;
         if (item.id === "edit") {
+          const drawioOptions = getDrawioOptions(editor2);
+          if (((_b = (_a = drawioOptions.callbacks) == null ? void 0 : _a.onBeforeInsertDrawio) == null ? void 0 : _b.call(_a, editor2)) === false) {
+            return true;
+          }
           const data2 = editor2.getBlockData(block2).embedData;
           editGraph(editor2, block2, data2, false);
           return true;
@@ -88592,9 +88636,9 @@ ${data2.flowchartText}
       root2.appendChild(suffixElem);
       return root2;
     } : void 0;
-    return {
-      name: "UML",
-      insertEmbedCommandItems: [{
+    const insertEmbedCommandItems = [];
+    if (drawioOptions.visible !== false) {
+      insertEmbedCommandItems.push({
         id: "insert-drawio",
         name: i18n$1.t("drawio.title"),
         icon: UmlIcon,
@@ -88603,7 +88647,11 @@ ${data2.flowchartText}
         subText: getShortcutById("insert-drawio"),
         element,
         useDefaultClickHandler: true
-      }],
+      });
+    }
+    return {
+      name: "UML",
+      insertEmbedCommandItems,
       handleInsertEmptyEmbed: async (editor2, options) => {
         var _a2, _b;
         if (((_b = (_a2 = drawioOptions.callbacks) == null ? void 0 : _a2.onBeforeInsertDrawio) == null ? void 0 : _b.call(_a2, editor2)) === false) {
@@ -93654,7 +93702,19 @@ ${data2.plantumlText}
       __publicField(this, "_dirtyFlag", false);
       __publicField(this, "_connectionFlag", false);
       __publicField(this, "_offlineFlag", false);
-      __publicField(this, "_errorMessage", i18n$1.t("error.network"));
+      __publicField(this, "_pendingErrorMessage", null);
+      __publicField(this, "_showErrorDebounced", debounce__default.default(() => {
+        if (!this._pendingErrorMessage) {
+          return;
+        }
+        if (document.visibilityState === "hidden") {
+          return;
+        }
+        if (this._editor) {
+          this._editor.readonly = true;
+        }
+        this.bar.show(this._pendingErrorMessage, "error");
+      }, 1e4));
       __publicField(this, "_handleOffline", () => {
         this._offlineFlag = true;
         this.handleError(new Error("offline"));
@@ -93681,14 +93741,18 @@ ${data2.plantumlText}
         this.autoHide();
       });
       __publicField(this, "onRenewingToken", (count) => {
+        console.log(`[${new Date().toLocaleString()}] wiz-editor onRenewingToken ${count}`);
       });
       __publicField(this, "onRenewedToken", (auth) => {
+        console.log(`[${new Date().toLocaleString()}] wiz-editor onRenewedToken`);
       });
       __publicField(this, "onRenewTokenError", (error2) => {
+        console.log(`[${new Date().toLocaleString()}] wiz-editor onRenewTokenError`);
         assert(logger$7, this._editor, "no editor");
         this.handleError(error2);
       });
       __publicField(this, "onReauthing", () => {
+        console.log(`[${new Date().toLocaleString()}] wiz-editor onReauthing`);
       });
       __publicField(this, "onReauthError", (error2) => {
         assert(logger$7, this._editor, "no editor");
@@ -93759,16 +93823,19 @@ ${data2.plantumlText}
     handleError(error2, customMessage) {
       console.error(`[${new Date().toLocaleString()}] wiz-editor error: ${error2}
 ${JSON.stringify(error2, null, 2)}`);
-      if (this._editor) {
-        this._editor.readonly = true;
+      if (document.visibilityState === "hidden") {
+        return;
       }
       const defaultMessage = this.hasPopup() ? i18n$1.t("error.networkPopup") : i18n$1.t("error.network");
       const errorMessage = customMessage || defaultMessage;
-      this.bar.show(errorMessage, "error");
+      this._pendingErrorMessage = errorMessage;
+      this._showErrorDebounced();
     }
     autoHide() {
       var _a;
       if (!this._dirtyFlag && !this._connectionFlag && !this._offlineFlag) {
+        this._showErrorDebounced.cancel();
+        this._pendingErrorMessage = null;
         this.bar.hide();
         if ((_a = this._editor) == null ? void 0 : _a.readonly) {
           this._editor.readonly = false;
@@ -96850,7 +96917,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.0.12-beta.2";
+    editor.version = "3.0.12-beta.4";
     return editor;
   }
   function isDoc(doc2) {
@@ -96984,7 +97051,7 @@ ${JSON.stringify(error2, null, 2)}`);
     OnesEditorDropTarget.register(editor);
     OnesEditorTocProvider.register(editor);
     OnesEditorExclusiveBlock.register(editor);
-    editor.version = "3.0.12-beta.2";
+    editor.version = "3.0.12-beta.4";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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