@seafile/sdoc-editor 0.2.8 → 0.2.9

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

@@ -1,7 +1,9 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Editor, Transforms, Element } from '@seafile/slate';
 import slugid from 'slugid';
-import { BLOCKQUOTE, CHECK_LIST_ITEM, IMAGE, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST } from '../../constants';
+import { BLOCKQUOTE, CHECK_LIST_ITEM, IMAGE, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST, CODE_BLOCK, TABLE } from '../../constants';
 import { focusEditor, getNodeType } from '../../core';
 export var isMenuDisabled = function isMenuDisabled(editor, readonly) {
   if (readonly) return true;
@@ -68,4 +70,48 @@ export var setBlockQuoteType = function setBlockQuoteType(editor, active) {
     });
   }
   focusEditor(editor);
+};
+export var getFormattedElements = function getFormattedElements(data) {
+  var elements = [];
+  var arr = [];
+  data.forEach(function (item) {
+    if ([CODE_BLOCK, TABLE, BLOCKQUOTE].includes(item === null || item === void 0 ? void 0 : item.type)) {
+      // Insert quote block
+      if (arr.length !== 0) {
+        var blockquoteNode = {
+          id: slugid.nice(),
+          type: BLOCKQUOTE
+        };
+        blockquoteNode['children'] = arr;
+        elements.push(blockquoteNode);
+        arr = [];
+      }
+      // Merge quote block
+      var preElement = elements[elements.length - 1];
+      if ((preElement === null || preElement === void 0 ? void 0 : preElement.type) === BLOCKQUOTE && (item === null || item === void 0 ? void 0 : item.type) === BLOCKQUOTE) {
+        elements[elements.length - 1] = _objectSpread(_objectSpread({}, preElement), {}, {
+          children: [].concat(_toConsumableArray(preElement.children), _toConsumableArray(item.children))
+        });
+      } else {
+        elements.push(item);
+      }
+    } else {
+      arr.push(item);
+    }
+  });
+  return elements;
+};
+export var getFormattedRestElements = function getFormattedRestElements(data) {
+  var restElements = data.slice(0);
+  // Contains quote block type elements
+  if (data.find(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === BLOCKQUOTE;
+  })) {
+    data.forEach(function (item, index) {
+      if ((item === null || item === void 0 ? void 0 : item.type) === BLOCKQUOTE) {
+        restElements.splice.apply(restElements, [index, 1].concat(_toConsumableArray(item.children)));
+      }
+    });
+  }
+  return restElements;
 };

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

@@ -2,12 +2,13 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Editor, Element, Point, Transforms, Node } from '@seafile/slate';
 import { ReactEditor } from '@seafile/slate-react';
 import { generateEmptyElement, getSelectedNodeByType, isSelectionAtBlockStart } from '../../core';
-import { BLOCKQUOTE, PARAGRAPH } from '../../constants';
-import { setBlockQuoteType } from './helpers';
+import { BLOCKQUOTE, PARAGRAPH, CODE_BLOCK, TABLE } from '../../constants';
+import { setBlockQuoteType, getFormattedElements, getFormattedRestElements } from './helpers';
 var withBlockquote = function withBlockquote(editor) {
   var insertBreak = editor.insertBreak,
     insertText = editor.insertText,
-    deleteBackward = editor.deleteBackward;
+    deleteBackward = editor.deleteBackward,
+    insertFragment = editor.insertFragment;
   var newEditor = editor;
   newEditor.insertBreak = function () {
     var selection = editor.selection;
@@ -58,6 +59,39 @@ var withBlockquote = function withBlockquote(editor) {
     }
     deleteBackward(unit);
   };
+  newEditor.insertFragment = function (data) {
+    // Paste into quote block
+    if (getSelectedNodeByType(newEditor, BLOCKQUOTE)) {
+      var lastIndex = data.findLastIndex(function (item) {
+        return [CODE_BLOCK, TABLE].includes(item === null || item === void 0 ? void 0 : item.type);
+      });
+      var elements = getFormattedElements(data.slice(0, lastIndex + 1));
+      var restElements = getFormattedRestElements(data.slice(lastIndex + 1));
+      var path = Editor.path(newEditor, newEditor.selection);
+
+      // Insert elements of quote block
+      if (restElements.length !== 0) {
+        // Insert text when inserting a single line paragraph
+        if (restElements.length === 1 && restElements[0].type === PARAGRAPH) {
+          var string = Node.string(restElements[0]);
+          Editor.insertText(newEditor, string);
+        } else {
+          Transforms.insertNodes(newEditor, restElements, {
+            at: [path[0], path[1]]
+          });
+        }
+      }
+
+      // Insert elements above the quoted block
+      if (elements.length !== 0) {
+        Transforms.insertNodes(newEditor, elements, {
+          at: [path[0]]
+        });
+      }
+      return;
+    }
+    return insertFragment(data);
+  };
   return newEditor;
 };
 export default withBlockquote;

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

@@ -137,7 +137,7 @@ export var changeToPlainText = function changeToPlainText(editor) {
     mode: 'highest'
   });
 };
