@seafile/sdoc-editor 2.0.170 → 2.0.172

package/dist/comment/components/comment-item-collapse-wrapper.js

@@ -141,6 +141,7 @@ var CommentItemCollapseWrapper = function CommentItemCollapseWrapper(_ref) {
   }, [latestReply, t]);
   var handleScrollToArticle = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
+    if (!element) return;
     var dom = _slateReact.ReactEditor.toDOMNode(editor, element);
     var headerHeight = 56 + 37;
     scrollRef.current.scrollTo({

package/dist/comment/components/comment-item-content.js

@@ -29,8 +29,8 @@ var CommentItemContent = function CommentItemContent(_ref) {
     updateComment = _ref.updateComment,
     updateCommentState = _ref.updateCommentState,
     onDeleteComment = _ref.onDeleteComment,
-    t = _ref.t,
-    targetId = _ref.targetId;
+    targetId = _ref.targetId,
+    t = _ref.t;
   var _useParticipantsConte = (0, _useParticipants.useParticipantsContext)(),
     addParticipants = _useParticipantsConte.addParticipants,
     participants = _useParticipantsConte.participants;

package/dist/comment/components/comment-item-wrapper.js

@@ -116,7 +116,7 @@ var CommentItemWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref
   }(), [comment.detail, dispatch]);
   var updateCommentState = (0, _react.useCallback)(/*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/(0, _regenerator2["default"])().m(function _callee3(commentId, newComment) {
-      var time, user, reply, res, returnReply, newReply, elementId, resolvedComment, _resolvedComment$deta, unresolvedComment, _unresolvedComment$de;
+      var time, user, reply, elementId, resolvedComment, _resolvedComment$deta, unresolvedComment, _unresolvedComment$de, res, returnReply, newReply;
       return (0, _regenerator2["default"])().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -127,18 +127,7 @@ var CommentItemWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref
               reply: newComment.resolved,
               updated_at: time,
               author: user.username
-            }; // When updating comment status, add a new reply
-            _context3.n = 1;
-            return _context7["default"].insertReply(commentId, reply);
-          case 1:
-            res = _context3.v;
-            returnReply = res.data.reply;
-            newReply = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, reply), {}, {
-              id: returnReply.id,
-              reply: returnReply.reply,
-              user_name: returnReply.user_name,
-              avatar_url: returnReply.avatar_url
-            });
+            };
             elementId = (0, _helper.getPrimaryElementId)(comment.detail);
             if (newComment.resolved === true) {
               resolvedComment = commentsDetail ? Object.values(commentsDetail).find(function (comments) {
@@ -161,25 +150,38 @@ var CommentItemWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref
                 (0, _helper.updateCommentedElementsAttrs)(unresolvedComment.detail.element_id_list, editor, (_unresolvedComment$de = unresolvedComment.detail) === null || _unresolvedComment$de === void 0 ? void 0 : _unresolvedComment$de.text_comment_id, !newComment.resolved);
               }
             }
+
+            // Modify comment status
+            _context3.n = 1;
+            return _context7["default"].updateComment(commentId, newComment);
+          case 1:
             dispatch({
-              type: 'INSERT_REPLY',
+              type: 'UPDATE_COMMENT_STATE',
               payload: {
                 element_id: elementId,
                 comment_id: commentId,
-                reply: newReply
+                comment: newComment
               }
             });
 
-            // Modify comment status
+            // When updating comment status, add a new reply
             _context3.n = 2;
-            return _context7["default"].updateComment(commentId, newComment);
+            return _context7["default"].insertReply(commentId, reply);
           case 2:
+            res = _context3.v;
+            returnReply = res.data.reply;
+            newReply = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, reply), {}, {
+              id: returnReply.id,
+              reply: returnReply.reply,
+              user_name: returnReply.user_name,
+              avatar_url: returnReply.avatar_url
+            });
             dispatch({
-              type: 'UPDATE_COMMENT_STATE',
+              type: 'INSERT_REPLY',
               payload: {
                 element_id: elementId,
                 comment_id: commentId,
-                comment: newComment
+                reply: newReply
               }
             });
 
@@ -401,6 +403,7 @@ var CommentItemWrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref
   });
   var handleScrollToArticle = (0, _react.useCallback)(function (e) {
     e.stopPropagation();
+    if (!element) return;
     var dom = _slateReact.ReactEditor.toDOMNode(editor, element);
     var headerHeight = 56 + 37;
     scrollRef.current.scrollTo({

package/dist/extension/plugins/image/dialogs/image-previewer.js

@@ -23,10 +23,11 @@ var ImagePreviewer = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2["default"])(_this, "getImageNodes", function (nodes) {
       var nodeIndex = 0;
       var list = [];
+      var editor = _this.props.editor;
       while (nodes && nodeIndex <= nodes.length - 1) {
         var currentNode = nodes[nodeIndex];
         if (currentNode.type === 'image') {
-          var url = (0, _helpers.getImageURL)(currentNode.data);
+          var url = (0, _helpers.getImageURL)(currentNode.data, editor);
           url && list.push(url);
         } else {
           list.push.apply(list, (0, _toConsumableArray2["default"])(_this.getImageNodes(currentNode.children)));
@@ -49,9 +50,9 @@ var ImagePreviewer = /*#__PURE__*/function (_React$Component) {
         };
       });
     });
-    var editor = props.editor,
+    var _editor = props.editor,
       imageUrl = props.imageUrl;
-    _this.images = _this.getImageNodes(editor.children);
+    _this.images = _this.getImageNodes(_editor.children);
     _this.state = {
       imageIndex: _this.images.findIndex(function (item) {
         return item === imageUrl;

package/dist/extension/plugins/image/hover-menu/index.js

@@ -304,7 +304,7 @@ var ImageHoverMenu = function ImageHoverMenu(_ref) {
       className: "sdocfont sdoc-check-mark sdoc-dropdown-item-right-icon"
     })));
   })), isShowImagePreview && /*#__PURE__*/_react["default"].createElement(_imagePreviewer["default"], {
-    imageUrl: (0, _helpers.getImageURL)(data),
+    imageUrl: (0, _helpers.getImageURL)(data, editor),
     editor: editor,
     toggleImagePreviewer: function toggleImagePreviewer() {
       setIsShowImagePreview(!isShowImagePreview);

package/dist/wiki-outline/style.css

@@ -3,7 +3,7 @@
   padding: .5rem 1rem .5rem 0;
 }
 
-.sdoc-wiki-viewer-outline .outline-h2, 
+.sdoc-wiki-viewer-outline .outline-h2,
 .sdoc-wiki-viewer-outline .outline-h3 {
   white-space: nowrap;
   overflow: hidden;
@@ -13,7 +13,7 @@
 .sdoc-wiki-viewer-outline .outline-h2 {
   margin-left: 20px;
   line-height: 2.5;
-  color:#364149;
+  color: #364149;
   white-space: nowrap;
   cursor: pointer;
 }
@@ -25,9 +25,9 @@
 .sdoc-wiki-viewer-outline .outline-h3 {
   margin-left: 40px;
   line-height: 2.5;
-  color:#364149;
+  color: #364149;
   white-space: nowrap;
-  cursor:pointer;
+  cursor: pointer;
 }
 
 .sdoc-wiki-viewer-outline .outline-h3:hover {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.170",
+  "version": "2.0.172",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f67a3cb8453cb2244cddc1f3ec798ccc5bdd7fbe"
+  "gitHead": "9aecbf97e5f1620e494c33fac11450514acb0dfa"
 }