@seafile/sdoc-editor 3.0.160 → 3.0.162

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

@@ -7,14 +7,31 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _slate = require("@seafile/slate");
+var _isHotkey = _interopRequireDefault(require("is-hotkey"));
 var _constants = require("../../constants");
 var _core = require("../../core");
 var _helpers = require("./helpers");
 var withBlockquote = function withBlockquote(editor) {
   var insertBreak = editor.insertBreak,
     deleteBackward = editor.deleteBackward,
-    insertFragment = editor.insertFragment;
+    insertFragment = editor.insertFragment,
+    handleTab = editor.handleTab;
   var newEditor = editor;
+  newEditor.handleTab = function (event) {
+    var quoteBlockEntry = (0, _core.getSelectedNodeEntryByType)(newEditor, _constants.BLOCKQUOTE);
+    if (!quoteBlockEntry) {
+      return handleTab && handleTab(event);
+    }
+    var listItemEntry = (0, _core.getSelectedNodeEntryByType)(newEditor, _constants.LIST_ITEM);
+    if (listItemEntry) {
+      return handleTab && handleTab(event);
+    }
+    if ((0, _isHotkey["default"])('tab', event) || (0, _isHotkey["default"])('shift+tab', event)) {
+      event.preventDefault();
+      return true;
+    }
+    return handleTab && handleTab(event);
+  };
   newEditor.insertBreak = function () {
     var selection = editor.selection;
     if (selection == null) return insertBreak();

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

@@ -87,6 +87,21 @@ var withCallout = function withCallout(editor) {
       // Close color picker
       var eventBus = _eventBus["default"].getInstance();
       eventBus.dispatch(_constants.INTERNAL_EVENT.CLOSE_CALLOUT_COLOR_PICKER);
+      if ((0, _isHotkey["default"])('tab', event) || (0, _isHotkey["default"])('shift+tab', event)) {
+        var listItemEntry = _slate.Editor.above(newEditor, {
+          at: newEditor.selection,
+          match: function match(n) {
+            return n.type === _constants2.LIST_ITEM;
+          },
+          mode: 'lowest'
+        });
+        if (!listItemEntry) {
+          event.preventDefault();
+          return true;
+        }
+        newEditor.handleTab && newEditor.handleTab(event);
+        return true;
+      }
       if ((0, _isHotkey["default"])('mod+enter', event)) {
         (0, _helpers.insertElement)(newEditor, _constants2.PARAGRAPH, _constants2.INSERT_POSITION.AFTER);
         return true;

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

@@ -122,11 +122,11 @@ var withList = function withList(editor) {
   };
   newEditor.handleTab = function (event) {
     if (!newEditor.selection) {
-      handleTab && handleTab();
+      handleTab && handleTab(event);
       return;
     }
     if ((0, _onTabHandle.onTabHandle)(newEditor, event)) return;
-    handleTab && handleTab();
+    handleTab && handleTab(event);
   };
   newEditor.insertFragment = (0, _insertFragmentList.insertFragmentList)(newEditor);
   newEditor.normalizeNode = (0, _normalizeList.normalizeList)(editor);

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

@@ -20,18 +20,40 @@ var withParagraph = function withParagraph(editor) {
     insertBreak = editor.insertBreak;
   var newEditor = editor;
   newEditor.handleTab = function (event) {
-    var _selectedNode$;
     var selection = newEditor.selection;
-    if (!selection) return;
-    if (!_slate.Range.isCollapsed(selection)) return;
-    var selectedNode = _slate.Editor.node(newEditor, selection, {
-      depth: 1
+    if (!selection) {
+      handleTab && handleTab(event);
+      return;
+    }
+    if (!_slate.Range.isCollapsed(selection)) {
+      handleTab && handleTab(event);
+      return;
+    }
+    var excludedParent = _slate.Editor.above(newEditor, {
+      at: selection,
+      match: function match(n) {
+        return [_constants.LIST_ITEM, _constants.BLOCKQUOTE].includes(n.type);
+      },
+      mode: 'lowest'
     });
-    if ((selectedNode === null || selectedNode === void 0 ? void 0 : (_selectedNode$ = selectedNode[0]) === null || _selectedNode$ === void 0 ? void 0 : _selectedNode$.type) === _constants.PARAGRAPH) {
+    if (excludedParent) {
+      return handleTab && handleTab(event);
+    }
+    var _Editor$nodes = _slate.Editor.nodes(newEditor, {
+        at: selection,
+        match: function match(n) {
+          return n.type === _constants.PARAGRAPH;
+        },
+        mode: 'lowest'
+      }),
+      _Editor$nodes2 = (0, _slicedToArray2["default"])(_Editor$nodes, 1),
+      selectedParagraphEntry = _Editor$nodes2[0];
+    if (selectedParagraphEntry) {
       event.preventDefault();
-      var path = _slate.Editor.path(newEditor, selection);
+      var _selectedParagraphEnt = (0, _slicedToArray2["default"])(selectedParagraphEntry, 2),
+        path = _selectedParagraphEnt[1];
       var point = _slate.Editor.point(newEditor, selection);
-      var isStart = _slate.Editor.isStart(newEditor, point, [path[0]]);
+      var isStart = _slate.Editor.isStart(newEditor, point, path);
       if (isStart) {
         var indent;
         if ((0, _isHotkey["default"])('shift+tab', event)) {
@@ -43,35 +65,42 @@ var withParagraph = function withParagraph(editor) {
         _slate.Transforms.setNodes(newEditor, {
           indent: indent
         }, {
-          at: [path[0]]
+          at: path
         });
       } else {
         if ((0, _isHotkey["default"])('tab', event)) insertText('  ');
       }
       return;
     }
-    return handleTab(event);
+    return handleTab && handleTab(event);
   };
   newEditor.deleteBackward = function (unit) {
     var selection = newEditor.selection;
     if (!selection) return;
-    var _Editor$node = _slate.Editor.node(newEditor, selection, {
-        depth: 1
+    var _Editor$nodes3 = _slate.Editor.nodes(newEditor, {
+        at: selection,
+        match: function match(n) {
+          return n.type === _constants.PARAGRAPH;
+        },
+        mode: 'lowest'
       }),
-      _Editor$node2 = (0, _slicedToArray2["default"])(_Editor$node, 1),
-      _Editor$node2$ = _Editor$node2[0],
-      selectedNode = _Editor$node2$ === void 0 ? {} : _Editor$node2$;
-    var type = selectedNode.type,
-      indent = selectedNode.indent;
-    if (_slate.Range.isCollapsed(selection) && type === _constants.PARAGRAPH && indent) {
-      var path = _slate.Editor.path(newEditor, selection);
+      _Editor$nodes4 = (0, _slicedToArray2["default"])(_Editor$nodes3, 1),
+      selectedParagraphEntry = _Editor$nodes4[0];
+    var _ref = selectedParagraphEntry || [],
+      _ref2 = (0, _slicedToArray2["default"])(_ref, 2),
+      _ref2$ = _ref2[0],
+      selectedNode = _ref2$ === void 0 ? {} : _ref2$,
+      _ref2$2 = _ref2[1],
+      path = _ref2$2 === void 0 ? [] : _ref2$2;
+    var indent = selectedNode.indent;
+    if (_slate.Range.isCollapsed(selection) && indent && path.length) {
       var point = _slate.Editor.point(newEditor, selection);
-      var isStart = _slate.Editor.isStart(newEditor, point, [path[0]]);
+      var isStart = _slate.Editor.isStart(newEditor, point, path);
       if (isStart) {
         _slate.Transforms.setNodes(newEditor, {
           indent: false
         }, {
-          at: [path[0]]
+          at: path
         });
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "3.0.160",
+  "version": "3.0.162",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2d77cce0e646af89cc4212bfeb5e621601f3e0f1"
+  "gitHead": "e799288b08d797747a7c810596964b8619de28a0"
 }