@seafile/sdoc-editor 3.0.4 → 3.0.6

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

@@ -87,6 +87,7 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
   // useMount: init socket connection
   (0, _react.useEffect)(function () {
     if (propsEditor) return;
@@ -265,6 +266,7 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }, /*#__PURE__*/_react["default"].createElement(_readonlyArticle["default"], {
       editor: validEditor,
       slateValue: slateValue,
+      updateSlateValue: onValueChange,
       showComment: false
     }))));
   }

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/dist/views/readonly-article.js

@@ -16,12 +16,14 @@ var _layout = require("../layout");
 var ReadOnlyArticle = function ReadOnlyArticle(_ref) {
   var editor = _ref.editor,
     slateValue = _ref.slateValue,
+    updateSlateValue = _ref.updateSlateValue,
     _ref$showComment = _ref.showComment,
     showComment = _ref$showComment === void 0 ? false : _ref$showComment;
   var decorate = (0, _decorates.usePipDecorate)(editor);
   return /*#__PURE__*/_react["default"].createElement(_slateReact.Slate, {
     editor: editor,
-    value: slateValue
+    value: slateValue,
+    onChange: updateSlateValue
   }, /*#__PURE__*/_react["default"].createElement(_layout.ArticleContainer, {
     editor: editor
   }, /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement(_highlight.SetNodeToDecorations, null), /*#__PURE__*/_react["default"].createElement(_slateReact.Editable, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "40de301531da184f54c0270ca175c91c5ce52c5c"
+  "gitHead": "975472a9d94d065f221dc7e76bde42fcb73cb2d8"
 }