@seafile/sdoc-editor 1.0.46 → 1.0.48

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

@@ -5,10 +5,10 @@ import { ReactEditor } from '@seafile/slate-react';
 import slugId from 'slugid';
 import context from '../../../../context';
 import EventBus from '../../../utils/event-bus';
-import { generateEmptyElement, getNodeType, isTextNode, getParentNode, focusEditor } from '../../core';
+import { generateEmptyElement, getNodeType, isTextNode, getParentNode, focusEditor, getAboveBlockNode } from '../../core';
 import { isList } from '../../toolbar/side-toolbar/helpers';
 import { COMMENT_EDITOR, INTERNAL_EVENT } from '../../../constants';
-import { CODE_BLOCK, ELEMENT_TYPE, IMAGE, IMAGE_BLOCK, INSERT_POSITION } from '../../constants';
+import { CODE_BLOCK, ELEMENT_TYPE, IMAGE, IMAGE_BLOCK, INSERT_POSITION, PARAGRAPH, SUBTITLE, TITLE } from '../../constants';
 import base64ToUnit8Array from '../../../../utils/base64-to-unit8array';
 export const isInsertImageMenuDisabled = (editor, readonly) => {
   if (readonly) return true;
@@ -26,6 +26,8 @@ export const isInsertImageMenuDisabled = (editor, readonly) => {
       }
       if (type === CODE_BLOCK) return true;
       if (type.startsWith('header')) return true;
+      if (type === TITLE) return true;
+      if (type === SUBTITLE) return true;
       if (Editor.isVoid(editor, n)) return true;
       return false;
     },
@@ -55,6 +57,22 @@ export const insertImage = function (editor, srcList, selection) {
   });
   const validSelection = selection || editor.selection;
   let path = Editor.path(editor, validSelection);
+  const aboveNodeEntry = getAboveBlockNode(editor);
+  const isEmptyParagraph = aboveNodeEntry[0].type === PARAGRAPH && Node.string(aboveNodeEntry[0]).length === 0;
+  if (imageNodes.length === 1 && isEmptyParagraph) {
+    const imageNode = imageNodes[0];
+    Transforms.insertNodes(editor, imageNode, {
+      at: validSelection
+    });
+    Transforms.setNodes(editor, {
+      type: IMAGE_BLOCK
+    }, {
+      at: validSelection
+    });
+    const imageEndSelection = Path.next(Path.next(path));
+    focusEditor(editor, imageEndSelection);
+    return;
+  }
   if (position === INSERT_POSITION.AFTER) {
     if (isList(editor, path)) {
       const targetPath = path.slice(0, -2);
@@ -147,11 +165,13 @@ export const resetCursor = editor => {
     Transforms.select(editor, targetPath);
   });
 };
