@seafile/seafile-editor 0.3.83 → 0.3.87

package/dist/css/richeditor/image.css

@@ -124,7 +124,7 @@
   content: "\e755";
 }
 
-.sf-editor-image-previewer .dtable-icon-fork-number {
+.sf-editor-image-previewer button.dtable-icon-fork-number {
   font-family: "iconfont" !important;
   font-size: 16px;
   font-style: normal;

package/dist/editor/controller/block-element-controller.js

@@ -1,7 +1,7 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { Editor } from 'slate';
+import { Editor, Path, Node } from 'slate';
 import ListUtils from '../editor-utils/block-element-utils/list-utils';
 import CodeUtils from '../editor-utils/block-element-utils/code-utils';
 import { isRangeCollapsed } from '../editor-utils/range-utils';
@@ -311,6 +311,35 @@ var withBlock = function withBlock(editor) {
         });
         break;
 
+      case 'modify_sublist_type':
+        var target_list_type = command.target_list_type;
+        var items = listUtils.getCurrentListItem();
+        var firstListItem = items.at(0);
+        var currentListPath = Path.parent(firstListItem[1]);
+        var parentPath = Path.parent(currentListPath);
+        Editor.withoutNormalizing(editor, function () {
+          for (var i = items.length - 1; i >= 0; i--) {
+            var _item = items[i];
+            var _path = _item[1];
+            Editor.liftNodes(editor, {
+              at: _path,
+              split: true
+            });
+            var currentListIndex = currentListPath.at(-1);
+
+            var currentListItemIndex = _path.at(-1);
+
+            Editor.wrapNodes(editor, {
+              type: target_list_type,
+              children: []
+            }, {
+              at: [].concat(_toConsumableArray(parentPath), [currentListItemIndex === 0 ? currentListIndex : currentListIndex + 1]),
+              split: true
+            });
+          }
+        });
+        break;
+
       case 'set_code_block':
         codeUtils.wrapCodeBlock();
         break;

package/dist/editor/controller/shortcut-controller.js

@@ -336,7 +336,7 @@ var withMarkdownShortcut = function withMarkdownShortcut(editor) {
             var listItemPath = _node3[1];
             var listNode = Node.parent(editor, listItemPath); // Unwrap the list item when the selection is at the first list item of the first node of document
 
-            if (anchor.path[0] === 0 && anchor.path[1] === 0) {
+            if (anchor.path[0] === 0 && anchor.path[1] === 0 && anchor.path[listItemPath.length] === 0) {
               listUtils.unwrapList();
               return;
             } // unwrap an empty list

package/dist/editor/editor-plugin.js

@@ -210,43 +210,47 @@ var Plugin = function Plugin(_editor) {
 
       var table = _this.tableUtils.getSelectedTableCells();
 
-      if (!table) {
-        setEventTransfer(event, 'text', SfEditor.text(editor, editor.selection));
+      if (table) {
+        setEventTransfer(event, 'fragment', table);
         return;
       }
-
-      setEventTransfer(event, 'fragment', table);
-      return;
     }
 
-    if (_this.codeUtils.isInCodeBlock() && !Range.isCollapsed(editor.selection)) {
-      var anchorPoint = editor.selection.anchor;
-      var focusPoint = editor.selection.focus;
-      var anchorCodeBlock = Editor.match(_this.editor, anchorPoint, {
-        type: 'code_block'
+    if (editor.selection && !Range.isCollapsed(editor.selection)) {
+      // get block deepest block node. 
+      // for example: code line in a code block, paragraph in a list
+      var blockList = Editor.nodes(editor, {
+        at: editor.selection,
+        match: 'block'
       });
-      var focusCodeBlock = Editor.match(_this.editor, focusPoint, {
-        type: 'code_block'
-      });
-      /* 
-        If the selection is within the range of the selected code block 
-        copy the selected code line as paragraph
-      */
 
-      if (anchorCodeBlock && focusCodeBlock && Path.equals(focusCodeBlock[1], anchorCodeBlock[1])) {
-        event.preventDefault();
-        var fragment = Node.fragment(editor, editor.selection);
-        fragment = fragment[0].children.map(function (codeLine) {
-          var text = Node.text(codeLine);
-          return {
-            type: 'paragraph',
-            children: [{
-              text: text
-            }]
-          };
-        });
-        setEventTransfer(event, 'fragment', fragment);
-        return;
+      if (blockList) {
+        var nodeList = Array.from(blockList);
+        /**
+         * if only one block element selected, write the selected content as paragraph or text to clipboard
+         * instead of use slate default behavior which write the outest element to clipboard
+        */
+
+        if (nodeList.length === 1) {
+          event.preventDefault();
+
+          var _nodeList$ = _slicedToArray(nodeList[0], 2),
+              node = _nodeList$[0],
+              path = _nodeList$[1];
+
+          path = path.slice(1);
+
+          if (node && node.type === 'paragraph') {
+            // get selected paragraph node in selection and write to clipboard
+            var fragment = Node.fragment(editor, editor.selection);
+            var selectedNode = Node.get(fragment[0], Array(path.length).fill(0));
+            setEventTransfer(event, 'fragment', [selectedNode]);
+          } else {
+            setEventTransfer(event, 'text', SfEditor.text(editor, editor.selection));
+          }
+
+          return;
+        }
       }
     }
   };

package/dist/editor/editor-utils/block-element-utils/list-utils.js

@@ -324,10 +324,10 @@ var LitsUtils = function LitsUtils(editor) {
     var listItems = [];
     list.children.forEach(function (listItem) {
       var children = listItem.children || [];
-      var firstChild = children[0];
+      var child = children[0];
 
-      if (firstChild && firstChild.type.includes('_list')) {
-        listItems.push.apply(listItems, _toConsumableArray(_this.getNormalizedListItems(firstChild)));
+      if (child && child.type.includes('_list') && children.length === 1) {
+        listItems.push.apply(listItems, _toConsumableArray(_this.getNormalizedListItems(child)));
       } else {
         listItems.push(listItem);
       }
@@ -371,10 +371,18 @@ var LitsUtils = function LitsUtils(editor) {
 
         listItems.forEach(function (listItem, index) {
           var itemChildren = listItem.children;
-          SfEditor.insertFragment(_this.editor, [itemChildren[0]]);
+
+          if (itemChildren[0].type.includes('list')) {
+            SfEditor.insertNodes(_this.editor, [itemChildren[0]]);
+          } else {
+            SfEditor.insertFragment(_this.editor, [itemChildren[0]]);
+          }
 
           if (itemChildren.length > 1) {
-            SfEditor.insertNodes(_this.editor, itemChildren.slice(1));
+            var currentListItem = Node.get(_this.editor, [].concat(_toConsumableArray(listPath), [currentItemIndex + index]));
+            SfEditor.insertNodes(_this.editor, itemChildren.slice(1), {
+              at: [].concat(_toConsumableArray(listPath), [currentItemIndex + index, currentListItem.children.length])
+            });
           }
 
           if (index < listItems.length - 1) {

package/dist/editor/editor-utils/common-editor-utils.js

@@ -339,9 +339,14 @@ var EditorUtils = /*#__PURE__*/function () {
             });
           } else {
             var currentListPath = Path.parent(item[1]);
-            var listAncesstor = Node.get(_this.editor, Path.parent(currentListPath)); // if the current selected list is a children of a different kind of list prevent modify the list type
+            var listAncesstor = Node.get(_this.editor, Path.parent(currentListPath)); // modify the sublist to different types
 
             if (listAncesstor.type && listAncesstor.type.includes('list')) {
+              _this.editor.exec({
+                type: "modify_sublist_type",
+                target_list_type: type
+              });
+
               return;
             }
 

package/dist/utils/slate2markdown/deserialize.js

@@ -496,7 +496,7 @@ function _nodeToSlate(node, opts) {
         return {
           type: 'link',
           data: data,
-          nodes: children
+          children: children
         };
       } else {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/seafile-editor",
-  "version": "0.3.83",
+  "version": "0.3.87",
   "private": false,
   "dependencies": {
     "@seafile/react-image-lightbox": "^0.0.9",