@seafile/sdoc-editor 0.5.23 → 0.5.24

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

@@ -1,4 +1,4 @@
-import { Editor, Element, Transforms, Node, Path } from '@seafile/slate';
+import { Editor, Element, Transforms, Node, Path, Range } from '@seafile/slate';
 import { focusEditor, generateDefaultText, generateEmptyElement, getSelectedNodeByType, getSelectedNodeEntryByType, isBlockAboveEmpty, isSelectionAtBlockStart } from '../../core';
 import { BLOCKQUOTE, PARAGRAPH, CODE_BLOCK, TABLE } from '../../constants';
 import { getFormattedElements, getFormattedRestElements } from './helpers';
@@ -106,6 +106,20 @@ const withBlockquote = editor => {
 
       // Insert elements of quote block
       if (restElements.length !== 0) {
+        if (Range.isCollapsed(editor.selection)) {
+          const paragraphEntry = getSelectedNodeEntryByType(newEditor, PARAGRAPH);
+          if (paragraphEntry) {
+            const parentNodeEntry = Editor.parent(editor, paragraphEntry[1]);
+            if (parentNodeEntry && parentNodeEntry[0].type === BLOCKQUOTE) {
+              if (!Node.string(paragraphEntry[0]).length) {
+                insertFragment(data);
+                return Transforms.removeNodes(newEditor, {
+                  at: paragraphEntry[1]
+                });
+              }
+            }
+          }
+        }
         // Insert text when inserting a single line paragraph
         if (restElements.length === 1 && restElements[0].type === PARAGRAPH) {
           const string = Node.string(restElements[0]);

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

@@ -1,7 +1,7 @@
 import isHotkey from 'is-hotkey';
-import { Editor, Transforms } from '@seafile/slate';
-import { PARAGRAPH, INSERT_POSITION, CODE_BLOCK } from '../../constants';
-import { isSelectionAtBlockStart } from '../../core';
+import { Editor, Node, Range, Transforms } from '@seafile/slate';
+import { PARAGRAPH, INSERT_POSITION, CODE_BLOCK, CALL_OUT } from '../../constants';
+import { getSelectedNodeEntryByType, isSelectionAtBlockStart } from '../../core';
 import { deleteCalloutIcon, getCalloutEntry, isCalloutContentEmpty, unwrapCallout } from './helper';
 import { insertElement } from '../../toolbar/side-toolbar/helpers';
 import EventBus from '../../../utils/event-bus';
@@ -49,6 +49,21 @@ const withCallout = editor => {
   newEditor.insertFragment = data => {
     if (getCalloutEntry(editor)) {
       var _data$find;
+      // Prvent insert new line when insert fragment
+      if (Range.isCollapsed(editor.selection)) {
+        const paragraphEntry = getSelectedNodeEntryByType(newEditor, PARAGRAPH);
+        if (paragraphEntry) {
+          const parentNodeEntry = Editor.parent(editor, paragraphEntry[1]);
+          if (parentNodeEntry && parentNodeEntry[0].type === CALL_OUT) {
+            if (!Node.string(paragraphEntry[0]).length) {
+              insertFragment(data);
+              return Transforms.removeNodes(newEditor, {
+                at: paragraphEntry[1]
+              });
+            }
+          }
+        }
+      }
       const eventBus = EventBus.getInstance();
       const unsupportType = (_data$find = data.find(node => !CALLOUT_ALLOWED_INSIDE_TYPES.includes(node.type))) === null || _data$find === void 0 ? void 0 : _data$find.type;
       if (unsupportType) {

package/package.json

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