@seafile/sdoc-editor 3.0.2 → 3.0.4

package/dist/android/constants.js

@@ -7,5 +7,9 @@ exports.ACTION_TYPES = void 0;
 var ACTION_TYPES = exports.ACTION_TYPES = {
   GET_OUTLINE: 'sdoc.outline.data.get',
   SELECT_OUTLINE: 'sdoc.outline.data.select',
-  EDITOR_ACTION_TRANSFER: 'sdoc.editor.data.edit'
+  EDITOR_ACTION_TRANSFER: 'sdoc.editor.data.edit',
+  TOOLBAR_MENU_TRIGGER: 'sdoc.toolbar.menu.trigger',
+  EDITOR_CONTENT_SELECT: 'sdoc.editor.content.select',
+  EDITOR_OPERATION_EXECUTE: 'sdoc.editor.operation.execute',
+  EDITOR_SYSTEM_EVENT: 'sdoc.editor.system.event'
 };

package/dist/android/dispatch-content-select-event.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.dispatchContentSelectEvent = void 0;
+var _constants = require("../extension/constants");
+var _core = require("../extension/core");
+var _constants2 = require("./constants");
+var _jsBridge = _interopRequireDefault(require("./js-bridge"));
+var dispatchContentSelectEvent = exports.dispatchContentSelectEvent = function dispatchContentSelectEvent(editor) {
+  var topBlockEntry = (0, _core.getTopLevelBlockNode)(editor);
+  if (!topBlockEntry) return;
+  var topNode = topBlockEntry[0];
+  var topType = topNode.type;
+  if (topType === _constants.MULTI_COLUMN) {
+    var selection = editor.selection;
+    var currentNodeInColumn = (0, _core.getNode)(editor, selection.anchor.path.slice(0, 3));
+    topType = currentNodeInColumn.type;
+  }
+  // content select
+  var selectData = {
+    v: 2,
+    action: _constants2.ACTION_TYPES.EDITOR_CONTENT_SELECT,
+    data: JSON.stringify({
+      type: topType
+    })
+  };
+  _jsBridge["default"].callAndroidFunction(JSON.stringify(selectData));
+
+  // op execute
+  var opData = {
+    v: 2,
+    action: _constants2.ACTION_TYPES.EDITOR_OPERATION_EXECUTE,
+    data: JSON.stringify({
+      type: 'op-execute'
+    })
+  };
+  _jsBridge["default"].callAndroidFunction(JSON.stringify(opData));
+};

package/dist/android/dispatch-system-event.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.dispatchSystemEvent = void 0;
+var _constants = require("./constants");
+var _jsBridge = _interopRequireDefault(require("./js-bridge"));
+var dispatchSystemEvent = exports.dispatchSystemEvent = function dispatchSystemEvent(message_type) {
+  // op execute
+  var opData = {
+    v: 2,
+    action: _constants.ACTION_TYPES.EDITOR_SYSTEM_EVENT,
+    data: JSON.stringify({
+      type: message_type
+    })
+  };
+  _jsBridge["default"].callAndroidFunction(JSON.stringify(opData));
+};

package/dist/android/js-bridge.js

@@ -11,12 +11,13 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/es
 var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
   var _this = this;
   (0, _classCallCheck2["default"])(this, JSBridge);
