@seafile/sdoc-editor 0.1.115 → 0.1.117

package/dist/basic-sdk/constants/index.js

@@ -0,0 +1,6 @@
+export var INTERNAL_EVENT = {
+  CANCEL_TABLE_SELECT_RANGE: 'cancel_table_select_range',
+  SET_TABLE_SELECT_RANGE: 'set_table_select_range',
+  HIDDEN_CODE_BLOCK_HOVER_MENU: 'hidden_code_block_hover_menu'
+};
+export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]

package/dist/basic-sdk/editor.js

@@ -8,7 +8,7 @@ import withNodeId from './node-id';
 import SDocOutline from './outline';
 import EventProxy from './utils/event-handler';
 import { useCursors } from './cursor/use-cursors';
-import { EXTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from '../constants';
+import { INTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from './constants';
 import { SetNodeToDecorations } from './highlight-decorate/setNodeToDecorations';
 import { ScrollContext } from './hooks/use-scroll-context';
 import CommentContextProvider from './comment/comment-context-provider';
@@ -88,7 +88,7 @@ var SDocEditor = forwardRef(function (_ref, ref) {
     if (event.button === 0) {
       editor.reSetTableSelectedRange();
       var eventBus = EventBus.getInstance();
-      eventBus.dispatch(EXTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
+      eventBus.dispatch(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

package/dist/basic-sdk/extension/plugins/code-block/render-elem.js

@@ -7,7 +7,7 @@ import EventBus from '../../../utils/event-bus';
 import { useScrollContext } from '../../../hooks/use-scroll-context';
 import CodeBlockHoverMenu from './hover-menu';
 import { setClipboardData } from './helpers';
-import { EXTERNAL_EVENT } from '../../../../constants';
+import { INTERNAL_EVENT } from '../../../constants';
 import '../../../assets/css/code-block.css';
 var CodeBlock = function CodeBlock(_ref) {
   var codeBlockProps = _ref.codeBlockProps;
@@ -122,7 +122,7 @@ var CodeBlock = function CodeBlock(_ref) {
   }, []);
   useEffect(function () {
     var eventBus = EventBus.getInstance();
-    eventBus.subscribe(EXTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU, onHiddenHoverMenu);
+    eventBus.subscribe(INTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU, onHiddenHoverMenu);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/React.createElement("div", {

package/dist/basic-sdk/extension/plugins/table/helpers.js

@@ -9,7 +9,7 @@ import { getNodeType, getParentNode, getSelectedNodeByType, isTextNode, getSelec
 import { ELEMENT_TYPE, KEYBOARD, CLIPBOARD_FORMAT_KEY } from '../../constants';
 import { TABLE_MAX_ROWS, TABLE_MAX_COLUMNS, EMPTY_SELECTED_RANGE, TABLE_ROW_MIN_HEIGHT, TABLE_CELL_MIN_WIDTH, TABLE_ELEMENT, TABLE_ELEMENT_POSITION } from './constants';
 import EventBus from '../../../utils/event-bus';
-import { EXTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from '../../../../constants';
+import { INTERNAL_EVENT, PAGE_EDIT_AREA_WIDTH } from '../../../constants';
 import ObjectUtils from '../../../utils/object-utils';
 import { replacePastedDataId } from '../../../node-id/helpers';
 export var isTableMenuDisabled = function isTableMenuDisabled(editor) {
@@ -226,7 +226,7 @@ export var insertTableElement = function insertTableElement(editor, type) {
     rowIndex = _getSelectedInfo2.rowIndex,
     cellIndex = _getSelectedInfo2.cellIndex;
   var eventBus = EventBus.getInstance();
-  eventBus.dispatch(EXTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
+  eventBus.dispatch(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
   if (type === TABLE_ELEMENT.ROW) {
     if (tableSize[0] >= TABLE_MAX_ROWS) return;
     var targetPath = position === TABLE_ELEMENT_POSITION.AFTER ? [].concat(_toConsumableArray(tablePath), [rowIndex + 1]) : [].concat(_toConsumableArray(tablePath), [rowIndex]);
@@ -287,7 +287,7 @@ export var removeTableElement = function removeTableElement(editor, type) {
     rowIndex = _getSelectedInfo4.rowIndex,
     cellIndex = _getSelectedInfo4.cellIndex;
   var eventBus = EventBus.getInstance();
-  eventBus.dispatch(EXTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
+  eventBus.dispatch(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
   if (type === TABLE_ELEMENT.TABLE) {
     removeTable(editor, tablePath);
     return;
@@ -517,7 +517,7 @@ export var insertMultipleRowsAndColumns = function insertMultipleRowsAndColumns(
     rowIndex = _getSelectedInfo6.rowIndex,
     cellIndex = _getSelectedInfo6.cellIndex;
   var eventBus = EventBus.getInstance();
-  eventBus.dispatch(EXTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
+  eventBus.dispatch(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
   var insertRows = rows.slice(tableSize[0] - rowIndex);
   var insertColumns = columns.slice(tableSize[1] - cellIndex);
   var validInsertRows = insertRows.slice(0, Math.min(TABLE_MAX_ROWS - tableSize[0], insertRows.length));
@@ -623,7 +623,7 @@ export var deleteTableRangeData = function deleteTableRangeData(editor) {
   if (forceCellPath) {
     editor.tableSelectedRange = EMPTY_SELECTED_RANGE;
     var eventBus = EventBus.getInstance();
-    eventBus.dispatch(EXTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
+    eventBus.dispatch(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE);
     focusEditor(editor, forceCellPath);
     var newFocus = editor.selection.focus;
     Transforms.select(editor, {

package/dist/basic-sdk/extension/plugins/table/plugin.js

@@ -9,7 +9,7 @@ import { TABLE_MAX_ROWS, EMPTY_SELECTED_RANGE, TABLE_ELEMENT, TABLE_ELEMENT_POSI
 import ObjectUtils from '../../../utils/object-utils';
 import { getSelectedInfo, insertTableElement, removeTable, insertMultipleRowsAndColumns, setTableFragmentData, deleteTableRangeData, focusCell, deleteHandler, isTableLocation, isLastTableCell } from './helpers';
 import EventBus from '../../../utils/event-bus';
-import { EXTERNAL_EVENT } from '../../../../constants';
+import { INTERNAL_EVENT } from '../../../constants';
 var withTable = function withTable(editor) {
   var insertBreak = editor.insertBreak,
     deleteBackward = editor.deleteBackward,
@@ -39,7 +39,7 @@ var withTable = function withTable(editor) {
         maxColIndex: tableSize[1] - 1
       };
       newEditor.tableSelectedRange = allTableRange;
-      eventBus.dispatch(EXTERNAL_EVENT.SET_TABLE_SELECT_RANGE, table, allTableRange);
+      eventBus.dispatch(INTERNAL_EVENT.SET_TABLE_SELECT_RANGE, table, allTableRange);
     }
     if (isHotkey(KEYBOARD.UP, event)) {
       focusCell(newEditor, event, KEYBOARD.UP);
@@ -227,7 +227,7 @@ var withTable = function withTable(editor) {
     var _getSelectedInfo4 = getSelectedInfo(newEditor),
       table = _getSelectedInfo4.table,
       tableSize = _getSelectedInfo4.tableSize;
-    eventBus.dispatch(EXTERNAL_EVENT.SET_TABLE_SELECT_RANGE, table, {
+    eventBus.dispatch(INTERNAL_EVENT.SET_TABLE_SELECT_RANGE, table, {
       minRowIndex: 0,
       maxRowIndex: tableSize[0] - 1,
       minColIndex: 0,

package/dist/basic-sdk/extension/plugins/table/render/index.js

@@ -8,7 +8,7 @@ import { Transforms, Editor } from '@seafile/slate';
 import { EMPTY_SELECTED_RANGE } from '../constants';
 import { ResizeHandlersContext, TableSelectedRangeContext, SettingSelectRangeContext } from './hooks';
 import EventBus from '../../../../utils/event-bus';
-import { EXTERNAL_EVENT } from '../../../../../constants';
+import { INTERNAL_EVENT } from '../../../../constants';
 import { getTableColumns, setTableSelectedRange, getFirstTableCell } from '../helpers';
 import ObjectUtils from '../../../../utils/object-utils';
 import ResizeHandlers from './resize-handlers';
@@ -68,8 +68,8 @@ var Table = function Table(_ref) {
   useEffect(function () {
     if (isSelected) {
       var eventBus = EventBus.getInstance();
-      var cancelTableSelectRangeSubscribe = eventBus.subscribe(EXTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE, clearRange);
-      var setTableSelectRangeSubscribe = eventBus.subscribe(EXTERNAL_EVENT.SET_TABLE_SELECT_RANGE, setRange);
+      var cancelTableSelectRangeSubscribe = eventBus.subscribe(INTERNAL_EVENT.CANCEL_TABLE_SELECT_RANGE, clearRange);
+      var setTableSelectRangeSubscribe = eventBus.subscribe(INTERNAL_EVENT.SET_TABLE_SELECT_RANGE, setRange);
       return function () {
         cancelTableSelectRangeSubscribe();
         setTableSelectRangeSubscribe();

package/dist/basic-sdk/socket/socket-manager.js

@@ -29,13 +29,16 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       _this.isSending = false;
       return;
     }
+    if (_this._sendingOperations || _this.disconnect) return;
     _this.dispatchConnectState('is-saving');
     var version = _this.document.version;
     var operations = _this.pendingOperationList.shift();
     var selection = _this.editor.selection;
+    _this._sendingOperations = operations;
     _this.socketClient.sendOperations(operations, version, selection, _this.sendOperationsCallback);
   };
   this.sendOperationsCallback = function (result) {
+    _this._sendingOperations = null;
     if (result && result.success) {
       var serverVersion = result.version;
       _this.document['version'] = serverVersion;
@@ -55,6 +58,8 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     } else if (error_type === 'document_content_load_failed') {
       // After a short-term reconnection, the content of the document fails to load
       _this.dispatchConnectState(error_type);
+    } else if (error_type === 'Internal_server_error') {
+      _this.dispatchConnectState(error_type);
     } else if (error_type === 'operation_exec_error') {
       _this.editor.isRemote = true;
       revertOperationList(_this.editor, [operations]);
@@ -76,15 +81,11 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       });
     }
     if (_this.isExecRemoteOperations) return;
+
+    // update execute remote operations flag
     _this.isExecRemoteOperations = true;
     _this.editor.isRemote = true;
     _this.execRemoteOperations();
-
-    // reset control flag
-    Promise.resolve().then(function (_) {
-      _this.isExecRemoteOperations = false;
-      _this.editor.isRemote = false;
-    });
   };
   this.execRemoteOperations = function () {
     if (_this.remoteOperationsList.length > 0) {
@@ -123,11 +124,14 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
         // Re-execute undone operations after isRemote is set to false
         // Need resend this operations to server
         Promise.resolve().then(function (_) {
-          debug('Editor isRemote is false: %s', _this.editor.isRemote);
-          debug('Re-execute pending operations, %O', _this.revertOperationList);
+          // reset execute remote operations flag
+          _this.isExecRemoteOperations = false;
+          _this.editor.isRemote = false;
 
           // 3. Execute pending operations
           // 3.1 Re-execute operations
+          debug('Editor isRemote is false: %s', _this.editor.isRemote);
+          debug('Re-execute pending operations, %O', _this.revertOperationList);
           reExecRevertOperationList(_this.editor, _this.revertOperationList);
 
           // 3.2 Clear revert operationList
@@ -168,15 +172,11 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     // sync operations
     // content is [{version, operations}, {version, operations}, ...]
     _this.remoteOperationsList = content;
+
+    // update execute remote operations flag
     _this.isExecRemoteOperations = true;
     _this.editor.isRemote = true;
     _this.execRemoteOperations();
-
-    // reset control flag
-    Promise.resolve().then(function (_) {
-      _this.isExecRemoteOperations = false;
-      _this.editor.isRemote = false;
-    });
   };
   this.sendCursorLocation = function (location) {
     _this.socketClient.sendCursorLocation(location);
@@ -193,6 +193,21 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       deleteCursor(_this.editor, message);
       _this.editor.onCursor && _this.editor.onCursor(_this.editor.cursors);
     }
+    if (type === 'disconnect') {
+      if (_this._sendingOperations) {
+        _this.pendingOperationList.unshift(_this._sendingOperations.slice());
+        _this._sendingOperations = null;
+      }
+      _this.isSending = false;
+      _this.disconnect = true;
+
+      // Update saved state
+      var lastSavedAt = new Date().getTime();
+      _this.dispatchConnectState('saved', lastSavedAt);
+    }
+    if (type === 'reconnect') {
+      _this.disconnect = false;
+    }
     _this.eventBus.dispatch(type, message);
   };
   this.closeSocketConnect = function () {

package/dist/basic-sdk/utils/event-handler.js

@@ -4,7 +4,7 @@ import isHotkey from 'is-hotkey';
 import EventBus from '../utils/event-bus';
 import { getSelectedNodeByType } from '../extension/core/queries/';
 import { ELEMENT_TYPE } from '../extension/constants';
-import { EXTERNAL_EVENT } from '../../constants';
+import { INTERNAL_EVENT } from '../constants';
 var EventProxy = /*#__PURE__*/_createClass(function EventProxy(_editor) {
   var _this = this;
   _classCallCheck(this, EventProxy);
@@ -70,7 +70,7 @@ var EventProxy = /*#__PURE__*/_createClass(function EventProxy(_editor) {
     }
     if (getSelectedNodeByType(editor, ELEMENT_TYPE.CODE_BLOCK)) {
       var eventBus = EventBus.getInstance();
-      eventBus.dispatch(EXTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU);
+      eventBus.dispatch(INTERNAL_EVENT.HIDDEN_CODE_BLOCK_HOVER_MENU);
     }
   };
   this.onCopy = function (event) {

package/dist/components/tip-message/index.js

@@ -39,6 +39,14 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
         duration: null
       });
     };
+    _this.onOperationsSaveError = function () {
+      var t = _this.props.t;
+      var message = t('Operations_save_error_tip');
+      toaster.danger(message, {
+        hasCloseButton: false,
+        duration: null
+      });
+    };
     _this.onDisconnect = function () {
       var _this$props = _this.props,
         t = _this$props.t,
@@ -138,6 +146,7 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
       this.unsubscribeOpExecError = eventBus.subscribe('operation_exec_error', this.onOperationExecuteError);
       this.unsubscribePendingOpExceedLimit = eventBus.subscribe('pending_operations_exceed_limit', this.onPendingOpExceedLimit);
       this.unsubscribeDocumentLoadError = eventBus.subscribe('document_content_load_failed', this.onDocumentLoadError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('Internal_server_error', this.onOperationsSaveError);
     }
   }, {
     key: "componentWillUnmount",

package/dist/constants/index.js

@@ -2,9 +2,5 @@ export var EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
   UNMARK_AS_DRAFT: 'unmark_as_draft',
-  SHARE_SDOC: 'share_sdoc',
-  CANCEL_TABLE_SELECT_RANGE: 'cancel_table_select_range',
-  SET_TABLE_SELECT_RANGE: 'set_table_select_range',
-  HIDDEN_CODE_BLOCK_HOVER_MENU: 'hidden_code_block_hover_menu'
-};
-export var PAGE_EDIT_AREA_WIDTH = 672; // 672 = 794 - 2[borderLeft + borderRight] - 120[paddingLeft + paddingRight]
+  SHARE_SDOC: 'share_sdoc'
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.115",
+  "version": "0.1.117",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

package/public/locales/en/sdoc-editor.json

@@ -349,5 +349,6 @@
   "Icon_and_text_Link": "Icon and text Link",
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
-  "Local_file": "Local file"
+  "Local_file": "Local file",
+  "Operations_save_error_tip": "Operation execution failed, internal server error, please refresh the page"
 }

package/public/locales/zh-CN/sdoc-editor.json

@@ -351,5 +351,6 @@
   "Icon_and_text_Link": "图标+文字链",
   "Card": "卡片",
   "Select_sdoc_document": "选择sdoc文档",
-  "Local_file": "本地文件"
+  "Local_file": "本地文件",
+  "Operations_save_error_tip": "操作执行失败，服务器内部错误，请刷新页面"
 }