@seafile/sdoc-editor 2.0.21 → 2.0.23

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateImage = exports.selectImageWhenSelectPartial = exports.resetCursor = exports.queryCopyMoveProgressView = exports.isInsertImageMenuDisabled = exports.isImagUrlIsFromCopy = exports.insertImageFiles = exports.insertImage = exports.hasSdocImages = exports.handleBase64Image = exports.getSingleImageFromFragment = exports.getImageURL = exports.getImageData = exports.generateImageNode = void 0;
+exports.updateImage = exports.selectImageWhenSelectPartial = exports.resetCursor = exports.removeImageBlockNode = exports.queryCopyMoveProgressView = exports.isInsertImageMenuDisabled = exports.isImagUrlIsFromCopy = exports.insertImageFiles = exports.insertImage = exports.hasSdocImages = exports.handleBase64Image = exports.getSingleImageFromFragment = exports.getImageURL = exports.getImageData = exports.generateImageNode = void 0;
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
@@ -283,4 +283,15 @@ const isImagUrlIsFromCopy = url => {
   if (url && url.startsWith('attachment')) return true; // from yuque
   return false;
 };
-exports.isImagUrlIsFromCopy = isImagUrlIsFromCopy;
+exports.isImagUrlIsFromCopy = isImagUrlIsFromCopy;
+const removeImageBlockNode = (editor, path) => {
+  _slate.Transforms.removeNodes(editor, {
+    at: path
+  });
+  const p = (0, _core.generateEmptyElement)(_constants2.ELEMENT_TYPE.PARAGRAPH);
+  _slate.Transforms.insertNodes(editor, p, {
+    at: path
+  });
+  (0, _core.focusEditor)(editor, path);
+};
+exports.removeImageBlockNode = removeImageBlockNode;

package/dist/basic-sdk/extension/plugins/image/hover-menu/index.js