-  (0, _defineProperty2["default"])(this, "init", function () {
+  (0, _defineProperty2["default"])(this, "init", function (editor) {
     if (window.WebViewJavascriptBridge) {
       _this.initWebViewJavascriptBridge();
     } else {
       document.addEventListener('WebViewJavascriptBridgeReady', _this.initWebViewJavascriptBridge, false);
     }
+    _this.editor = editor;
     _this.initJSEventHandler();
   });
   (0, _defineProperty2["default"])(this, "finishPage", function () {
@@ -41,7 +42,7 @@ var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
       }
       if (!parsedData) {
         responseCallback(JSON.stringify({
-          success: true
+          success: false
         }));
         return;
       }
@@ -59,7 +60,7 @@ var JSBridge = /*#__PURE__*/(0, _createClass2["default"])(function JSBridge() {
           success: false
         }));
       }
-      var execActionSucceed = eventHandler(params);
+      var execActionSucceed = eventHandler(params, _this.editor);
       if (execActionSucceed) {
         responseCallback(JSON.stringify({
           success: true

package/dist/android/mobile-message.js

@@ -0,0 +1,119 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
+var _callSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/callSuper"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _react = _interopRequireDefault(require("react"));
+var _eventBus = _interopRequireDefault(require("../utils/event-bus"));
+var _dispatchSystemEvent = require("./dispatch-system-event");
+var MobileMessage = /*#__PURE__*/function (_React$Component) {
+  function MobileMessage(props) {
+    var _this;
+    (0, _classCallCheck2["default"])(this, MobileMessage);
+    _this = (0, _callSuper2["default"])(this, MobileMessage, [props]);
+    (0, _defineProperty2["default"])(_this, "onOperationExecuteError", function () {
+      var message = 'failed_to_execute_operation_on_server';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onSyncServerOperationError", function () {
+      var message = 'failed_to_sync_with_server_operations';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onInternalServerExecError", function () {
+      var message = 'internal_server_exec_operations_error';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onTokenExpiredError", function (msg) {
+      var message = 'token_expired_Please_refresh_the_page';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onPendingOpExceedLimit", function () {
+      var message = 'pending_operations_exceed_limit';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onDisconnect", function () {
+      var message = 'server_is_not_connected_operation_will_be_sent_to_server_later';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onReconnectError", function () {
+      if (!_this.isConnectError) {
+        _this.isConnectError = true;
+        var message = 'server_is_disconnected_reconnecting';
+        (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "onConnect", function () {
+      _this.isConnectError = false;
+    });
+    (0, _defineProperty2["default"])(_this, "onReconnect", function () {
+      _this.isConnectError = false;
+      var message = 'server_is_reconnected';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onDocumentSaving", function () {
+      var message = 'document_is_saving';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "onDocumentSaved", function () {
+      var message = 'document_is_saved';
+      (0, _dispatchSystemEvent.dispatchSystemEvent)(message);
+    });
+    (0, _defineProperty2["default"])(_this, "render", function () {
+      return null;
+    });
+    _this.state = {
+      isSaved: false,
+      isSaving: false,
+      lastSavedAt: ''
+    };
+    _this.saveTimer = null;
+    return _this;
+  }
+  (0, _inherits2["default"])(MobileMessage, _React$Component);
+  return (0, _createClass2["default"])(MobileMessage, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      var eventBus = _eventBus["default"].getInstance();
+      this.unsubscribeSavingEvent = eventBus.subscribe('is-saving', this.onDocumentSaving);
+      this.unsubscribeSavedEvent = eventBus.subscribe('saved', this.onDocumentSaved);
+      this.unsubscribeSavedEvent = eventBus.subscribe('connect', this.onConnect);
+      // offline reconnect
+      this.unsubscribeDisconnectEvent = eventBus.subscribe('disconnect', this.onDisconnect);
+      this.unsubscribeReconnectErrorEvent = eventBus.subscribe('reconnect_error', this.onReconnectError);
+      this.unsubscribeReconnectEvent = eventBus.subscribe('reconnect', this.onReconnect);
+
+      // server return error
+      this.unsubscribeOpExecError = eventBus.subscribe('execute_client_operations_error', this.onOperationExecuteError);
+      this.unsubscribeSyncServerOpError = eventBus.subscribe('sync_server_operations_error', this.onSyncServerOperationError);
+      this.unsubscribeDocumentLoadError = eventBus.subscribe('load_document_content_error', this.onInternalServerExecError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('save_operations_to_database_error', this.onInternalServerExecError);
+      this.unsubscribeOperationsSaveError = eventBus.subscribe('token_expired', this.onTokenExpiredError);
+
+      // local error
+      this.unsubscribePendingOpExceedLimit = eventBus.subscribe('pending_operations_exceed_limit', this.onPendingOpExceedLimit);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.unsubscribeSavingEvent();
+      this.unsubscribeSavedEvent();
+      this.unsubscribeDisconnectEvent();
+      this.unsubscribeReconnectErrorEvent();
+      this.unsubscribeReconnectEvent();
+      this.unsubscribeOpExecError();
+      this.unsubscribeSyncServerOpError();
+      this.unsubscribePendingOpExceedLimit();
+      this.unsubscribeDocumentLoadError();
+      this.unsubscribeOperationsSaveError();
+      clearTimeout(this.saveTimer);
+    }
+  }]);
+}(_react["default"].Component);
+var _default = exports["default"] = MobileMessage;

package/dist/android/toolbar-trigger.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.updateEditorHistory = exports.registerToolbarMenuTrigger = void 0;
+var _constants = require("../extension/constants");
+var _core = require("../extension/core");
+var _helpers = require("../extension/plugins/check-list/helpers");
+var _helpers2 = require("../extension/plugins/header/helpers");
+var _helpers3 = require("../extension/plugins/list/helpers");
+var _constants2 = require("./constants");
+var _jsBridge = _interopRequireDefault(require("./js-bridge"));
+var headerTypes = [_constants.ELEMENT_TYPE.TITLE, _constants.ELEMENT_TYPE.SUBTITLE, _constants.ELEMENT_TYPE.HEADER1, _constants.ELEMENT_TYPE.HEADER2, _constants.ELEMENT_TYPE.HEADER3, _constants.ELEMENT_TYPE.HEADER4, _constants.ELEMENT_TYPE.HEADER5, _constants.ELEMENT_TYPE.HEADER6, _constants.ELEMENT_TYPE.PARAGRAPH];
+var onToolbarTrigger = function onToolbarTrigger(data, editor) {
+  var type = data.type;
+  if (headerTypes.includes(type)) {
+    var nodeEntry = (0, _core.getNearestBlockNode)(editor);
+    if (!nodeEntry) return;
+    var newType = type;
+    if (nodeEntry[0].type === type) {
+      newType = _constants.PARAGRAPH;
+    }
+    (0, _helpers2.setHeaderType)(editor, newType);
+    return;
+  }
+  if (type === _constants.UNDO) {
+    editor.undo();
+    return;
+  }
+  if (type === _constants.REDO) {
+    editor.redo();
+    return;
+  }
+  if (type === _constants.UNORDERED_LIST || type === _constants.ORDERED_LIST) {
+    (0, _helpers3.setListType)(editor, type);
+    return;
+  }
+  if (type === _constants.CHECK_LIST_ITEM) {
+    var _nodeEntry = (0, _core.getNearestBlockNode)(editor);
+    if (!_nodeEntry) return;
+    var _newType = type;
+    if (_nodeEntry[0].type === type) {
+      _newType = _constants.PARAGRAPH;
+    }
+    (0, _helpers.setCheckListItemType)(editor, _newType);
+    return;
+  }
+};
+var updateEditorHistory = exports.updateEditorHistory = function updateEditorHistory(editor) {
+  if (!window.seadroid) {
+    window.seadroid = {};
+  }
+  window.seadroid['history'] = editor.history;
+};
+var registerToolbarMenuTrigger = exports.registerToolbarMenuTrigger = function registerToolbarMenuTrigger() {
+  _jsBridge["default"].registerEventHandler(_constants2.ACTION_TYPES.TOOLBAR_MENU_TRIGGER, onToolbarTrigger);
+};

package/dist/assets/css/layout.css

@@ -73,7 +73,6 @@
 
 .sdoc-editor-container .sdoc-editor-toolbar {
   display: flex;
-  flex: 1;
   justify-content: center;
   position: relative;
   height: 44px;
@@ -96,7 +95,7 @@
 
 .sdoc-content-wrapper {
   width: 100%;
-  height: calc(100vh - 44px);
+  flex: 1;
   display: flex;
 }
 

package/dist/editor/sdoc-editor.js

@@ -13,9 +13,12 @@ var _react = _interopRequireWildcard(require("react"));
 var _slate = require("@seafile/slate");
 var _deepCopy = _interopRequireDefault(require("deep-copy"));
 var _isHotkey = _interopRequireDefault(require("is-hotkey"));
+var _dispatchContentSelectEvent = require("../android/dispatch-content-select-event");
 var _editorTitleBar = require("../android/editor-title-bar");
 var _jsBridge = _interopRequireDefault(require("../android/js-bridge"));
+var _mobileMessage = _interopRequireDefault(require("../android/mobile-message"));
 var _outlineModule = require("../android/outline-module");
+var _toolbarTrigger = require("../android/toolbar-trigger");
 var _fileLoading = _interopRequireDefault(require("../components/file-loading"));
 var _constants = require("../constants");
 var _context = _interopRequireDefault(require("../context"));
@@ -120,10 +123,12 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   (0, _react.useEffect)(function () {
     var mobileLogin = _context["default"].getSetting('mobileLogin');
     if (mobileLogin) {
-      _jsBridge["default"].init();
+      _jsBridge["default"].init(validEditor);
       (0, _outlineModule.registerOutlineEventHandler)();
       (0, _editorTitleBar.registerTitleBarEventHandler)();
+      (0, _toolbarTrigger.registerToolbarMenuTrigger)();
       (0, _outlineModule.updateOutlineValue)(document.elements);
+      (0, _toolbarTrigger.updateEditorHistory)(validEditor);
     }
     return function () {
       _jsBridge["default"].finishPage();
@@ -236,6 +241,9 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     if (_commonUtils.isMobile) {
       (0, _outlineModule.updateOutlineValue)(value);
     }
+    if (_commonUtils.isMobile && isEdit) {
+      (0, _dispatchContentSelectEvent.dispatchContentSelectEvent)(validEditor);
+    }
   };
   var isFreezed = _context["default"].getSetting('isFreezed');
   if (isReloading) {
@@ -280,6 +288,7 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }))));
   }
   var isShowComment = typeof showComment === 'boolean' ? showComment : true;
+  var mobileLogin = _context["default"].getSetting('mobileLogin');
   if (_commonUtils.isMobile && isEdit) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_layout.EditorContainer, {
       editor: validEditor
@@ -293,7 +302,7 @@ var SdocEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       slateValue: slateValue,
       updateSlateValue: onValueChange,
       showComment: false
-    })), isShowHeaderToolbar && /*#__PURE__*/_react["default"].createElement(_extension.HeaderToolbar, {
+    })), mobileLogin && /*#__PURE__*/_react["default"].createElement(_mobileMessage["default"], null), !mobileLogin && isShowHeaderToolbar && /*#__PURE__*/_react["default"].createElement(_extension.HeaderToolbar, {
       editor: validEditor,
       isEdit: isEdit
     }))), /*#__PURE__*/_react["default"].createElement(_insertElementDialog["default"], {

package/dist/extension/constants/element-type.js

@@ -54,5 +54,5 @@ var FONT_SIZE_REDUCE = exports.FONT_SIZE_REDUCE = 'font-size-reduce';
 
 // group
 var GROUP = exports.GROUP = 'group';
-var TOP_LEVEL_TYPES = exports.TOP_LEVEL_TYPES = [BLOCKQUOTE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, PARAGRAPH, CODE_BLOCK, TABLE];
+var TOP_LEVEL_TYPES = exports.TOP_LEVEL_TYPES = [BLOCKQUOTE, TITLE, SUBTITLE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, PARAGRAPH, CODE_BLOCK, TABLE, IMAGE_BLOCK, VIDEO, WHITEBOARD];
 var INLINE_LEVEL_TYPES = exports.INLINE_LEVEL_TYPES = [IMAGE, LINK, MENTION, MENTION_TEMP];

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isMiddlePoint = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCursorAtBlockStart = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isContainsVoidElement = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
+exports.someNode = exports.isTopLevelListItem = exports.isTextNode = exports.isStartPoint = exports.isSelectionAtBlockStart = exports.isSelectionAtBlockEnd = exports.isRangeInSameBlock = exports.isRangeAcrossBlocks = exports.isMultiLevelList = exports.isMiddlePoint = exports.isLastNode = exports.isLastChild = exports.isHasImg = exports.isFirstChild = exports.isEndPoint = exports.isEmptyArticle = exports.isCursorAtBlockStart = exports.isCurrentLineHasText = exports.isCurrentLineEmpty = exports.isContainsVoidElement = exports.isBlockTextEmptyAfterSelection = exports.isBlockAboveEmpty = exports.isAncestorEmpty = exports.getTopLevelBlockNode = exports.getStartPoint = exports.getSelectedNodeEntryByType = exports.getSelectedNodeByTypes = exports.getSelectedNodeByType = exports.getSelectedElems = exports.getQueryOptions = exports.getPreviousPath = exports.getPrevNode = exports.getPointBefore = exports.getParentNode = exports.getNodes = exports.getNodeType = exports.getNodeEntries = exports.getNodeById = exports.getNode = exports.getNextSiblingNodes = exports.getNextNode = exports.getNearestBlockNode = exports.getLastChildPath = exports.getLastChild = exports.getEndPoint = exports.getEditorString = exports.getDeepInlineChildren = exports.getCurrentNode = exports.getCommonNode = exports.getChildren = exports.getAboveNode = exports.getAboveBlockNode = exports.findPath = exports.findNode = exports.findDescendant = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
@@ -261,6 +261,32 @@ var getTopLevelBlockNode = exports.getTopLevelBlockNode = function getTopLevelBl
     }
   });
 };
