@worktile/theia 2.4.4 → 2.4.5

package/bundles/worktile-theia.umd.js

@@ -1716,6 +1716,30 @@
         return !containerNode ? CONTAINER_BLOCKS : __spreadArray(__spreadArray([], __read(CONTAINER_BLOCKS)), [containerNode[0].type]);
     };
 
+    var getDirectlyParent = function (editor) {
+        var _a = __read(getBlockAbove(editor), 2), anchorPath = _a[1];
+        if (!anchorPath)
+            return;
+        var parentEntry = getParent(editor, anchorPath);
+        if (!parentEntry)
+            return;
+        return parentEntry;
+    };
+
+    var isTypesInParent = function (editor, types) {
+        if (!Array.isArray(types)) {
+            types = [types];
+        }
+        var _a = __read(getBlockAbove(editor), 2), anchorPath = _a[1];
+        if (!anchorPath)
+            return false;
+        var parentEntry = slate.Editor.above(editor, { match: function (n) { return types.includes(n.type); } });
+        if (!parentEntry)
+            return false;
+        var _b = __read(parentEntry, 1), parentNode = _b[0];
+        return types.includes(parentNode.type);
+    };
+
     var index$1 = /*#__PURE__*/Object.freeze({
         __proto__: null,
         getLastNode: getLastNode,
@@ -1743,6 +1767,7 @@
         getPlainText: getPlainText,
         getSelectionMarks: getSelectionMarks,
         getContainerBlocks: getContainerBlocks,
+        getDirectlyParent: getDirectlyParent,
         isAncestor: isAncestor,
         isCollapsed: isCollapsed,
         isEmptyParagraph: isEmptyParagraph,
@@ -1765,6 +1790,7 @@
         isEmptyContent: isEmptyContent,
         isEmptyParagraphByPath: isEmptyParagraphByPath,
         isContainer: isContainer,
+        isTypesInParent: isTypesInParent,
         anchorBlock: anchorBlock,
         anchorBlockEntry: anchorBlockEntry,
         anchorInlineEntry: anchorInlineEntry,
@@ -1776,11 +1802,32 @@
     });
 
     var insertElementNext = function (editor, node) {
+        var _a;
         if (slate.Range.isExpanded(editor.selection)) {
             slate.Editor.deleteFragment(editor);
         }
-        var anchorBlockPath = anchorBlockEntry(editor)[1];
-        var isEmpty = isEmptyParagraph(editor);
+        var allowContainerOperateTypes = ((_a = editor.options) === null || _a === void 0 ? void 0 : _a.allowContainerOperateTypes) || [];
+        var isAllowContainerInsert = isTypesInParent(editor, allowContainerOperateTypes);
+        var isBlockCardCursor$1 = isBlockCardCursor(editor);
+        var containerBlocks = getContainerBlocks(editor);
+        var isContainer = isNodeTypeIn(editor, containerBlocks, { at: editor.selection });
+        var _b = __read(anchorBlockEntry(editor), 2), anchorBlock = _b[0], anchorBlockPath = _b[1];
+        var isEmpty = slate.Editor.isEmpty(editor, anchorBlock);
+        if (isAllowContainerInsert && isContainer && !isBlockCardCursor$1) {
+            var _c = __read(slate.Editor.above(editor, {
+                match: function (n) { return slate.Editor.isBlock(editor, n) && allowContainerOperateTypes.includes(n.type); },
+                at: editor.selection
+            }), 2), containerPath_1 = _c[1];
+            slate.Editor.withoutNormalizing(editor, function () {
+                var containerPathFirstPath = anchorBlockPath.slice(0, containerPath_1.length + 1);
+                slate.Transforms.insertNodes(editor, node, { at: slate.Path.next(containerPathFirstPath) });
+                slate.Transforms.select(editor, slate.Editor.start(editor, slate.Path.next(containerPathFirstPath)));
+                if (isEmpty) {
+                    slate.Transforms.removeNodes(editor, { at: anchorBlockPath });
+                }
+            });
+            return;
+        }
         var nextPath = slate.Path.next([anchorBlockPath[0]]);
         slate.Transforms.insertNodes(editor, node, { at: nextPath });
         if (isEmpty && anchorBlockPath.length === 1) {
@@ -1995,40 +2042,6 @@
         return false;
     }
 
-    var insertElementNode = function (editor, node) {
-        if (slate.Range.isExpanded(editor.selection)) {
-            slate.Editor.deleteFragment(editor);
-        }
-        var isBlockCardCursor$1 = isBlockCardCursor(editor);
-        var containerBlocks = getContainerBlocks(editor);
-        var isContainer = isNodeTypeIn(editor, containerBlocks, { at: editor.selection });
-        var _a = __read(anchorBlockEntry(editor), 2), anchorBlock = _a[0], anchorBlockPath = _a[1];
-        var isEmpty = slate.Editor.isEmpty(editor, anchorBlock);
-        if (isContainer && !isBlockCardCursor$1) {
-            var _b = __read(slate.Editor.above(editor, {
-                match: function (n) { return slate.Editor.isBlock(editor, n) && containerBlocks.includes(n.type); },
-                at: editor.selection
-            }), 2), containerPath_1 = _b[1];
-            slate.Editor.withoutNormalizing(editor, function () {
-                var containerPathFirstPath = anchorBlockPath.slice(0, containerPath_1.length + 1);
-                slate.Transforms.insertNodes(editor, node, { at: slate.Path.next(containerPathFirstPath), select: true });
-                if (isEmpty) {
-                    slate.Transforms.removeNodes(editor, { at: anchorBlockPath });
-                }
-            });
-            return;
-        }
-        var nextPath = slate.Path.next([anchorBlockPath[0]]);
-        slate.Transforms.insertNodes(editor, node, { at: nextPath });
-        if (isEmpty && anchorBlockPath.length === 1) {
-            slate.Transforms.delete(editor, { at: anchorBlockPath });
-            slate.Transforms.select(editor, slate.Editor.start(editor, anchorBlockPath));
-        }
-        else {
-            slate.Transforms.select(editor, slate.Editor.start(editor, nextPath));
-        }
-    };
-
     var index = /*#__PURE__*/Object.freeze({
         __proto__: null,
         setMarks: setMarks,
@@ -2048,8 +2061,7 @@
         setEndSelection: setEndSelection,
         closeConversionHint: closeConversionHint,
         handleContinualDeleteBackward: handleContinualDeleteBackward,
-        handleContinualInsertBreak: handleContinualInsertBreak,
-        insertElementNode: insertElementNode
+        handleContinualInsertBreak: handleContinualInsertBreak
     });
 
     var TheConversionHintComponent = /** @class */ (function () {
@@ -12280,12 +12292,18 @@
         editor.onKeydown = function (event) {
             var _a;
             if (event.key === QUICK_TOOLBAR_HOTKEY) {
-                var types = __spreadArray([], __read((((_a = editor.options) === null || _a === void 0 ? void 0 : _a.triggerQuickToolbarTypes) || [])));
+                var types = __spreadArray([], __read((((_a = editor.options) === null || _a === void 0 ? void 0 : _a.allowContainerOperateTypes) || [])));
                 var _b = __read(getBlockAbove(editor), 1), block = _b[0];
                 if (isPureEmptyParagraph(editor, block) && allowOpenQuickToolbar(editor, types)) {
                     presseingQuickInsertHotkey = true;
                 }
             }
+            var quickToolbarRef = THE_EDITOR_QUICK_TOOLBAR_REF.get(editor);
+            var isMoveUp = i1.hotkeys.isMoveUp(event);
+            var isMoveDown = i1.hotkeys.isMoveDown(event);
+            if (quickToolbarRef && (isMoveUp || isMoveDown)) {
+                return;
+            }
             onKeydown(event);
         };
         editor.deleteBackward = function (unit) {
@@ -12310,7 +12328,9 @@
                 else {
                     presseingQuickInsertHotkey = false;
                 }
-                if (QuickInsertEditor.isOpenedToolbar(editor) && !isPureEmptyParagraph(editor, block) && slate.Node.string(block) !== QUICK_TOOLBAR_HOTKEY) {
+                if (QuickInsertEditor.isOpenedToolbar(editor) &&
+                    !isPureEmptyParagraph(editor, block) &&
+                    slate.Node.string(block) !== QUICK_TOOLBAR_HOTKEY) {
                     QuickInsertEditor.closeQuickInsertToolbar(editor);
                 }
             }