@seafile/seafile-editor 1.0.62 → 1.0.63

package/dist/editors/slate-editor/style.css

@@ -66,6 +66,7 @@
   background-color: #fff;
   border: 1px solid #e5e6e8;
   box-shadow: 0 0 15px rgba(0, 0, 0, 0.06);
+  color: #212529;
 }
 
 .sf-slate-editor-container .sf-slate-editor-content .article div:first-child {

package/dist/editors/slate-viewer/style.css

@@ -52,6 +52,7 @@
   min-height: calc(100% - 15px);
   border: 1px solid #e6e6dd;
   background: #fff;
+  color: #212529;
 }
 
 @media (max-width: 991.98px) {

package/dist/extension/commons/select/menu/style.css

@@ -11,7 +11,7 @@
   box-shadow: 0 4px 10px #eee;
   border-radius: 4px;
   background: #fff;
-  color: #333;
+  color: #212529;
   z-index: 1080;
 }
 

package/dist/extension/core/queries/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeAcrossBlocks = exports.isLastNode = exports.isLastChild = exports.isFirstNode = exports.isFirstChild = exports.isEndPoint = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEditorString = exports.getDeepInlineChildren = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
+exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeAcrossBlocks = exports.isLastNode = exports.isLastChild = exports.isFirstNode = exports.isFirstChild = exports.isEndPoint = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getSelectedNodeEntryByTypes = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEditorString = exports.getDeepInlineChildren = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
 var _slate = require("slate");
 var _slateReact = require("slate-react");
 var _utils = require("../utils");
@@ -101,6 +101,15 @@ const getSelectedNodeEntryByType = (editor, type) => {
   return nodeEntry ? nodeEntry : null;
 };
 exports.getSelectedNodeEntryByType = getSelectedNodeEntryByType;
+const getSelectedNodeEntryByTypes = (editor, types) => {
+  const match = n => types.includes(getNodeType(n));
+  const [nodeEntry] = _slate.Editor.nodes(editor, {
+    match,
+    universal: false
+  });
+  return nodeEntry ? nodeEntry : null;
+};
+exports.getSelectedNodeEntryByTypes = getSelectedNodeEntryByTypes;
 const getNodeEntries = (editor, options) => {
   return _slate.Editor.nodes(editor, getQueryOptions(editor, options));
 };

package/dist/extension/plugins/blockquote/plugin.js

@@ -119,17 +119,34 @@ const withBlockquote = editor => {
     }
     deleteBackward(unit);
   };