+var getNearestBlockNode = exports.getNearestBlockNode = function getNearestBlockNode(editor) {
+  if (!editor.selection) return null;
+  var LIST_TYPES = [_constants.UNORDERED_LIST, _constants.ORDERED_LIST];
+  var _Editor$nodes7 = _slate.Editor.nodes(editor, {
+      at: editor.selection,
+      match: function match(n) {
+        return _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n) && LIST_TYPES.includes(n.type);
+      },
+      mode: 'lowest'
+    }),
+    _Editor$nodes8 = (0, _slicedToArray2["default"])(_Editor$nodes7, 1),
+    nodeEntry = _Editor$nodes8[0];
+  if (nodeEntry) {
+    return nodeEntry;
+  }
+  var _Editor$nodes9 = _slate.Editor.nodes(editor, {
+      at: editor.selection,
+      match: function match(n) {
+        return _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n) && _constants.TOP_LEVEL_TYPES.includes(n.type);
+      },
+      mode: 'lowest'
+    }),
+    _Editor$nodes0 = (0, _slicedToArray2["default"])(_Editor$nodes9, 1),
+    nodeEntry2 = _Editor$nodes0[0];
+  return nodeEntry2 || null;
+};
 var getPrevNode = exports.getPrevNode = function getPrevNode(editor) {
   var lowerNodeEntry = getAboveNode(editor, {
     mode: 'lowest',
@@ -308,15 +334,15 @@ var getPrevNode = exports.getPrevNode = function getPrevNode(editor) {
 };
 var getCurrentNode = exports.getCurrentNode = function getCurrentNode(editor) {
   if (!editor.selection) return null;
-  var _Editor$nodes7 = _slate.Editor.nodes(editor, {
+  var _Editor$nodes1 = _slate.Editor.nodes(editor, {
       at: editor.selection,
       match: function match(n) {
         return _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n);
       },
       mode: 'lowest'
     }),
-    _Editor$nodes8 = (0, _slicedToArray2["default"])(_Editor$nodes7, 1),
-    nodeEntry = _Editor$nodes8[0];
+    _Editor$nodes10 = (0, _slicedToArray2["default"])(_Editor$nodes1, 1),
+    nodeEntry = _Editor$nodes10[0];
   return nodeEntry || null;
 };
 var getNextNode = exports.getNextNode = function getNextNode(editor) {

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.4",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6a60ac9e210680a19a336fc2a98dbae74795305d"
+  "gitHead": "40de301531da184f54c0270ca175c91c5ce52c5c"
 }