@seafile/sdoc-editor 0.4.13 → 0.4.14

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

@@ -78,6 +78,7 @@ const GlobalComment = _ref => {
     setActiveComment(comment);
     deleteUnseenNotifications && deleteUnseenNotifications(comment);
     if (comment.detail.element_id === DOC_COMMENT_ELEMENT_ID) return;
+    if (!element) return;
     const elementDom = ReactEditor.toDOMNode(editor, element, scrollRef);
     scrollRef.current.scrollTop = elementDom.offsetTop - scrollRef.current.clientHeight / 3;
     focusToCommentElement(editor, element);
@@ -150,8 +151,7 @@ const GlobalComment = _ref => {
     className: "sdoc-comment-list-container"
   }, Array.isArray(commentList) && commentList.map(comment => {
     const elementId = comment.detail.element_id;
-    const element = getNodeById(editor.children, elementId);
-    if (!element && elementId !== DOC_COMMENT_ELEMENT_ID) return null;
+    const element = elementId !== DOC_COMMENT_ELEMENT_ID ? getNodeById(editor.children, elementId) : null;
     const isActive = activeComment && activeComment.id === comment.id;
     return /*#__PURE__*/React.createElement(CommentItemWrapper, {
       key: comment.id,

package/dist/basic-sdk/extension/constants/font.js

@@ -517,7 +517,6 @@ export const FONT = [
   }
 } // 楷体
 ];
-
 export const SDOC_FONT_SIZE = {
   DEFAULT: 11,
   [ELEMENT_TYPE.TITLE]: 26,

package/dist/basic-sdk/extension/plugins/blockquote/plugin.js

@@ -1,7 +1,7 @@
 import { Editor, Element, Transforms, Node, Path } from '@seafile/slate';
-import { focusEditor, generateDefaultText, getSelectedNodeByType, isSelectionAtBlockStart } from '../../core';
+import { focusEditor, generateDefaultText, generateEmptyElement, getSelectedNodeByType, getSelectedNodeEntryByType, isBlockAboveEmpty, isSelectionAtBlockStart } from '../../core';
 import { BLOCKQUOTE, PARAGRAPH, CODE_BLOCK, TABLE } from '../../constants';
-import { setBlockQuoteType, getFormattedElements, getFormattedRestElements } from './helpers';
+import { getFormattedElements, getFormattedRestElements } from './helpers';
 const withBlockquote = editor => {
   const {
     insertBreak,
@@ -54,23 +54,34 @@ const withBlockquote = editor => {
       deleteBackward(unit);
       return;
     }
-    const node = getSelectedNodeByType(editor, BLOCKQUOTE);
-    if (node) {
+    const blockQuoteEntry = getSelectedNodeEntryByType(editor, BLOCKQUOTE);
+    if (blockQuoteEntry) {
       const [currentLineEntry] = Editor.nodes(newEditor, {
         match: n => Element.isElement(n) && n.type === PARAGRAPH,
         mode: 'lowest'
       });
       if (!currentLineEntry) return deleteBackward(unit);
       const currentLineIndex = currentLineEntry[1].slice(-1)[0];
-      if (currentLineIndex === 0) {
-        setBlockQuoteType(editor, PARAGRAPH);
+      // Transforms to paragraph when Select at the beginning of the first line
+      if (currentLineIndex === 0 && isBlockAboveEmpty(newEditor)) {
+        const emptyParagraph = generateEmptyElement(PARAGRAPH);
+        Transforms.removeNodes(editor, {
+          at: currentLineEntry[1]
+        });
+        Transforms.insertNodes(newEditor, emptyParagraph, {
+          at: blockQuoteEntry[1]
+        });
+        const previous = Path.previous(blockQuoteEntry[1]);
+        focusEditor(newEditor, Path.next(previous).concat(0));
         return;
       }
+      // Merge with previous line when Select at the beginning of the line
       if (isSelectionAtBlockStart(editor)) {
         const lineText = Node.string(currentLineEntry[0]);
         const previousNodeEntry = Editor.previous(editor, {
           at: currentLineEntry[1]
         });
+        if (!previousNodeEntry) return;
         const focusPoint = Editor.end(newEditor, previousNodeEntry[1]);
         Transforms.insertText(newEditor, lineText, {
           at: Editor.end(newEditor, previousNodeEntry[1])

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

@@ -51,7 +51,6 @@ const renderCallout = (_ref, editor) => {
         top: menuTop,
         left: left // left = code-block left distance
       };
-
       setPopoverPosition(newMenuPosition);
     }
   }, [isShowColorSelector, readOnly]);
@@ -82,7 +81,6 @@ const renderCallout = (_ref, editor) => {
       top: menuTop,
       left: left // left = callout left distance
     };
-
     setPopoverPosition(newMenuPosition);
     setIsShowColorSelector(true);
   }, [readOnly]);

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

@@ -23,7 +23,6 @@ export const isMenuDisabled = (editor, readonly) => {
   if (isMatch) return false; // enable
   return true; // disable
 };
-
 export const getSelectCodeElem = editor => {
   const codeNode = getSelectedNodeByType(editor, CODE_BLOCK);
   if (codeNode == null) return null;
@@ -63,7 +62,6 @@ export const changeToCodeBlock = function (editor) {
     style: {
       white_space: 'nowrap' // default nowrap
     },
-
     children: [{
       id: slugid.nice(),
       type: CODE_LINE,

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

@@ -81,7 +81,6 @@ const CodeBlock = _ref => {
         top: menuTop,
         left: left // left = code-block left distance
       };
-
       setMenuPosition(newMenuPosition);
     }
     setShowHoverMenu(true);
@@ -105,7 +104,6 @@ const CodeBlock = _ref => {
         top: menuTop,
         left: left // left = code-block left distance
       };
-
       setMenuPosition(newMenuPosition);
     }
   }, [readOnly, showHoverMenu]);

package/dist/basic-sdk/extension/plugins/file-link/helpers.js

@@ -20,7 +20,6 @@ export const isMenuDisabled = (editor, readonly) => {
   if (notMatch) return true; // disabled
   return false; // enable
 };
-
 export const generateFileNode = (uuid, text) => {
   const fileNode = {
     id: slugid.nice(),

package/dist/basic-sdk/extension/plugins/html/helper.js

@@ -68,7 +68,6 @@ const deserializeElements = function () {
       // nothing todo
     }
   });
-
   return nodes;
 };
 const formatElementNodes = nodes => {

package/dist/basic-sdk/extension/plugins/image/plugin.js

@@ -115,7 +115,8 @@ const withImage = editor => {
       distance: 2
     });
     const [node, path] = Editor.node(editor, [point.path[0], point.path[1]]);
-    if (Range.isCollapsed(selection) && isBlockAboveEmpty(editor) && !Path.isCommon(path, selection.anchor.path)) {
+    const isPerviousNodeImage = node.type === IMAGE;
+    if (isPerviousNodeImage && Range.isCollapsed(selection) && isBlockAboveEmpty(editor) && !Path.isCommon(path, selection.anchor.path)) {
       deleteBackward(unit);
       focusEditor(newEditor, Editor.end(newEditor, focusPoint));
       return;

package/dist/basic-sdk/extension/plugins/link/helpers.js

@@ -19,7 +19,6 @@ export const isMenuDisabled = (editor, readonly) => {
   if (notMatch) return true; // disabled
   return false; // enable
 };
-
 export const checkLink = url => {
   if (url.indexOf('http') !== 0) {
     return true;

package/dist/basic-sdk/extension/plugins/sdoc-link/helpers.js

@@ -21,7 +21,6 @@ export const isMenuDisabled = (editor, readonly) => {
   if (notMatch) return true; // disabled
   return false; // enable
 };
-
 export const generateSdocFileNode = (uuid, text) => {
   const sdocFileNode = {
     id: slugid.nice(),

package/dist/basic-sdk/extension/plugins/search-replace/popover/index.js

@@ -188,7 +188,7 @@ const SearchReplacePopover = _ref => {
     disabled: !highlightInfos.length,
     onClick: handleLast,
     className: "btn btn-secondary"
-  }, t('Previous')), /*#__PURE__*/React.createElement("button", {
+  }, t('Prevs')), /*#__PURE__*/React.createElement("button", {
     disabled: !highlightInfos.length,
     onClick: handleNext,
     className: "btn btn-secondary"

package/dist/basic-sdk/extension/plugins/table/helpers.js

@@ -175,7 +175,6 @@ export const isAllInTable = editor => {
   if (firstSelectedNode.type !== ELEMENT_TYPE.TABLE) return false;
   return selectedNodes.slice(1).every(node => [ELEMENT_TYPE.TABLE_ROW, ELEMENT_TYPE.TABLE_CELL].includes(node.type)); // same table element
 };
-
 export const setCellStyle = (editor, style) => {
   // Select single cell
   if (ObjectUtils.isSameObject(editor.tableSelectedRange, EMPTY_SELECTED_RANGE)) {

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

@@ -92,7 +92,6 @@ export const getDomTopHeight = (dom, slateNode) => {
   if (ADD_POSITION_OFFSET_TYPE.includes(slateNode.type)) {
     offsetY = lightHight / 2 + paddingTop - 12; // side toolbar icon is 12 px
   }
-
   const HEADER_HEIGHT = 56 + 44;
   return rect.y - HEADER_HEIGHT + offsetY;
 };

package/package.json

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

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Type search content",
   "Replace_as": "Replace as",
   "Type_replace_content": "Type replace content",
-  "Previous": "Předchozí",
+  "Prevs": "Prevs",
   "Next": "Další",
   "Replace": "Nahradit",
   "Replace_all": "Replace all",

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Type search content",
   "Replace_as": "Replace as",
   "Type_replace_content": "Type replace content",
-  "Previous": "Vorherige",
+  "Prevs": "Prevs",
   "Next": "Nächste Seite",
   "Replace": "Ersetzen",
   "Replace_all": "Replace all",

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Type search content",
   "Replace_as": "Replace as",
   "Type_replace_content": "Type replace content",
-  "Previous": "Previous",
+  "Prevs": "Prevs",
   "Next": "Next",
   "Replace": "Replace",
   "Replace_all": "Replace all",

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Type search content",
   "Replace_as": "Replace as",
   "Type_replace_content": "Type replace content",
-  "Previous": "Anterior",
+  "Prevs": "Prevs",
   "Next": "Siguiente",
   "Replace": "Reemplazar",
   "Replace_all": "Replace all",

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Type search content",
   "Replace_as": "Replace as",
   "Type_replace_content": "Type replace content",
-  "Previous": "Précédent",
+  "Prevs": "Prevs",
   "Next": "Suivant",
   "Replace": "Remplacer",
   "Replace_all": "Replace all",

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Type search content",
   "Replace_as": "Replace as",
   "Type_replace_content": "Type replace content",
-  "Previous": "Precedente",
+  "Prevs": "Prevs",
   "Next": "Successivo",
   "Replace": "Sostituire",
   "Replace_all": "Replace all",

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

@@ -434,7 +434,7 @@
   "Type_search_content": "Введите содержимое для поиска",
   "Replace_as": "Заменить как",
   "Type_replace_content": "Введите содержимое для замены",
-  "Previous": "Предыдущий",
+  "Prevs": "Prevs",
   "Next": "Следующий",
   "Replace": "Заменить",
   "Replace_all": "Заменить все",

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

@@ -434,10 +434,10 @@
   "Type_search_content": "输入查找内容",
   "Replace_as": "替换为",
   "Type_replace_content": "输入替换内容",
-  "Previous": "上一个",
+  "Prevs": "上一个",
   "Next": "下一页",
   "Replace": "替换",
-  "Replace_all": "下一个",
+  "Replace_all": "替换全部",
   "Are_you_sure_to_replace_all_number_xxx_in_this_document_with_yyy": "确定要将此文档内的 {{number}} 处 \"{{originalWord}} \" 替换为 \"{{replacedWord}} \" 吗？",
   "Are_you_sure_to_clear_all_number_xxx_in_this_document": "确定将此文档内的 {{number}} 处 \"{{originalWord}}\" 全部清除吗?",
   "Search_not_found": "未找到"