@seafile/sdoc-editor 1.0.194 → 1.0.195

package/dist/basic-sdk/extension/core/queries/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isContainsVoidElement = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
+exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isMiddlePoint = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isContainsVoidElement = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
 var _utils = require("../utils");
@@ -390,6 +390,10 @@ const isEndPoint = (editor, point, at) => {
   return !!point && _slate.Editor.isEnd(editor, point, at);
 };
 exports.isEndPoint = isEndPoint;
+const isMiddlePoint = (editor, point, at) => {
+  return !isStartPoint(editor, point, at) && !isEndPoint(editor, point, at);
+};
+exports.isMiddlePoint = isMiddlePoint;
 const isBlockTextEmptyAfterSelection = editor => {
   if (!editor.selection) return false;
   const blockAbove = _slate.Editor.above(editor, {

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

@@ -29,9 +29,10 @@ const withBlockquote = editor => {
       match: n => _slate.Element.isElement(n) && [_constants.PARAGRAPH, _constants.HEADER1, _constants.HEADER2, _constants.HEADER3, _constants.HEADER4, _constants.HEADER5, _constants.HEADER6, _constants.TITLE, _constants.SUBTITLE].includes(n.type),
       mode: 'lowest'
     });
+
     // Exit blockquote when current line is empty
-    const isAtEnd = currentLineEntry[1].slice(-1)[0] === quoteBlockEntry[0].children.length - 1;
-    if (isAtEnd) {
+    const isAtBlockquoteEnd = currentLineEntry[1].slice(-1)[0] === quoteBlockEntry[0].children.length - 1;
+    if (isAtBlockquoteEnd) {
       const isEmptyLine = !(currentLineEntry && _slate.Editor.string(newEditor, currentLineEntry[1]).length) && !(0, _core.isContainsVoidElement)(currentLineEntry[0]);
       if (isEmptyLine) {
         const nextPath = _slate.Path.next(quoteBlockEntry[1]);
@@ -43,6 +44,15 @@ const withBlockquote = editor => {
       }
     }
 
+    // const isMiddleIn
+    if (_slate.Range.isCollapsed(selection)) {
+      const isMiddleIn = (0, _core.isMiddlePoint)(editor, selection.anchor, currentLineEntry[1]);
+      if (isMiddleIn) {
+        insertBreak();
+        return;
+      }
+    }
+
     // Insert new line
     _slate.Transforms.insertNodes(editor, {
       type: _constants.PARAGRAPH,
@@ -70,20 +80,15 @@ const withBlockquote = editor => {
       const [, currentLinePath] = currentLineEntry;
       const currentLineIndex = currentLinePath[blockQuotePath.length];
       // Transforms to paragraph when Select at the beginning of the first line
-      if (currentLineIndex === 0 && (0, _core.isBlockAboveEmpty)(newEditor)) {
-        const emptyParagraph = (0, _core.generateEmptyElement)(_constants.PARAGRAPH);
-        _slate.Transforms.removeNodes(editor, {
-          at: blockQuoteEntry[1]
-        });
-        _slate.Transforms.insertNodes(newEditor, emptyParagraph, {
-          at: blockQuoteEntry[1]
+      if (currentLineIndex === 0) {
+        _slate.Transforms.liftNodes(editor, {
+          at: currentLinePath
         });
-        const focusPoint = _slate.Editor.end(newEditor, blockQuoteEntry[1]);
-        (0, _core.focusEditor)(newEditor, focusPoint);
         return;
       }
+
       // Merge with previous line when Select at the beginning of the line
-      if ((0, _core.isSelectionAtBlockStart)(editor)) {
+      if (currentLineIndex !== 0 && (0, _core.isSelectionAtBlockStart)(editor)) {
         const lineText = _slate.Node.string(currentLineEntry[0]);
         const previousNodeEntry = _slate.Editor.previous(editor, {
           at: currentLineEntry[1]

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.onMouseEnter = exports.onDrop = exports.onDragOver = exports.onDragLeave = void 0;
+exports.onMouseEnter = exports.onDrop = exports.onDragOver = exports.onDragLeave = exports.DRAG_SDOC_EDITOR_ELEMENT = void 0;
 var _eventBus = _interopRequireDefault(require("../../../utils/event-bus"));
 var _constants = require("../../../constants");
 var _constants2 = require("../../constants");
@@ -36,4 +36,5 @@ const onDrop = event => {
   const eventBus = _eventBus.default.getInstance();
   eventBus.dispatch(_constants.INTERNAL_EVENT.ON_DRAG_DROP_BLOCK, event);
 };
-exports.onDrop = onDrop;
+exports.onDrop = onDrop;
+const DRAG_SDOC_EDITOR_ELEMENT = exports.DRAG_SDOC_EDITOR_ELEMENT = 'drag_sdoc_editor_element';

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

@@ -19,6 +19,7 @@ var _helpers2 = require("../../plugins/image/helpers");
 var _constants = require("../../../constants");
 var _constants2 = require("../../constants");
 var _helper = require("../../plugins/callout/helper");
+var _event = require("./event");
 require("./index.css");
 let sourceElement = null;
 let targetElement = null;
@@ -122,6 +123,7 @@ const SideToolbar = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, isShowSideMenu, scrollRef, sidePosition.top]);
   const onMouseDown = (0, _react.useCallback)(e => {
+    e.stopPropagation();
     const domSelection = window.getSelection();
     if (domSelection.type !== 'Range' || !editor.selection || _slate.Path.equals(editor.selection.focus.path, editor.selection.anchor.path)) {
       draggedPreviewContainer.current = null;
@@ -193,6 +195,7 @@ const SideToolbar = () => {
     });
   }, [editor, isShowSideMenu, slateNode]);
   const dragStart = (0, _react.useCallback)(event => {
+    event.stopPropagation();
     // Create the preview container when dragging more than one listNodes
     const noDrag = _slate.Path.equals(editor.selection.focus.path, editor.selection.anchor.path);
     if (showSelectedNodesRef.current && showSelectedNodesRef.current.length > 1 && !noDrag) {
@@ -207,6 +210,7 @@ const SideToolbar = () => {
         draggedPreviewContainer.current.appendChild(clonedNode);
       });
       event.dataTransfer.setDragImage(draggedPreviewContainer.current, 0, 0);
+      event.dataTransfer.setData(_event.DRAG_SDOC_EDITOR_ELEMENT, true);
       draggedSourcePaths.current = showSelectedNodesRef.current.map(_ref4 => {
         let [, path] = _ref4;
         return path;
@@ -228,8 +232,11 @@ const SideToolbar = () => {
       sourceElement = _slateReact.ReactEditor.toDOMNode(editor, nodeEntry[0]);
     }
     event.dataTransfer.setDragImage(sourceElement, 0, 0);
+    event.dataTransfer.setData(_event.DRAG_SDOC_EDITOR_ELEMENT, true);
   }, [editor, slateNode]);
   const dragOver = (0, _react.useCallback)(event => {
+    const dragTypes = event.dataTransfer.types;
+    if (!dragTypes.includes(_event.DRAG_SDOC_EDITOR_ELEMENT)) return;
     const overElement = event.currentTarget;
     if (!overElement.classList.contains('sdoc-draging')) {
       overElement.classList.add('sdoc-draging');
@@ -240,11 +247,14 @@ const SideToolbar = () => {
     leaveElement.classList.remove('sdoc-draging');
   }, []);
   const drop = (0, _react.useCallback)(event => {
-    const dragTypes = event.dataTransfer.types;
     targetElement = event.currentTarget;
     targetElement.classList.remove('sdoc-draging');
+    const dragTypes = event.dataTransfer.types;
+    if (!dragTypes.includes(_event.DRAG_SDOC_EDITOR_ELEMENT)) return;
+
     // Prevent dragging table data to the editor
     if (dragTypes.includes(_constants2.TABLE_DRAG_KEY)) return;
+
     // Drag local image files to sdoc
     if (event.dataTransfer.files.length > 0) {
       const [, targetPath] = (0, _helpers.getNodeEntry)(editor, targetElement);
@@ -302,6 +312,7 @@ const SideToolbar = () => {
         draggedSourcePaths.current = null;
         showSelectedNodesRef.current = null;
         draggedPreviewContainer.current = null;
+        event.dataTransfer.clearData();
       }
     }
     const [sourceNode, sourcePath] = (0, _helpers.getNodeEntry)(editor, sourceElement);

package/package.json

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