@seafile/sdoc-editor 3.0.3 → 3.0.5

package/dist/android/constants.js

@@ -7,5 +7,9 @@ exports.ACTION_TYPES = void 0;
 var ACTION_TYPES = exports.ACTION_TYPES = {
   GET_OUTLINE: 'sdoc.outline.data.get',
   SELECT_OUTLINE: 'sdoc.outline.data.select',
-  EDITOR_ACTION_TRANSFER: 'sdoc.editor.data.edit'
+  EDITOR_ACTION_TRANSFER: 'sdoc.editor.data.edit',
+  TOOLBAR_MENU_TRIGGER: 'sdoc.toolbar.menu.trigger',
+  EDITOR_CONTENT_SELECT: 'sdoc.editor.content.select',
+  EDITOR_OPERATION_EXECUTE: 'sdoc.editor.operation.execute',
+  EDITOR_SYSTEM_EVENT: 'sdoc.editor.system.event'
 };

package/dist/android/dispatch-content-select-event.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.dispatchContentSelectEvent = void 0;
+var _constants = require("../extension/constants");
+var _core = require("../extension/core");
+var _constants2 = require("./constants");
+var _jsBridge = _interopRequireDefault(require("./js-bridge"));
+var dispatchContentSelectEvent = exports.dispatchContentSelectEvent = function dispatchContentSelectEvent(editor) {
+  var topBlockEntry = (0, _core.getTopLevelBlockNode)(editor);
+  if (!topBlockEntry) return;
+  var topNode = topBlockEntry[0];
+  var topType = topNode.type;
+  if (topType === _constants.MULTI_COLUMN) {
+    var selection = editor.selection;
+    var currentNodeInColumn = (0, _core.getNode)(editor, selection.anchor.path.slice(0, 3));
+    topType = currentNodeInColumn.type;
+  }
+  // content select
+  var selectData = {
+    v: 2,
+    action: _constants2.ACTION_TYPES.EDITOR_CONTENT_SELECT,
+    data: JSON.stringify({
+      type: topType
+    })
+  };
+  _jsBridge["default"].callAndroidFunction(JSON.stringify(selectData));
+
+  // op execute
+  var opData = {
+    v: 2,
+    action: _constants2.ACTION_TYPES.EDITOR_OPERATION_EXECUTE,
+    data: JSON.stringify({
+      type: 'op-execute'
+    })
+  };
+  _jsBridge["default"].callAndroidFunction(JSON.stringify(opData));
+};

package/dist/android/dispatch-system-event.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.dispatchSystemEvent = void 0;
+var _constants = require("./constants");
+var _jsBridge = _interopRequireDefault(require("./js-bridge"));
+var dispatchSystemEvent = exports.dispatchSystemEvent = function dispatchSystemEvent(message_type) {
+  // op execute
+  var opData = {
+    v: 2,
+    action: _constants.ACTION_TYPES.EDITOR_SYSTEM_EVENT,
+    data: JSON.stringify({
+      type: message_type
+    })
+  };
+  _jsBridge["default"].callAndroidFunction(JSON.stringify(opData));
+};

package/dist/android/js-bridge.js

@@ -11,12 +11,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
   var _this = this;
   (0, _classCallCheck2["default"])(this, JSBridge);
-  (0, _defineProperty2["default"])(this, "init", function () {
+  (0, _defineProperty2["default"])(this, "init", function (editor) {
     if (window.WebViewJavascriptBridge) {
       _this.initWebViewJavascriptBridge();
     } else {
       document.addEventListener('WebViewJavascriptBridgeReady', _this.initWebViewJavascriptBridge, false);
     }
+    _this.editor = editor;
     _this.initJSEventHandler();
   });
   (0, _defineProperty2["default"])(this, "finishPage", function () {
@@ -41,7 +42,7 @@ var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
       }
       if (!parsedData) {
         responseCallback(JSON.stringify({
-          success: true
+          success: false
         }));
         return;
       }
@@ -59,7 +60,7 @@ var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
           success: false
         }));
       }
