@seafile/sdoc-editor 2.0.32 → 2.0.34

package/dist/basic-sdk/extension/plugins/image/image-loader/index.css

@@ -3,12 +3,13 @@
   width: 100%;
   height: 100%;
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
-  top: 0;
+  bottom: 0;
   left: 0;
-  background-color: 'rgba(0, 0, 0, 0.5)'
+  background-color: rgba(0, 0, 0, 0.5);
+  min-height: 28px;
 }
 
 @keyframes spin {
@@ -33,5 +34,7 @@
 }
 
 .sdoc-image-process-container .copyright {
-  margin-top: 4px;
+  margin-left: 15px;
+  display: inline-block;
+  white-space: nowrap;
 }

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

@@ -209,8 +209,8 @@ const Image = _ref => {
     }
   }, [data, editor]);
   const onImageLoaded = (0, _react.useCallback)(() => {
-    if ((0, _helpers.isImagUrlIsFromCopy)(data.src)) {
-      setCopyImageLoading(true);
+    if (!(0, _helpers.isImagUrlIsFromCopy)(data.src)) {
+      setCopyImageLoading(false);
     }
   }, [data.src, setCopyImageLoading]);
   const onImageLoadError = (0, _react.useCallback)(() => {

package/dist/basic-sdk/extension/plugins/image/use-upload-image.js

@@ -35,7 +35,7 @@ const useImageUpload = _ref => {
   const {
     is_copy_error = false
   } = data;
-  const [isLoading, setIsLoading] = (0, _react.useState)(false);
+  const [isLoading, setIsLoading] = (0, _react.useState)(true);
   const [isCopyError, setIsCopyError] = (0, _react.useState)(is_copy_error);
   (0, _react.useEffect)(() => {
     const {

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

@@ -21,16 +21,82 @@ var _constants3 = require("../../../constants");
 var _helpers3 = require("../../../node-id/helpers");
 var _documentUtils = require("../../../utils/document-utils");
 var _helper2 = require("../../plugins/multi-column/helper");
+var _helpers4 = require("../../plugins/blockquote/helpers");
+var _helpers5 = require("../../plugins/header/helpers");
 const onSetNodeType = (editor, element, type) => {
+  const {
+    selection
+  } = editor;
   if (!type) return;
   if (type === _constants.CALL_OUT) {
+    if (_constants.IMAGE_BLOCK === element.type) {
+      _slate.Transforms.setNodes(editor, {
+        type: _constants.PARAGRAPH
+      });
+    }
     (0, _helper.wrapCallout)(editor);
     return;
   }
   if ([_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(type)) {
+    if ([_constants.IMAGE_BLOCK].includes(element.type)) return;
     (0, _transforms.toggleList)(editor, type);
+    const path = (0, _core.findPath)(editor, element);
+    const [targetNode] = _slate.Editor.node(editor, [path[0]]) || [];
+    if ([_constants.MULTI_COLUMN, _constants.BLOCKQUOTE].includes(targetNode.type)) {
+      if (targetNode.type === _constants.BLOCKQUOTE) {
+        (0, _helpers4.setBlockQuoteType)(editor, true);
+      } else {
+        const currentNodeInColumn = (0, _core.getNode)(editor, selection.anchor.path.slice(0, 3));
+        if ([_constants.BLOCKQUOTE].includes(currentNodeInColumn.type)) {
+          (0, _helpers4.setBlockQuoteType)(editor, true);
+        }
+      }
+    }
     return;
   }
+  if ([_constants.PARAGRAPH, ..._constants.HEADERS].includes(type)) {
+    var _getTopLevelBlockNode;
+    // Transform list-item, blockquote, callout to paragraph or header
+    const topNodeType = (_getTopLevelBlockNode = (0, _core.getTopLevelBlockNode)(editor)[0]) === null || _getTopLevelBlockNode === void 0 ? void 0 : _getTopLevelBlockNode.type;
+    if (topNodeType === _constants.MULTI_COLUMN) {
+      const currentNodeInColumn = (0, _core.getNode)(editor, selection.anchor.path.slice(0, 3));
+      // Callout, List-item, Blockquote in multi_column
+      if ([_constants.CALL_OUT].includes(currentNodeInColumn.type)) {
+        (0, _helper.unwrapCallout)(editor);
+      }
+      if ([_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(currentNodeInColumn.type)) {
+        (0, _transforms.toggleList)(editor, currentNodeInColumn.type);
+        if ([..._constants.HEADERS].includes(type)) {
+          (0, _helpers5.setHeaderType)(editor, type);
+        }
+      }
+      if ([_constants.BLOCKQUOTE].includes(currentNodeInColumn.type)) {
+        if ([..._constants.HEADERS].includes(type)) {
+          (0, _helpers5.setHeaderType)(editor, type);
+        }
+        (0, _helpers4.setBlockQuoteType)(editor, true);
+      }
+      return;
+    } else {
+      // List-item, blockquote, callout is top node
+      if ([_constants.ORDERED_LIST, _constants.UNORDERED_LIST].includes(topNodeType)) {
+        (0, _transforms.toggleList)(editor, topNodeType);
+        if ([..._constants.HEADERS].includes(type)) {
+          (0, _helpers5.setHeaderType)(editor, type);
+        }
+      }
+      if ([_constants.BLOCKQUOTE].includes(topNodeType)) {
+        if ([..._constants.HEADERS].includes(type)) {
+          (0, _helpers5.setHeaderType)(editor, type);
+        }
+        (0, _helpers4.setBlockQuoteType)(editor, true);
+      }
+      if ([_constants.CALL_OUT].includes(topNodeType)) {
+        (0, _helper.unwrapCallout)(editor);
+      }
+      return;
+    }
+  }
   if (type === _constants.CHECK_LIST_ITEM) {
     const path = (0, _core.findPath)(editor, element);
     const [targetNode, targetPath] = _slate.Editor.node(editor, [path[0]]) || [];
@@ -42,8 +108,31 @@ const onSetNodeType = (editor, element, type) => {
     _slate.Transforms.setNodes(editor, {
       type: newType
     });
+    if ([_constants.MULTI_COLUMN, _constants.BLOCKQUOTE].includes(targetNode.type)) {
+      if (targetNode.type === _constants.BLOCKQUOTE) {
+        (0, _helpers4.setBlockQuoteType)(editor, true);
+      } else {
+        const currentNodeInColumn = (0, _core.getNode)(editor, selection.anchor.path.slice(0, 3));
+        if ([_constants.BLOCKQUOTE].includes(currentNodeInColumn.type)) {
+          (0, _helpers4.setBlockQuoteType)(editor, true);
+        }
+      }
+    }
     return;
   }
+  if (type === _constants.BLOCKQUOTE && !_constants.LIST_ITEM_CORRELATION_TYPE.includes(element.type)) {
+    if (element.type === _constants.BLOCKQUOTE) return;
+    const isBlockQuoteParent = (0, _core.getAboveNode)(editor, {
+      match: {
+        type: _constants.BLOCKQUOTE
+      }
+    });
+    if (isBlockQuoteParent) return;
+    if (!isBlockQuoteParent && ![_constants.BLOCKQUOTE].includes(element.type)) {
+      (0, _helpers4.setBlockQuoteType)(editor, false);
+      return;
+    }
+  }
   if (type === _constants.BLOCKQUOTE && _constants.LIST_ITEM_CORRELATION_TYPE.includes(element.type)) {
     _slate.Transforms.wrapNodes(editor, {
       id: _slugid.default.nice(),
@@ -167,7 +256,7 @@ const isVoidNode = node => {
 };
 exports.isVoidNode = isVoidNode;
 const isNotSupportTransform = node => {
-  if (node.type && [_constants.CODE_BLOCK, _constants.TABLE, _constants.CALL_OUT, _constants.VIDEO, _constants.SEATABLE_TABLE].includes(node.type)) {
+  if (node.type && [_constants.CODE_BLOCK, _constants.TABLE, _constants.VIDEO, _constants.SEATABLE_TABLE, _constants.SEATABLE_ROW].includes(node.type)) {
     return true;
   }
   return false;
@@ -313,6 +402,9 @@ const onWrapMultiListItemToNonListTypeTarget = (editor, targetPath, sourceNodes,
 exports.onWrapMultiListItemToNonListTypeTarget = onWrapMultiListItemToNonListTypeTarget;
 const getTransformMenusConfig = (editor, slateNode) => {
   let newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG;
+  if ([_constants.CALL_OUT].includes(slateNode.type)) {
+    return newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG.filter(item => [_constants.PARAGRAPH].includes(item.type));
+  }
   if (_constants.LIST_ITEM_CORRELATION_TYPE.includes(slateNode.type)) {
     newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG.filter(item => _constants.LIST_ITEM_SUPPORTED_TRANSFORMATION.includes(item.type));
   }
@@ -330,6 +422,11 @@ const getTransformMenusConfig = (editor, slateNode) => {
       }
     }
 
+    // Image-block can't be nested by ordered-list, ordered-list and check-list
+    if (_constants.IMAGE_BLOCK.includes(highestNode.type)) {
+      newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG.filter(item => ![_constants.ORDERED_LIST, _constants.UNORDERED_LIST, _constants.CHECK_LIST_ITEM].includes(item.type));
+    }
+
     // headers can't be nested by quote block
     if (_constants.HEADERS.includes(highestNode.type)) {
       newSideMenusConfig = _constants.SIDE_TRANSFORM_MENUS_CONFIG.filter(item => item.type !== _constants.BLOCKQUOTE);

package/package.json

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