-  newEditor.insertFragment = data => {
+  newEditor.insertFragment = fragment => {
     const {
       selection
     } = editor;
-    if (selection == null) return insertFragment(data);
+    if (selection == null) return insertFragment(fragment);
     const [blockquoteEntry] = _slate.Editor.nodes(editor, {
       match: n => _slate.Element.isElement(n) && n.type === _elementTypes.BLOCKQUOTE,
       universal: true
     });
-    if (!blockquoteEntry) return insertFragment(data);
-    const insertData = data.filter(node => node.type !== _elementTypes.TABLE);
+    if (!blockquoteEntry) return insertFragment(fragment);
+    const firstChild = fragment[0];
+    if (fragment.length === 1 && firstChild.type === _elementTypes.TABLE) {
+      // const nodeEntry = Editor.nodes(newEditor, { mode: 'highest' });
+      const nextPath = _slate.Path.next(blockquoteEntry[1]);
+      _slate.Transforms.insertNodes(newEditor, fragment, {
+        at: nextPath
+      });
+      return;
+    }
+    const insertData = fragment.map(node => {
+      if (node.type === _elementTypes.TABLE) {
+        const text = _slate.Node.string(node);
+        return (0, _core.generateElement)(_elementTypes.PARAGRAPH, {
+          childrenOrText: text
+        });
+      }
+      return node;
+    });
     return insertFragment(insertData);
   };
   return newEditor;

package/dist/extension/plugins/check-list/plugin.js

@@ -11,7 +11,8 @@ var _helper = require("../paragraph/helper");
 const withCheckList = editor => {
   const {
     insertBreak,
-    deleteBackward
+    deleteBackward,
+    insertFragment
   } = editor;
   const newEditor = editor;
   newEditor.insertBreak = () => {
@@ -49,6 +50,24 @@ const withCheckList = editor => {
     }
     deleteBackward(unit);
   };
+  newEditor.insertFragment = fragment => {
+    const match = {
+      type: [_elementTypes.CHECK_LIST_ITEM]
+    };
+    const [checkListEntry] = (0, _core.getNodeEntries)(newEditor, {
+      match
+    });
+    if (!checkListEntry) return insertFragment(fragment);
+    const firstChild = fragment[0];
+    if (fragment.length === 1 && firstChild.type === _elementTypes.TABLE) {
+      const nextPath = _slate.Path.next(checkListEntry[1]);
+      _slate.Transforms.insertNodes(newEditor, fragment, {
+        at: nextPath
+      });
+      return;
+    }
+    return insertFragment(fragment);
+  };
   return newEditor;
 };
 var _default = exports.default = withCheckList;

package/dist/extension/plugins/header/menu/style.css

@@ -5,6 +5,7 @@
   padding: 6px 8px;
   position: relative;
   align-items: center;
+  color: #212529;
 }
 
 .sf-header-menu.header-toggle-disabled::after {

package/dist/extension/plugins/header/plugin.js

@@ -12,6 +12,7 @@ var _helper = require("./helper");
 var _keyboard = require("../../constants/keyboard");
 var _common = require("../../../utils/common");
 var _constants = require("../../constants");
+var _elementTypes = require("../../constants/element-types");
 const isSelectionAtLineEnd = (editor, path) => {
   const {
     selection
@@ -89,20 +90,33 @@ const withHeader = editor => {
     }
     return deleteBackward(unit);
   };
-  newEditor.insertFragment = data => {
-    var _data$, _data$$children;
-    const headerNode = (0, _core.getSelectedNodeByTypes)(editor, _constants.HEADERS);
-    const headerText = _slate.Node.string(headerNode || {
-      children: []
-    });
-    const isSingleListItem = data.length === 1 && ((_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$children = _data$.children) === null || _data$$children === void 0 ? void 0 : _data$$children.length) === 1 && _constants.LIST_TYPE_ARRAY.includes(data[0].type);
-    // Insert a list item when the header is empty, insert only the text
-    if (headerNode && headerText.length === 0 && isSingleListItem) {
-      const text = _slate.Node.string(data[0]);
-      insertText(text);
-      return;
+  newEditor.insertFragment = fragment => {
+    const headerEntry = (0, _core.getSelectedNodeEntryByTypes)(editor, _constants.HEADERS);
+    if (!headerEntry) return insertFragment(fragment);
+    const firstChild = fragment[0];
+    if (fragment.length === 1) {
+      // is single list item
+      if (_constants.LIST_TYPE_ARRAY.includes(firstChild.type)) {
+        if (firstChild.children.length === 1) {
+          const text = _slate.Node.string(fragment[0]);
+          insertText(text);
+          return;
+        }
+        const nextPath = _slate.Path.next(headerEntry[1]);
+        _slate.Transforms.insertNodes(newEditor, fragment, {
+          at: nextPath
+        });
+        return;
+      }
+      if (firstChild.type === _elementTypes.TABLE) {
+        const nextPath = _slate.Path.next(headerEntry[1]);
+        _slate.Transforms.insertNodes(newEditor, fragment, {
+          at: nextPath
+        });
+        return;
+      }
     }
-    return insertFragment(data);
+    return insertFragment(fragment);
   };
   newEditor.onHotKeyDown = event => {
     const HOT_KEYS = (0, _common.isMac)() ? _keyboard.MAC_HOTKEYS_EVENT_HEADER : _keyboard.WIN_HOTKEYS_EVENT_HEADER;

package/dist/extension/plugins/list/plugin/insert-fragment-list.js

@@ -50,10 +50,18 @@ const trimList = listRoot => {
   return [...findListItemsWithContent(first), ...rest];
 };
 const wrapNodeIntoListItem = node => {
-  return node.type === _elementTypes.LIST_ITEM ? node : {
+  if (node.type === _elementTypes.LIST_ITEM) return node;
+  return {
     id: _slugid.default.nice(),
     type: _elementTypes.LIST_ITEM,
-    children: [node]
+    children: [{
+      id: _slugid.default.nice(),
+      type: _elementTypes.PARAGRAPH,
+      children: [{
+        id: _slugid.default.nice(),
+        text: _slate.Node.string(node)
+      }]
+    }]
   };
 };
 const isSingleLic = fragment => {

package/dist/extension/plugins/paragraph/plugin.js

@@ -26,7 +26,8 @@ const isSelectionAtLineStart = (editor, path) => {
 const withParagraph = editor => {
   const {
     deleteBackward,
-    insertBreak
+    insertBreak,
+    insertFragment
   } = editor;
   const newEditor = editor;
   newEditor.insertBreak = () => {
@@ -88,6 +89,30 @@ const withParagraph = editor => {
     }
     return deleteBackward(unit);
   };
+  newEditor.insertFragment = fragment => {
+    const match = {
+      type: [_elementTypes.PARAGRAPH]
+    };
+    const [paragraphEntry] = (0, _core.getNodeEntries)(newEditor, {
+      match
+    });
+    if (!paragraphEntry) return insertFragment(fragment);
+    const firstChild = fragment[0];
+    if (fragment.length === 1 && firstChild.type === _elementTypes.TABLE) {
+      const hasVoidNode = paragraphEntry[0].children.some(item => _slate.Editor.isVoid(newEditor, item));
+      if (_slate.Node.string(paragraphEntry[0]).length === 0 && !hasVoidNode) {
+        _slate.Transforms.removeNodes(newEditor);
+        _slate.Transforms.insertNodes(newEditor, fragment);
+        return;
+      }
+      const nextPath = _slate.Path.next(paragraphEntry[1]);
+      _slate.Transforms.insertNodes(newEditor, fragment, {
+        at: nextPath
+      });
+      return;
+    }
+    return insertFragment(fragment);
+  };
   return newEditor;
 };
 var _default = exports.default = withParagraph;

package/dist/extension/plugins/table/helper.js

@@ -103,10 +103,11 @@ const selectCellByGrid = (editor, rowIndex, colIndex) => {
 exports.selectCellByGrid = selectCellByGrid;
 const getSelectedTableCells = editor => {
   const [tableEntry] = getTableEntry(editor);
-  if (!tableEntry) return [];
+  if (!tableEntry) return null;
   const [tableNode] = tableEntry;
   const tableRows = tableNode.children;
   const selectGrid = getSelectGrid(editor);
+  if (!selectGrid) return null;
   const {
     startRowIndex,
     endRowIndex,

package/dist/extension/plugins/table/model.js

@@ -72,8 +72,9 @@ const generateTable = options => {
     childrenOrText = ''
   } = options;
   let rows = [];
-  const align = new Array(columnNum).fill(null);
+  let align = [];
   if (rowNum) {
+    align = new Array(columnNum).fill(null);
     rows = Array.from({
       length: rowNum
     }, () => generateTableRow({
@@ -89,6 +90,8 @@ const generateTable = options => {
     if (!Array.isArray(childrenOrText)) {
       throw Error('childrenOrText must be a string or a Node array!');
     }
+    const columns = childrenOrText[0].children.length;
+    align = new Array(columns).fill(null);
   }
   return (0, _core.generateElement)(_elementTypes.TABLE, {
     childrenOrText: rowNum ? rows : childrenOrText,

package/dist/extension/plugins/table/plugin.js

@@ -66,21 +66,77 @@ const withTable = editor => {
     }
     return (0, _helper.pasteContentIntoTable)(newEditor, data);
   };
-  newEditor.insertFragment = data => {
+  newEditor.insertFragment = fragment => {
     const isTableActive = (0, _helper.isInTable)(newEditor);
-    if (!isTableActive) return insertFragment && insertFragment(data);
-    if (!Array.isArray(data)) return;
+    if (!isTableActive) return insertFragment && insertFragment(fragment);
+    if (!Array.isArray(fragment)) return;
+    const firstChild = fragment[0];
+    if (fragment.length === 1 && firstChild.type === _elementTypes.TABLE) {
+      const {
+        tableEntry,
+        rowEntry
+      } = (0, _helper.getTableFocusingInfos)(editor);
+      let selectedInfo = (0, _helper.getSelectGrid)(editor);
+      if (!selectedInfo) {
+        const tableCellEntry = (0, _core.getSelectedNodeEntryByType)(editor, _elementTypes.TABLE_CELL);
+        if (!tableCellEntry) return;
+        const [, path] = tableCellEntry;
+        const startColIndex = path.pop();
+        const startRowIndex = path.pop();
+        selectedInfo = {
+          startRowIndex,
+          startColIndex
+        };
+      }
+      const {
+        startRowIndex,
+        startColIndex
+      } = selectedInfo;
+      const [tableNode, tablePath] = tableEntry;
+      const [rowNode] = rowEntry;
+      const tableWidth = rowNode.children.length;
+      const tableHeight = tableNode.children.length;
+      firstChild.children.forEach((clipRow, clipRowIndex) => {
+        // Out of table
+        if (startRowIndex + clipRowIndex >= tableHeight) return true;
+
+        // rowPath = [...tablePath, rowIndex + clipRowIndex];
+        const currentRowPath = [...tablePath, startRowIndex + clipRowIndex];
+        clipRow.children.forEach((clipCol, clipColIndex) => {
+          // Out of table
+          if (startColIndex + clipColIndex >= tableWidth) return true;
+
+          // cellPath = [...rowPath, columnIndex + clipColIndex];
+          const currentCellPath = [...currentRowPath, startColIndex + clipColIndex];
+          const currentCellChildPath = currentCellPath.concat(0);
+          _slate.Transforms.removeNodes(editor, {
+            at: currentCellChildPath
+          });
+          const otherBlockTypes = [..._constants.HEADERS, _elementTypes.CHECK_LIST_ITEM, _elementTypes.PARAGRAPH];
+          const newChildren = clipCol.children.map(item => {
+            if (otherBlockTypes.includes(item.type)) return item.children;
+            return item;
+          }).flat();
+          _slate.Transforms.insertNodes(editor, newChildren, {
+            at: currentCellChildPath
+          });
+          return false;
+        });
+        return false;
+      });
+      return;
+    }
     const notSupportTypes = [_elementTypes.TABLE, _elementTypes.BLOCKQUOTE, _elementTypes.UNORDERED_LIST, _elementTypes.ORDERED_LIST, _elementTypes.CODE_BLOCK];
-    const isDataValid = data.some(item => notSupportTypes.includes(item.type));
+    const isDataValid = fragment.some(item => notSupportTypes.includes(item.type));
     if (isDataValid) {
-      const strContent = data.reduce((ret, item) => {
+      const strContent = fragment.reduce((ret, item) => {
         return ret + _slate.Node.string(item);
       }, '');
       _slate.Editor.insertText(newEditor, strContent);
       return;
     }
     const otherBlockTypes = [..._constants.HEADERS, _elementTypes.CHECK_LIST_ITEM, _elementTypes.PARAGRAPH];
-    const newChildren = data.map(item => {
+    const newChildren = fragment.map(item => {
       if (otherBlockTypes.includes(item.type)) return item.children;
       return item;
     }).flat();
@@ -219,11 +275,19 @@ const withTable = editor => {
     }
     event.preventDefault();
     event.stopPropagation();
+    // selected multiple cells
     const tableNode = (0, _helper.getSelectedTableCells)(newEditor);
     if (tableNode) {
       (0, _setEventTransfer.default)(event, 'fragment', tableNode);
       return true;
     }
+    // selected only one cell
+    const tableCell = (0, _core.getSelectedNodeByType)(newEditor, _elementTypes.TABLE_CELL);
+    if (tableCell) {
+      (0, _setEventTransfer.default)(event, 'fragment', tableCell.children);
+      return true;
+    }
+    return false;
   };
   newEditor.normalizeNode = _ref => {
     let [node, path] = _ref;

package/dist/extension/toolbar/user-help/style.css

@@ -43,7 +43,7 @@
   text-transform: uppercase;
   text-align: center;
   border-radius: 3px;
-  color: #333333;
+  color: #212529;
   box-sizing: border-box;
   border-style: solid;
   border-width: 1px;

package/dist/pages/longtext-editor-dialog/style.css

@@ -155,6 +155,7 @@
   height: auto;
   min-height: 100% !important;
   margin: 0 !important;
+  color: #212529;
 }
 
 .longtext-content-container .sf-simple-slate-editor-container .article > div[role="textbox"] > :first-child {

package/dist/pages/markdown-preview/style.css

@@ -23,6 +23,7 @@
   height: auto;
   min-height: 100% !important;
   border: 0;
+  color: #212529;
 }
 
 .longtext-preview-container .article :first-child {

package/dist/slate-convert/html-to-slate/rules/code-block.js

@@ -73,7 +73,7 @@ const codeBlockRule = (element, parseChild) => {
         }]
       };
     }
-    const codes = content.slugid('\n').filter(Boolean);
+    const codes = content.split('\n').filter(Boolean);
     return codes.map(item => {
       return {
         id: _slugid.default.nice(),

package/dist/utils/event-handler.js

@@ -34,8 +34,9 @@ class EventProxy {
       const editor = this.editor;
       if (editor.onCopy) {
         const isHandled = editor.onCopy(event);
-        if (isHandled) return;
+        if (isHandled) return true;
       }
+      return false;
     });
     this.editor = _editor;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "1.0.62",
+  "version": "1.0.63",
   "description": "",
   "main": "dist/index.js",
   "scripts": {