@seafile/sdoc-editor 0.5.36 → 0.5.38

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

@@ -11,8 +11,9 @@ import { generateEmptyElement } from '../../extension/core';
 import { PARAGRAPH } from '../../extension/constants';
 import slateToMdString from '../../../slate-convert/slate-to-md';
 import mdStringToSlate from '../../../slate-convert/md-to-slate';
-import { COMMENT_EDITOR, COMMENT_EDITOR_EDIT_AREA_WIDTH } from '../../constants';
+import { COMMENT_EDITOR, COMMENT_EDITOR_EDIT_AREA_WIDTH, INTERNAL_EVENT } from '../../constants';
 import { KeyCodes } from '../../../constants';
+import EventBus from '../../utils/event-bus';
 const getSubmitTip = (type, content) => {
   if (content) return 'Save';
   return type === 'comment' ? 'Comment' : 'Reply';
@@ -87,6 +88,13 @@ const CommentEditor = _ref => {
     })];
     Transforms.select(editor, Editor.start(editor, []));
   }, [editor, updateValue, addParticipants, userInfo.username, placeholder]);
+  useEffect(() => {
+    const eventBus = EventBus.getInstance();
+    const unsubscribePostComment = eventBus.subscribe(INTERNAL_EVENT.COMMENT_EDITOR_POST_COMMENT, onSubmit);
+    return () => {
+      unsubscribePostComment();
+    };
+  }, [onSubmit]);
   const onCancel = useCallback(event => {
     event.stopPropagation();
     const {
@@ -144,6 +152,6 @@ const CommentEditor = _ref => {
   }));
 };
 CommentEditor.defaultProps = {
-  placeholder: 'Enter_a_comment'
+  placeholder: 'Enter_comment_Enter_for_new_line_shift_enter_to_send'
 };
 export default CommentEditor;

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

@@ -233,7 +233,7 @@ const CommentItemWrapper = _ref => {
     'sdoc-resolved': comment.resolved,
     'd-flex flex-column pt-0': element
   });
-  const tip = comment.resolved ? 'Reopen_discussion' : 'Enter_a_reply';
+  const tip = comment.resolved ? 'Reopen_discussion' : 'Enter_reply_Enter_for_new_line_Shift_Enter_to_send';
   return /*#__PURE__*/React.createElement("div", {
     id: "comment-item-wrapper_".concat(comment.id),
     className: className,

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

@@ -152,7 +152,7 @@
 
 .sdoc-comment-drawer .sdoc-doc-comment-editor-container .comment-ui-container.active {
   margin-bottom: 0;
-  padding: 16px;
+  padding: 16px 10px;
   left: 0;
 }
 

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

@@ -23,7 +23,8 @@ export const INTERNAL_EVENT = {
   TABLE_COLUMN_START_DRAG: 'table_column_start_drag',
   TABLE_SHOW_DRAG_HANDLER: 'table_show_drag_handler',
   TABLE_HIDE_DRAG_HANDLER: 'table_show_drag_handler',
-  ON_PRINT: 'on_print'
+  ON_PRINT: 'on_print',
+  COMMENT_EDITOR_POST_COMMENT: 'comment_editor_post_comment'
 };
 export const REVISION_DIFF_KEY = 'diff';
 export const REVISION_DIFF_VALUE = '1';

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

@@ -2,15 +2,16 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useCallback, useMemo } from 'react';
 import { Editable, ReactEditor, Slate } from '@seafile/slate-react';
 import { Editor, Node, Range } from '@seafile/slate';
+import isHotkey from 'is-hotkey';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import { renderLeaf } from '../extension';
-import EventProxy from '../utils/event-handler';
 import { useCursors } from '../cursor/use-cursors';
 import { INTERNAL_EVENT } from '../constants';
 import { usePipDecorate } from '../decorates';
 import EventBus from '../utils/event-bus';
 import { IMAGE } from '../extension/constants';
 import RenderCommentEditorCustomRenderElement from '../extension/render/render-comment-editor-element';
+import EventProxy from '../utils/event-handler';
 const CommentArticle = _ref => {
   let {
     editor,
@@ -57,6 +58,15 @@ const CommentArticle = _ref => {
       //
     }
   }, []);
+  const onKeyDown = useCallback(event => {
+    if (isHotkey('shift+enter', event)) {
+      event.preventDefault();
+      const eventBus = EventBus.getInstance();
+      eventBus.dispatch(INTERNAL_EVENT.COMMENT_EDITOR_POST_COMMENT, event);
+      return;
+    }
+    eventProxy.onKeyDown(event);
+  }, [eventProxy]);
   return /*#__PURE__*/React.createElement(Slate, {
     editor: editor,
     value: slateValue,
@@ -74,7 +84,8 @@ const CommentArticle = _ref => {
     onCopy: eventProxy.onCopy,
     onCompositionStart: eventProxy.onCompositionStart,
     onCompositionUpdate: eventProxy.onCompositionUpdate,
-    onCompositionEnd: eventProxy.onCompositionEnd
+    onCompositionEnd: eventProxy.onCompositionEnd,
+    onKeyDown: onKeyDown
   }));
 };
 export default CommentArticle;