-export const isSingleImage = data => {
-  if (data.length !== 1) return false;
-  if (Node.string(data[0]).length !== 0) return false;
-  if (data[0].children.filter(item => (item === null || item === void 0 ? void 0 : item.type) === IMAGE).length !== 1) return false;
-  return true;
+export const getSingleImageFromFragment = data => {
+  if (data.length !== 1) return null;
+  if (Node.string(data[0]).length !== 0) return null;
+  const children = data[0].children;
+  const images = children.filter(item => (item === null || item === void 0 ? void 0 : item.type) === IMAGE);
+  if (images.length !== 1) return null;
+  return images[0];
 };
 export const insertImageFiles = (files, editor, targetPath) => {
   context.uploadLocalImage(files).then(fileUrl => {

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

@@ -2,11 +2,11 @@ import { Transforms, Path, Editor, Element, Range } from '@seafile/slate';
 import toaster from '../../../../components/toast';
 import context from '../../../../context';
 import EventBus from '../../../utils/event-bus';
-import { insertImage, hasSdocImages, getImageData, queryCopyMoveProgressView, resetCursor, isSingleImage } from './helpers';
-import { focusEditor, generateEmptyElement, isBlockAboveEmpty } from '../../core';
+import { insertImage, hasSdocImages, getImageData, queryCopyMoveProgressView, resetCursor, isInsertImageMenuDisabled, getSingleImageFromFragment } from './helpers';
+import { focusEditor, generateEmptyElement, getLastChildPath, getSelectedNodeEntryByType, isBlockAboveEmpty, isSelectionAtBlockStart } from '../../core';
 import { getErrorMsg } from '../../../../utils';
 import { getSlateFragmentAttribute } from '../../../utils/document-utils';
-import { INSERT_POSITION, CLIPBOARD_FORMAT_KEY, CLIPBOARD_ORIGIN_SDOC_KEY, IMAGE, IMAGE_BLOCK, PARAGRAPH } from '../../constants';
+import { INSERT_POSITION, CLIPBOARD_FORMAT_KEY, CLIPBOARD_ORIGIN_SDOC_KEY, IMAGE, IMAGE_BLOCK, PARAGRAPH, ELEMENT_TYPE } from '../../constants';
 import { INTERNAL_EVENT } from '../../../constants';
 const withImage = editor => {
   const {
@@ -70,14 +70,27 @@ const withImage = editor => {
     if (data.types && data.types.includes('Files') && data.files[0].type.includes(IMAGE)) {
       context.uploadLocalImage(data.files).then(fileUrl => {
         insertImage(newEditor, fileUrl, editor.selection, INSERT_POSITION.CURRENT);
-        resetCursor(newEditor);
       });
       return;
     }
     insertData(data);
   };
   newEditor.insertFragment = data => {
-    if (isSingleImage(data)) {
+    const singleImage = getSingleImageFromFragment(data);
+    if (singleImage && isInsertImageMenuDisabled(editor)) {
+      const path = Editor.path(editor, editor.selection);
+      const nextPath = Path.next([path[0]]);
+      const p = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
+      p.children = [singleImage];
+      Transforms.insertNodes(editor, p, {
+        at: nextPath
+      });
+      // There will be a space before and after the image
+      const imagePath = [...nextPath, 1];
+      focusEditor(editor, Path.next(imagePath));
+      return;
+    }
+    if (singleImage) {
       resetCursor(newEditor);
     }
     return insertFragment(data);
@@ -110,28 +123,39 @@ const withImage = editor => {
     const {
       selection
     } = editor;
-    const focusPoint = Editor.before(editor, selection);
+    if (!selection) return deleteBackward(unit);
     const point = Editor.before(editor, selection, {
       distance: 1
     });
     if (!point) return deleteBackward(unit);
-    const [node, path] = Editor.node(editor, [point.path[0], point.path[1]]);
-    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;
+    if (!Range.isCollapsed(selection)) {
+      return deleteBackward(unit);
     }
-    if (Element.isElement(node) && node.type === IMAGE) {
-      // If the wrapping element is image_block, delete the wrapping element
-      const [parentNode, p] = Editor.node(editor, [path[0]]);
-      if (parentNode.type === IMAGE_BLOCK) {
-        Transforms.removeNodes(editor, {
-          at: p
-        });
+    if (isSelectionAtBlockStart(editor)) {
+      const path = selection.anchor.path;
+      const beforePath = [path[0] - 1];
+      const beforeBlock = Editor.node(editor, beforePath);
+      if (beforeBlock && beforeBlock[0].type === IMAGE_BLOCK) {
+        focusEditor(editor, [...beforePath, 1]);
         return;
       }
-      focusEditor(editor, Path.next(path));
+    }
+    const imageBlock = getSelectedNodeEntryByType(editor, IMAGE_BLOCK);
+    if (imageBlock) {
+      const path = selection.anchor.path;
+      const deletePath = [path[0]];
+      Transforms.removeNodes(editor, {
+        at: deletePath
+      });
+      const beforeEntry = Editor.node(editor, Path.previous(deletePath));
+      const selectPath = getLastChildPath(beforeEntry);
+      const endOfFirstNode = Editor.end(editor, selectPath);
+      const range = {
+        anchor: endOfFirstNode,
+        focus: endOfFirstNode
+      };
+      focusEditor(editor, range);
+      return;
     }
     deleteBackward(unit);
   };

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

@@ -201,7 +201,8 @@ const Image = _ref => {
   }, attributes, {
     style: _objectSpread({}, style),
     onMouseOver: e => selectImageWhenSelectPartial(e, editor, element, isSelected),
-    contentEditable: "true"
+    contentEditable: "true",
+    suppressContentEditableWarning: true
   }), /*#__PURE__*/React.createElement("img", {
     ref: imageRef,
     src: imagePlaceholder,
@@ -214,10 +215,10 @@ const Image = _ref => {
   }, attributes, {
     style: _objectSpread({}, style),
     onMouseOver: e => selectImageWhenSelectPartial(e, editor, element, isSelected),
-    contentEditable: "true"
+    contentEditable: "true",
+    suppressContentEditableWarning: true
   }), /*#__PURE__*/React.createElement("span", {
-    className: "sdoc-image-inner",
-    contentEditable: "false"
+    className: "sdoc-image-inner"
   }, /*#__PURE__*/React.createElement("span", {
     className: "sdoc-image-content"
   }, /*#__PURE__*/React.createElement("span", {
@@ -238,8 +239,7 @@ const Image = _ref => {
     ref: resizerRef,
     onMouseDown: onResizeStart
   }), isResizing && /*#__PURE__*/React.createElement("span", {
-    className: "image-size",
-    contentEditable: false
+    className: "image-size"
   }, /*#__PURE__*/React.createElement("span", null, t('Width'), ':', parseInt(movingWidth || ((_imageRef$current = imageRef.current) === null || _imageRef$current === void 0 ? void 0 : _imageRef$current.clientWidth))), /*#__PURE__*/React.createElement("span", null, "\xA0\xA0"), /*#__PURE__*/React.createElement("span", null, t('Height'), ':', imageRef.current.clientHeight))), nodeEntry[0].type === IMAGE_BLOCK && show_caption && /*#__PURE__*/React.createElement("input", {
     id: "sdoc-image-caption-input",
     ref: imageCaptionInputRef,

package/dist/basic-sdk/extension/plugins/seatable-tables/helpers.js

@@ -18,6 +18,8 @@ export const isInsertSeaTableTableDisabled = (editor, readonly) => {
         type = getNodeType(parentNode);
       }
       if (type.startsWith('header')) return true;
+      if (type === ELEMENT_TYPE.TITLE) return true;
+      if (type === ELEMENT_TYPE.SUBTITLE) return true;
       if (type === ELEMENT_TYPE.CODE_BLOCK) return true;
       if (type === ELEMENT_TYPE.ORDERED_LIST) return true;
       if (type === ELEMENT_TYPE.UNORDERED_LIST) return true;

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

@@ -25,6 +25,8 @@ export const isTableMenuDisabled = (editor, readonly) => {
         type = getNodeType(parentNode);
       }
       if (type.startsWith('header')) return true;
+      if (type === ELEMENT_TYPE.TITLE) return true;
+      if (type === ELEMENT_TYPE.SUBTITLE) return true;
       if (type === ELEMENT_TYPE.CODE_BLOCK) return true;
       if (type === ELEMENT_TYPE.ORDERED_LIST) return true;
       if (type === ELEMENT_TYPE.UNORDERED_LIST) return true;
@@ -575,8 +577,10 @@ export const removeTableElement = (editor, type) => {
         return;
       }
       for (let i = minRowIndex; i <= maxRowIndex; i++) {
-        Transforms.removeNodes(editor, {
-          at: [...tablePath, minRowIndex]
+        queueMicrotask(() => {
+          Transforms.removeNodes(editor, {
+            at: [...tablePath, minRowIndex]
+          });
         });
       }
       const focusPath = [...tablePath, minRowIndex === 0 ? 0 : minRowIndex - 1, cellIndex];
@@ -1770,9 +1774,27 @@ export const isHideDragHandlerLine = (editor, displayType, table, cellPath, isDr
   if (displayType === DRAG_HANDLER_COLUMN && cellIndex > 0) {
     const prevCell = table.children[rowIndex].children[cellIndex - 1];
     preCellDom = ReactEditor.toDOMNode(editor, prevCell);
+
+    // Check if there are merged cells in the columns before and after the drag line
+    const beforeLineColumnHasCombined = table.children.find(item => {
+      const cell = item.children[cellIndex - 1];
+      return cell.children.length > 1;
+    });
+    const afterLineColumnHasCombined = table.children.find(item => {
+      const cell = item.children[cellIndex];
+      return (cell === null || cell === void 0 ? void 0 : cell.is_combined) === true;
+    });
+    if (beforeLineColumnHasCombined && afterLineColumnHasCombined) return true;
   } else if (displayType === DRAG_HANDLER_ROW && rowIndex > 0) {
     const prevCell = table.children[rowIndex - 1].children[cellIndex];
     preCellDom = ReactEditor.toDOMNode(editor, prevCell);
+
+    // Check whether there are merged cells in the rows before and after the drag line
+    const beforeLineRow = table.children[rowIndex - 1];
+    const afterLineRow = table.children[rowIndex];
+    const beforeLineRowHasCombined = beforeLineRow.children.find(item => item.children.length > 1);
+    const afterLineRowHasCombined = afterLineRow.children.find(item => (item === null || item === void 0 ? void 0 : item.is_combined) === true);
+    if (beforeLineRowHasCombined && afterLineRowHasCombined) return true;
   }
 
   // Check is above cell selected

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

@@ -46,7 +46,7 @@ class TableContextMenu extends React.Component {
       } = this.props;
       insertTableElement(editor, type, position, count);
     });
-    _defineProperty(this, "removeTableElement", type => {
+    _defineProperty(this, "removeTableElements", type => {
       const {
         editor
       } = this.props;
@@ -54,7 +54,7 @@ class TableContextMenu extends React.Component {
     });
     _defineProperty(this, "renderRemoveBtn", (type, title) => {
       return /*#__PURE__*/React.createElement("button", {
-        onMouseDown: this.removeTableElement.bind(this, type),
+        onMouseDown: this.removeTableElements.bind(this, type),
         className: "dropdown-item"
       }, this.props.t(title));
     });

package/dist/pages/sdoc-wiki-editor.js

@@ -6,7 +6,6 @@ import { PAGE_EDIT_AREA_WIDTH, WIKI_EDITOR } from '../basic-sdk/constants';
 import { createWikiEditor } from '../basic-sdk/extension';
 import withNodeId from '../basic-sdk/node-id';
 import { withSocketIO } from '../basic-sdk/socket';
-import { TITLE } from '../basic-sdk/extension/constants';
 import WikiEditor from '../basic-sdk/editor/wiki-editor';
 import '../assets/css/simple-viewer.css';
 const SdocWikiEditor = _ref => {

package/package.json

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