@seafile/sdoc-editor 3.0.2 → 3.0.3

package/dist/extension/plugins/code-block/plugin.js

@@ -182,6 +182,15 @@ var withCodeBlock = function withCodeBlock(editor) {
         _slate.Transforms.select(newEditor, [path[0] + 1]);
       }
     }
+    if ((0, _isHotkey["default"])('enter', event)) {
+      event.preventDefault();
+      var selectedNode = (0, _core.getSelectedNodeByType)(newEditor, _constants.CODE_LINE);
+      var line = (0, _core.generateEmptyElement)(_constants.CODE_LINE);
+      _slate.Transforms.insertNodes(editor, line, {
+        at: selectedNode[1]
+      });
+      return;
+    }
     if ((0, _isHotkey["default"])('tab', event)) {
       var selection = newEditor.selection;
       event.preventDefault();

package/dist/extension/plugins/list/plugin/index.js

@@ -24,7 +24,8 @@ var withList = function withList(editor) {
   var insertBreak = editor.insertBreak,
     handleTab = editor.handleTab,
     insertText = editor.insertText,
-    deleteBackward = editor.deleteBackward;
+    deleteBackward = editor.deleteBackward,
+    onHotKeyDown = editor.onHotKeyDown;
   var newEditor = editor;
   newEditor.insertBreak = function () {
     if ((0, _insertBreakList.insertBreakList)(editor)) return;

package/dist/extension/plugins/list/transforms/normalize-list-item.js

@@ -17,7 +17,7 @@ var _moveListItemUp = require("./move-list-item-up");
 var normalizeListItem = exports.normalizeListItem = function normalizeListItem(editor, _ref) {
   var listItem = _ref.listItem;
   var changed = false;
-  var validLiChildrenTypes = [].concat((0, _toConsumableArray2["default"])((0, _queries.getListTypes)()), [_constants.PARAGRAPH, _constants.GROUP]);
+  var validLiChildrenTypes = [].concat((0, _toConsumableArray2["default"])((0, _queries.getListTypes)()), [_constants.PARAGRAPH, _constants.CODE_BLOCK, _constants.GROUP]);
   var _listItem = (0, _slicedToArray2["default"])(listItem, 2),
     liPath = _listItem[1];
   var liChildren = (0, _core.getChildren)(listItem);

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

@@ -328,6 +328,7 @@ var SideToolbar = function SideToolbar() {
     }
     var _getNodeEntry3 = (0, _helpers2.getNodeEntry)(editor, targetElement),
       _getNodeEntry4 = (0, _slicedToArray2["default"])(_getNodeEntry3, 2),
+      targetNode = _getNodeEntry4[0],
       targetPath = _getNodeEntry4[1];
     // Drag multiple list_items nodes
     if (draggedSourcePaths.current) {
@@ -394,7 +395,7 @@ var SideToolbar = function SideToolbar() {
     }
 
     // Dragging into a list is not supported
-    if ([_constants2.CODE_BLOCK, _constants2.TABLE, _constants2.BLOCKQUOTE, _constants2.CHECK_LIST_ITEM].includes(sourceNode.type) && (0, _helpers2.isList)(editor, targetPath)) {
+    if ([_constants2.CALL_OUT, _constants2.TABLE, _constants2.BLOCKQUOTE, _constants2.CHECK_LIST_ITEM].includes(sourceNode.type) && (0, _helpers2.isList)(editor, targetPath)) {
       return;
     }
 
@@ -409,8 +410,19 @@ var SideToolbar = function SideToolbar() {
       return;
     }
 
+    // Drag out codeblock from list into non-list nodes
+    if ((0, _helpers2.isList)(editor, sourcePath) && sourceNode.type === _constants2.CODE_BLOCK && !(0, _helpers2.isList)(editor, targetPath)) {
+      var codeblockPath = (0, _core.findPath)(editor, sourceNode);
+      var toPath = _slate.Path.next(targetPath);
+      _slate.Transforms.moveNodes(editor, {
+        at: codeblockPath,
+        to: toPath
+      });
+      return;
+    }
+
     // Drag list
-    if ((0, _helpers2.isList)(editor, sourcePath)) {
+    if ((0, _helpers2.isList)(editor, sourcePath) && sourceNode !== _constants2.CODE_BLOCK) {
       // ordinary list items
       if (!(0, _helpers2.isBlockquote)(editor, [sourcePath[0]])) {
         // Drag ordinary list items to places other than list and quoteBlock
@@ -498,39 +510,51 @@ var SideToolbar = function SideToolbar() {
 
     // 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)) {
+      // Special situation: drag codeblock into list nodes
+      if ((0, _helpers2.isList)(editor, targetPath) && [_constants2.CODE_BLOCK].includes(sourceNode.type)) {
+        var childrenPath = (0, _core.findPath)(editor, targetNode);
+        var _codeblockPath = (0, _core.findPath)(editor, sourceNode);
+        var _toPath = _slate.Path.next(childrenPath);
+        _slate.Transforms.moveNodes(editor, {
+          at: _codeblockPath,
+          to: _toPath
+        });
+        return;
+      }
+
       // Drag backward
       if (_slate.Path.isAfter(targetPath, sourcePath)) {
-        var toPath = targetPath.slice(0);
+        var _toPath2 = targetPath.slice(0);
 
         // Drag elements outside the quoteBlock into the quoteBlock
         if (!(0, _helpers2.isBlockquote)(editor, [sourcePath[0]]) && (0, _helpers2.isBlockquote)(editor, [targetPath[0]]) && targetPath.length > 1) {
-          toPath = _slate.Path.next(targetPath);
+          _toPath2 = _slate.Path.next(targetPath);
         }
 
-        // Drag into list
-        if ((0, _helpers2.isList)(editor, targetPath)) {
-          toPath = _slate.Path.next(targetPath);
+        // Drag non-codeblock into list
+        if ((0, _helpers2.isList)(editor, targetPath) && ![_constants2.CODE_BLOCK].includes(currentSourceNode.type)) {
+          _toPath2 = _slate.Path.next(targetPath);
         }
         _slate.Transforms.moveNodes(editor, {
           at: sourcePath,
-          to: toPath
+          to: _toPath2
         });
       }
 
       // Drag forward
       if (_slate.Path.isBefore(targetPath, sourcePath)) {
-        var _toPath = _slate.Path.next(targetPath);
+        var _toPath3 = _slate.Path.next(targetPath);
         _slate.Transforms.moveNodes(editor, {
           at: sourcePath,
-          to: _toPath
+          to: _toPath3
         });
       }
     }
     var selectedSourcePath = sourcePath;
     // Handling drag forward situation for multi_column update
     if (_slate.Path.isBefore(targetPath, sourcePath)) {
-      var targetNode = _slate.Editor.node(editor, [targetPath[0]])[0];
-      if (![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(targetNode.type)) {
+      var _targetNode = _slate.Editor.node(editor, [targetPath[0]])[0];
+      if (![_constants2.ORDERED_LIST, _constants2.UNORDERED_LIST].includes(_targetNode.type)) {
         selectedSourcePath[0] += 1;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6a60ac9e210680a19a336fc2a98dbae74795305d"
+  "gitHead": "0a7ebc1042c83af89889893429b3b1a6b1a13431"
 }