@seafile/sdoc-editor 1.0.113 → 1.0.115

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

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _slate = require("@seafile/slate");
+var _slateReact = require("@seafile/slate-react");
 var _context = _interopRequireDefault(require("../../../context"));
 var _useParticipants = require("../hooks/use-participants");
 var _sdocCommentEditor = _interopRequireDefault(require("../../editor/sdoc-comment-editor"));
@@ -90,6 +91,7 @@ const CommentEditor = _ref => {
     updateContent && updateContent(value);
   }, [content, insertContent, updateContent]);
   const onSubmit = (0, _react.useCallback)(event => {
+    if (!_slateReact.ReactEditor.isFocused(editor)) return;
     event && event.stopPropagation();
     const mdString = (0, _slateToMd.default)(editor.children);
     updateValue(mdString);

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

@@ -110,7 +110,7 @@ const CommentItemCollapseWrapper = _ref => {
     className: "comments-count"
   }, /*#__PURE__*/_react.default.createElement("i", {
     className: "sdocfont sdoc-comments"
-  }), /*#__PURE__*/_react.default.createElement("span", {
+  }), commentCount !== 0 && /*#__PURE__*/_react.default.createElement("span", {
     className: "comments-count-number"
   }, commentCount)), /*#__PURE__*/_react.default.createElement("div", {
     className: "comment-author"

package/dist/basic-sdk/comment/components/global-comment/global-comment-header.js

@@ -65,7 +65,7 @@ const GlobalCommentHeader = _ref => {
   }, activeCommentGroup ? t('Comment_details') : t('Comments'))), /*#__PURE__*/_react.default.createElement("div", {
     ref: panelHeaderRef,
     className: "comments-panel-header-right"
-  }, /*#__PURE__*/_react.default.createElement("div", {
+  }, !activeCommentGroup && /*#__PURE__*/_react.default.createElement("div", {
     id: "sdoc-read-all-btn",
     className: "sdoc-icon-btn",
     onClick: toggleReadAll

package/dist/basic-sdk/comment/components/global-comment/index.css

@@ -117,13 +117,14 @@
   display: flex;
   flex-direction: column;
   padding-top: 0px;
-  margin-bottom: 20px;
+  margin-bottom: 11px;
   overflow: auto;
+  border-bottom: 1px solid #e1e2e5;
 }
 
 .sdoc-comment-drawer .comments-panel-body__content .sdoc-comment-list-container {
   position: relative;
-  margin-top: 0px
+  margin-top: 0px;
 }
 
 .sdoc-comment-drawer .comments-panel-body__content .comment-ui-container.sdoc-resolved {
@@ -176,9 +177,7 @@
 }
 
 .sdoc-comment-drawer .comments-panel-body .sdoc-doc-comment-editor-container {
-  padding: 0 16px;
-  position: absolute;
-  bottom: 16px;
+  position: relative;
   width: 100%;
 }
 
@@ -197,7 +196,6 @@
 /* custom */
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-ui-container {
   background-color: #FFF;
-  border-bottom: 1px solid #e1e2e5;
   margin-bottom: 0px;
   box-shadow: none;
   padding: 16px;
@@ -298,6 +296,6 @@
 }
 
 .sdoc-comment-drawer .sdoc-comment-list-container .comment-item-detail-wrapper .comment-operation .sdoc-confirm {
-  color: rgb(70, 77, 90);;
+  color: rgb(70, 77, 90);
   font-weight: unset;
 }

package/dist/basic-sdk/comment/components/global-comment/index.js

@@ -124,6 +124,7 @@ const GlobalComment = _ref => {
       setActiveCommentGroup(null);
     }
   }, [commentList]);
+  const commentEditorPlaceholder = !activeCommentGroup ? t('Enter_comment_shift_enter_for_new_line_Enter_to_send') : t('Enter_reply_shift_Enter_for_new_line_Enter_to_send');
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "sdoc-comment-drawer"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -135,7 +136,7 @@ const GlobalComment = _ref => {
     setCurrentCommentGroup: setCurrentCommentGroup
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "comments-panel-body"
-  }, /*#__PURE__*/_react.default.createElement(_globalCommentBodyHeader.default, {
+  }, !activeCommentGroup && /*#__PURE__*/_react.default.createElement(_globalCommentBodyHeader.default, {
     commentList: commentList,
     commentType: commentType,
     setCommentType: setCommentType
@@ -148,7 +149,7 @@ const GlobalComment = _ref => {
   }, !activeCommentGroup && Array.isArray(commentList) && commentList.map(comment => {
     var _comment$replies, _comment$replies2;
     const latestComment = ((_comment$replies = comment.replies) === null || _comment$replies === void 0 ? void 0 : _comment$replies.length) > 0 ? comment.replies[comment.replies.length - 1] : comment;
-    const commentCount = ((_comment$replies2 = comment.replies) === null || _comment$replies2 === void 0 ? void 0 : _comment$replies2.length) + 1;
+    const commentCount = (_comment$replies2 = comment.replies) === null || _comment$replies2 === void 0 ? void 0 : _comment$replies2.length;
     const elementId = comment.detail.element_id;
     const element = getNodeByElementId(elementId);
     return /*#__PURE__*/_react.default.createElement(_commentItemCollapseWrapper.default, {
@@ -172,18 +173,18 @@ const GlobalComment = _ref => {
     updateScrollPosition: updateScrollPosition,
     isClickCommentPanelBody: isClickCommentPanelBody,
     setCurrentCommentGroup: setCurrentCommentGroup
-  }))), !showEditor && /*#__PURE__*/_react.default.createElement("div", {
+  }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('global-comment-input-wrapper', {
       'active': globalCommentContent === null || globalCommentContent === void 0 ? void 0 : globalCommentContent.trim()
     })
-  }, /*#__PURE__*/_react.default.createElement(_reactstrap.Input, {
+  }, !showEditor && /*#__PURE__*/_react.default.createElement(_reactstrap.Input, {
     value: globalCommentContent !== null && globalCommentContent !== void 0 && globalCommentContent.trim() ? '.....' : '',
     readOnly: true,
-    placeholder: t('Enter_comment_shift_enter_for_new_line_Enter_to_send'),
+    placeholder: commentEditorPlaceholder,
     onFocus: () => {
       setShowEditor(true);
     }
-  })), showEditor && /*#__PURE__*/_react.default.createElement(_globalCommentEditor.default, {
+  }), showEditor && /*#__PURE__*/_react.default.createElement(_globalCommentEditor.default, {
     globalCommentContent: globalCommentContent,
     isScrollDisplayed: isScrollDisplayed,
     hiddenCommentEditor: hiddenCommentEditor,
@@ -191,6 +192,6 @@ const GlobalComment = _ref => {
     updateGlobalCommentContent: content => {
       setGlobalCommentContent(content);
     }
-  }))));
+  })))));
 };
 var _default = exports.default = (0, _reactI18next.withTranslation)('sdoc-editor')(GlobalComment);

package/package.json

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