-export var setClipboardData = function setClipboardData(value) {
+export var setClipboardCodeBlockData = function setClipboardCodeBlockData(value) {
   // Insert text into the clipboard for use on other pages
   var text = value.children.map(function (line) {
     return Node.string(line);

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

@@ -1,20 +1,19 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _toArray from "@babel/runtime/helpers/esm/toArray";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import slugid from 'slugid';
 import isHotkey from 'is-hotkey';
 import { Transforms, Node, Range, Editor } from '@seafile/slate';
 import { getNodeType, isLastNode, getSelectedNodeByType, generateEmptyElement } from '../../core';
 import { deleteBackwardByLength } from './helpers';
-import { CODE_BLOCK, PARAGRAPH, CODE_LINE } from '../../constants';
+import { CODE_BLOCK, PARAGRAPH, CODE_LINE, BLOCKQUOTE } from '../../constants';
 var withCodeBlock = function withCodeBlock(editor) {
   var normalizeNode = editor.normalizeNode,
     insertFragment = editor.insertFragment,
     insertText = editor.insertText,
     insertBreak = editor.insertBreak,
-    insertData = editor.insertData,
-    insertNode = editor.insertNode;
+    insertData = editor.insertData;
   var newEditor = editor;
 
   // If you enter two Spaces in quick succession, a period and a space appear （Default Settings for mac）
@@ -25,14 +24,21 @@ var withCodeBlock = function withCodeBlock(editor) {
     return insertText(data);
   };
   newEditor.insertData = function (data) {
+    // Paste a single code block element somewhere other than a code block
     if (data.types.includes('text/code-block') && !getSelectedNodeByType(editor, CODE_BLOCK)) {
+      var options = {};
+      // Paste into quote block
+      if (getSelectedNodeByType(newEditor, BLOCKQUOTE)) {
+        var path = Editor.path(newEditor, newEditor.selection);
+        options['at'] = [path[0]];
+      }
       var codeBlockNode = JSON.parse(data.getData('text/code-block'));
-      return insertNode(codeBlockNode);
+      return Transforms.insertNodes(newEditor, codeBlockNode, _objectSpread({}, options));
     }
     insertData(data);
   };
   newEditor.insertFragment = function (data) {
-    // only selected code block content
+    // Only selected code block content
     if (data.length === 1 && data[0].type === CODE_BLOCK && !getSelectedNodeByType(editor, CODE_BLOCK)) {
       data.forEach(function (node, index) {
         if (node.type === CODE_BLOCK) {
@@ -47,9 +53,8 @@ var withCodeBlock = function withCodeBlock(editor) {
       });
       return insertFragment(data);
     } else {
+      // Paste into code block
       if (getSelectedNodeByType(editor, CODE_BLOCK)) {
-        // Paste into code block
-
         // Pasted data is code block split with code-line
         data.forEach(function (node, index) {
           if (node.type === CODE_BLOCK) {

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

@@ -7,7 +7,7 @@ import EventBus from '../../../utils/event-bus';
 import { focusEditor } from '../../core';
 import { useScrollContext } from '../../../hooks/use-scroll-context';
 import CodeBlockHoverMenu from './hover-menu';
-import { setClipboardData } from './helpers';
+import { setClipboardCodeBlockData } from './helpers';
 import { INTERNAL_EVENT } from '../../../constants';
 import '../../../assets/css/code-block.css';
 var CodeBlock = function CodeBlock(_ref) {
@@ -57,7 +57,7 @@ var CodeBlock = function CodeBlock(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var onCopyCodeBlock = useCallback(function () {
-    setClipboardData(element);
+    setClipboardCodeBlockData(element);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [element]);
   var onDeleteCodeBlock = useCallback(function () {

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

@@ -4,6 +4,7 @@ import { ReactEditor } from '@seafile/slate-react';
 import copy from 'copy-to-clipboard';
 import { toggleList } from '../../plugins/list/transforms';
 import { generateEmptyElement } from '../../core';
+import { setClipboardCodeBlockData } from '../../plugins/code-block/helpers';
 import { ORDERED_LIST, UNORDERED_LIST, PARAGRAPH, CHECK_LIST_ITEM, IMAGE, TABLE, CODE_BLOCK, BLOCKQUOTE, LIST_ITEM_CORRELATION_TYPE, ADD_POSITION_OFFSET_TYPE, INSERT_POSITION, ELEMENT_TYPE } from '../../constants';
 import { EMPTY_SELECTED_RANGE } from '../../plugins/table/constants';
 export var onSetNodeType = function onSetNodeType(editor, element, type) {
@@ -42,6 +43,10 @@ export var setSelection = function setSelection(editor, element) {
   }
 };
 export var onCopyNode = function onCopyNode(editor, element) {
+  if (element.type === ELEMENT_TYPE.CODE_BLOCK) {
+    setClipboardCodeBlockData(element);
+    return;
+  }
   if (element.type === ELEMENT_TYPE.TABLE) {
     var tableSize = [element.children.length, element.children[0].children.length];
     var tableSelectedRange = {

package/package.json

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