roosterjs-content-model-plugins 0.24.0 → 0.26.0

package/lib-amd/edit/inputSteps/handleEnterOnList.js

@@ -0,0 +1,67 @@
+define(["require", "exports", "tslib", "roosterjs-content-model-core", "roosterjs-content-model-dom"], function (require, exports, tslib_1, roosterjs_content_model_core_1, roosterjs_content_model_dom_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.handleEnterOnList = void 0;
+    /**
+     * @internal
+     */
+    var handleEnterOnList = function (context) {
+        if (context.deleteResult == 'nothingToDelete' ||
+            context.deleteResult == 'notDeleted' ||
+            context.deleteResult == 'range') {
+            var insertPoint = context.insertPoint, formatContext = context.formatContext;
+            var path = insertPoint.path;
+            var rawEvent = formatContext === null || formatContext === void 0 ? void 0 : formatContext.rawEvent;
+            var index = (0, roosterjs_content_model_core_1.getClosestAncestorBlockGroupIndex)(path, ['ListItem'], ['TableCell']);
+            var listItem = path[index];
+            if (listItem && listItem.blockGroupType === 'ListItem') {
+                var listParent = path[index + 1];
+                if (isEmptyListItem(listItem)) {
+                    listItem.levels.pop();
+                }
+                else {
+                    createNewListItem(context, listItem, listParent);
+                }
+                rawEvent === null || rawEvent === void 0 ? void 0 : rawEvent.preventDefault();
+                context.deleteResult = 'range';
+            }
+        }
+    };
+    exports.handleEnterOnList = handleEnterOnList;
+    var isEmptyListItem = function (listItem) {
+        return (listItem.blocks.length === 1 &&
+            listItem.blocks[0].blockType === 'Paragraph' &&
+            listItem.blocks[0].segments.length === 2 &&
+            listItem.blocks[0].segments[0].segmentType === 'SelectionMarker' &&
+            listItem.blocks[0].segments[1].segmentType === 'Br');
+    };
+    var createNewListItem = function (context, listItem, listParent) {
+        var insertPoint = context.insertPoint;
+        var listIndex = listParent.blocks.indexOf(listItem);
+        var newParagraph = createNewParagraph(insertPoint);
+        var levels = createNewListLevel(listItem);
+        var newListItem = (0, roosterjs_content_model_dom_1.createListItem)(levels, insertPoint.marker.format);
+        newListItem.blocks.push(newParagraph);
+        listParent.blocks.splice(listIndex + 1, 0, newListItem);
+    };
+    var createNewListLevel = function (listItem) {
+        return listItem.levels.map(function (level) {
+            return (0, roosterjs_content_model_dom_1.createListLevel)(level.listType, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, level.format), { startNumberOverride: undefined }), level.dataset);
+        });
+    };
+    var createNewParagraph = function (insertPoint) {
+        var _a;
+        var paragraph = insertPoint.paragraph, marker = insertPoint.marker;
+        var newParagraph = (0, roosterjs_content_model_dom_1.createParagraph)(false /*isImplicit*/, paragraph.format, paragraph.segmentFormat);
+        var markerIndex = paragraph.segments.indexOf(marker);
+        var segments = paragraph.segments.splice(markerIndex, paragraph.segments.length - markerIndex);
+        (_a = newParagraph.segments).push.apply(_a, (0, tslib_1.__spreadArray)([], (0, tslib_1.__read)(segments), false));
+        (0, roosterjs_content_model_dom_1.setParagraphNotImplicit)(paragraph);
+        if (paragraph.segments.every(function (x) { return x.segmentType == 'SelectionMarker'; })) {
+            paragraph.segments.push((0, roosterjs_content_model_dom_1.createBr)(marker.format));
+        }
+        (0, roosterjs_content_model_dom_1.normalizeParagraph)(newParagraph);
+        return newParagraph;
+    };
+});
+//# sourceMappingURL=handleEnterOnList.js.map

package/lib-amd/edit/inputSteps/handleEnterOnList.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleEnterOnList.js","sourceRoot":"","sources":["../../../../../packages-content-model/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts"],"names":[],"mappings":"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","sourcesContent":["import { getClosestAncestorBlockGroupIndex } from 'roosterjs-content-model-core';\r\nimport {\r\n    createBr,\r\n    createListItem,\r\n    createListLevel,\r\n    createParagraph,\r\n    normalizeParagraph,\r\n    setParagraphNotImplicit,\r\n} from 'roosterjs-content-model-dom';\r\nimport type {\r\n    ContentModelBlockGroup,\r\n    ContentModelListItem,\r\n    DeleteSelectionStep,\r\n    InsertPoint,\r\n    ValidDeleteSelectionContext,\r\n} from 'roosterjs-content-model-types';\r\n\r\n/**\r\n * @internal\r\n */\r\nexport const handleEnterOnList: DeleteSelectionStep = context => {\r\n    if (\r\n        context.deleteResult == 'nothingToDelete' ||\r\n        context.deleteResult == 'notDeleted' ||\r\n        context.deleteResult == 'range'\r\n    ) {\r\n        const { insertPoint, formatContext } = context;\r\n        const { path } = insertPoint;\r\n        const rawEvent = formatContext?.rawEvent;\r\n        const index = getClosestAncestorBlockGroupIndex(path, ['ListItem'], ['TableCell']);\r\n\r\n        const listItem = path[index];\r\n\r\n        if (listItem && listItem.blockGroupType === 'ListItem') {\r\n            const listParent = path[index + 1];\r\n            if (isEmptyListItem(listItem)) {\r\n                listItem.levels.pop();\r\n            } else {\r\n                createNewListItem(context, listItem, listParent);\r\n            }\r\n            rawEvent?.preventDefault();\r\n            context.deleteResult = 'range';\r\n        }\r\n    }\r\n};\r\n\r\nconst isEmptyListItem = (listItem: ContentModelListItem) => {\r\n    return (\r\n        listItem.blocks.length === 1 &&\r\n        listItem.blocks[0].blockType === 'Paragraph' &&\r\n        listItem.blocks[0].segments.length === 2 &&\r\n        listItem.blocks[0].segments[0].segmentType === 'SelectionMarker' &&\r\n        listItem.blocks[0].segments[1].segmentType === 'Br'\r\n    );\r\n};\r\n\r\nconst createNewListItem = (\r\n    context: ValidDeleteSelectionContext,\r\n    listItem: ContentModelListItem,\r\n    listParent: ContentModelBlockGroup\r\n) => {\r\n    const { insertPoint } = context;\r\n    const listIndex = listParent.blocks.indexOf(listItem);\r\n    const newParagraph = createNewParagraph(insertPoint);\r\n    const levels = createNewListLevel(listItem);\r\n    const newListItem = createListItem(levels, insertPoint.marker.format);\r\n    newListItem.blocks.push(newParagraph);\r\n    listParent.blocks.splice(listIndex + 1, 0, newListItem);\r\n};\r\n\r\nconst createNewListLevel = (listItem: ContentModelListItem) => {\r\n    return listItem.levels.map(level => {\r\n        return createListLevel(\r\n            level.listType,\r\n            {\r\n                ...level.format,\r\n                startNumberOverride: undefined,\r\n            },\r\n            level.dataset\r\n        );\r\n    });\r\n};\r\n\r\nconst createNewParagraph = (insertPoint: InsertPoint) => {\r\n    const { paragraph, marker } = insertPoint;\r\n    const newParagraph = createParagraph(\r\n        false /*isImplicit*/,\r\n        paragraph.format,\r\n        paragraph.segmentFormat\r\n    );\r\n\r\n    const markerIndex = paragraph.segments.indexOf(marker);\r\n    const segments = paragraph.segments.splice(\r\n        markerIndex,\r\n        paragraph.segments.length - markerIndex\r\n    );\r\n\r\n    newParagraph.segments.push(...segments);\r\n\r\n    setParagraphNotImplicit(paragraph);\r\n\r\n    if (paragraph.segments.every(x => x.segmentType == 'SelectionMarker')) {\r\n        paragraph.segments.push(createBr(marker.format));\r\n    }\r\n\r\n    normalizeParagraph(newParagraph);\r\n    return newParagraph;\r\n};\r\n"]}