@@ -165,7 +165,7 @@ const ImageHoverMenu = _ref => {
     style: menuPosition
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "hover-menu-container"
-  }, ![_constants2.TABLE, _constants2.BLOCKQUOTE, _constants2.CALL_OUT].includes(type) && !readonly && /*#__PURE__*/_react.default.createElement("span", {
+  }, ![_constants2.TABLE, _constants2.BLOCKQUOTE, _constants2.CALL_OUT, _constants2.MULTI_COLUMN].includes(type) && !readonly && /*#__PURE__*/_react.default.createElement("span", {
     className: "op-group-item"
   }, /*#__PURE__*/_react.default.createElement("span", {
     role: "button",

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

@@ -173,6 +173,20 @@ const withImage = editor => {
     if (imageBlock) {
       const path = selection.anchor.path;
       const deletePath = [path[0]];
+
+      // Delete image_block element in multi-column node
+      const currentTopNode = (0, _core.getNode)(editor, deletePath);
+      const currentBlockNode = (0, _core.getNode)(editor, path.slice(0, 3));
+      // Image_block not in callout or blockquote
+      if (currentTopNode.type === _constants.MULTI_COLUMN && ![_constants.CALL_OUT, _constants.BLOCKQUOTE].includes(currentBlockNode.type)) {
+        (0, _helpers.removeImageBlockNode)(editor, path.slice(0, 3));
+        return;
+      }
+      // Image_block in callout or blockquote
+      if (currentTopNode.type === _constants.MULTI_COLUMN && [_constants.CALL_OUT, _constants.BLOCKQUOTE].includes(currentBlockNode.type)) {
+        (0, _helpers.removeImageBlockNode)(editor, path.slice(0, 4));
+        return;
+      }
       _slate.Transforms.removeNodes(editor, {
         at: deletePath
       });

package/dist/basic-sdk/extension/plugins/multi-column/helper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateColumnWidthOnDeletion = exports.updateColumnWidth = exports.insertMultiColumn = exports.handleInsertMultiColumn = exports.getCurrentPageWidth = exports.generateEmptyMultiColumn = void 0;
+exports.updateColumnWidthOnDeletion = exports.updateColumnWidth = exports.insertMultiColumn = exports.hasImageInColumn = exports.handleInsertMultiColumn = exports.getCurrentPageWidth = exports.generateEmptyMultiColumn = void 0;
 var _slugid = _interopRequireDefault(require("slugid"));
 var _slate = require("@seafile/slate");
 var _slateReact = require("@seafile/slate-react");
@@ -178,4 +178,15 @@ const getCurrentPageWidth = editor => {
   }
   return pageWidth;
 };
-exports.getCurrentPageWidth = getCurrentPageWidth;
+exports.getCurrentPageWidth = getCurrentPageWidth;
+const hasImageInColumn = (editor, columnPath) => {
+  for (const [node] of _slate.Editor.nodes(editor, {
+    at: columnPath
+  })) {
+    if ([_constants.IMAGE_BLOCK, _constants.IMAGE].includes(node === null || node === void 0 ? void 0 : node.type)) {
+      return true;
+    }
+  }
+  return false;
+};
+exports.hasImageInColumn = hasImageInColumn;

package/dist/basic-sdk/extension/plugins/multi-column/plugin.js

@@ -8,6 +8,7 @@ var _slate = require("@seafile/slate");
 var _core = require("../../core");
 var _constants = require("../../constants");
 var _helper = require("./helper");
+var _unwrapList = require("../list/transforms/unwrap-list");
 const withMultiColumn = editor => {
   const {
     normalizeNode,
@@ -54,9 +55,41 @@ const withMultiColumn = editor => {
     const currentColumnEntry = (0, _core.getSelectedNodeEntryByType)(editor, _constants.ELEMENT_TYPE.COLUMN);
     const isOnlyOneChild = currentColumnEntry[0].children.length === 1;
     const isAtStart = _slate.Editor.isStart(editor, selection.focus, selection.anchor.path.slice(0, 2));
+    const currentNodeInColumn = currentColumnEntry[0].children[0];
+    const currentNodePathInColumn = (0, _core.findPath)(editor, currentNodeInColumn);
+    // Only one child inline-image in current column
+    // Return if cursor is at the start of only one child image
+    if (isOnlyOneChild && currentNodeInColumn.children.length === 3) {
+      const isImageType = currentNodeInColumn.children[1].type === _constants.IMAGE;
+      if (isImageType && selection.anchor.path[3] === 0 && selection.anchor.offset === 0) {
+        return;
+      }
+    }
 
     // When selection is at start of the only one existed child nodes in current column node, delete column node
     if (isOnlyOneChild && isAtStart) {
+      // Transform non-paragraph elements without callout element to paragraph elements
+      if (currentNodeInColumn.type !== _constants.PARAGRAPH) {
+        var _currentNodeInColumn$;
+        // Unwrap list if list-item exists in the current column node
+        if ([_constants.UNORDERED_LIST, _constants.ORDERED_LIST].includes(currentNodeInColumn.type)) {
+          (0, _unwrapList.unwrapList)(editor);
+          return;
+        }
+        if ([_constants.UNORDERED_LIST, _constants.ORDERED_LIST].includes(currentNodeInColumn === null || currentNodeInColumn === void 0 ? void 0 : (_currentNodeInColumn$ = currentNodeInColumn.children[0]) === null || _currentNodeInColumn$ === void 0 ? void 0 : _currentNodeInColumn$.type)) {
+          _slate.Transforms.unwrapNodes(editor, {
+            at: currentNodePathInColumn
+          });
+        } else {
+          _slate.Transforms.setNodes(editor, {
+            type: _constants.PARAGRAPH
+          }, {
+            at: currentNodePathInColumn
+          });
+        }
+        return;
+      }
+
       // Delete multi_column and column wrap when only one child column node exists
       if (childColumn.length <= 2) {
         deleteBackward();
@@ -89,6 +122,13 @@ const withMultiColumn = editor => {
     } = currentMultiColumnEntry[0];
     const isOnlyOneChild = childColumn[nextColumnIndex].children.length === 1;
     const isAtEnd = _slate.Editor.isEnd(editor, selection.focus, selection.anchor.path.slice(0, 2));
+
+    // When deleteForwarding only one child including image or image-block in next column, return
+    const hasImageInOnlyOneChild = isOnlyOneChild && (0, _helper.hasImageInColumn)(editor, nextNode[1].slice(0, 2));
+    if (isOnlyOneChild && isAtEnd && hasImageInOnlyOneChild) {
+      return;
+    }
+
     // When selection is at end and the only one existed child nodes in next column node, delete column node
     if (isOnlyOneChild && isAtEnd) {
       // Delete multi_column and column wrap when only one child column node exists and selection is on the first column node

package/dist/basic-sdk/extension/toolbar/insert-element-toolbar/index.js

@@ -150,6 +150,12 @@ const QuickInsertBlockMenu = _ref => {
     });
     return !!callout;
   }, [editor]);
+  const isDisableCodeBlock = (0, _react.useMemo)(() => {
+    const callout = (0, _core.getAboveBlockNode)(editor, {
+      match: n => [_constants.ELEMENT_TYPE.MULTI_COLUMN].includes(n.type)
+    });
+    return !!callout;
+  }, [editor]);
   const createMultiColumn = (0, _react.useCallback)(type => {
     callback && callback();
     const newInsertPosition = slateNode.type === _constants.ELEMENT_TYPE.LIST_ITEM ? _constants.INSERT_POSITION.AFTER : insertPosition;
@@ -209,6 +215,7 @@ const QuickInsertBlockMenu = _ref => {
       }),
       [_constants.CODE_BLOCK]: /*#__PURE__*/_react.default.createElement(_dropdownMenuItem.default, {
         isHidden: !quickInsertMenuSearchMap[_constants.CODE_BLOCK],
+        disabled: isDisableCodeBlock,
         key: "sdoc-insert-menu-code-block",
         menuConfig: {
           ..._constants.SIDE_INSERT_MENUS_CONFIG[_constants.ELEMENT_TYPE.CODE_BLOCK]

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

@@ -119,6 +119,11 @@ const SideToolbar = () => {
         if ([_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST, _constants2.BLOCKQUOTE].includes(parentNode.type)) {
           domLeft = document.querySelector(`[data-id="${parentNode.id}"]`) && document.querySelector(`[data-id="${parentNode.id}"]`).getBoundingClientRect().left;
         }
+        if ([_constants2.IMAGE_BLOCK].includes(node.type)) {
+          var _dom$querySelectorAll;
+          const imageWrapperDomId = (_dom$querySelectorAll = dom.querySelectorAll('span')[1]) === null || _dom$querySelectorAll === void 0 ? void 0 : _dom$querySelectorAll.getAttribute('data-id');
+          domLeft = document.querySelector(`[data-id="${imageWrapperDomId}"]`) && document.querySelector(`[data-id="${imageWrapperDomId}"]`).getBoundingClientRect().left;
+        }
         const {
           left: containerLeft
         } = document.querySelector('.sdoc-editor__article').getBoundingClientRect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -16,7 +16,7 @@
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "1.10.7",
     "deep-copy": "1.4.2",
-    "dtable-ui-component": "^6.0.1",
+    "dtable-ui-component": "^6.0.3",
     "is-hotkey": "0.2.0",
     "is-url": "^1.2.4",
     "lodash.isequal": "4.5.0",