package/dist/basic-sdk/editor/sdoc-editor.js

@@ -115,6 +115,11 @@ const SdocEditor = forwardRef((_ref, ref) => {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }), [document, validEditor, slateValue]);
+  const onValueChange = value => {
+    const eventBus = EventBus.getInstance();
+    eventBus.dispatch(INTERNAL_EVENT.UPDATE_SEARCH_REPLACE_HIGHLIGHT, value);
+    setSlateValue(value);
+  };
   const isFreezed = context.getSetting('isFreezed');
   if (isReloading) {
     return /*#__PURE__*/React.createElement("div", {
@@ -129,7 +134,8 @@ const SdocEditor = forwardRef((_ref, ref) => {
       docValue: slateValue,
       readonly: true,
       showOutline: false,
-      editor: validEditor
+      editor: validEditor,
+      showComment: false
     }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
       editor: validEditor,
       slateValue: slateValue
@@ -146,18 +152,14 @@ const SdocEditor = forwardRef((_ref, ref) => {
       docValue: slateValue,
       showOutline: true,
       readonly: isFreezed,
-      editor: validEditor
+      editor: validEditor,
+      showComment: true
     }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
       editor: validEditor,
       slateValue: slateValue,
       isShowComment: true
     })))));
   }
-  const onValueChange = value => {
-    const eventBus = EventBus.getInstance();
-    eventBus.dispatch(INTERNAL_EVENT.UPDATE_SEARCH_REPLACE_HIGHLIGHT, value);
-    setSlateValue(value);
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(EditorContainer, {
     editor: validEditor
   }, /*#__PURE__*/React.createElement(CollaboratorsProvider, null, /*#__PURE__*/React.createElement(ColorProvider, null, /*#__PURE__*/React.createElement(HeaderToolbar, {
@@ -165,7 +167,8 @@ const SdocEditor = forwardRef((_ref, ref) => {
   }), /*#__PURE__*/React.createElement(EditorContent, {
     docValue: slateValue,
     showOutline: true,
-    editor: validEditor
+    editor: validEditor,
+    showComment: true
   }, /*#__PURE__*/React.createElement(EditableArticle, {
     editor: validEditor,
     slateValue: slateValue,

package/dist/basic-sdk/extension/plugins/list/plugin/shortcut.js

@@ -1,8 +1,9 @@
 import { Editor, Path, Range, Transforms } from '@seafile/slate';
-import { ORDERED_LIST, PARAGRAPH } from '../../../constants';
+import { INSERT_POSITION, ORDERED_LIST, PARAGRAPH } from '../../../constants';
 import { getBeforeText, setListType } from '../helpers';
 import { focusEditor, getLastChild, getPreviousPath } from '../../../core';
 import { generateEmptyListItem } from '../model';
+import { toggleList } from '../transforms';
 
 /**
  * @param {Editor} editor
@@ -29,6 +30,17 @@ export const handleShortcut = (editor, text) => {
   // If the match fails or the match is not at the beginning of the line, it is not a shortcut
   if (!matchResult || matchResult.index !== 0) return false;
   const previousNodePath = getPreviousPath(aboveNodePath);
+
+  // No previous node means that the current paragraph is the first paragraph in the container
+  if (!previousNodePath) {
+    if (matchedText !== '1.') return false;
+    // Delete shortcut key text
+    Transforms.delete(editor, {
+      at: range
+    });
+    toggleList(editor, ORDERED_LIST);
+    return true;
+  }
   const [previousNode, previousPath] = Editor.node(editor, previousNodePath);
   // If the previous node is not an ordered list and is not start with `1.`,it is not a shortcut
   if (previousNode.type !== ORDERED_LIST && matchedText !== '1.') return false;

package/dist/basic-sdk/extension/render/render-comment-editor-element.js

@@ -21,7 +21,7 @@ const RenderCommentEditorCustomRenderElement = props => {
           const [renderParagraph] = ParagraphPlugin.renderElements;
           return renderParagraph(_props);
         }
-        const placeholder = commentType === 'comment' ? 'Enter_a_comment' : 'Enter_a_reply';
+        const placeholder = commentType === 'comment' ? 'Enter_comment_Enter_for_new_line_shift_enter_to_send' : 'Enter_reply_Enter_for_new_line_Shift_Enter_to_send';
         const [renderParagraph] = ParagraphPlugin.renderElements;
         return renderParagraph(_objectSpread(_objectSpread({}, _props), {}, {
           placeholder

package/dist/basic-sdk/extension/toolbar/side-toolbar/helpers.js

@@ -88,11 +88,11 @@ export const getDomTopHeight = (dom, slateNode) => {
   const rect = dom.getBoundingClientRect();
   let offsetY = 0;
   const paddingTop = parseFloat(window.getComputedStyle(dom).getPropertyValue('padding-top'));
-  const lightHight = parseFloat(window.getComputedStyle(dom).getPropertyValue('line-height'));
+  const lineHeight = parseFloat(window.getComputedStyle(dom).getPropertyValue('line-height'));
+  const disToolBarHeight = 12; // side toolbar icon is 12 px
   if (ADD_POSITION_OFFSET_TYPE.includes(slateNode.type)) {
-    offsetY = lightHight / 2 + paddingTop - 12; // side toolbar icon is 12 px
+    offsetY = lineHeight / 2 + paddingTop - disToolBarHeight / 2;
   }
-
   const HEADER_HEIGHT = 56 + 44;
   return rect.y - HEADER_HEIGHT + offsetY;
 };

package/dist/basic-sdk/layout/editor-content.js

@@ -11,7 +11,8 @@ const EditorContent = _ref => {
     showOutline,
     children,
     docValue,
-    editor
+    editor,
+    showComment
   } = _ref;
   const scrollRef = useRef(null);
   const [scrollLeft, setScrollLeft] = useState(0);
@@ -25,6 +26,25 @@ const EditorContent = _ref => {
     'readonly': readonly,
     'no-outline': !showOutline
   });
+  if (!showComment) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "sdoc-content-wrapper"
+    }, /*#__PURE__*/React.createElement("div", {
+      ref: scrollRef,
+      className: "sdoc-scroll-container",
+      onScroll: onWrapperScroll,
+      id: "sdoc-scroll-container"
+    }, /*#__PURE__*/React.createElement(ScrollContext.Provider, {
+      value: {
+        scrollRef
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      className: className
+    }, showOutline && /*#__PURE__*/React.createElement(SDocOutline, {
+      scrollLeft: scrollLeft,
+      doc: docValue
+    }), children))));
+  }
   return /*#__PURE__*/React.createElement("div", {
     className: "sdoc-content-wrapper"
   }, /*#__PURE__*/React.createElement(CommentProvider, {
@@ -50,6 +70,7 @@ const EditorContent = _ref => {
 };
 EditorContent.defaultProps = {
   readonly: false,
-  showOutline: true
+  showOutline: true,
+  showComment: false
 };
 export default EditorContent;

package/dist/basic-sdk/views/published-revision-diff-viewer.js

@@ -48,9 +48,10 @@ const PublishedRevisionDiffViewer = _ref => {
     children: isShowChanges && (diff === null || diff === void 0 ? void 0 : diff.value) || revisionContent.children
   };
   return /*#__PURE__*/React.createElement(SDocViewer, {
+    document: document,
     showToolbar: true,
     showOutline: true,
-    document: document
+    showComment: false
   });
 };
 export default PublishedRevisionDiffViewer;

package/dist/basic-sdk/views/revision-diff-viewer.js

@@ -3,6 +3,7 @@ import context from '../../context';
 import { getDiff } from '../utils/diff';
 import SDocViewer from './sdoc-viewer';
 import Loading from '../../components/loading';
+import { CollaboratorsProvider } from '../../hooks';
 import '../../assets/css/diff-viewer.css';
 const RevisionDiffViewer = _ref => {
   let {
@@ -39,13 +40,14 @@ const RevisionDiffViewer = _ref => {
   if (isLoading) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
-  return /*#__PURE__*/React.createElement(SDocViewer, {
-    showToolbar: true,
-    showOutline: true,
+  return /*#__PURE__*/React.createElement(CollaboratorsProvider, null, /*#__PURE__*/React.createElement(SDocViewer, {
     editor: editor,
     document: {
       children: diff.value
-    }
-  });
+    },
+    showToolbar: true,
+    showOutline: true,
+    showComment: true
+  }));
 };
 export default RevisionDiffViewer;

package/dist/basic-sdk/views/sdoc-diff-viewer.js

@@ -17,11 +17,12 @@ const DiffViewer = _ref => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return /*#__PURE__*/React.createElement(SDocViewer, {
-    showToolbar: false,
-    showOutline: false,
     document: {
       children: diff.value
-    }
+    },
+    showToolbar: false,
+    showOutline: false,
+    showComment: false
   });
 };
 export default DiffViewer;

package/dist/basic-sdk/views/sdoc-viewer.js

@@ -5,32 +5,33 @@ import { generateDefaultDocContent } from '../../utils';
 import { EditorContainer, EditorContent } from '../layout';
 import ReadOnlyArticle from './readonly-article';
 import { ColorProvider } from '../hooks/use-color-context';
-import { CollaboratorsProvider } from '../../hooks';
 import '../assets/css/simple-viewer.css';
 const SDocViewer = _ref => {
   let {
     editor,
     document,
     showToolbar,
-    showOutline
+    showOutline,
+    showComment
   } = _ref;
   const validEditor = editor || withNodeId(createDefaultEditor());
   const slateValue = (document || generateDefaultDocContent()).children;
   return /*#__PURE__*/React.createElement(EditorContainer, {
     editor: validEditor,
     readonly: true
-  }, /*#__PURE__*/React.createElement(CollaboratorsProvider, null, /*#__PURE__*/React.createElement(ColorProvider, null, showToolbar && /*#__PURE__*/React.createElement(HeaderToolbar, {
+  }, /*#__PURE__*/React.createElement(ColorProvider, null, showToolbar && /*#__PURE__*/React.createElement(HeaderToolbar, {
     editor: validEditor,
     readonly: true
   }), /*#__PURE__*/React.createElement(EditorContent, {
     docValue: slateValue,
     readonly: true,
     showOutline: showOutline,
-    editor: validEditor
+    editor: validEditor,
+    showComment: showComment
   }, /*#__PURE__*/React.createElement(ReadOnlyArticle, {
     editor: validEditor,
     slateValue: slateValue
-  })))));
+  }))));
 };
 SDocViewer.defaultProps = {
   showToolbar: false,

package/package.json

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

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Delete reply",
   "Are_you_sure_to_delete_this_comment": "Are you sure to delete this comment?",
   "Are_you_sure_to_delete_this_reply": "Are you sure to delete this reply?",
-  "Enter_a_comment": "Enter a comment",
-  "Enter_a_reply": "Enter a reply",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Enter a comment",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Enter a reply",
   "Reopen_discussion": "Adding a reply will reopen this discussion",
   "Confirm": "Potvrdit",
   "View_changes": "View changes",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Delete reply",
   "Are_you_sure_to_delete_this_comment": "Are you sure to delete this comment?",
   "Are_you_sure_to_delete_this_reply": "Are you sure to delete this reply?",
-  "Enter_a_comment": "Enter a comment",
-  "Enter_a_reply": "Enter a reply",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Enter a comment",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Enter a reply",
   "Reopen_discussion": "Adding a reply will reopen this discussion",
   "Confirm": "Bestätigen",
   "View_changes": "View changes",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Delete reply",
   "Are_you_sure_to_delete_this_comment": "Are you sure to delete this comment?",
   "Are_you_sure_to_delete_this_reply": "Are you sure to delete this reply?",
-  "Enter_a_comment": "Enter a comment",
-  "Enter_a_reply": "Enter a reply",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Enter comment, Enter for new line, Shift + Enter to send",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Enter reply, Enter for new line, Shift + Enter to send",
   "Reopen_discussion": "Adding a reply will reopen this discussion",
   "Confirm": "Confirm",
   "View_changes": "View changes",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Delete reply",
   "Are_you_sure_to_delete_this_comment": "Are you sure to delete this comment?",
   "Are_you_sure_to_delete_this_reply": "Are you sure to delete this reply?",
-  "Enter_a_comment": "Enter a comment",
-  "Enter_a_reply": "Enter a reply",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Enter a comment",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Enter a reply",
   "Reopen_discussion": "Adding a reply will reopen this discussion",
   "Confirm": "Confirmar",
   "View_changes": "View changes",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Supprimer la réponse",
   "Are_you_sure_to_delete_this_comment": "Êtes-vous sûr de vouloir supprimer ce commentaire ?",
   "Are_you_sure_to_delete_this_reply": "Êtes-vous sûr de vouloir supprimer cette réponse ?",
-  "Enter_a_comment": "Saisir un commentaire",
-  "Enter_a_reply": "Saisir une réponse",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Saisir un commentaire",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Saisir une réponse",
   "Reopen_discussion": "L'ajout d'une réponse rouvrira la discussion.",
   "Confirm": "Confirmer",
   "View_changes": "Afficher les modifications",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Delete reply",
   "Are_you_sure_to_delete_this_comment": "Are you sure to delete this comment?",
   "Are_you_sure_to_delete_this_reply": "Are you sure to delete this reply?",
-  "Enter_a_comment": "Enter a comment",
-  "Enter_a_reply": "Enter a reply",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Enter a comment",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Enter a reply",
   "Reopen_discussion": "Adding a reply will reopen this discussion",
   "Confirm": "Confirm",
   "View_changes": "View changes",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "Удалить ответ",
   "Are_you_sure_to_delete_this_comment": "Вы уверены, что удалите этот комментарий?",
   "Are_you_sure_to_delete_this_reply": "Вы уверены, что удалите этот ответ?",
-  "Enter_a_comment": "Введите комментарий",
-  "Enter_a_reply": "Введите ответ",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "Введите комментарий",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Введите ответ",
   "Reopen_discussion": "Добавление ответа приведёт к возобновлению обсуждения.",
   "Confirm": "Подтвердить",
   "View_changes": "Просмотр изменений",

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

@@ -274,8 +274,8 @@
   "Delete_reply": "删除回复",
   "Are_you_sure_to_delete_this_comment": "你确定要删除这个评论吗？",
   "Are_you_sure_to_delete_this_reply": "你确定要删除这个回复吗？",
-  "Enter_a_comment": "输入评论",
-  "Enter_a_reply": "输入回复",
+  "Enter_comment_Enter_for_new_line_shift_enter_to_send": "输入评论，Enter 换行，Shift + Enter 发送",
+  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "输入回复，Enter 换行，Shift + Enter 发送",
   "Reopen_discussion": "添加回复会重新提出该讨论",
   "Confirm": "确认",
   "View_changes": "查看改动",