package/lib-amd/edit/keyboardDelete.d.ts

@@ -1,8 +1,9 @@
-import type { IStandaloneEditor } from 'roosterjs-content-model-types';
-/**
- * @internal
- * Do keyboard event handling for DELETE/BACKSPACE key
- * @param editor The Content Model Editor
- * @param rawEvent DOM keyboard event
- */
-export declare function keyboardDelete(editor: IStandaloneEditor, rawEvent: KeyboardEvent): true | undefined;
+import type { IStandaloneEditor } from 'roosterjs-content-model-types';
+/**
+ * @internal
+ * Do keyboard event handling for DELETE/BACKSPACE key
+ * @param editor The Content Model Editor
+ * @param rawEvent DOM keyboard event
+ * @returns True if the event is handled by content model, otherwise false
+ */
+export declare function keyboardDelete(editor: IStandaloneEditor, rawEvent: KeyboardEvent): boolean;

package/lib-amd/edit/keyboardDelete.js

@@ -1,70 +1,67 @@
-define(["require", "exports", "roosterjs-content-model-core", "./deleteSteps/deleteAllSegmentBefore", "./deleteSteps/deleteList", "roosterjs-content-model-dom", "./handleKeyboardEventCommon", "./deleteSteps/deleteWordSelection", "./deleteSteps/deleteCollapsedSelection"], function (require, exports, roosterjs_content_model_core_1, deleteAllSegmentBefore_1, deleteList_1, roosterjs_content_model_dom_1, handleKeyboardEventCommon_1, deleteWordSelection_1, deleteCollapsedSelection_1) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.keyboardDelete = void 0;
-    /**
-     * @internal
-     * Do keyboard event handling for DELETE/BACKSPACE key
-     * @param editor The Content Model Editor
-     * @param rawEvent DOM keyboard event
-     */
-    function keyboardDelete(editor, rawEvent) {
-        var selection = editor.getDOMSelection();
-        if (shouldDeleteWithContentModel(selection, rawEvent)) {
-            editor.formatContentModel(function (model, context) {
-                var result = (0, roosterjs_content_model_core_1.deleteSelection)(model, getDeleteSteps(rawEvent, !!editor.getEnvironment().isMac), context).deleteResult;
-                return (0, handleKeyboardEventCommon_1.handleKeyboardEventResult)(editor, model, rawEvent, result, context);
-            }, {
-                rawEvent: rawEvent,
-                changeSource: roosterjs_content_model_core_1.ChangeSource.Keyboard,
-                getChangeData: function () { return rawEvent.which; },
-                apiName: rawEvent.key == 'Delete' ? 'handleDeleteKey' : 'handleBackspaceKey',
-            });
-            return true;
-        }
-    }
-    exports.keyboardDelete = keyboardDelete;
-    function getDeleteSteps(rawEvent, isMac) {
-        var isForward = rawEvent.key == 'Delete';
-        var deleteAllSegmentBeforeStep = (0, handleKeyboardEventCommon_1.shouldDeleteAllSegmentsBefore)(rawEvent) && !isForward ? deleteAllSegmentBefore_1.deleteAllSegmentBefore : null;
-        var deleteWordSelection = (0, handleKeyboardEventCommon_1.shouldDeleteWord)(rawEvent, isMac)
-            ? isForward
-                ? deleteWordSelection_1.forwardDeleteWordSelection
-                : deleteWordSelection_1.backwardDeleteWordSelection
-            : null;
-        var deleteCollapsedSelection = isForward
-            ? deleteCollapsedSelection_1.forwardDeleteCollapsedSelection
-            : deleteCollapsedSelection_1.backwardDeleteCollapsedSelection;
-        var deleteListStep = !isForward ? deleteList_1.deleteList : null;
-        return [
-            deleteAllSegmentBeforeStep,
-            deleteWordSelection,
-            deleteCollapsedSelection,
-            deleteListStep,
-        ];
-    }
-    function shouldDeleteWithContentModel(selection, rawEvent) {
-        if (!selection) {
-            return false; // Nothing to delete
-        }
-        else if (selection.type != 'range' || !selection.range.collapsed) {
-            return true; // Selection is not collapsed, need to delete all selections
-        }
-        else {
-            var range = selection.range;
-            // When selection is collapsed and is in middle of text node, no need to use Content Model to delete
-            return !((0, roosterjs_content_model_dom_1.isNodeOfType)(range.startContainer, 'TEXT_NODE') &&
-                !(0, roosterjs_content_model_core_1.isModifierKey)(rawEvent) &&
-                (canDeleteBefore(rawEvent, range) || canDeleteAfter(rawEvent, range)));
-        }
-    }
-    function canDeleteBefore(rawEvent, range) {
-        return rawEvent.key == 'Backspace' && range.startOffset > 1;
-    }
-    function canDeleteAfter(rawEvent, range) {
-        var _a, _b;
-        return (rawEvent.key == 'Delete' &&
-            range.startOffset < ((_b = (_a = range.startContainer.nodeValue) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) - 1);
-    }
-});
+define(["require", "exports", "roosterjs-content-model-core", "./deleteSteps/deleteAllSegmentBefore", "./deleteSteps/deleteList", "roosterjs-content-model-dom", "./handleKeyboardEventCommon", "./deleteSteps/deleteWordSelection", "./deleteSteps/deleteCollapsedSelection"], function (require, exports, roosterjs_content_model_core_1, deleteAllSegmentBefore_1, deleteList_1, roosterjs_content_model_dom_1, handleKeyboardEventCommon_1, deleteWordSelection_1, deleteCollapsedSelection_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.keyboardDelete = void 0;
+    /**
+     * @internal
+     * Do keyboard event handling for DELETE/BACKSPACE key
+     * @param editor The Content Model Editor
+     * @param rawEvent DOM keyboard event
+     * @returns True if the event is handled by content model, otherwise false
+     */
+    function keyboardDelete(editor, rawEvent) {
+        var handled = false;
+        var selection = editor.getDOMSelection();
+        if (shouldDeleteWithContentModel(selection, rawEvent)) {
+            editor.formatContentModel(function (model, context) {
+                var result = (0, roosterjs_content_model_core_1.deleteSelection)(model, getDeleteSteps(rawEvent, !!editor.getEnvironment().isMac), context).deleteResult;
+                handled = (0, handleKeyboardEventCommon_1.handleKeyboardEventResult)(editor, model, rawEvent, result, context);
+                return handled;
+            }, {
+                rawEvent: rawEvent,
+                changeSource: roosterjs_content_model_core_1.ChangeSource.Keyboard,
+                getChangeData: function () { return rawEvent.which; },
+                apiName: rawEvent.key == 'Delete' ? 'handleDeleteKey' : 'handleBackspaceKey',
+            });
+        }
+        return handled;
+    }
+    exports.keyboardDelete = keyboardDelete;
+    function getDeleteSteps(rawEvent, isMac) {
+        var isForward = rawEvent.key == 'Delete';
+        var deleteAllSegmentBeforeStep = (0, handleKeyboardEventCommon_1.shouldDeleteAllSegmentsBefore)(rawEvent) && !isForward ? deleteAllSegmentBefore_1.deleteAllSegmentBefore : null;
+        var deleteWordSelection = (0, handleKeyboardEventCommon_1.shouldDeleteWord)(rawEvent, isMac)
+            ? isForward
+                ? deleteWordSelection_1.forwardDeleteWordSelection
+                : deleteWordSelection_1.backwardDeleteWordSelection
+            : null;
+        var deleteCollapsedSelection = isForward
+            ? deleteCollapsedSelection_1.forwardDeleteCollapsedSelection
+            : deleteCollapsedSelection_1.backwardDeleteCollapsedSelection;
+        return [deleteAllSegmentBeforeStep, deleteWordSelection, deleteCollapsedSelection, deleteList_1.deleteList];
+    }
+    function shouldDeleteWithContentModel(selection, rawEvent) {
+        if (!selection) {
+            return false; // Nothing to delete
+        }
+        else if (selection.type != 'range' || !selection.range.collapsed) {
+            return true; // Selection is not collapsed, need to delete all selections
+        }
+        else {
+            var range = selection.range;
+            // When selection is collapsed and is in middle of text node, no need to use Content Model to delete
+            return !((0, roosterjs_content_model_dom_1.isNodeOfType)(range.startContainer, 'TEXT_NODE') &&
+                !(0, roosterjs_content_model_core_1.isModifierKey)(rawEvent) &&
+                (canDeleteBefore(rawEvent, range) || canDeleteAfter(rawEvent, range)));
+        }
+    }
+    function canDeleteBefore(rawEvent, range) {
+        return rawEvent.key == 'Backspace' && range.startOffset > 1;
+    }
+    function canDeleteAfter(rawEvent, range) {
+        var _a, _b;
+        return (rawEvent.key == 'Delete' &&
+            range.startOffset < ((_b = (_a = range.startContainer.nodeValue) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) - 1);
+    }
+});
 //# sourceMappingURL=keyboardDelete.js.map

package/lib-amd/edit/keyboardDelete.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboardDelete.js","sourceRoot":"","sources":["../../../../packages-content-model/roosterjs-content-model-plugins/lib/edit/keyboardDelete.ts"],"names":[],"mappings":"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","sourcesContent":["import { ChangeSource, deleteSelection, isModifierKey } from 'roosterjs-content-model-core';\nimport { deleteAllSegmentBefore } from './deleteSteps/deleteAllSegmentBefore';\nimport { deleteList } from './deleteSteps/deleteList';\nimport { isNodeOfType } from 'roosterjs-content-model-dom';\nimport {\n    handleKeyboardEventResult,\n    shouldDeleteAllSegmentsBefore,\n    shouldDeleteWord,\n} from './handleKeyboardEventCommon';\nimport {\n    backwardDeleteWordSelection,\n    forwardDeleteWordSelection,\n} from './deleteSteps/deleteWordSelection';\nimport {\n    backwardDeleteCollapsedSelection,\n    forwardDeleteCollapsedSelection,\n} from './deleteSteps/deleteCollapsedSelection';\nimport type {\n    DOMSelection,\n    DeleteSelectionStep,\n    IStandaloneEditor,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n * Do keyboard event handling for DELETE/BACKSPACE key\n * @param editor The Content Model Editor\n * @param rawEvent DOM keyboard event\n */\nexport function keyboardDelete(editor: IStandaloneEditor, rawEvent: KeyboardEvent) {\n    const selection = editor.getDOMSelection();\n\n    if (shouldDeleteWithContentModel(selection, rawEvent)) {\n        editor.formatContentModel(\n            (model, context) => {\n                const result = deleteSelection(\n                    model,\n                    getDeleteSteps(rawEvent, !!editor.getEnvironment().isMac),\n                    context\n                ).deleteResult;\n\n                return handleKeyboardEventResult(editor, model, rawEvent, result, context);\n            },\n            {\n                rawEvent,\n                changeSource: ChangeSource.Keyboard,\n                getChangeData: () => rawEvent.which,\n                apiName: rawEvent.key == 'Delete' ? 'handleDeleteKey' : 'handleBackspaceKey',\n            }\n        );\n\n        return true;\n    }\n}\n\nfunction getDeleteSteps(rawEvent: KeyboardEvent, isMac: boolean): (DeleteSelectionStep | null)[] {\n    const isForward = rawEvent.key == 'Delete';\n    const deleteAllSegmentBeforeStep =\n        shouldDeleteAllSegmentsBefore(rawEvent) && !isForward ? deleteAllSegmentBefore : null;\n    const deleteWordSelection = shouldDeleteWord(rawEvent, isMac)\n        ? isForward\n            ? forwardDeleteWordSelection\n            : backwardDeleteWordSelection\n        : null;\n    const deleteCollapsedSelection = isForward\n        ? forwardDeleteCollapsedSelection\n        : backwardDeleteCollapsedSelection;\n    const deleteListStep = !isForward ? deleteList : null;\n    return [\n        deleteAllSegmentBeforeStep,\n        deleteWordSelection,\n        deleteCollapsedSelection,\n        deleteListStep,\n    ];\n}\n\nfunction shouldDeleteWithContentModel(selection: DOMSelection | null, rawEvent: KeyboardEvent) {\n    if (!selection) {\n        return false; // Nothing to delete\n    } else if (selection.type != 'range' || !selection.range.collapsed) {\n        return true; // Selection is not collapsed, need to delete all selections\n    } else {\n        const range = selection.range;\n\n        // When selection is collapsed and is in middle of text node, no need to use Content Model to delete\n        return !(\n            isNodeOfType(range.startContainer, 'TEXT_NODE') &&\n            !isModifierKey(rawEvent) &&\n            (canDeleteBefore(rawEvent, range) || canDeleteAfter(rawEvent, range))\n        );\n    }\n}\n\nfunction canDeleteBefore(rawEvent: KeyboardEvent, range: Range) {\n    return rawEvent.key == 'Backspace' && range.startOffset > 1;\n}\n\nfunction canDeleteAfter(rawEvent: KeyboardEvent, range: Range) {\n    return (\n        rawEvent.key == 'Delete' &&\n        range.startOffset < (range.startContainer.nodeValue?.length ?? 0) - 1\n    );\n}\n"]}
+{"version":3,"file":"keyboardDelete.js","sourceRoot":"","sources":["../../../../packages-content-model/roosterjs-content-model-plugins/lib/edit/keyboardDelete.ts"],"names":[],"mappings":"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","sourcesContent":["import { ChangeSource, deleteSelection, isModifierKey } from 'roosterjs-content-model-core';\r\nimport { deleteAllSegmentBefore } from './deleteSteps/deleteAllSegmentBefore';\r\nimport { deleteList } from './deleteSteps/deleteList';\r\nimport { isNodeOfType } from 'roosterjs-content-model-dom';\r\nimport {\r\n    handleKeyboardEventResult,\r\n    shouldDeleteAllSegmentsBefore,\r\n    shouldDeleteWord,\r\n} from './handleKeyboardEventCommon';\r\nimport {\r\n    backwardDeleteWordSelection,\r\n    forwardDeleteWordSelection,\r\n} from './deleteSteps/deleteWordSelection';\r\nimport {\r\n    backwardDeleteCollapsedSelection,\r\n    forwardDeleteCollapsedSelection,\r\n} from './deleteSteps/deleteCollapsedSelection';\r\nimport type {\r\n    DOMSelection,\r\n    DeleteSelectionStep,\r\n    IStandaloneEditor,\r\n} from 'roosterjs-content-model-types';\r\n\r\n/**\r\n * @internal\r\n * Do keyboard event handling for DELETE/BACKSPACE key\r\n * @param editor The Content Model Editor\r\n * @param rawEvent DOM keyboard event\r\n * @returns True if the event is handled by content model, otherwise false\r\n */\r\nexport function keyboardDelete(editor: IStandaloneEditor, rawEvent: KeyboardEvent) {\r\n    let handled = false;\r\n    const selection = editor.getDOMSelection();\r\n\r\n    if (shouldDeleteWithContentModel(selection, rawEvent)) {\r\n        editor.formatContentModel(\r\n            (model, context) => {\r\n                const result = deleteSelection(\r\n                    model,\r\n                    getDeleteSteps(rawEvent, !!editor.getEnvironment().isMac),\r\n                    context\r\n                ).deleteResult;\r\n\r\n                handled = handleKeyboardEventResult(editor, model, rawEvent, result, context);\r\n                return handled;\r\n            },\r\n            {\r\n                rawEvent,\r\n                changeSource: ChangeSource.Keyboard,\r\n                getChangeData: () => rawEvent.which,\r\n                apiName: rawEvent.key == 'Delete' ? 'handleDeleteKey' : 'handleBackspaceKey',\r\n            }\r\n        );\r\n    }\r\n\r\n    return handled;\r\n}\r\n\r\nfunction getDeleteSteps(rawEvent: KeyboardEvent, isMac: boolean): (DeleteSelectionStep | null)[] {\r\n    const isForward = rawEvent.key == 'Delete';\r\n    const deleteAllSegmentBeforeStep =\r\n        shouldDeleteAllSegmentsBefore(rawEvent) && !isForward ? deleteAllSegmentBefore : null;\r\n    const deleteWordSelection = shouldDeleteWord(rawEvent, isMac)\r\n        ? isForward\r\n            ? forwardDeleteWordSelection\r\n            : backwardDeleteWordSelection\r\n        : null;\r\n    const deleteCollapsedSelection = isForward\r\n        ? forwardDeleteCollapsedSelection\r\n        : backwardDeleteCollapsedSelection;\r\n    return [deleteAllSegmentBeforeStep, deleteWordSelection, deleteCollapsedSelection, deleteList];\r\n}\r\n\r\nfunction shouldDeleteWithContentModel(selection: DOMSelection | null, rawEvent: KeyboardEvent) {\r\n    if (!selection) {\r\n        return false; // Nothing to delete\r\n    } else if (selection.type != 'range' || !selection.range.collapsed) {\r\n        return true; // Selection is not collapsed, need to delete all selections\r\n    } else {\r\n        const range = selection.range;\r\n\r\n        // When selection is collapsed and is in middle of text node, no need to use Content Model to delete\r\n        return !(\r\n            isNodeOfType(range.startContainer, 'TEXT_NODE') &&\r\n            !isModifierKey(rawEvent) &&\r\n            (canDeleteBefore(rawEvent, range) || canDeleteAfter(rawEvent, range))\r\n        );\r\n    }\r\n}\r\n\r\nfunction canDeleteBefore(rawEvent: KeyboardEvent, range: Range) {\r\n    return rawEvent.key == 'Backspace' && range.startOffset > 1;\r\n}\r\n\r\nfunction canDeleteAfter(rawEvent: KeyboardEvent, range: Range) {\r\n    return (\r\n        rawEvent.key == 'Delete' &&\r\n        range.startOffset < (range.startContainer.nodeValue?.length ?? 0) - 1\r\n    );\r\n}\r\n"]}

package/lib-amd/edit/keyboardInput.d.ts

@@ -1,5 +1,5 @@
-import type { IStandaloneEditor } from 'roosterjs-content-model-types';
-/**
- * @internal
- */
-export declare function keyboardInput(editor: IStandaloneEditor, rawEvent: KeyboardEvent): true | undefined;
+import type { IStandaloneEditor } from 'roosterjs-content-model-types';
+/**
+ * @internal
+ */
+export declare function keyboardInput(editor: IStandaloneEditor, rawEvent: KeyboardEvent): true | undefined;

package/lib-amd/edit/keyboardInput.js

@@ -1,51 +1,58 @@
-define(["require", "exports", "roosterjs-content-model-core", "roosterjs-content-model-dom"], function (require, exports, roosterjs_content_model_core_1, roosterjs_content_model_dom_1) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.keyboardInput = void 0;
-    /**
-     * @internal
-     */
-    function keyboardInput(editor, rawEvent) {
-        var selection = editor.getDOMSelection();
-        if (shouldInputWithContentModel(selection, rawEvent, editor.isInIME())) {
-            editor.takeSnapshot();
-            editor.formatContentModel(function (model, context) {
-                var _a;
-                var result = (0, roosterjs_content_model_core_1.deleteSelection)(model, [], context);
-                // We have deleted selection then we will let browser to handle the input.
-                // With this combined operation, we don't wan to mass up the cached model so clear it
-                context.clearModelCache = true;
-                // Skip undo snapshot here and add undo snapshot before the operation so that we don't add another undo snapshot in middle of this replace operation
-                context.skipUndoSnapshot = true;
-                if (result.deleteResult == 'range') {
-                    // We have deleted something, next input should inherit the segment format from deleted content, so set pending format here
-                    context.newPendingFormat = (_a = result.insertPoint) === null || _a === void 0 ? void 0 : _a.marker.format;
-                    (0, roosterjs_content_model_dom_1.normalizeContentModel)(model);
-                    // Do not preventDefault since we still want browser to handle the final input for now
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            }, {
-                rawEvent: rawEvent,
-            });
-            return true;
-        }
-    }
-    exports.keyboardInput = keyboardInput;
-    function shouldInputWithContentModel(selection, rawEvent, isInIME) {
-        if (!selection) {
-            return false; // Nothing to delete
-        }
-        else if (!(0, roosterjs_content_model_core_1.isModifierKey)(rawEvent) &&
-            (rawEvent.key == 'Enter' || rawEvent.key == 'Space' || rawEvent.key.length == 1)) {
-            return (selection.type != 'range' ||
-                (!selection.range.collapsed && !rawEvent.isComposing && !isInIME)); // TODO: Also handle Enter key even selection is collapsed
-        }
-        else {
-            return false;
-        }
-    }
-});
+define(["require", "exports", "roosterjs-content-model-core", "./inputSteps/handleEnterOnList", "roosterjs-content-model-dom"], function (require, exports, roosterjs_content_model_core_1, handleEnterOnList_1, roosterjs_content_model_dom_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.keyboardInput = void 0;
+    /**
+     * @internal
+     */
+    function keyboardInput(editor, rawEvent) {
+        var selection = editor.getDOMSelection();
+        if (shouldInputWithContentModel(selection, rawEvent)) {
+            editor.takeSnapshot();
+            editor.formatContentModel(function (model, context) {
+                var _a;
+                var result = (0, roosterjs_content_model_core_1.deleteSelection)(model, getInputSteps(selection, rawEvent), context);
+                // We have deleted selection then we will let browser to handle the input.
+                // With this combined operation, we don't wan to mass up the cached model so clear it
+                context.clearModelCache = true;
+                // Skip undo snapshot here and add undo snapshot before the operation so that we don't add another undo snapshot in middle of this replace operation
+                context.skipUndoSnapshot = true;
+                if (result.deleteResult == 'range') {
+                    // We have deleted something, next input should inherit the segment format from deleted content, so set pending format here
+                    context.newPendingFormat = (_a = result.insertPoint) === null || _a === void 0 ? void 0 : _a.marker.format;
+                    (0, roosterjs_content_model_dom_1.normalizeContentModel)(model);
+                    // Do not preventDefault since we still want browser to handle the final input for now
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }, {
+                rawEvent: rawEvent,
+            });
+            return true;
+        }
+    }
+    exports.keyboardInput = keyboardInput;
+    function getInputSteps(selection, rawEvent) {
+        return shouldHandleEnterKey(selection, rawEvent) ? [handleEnterOnList_1.handleEnterOnList] : [];
+    }
+    function shouldInputWithContentModel(selection, rawEvent) {
+        if (!selection) {
+            return false; // Nothing to delete
+        }
+        else if (!(0, roosterjs_content_model_core_1.isModifierKey)(rawEvent) &&
+            (rawEvent.key == 'Enter' || rawEvent.key == 'Space' || rawEvent.key.length == 1)) {
+            return (selection.type != 'range' ||
+                !selection.range.collapsed ||
+                shouldHandleEnterKey(selection, rawEvent));
+        }
+        else {
+            return false;
+        }
+    }
+    var shouldHandleEnterKey = function (selection, rawEvent) {
+        return selection && selection.type == 'range' && rawEvent.key == 'Enter' && !rawEvent.shiftKey;
+    };
+});
 //# sourceMappingURL=keyboardInput.js.map

package/lib-amd/edit/keyboardInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboardInput.js","sourceRoot":"","sources":["../../../../packages-content-model/roosterjs-content-model-plugins/lib/edit/keyboardInput.ts"],"names":[],"mappings":";;;;IAIA;;OAEG;IACH,SAAgB,aAAa,CAAC,MAAyB,EAAE,QAAuB;QAC5E,IAAM,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAE3C,IAAI,2BAA2B,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE;YACpE,MAAM,CAAC,YAAY,EAAE,CAAC;YAEtB,MAAM,CAAC,kBAAkB,CACrB,UAAC,KAAK,EAAE,OAAO;;gBACX,IAAM,MAAM,GAAG,IAAA,8CAAe,EAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBAEnD,0EAA0E;gBAC1E,qFAAqF;gBACrF,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;gBAE/B,oJAAoJ;gBACpJ,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAEhC,IAAI,MAAM,CAAC,YAAY,IAAI,OAAO,EAAE;oBAChC,2HAA2H;oBAC3H,OAAO,CAAC,gBAAgB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,MAAM,CAAC,MAAM,CAAC;oBAE7D,IAAA,mDAAqB,EAAC,KAAK,CAAC,CAAC;oBAE7B,sFAAsF;oBACtF,OAAO,IAAI,CAAC;iBACf;qBAAM;oBACH,OAAO,KAAK,CAAC;iBAChB;YACL,CAAC,EACD;gBACI,QAAQ,UAAA;aACX,CACJ,CAAC;YAEF,OAAO,IAAI,CAAC;SACf;IACL,CAAC;IApCD,sCAoCC;IAED,SAAS,2BAA2B,CAChC,SAA8B,EAC9B,QAAuB,EACvB,OAAgB;QAEhB,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,KAAK,CAAC,CAAC,oBAAoB;SACrC;aAAM,IACH,CAAC,IAAA,4CAAa,EAAC,QAAQ,CAAC;YACxB,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,IAAI,QAAQ,CAAC,GAAG,IAAI,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,EAClF;YACE,OAAO,CACH,SAAS,CAAC,IAAI,IAAI,OAAO;gBACzB,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,CACpE,CAAC,CAAC,0DAA0D;SAChE;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC","sourcesContent":["import { deleteSelection, isModifierKey } from 'roosterjs-content-model-core';\nimport { normalizeContentModel } from 'roosterjs-content-model-dom';\nimport type { DOMSelection, IStandaloneEditor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function keyboardInput(editor: IStandaloneEditor, rawEvent: KeyboardEvent) {\n    const selection = editor.getDOMSelection();\n\n    if (shouldInputWithContentModel(selection, rawEvent, editor.isInIME())) {\n        editor.takeSnapshot();\n\n        editor.formatContentModel(\n            (model, context) => {\n                const result = deleteSelection(model, [], context);\n\n                // We have deleted selection then we will let browser to handle the input.\n                // With this combined operation, we don't wan to mass up the cached model so clear it\n                context.clearModelCache = true;\n\n                // Skip undo snapshot here and add undo snapshot before the operation so that we don't add another undo snapshot in middle of this replace operation\n                context.skipUndoSnapshot = true;\n\n                if (result.deleteResult == 'range') {\n                    // We have deleted something, next input should inherit the segment format from deleted content, so set pending format here\n                    context.newPendingFormat = result.insertPoint?.marker.format;\n\n                    normalizeContentModel(model);\n\n                    // Do not preventDefault since we still want browser to handle the final input for now\n                    return true;\n                } else {\n                    return false;\n                }\n            },\n            {\n                rawEvent,\n            }\n        );\n\n        return true;\n    }\n}\n\nfunction shouldInputWithContentModel(\n    selection: DOMSelection | null,\n    rawEvent: KeyboardEvent,\n    isInIME: boolean\n) {\n    if (!selection) {\n        return false; // Nothing to delete\n    } else if (\n        !isModifierKey(rawEvent) &&\n        (rawEvent.key == 'Enter' || rawEvent.key == 'Space' || rawEvent.key.length == 1)\n    ) {\n        return (\n            selection.type != 'range' ||\n            (!selection.range.collapsed && !rawEvent.isComposing && !isInIME)\n        ); // TODO: Also handle Enter key even selection is collapsed\n    } else {\n        return false;\n    }\n}\n"]}
+{"version":3,"file":"keyboardInput.js","sourceRoot":"","sources":["../../../../packages-content-model/roosterjs-content-model-plugins/lib/edit/keyboardInput.ts"],"names":[],"mappings":";;;;IAKA;;OAEG;IACH,SAAgB,aAAa,CAAC,MAAyB,EAAE,QAAuB;QAC5E,IAAM,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAE3C,IAAI,2BAA2B,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE;YAClD,MAAM,CAAC,YAAY,EAAE,CAAC;YAEtB,MAAM,CAAC,kBAAkB,CACrB,UAAC,KAAK,EAAE,OAAO;;gBACX,IAAM,MAAM,GAAG,IAAA,8CAAe,EAAC,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;gBAEnF,0EAA0E;gBAC1E,qFAAqF;gBACrF,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;gBAE/B,oJAAoJ;gBACpJ,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAEhC,IAAI,MAAM,CAAC,YAAY,IAAI,OAAO,EAAE;oBAChC,2HAA2H;oBAC3H,OAAO,CAAC,gBAAgB,GAAG,MAAA,MAAM,CAAC,WAAW,0CAAE,MAAM,CAAC,MAAM,CAAC;oBAE7D,IAAA,mDAAqB,EAAC,KAAK,CAAC,CAAC;oBAE7B,sFAAsF;oBACtF,OAAO,IAAI,CAAC;iBACf;qBAAM;oBACH,OAAO,KAAK,CAAC;iBAChB;YACL,CAAC,EACD;gBACI,QAAQ,UAAA;aACX,CACJ,CAAC;YAEF,OAAO,IAAI,CAAC;SACf;IACL,CAAC;IApCD,sCAoCC;IAED,SAAS,aAAa,CAAC,SAA8B,EAAE,QAAuB;QAC1E,OAAO,oBAAoB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAChF,CAAC;IAED,SAAS,2BAA2B,CAAC,SAA8B,EAAE,QAAuB;QACxF,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,KAAK,CAAC,CAAC,oBAAoB;SACrC;aAAM,IACH,CAAC,IAAA,4CAAa,EAAC,QAAQ,CAAC;YACxB,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,IAAI,QAAQ,CAAC,GAAG,IAAI,OAAO,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,EAClF;YACE,OAAO,CACH,SAAS,CAAC,IAAI,IAAI,OAAO;gBACzB,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS;gBAC1B,oBAAoB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAC5C,CAAC;SACL;aAAM;YACH,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED,IAAM,oBAAoB,GAAG,UAAC,SAA8B,EAAE,QAAuB;QACjF,OAAO,SAAS,IAAI,SAAS,CAAC,IAAI,IAAI,OAAO,IAAI,QAAQ,CAAC,GAAG,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACnG,CAAC,CAAC","sourcesContent":["import { deleteSelection, isModifierKey } from 'roosterjs-content-model-core';\r\nimport { handleEnterOnList } from './inputSteps/handleEnterOnList';\r\nimport { normalizeContentModel } from 'roosterjs-content-model-dom';\r\nimport type { DOMSelection, IStandaloneEditor } from 'roosterjs-content-model-types';\r\n\r\n/**\r\n * @internal\r\n */\r\nexport function keyboardInput(editor: IStandaloneEditor, rawEvent: KeyboardEvent) {\r\n    const selection = editor.getDOMSelection();\r\n\r\n    if (shouldInputWithContentModel(selection, rawEvent)) {\r\n        editor.takeSnapshot();\r\n\r\n        editor.formatContentModel(\r\n            (model, context) => {\r\n                const result = deleteSelection(model, getInputSteps(selection, rawEvent), context);\r\n\r\n                // We have deleted selection then we will let browser to handle the input.\r\n                // With this combined operation, we don't wan to mass up the cached model so clear it\r\n                context.clearModelCache = true;\r\n\r\n                // Skip undo snapshot here and add undo snapshot before the operation so that we don't add another undo snapshot in middle of this replace operation\r\n                context.skipUndoSnapshot = true;\r\n\r\n                if (result.deleteResult == 'range') {\r\n                    // We have deleted something, next input should inherit the segment format from deleted content, so set pending format here\r\n                    context.newPendingFormat = result.insertPoint?.marker.format;\r\n\r\n                    normalizeContentModel(model);\r\n\r\n                    // Do not preventDefault since we still want browser to handle the final input for now\r\n                    return true;\r\n                } else {\r\n                    return false;\r\n                }\r\n            },\r\n            {\r\n                rawEvent,\r\n            }\r\n        );\r\n\r\n        return true;\r\n    }\r\n}\r\n\r\nfunction getInputSteps(selection: DOMSelection | null, rawEvent: KeyboardEvent) {\r\n    return shouldHandleEnterKey(selection, rawEvent) ? [handleEnterOnList] : [];\r\n}\r\n\r\nfunction shouldInputWithContentModel(selection: DOMSelection | null, rawEvent: KeyboardEvent) {\r\n    if (!selection) {\r\n        return false; // Nothing to delete\r\n    } else if (\r\n        !isModifierKey(rawEvent) &&\r\n        (rawEvent.key == 'Enter' || rawEvent.key == 'Space' || rawEvent.key.length == 1)\r\n    ) {\r\n        return (\r\n            selection.type != 'range' ||\r\n            !selection.range.collapsed ||\r\n            shouldHandleEnterKey(selection, rawEvent)\r\n        );\r\n    } else {\r\n        return false;\r\n    }\r\n}\r\n\r\nconst shouldHandleEnterKey = (selection: DOMSelection | null, rawEvent: KeyboardEvent) => {\r\n    return selection && selection.type == 'range' && rawEvent.key == 'Enter' && !rawEvent.shiftKey;\r\n};\r\n"]}

package/lib-amd/edit/keyboardTab.d.ts

@@ -0,0 +1,5 @@
+import type { IStandaloneEditor } from 'roosterjs-content-model-types';
+/**
+ * @internal
+ */
+export declare function keyboardTab(editor: IStandaloneEditor, rawEvent: KeyboardEvent): true | undefined;

package/lib-amd/edit/keyboardTab.js

@@ -0,0 +1,35 @@
+define(["require", "exports", "roosterjs-content-model-core", "roosterjs-content-model-api"], function (require, exports, roosterjs_content_model_core_1, roosterjs_content_model_api_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.keyboardTab = void 0;
+    /**
+     * @internal
+     */
+    function keyboardTab(editor, rawEvent) {
+        var selection = editor.getDOMSelection();
+        if ((selection === null || selection === void 0 ? void 0 : selection.type) == 'range') {
+            editor.takeSnapshot();
+            editor.formatContentModel(function (model, _context) {
+                return handleTabOnList(model, rawEvent);
+            });
+            return true;
+        }
+    }
+    exports.keyboardTab = keyboardTab;
+    function isMarkerAtStartOfBlock(listItem) {
+        return (listItem.blocks[0].blockType == 'Paragraph' &&
+            listItem.blocks[0].segments[0].segmentType == 'SelectionMarker');
+    }
+    function handleTabOnList(model, rawEvent) {
+        var blocks = (0, roosterjs_content_model_core_1.getOperationalBlocks)(model, ['ListItem'], ['TableCell']);
+        var listItem = blocks[0].block;
+        if ((0, roosterjs_content_model_core_1.isBlockGroupOfType)(listItem, 'ListItem') &&
+            isMarkerAtStartOfBlock(listItem)) {
+            (0, roosterjs_content_model_api_1.setModelIndentation)(model, rawEvent.shiftKey ? 'outdent' : 'indent');
+            rawEvent.preventDefault();
+            return true;
+        }
+        return false;
+    }
+});
+//# sourceMappingURL=keyboardTab.js.map

package/lib-amd/edit/keyboardTab.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyboardTab.js","sourceRoot":"","sources":["../../../../packages-content-model/roosterjs-content-model-plugins/lib/edit/keyboardTab.ts"],"names":[],"mappings":";;;;IAQA;;OAEG;IACH,SAAgB,WAAW,CAAC,MAAyB,EAAE,QAAuB;QAC1E,IAAM,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAE3C,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,KAAI,OAAO,EAAE;YAC5B,MAAM,CAAC,YAAY,EAAE,CAAC;YAEtB,MAAM,CAAC,kBAAkB,CAAC,UAAC,KAAK,EAAE,QAAQ;gBACtC,OAAO,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;IAZD,kCAYC;IAED,SAAS,sBAAsB,CAAC,QAA8B;QAC1D,OAAO,CACH,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,WAAW;YAC3C,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,iBAAiB,CAClE,CAAC;IACN,CAAC;IAED,SAAS,eAAe,CAAC,KAA2B,EAAE,QAAuB;QACzE,IAAM,MAAM,GAAG,IAAA,mDAAoB,EAAuB,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAC9F,IAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAEjC,IACI,IAAA,iDAAkB,EAAuB,QAAQ,EAAE,UAAU,CAAC;YAC9D,sBAAsB,CAAC,QAAQ,CAAC,EAClC;YACE,IAAA,iDAAmB,EAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACrE,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC","sourcesContent":["import { getOperationalBlocks, isBlockGroupOfType } from 'roosterjs-content-model-core';\r\nimport { setModelIndentation } from 'roosterjs-content-model-api';\r\nimport type {\r\n    ContentModelDocument,\r\n    ContentModelListItem,\r\n    IStandaloneEditor,\r\n} from 'roosterjs-content-model-types';\r\n\r\n/**\r\n * @internal\r\n */\r\nexport function keyboardTab(editor: IStandaloneEditor, rawEvent: KeyboardEvent) {\r\n    const selection = editor.getDOMSelection();\r\n\r\n    if (selection?.type == 'range') {\r\n        editor.takeSnapshot();\r\n\r\n        editor.formatContentModel((model, _context) => {\r\n            return handleTabOnList(model, rawEvent);\r\n        });\r\n\r\n        return true;\r\n    }\r\n}\r\n\r\nfunction isMarkerAtStartOfBlock(listItem: ContentModelListItem) {\r\n    return (\r\n        listItem.blocks[0].blockType == 'Paragraph' &&\r\n        listItem.blocks[0].segments[0].segmentType == 'SelectionMarker'\r\n    );\r\n}\r\n\r\nfunction handleTabOnList(model: ContentModelDocument, rawEvent: KeyboardEvent) {\r\n    const blocks = getOperationalBlocks<ContentModelListItem>(model, ['ListItem'], ['TableCell']);\r\n    const listItem = blocks[0].block;\r\n\r\n    if (\r\n        isBlockGroupOfType<ContentModelListItem>(listItem, 'ListItem') &&\r\n        isMarkerAtStartOfBlock(listItem)\r\n    ) {\r\n        setModelIndentation(model, rawEvent.shiftKey ? 'outdent' : 'indent');\r\n        rawEvent.preventDefault();\r\n        return true;\r\n    }\r\n    return false;\r\n}\r\n"]}

package/lib-amd/edit/utils/getLeafSiblingBlock.d.ts

@@ -1,23 +1,23 @@
-import type { ContentModelBlock, ContentModelBlockGroup, ContentModelSegment } from 'roosterjs-content-model-types';
-/**
- * @internal
- */
-export declare type BlockAndPath = {
-    /**
-     * The sibling block
-     */
-    block: ContentModelBlock;
-    /**
-     * Path of this sibling block
-     */
-    path: ContentModelBlockGroup[];
-    /**
-     * If the input block is under a general segment, it is possible there are sibling segments under the same paragraph.
-     * Use this property to return the sibling sibling under the same paragraph
-     */
-    siblingSegment?: ContentModelSegment;
-};
-/**
- * @internal
- */
-export declare function getLeafSiblingBlock(path: ContentModelBlockGroup[], block: ContentModelBlock, isNext: boolean): BlockAndPath | null;
+import type { ContentModelBlock, ContentModelBlockGroup, ContentModelSegment } from 'roosterjs-content-model-types';
+/**
+ * @internal
+ */
+export declare type BlockAndPath = {
+    /**
+     * The sibling block
+     */
+    block: ContentModelBlock;
+    /**
+     * Path of this sibling block
+     */
+    path: ContentModelBlockGroup[];
+    /**
+     * If the input block is under a general segment, it is possible there are sibling segments under the same paragraph.
+     * Use this property to return the sibling sibling under the same paragraph
+     */
+    siblingSegment?: ContentModelSegment;
+};
+/**
+ * @internal
+ */
+export declare function getLeafSiblingBlock(path: ContentModelBlockGroup[], block: ContentModelBlock, isNext: boolean): BlockAndPath | null;