-      var execActionSucceed = eventHandler(params);
+      var execActionSucceed = eventHandler(params, _this.editor);
       if (execActionSucceed) {
         responseCallback(JSON.stringify({
           success: true

package/dist/android/mobile-message.js

@@ -0,0 +1,119 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
+var _callSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/callSuper"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _react = _interopRequireDefault(require("react"));
+var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
+var _dispatchSystemEvent = require("./dispatch-system-event");
+var MobileMessage = /*#__PURE__*/function (_React$Component) {
+  function MobileMessage(props) {
+    var _this;
+    (0, _classCallCheck2["default"])(this, MobileMessage);
+    _this = (0, _callSuper2["default"])(this, MobileMessage, [props]);
+    (0, _defineProperty2["default"])(_this, "onOperationExecuteError", function () {
+      var message = 'failed_to_execute_operation_on_server';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onSyncServerOperationError", function () {
+      var message = 'failed_to_sync_with_server_operations';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onInternalServerExecError", function () {
+      var message = 'internal_server_exec_operations_error';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onTokenExpiredError", function (msg) {
+      var message = 'token_expired_Please_refresh_the_page';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onPendingOpExceedLimit", function () {
+      var message = 'pending_operations_exceed_limit';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onDisconnect", function () {
+      var message = 'server_is_not_connected_operation_will_be_sent_to_server_later';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onReconnectError", function () {
+      if (!_this.isConnectError) {
+        _this.isConnectError = true;
+        var message = 'server_is_disconnected_reconnecting';
+        (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "onConnect", function () {
+      _this.isConnectError = false;
+    });
+    (0, _defineProperty2["default"])(_this, "onReconnect", function () {
+      _this.isConnectError = false;
+      var message = 'server_is_reconnected';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onDocumentSaving", function () {
+      var message = 'document_is_saving';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onDocumentSaved", function () {
+      var message = 'document_is_saved';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "render", function () {
+      return null;
+    });
+    _this.state = {
+      isSaved: false,
+      isSaving: false,
+      lastSavedAt: ''
+    };
+    _this.saveTimer = null;
+    return _this;
+  }
+  (0, _inherits2["default"])(MobileMessage, _React$Component);
+  return (0, _createClass2["default"])(MobileMessage, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var eventBus = _eventBus["default"].getInstance();
+      this.unsubscribeSavingEvent = eventBus.subscribe('is-saving', this.onDocumentSaving);
+      this.unsubscribeSavedEvent = eventBus.subscribe('saved', this.onDocumentSaved);
+      this.unsubscribeSavedEvent = eventBus.subscribe('connect', this.onConnect);
+      // offline reconnect
+      this.unsubscribeDisconnectEvent = eventBus.subscribe('disconnect', this.onDisconnect);
+      this.unsubscribeReconnectErrorEvent = eventBus.subscribe('reconnect_error', this.onReconnectError);
+      this.unsubscribeReconnectEvent = eventBus.subscribe('reconnect', this.onReconnect);
+
+      // server return error
+      this.unsubscribeOpExecError = eventBus.subscribe('execute_client_operations_error', this.onOperationExecuteError);
+      this.unsubscribeSyncServerOpError = eventBus.subscribe('sync_server_operations_error', this.onSyncServerOperationError);
+      this.unsubscribeDocumentLoadError = eventBus.subscribe('load_document_content_error', this.onInternalServerExecError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('save_operations_to_database_error', this.onInternalServerExecError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('token_expired', this.onTokenExpiredError);
+
+      // local error
+      this.unsubscribePendingOpExceedLimit = eventBus.subscribe('pending_operations_exceed_limit', this.onPendingOpExceedLimit);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.unsubscribeSavingEvent();
+      this.unsubscribeSavedEvent();
+      this.unsubscribeDisconnectEvent();
+      this.unsubscribeReconnectErrorEvent();
+      this.unsubscribeReconnectEvent();
+      this.unsubscribeOpExecError();
+      this.unsubscribeSyncServerOpError();
+      this.unsubscribePendingOpExceedLimit();
+      this.unsubscribeDocumentLoadError();
+      this.unsubscribeOperationsSaveError();
+      clearTimeout(this.saveTimer);
+    }
+  }]);
+}(_react["default"].Component);
+var _default = exports["default"] = MobileMessage;

package/dist/android/toolbar-trigger.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateEditorHistory = exports.registerToolbarMenuTrigger = void 0;
+var _constants = require("../extension/constants");
+var _core = require("../extension/core");
+var _helpers = require("../extension/plugins/check-list/helpers");
+var _helpers2 = require("../extension/plugins/header/helpers");
+var _helpers3 = require("../extension/plugins/list/helpers");
+var _constants2 = require("./constants");
+var _jsBridge = _interopRequireDefault(require("./js-bridge"));
+var headerTypes = [_constants.ELEMENT_TYPE.TITLE, _constants.ELEMENT_TYPE.SUBTITLE, _constants.ELEMENT_TYPE.HEADER1, _constants.ELEMENT_TYPE.HEADER2, _constants.ELEMENT_TYPE.HEADER3, _constants.ELEMENT_TYPE.HEADER4, _constants.ELEMENT_TYPE.HEADER5, _constants.ELEMENT_TYPE.HEADER6, _constants.ELEMENT_TYPE.PARAGRAPH];
+var onToolbarTrigger = function onToolbarTrigger(data, editor) {
+  var type = data.type;
+  if (headerTypes.includes(type)) {
+    var nodeEntry = (0, _core.getNearestBlockNode)(editor);
+    if (!nodeEntry) return;
+    var newType = type;
+    if (nodeEntry[0].type === type) {
+      newType = _constants.PARAGRAPH;
+    }
+    (0, _helpers2.setHeaderType)(editor, newType);
+    return;
+  }
+  if (type === _constants.UNDO) {
+    editor.undo();
+    return;
+  }
+  if (type === _constants.REDO) {
+    editor.redo();
+    return;
+  }
+  if (type === _constants.UNORDERED_LIST || type === _constants.ORDERED_LIST) {
+    (0, _helpers3.setListType)(editor, type);
+    return;
+  }
+  if (type === _constants.CHECK_LIST_ITEM) {
+    var _nodeEntry = (0, _core.getNearestBlockNode)(editor);
+    if (!_nodeEntry) return;
+    var _newType = type;
+    if (_nodeEntry[0].type === type) {
+      _newType = _constants.PARAGRAPH;
+    }
+    (0, _helpers.setCheckListItemType)(editor, _newType);
+    return;
+  }
+};
+var updateEditorHistory = exports.updateEditorHistory = function updateEditorHistory(editor) {
+  if (!window.seadroid) {
+    window.seadroid = {};
+  }
+  window.seadroid['history'] = editor.history;
+};
+var registerToolbarMenuTrigger = exports.registerToolbarMenuTrigger = function registerToolbarMenuTrigger() {
+  _jsBridge["default"].registerEventHandler(_constants2.ACTION_TYPES.TOOLBAR_MENU_TRIGGER, onToolbarTrigger);
+};

package/dist/assets/css/layout.css

@@ -73,7 +73,6 @@
 
 .sdoc-editor-container .sdoc-editor-toolbar {
   display: flex;
-  flex: 1;
   justify-content: center;
   position: relative;
   height: 44px;
@@ -96,7 +95,7 @@
 
 .sdoc-content-wrapper {
   width: 100%;
-  height: calc(100vh - 44px);
+  flex: 1;
   display: flex;
 }
 

package/dist/comment/components/comment-list.css

@@ -383,6 +383,7 @@
 }
 
 .sdoc-comment-list-container-popover {
+  z-index: 102;
   background-color: rgba(255, 255, 255);
   box-shadow: 0 1px 3px rgba(0, 0, 0, .15), 0 4px 8px 3px rgba(0, 0, 0, .15);
   border-radius: 5px;

package/dist/comment/components/editor-comment.js

@@ -65,32 +65,32 @@ var EditorComment = function EditorComment(_ref) {
       var unresolvedComments = element_comments_map[elementId].filter(function (item) {
         return !item.resolved;
       });
+      setIsShowComments(true);
       setCommentDetail((0, _objectSpread2["default"])({}, unresolvedComments));
       setIsClickedContextComment(false);
+      return;
     }
-    setIsShowComments(true);
-    if (isClickInContext) {
-      var clickedComments = [];
-      for (var _i = 0, _Object$values = Object.values(editor.element_comments_map); _i < _Object$values.length; _i++) {
-        var comments = _Object$values[_i];
-        var _iterator = (0, _createForOfIteratorHelper2["default"])(comments),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var comment = _step.value;
-            if (elementId.includes(comment.detail.text_comment_id)) {
-              clickedComments.push(comment);
-            }
+    var clickedComments = [];
+    for (var _i = 0, _Object$values = Object.values(editor.element_comments_map); _i < _Object$values.length; _i++) {
+      var comments = _Object$values[_i];
+      var _iterator = (0, _createForOfIteratorHelper2["default"])(comments),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var comment = _step.value;
+          if (elementId.includes(comment.detail.text_comment_id)) {
+            clickedComments.push(comment);
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
-      setCommentDetail((0, _objectSpread2["default"])({}, clickedComments));
-      setIsClickedContextComment(true);
     }
+    setIsShowComments(true);
+    setCommentDetail((0, _objectSpread2["default"])({}, clickedComments));
+    setIsClickedContextComment(true);
   }, [editor, element_comments_map, hiddenComment]);
   (0, _react.useEffect)(function () {
     var handleHoverContextComment = function handleHoverContextComment(event) {

package/dist/comment/provider/comment-context-provider.js

@@ -22,6 +22,7 @@ var CommentContextProvider = function CommentContextProvider(_ref) {
     dispatch = _useReducer2[1];
   (0, _useCommentMount.useCommentsMount)(dispatch);
   (0, _react.useEffect)(function () {
+    editor.element_comments_map = {};
     if (Object.keys(commentsInfo.element_comments_map).length) {
       editor.element_comments_map = commentsInfo.element_comments_map;
       var eventBus = _eventBus["default"].getInstance();

package/dist/editor/editable-article.js

@@ -189,6 +189,7 @@ var EditableArticle = function EditableArticle(_ref) {
         });
       }
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor.selection]);
   var onKeyDown = (0, _react.useCallback)(function (event) {
     var _scrollRef$current = scrollRef.current,

package/dist/editor/sdoc-editor.js

@@ -13,9 +13,12 @@ var _react = _interopRequireWildcard(require("react"));
 var _slate = require("@seafile/slate");
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
+var _dispatchContentSelectEvent = require("../android/dispatch-content-select-event");
 var _editorTitleBar = require("../android/editor-title-bar");
 var _jsBridge = _interopRequireDefault(require("../android/js-bridge"));
+var _mobileMessage = _interopRequireDefault(require("../android/mobile-message"));
 var _outlineModule = require("../android/outline-module");
+var _toolbarTrigger = require("../android/toolbar-trigger");
 var _fileLoading = _interopRequireDefault(require("../components/file-loading"));
 var _constants = require("../constants");
 var _context = _interopRequireDefault(require("../context"));
@@ -120,10 +123,12 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   (0, _react.useEffect)(function () {
     var mobileLogin = _context["default"].getSetting('mobileLogin');
     if (mobileLogin) {
-      _jsBridge["default"].init();
+      _jsBridge["default"].init(validEditor);
       (0, _outlineModule.registerOutlineEventHandler)();
       (0, _editorTitleBar.registerTitleBarEventHandler)();
+      (0, _toolbarTrigger.registerToolbarMenuTrigger)();
       (0, _outlineModule.updateOutlineValue)(document.elements);
+      (0, _toolbarTrigger.updateEditorHistory)(validEditor);
     }
     return function () {
       _jsBridge["default"].finishPage();
@@ -236,6 +241,9 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     if (_commonUtils.isMobile) {
       (0, _outlineModule.updateOutlineValue)(value);
     }
+    if (_commonUtils.isMobile && isEdit) {
+      (0, _dispatchContentSelectEvent.dispatchContentSelectEvent)(validEditor);
+    }
   };
   var isFreezed = _context["default"].getSetting('isFreezed');
   if (isReloading) {
@@ -280,6 +288,7 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }))));
   }
   var isShowComment = typeof showComment === 'boolean' ? showComment : true;
+  var mobileLogin = _context["default"].getSetting('mobileLogin');
   if (_commonUtils.isMobile && isEdit) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_layout.EditorContainer, {
       editor: validEditor
@@ -293,7 +302,7 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       slateValue: slateValue,
       updateSlateValue: onValueChange,
       showComment: false
-    })), isShowHeaderToolbar && /*#__PURE__*/_react["default"].createElement(_extension.HeaderToolbar, {
+    })), mobileLogin && /*#__PURE__*/_react["default"].createElement(_mobileMessage["default"], null), !mobileLogin && isShowHeaderToolbar && /*#__PURE__*/_react["default"].createElement(_extension.HeaderToolbar, {
       editor: validEditor,
       isEdit: isEdit
     }))), /*#__PURE__*/_react["default"].createElement(_insertElementDialog["default"], {

package/dist/extension/constants/element-type.js

@@ -54,5 +54,5 @@ var FONT_SIZE_REDUCE = exports.FONT_SIZE_REDUCE = 'font-size-reduce';
 
 // group
 var GROUP = exports.GROUP = 'group';
-var TOP_LEVEL_TYPES = exports.TOP_LEVEL_TYPES = [BLOCKQUOTE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, PARAGRAPH, CODE_BLOCK, TABLE];
+var TOP_LEVEL_TYPES = exports.TOP_LEVEL_TYPES = [BLOCKQUOTE, TITLE, SUBTITLE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, PARAGRAPH, CODE_BLOCK, TABLE, IMAGE_BLOCK, VIDEO, WHITEBOARD];
 var INLINE_LEVEL_TYPES = exports.INLINE_LEVEL_TYPES = [IMAGE, LINK, MENTION, MENTION_TEMP];

package/dist/extension/core/queries/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isMiddlePoint = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCursorAtBlockStart = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isContainsVoidElement = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
+exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isMiddlePoint = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCursorAtBlockStart = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isContainsVoidElement = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getNearestBlockNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
@@ -261,6 +261,32 @@ var getTopLevelBlockNode = exports.getTopLevelBlockNode = function getTopLevelBl
     }
   });
 };
+var getNearestBlockNode = exports.getNearestBlockNode = function getNearestBlockNode(editor) {
+  if (!editor.selection) return null;
+  var LIST_TYPES = [_constants.UNORDERED_LIST, _constants.ORDERED_LIST];
+  var _Editor$nodes7 = _slate.Editor.nodes(editor, {
+      at: editor.selection,
+      match: function match(n) {
+        return _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n) && LIST_TYPES.includes(n.type);
+      },
+      mode: 'lowest'
+    }),
+    _Editor$nodes8 = (0, _slicedToArray2["default"])(_Editor$nodes7, 1),
+    nodeEntry = _Editor$nodes8[0];
+  if (nodeEntry) {
+    return nodeEntry;
+  }
+  var _Editor$nodes9 = _slate.Editor.nodes(editor, {
+      at: editor.selection,
+      match: function match(n) {
+        return _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n) && _constants.TOP_LEVEL_TYPES.includes(n.type);
+      },
+      mode: 'lowest'
+    }),
+    _Editor$nodes0 = (0, _slicedToArray2["default"])(_Editor$nodes9, 1),
+    nodeEntry2 = _Editor$nodes0[0];
+  return nodeEntry2 || null;
+};
 var getPrevNode = exports.getPrevNode = function getPrevNode(editor) {
   var lowerNodeEntry = getAboveNode(editor, {
     mode: 'lowest',
@@ -308,15 +334,15 @@ var getPrevNode = exports.getPrevNode = function getPrevNode(editor) {
 };
 var getCurrentNode = exports.getCurrentNode = function getCurrentNode(editor) {
   if (!editor.selection) return null;
-  var _Editor$nodes7 = _slate.Editor.nodes(editor, {
+  var _Editor$nodes1 = _slate.Editor.nodes(editor, {
       at: editor.selection,
       match: function match(n) {
         return _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n);
       },
       mode: 'lowest'
     }),
-    _Editor$nodes8 = (0, _slicedToArray2["default"])(_Editor$nodes7, 1),
-    nodeEntry = _Editor$nodes8[0];
+    _Editor$nodes10 = (0, _slicedToArray2["default"])(_Editor$nodes1, 1),
+    nodeEntry = _Editor$nodes10[0];
   return nodeEntry || null;
 };
 var getNextNode = exports.getNextNode = function getNextNode(editor) {

package/dist/extension/plugins/text-style/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeMark = exports.isMenuDisabled = exports.getValue = exports.addMark = void 0;
+exports.removeMark = exports.isTextCommentExist = exports.isMenuDisabled = exports.getValue = exports.addMark = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _slate = require("@seafile/slate");
 var _elementType = require("../../constants/element-type");
@@ -64,4 +64,19 @@ var getValue = exports.getValue = function getValue(editor, mark) {
       match = _Editor$nodes4[0];
     return !!match;
   }
+};
+var isTextCommentExist = exports.isTextCommentExist = function isTextCommentExist(commentClass, editor) {
+  if (!commentClass) return null;
+  if (!editor.element_comments_map) return null;
+  var commentId = commentClass.split('sdoc_comment_')[1];
+  if (!commentId) return null;
+  var element_comments_map = editor.element_comments_map;
+  var commentsArray = Object.values(element_comments_map);
+  var comments = commentsArray.flat();
+  var comment = comments.find(function (item) {
+    var id = item.detail.text_comment_id || '';
+    if (id === commentId) return true;
+    return false;
+  });
+  return comment ? true : false;
 };

package/dist/extension/plugins/text-style/render-elem.js

@@ -12,8 +12,9 @@ var _react = _interopRequireDefault(require("react"));
 var _constants = require("../../constants");
 var _helpers = require("../font/helpers");
 var _caret = _interopRequireDefault(require("./caret"));
+var _helpers2 = require("./helpers");
 var _excluded = ["text"];
-var renderText = function renderText(props) {
+var renderText = function renderText(props, editor) {
   var attributes = props.attributes,
     children = props.children,
     leaf = props.leaf;
@@ -57,6 +58,9 @@ var renderText = function renderText(props) {
         var _step$value = (0, _slicedToArray2["default"])(_step.value, 2),
           key = _step$value[0],
           value = _step$value[1];
+        if (!(0, _helpers2.isTextCommentExist)(key, editor)) {
+          delete rest[key];
+        }
         if (value === false && key.startsWith('sdoc_comment_')) {
           var newKey = "removed_".concat(key);
           rest[newKey] = true;

package/dist/extension/render/render-leaf.js

@@ -1,16 +1,32 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _slateReact = require("@seafile/slate-react");
+var _constants = require("../../constants");
+var _useForceUpdate = _interopRequireDefault(require("../../hooks/use-force-update"));
+var _eventBus = _interopRequireDefault(require("../../utils/event-bus"));
 var _plugins = require("../plugins");
 var CustomLeaf = function CustomLeaf(props) {
   var editor = (0, _slateReact.useSlateStatic)();
+  var forceUpdate = (0, _useForceUpdate["default"])();
+  var updateRender = (0, _react.useCallback)(function () {
+    forceUpdate();
+  }, [forceUpdate]);
+  (0, _react.useEffect)(function () {
+    var eventBus = _eventBus["default"].getInstance();
+    var unsubscribeReloadComment = eventBus.subscribe(_constants.INTERNAL_EVENT.RELOAD_COMMENT, updateRender);
+    return function () {
+      unsubscribeReloadComment();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var _TextPlugin$renderEle = (0, _slicedToArray2["default"])(_plugins.TextPlugin.renderElements, 1),
     renderText = _TextPlugin$renderEle[0];
   return renderText(props, editor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0a7ebc1042c83af89889893429b3b1a6b1a13431"
+  "gitHead": "8629f169a57be83cbaad84b8a413a728d4fd2a22"
 }