@seafile/sdoc-editor 0.5.48 → 0.5.50

package/dist/basic-sdk/assets/css/sdoc-editor-plugins.css

@@ -28,7 +28,7 @@
   padding-left: 1.2em !important;
 }
 
-.sdoc-editor-container .article .list-container .sdoc-li-blod::marker {
+.sdoc-editor-container .article .list-container .sdoc-li-bold::marker {
   font-weight: bold;
 }
 

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

@@ -71,7 +71,7 @@ const CommentItem = _ref => {
     updateCommentResolved(false);
   }, [updateCommentResolved]);
   const menuId = useMemo(() => "comment_".concat(comment.id), [comment]);
-  return /*#__PURE__*/React.createElement("li", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "comment-item"
   }, /*#__PURE__*/React.createElement("div", {
     className: "comment-header"

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

@@ -20,7 +20,7 @@ const CommentItemReply = _ref => {
   const {
     notificationsInfo
   } = useNotificationContext();
-  const liRef = useRef(null);
+  const itemRef = useRef(null);
   const isUnseen = notificationsInfo.notifications_map["sdoc_notification_".concat(reply.comment_id, "_").concat(reply.id)] ? true : false;
   const [isEditing, setIsEditing] = useState(false);
   const [editorContent, setEditorContent] = useState('');
@@ -36,7 +36,8 @@ const CommentItemReply = _ref => {
   }, []);
   const transferHtml = async mdString => {
     const htmlString = await processor.process(mdString);
-    setEditorContent(String(htmlString));
+    const formatHtml = String(htmlString).replace(/\n */g, '');
+    setEditorContent(formatHtml);
   };
   useEffect(() => {
     transferHtml(reply.reply);
@@ -57,9 +58,9 @@ const CommentItemReply = _ref => {
     setIsEditing(false);
   }, [reply, updateReply]);
   const user = context.getUserInfo();
-  return /*#__PURE__*/React.createElement("li", {
+  return /*#__PURE__*/React.createElement("div", {
     className: "comment-item",
-    ref: liRef
+    ref: itemRef
   }, /*#__PURE__*/React.createElement("div", {
     className: "comment-header"
   }, /*#__PURE__*/React.createElement("div", {
@@ -112,7 +113,7 @@ const CommentItemReply = _ref => {
     updateContent: updateContent,
     setIsEditing: setIsEditing
   }), isShowDeleteDialog && isActive && /*#__PURE__*/React.createElement(CommentDeletePopover, {
-    parentDom: liRef.current,
+    parentDom: itemRef.current,
     type: "reply",
     deleteConfirm: _deleteReply,
     setIsShowDeleteModal: setIsShowDeleteDialog,

package/dist/basic-sdk/comment/components/comment-item-resolved-reply.js

@@ -6,7 +6,7 @@ const CommentItemResolvedReply = _ref => {
     reply,
     t
   } = _ref;
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("li", {
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "comment-item"
   }, /*#__PURE__*/React.createElement("div", {
     className: "comment-header"

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

@@ -244,7 +244,7 @@ const CommentItemWrapper = _ref => {
     className: "sdocfont sdoc-comment-quote mr-2"
   }), /*#__PURE__*/React.createElement("div", {
     className: "comment-item-selected-text"
-  }, Node.string(element))), /*#__PURE__*/React.createElement("ul", {
+  }, Node.string(element))), /*#__PURE__*/React.createElement("div", {
     ref: listRef,
     className: "comment-item-list"
   }, /*#__PURE__*/React.createElement(CommentItemContent, {

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

@@ -3,7 +3,7 @@
   margin-top: 5px;
 }
 
-.sdoc-comment-list-container  .article.sdoc-comment-editor {
+.sdoc-comment-list-container .article.sdoc-comment-editor {
   font-size: 14px;
 }
 
@@ -57,12 +57,11 @@
   overflow-y: auto;
   margin: 0;
   padding: 0;
-  list-style: none;
 }
 
 .sdoc-comment-list-container .comment-item {
   position: relative;
-  padding: 16px 10px 0;
+  padding: 16px 16px 0;
   cursor: pointer;
 }
 
@@ -369,3 +368,11 @@
 .sdoc-article-container .sdoc-comment-list-container .comment-ui-container.active {
   padding: 16px;
 }
+
+/* Override seafile ui */
+.sdoc-comment-list-container .btn {
+  height: 30px;
+  line-height: 15px;
+  font-size: 14px;
+  font-weight: 500;
+}

package/dist/basic-sdk/comment/components/elements-comment-count/element-comment-count.js

@@ -4,6 +4,7 @@ import { getElementCommentCountTop } from '../../helper';
 import { eventStopPropagation } from '../../../utils/mouse-event';
 import { focusToCommentElement } from '../../utils';
 import { Z_INDEX } from '../../../constants';
+import { useScrollContext } from '../../../hooks/use-scroll-context';
 const ElementCommentCount = _ref => {
   let {
     elementId,
@@ -13,16 +14,17 @@ const ElementCommentCount = _ref => {
   } = _ref;
   const element = getNodeById(editor.children, elementId);
   const [top, setTop] = useState(-9999);
+  const scrollRef = useScrollContext();
   const onClick = useCallback(event => {
     eventStopPropagation(event);
     focusToCommentElement(editor, element);
   }, [editor, element]);
   useEffect(() => {
     if (!element) return;
-    const scrollTop = 0;
+    const scrollTop = scrollRef.current.scrollTop || 0;
     const newTop = getElementCommentCountTop(editor, element, scrollTop);
     setTop(newTop);
-  }, [editor, elementId, element, isElementSelected]);
+  }, [editor, elementId, element, isElementSelected, scrollRef]);
   if (!element) return null;
   let style = {
     top

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

@@ -5,7 +5,7 @@
   max-width: 620px;
   border-left: 1px solid #e2e3e6;
   /* Prevent the image menu from still appearing above the comment drawer when scrolled hidden. */
-  z-index: 103;
+  z-index: 102;
 }
 
 .sdoc-comment-drawer .comments-panel-wrapper {

package/dist/basic-sdk/comment/helper.js

@@ -18,7 +18,7 @@ export const getCursorPosition = () => {
   let range = getSelectionRange();
   if (range) {
     const rect = range.getBoundingClientRect();
-    const headerHeight = 100;
+    const headerHeight = 93;
     x = rect.x || 0;
     y = rect.y - headerHeight + (rect.height - 24) / 2 || 0;
   }
@@ -59,5 +59,5 @@ export const getElementCommentCountTop = (editor, element, scrollTop) => {
     if (!minY) minY = y;
     minY = Math.min(minY, y);
   });
-  return minY - 100 + scrollTop; // 100: header height(56) + toolbar height(44)
+  return minY - 93 + scrollTop; // 100: header height(56) + toolbar height(37)
 };

package/dist/basic-sdk/extension/constants/menus-config.js

@@ -86,16 +86,6 @@ export const MENUS_CONFIG_MAP = {
     iconClass: 'sdocfont sdoc-table',
     text: 'Insert_table'
   },
-  [REMOVE_TABLE]: {
-    id: "sdoc_".concat(REMOVE_TABLE),
-    iconClass: 'sdocfont sdoc-delete-table',
-    text: 'Delete_table'
-  },
-  [COMBINE_CELL]: {
-    id: "sdoc_".concat(COMBINE_CELL),
-    iconClass: 'sdocfont sdoc-merge-cell',
-    text: 'Combine_cell'
-  },
   [TEXT_STYLE]: [{
     id: ITALIC,
     iconClass: 'sdocfont sdoc-italic',

package/dist/basic-sdk/extension/plugins/code-block/prismjs.js

@@ -33,10 +33,10 @@ export const genCodeLangs = () => {
     value: 'c'
   }, {
     text: 'C++',
-    value: 'cpp'
+    value: 'c++'
   }, {
     text: 'C#',
-    value: 'csharp'
+    value: 'c#'
   }, {
     text: 'Go',
     value: 'go'

package/dist/basic-sdk/extension/plugins/index.js

@@ -18,6 +18,6 @@ import CalloutPlugin from './callout';
 import SearchReplacePlugin from './search-replace';
 import MentionPlugin from './mention';
 const Plugins = [MarkDownPlugin, HtmlPlugin, HeaderPlugin, LinkPlugin, BlockquotePlugin, ListPlugin, CheckListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, TextPlugin, TextAlignPlugin, FontPlugin, SdocLinkPlugin, ParagraphPlugin, FileLinkPlugin, CalloutPlugin, SearchReplacePlugin];
-const CommentPlugins = [TextPlugin, MarkDownPlugin, HtmlPlugin, ListPlugin, ImagePlugin, LinkPlugin, MentionPlugin];
+const CommentPlugins = [MarkDownPlugin, HtmlPlugin, ParagraphPlugin, TextPlugin, ListPlugin, ImagePlugin, LinkPlugin, MentionPlugin, BlockquotePlugin];
 export default Plugins;
 export { MarkDownPlugin, HeaderPlugin, LinkPlugin, BlockquotePlugin, ListPlugin, CheckListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, TextPlugin, HtmlPlugin, TextAlignPlugin, FontPlugin, SdocLinkPlugin, ParagraphPlugin, FileLinkPlugin, CalloutPlugin, SearchReplacePlugin, MentionPlugin, CommentPlugins };

package/dist/basic-sdk/extension/plugins/list/render-elem.js

@@ -33,12 +33,12 @@ const renderListItem = (props, editor) => {
     default:
       className = '';
   }
-  const isBlod = element.children[0].children.every(item => item.bold === true);
+  const isBold = element.children[0].children.every(item => item.bold === true);
   return /*#__PURE__*/React.createElement("li", Object.assign({
     "data-id": element.id
   }, attributes, {
     className: classnames(className, {
-      'sdoc-li-blod': isBlod
+      'sdoc-li-bold': isBold
     })
   }), children);
 };

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/index.js

@@ -4,10 +4,6 @@ import { MenuGroup } from '../../../../commons';
 import { isAllInTable } from '../../helpers';
 import CellBackgroundColorMenu from './cell-bg-color-menu';
 import CellTextAlignMenu from './cell-text-align-menu';
-import CombineCells from './combine-cells';
-import RemoveTable from './remove-table-menu';
-import TableColumnMenu from './table-column-menu';
-import TableRowMenu from './table-row-menu';
 import ColumnVerticalAlignmentMenu from './column-vertical-alignment-menu';
 import './index.css';
 const ActiveTableMenu = _ref => {
@@ -26,27 +22,11 @@ const ActiveTableMenu = _ref => {
   }), /*#__PURE__*/React.createElement(ColumnVerticalAlignmentMenu, {
     editor: editor,
     readonly: readonly
-  }), /*#__PURE__*/React.createElement(TableColumnMenu, {
-    editor: editor,
-    readonly: readonly
-  }), /*#__PURE__*/React.createElement(TableRowMenu, {
-    editor: editor,
-    readonly: readonly
   }), /*#__PURE__*/React.createElement(CellBackgroundColorMenu, {
     editor: editor,
     isRichEditor: isRichEditor,
     className: className,
     readonly: readonly
-  }), /*#__PURE__*/React.createElement(CombineCells, {
-    editor: editor,
-    isRichEditor: isRichEditor,
-    className: className,
-    readonly: readonly
-  }), /*#__PURE__*/React.createElement(RemoveTable, {
-    editor: editor,
-    isRichEditor: isRichEditor,
-    className: className,
-    readonly: readonly
   }));
 };
 export default withTranslation('sdoc-editor')(ActiveTableMenu);

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

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { useReadOnly, useSlateStatic } from '@seafile/slate-react';
-import { LINK, LIST_ITEM, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST, IMAGE, IMAGE_BLOCK, MENTION, MENTION_TEMP } from '../constants';
-import { LinkPlugin, ListPlugin, ImagePlugin, ParagraphPlugin, MentionPlugin } from '../plugins';
+import { LINK, LIST_ITEM, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST, IMAGE, IMAGE_BLOCK, MENTION, MENTION_TEMP, BLOCKQUOTE } from '../constants';
+import { LinkPlugin, ListPlugin, ImagePlugin, ParagraphPlugin, MentionPlugin, BlockquotePlugin } from '../plugins';
 import { getParentNode } from '../core';
 const RenderCommentEditorCustomRenderElement = props => {
   const editor = useSlateStatic();
@@ -73,6 +73,11 @@ const RenderCommentEditorCustomRenderElement = props => {
         const [, renderMentionTemporaryInput] = MentionPlugin.renderElements;
         return renderMentionTemporaryInput(props, editor);
       }
+    case BLOCKQUOTE:
+      {
+        const [renderBlockquote] = BlockquotePlugin.renderElements;
+        return renderBlockquote(props, editor);
+      }
     default:
       {
         const [renderParagraph] = ParagraphPlugin.renderElements;

package/dist/basic-sdk/extension/toolbar/comment-editor-toolbar/index.js

@@ -8,6 +8,7 @@ import ImageMenu from '../../plugins/image/menu';
 import EventBus from '../../../utils/event-bus';
 import LinkMenu from '../../plugins/link/menu';
 import PostCommentBtn from './post-comment';
+import QuoteMenu from '../../plugins/blockquote/menu';
 const CommentEditorToolbar = _ref => {
   let {
     editor,
@@ -25,6 +26,9 @@ const CommentEditorToolbar = _ref => {
   }, /*#__PURE__*/React.createElement(CommentEditorTextStyleMenuList, {
     editor: editor,
     readonly: readonly
+  }), /*#__PURE__*/React.createElement(QuoteMenu, {
+    editor: editor,
+    readonly: readonly
   }), /*#__PURE__*/React.createElement(ListMenu, {
     editor: editor,
     type: UNORDERED_LIST,

package/dist/basic-sdk/utils/rebase.js

@@ -169,9 +169,7 @@ const getMergeElement = (diffElement, baseElement) => {
     }
 
     // The content of the subnode has changed and needs to be solved manually.
-    const {
-      content: childrenContent
-    } = getMergeContent(baseElement, diffElement.children);
+    const childrenContent = getMergeContent(baseElement, diffElement.children);
     return [_objectSpread(_objectSpread({}, newElement), {}, {
       children: childrenContent
     })];
@@ -194,11 +192,28 @@ const getMergeContent = (baseContent, diffChanges) => {
     const mergeElements = getMergeElement(diffElement, baseElement);
     content.push(...mergeElements);
   });
-  const canMerge = !hasConflict(content);
-  return {
-    content,
-    canMerge
-  };
+  return content;
+};
+export const canMerge = (content, reference) => {
+  if (hasConflict(content)) return false;
+  if (!Array.isArray(reference) || reference.length === 0) return true;
+  const {
+    map: referenceMap
+  } = generateIdMapAndIds(reference);
+  let flag = true;
+  for (let i = 0; i < content.length; i++) {
+    const element = content[i];
+    let referenceElement = referenceMap[element.id];
+    if (!referenceElement) {
+      flag = false;
+      break;
+    }
+    flag = canMerge(element.children, referenceElement.children);
+    if (flag === false) {
+      break;
+    }
+  }
+  return flag;
 };
 export const getRebase = (masterContent, baseContent, revisionContent) => {
   // master no changes, merged directly
@@ -219,12 +234,9 @@ export const getRebase = (masterContent, baseContent, revisionContent) => {
     };
   }
   const diffChanges = getChanges(masterContent, revisionContent);
-  const {
-    canMerge,
-    content
-  } = getMergeContent(baseContent, diffChanges);
+  const content = getMergeContent(baseContent, diffChanges);
   return {
-    canMerge,
+    canMerge: canMerge(content, revisionContent.children),
     isNeedReplaceMaster: true,
     value: _objectSpread(_objectSpread({}, revisionContent), {}, {
       children: content,

package/dist/components/doc-operations/revision-operations/index.js

@@ -32,6 +32,41 @@ const RevisionOperations = _ref => {
   const {
     loadDocument
   } = useDocument();
+  useEffect(() => {
+    if (isShowChanges) return;
+    setShowTip(true);
+    setTipType(TIP_TYPE.CHECKING);
+    const revisionPromise = loadDocument();
+    const baseVersionPromise = context.getRevisionBaseVersionContent();
+    const originVersionPromise = context.getSeadocOriginFileContent();
+    Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(results => {
+      const [revisionContent, baseRes, masterRes] = results;
+      const baseContent = JSON.parse(baseRes.data.content);
+      const masterContent = JSON.parse(masterRes.data.content);
+
+      // no changes
+      if (masterContent.version === baseContent.version) {
+        setShowTip(false);
+        setTipType('');
+        return;
+      }
+      const {
+        value
+      } = getRebase(masterContent, baseContent, revisionContent);
+      setMergeValue(value);
+      setTipType(TIP_TYPE.SOURCE_DOCUMENT_CHANGED);
+    }).catch(error => {
+      if (typeof error === 'string') {
+        toaster.danger(t(error));
+        return;
+      }
+      toaster.danger(t('Error'));
+      setShowTip(false);
+      setTipType('');
+    });
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   const onDocumentReplaced = useCallback(() => {
     if (isShowTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
@@ -150,6 +185,7 @@ const RevisionOperations = _ref => {
   const onSubmit = useCallback(() => {
     if (tipType === TIP_TYPE.HAS_BEEN_PUBLISHED) {
       // nothing todo
+      return;
     }
     if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
       context.deleteSdocRevision().then(res => {
@@ -161,7 +197,7 @@ const RevisionOperations = _ref => {
       });
       return;
     }
-    if (tipType === TIP_TYPE.MERGE) {
+    if (tipType === TIP_TYPE.MERGE || tipType === TIP_TYPE.SOURCE_DOCUMENT_CHANGED) {
       const {
         username
       } = context.getUserInfo();

package/dist/constants/index.js

@@ -31,7 +31,8 @@ export const TIP_TYPE = {
   HAS_BEEN_REMOVED: 'has_been_removed',
   CHECKING: 'checking',
   PUBLISHING: 'publishing',
-  DELETE_REVISION: 'delete_revision'
+  DELETE_REVISION: 'delete_revision',
+  SOURCE_DOCUMENT_CHANGED: 'source_document_changed'
 };
 export const TIP_TITLE = {
   [TIP_TYPE.DELETE_NO_CHANGES_REVISION]: 'Tip',
@@ -43,7 +44,8 @@ export const TIP_TITLE = {
   [TIP_TYPE.HAS_BEEN_REMOVED]: 'Tip',
   [TIP_TYPE.CHECKING]: 'Tip',
   [TIP_TYPE.PUBLISHING]: 'Tip',
-  [TIP_TYPE.DELETE_REVISION]: 'Delete_revision'
+  [TIP_TYPE.DELETE_REVISION]: 'Delete_revision',
+  [TIP_TYPE.SOURCE_DOCUMENT_CHANGED]: 'Tip'
 };
 export const TIP_CONTENT = {
   [TIP_TYPE.DELETE_NO_CHANGES_REVISION]: 'Rebase_delete_no_change_revision_tip',
@@ -55,6 +57,7 @@ export const TIP_CONTENT = {
   [TIP_TYPE.HAS_BEEN_REMOVED]: 'Has_been_removed_tip',
   [TIP_TYPE.CHECKING]: 'Checking',
   [TIP_TYPE.PUBLISHING]: 'Publishing',
-  [TIP_TYPE.DELETE_REVISION]: 'Delete_tip'
+  [TIP_TYPE.DELETE_REVISION]: 'Delete_tip',
+  [TIP_TYPE.SOURCE_DOCUMENT_CHANGED]: 'Source_document_changed_tip'
 };
 export { KeyCodes, TransferTypes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.5.48",
+  "version": "0.5.50",
   "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_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",
+  "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": "Potvrdit",
   "View_changes": "View changes",
@@ -452,5 +452,9 @@
   "Move_column_count": "Moving {{count}} column(s)",
   "Move_row_count": "Moving {{count}} row(s)",
   "Mark_all_as_read": "Mark all as read",
-  "Alignment_type": "Alignment"
+  "Alignment_type": "Alignment",
+  "Print": "Print",
+  "Enter_more_character_start_search": "Enter more characters to start search",
+  "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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

@@ -59,7 +59,7 @@
   "Copy_internal_link": "Der interne Link wurde in den Zwischenspeicher kopiert.",
   "Internal_link_desc": "Interne Links sind Verweise auf Dateien bzw. Ordner, die nur von Benutzer/innen mit mindestens Leserechten für die Dateien bzw. Ordner genutzt werden können. Interne Links eignen sich insbesondere für die interne Kommunikation in Ticket-/CRM-Systemen sowie E-Mails und Chats.",
   "Share": "Freigeben",
-  "Share_link": "Share link",
+  "Share_link": "Freigabe-Link",
   "Generate": "Erstellen",
   "Add_password_protection": "Passwort hinzufügen",
   "Password": "Passwort",
@@ -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_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",
+  "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": "Bestätigen",
   "View_changes": "View changes",
@@ -452,5 +452,9 @@
   "Move_column_count": "Moving {{count}} column(s)",
   "Move_row_count": "Moving {{count}} row(s)",
   "Mark_all_as_read": "Alle als gelesen markieren",
-  "Alignment_type": "Alignment"
+  "Alignment_type": "Alignment",
+  "Print": "Drucken",
+  "Enter_more_character_start_search": "Enter more characters to start search",
+  "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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

@@ -455,5 +455,6 @@
   "Alignment_type": "Alignment",
   "Print": "Print",
   "Enter_more_character_start_search": "Enter more characters to start search",
-  "Create_file_name_sdoc": "Create {{file_name_sdoc}}"
+  "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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_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",
+  "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": "Confirmar",
   "View_changes": "View changes",
@@ -452,5 +452,9 @@
   "Move_column_count": "Moving {{count}} column(s)",
   "Move_row_count": "Moving {{count}} row(s)",
   "Mark_all_as_read": "Mark all as read",
-  "Alignment_type": "Alignment"
+  "Alignment_type": "Alignment",
+  "Print": "Print",
+  "Enter_more_character_start_search": "Enter more characters to start search",
+  "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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_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",
+  "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": "L'ajout d'une réponse rouvrira la discussion.",
   "Confirm": "Confirmer",
   "View_changes": "Afficher les modifications",
@@ -452,5 +452,9 @@
   "Move_column_count": "Moving {{count}} column(s)",
   "Move_row_count": "Moving {{count}} row(s)",
   "Mark_all_as_read": "Mark all as read",
-  "Alignment_type": "Alignment"
+  "Alignment_type": "Alignment",
+  "Print": "Imprimer",
+  "Enter_more_character_start_search": "Enter more characters to start search",
+  "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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_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",
+  "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",
@@ -452,5 +452,9 @@
   "Move_column_count": "Moving {{count}} column(s)",
   "Move_row_count": "Moving {{count}} row(s)",
   "Mark_all_as_read": "Mark all as read",
-  "Alignment_type": "Alignment"
+  "Alignment_type": "Alignment",
+  "Print": "Print",
+  "Enter_more_character_start_search": "Enter more characters to start search",
+  "Create_file_name_sdoc": "Create {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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_comment_Enter_for_new_line_shift_enter_to_send": "Введите комментарий",
-  "Enter_reply_Enter_for_new_line_Shift_Enter_to_send": "Введите ответ",
+  "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": "Просмотр изменений",
@@ -400,7 +400,7 @@
   "Delete_failed": "Не удалось удалить",
   "Insert_caption": "Вставить подпись",
   "No_collaborators_available": "Нет доступных соавторов",
-  "Search_collaborator": "Search collaborator",
+  "Search_collaborator": "Поиск соавтора",
   "Doc_comments": "Комментарии к документу",
   "Tag_not_found": "Тег не найден",
   "Create_a_new_tag": "Создать новый тег",
@@ -452,5 +452,9 @@
   "Move_column_count": "Перемещение {{count}} столбцов",
   "Move_row_count": "Перемещение {{count}} строк",
   "Mark_all_as_read": "Отметить все как прочитанное",
-  "Alignment_type": "Alignment"
+  "Alignment_type": "Выравнивание",
+  "Print": "Печать",
+  "Enter_more_character_start_search": "Введите больше символов, чтобы начать поиск",
+  "Create_file_name_sdoc": "Создать {{file_name_sdoc}}",
+  "Source_document_changed_tip": "Original document has concurrent modifications. Do you like to merge these modifications to the revision?"
 }

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

@@ -455,5 +455,6 @@
   "Alignment_type": "对齐方式",
   "Print": "打印",
   "Enter_more_character_start_search": "输入更多字符开始搜索",
-  "Create_file_name_sdoc": "新建 {{file_name_sdoc}}"
+  "Create_file_name_sdoc": "新建 {{file_name_sdoc}}",
+  "Source_document_changed_tip": "源文档有并发的改动。你需要合并这些改动到修订稿吗?"
 }

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/combine-cells.js

@@ -1,32 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useCallback, useEffect, useState } from 'react';
-import { MenuItem } from '../../../../commons';
-import { MENUS_CONFIG_MAP, COMBINE_CELL } from '../../../../constants';
-import { isCombineCellsDisabled, combineCells } from '../../helpers';
-const CombineCells = _ref => {
-  let {
-    isRichEditor,
-    className,
-    editor,
-    readonly
-  } = _ref;
-  const [disabled, setDisabled] = useState(false);
-  useEffect(() => {
-    const disabled = isCombineCellsDisabled(editor, readonly);
-    setDisabled(disabled);
-  }, [editor, editor.tableSelectedRange, readonly]);
-  const _combineCells = useCallback(() => {
-    if (readonly) return;
-    combineCells(editor);
-  }, [editor, readonly]);
-  const menuConfig = MENUS_CONFIG_MAP[COMBINE_CELL];
-  const props = _objectSpread(_objectSpread({
-    isRichEditor,
-    disabled: disabled,
-    isActive: false
-  }, menuConfig), {}, {
-    onMouseDown: _combineCells
-  });
-  return /*#__PURE__*/React.createElement(MenuItem, props);
-};
-export default CombineCells;

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/remove-table-menu.js

@@ -1,30 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useCallback } from 'react';
-import classnames from 'classnames';
-import { MenuItem } from '../../../../commons';
-import { MENUS_CONFIG_MAP, REMOVE_TABLE } from '../../../../constants';
-import { removeTableElement } from '../../helpers';
-import { TABLE_ELEMENT } from '../../constants';
-const RemoveTable = _ref => {
-  let {
-    isRichEditor,
-    className,
-    editor,
-    readonly
-  } = _ref;
-  const removeTable = useCallback(() => {
-    if (readonly) return;
-    removeTableElement(editor, TABLE_ELEMENT.TABLE);
-  }, [editor, readonly]);
-  const menuConfig = MENUS_CONFIG_MAP[REMOVE_TABLE];
-  const props = _objectSpread(_objectSpread({
-    isRichEditor,
-    className: classnames(className, 'sdoc-remove-table menu-group-item'),
-    disabled: readonly,
-    isActive: false
-  }, menuConfig), {}, {
-    onMouseDown: removeTable
-  });
-  return /*#__PURE__*/React.createElement(MenuItem, props);
-};
-export default RemoveTable;

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/table-column-menu.js

@@ -1,38 +0,0 @@
-import React, { useCallback, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
-import CommonMenu from './common-menu';
-import { insertTableElement, removeTableElement } from '../../helpers';
-import { TABLE_ELEMENT } from '../../constants';
-const TableColumnMenu = _ref => {
-  let {
-    editor,
-    readonly
-  } = _ref;
-  const tableColumnRef = useRef(null);
-  const {
-    t
-  } = useTranslation();
-  const insertColumn = useCallback(type => {
-    if (readonly) return;
-    insertTableElement(editor, type);
-    tableColumnRef.current && tableColumnRef.current.hidePopover();
-  }, [editor, readonly]);
-  const removeColumn = useCallback(type => {
-    if (readonly) return;
-    removeTableElement(editor, type);
-    tableColumnRef.current && tableColumnRef.current.hidePopover();
-  }, [editor, readonly]);
-  return /*#__PURE__*/React.createElement(CommonMenu, {
-    id: "table-column",
-    iconClass: "sdocfont sdoc-column",
-    ref: tableColumnRef,
-    disabled: readonly
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-dropdown-menu-item",
-    onClick: () => insertColumn(TABLE_ELEMENT.COLUMN)
-  }, t('Insert_column')), /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-dropdown-menu-item",
-    onClick: () => removeColumn(TABLE_ELEMENT.COLUMN)
-  }, t('Remove_column')));
-};
-export default TableColumnMenu;

package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/table-row-menu.js

@@ -1,38 +0,0 @@
-import React, { useCallback, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
-import CommonMenu from './common-menu';
-import { insertTableElement, removeTableElement } from '../../helpers';
-import { TABLE_ELEMENT } from '../../constants';
-const TableRowMenu = _ref => {
-  let {
-    editor,
-    readonly
-  } = _ref;
-  const tableRowRef = useRef(null);
-  const {
-    t
-  } = useTranslation();
-  const insertRow = useCallback(type => {
-    if (readonly) return;
-    insertTableElement(editor, type);
-    tableRowRef.current && tableRowRef.current.hidePopover();
-  }, [editor, readonly]);
-  const removeRow = useCallback(type => {
-    if (readonly) return;
-    removeTableElement(editor, type);
-    tableRowRef.current && tableRowRef.current.hidePopover();
-  }, [editor, readonly]);
-  return /*#__PURE__*/React.createElement(CommonMenu, {
-    id: "table-row",
-    iconClass: "sdocfont sdoc-row",
-    ref: tableRowRef,
-    disabled: readonly
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-dropdown-menu-item",
-    onClick: () => insertRow(TABLE_ELEMENT.ROW)
-  }, t('Insert_row')), /*#__PURE__*/React.createElement("div", {
-    className: "sdoc-dropdown-menu-item",
-    onClick: () => removeRow(TABLE_ELEMENT.ROW)
-  }, t('Remove_row')));
-};
-export default TableRowMenu;