@seafile/sdoc-editor 1.0.221 → 1.0.223

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

@@ -138,6 +138,12 @@ const QuickInsertBlockMenu = _ref => {
     });
     return !!callout;
   }, [editor]);
+  const isDisableTable = (0, _react.useMemo)(() => {
+    const callout = (0, _core.getAboveBlockNode)(editor, {
+      match: n => [_constants.ELEMENT_TYPE.ORDERED_LIST, _constants.ELEMENT_TYPE.UNORDERED_LIST, _constants.ELEMENT_TYPE.CHECK_LIST_ITEM, _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;
@@ -168,6 +174,7 @@ const QuickInsertBlockMenu = _ref => {
       // eslint-disable-next-line react/jsx-indent
       _react.default.createElement(_dropdownMenuItem.default, {
         isHidden: !quickInsertMenuSearchMap[_constants.TABLE],
+        disabled: isDisableTable,
         key: "sdoc-insert-menu-table",
         menuConfig: {
           ..._constants.SIDE_INSERT_MENUS_CONFIG[_constants.ELEMENT_TYPE.TABLE]

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setSelection = exports.onWrapMultiListItemToNonListTypeTarget = exports.onWrapMultiListItem = exports.onWrapListItem = exports.onSetNodeType = exports.onDeleteNode = exports.onCopyNode = exports.normalizeCopyData = exports.isVoidNode = exports.isNotSupportTransform = exports.isMultiColumn = exports.isListItem = exports.isList = exports.isInMultiColumnNode = exports.isBlockquote = exports.insertEmptyListNodeAtTarget = exports.insertElement = exports.getTransformMenusConfig = exports.getTopValue = exports.getSearchedOperations = exports.getNodeEntry = exports.getListNode = exports.deleteNodesFromBack = exports.createDragPreviewContainer = void 0;
+exports.setSelection = exports.onWrapMultiListItemToNonListTypeTarget = exports.onWrapMultiListItem = exports.onWrapListItemFromMultiColumn = exports.onWrapListItem = exports.onSetNodeType = exports.onDeleteNode = exports.onCopyNode = exports.normalizeCopyData = exports.isVoidNode = exports.isNotSupportTransform = exports.isMultiColumn = exports.isListItem = exports.isList = exports.isInMultiColumnNode = exports.isBlockquote = exports.insertEmptyListNodeAtTarget = exports.insertElement = exports.getTransformMenusConfig = exports.getTopValue = exports.getSearchedOperations = exports.getNodeEntry = exports.getListNodeFromMultiColumn = exports.getListNode = exports.deleteNodesFromBack = exports.createDragPreviewContainer = void 0;
 var _slate = require("@seafile/slate");
 var _slugid = _interopRequireDefault(require("slugid"));
 var _slateReact = require("@seafile/slate-react");
@@ -20,6 +20,7 @@ var _helpers2 = require("../../plugins/check-list/helpers");
 var _constants3 = require("../../../constants");
 var _helpers3 = require("../../../node-id/helpers");
 var _documentUtils = require("../../../utils/document-utils");
+var _helper2 = require("../../plugins/multi-column/helper");
 const onSetNodeType = (editor, element, type) => {
   if (!type) return;
   if (type === _constants.CALL_OUT) {
@@ -53,6 +54,32 @@ const onSetNodeType = (editor, element, type) => {
     });
     return;
   }
+
+  // Transform to multi_column and put content into first column
+  if (_constants.MULTI_COLUMN_TYPE.includes(type)) {
+    const path = (0, _core.findPath)(editor, element);
+    const multiColumnNode = (0, _helper2.generateEmptyMultiColumn)(editor, type);
+    _slate.Transforms.insertNodes(editor, multiColumnNode, {
+      at: [path[0] + 1]
+    });
+    const nodeIndex = path[0];
+    const highestNode = editor.children[nodeIndex];
+    if (path.length > 1 && [_constants.BLOCKQUOTE, _constants.ORDERED_LIST, _constants.UNORDERED_LIST, _constants.CODE_BLOCK].includes(highestNode.type)) {
+      _slate.Transforms.moveNodes(editor, {
+        at: [path[0]],
+        to: [path[0] + 1, 0, 0]
+      });
+    } else {
+      _slate.Transforms.moveNodes(editor, {
+        at: path,
+        to: [path[0] + 1, 0, 0]
+      });
+    }
+    _slate.Transforms.removeNodes(editor, {
+      at: [path[0], 0, 1]
+    });
+    return;
+  }
   _slate.Transforms.setNodes(editor, {
     type: type
   });
@@ -220,6 +247,25 @@ const getListNode = (editor, path) => {
   return listNode;
 };
 exports.getListNode = getListNode;
+const getListNodeFromMultiColumn = (editor, path) => {
+  let listType = _slate.Editor.node(editor, path.slice(0, 3))[0].type;
+  const listItem = _slate.Editor.node(editor, path)[0];
+  const listNode = (0, _model.generateEmptyList)(listType);
+  listNode.children[0] = listItem;
+  return listNode;
+};
+exports.getListNodeFromMultiColumn = getListNodeFromMultiColumn;
+const onWrapListItemFromMultiColumn = (editor, targetPath, sourcePath) => {
+  const nextPath = _slate.Path.next(targetPath);
+  const listNode = getListNodeFromMultiColumn(editor, sourcePath.slice(0, 4));
+  _slate.Transforms.removeNodes(editor, {
+    at: sourcePath.slice(0, 4)
+  });
+  _slate.Transforms.insertNodes(editor, listNode, {
+    at: nextPath
+  });
+};
+exports.onWrapListItemFromMultiColumn = onWrapListItemFromMultiColumn;
 const onWrapListItem = (editor, targetPath, sourcePath) => {
   const nextPath = _slate.Path.next(targetPath);
   const listNode = getListNode(editor, sourcePath);
@@ -274,6 +320,10 @@ const getTransformMenusConfig = (editor, slateNode) => {
       if (highestNode.type === _constants.BLOCKQUOTE) {
         newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG.filter(item => item.type !== _constants.CALL_OUT);
       }
+      // Element in Multi_column can not be converted to multi_column type
+      if (highestNode.type === _constants.MULTI_COLUMN) {
+        newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG.filter(item => !_constants.MULTI_COLUMN_TYPE.includes(item.type));
+      }
     }
 
     // headers can't be nested by quote block

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

@@ -20,6 +20,7 @@ var _constants = require("../../../constants");
 var _constants2 = require("../../constants");
 var _helper = require("../../plugins/callout/helper");
 var _event = require("./event");
+var _helper2 = require("../../plugins/multi-column/helper");
 require("./index.css");
 let sourceElement = null;
 let targetElement = null;
@@ -88,6 +89,9 @@ const SideToolbar = () => {
       let dom = e.target;
       while (((_dom = dom) === null || _dom === void 0 ? void 0 : (_dom$dataset = _dom.dataset) === null || _dom$dataset === void 0 ? void 0 : _dom$dataset.root) !== 'true') {
         var _dom, _dom$dataset;
+        if (dom.className === 'column') {
+          return;
+        }
         if (!dom.parentNode) return;
         dom = dom.parentNode;
       }
@@ -106,6 +110,20 @@ const SideToolbar = () => {
         } = document.querySelector('.sdoc-editor-container').getBoundingClientRect();
         left = editorLeft - containerLeft - 40;
       }
+      const path = (0, _core.findPath)(editor, node);
+      // Add side-tool-bar for paragraphs in multi_column
+      if (path.length > 2 && (0, _helpers.isInMultiColumnNode)(editor, node)) {
+        let domLeft;
+        domLeft = document.querySelector(`[data-id="${dom.dataset.id}"]`) && document.querySelector(`[data-id="${dom.dataset.id}"]`).getBoundingClientRect().left;
+        const parentNode = _slate.Editor.node(editor, path.slice(0, 3))[0];
+        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;
+        }
+        const {
+          left: containerLeft
+        } = document.querySelector('.sdoc-editor__article').getBoundingClientRect();
+        left = domLeft - containerLeft - 41;
+      }
       setTimeout(() => {
         // wait animation
         setSidePosition({
@@ -247,6 +265,7 @@ const SideToolbar = () => {
     leaveElement.classList.remove('sdoc-draging');
   }, []);
   const drop = (0, _react.useCallback)(event => {
+    var _parentNode$children$;
     targetElement = event.currentTarget;
     targetElement.classList.remove('sdoc-draging');
     const dragTypes = event.dataTransfer.types;
@@ -326,11 +345,17 @@ const SideToolbar = () => {
       return;
     }
 
-    // Drag into callout is not supported
+    // Dragging into callout is not supported
     if ([_constants2.CALL_OUT, _constants2.CODE_BLOCK, _constants2.TABLE].includes(sourceNode.type) && (0, _helper.getCalloutEntry)(editor, targetPath)) {
       return;
     }
 
+    // Dragging multi_column's child into multi_column is not supported
+    const isInMultiColumn = (0, _helpers.isInMultiColumnNode)(editor, sourceNode);
+    if (isInMultiColumn && (0, _helpers.isMultiColumn)(editor, [targetPath[0]])) {
+      return;
+    }
+
     // Drag list
     if ((0, _helpers.isList)(editor, sourcePath)) {
       // ordinary list items
@@ -380,32 +405,103 @@ const SideToolbar = () => {
       }
     }
 
-    // Drag backward
-    if (_slate.Path.isAfter(targetPath, sourcePath)) {
-      let toPath = targetPath.slice(0);
+    // Dragging element from multi_column to other nodes
+    const currentSourceNode = _slate.Editor.node(editor, sourcePath.slice(0, 3))[0];
+    if (isInMultiColumn && sourceNode.type === _constants2.PARAGRAPH) {
+      // Dragging list
+      if ([_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(currentSourceNode.type)) {
+        // Drag ordinary list items to places other than list and quoteBlock
+        if (!(0, _helpers.isList)(editor, targetPath) && !(0, _helpers.isBlockquote)(editor, [targetPath[0]])) {
+          (0, _helpers.onWrapListItemFromMultiColumn)(editor, targetPath, sourcePath);
+        }
+
+        // Drag ordinary list items to list
+        if ((0, _helpers.isList)(editor, targetPath)) {
+          _slate.Transforms.moveNodes(editor, {
+            at: sourcePath.slice(0, 4),
+            to: _slate.Path.next(targetPath)
+          });
+        }
 
-      // Drag elements outside the quoteBlock into the quoteBlock
-      if (!(0, _helpers.isBlockquote)(editor, [sourcePath[0]]) && (0, _helpers.isBlockquote)(editor, [targetPath[0]]) && targetPath.length > 1) {
-        toPath = _slate.Path.next(targetPath);
+        // Drag ordinary list items into the quoteBlock
+        if ((0, _helpers.isBlockquote)(editor, [targetPath[0]])) {
+          // Drag and drop ordinary list items onto the list within the quoteBlock
+          if ((0, _helpers.isList)(editor, targetPath)) {
+            _slate.Transforms.moveNodes(editor, {
+              at: sourcePath.slice(0, 4),
+              to: _slate.Path.next(targetPath)
+            });
+          } else {
+            (0, _helpers.onWrapListItemFromMultiColumn)(editor, targetPath, sourcePath);
+          }
+        }
       }
 
-      // Drag into list
-      if ((0, _helpers.isList)(editor, targetPath)) {
-        toPath = _slate.Path.next(targetPath);
+      // Dragging quoteBlock's children element  from multi_column is not supported
+      if (currentSourceNode.type === _constants2.BLOCKQUOTE) {
+        return;
       }
-      _slate.Transforms.moveNodes(editor, {
-        at: sourcePath,
-        to: toPath
-      });
     }
 
-    // Drag forward
+    // Handling drag situations including non-multi_column or non-list item dragged from multiColumn
+    if (!isInMultiColumn || isInMultiColumn && ![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(currentSourceNode.type)) {
+      // Drag backward
+      if (_slate.Path.isAfter(targetPath, sourcePath)) {
+        let toPath = targetPath.slice(0);
+
+        // Drag elements outside the quoteBlock into the quoteBlock
+        if (!(0, _helpers.isBlockquote)(editor, [sourcePath[0]]) && (0, _helpers.isBlockquote)(editor, [targetPath[0]]) && targetPath.length > 1) {
+          toPath = _slate.Path.next(targetPath);
+        }
+
+        // Drag into list
+        if ((0, _helpers.isList)(editor, targetPath)) {
+          toPath = _slate.Path.next(targetPath);
+        }
+        _slate.Transforms.moveNodes(editor, {
+          at: sourcePath,
+          to: toPath
+        });
+      }
+
+      // Drag forward
+      if (_slate.Path.isBefore(targetPath, sourcePath)) {
+        const toPath = _slate.Path.next(targetPath);
+        _slate.Transforms.moveNodes(editor, {
+          at: sourcePath,
+          to: toPath
+        });
+      }
+    }
+    let selectedSourcePath = sourcePath;
+    // Handling drag forward situation for multi_column update
     if (_slate.Path.isBefore(targetPath, sourcePath)) {
-      const toPath = _slate.Path.next(targetPath);
-      _slate.Transforms.moveNodes(editor, {
-        at: sourcePath,
-        to: toPath
-      });
+      const targetNode = _slate.Editor.node(editor, [targetPath[0]])[0];
+      if (![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(targetNode.type)) {
+        selectedSourcePath[0] += 1;
+      }
+    }
+
+    // Dragging childNodes from multi_column
+    const nodeIndex = selectedSourcePath[0];
+    const highestNode = editor.children[nodeIndex];
+    const [parentNode] = _slate.Editor.parent(editor, selectedSourcePath.slice(0, 3));
+    if (selectedSourcePath.length > 1 && highestNode.type === _constants2.MULTI_COLUMN && !((_parentNode$children$ = parentNode.children[0]) !== null && _parentNode$children$ !== void 0 && _parentNode$children$.type)) {
+      if (highestNode.children.length <= 2) {
+        _slate.Transforms.removeNodes(editor, {
+          at: selectedSourcePath.slice(0, 2)
+        });
+        _slate.Transforms.unwrapNodes(editor, {
+          at: [selectedSourcePath[0]]
+        });
+      } else {
+        const topNodesColumnAttribute = highestNode.column;
+        _slate.Transforms.removeNodes(editor, {
+          at: selectedSourcePath.slice(0, 2)
+        });
+        const isDragged = true;
+        (0, _helper2.updateColumnWidthOnDeletion)(editor, selectedSourcePath, topNodesColumnAttribute, 'deleteBackward', isDragged);
+      }
     }
 
     // reset

package/dist/basic-sdk/utils/full-width-mode.js

@@ -17,7 +17,7 @@ const getStyleByFullWidthMode = (scrollRef, editor) => {
   containerStyle['minWidth'] = _constants.ARTICLE_FULL_MIN_WIDTH;
 
   // Has outline
-  if (isShowOutline && editor.editorType !== _constants.WIKI_EDITOR) {
+  if (isShowOutline && (editor === null || editor === void 0 ? void 0 : editor.editorType) !== _constants.WIKI_EDITOR) {
     containerStyle['marginLeft'] = `${_constants.LEFT_OUTLINE_WIDTH}px`;
     const adjustWidth = ` - ${_constants.LEFT_OUTLINE_WIDTH - 50}px`; // One side is 50
     containerStyle['width'] = containerStyle['width'].slice(0, -1) + adjustWidth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "1.0.221",
+  "version": "1.0.223",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",
@@ -11,7 +11,7 @@
     "@seafile/slate-history": "0.86.2",
     "@seafile/slate-hyperscript": "0.81.7",
     "@seafile/slate-react": "0.92.7",
-    "axios": "^1.7.4",
+    "axios": "^1.8.2",
     "classnames": "2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "1.10.7",

package/public/locales/en/sdoc-editor.json

@@ -613,5 +613,6 @@
   "Support_Youtube_Tencent_Bilibili_and_more": "Support Youtube, Tencent, Bilibili and more",
   "Image_cannot_be_copied_Please_download_the_source_image": "Image cannot be copied. Please download the source image,",
   "And_select_insert_-_image_to_upload": "and select 「insert」 - 「image」 to upload.",
-  "Image_copy_error": "Image copy error"
+  "Image_copy_error": "Image copy error",
+  "Image_is_uploading": "Image is uploading..."
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -613,5 +613,6 @@
   "Support_Youtube_Tencent_Bilibili_and_more": "支持Youtube，腾讯视频，B站及其他平台",
   "Image_cannot_be_copied_Please_download_the_source_image": "此照片不支持复制，请下载原图",
   "And_select_insert_-_image_to_upload": "后点击工具栏「插入」- 「照片」上传",
-  "Image_copy_error": "图片复制错误"
+  "Image_copy_error": "图片复制错误",
+  "Image_is_uploading": "图片正在上传..."
 }