roosterjs-content-model-plugins 9.0.0 → 9.1.0

package/lib/autoFormat/AutoFormatPlugin.d.ts

@@ -19,6 +19,10 @@ export declare type AutoFormatOptions = {
      * When paste content, create hyperlink for the pasted link
      */
     autoLink: boolean;
+    /**
+     * Transform -- into hyphen, if typed between two words
+     */
+    autoHyphen: boolean;
 };
 /**
  * Auto Format plugin handles auto formatting, such as transforming * characters into a bullet list.
@@ -33,6 +37,7 @@ export declare class AutoFormatPlugin implements EditorPlugin {
      *  - autoNumbering: A boolean that enables or disables automatic numbering formatting. Defaults to false.
      *  - autoLink: A boolean that enables or disables automatic hyperlink creation when pasting or typing content. Defaults to false.
      *  - autoUnlink: A boolean that enables or disables automatic hyperlink removal when pressing backspace. Defaults to false.
+     *  - autoHyphen: A boolean that enables or disables automatic hyphen transformation. Defaults to false.
      */
     constructor(options?: AutoFormatOptions);
     /**

package/lib/autoFormat/AutoFormatPlugin.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoFormatPlugin = void 0;
 var createLink_1 = require("./link/createLink");
 var createLinkAfterSpace_1 = require("./link/createLinkAfterSpace");
+var roosterjs_content_model_api_1 = require("roosterjs-content-model-api");
 var keyboardListTrigger_1 = require("./list/keyboardListTrigger");
+var transformHyphen_1 = require("./hyphen/transformHyphen");
 var unlink_1 = require("./link/unlink");
 /**
  * @internal
@@ -13,6 +15,7 @@ var DefaultOptions = {
     autoNumbering: false,
     autoUnlink: false,
     autoLink: false,
+    autoHyphen: false,
 };
 /**
  * Auto Format plugin handles auto formatting, such as transforming * characters into a bullet list.
@@ -25,6 +28,7 @@ var AutoFormatPlugin = /** @class */ (function () {
      *  - autoNumbering: A boolean that enables or disables automatic numbering formatting. Defaults to false.
      *  - autoLink: A boolean that enables or disables automatic hyperlink creation when pasting or typing content. Defaults to false.
      *  - autoUnlink: A boolean that enables or disables automatic hyperlink removal when pressing backspace. Defaults to false.
+     *  - autoHyphen: A boolean that enables or disables automatic hyphen transformation. Defaults to false.
      */
     function AutoFormatPlugin(options) {
         if (options === void 0) { options = DefaultOptions; }
@@ -76,15 +80,29 @@ var AutoFormatPlugin = /** @class */ (function () {
         }
     };
     AutoFormatPlugin.prototype.handleEditorInputEvent = function (editor, event) {
+        var _this = this;
         var rawEvent = event.rawEvent;
-        if (rawEvent.inputType === 'insertText') {
+        var selection = editor.getDOMSelection();
+        if (rawEvent.inputType === 'insertText' &&
+            selection &&
+            selection.type === 'range' &&
+            selection.range.collapsed) {
             switch (rawEvent.data) {
                 case ' ':
-                    var _a = this.options, autoBullet = _a.autoBullet, autoNumbering = _a.autoNumbering, autoLink = _a.autoLink;
-                    (0, keyboardListTrigger_1.keyboardListTrigger)(editor, autoBullet, autoNumbering);
-                    if (autoLink) {
-                        (0, createLinkAfterSpace_1.createLinkAfterSpace)(editor);
-                    }
+                    (0, roosterjs_content_model_api_1.formatTextSegmentBeforeSelectionMarker)(editor, function (model, previousSegment, paragraph, _markerFormat, context) {
+                        var _a = _this.options, autoBullet = _a.autoBullet, autoNumbering = _a.autoNumbering, autoLink = _a.autoLink, autoHyphen = _a.autoHyphen;
+                        var shouldHyphen = false;
+                        var shouldLink = false;
+                        if (autoLink) {
+                            shouldLink = (0, createLinkAfterSpace_1.createLinkAfterSpace)(previousSegment, paragraph, context);
+                        }
+                        if (autoHyphen) {
+                            shouldHyphen = (0, transformHyphen_1.transformHyphen)(previousSegment, paragraph, context);
+                        }
+                        return ((0, keyboardListTrigger_1.keyboardListTrigger)(model, paragraph, context, autoBullet, autoNumbering) ||
+                            shouldHyphen ||
+                            shouldLink);
+                    });
                     break;
             }
         }

package/lib/autoFormat/AutoFormatPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"AutoFormatPlugin.js","sourceRoot":"","sources":["../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/AutoFormatPlugin.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAC/C,oEAAmE;AACnE,kEAAiE;AACjE,wCAAuC;AAmCvC;;GAEG;AACH,IAAM,cAAc,GAAgC;IAChD,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,KAAK;IACpB,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,KAAK;CAClB,CAAC;AAEF;;;GAGG;AACH;IAGI;;;;;;OAMG;IACH,0BAAoB,OAA2C;QAA3C,wBAAA,EAAA,wBAA2C;QAA3C,YAAO,GAAP,OAAO,CAAoC;QATvD,WAAM,GAAmB,IAAI,CAAC;IAS4B,CAAC;IAEnE;;OAEG;IACH,kCAAO,GAAP;QACI,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACH,qCAAU,GAAV,UAAW,MAAe;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,kCAAO,GAAP;QACI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,wCAAa,GAAb,UAAc,KAAkB;QAC5B,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,QAAQ,KAAK,CAAC,SAAS,EAAE;gBACrB,KAAK,OAAO;oBACR,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAChD,MAAM;gBACV,KAAK,SAAS;oBACV,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAC5C,MAAM;gBACV,KAAK,gBAAgB;oBACjB,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBACnD,MAAM;aACb;SACJ;IACL,CAAC;IAEO,iDAAsB,GAA9B,UAA+B,MAAe,EAAE,KAAuB;QACnE,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAI,QAAQ,CAAC,SAAS,KAAK,YAAY,EAAE;YACrC,QAAQ,QAAQ,CAAC,IAAI,EAAE;gBACnB,KAAK,GAAG;oBACE,IAAA,KAA0C,IAAI,CAAC,OAAO,EAApD,UAAU,gBAAA,EAAE,aAAa,mBAAA,EAAE,QAAQ,cAAiB,CAAC;oBAC7D,IAAA,yCAAmB,EAAC,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;oBACvD,IAAI,QAAQ,EAAE;wBACV,IAAA,2CAAoB,EAAC,MAAM,CAAC,CAAC;qBAChC;oBACD,MAAM;aACb;SACJ;IACL,CAAC;IAEO,6CAAkB,GAA1B,UAA2B,MAAe,EAAE,KAAmB;QAC3D,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;YAC3D,QAAQ,QAAQ,CAAC,GAAG,EAAE;gBAClB,KAAK,WAAW;oBACZ,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;wBACzB,IAAA,eAAM,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;qBAC5B;oBACD,MAAM;aACb;SACJ;IACL,CAAC;IAEO,oDAAyB,GAAjC,UAAkC,MAAe,EAAE,KAA0B;QACjE,IAAA,QAAQ,GAAK,IAAI,CAAC,OAAO,SAAjB,CAAkB;QAClC,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,IAAI,QAAQ,EAAE;YACrC,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;SACtB;IACL,CAAC;IACL,uBAAC;AAAD,CAAC,AA9FD,IA8FC;AA9FY,4CAAgB","sourcesContent":["import { createLink } from './link/createLink';\nimport { createLinkAfterSpace } from './link/createLinkAfterSpace';\nimport { keyboardListTrigger } from './list/keyboardListTrigger';\nimport { unlink } from './link/unlink';\nimport type {\n    ContentChangedEvent,\n    EditorInputEvent,\n    EditorPlugin,\n    IEditor,\n    KeyDownEvent,\n    PluginEvent,\n} from 'roosterjs-content-model-types';\n\n/**\n * Options to customize the Content Model Auto Format Plugin\n */\nexport type AutoFormatOptions = {\n    /**\n     * When true, after type *, ->, -, --, => , —, > and space key a type of bullet list will be triggered. @default true\n     */\n    autoBullet: boolean;\n\n    /**\n     * When true, after type 1, A, a, i, I followed by ., ), - or between () and space key a type of numbering list will be triggered. @default true\n     */\n    autoNumbering: boolean;\n\n    /**\n     * When press backspace before a link, remove the hyperlink\n     */\n    autoUnlink: boolean;\n\n    /**\n     * When paste content, create hyperlink for the pasted link\n     */\n    autoLink: boolean;\n};\n\n/**\n * @internal\n */\nconst DefaultOptions: Required<AutoFormatOptions> = {\n    autoBullet: false,\n    autoNumbering: false,\n    autoUnlink: false,\n    autoLink: false,\n};\n\n/**\n * Auto Format plugin handles auto formatting, such as transforming * characters into a bullet list.\n * It can be customized with options to enable or disable auto list features.\n */\nexport class AutoFormatPlugin implements EditorPlugin {\n    private editor: IEditor | null = null;\n\n    /**\n     * @param options An optional parameter that takes in an object of type AutoFormatOptions, which includes the following properties:\n     *  - autoBullet: A boolean that enables or disables automatic bullet list formatting. Defaults to false.\n     *  - autoNumbering: A boolean that enables or disables automatic numbering formatting. Defaults to false.\n     *  - autoLink: A boolean that enables or disables automatic hyperlink creation when pasting or typing content. Defaults to false.\n     *  - autoUnlink: A boolean that enables or disables automatic hyperlink removal when pressing backspace. Defaults to false.\n     */\n    constructor(private options: AutoFormatOptions = DefaultOptions) {}\n\n    /**\n     * Get name of this plugin\n     */\n    getName() {\n        return 'AutoFormat';\n    }\n\n    /**\n     * The first method that editor will call to a plugin when editor is initializing.\n     * It will pass in the editor instance, plugin should take this chance to save the\n     * editor reference so that it can call to any editor method or format API later.\n     * @param editor The editor object\n     */\n    initialize(editor: IEditor) {\n        this.editor = editor;\n    }\n\n    /**\n     * The last method that editor will call to a plugin before it is disposed.\n     * Plugin can take this chance to clear the reference to editor. After this method is\n     * called, plugin should not call to any editor method since it will result in error.\n     */\n    dispose() {\n        this.editor = null;\n    }\n\n    /**\n     * Core method for a plugin. Once an event happens in editor, editor will call this\n     * method of each plugin to handle the event as long as the event is not handled\n     * exclusively by another plugin.\n     * @param event The event to handle:\n     */\n    onPluginEvent(event: PluginEvent) {\n        if (this.editor) {\n            switch (event.eventType) {\n                case 'input':\n                    this.handleEditorInputEvent(this.editor, event);\n                    break;\n                case 'keyDown':\n                    this.handleKeyDownEvent(this.editor, event);\n                    break;\n                case 'contentChanged':\n                    this.handleContentChangedEvent(this.editor, event);\n                    break;\n            }\n        }\n    }\n\n    private handleEditorInputEvent(editor: IEditor, event: EditorInputEvent) {\n        const rawEvent = event.rawEvent;\n        if (rawEvent.inputType === 'insertText') {\n            switch (rawEvent.data) {\n                case ' ':\n                    const { autoBullet, autoNumbering, autoLink } = this.options;\n                    keyboardListTrigger(editor, autoBullet, autoNumbering);\n                    if (autoLink) {\n                        createLinkAfterSpace(editor);\n                    }\n                    break;\n            }\n        }\n    }\n\n    private handleKeyDownEvent(editor: IEditor, event: KeyDownEvent) {\n        const rawEvent = event.rawEvent;\n        if (!rawEvent.defaultPrevented && !event.handledByEditFeature) {\n            switch (rawEvent.key) {\n                case 'Backspace':\n                    if (this.options.autoUnlink) {\n                        unlink(editor, rawEvent);\n                    }\n                    break;\n            }\n        }\n    }\n\n    private handleContentChangedEvent(editor: IEditor, event: ContentChangedEvent) {\n        const { autoLink } = this.options;\n        if (event.source == 'Paste' && autoLink) {\n            createLink(editor);\n        }\n    }\n}\n"]}
+{"version":3,"file":"AutoFormatPlugin.js","sourceRoot":"","sources":["../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/AutoFormatPlugin.ts"],"names":[],"mappings":";;;AAAA,gDAA+C;AAC/C,oEAAmE;AACnE,2EAAqF;AACrF,kEAAiE;AACjE,4DAA2D;AAC3D,wCAAuC;AAwCvC;;GAEG;AACH,IAAM,cAAc,GAAgC;IAChD,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,KAAK;IACpB,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,KAAK;IACf,UAAU,EAAE,KAAK;CACpB,CAAC;AAEF;;;GAGG;AACH;IAEI;;;;;;;OAOG;IACH,0BAAoB,OAA2C;QAA3C,wBAAA,EAAA,wBAA2C;QAA3C,YAAO,GAAP,OAAO,CAAoC;QATvD,WAAM,GAAmB,IAAI,CAAC;IAS4B,CAAC;IAEnE;;OAEG;IACH,kCAAO,GAAP;QACI,OAAO,YAAY,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACH,qCAAU,GAAV,UAAW,MAAe;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,kCAAO,GAAP;QACI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACH,wCAAa,GAAb,UAAc,KAAkB;QAC5B,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,QAAQ,KAAK,CAAC,SAAS,EAAE;gBACrB,KAAK,OAAO;oBACR,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAChD,MAAM;gBACV,KAAK,SAAS;oBACV,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBAC5C,MAAM;gBACV,KAAK,gBAAgB;oBACjB,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBACnD,MAAM;aACb;SACJ;IACL,CAAC;IAEO,iDAAsB,GAA9B,UAA+B,MAAe,EAAE,KAAuB;QAAvE,iBAmDC;QAlDG,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAM,SAAS,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAC3C,IACI,QAAQ,CAAC,SAAS,KAAK,YAAY;YACnC,SAAS;YACT,SAAS,CAAC,IAAI,KAAK,OAAO;YAC1B,SAAS,CAAC,KAAK,CAAC,SAAS,EAC3B;YACE,QAAQ,QAAQ,CAAC,IAAI,EAAE;gBACnB,KAAK,GAAG;oBACJ,IAAA,oEAAsC,EAClC,MAAM,EACN,UAAC,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO;wBAChD,IAAA,KAKF,KAAI,CAAC,OAAO,EAJZ,UAAU,gBAAA,EACV,aAAa,mBAAA,EACb,QAAQ,cAAA,EACR,UAAU,gBACE,CAAC;wBACjB,IAAI,YAAY,GAAG,KAAK,CAAC;wBACzB,IAAI,UAAU,GAAG,KAAK,CAAC;wBAEvB,IAAI,QAAQ,EAAE;4BACV,UAAU,GAAG,IAAA,2CAAoB,EAC7B,eAAe,EACf,SAAS,EACT,OAAO,CACV,CAAC;yBACL;wBAED,IAAI,UAAU,EAAE;4BACZ,YAAY,GAAG,IAAA,iCAAe,EAAC,eAAe,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;yBACvE;wBAED,OAAO,CACH,IAAA,yCAAmB,EACf,KAAK,EACL,SAAS,EACT,OAAO,EACP,UAAU,EACV,aAAa,CAChB;4BACD,YAAY;4BACZ,UAAU,CACb,CAAC;oBACN,CAAC,CACJ,CAAC;oBACF,MAAM;aACb;SACJ;IACL,CAAC;IAEO,6CAAkB,GAA1B,UAA2B,MAAe,EAAE,KAAmB;QAC3D,IAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE;YAC3D,QAAQ,QAAQ,CAAC,GAAG,EAAE;gBAClB,KAAK,WAAW;oBACZ,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;wBACzB,IAAA,eAAM,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;qBAC5B;oBACD,MAAM;aACb;SACJ;IACL,CAAC;IAEO,oDAAyB,GAAjC,UAAkC,MAAe,EAAE,KAA0B;QACjE,IAAA,QAAQ,GAAK,IAAI,CAAC,OAAO,SAAjB,CAAkB;QAClC,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,IAAI,QAAQ,EAAE;YACrC,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;SACtB;IACL,CAAC;IACL,uBAAC;AAAD,CAAC,AApID,IAoIC;AApIY,4CAAgB","sourcesContent":["import { createLink } from './link/createLink';\nimport { createLinkAfterSpace } from './link/createLinkAfterSpace';\nimport { formatTextSegmentBeforeSelectionMarker } from 'roosterjs-content-model-api';\nimport { keyboardListTrigger } from './list/keyboardListTrigger';\nimport { transformHyphen } from './hyphen/transformHyphen';\nimport { unlink } from './link/unlink';\nimport type {\n    ContentChangedEvent,\n    EditorInputEvent,\n    EditorPlugin,\n    IEditor,\n    KeyDownEvent,\n    PluginEvent,\n} from 'roosterjs-content-model-types';\n\n/**\n * Options to customize the Content Model Auto Format Plugin\n */\nexport type AutoFormatOptions = {\n    /**\n     * When true, after type *, ->, -, --, => , —, > and space key a type of bullet list will be triggered. @default true\n     */\n    autoBullet: boolean;\n\n    /**\n     * When true, after type 1, A, a, i, I followed by ., ), - or between () and space key a type of numbering list will be triggered. @default true\n     */\n    autoNumbering: boolean;\n\n    /**\n     * When press backspace before a link, remove the hyperlink\n     */\n    autoUnlink: boolean;\n\n    /**\n     * When paste content, create hyperlink for the pasted link\n     */\n    autoLink: boolean;\n\n    /**\n     * Transform -- into hyphen, if typed between two words\n     */\n    autoHyphen: boolean;\n};\n\n/**\n * @internal\n */\nconst DefaultOptions: Required<AutoFormatOptions> = {\n    autoBullet: false,\n    autoNumbering: false,\n    autoUnlink: false,\n    autoLink: false,\n    autoHyphen: false,\n};\n\n/**\n * Auto Format plugin handles auto formatting, such as transforming * characters into a bullet list.\n * It can be customized with options to enable or disable auto list features.\n */\nexport class AutoFormatPlugin implements EditorPlugin {\n    private editor: IEditor | null = null;\n    /**\n     * @param options An optional parameter that takes in an object of type AutoFormatOptions, which includes the following properties:\n     *  - autoBullet: A boolean that enables or disables automatic bullet list formatting. Defaults to false.\n     *  - autoNumbering: A boolean that enables or disables automatic numbering formatting. Defaults to false.\n     *  - autoLink: A boolean that enables or disables automatic hyperlink creation when pasting or typing content. Defaults to false.\n     *  - autoUnlink: A boolean that enables or disables automatic hyperlink removal when pressing backspace. Defaults to false.\n     *  - autoHyphen: A boolean that enables or disables automatic hyphen transformation. Defaults to false.\n     */\n    constructor(private options: AutoFormatOptions = DefaultOptions) {}\n\n    /**\n     * Get name of this plugin\n     */\n    getName() {\n        return 'AutoFormat';\n    }\n\n    /**\n     * The first method that editor will call to a plugin when editor is initializing.\n     * It will pass in the editor instance, plugin should take this chance to save the\n     * editor reference so that it can call to any editor method or format API later.\n     * @param editor The editor object\n     */\n    initialize(editor: IEditor) {\n        this.editor = editor;\n    }\n\n    /**\n     * The last method that editor will call to a plugin before it is disposed.\n     * Plugin can take this chance to clear the reference to editor. After this method is\n     * called, plugin should not call to any editor method since it will result in error.\n     */\n    dispose() {\n        this.editor = null;\n    }\n\n    /**\n     * Core method for a plugin. Once an event happens in editor, editor will call this\n     * method of each plugin to handle the event as long as the event is not handled\n     * exclusively by another plugin.\n     * @param event The event to handle:\n     */\n    onPluginEvent(event: PluginEvent) {\n        if (this.editor) {\n            switch (event.eventType) {\n                case 'input':\n                    this.handleEditorInputEvent(this.editor, event);\n                    break;\n                case 'keyDown':\n                    this.handleKeyDownEvent(this.editor, event);\n                    break;\n                case 'contentChanged':\n                    this.handleContentChangedEvent(this.editor, event);\n                    break;\n            }\n        }\n    }\n\n    private handleEditorInputEvent(editor: IEditor, event: EditorInputEvent) {\n        const rawEvent = event.rawEvent;\n        const selection = editor.getDOMSelection();\n        if (\n            rawEvent.inputType === 'insertText' &&\n            selection &&\n            selection.type === 'range' &&\n            selection.range.collapsed\n        ) {\n            switch (rawEvent.data) {\n                case ' ':\n                    formatTextSegmentBeforeSelectionMarker(\n                        editor,\n                        (model, previousSegment, paragraph, _markerFormat, context) => {\n                            const {\n                                autoBullet,\n                                autoNumbering,\n                                autoLink,\n                                autoHyphen,\n                            } = this.options;\n                            let shouldHyphen = false;\n                            let shouldLink = false;\n\n                            if (autoLink) {\n                                shouldLink = createLinkAfterSpace(\n                                    previousSegment,\n                                    paragraph,\n                                    context\n                                );\n                            }\n\n                            if (autoHyphen) {\n                                shouldHyphen = transformHyphen(previousSegment, paragraph, context);\n                            }\n\n                            return (\n                                keyboardListTrigger(\n                                    model,\n                                    paragraph,\n                                    context,\n                                    autoBullet,\n                                    autoNumbering\n                                ) ||\n                                shouldHyphen ||\n                                shouldLink\n                            );\n                        }\n                    );\n                    break;\n            }\n        }\n    }\n\n    private handleKeyDownEvent(editor: IEditor, event: KeyDownEvent) {\n        const rawEvent = event.rawEvent;\n        if (!rawEvent.defaultPrevented && !event.handledByEditFeature) {\n            switch (rawEvent.key) {\n                case 'Backspace':\n                    if (this.options.autoUnlink) {\n                        unlink(editor, rawEvent);\n                    }\n                    break;\n            }\n        }\n    }\n\n    private handleContentChangedEvent(editor: IEditor, event: ContentChangedEvent) {\n        const { autoLink } = this.options;\n        if (event.source == 'Paste' && autoLink) {\n            createLink(editor);\n        }\n    }\n}\n"]}

package/lib/autoFormat/hyphen/transformHyphen.d.ts

@@ -0,0 +1,5 @@
+import type { ContentModelParagraph, ContentModelText, FormatContentModelContext } from 'roosterjs-content-model-types';
+/**
+ * @internal
+ */
+export declare function transformHyphen(previousSegment: ContentModelText, paragraph: ContentModelParagraph, context: FormatContentModelContext): boolean;

package/lib/autoFormat/hyphen/transformHyphen.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformHyphen = void 0;
+var splitTextSegment_1 = require("../../pluginUtils/splitTextSegment");
+/**
+ * @internal
+ */
+function transformHyphen(previousSegment, paragraph, context) {
+    var segments = previousSegment.text.split(' ');
+    var dashes = segments[segments.length - 2];
+    if (dashes === '--') {
+        var textIndex = previousSegment.text.lastIndexOf('--');
+        var textSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, textIndex, textIndex + 2);
+        textSegment.text = textSegment.text.replace('--', '—');
+        context.canUndoByBackspace = true;
+        return true;
+    }
+    else {
+        var text = segments.pop();
+        var hasDashes = text && (text === null || text === void 0 ? void 0 : text.indexOf('--')) > -1;
+        if (hasDashes && text.trim() !== '--') {
+            var textIndex = previousSegment.text.indexOf(text);
+            var textSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, textIndex, textIndex + text.length - 1);
+            var textLength = textSegment.text.length;
+            if (textSegment.text[0] !== '-' && textSegment.text[textLength - 1] !== '-') {
+                textSegment.text = textSegment.text.replace('--', '—');
+                context.canUndoByBackspace = true;
+                return true;
+            }
+        }
+    }
+    return false;
+}
+exports.transformHyphen = transformHyphen;
+//# sourceMappingURL=transformHyphen.js.map

package/lib/autoFormat/hyphen/transformHyphen.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transformHyphen.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/hyphen/transformHyphen.ts"],"names":[],"mappings":";;;AAAA,uEAAsE;AAOtE;;GAEG;AACH,SAAgB,eAAe,CAC3B,eAAiC,EACjC,SAAgC,EAChC,OAAkC;IAElC,IAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjD,IAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,IAAI,EAAE;QACjB,IAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzD,IAAM,WAAW,GAAG,IAAA,mCAAgB,EAAC,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;QAE3F,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAClC,OAAO,IAAI,CAAC;KACf;SAAM;QACH,IAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC5B,IAAM,SAAS,GAAG,IAAI,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,IAAI,CAAC,IAAG,CAAC,CAAC,CAAC;QACnD,IAAI,SAAS,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;YACnC,IAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrD,IAAM,WAAW,GAAG,IAAA,mCAAgB,EAChC,eAAe,EACf,SAAS,EACT,SAAS,EACT,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAC9B,CAAC;YAEF,IAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3C,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;gBACzE,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACvD,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAClC,OAAO,IAAI,CAAC;aACf;SACJ;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAnCD,0CAmCC","sourcesContent":["import { splitTextSegment } from '../../pluginUtils/splitTextSegment';\nimport type {\n    ContentModelParagraph,\n    ContentModelText,\n    FormatContentModelContext,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function transformHyphen(\n    previousSegment: ContentModelText,\n    paragraph: ContentModelParagraph,\n    context: FormatContentModelContext\n): boolean {\n    const segments = previousSegment.text.split(' ');\n    const dashes = segments[segments.length - 2];\n    if (dashes === '--') {\n        const textIndex = previousSegment.text.lastIndexOf('--');\n        const textSegment = splitTextSegment(previousSegment, paragraph, textIndex, textIndex + 2);\n\n        textSegment.text = textSegment.text.replace('--', '—');\n        context.canUndoByBackspace = true;\n        return true;\n    } else {\n        const text = segments.pop();\n        const hasDashes = text && text?.indexOf('--') > -1;\n        if (hasDashes && text.trim() !== '--') {\n            const textIndex = previousSegment.text.indexOf(text);\n            const textSegment = splitTextSegment(\n                previousSegment,\n                paragraph,\n                textIndex,\n                textIndex + text.length - 1\n            );\n\n            const textLength = textSegment.text.length;\n            if (textSegment.text[0] !== '-' && textSegment.text[textLength - 1] !== '-') {\n                textSegment.text = textSegment.text.replace('--', '—');\n                context.canUndoByBackspace = true;\n                return true;\n            }\n        }\n    }\n    return false;\n}\n"]}

package/lib/autoFormat/link/createLink.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLink = void 0;
 var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
-var getLinkSegment_1 = require("./getLinkSegment");
+var roosterjs_content_model_api_1 = require("roosterjs-content-model-api");
 /**
  * @internal
  */
 function createLink(editor) {
-    editor.formatContentModel(function (model) {
-        var link = (0, getLinkSegment_1.getLinkSegment)(model);
-        if (link && !link.link) {
-            (0, roosterjs_content_model_dom_1.addLink)(link, {
+    (0, roosterjs_content_model_api_1.formatTextSegmentBeforeSelectionMarker)(editor, function (_model, linkSegment, _paragraph) {
+        var linkData = null;
+        if (!linkSegment.link && (linkData = (0, roosterjs_content_model_api_1.matchLink)(linkSegment.text))) {
+            (0, roosterjs_content_model_dom_1.addLink)(linkSegment, {
                 format: {
-                    href: link.text,
+                    href: linkData.normalizedUrl,
                     underline: true,
                 },
                 dataset: {},

package/lib/autoFormat/link/createLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLink.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/link/createLink.ts"],"names":[],"mappings":";;;AAAA,2EAAsD;AACtD,mDAAkD;AAGlD;;GAEG;AACH,SAAgB,UAAU,CAAC,MAAe;IACtC,MAAM,CAAC,kBAAkB,CAAC,UAAA,KAAK;QAC3B,IAAM,IAAI,GAAG,IAAA,+BAAc,EAAC,KAAK,CAAC,CAAC;QACnC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACpB,IAAA,qCAAO,EAAC,IAAI,EAAE;gBACV,MAAM,EAAE;oBACJ,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,SAAS,EAAE,IAAI;iBAClB;gBACD,OAAO,EAAE,EAAE;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAfD,gCAeC","sourcesContent":["import { addLink } from 'roosterjs-content-model-dom';\nimport { getLinkSegment } from './getLinkSegment';\nimport type { IEditor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function createLink(editor: IEditor) {\n    editor.formatContentModel(model => {\n        const link = getLinkSegment(model);\n        if (link && !link.link) {\n            addLink(link, {\n                format: {\n                    href: link.text,\n                    underline: true,\n                },\n                dataset: {},\n            });\n            return true;\n        }\n        return false;\n    });\n}\n"]}
+{"version":3,"file":"createLink.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/link/createLink.ts"],"names":[],"mappings":";;;AAAA,2EAAsD;AACtD,2EAAgG;AAGhG;;GAEG;AACH,SAAgB,UAAU,CAAC,MAAe;IACtC,IAAA,oEAAsC,EAAC,MAAM,EAAE,UAAC,MAAM,EAAE,WAAW,EAAE,UAAU;QAC3E,IAAI,QAAQ,GAAoB,IAAI,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAA,uCAAS,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE;YAC/D,IAAA,qCAAO,EAAC,WAAW,EAAE;gBACjB,MAAM,EAAE;oBACJ,IAAI,EAAE,QAAQ,CAAC,aAAa;oBAC5B,SAAS,EAAE,IAAI;iBAClB;gBACD,OAAO,EAAE,EAAE;aACd,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAfD,gCAeC","sourcesContent":["import { addLink } from 'roosterjs-content-model-dom';\nimport { formatTextSegmentBeforeSelectionMarker, matchLink } from 'roosterjs-content-model-api';\nimport type { IEditor, LinkData } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function createLink(editor: IEditor) {\n    formatTextSegmentBeforeSelectionMarker(editor, (_model, linkSegment, _paragraph) => {\n        let linkData: LinkData | null = null;\n        if (!linkSegment.link && (linkData = matchLink(linkSegment.text))) {\n            addLink(linkSegment, {\n                format: {\n                    href: linkData.normalizedUrl,\n                    underline: true,\n                },\n                dataset: {},\n            });\n            return true;\n        }\n        return false;\n    });\n}\n"]}

package/lib/autoFormat/link/createLinkAfterSpace.d.ts

@@ -1,5 +1,5 @@
-import type { IEditor } from 'roosterjs-content-model-types';
+import type { ContentModelParagraph, ContentModelText, FormatContentModelContext } from 'roosterjs-content-model-types';
 /**
  * @internal
  */
-export declare function createLinkAfterSpace(editor: IEditor): void;
+export declare function createLinkAfterSpace(previousSegment: ContentModelText, paragraph: ContentModelParagraph, context: FormatContentModelContext): boolean;

package/lib/autoFormat/link/createLinkAfterSpace.js

@@ -1,45 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLinkAfterSpace = void 0;
-var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
 var roosterjs_content_model_api_1 = require("roosterjs-content-model-api");
 var splitTextSegment_1 = require("../../pluginUtils/splitTextSegment");
 /**
  * @internal
  */
-function createLinkAfterSpace(editor) {
-    editor.formatContentModel(function (model, context) {
-        var selectedSegmentsAndParagraphs = (0, roosterjs_content_model_dom_1.getSelectedSegmentsAndParagraphs)(model, false /* includingFormatHolder */);
-        if (selectedSegmentsAndParagraphs.length > 0 && selectedSegmentsAndParagraphs[0][1]) {
-            var markerIndex = selectedSegmentsAndParagraphs[0][1].segments.findIndex(function (segment) { return segment.segmentType == 'SelectionMarker'; });
-            var paragraph = selectedSegmentsAndParagraphs[0][1];
-            if (markerIndex > 0) {
-                var textSegment = paragraph.segments[markerIndex - 1];
-                var marker = paragraph.segments[markerIndex];
-                if (marker.segmentType == 'SelectionMarker' &&
-                    textSegment &&
-                    textSegment.segmentType == 'Text' &&
-                    !textSegment.link) {
-                    var link = textSegment.text.split(' ').pop();
-                    var url = link === null || link === void 0 ? void 0 : link.trim();
-                    var linkData = null;
-                    if (url && link && (linkData = (0, roosterjs_content_model_api_1.matchLink)(url))) {
-                        var linkSegment = (0, splitTextSegment_1.splitTextSegment)(textSegment, paragraph, textSegment.text.length - link.trimLeft().length, textSegment.text.trimRight().length);
-                        linkSegment.link = {
-                            format: {
-                                href: linkData.normalizedUrl,
-                                underline: true,
-                            },
-                            dataset: {},
-                        };
-                        context.canUndoByBackspace = true;
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    });
+function createLinkAfterSpace(previousSegment, paragraph, context) {
+    var link = previousSegment.text.split(' ').pop();
+    var url = link === null || link === void 0 ? void 0 : link.trim();
+    var linkData = null;
+    if (url && link && (linkData = (0, roosterjs_content_model_api_1.matchLink)(url))) {
+        var linkSegment = (0, splitTextSegment_1.splitTextSegment)(previousSegment, paragraph, previousSegment.text.length - link.trimLeft().length, previousSegment.text.trimRight().length);
+        linkSegment.link = {
+            format: {
+                href: linkData.normalizedUrl,
+                underline: true,
+            },
+            dataset: {},
+        };
+        context.canUndoByBackspace = true;
+        return true;
+    }
+    return false;
 }
 exports.createLinkAfterSpace = createLinkAfterSpace;
 //# sourceMappingURL=createLinkAfterSpace.js.map

package/lib/autoFormat/link/createLinkAfterSpace.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLinkAfterSpace.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/link/createLinkAfterSpace.ts"],"names":[],"mappings":";;;AAAA,2EAA+E;AAC/E,2EAAwD;AACxD,uEAAsE;AAGtE;;GAEG;AACH,SAAgB,oBAAoB,CAAC,MAAe;IAChD,MAAM,CAAC,kBAAkB,CAAC,UAAC,KAAK,EAAE,OAAO;QACrC,IAAM,6BAA6B,GAAG,IAAA,8DAAgC,EAClE,KAAK,EACL,KAAK,CAAC,2BAA2B,CACpC,CAAC;QACF,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,IAAI,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACjF,IAAM,WAAW,GAAG,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CACtE,UAAA,OAAO,IAAI,OAAA,OAAO,CAAC,WAAW,IAAI,iBAAiB,EAAxC,CAAwC,CACtD,CAAC;YACF,IAAM,SAAS,GAAG,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,IAAI,WAAW,GAAG,CAAC,EAAE;gBACjB,IAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;gBACxD,IAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC/C,IACI,MAAM,CAAC,WAAW,IAAI,iBAAiB;oBACvC,WAAW;oBACX,WAAW,CAAC,WAAW,IAAI,MAAM;oBACjC,CAAC,WAAW,CAAC,IAAI,EACnB;oBACE,IAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;oBAC/C,IAAM,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAE,CAAC;oBACzB,IAAI,QAAQ,GAAoB,IAAI,CAAC;oBACrC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAA,uCAAS,EAAC,GAAG,CAAC,CAAC,EAAE;wBAC5C,IAAM,WAAW,GAAG,IAAA,mCAAgB,EAChC,WAAW,EACX,SAAS,EACT,WAAW,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAChD,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CACtC,CAAC;wBACF,WAAW,CAAC,IAAI,GAAG;4BACf,MAAM,EAAE;gCACJ,IAAI,EAAE,QAAQ,CAAC,aAAa;gCAC5B,SAAS,EAAE,IAAI;6BAClB;4BACD,OAAO,EAAE,EAAE;yBACd,CAAC;wBAEF,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;wBAElC,OAAO,IAAI,CAAC;qBACf;iBACJ;aACJ;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAhDD,oDAgDC","sourcesContent":["import { getSelectedSegmentsAndParagraphs } from 'roosterjs-content-model-dom';\nimport { matchLink } from 'roosterjs-content-model-api';\nimport { splitTextSegment } from '../../pluginUtils/splitTextSegment';\nimport type { IEditor, LinkData } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function createLinkAfterSpace(editor: IEditor) {\n    editor.formatContentModel((model, context) => {\n        const selectedSegmentsAndParagraphs = getSelectedSegmentsAndParagraphs(\n            model,\n            false /* includingFormatHolder */\n        );\n        if (selectedSegmentsAndParagraphs.length > 0 && selectedSegmentsAndParagraphs[0][1]) {\n            const markerIndex = selectedSegmentsAndParagraphs[0][1].segments.findIndex(\n                segment => segment.segmentType == 'SelectionMarker'\n            );\n            const paragraph = selectedSegmentsAndParagraphs[0][1];\n            if (markerIndex > 0) {\n                const textSegment = paragraph.segments[markerIndex - 1];\n                const marker = paragraph.segments[markerIndex];\n                if (\n                    marker.segmentType == 'SelectionMarker' &&\n                    textSegment &&\n                    textSegment.segmentType == 'Text' &&\n                    !textSegment.link\n                ) {\n                    const link = textSegment.text.split(' ').pop();\n                    const url = link?.trim();\n                    let linkData: LinkData | null = null;\n                    if (url && link && (linkData = matchLink(url))) {\n                        const linkSegment = splitTextSegment(\n                            textSegment,\n                            paragraph,\n                            textSegment.text.length - link.trimLeft().length,\n                            textSegment.text.trimRight().length\n                        );\n                        linkSegment.link = {\n                            format: {\n                                href: linkData.normalizedUrl,\n                                underline: true,\n                            },\n                            dataset: {},\n                        };\n\n                        context.canUndoByBackspace = true;\n\n                        return true;\n                    }\n                }\n            }\n        }\n\n        return false;\n    });\n}\n"]}
+{"version":3,"file":"createLinkAfterSpace.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/link/createLinkAfterSpace.ts"],"names":[],"mappings":";;;AAAA,2EAAwD;AACxD,uEAAsE;AAQtE;;GAEG;AACH,SAAgB,oBAAoB,CAChC,eAAiC,EACjC,SAAgC,EAChC,OAAkC;IAElC,IAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACnD,IAAM,GAAG,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAE,CAAC;IACzB,IAAI,QAAQ,GAAoB,IAAI,CAAC;IACrC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAA,uCAAS,EAAC,GAAG,CAAC,CAAC,EAAE;QAC5C,IAAM,WAAW,GAAG,IAAA,mCAAgB,EAChC,eAAe,EACf,SAAS,EACT,eAAe,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EACpD,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,MAAM,CAC1C,CAAC;QACF,WAAW,CAAC,IAAI,GAAG;YACf,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ,CAAC,aAAa;gBAC5B,SAAS,EAAE,IAAI;aAClB;YACD,OAAO,EAAE,EAAE;SACd,CAAC;QAEF,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAElC,OAAO,IAAI,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AA5BD,oDA4BC","sourcesContent":["import { matchLink } from 'roosterjs-content-model-api';\nimport { splitTextSegment } from '../../pluginUtils/splitTextSegment';\nimport type {\n    ContentModelParagraph,\n    ContentModelText,\n    FormatContentModelContext,\n    LinkData,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function createLinkAfterSpace(\n    previousSegment: ContentModelText,\n    paragraph: ContentModelParagraph,\n    context: FormatContentModelContext\n) {\n    const link = previousSegment.text.split(' ').pop();\n    const url = link?.trim();\n    let linkData: LinkData | null = null;\n    if (url && link && (linkData = matchLink(url))) {\n        const linkSegment = splitTextSegment(\n            previousSegment,\n            paragraph,\n            previousSegment.text.length - link.trimLeft().length,\n            previousSegment.text.trimRight().length\n        );\n        linkSegment.link = {\n            format: {\n                href: linkData.normalizedUrl,\n                underline: true,\n            },\n            dataset: {},\n        };\n\n        context.canUndoByBackspace = true;\n\n        return true;\n    }\n    return false;\n}\n"]}

package/lib/autoFormat/link/unlink.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unlink = void 0;
-var getLinkSegment_1 = require("./getLinkSegment");
+var roosterjs_content_model_api_1 = require("roosterjs-content-model-api");
 /**
  * @internal
  */
 function unlink(editor, rawEvent) {
-    editor.formatContentModel(function (model) {
-        var link = (0, getLinkSegment_1.getLinkSegment)(model);
-        if (link === null || link === void 0 ? void 0 : link.link) {
-            link.link = undefined;
+    (0, roosterjs_content_model_api_1.formatTextSegmentBeforeSelectionMarker)(editor, function (_model, linkSegment, _paragraph) {
+        if (linkSegment === null || linkSegment === void 0 ? void 0 : linkSegment.link) {
+            linkSegment.link = undefined;
             rawEvent.preventDefault();
             return true;
         }

package/lib/autoFormat/link/unlink.js.map

@@ -1 +1 @@
-{"version":3,"file":"unlink.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/link/unlink.ts"],"names":[],"mappings":";;;AAAA,mDAAkD;AAGlD;;GAEG;AACH,SAAgB,MAAM,CAAC,MAAe,EAAE,QAAuB;IAC3D,MAAM,CAAC,kBAAkB,CAAC,UAAA,KAAK;QAC3B,IAAM,IAAI,GAAG,IAAA,+BAAc,EAAC,KAAK,CAAC,CAAC;QACnC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAE;YACZ,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;SACf;QAED,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAXD,wBAWC","sourcesContent":["import { getLinkSegment } from './getLinkSegment';\nimport type { IEditor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function unlink(editor: IEditor, rawEvent: KeyboardEvent) {\n    editor.formatContentModel(model => {\n        const link = getLinkSegment(model);\n        if (link?.link) {\n            link.link = undefined;\n            rawEvent.preventDefault();\n            return true;\n        }\n\n        return false;\n    });\n}\n"]}
+{"version":3,"file":"unlink.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/link/unlink.ts"],"names":[],"mappings":";;;AAAA,2EAAqF;AAIrF;;GAEG;AACH,SAAgB,MAAM,CAAC,MAAe,EAAE,QAAuB;IAC3D,IAAA,oEAAsC,EAAC,MAAM,EAAE,UAAC,MAAM,EAAE,WAAW,EAAE,UAAU;QAC3E,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE;YACnB,WAAW,CAAC,IAAI,GAAG,SAAS,CAAC;YAC7B,QAAQ,CAAC,cAAc,EAAE,CAAC;YAE1B,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAVD,wBAUC","sourcesContent":["import { formatTextSegmentBeforeSelectionMarker } from 'roosterjs-content-model-api';\n\nimport type { IEditor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function unlink(editor: IEditor, rawEvent: KeyboardEvent) {\n    formatTextSegmentBeforeSelectionMarker(editor, (_model, linkSegment, _paragraph) => {\n        if (linkSegment?.link) {\n            linkSegment.link = undefined;\n            rawEvent.preventDefault();\n\n            return true;\n        }\n        return false;\n    });\n}\n"]}

package/lib/autoFormat/list/getListTypeStyle.js

@@ -21,7 +21,7 @@ function getListTypeStyle(model, shouldSearchForBullet, shouldSearchForNumbering
         marker.segmentType == 'SelectionMarker' &&
         listMarkerSegment &&
         listMarkerSegment.segmentType == 'Text') {
-        var listMarker = listMarkerSegment.text;
+        var listMarker = listMarkerSegment.text.trim();
         var bulletType = bulletListType[listMarker];
         if (bulletType && shouldSearchForBullet) {
             return { listType: 'UL', styleType: bulletType };
@@ -84,7 +84,7 @@ var bulletListType = {
     '—': roosterjs_content_model_dom_1.BulletListType.Hyphen,
 };
 var isNewList = function (listMarker) {
-    var marker = listMarker.replace(/[^\w\s]/g, '').trim();
+    var marker = listMarker.replace(/[^\w\s]/g, '');
     var pattern = /^[1aAiI]$/;
     return pattern.test(marker);
 };

package/lib/autoFormat/list/getListTypeStyle.js.map

@@ -1 +1 @@
-{"version":3,"file":"getListTypeStyle.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/list/getListTypeStyle.ts"],"names":[],"mappings":";;;AAAA,2EAAwE;AACxE,iEAAgE;AAMhE,2EAMqC;AAWrC;;GAEG;AACH,SAAgB,gBAAgB,CAC5B,KAA2B,EAC3B,qBAAqC,EACrC,wBAAwC;IADxC,sCAAA,EAAA,4BAAqC;IACrC,yCAAA,EAAA,+BAAwC;IAExC,IAAM,6BAA6B,GAAG,IAAA,8DAAgC,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACpF,IAAI,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAAE;QACnC,OAAO,SAAS,CAAC;KACpB;IACD,IAAM,MAAM,GAAG,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,IAAM,SAAS,GAAG,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,IAAM,iBAAiB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEjD,IACI,MAAM;QACN,MAAM,CAAC,WAAW,IAAI,iBAAiB;QACvC,iBAAiB;QACjB,iBAAiB,CAAC,WAAW,IAAI,MAAM,EACzC;QACE,IAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC;QAC1C,IAAM,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;QAE9C,IAAI,UAAU,IAAI,qBAAqB,EAAE;YACrC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;SACpD;aAAM,IAAI,wBAAwB,EAAE;YACjC,IAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAC5D,IAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;YAChE,IAAM,iBAAiB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;YAC7D,IAAM,aAAa,GAAG,IAAA,6CAAqB,EACvC,UAAU,EACV,aAAa,EACb,iBAAiB,CACpB,CAAC;YAEF,IAAI,aAAa,EAAE;gBACf,OAAO;oBACH,QAAQ,EAAE,IAAI;oBACd,SAAS,EAAE,aAAa;oBACxB,KAAK,EACD,CAAC,SAAS,CAAC,UAAU,CAAC;wBACtB,iBAAiB,KAAK,aAAa;wBACnC,aAAa;wBACT,CAAC,CAAC,aAAa,GAAG,CAAC;wBACnB,CAAC,CAAC,SAAS;iBACtB,CAAC;aACL;SACJ;KACJ;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAjDD,4CAiDC;AAED,IAAM,oBAAoB,GAAG,UACzB,KAA2B,EAC3B,gBAAuC;IAEvC,OAAO,gBAAgB,CAAC,CAAC,CAAC,IAAA,uDAAyB,EAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;AACpG,CAAC,CAAC;AAEF,IAAM,oBAAoB,GAAG,UAAC,KAA2B,EAAE,SAAgC;IACvF,IAAM,MAAM,GAAG,IAAA,kDAAoB,EAC/B,KAAK,EACL,CAAC,UAAU,CAAC,EACZ,CAAC,WAAW,CAAC,CAChB,CAAC,CAAC,CAAC,CAAC;IACL,IAAI,QAAQ,GAAqC,SAAS,CAAC;IAC3D,IAAI,MAAM,EAAE;QACR,IAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE/D,IAAI,cAAc,GAAG,CAAC,CAAC,EAAE;YACrB,KAAK,IAAI,CAAC,GAAG,cAAc,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC1C,IAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACrC,IAAI,IAAA,gDAAkB,EAAuB,IAAI,EAAE,UAAU,CAAC,EAAE;oBAC5D,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM;iBACT;aACJ;SACJ;KACJ;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,IAAM,oBAAoB,GAAG,UAAC,IAA2B;;IACrD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE;QACzB,OAAO,MAAA,IAAA,gDAAkB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,0CAAE,gBAAgB,CAAC;KAC/D;AACL,CAAC,CAAC;AAEF,IAAM,cAAc,GAA2B;IAC3C,GAAG,EAAE,4CAAc,CAAC,IAAI;IACxB,GAAG,EAAE,4CAAc,CAAC,IAAI;IACxB,IAAI,EAAE,4CAAc,CAAC,MAAM;IAC3B,IAAI,EAAE,4CAAc,CAAC,SAAS;IAC9B,KAAK,EAAE,4CAAc,CAAC,eAAe;IACrC,IAAI,EAAE,4CAAc,CAAC,aAAa;IAClC,GAAG,EAAE,4CAAc,CAAC,UAAU;IAC9B,GAAG,EAAE,4CAAc,CAAC,MAAM;CAC7B,CAAC;AAEF,IAAM,SAAS,GAAG,UAAC,UAAkB;IACjC,IAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACzD,IAAM,OAAO,GAAG,WAAW,CAAC;IAC5B,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC","sourcesContent":["import { findListItemsInSameThread } from 'roosterjs-content-model-api';\nimport { getNumberingListStyle } from './getNumberingListStyle';\nimport type {\n    ContentModelDocument,\n    ContentModelListItem,\n    ContentModelParagraph,\n} from 'roosterjs-content-model-types';\nimport {\n    BulletListType,\n    isBlockGroupOfType,\n    updateListMetadata,\n    getOperationalBlocks,\n    getSelectedSegmentsAndParagraphs,\n} from 'roosterjs-content-model-dom';\n\n/**\n * @internal\n */\ninterface ListTypeStyle {\n    listType: 'UL' | 'OL';\n    styleType: number;\n    index?: number;\n}\n\n/**\n * @internal\n */\nexport function getListTypeStyle(\n    model: ContentModelDocument,\n    shouldSearchForBullet: boolean = true,\n    shouldSearchForNumbering: boolean = true\n): ListTypeStyle | undefined {\n    const selectedSegmentsAndParagraphs = getSelectedSegmentsAndParagraphs(model, true);\n    if (!selectedSegmentsAndParagraphs[0]) {\n        return undefined;\n    }\n    const marker = selectedSegmentsAndParagraphs[0][0];\n    const paragraph = selectedSegmentsAndParagraphs[0][1];\n    const listMarkerSegment = paragraph?.segments[0];\n\n    if (\n        marker &&\n        marker.segmentType == 'SelectionMarker' &&\n        listMarkerSegment &&\n        listMarkerSegment.segmentType == 'Text'\n    ) {\n        const listMarker = listMarkerSegment.text;\n        const bulletType = bulletListType[listMarker];\n\n        if (bulletType && shouldSearchForBullet) {\n            return { listType: 'UL', styleType: bulletType };\n        } else if (shouldSearchForNumbering) {\n            const previousList = getPreviousListLevel(model, paragraph);\n            const previousIndex = getPreviousListIndex(model, previousList);\n            const previousListStyle = getPreviousListStyle(previousList);\n            const numberingType = getNumberingListStyle(\n                listMarker,\n                previousIndex,\n                previousListStyle\n            );\n\n            if (numberingType) {\n                return {\n                    listType: 'OL',\n                    styleType: numberingType,\n                    index:\n                        !isNewList(listMarker) &&\n                        previousListStyle === numberingType &&\n                        previousIndex\n                            ? previousIndex + 1\n                            : undefined,\n                };\n            }\n        }\n    }\n    return undefined;\n}\n\nconst getPreviousListIndex = (\n    model: ContentModelDocument,\n    previousListItem?: ContentModelListItem\n) => {\n    return previousListItem ? findListItemsInSameThread(model, previousListItem).length : undefined;\n};\n\nconst getPreviousListLevel = (model: ContentModelDocument, paragraph: ContentModelParagraph) => {\n    const blocks = getOperationalBlocks<ContentModelListItem>(\n        model,\n        ['ListItem'],\n        ['TableCell']\n    )[0];\n    let listItem: ContentModelListItem | undefined = undefined;\n    if (blocks) {\n        const listBlockIndex = blocks.parent.blocks.indexOf(paragraph);\n\n        if (listBlockIndex > -1) {\n            for (let i = listBlockIndex - 1; i > -1; i--) {\n                const item = blocks.parent.blocks[i];\n                if (isBlockGroupOfType<ContentModelListItem>(item, 'ListItem')) {\n                    listItem = item;\n                    break;\n                }\n            }\n        }\n    }\n\n    return listItem;\n};\n\nconst getPreviousListStyle = (list?: ContentModelListItem) => {\n    if (list?.levels[0].dataset) {\n        return updateListMetadata(list.levels[0])?.orderedStyleType;\n    }\n};\n\nconst bulletListType: Record<string, number> = {\n    '*': BulletListType.Disc,\n    '-': BulletListType.Dash,\n    '--': BulletListType.Square,\n    '->': BulletListType.LongArrow,\n    '-->': BulletListType.DoubleLongArrow,\n    '=>': BulletListType.UnfilledArrow,\n    '>': BulletListType.ShortArrow,\n    '—': BulletListType.Hyphen,\n};\n\nconst isNewList = (listMarker: string) => {\n    const marker = listMarker.replace(/[^\\w\\s]/g, '').trim();\n    const pattern = /^[1aAiI]$/;\n    return pattern.test(marker);\n};\n"]}
+{"version":3,"file":"getListTypeStyle.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/list/getListTypeStyle.ts"],"names":[],"mappings":"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","sourcesContent":["import { findListItemsInSameThread } from 'roosterjs-content-model-api';\nimport { getNumberingListStyle } from './getNumberingListStyle';\nimport type {\n    ContentModelDocument,\n    ContentModelListItem,\n    ContentModelParagraph,\n} from 'roosterjs-content-model-types';\nimport {\n    BulletListType,\n    isBlockGroupOfType,\n    updateListMetadata,\n    getOperationalBlocks,\n    getSelectedSegmentsAndParagraphs,\n} from 'roosterjs-content-model-dom';\n\n/**\n * @internal\n */\ninterface ListTypeStyle {\n    listType: 'UL' | 'OL';\n    styleType: number;\n    index?: number;\n}\n\n/**\n * @internal\n */\nexport function getListTypeStyle(\n    model: ContentModelDocument,\n    shouldSearchForBullet: boolean = true,\n    shouldSearchForNumbering: boolean = true\n): ListTypeStyle | undefined {\n    const selectedSegmentsAndParagraphs = getSelectedSegmentsAndParagraphs(model, true);\n    if (!selectedSegmentsAndParagraphs[0]) {\n        return undefined;\n    }\n    const marker = selectedSegmentsAndParagraphs[0][0];\n    const paragraph = selectedSegmentsAndParagraphs[0][1];\n    const listMarkerSegment = paragraph?.segments[0];\n\n    if (\n        marker &&\n        marker.segmentType == 'SelectionMarker' &&\n        listMarkerSegment &&\n        listMarkerSegment.segmentType == 'Text'\n    ) {\n        const listMarker = listMarkerSegment.text.trim();\n        const bulletType = bulletListType[listMarker];\n\n        if (bulletType && shouldSearchForBullet) {\n            return { listType: 'UL', styleType: bulletType };\n        } else if (shouldSearchForNumbering) {\n            const previousList = getPreviousListLevel(model, paragraph);\n            const previousIndex = getPreviousListIndex(model, previousList);\n            const previousListStyle = getPreviousListStyle(previousList);\n            const numberingType = getNumberingListStyle(\n                listMarker,\n                previousIndex,\n                previousListStyle\n            );\n\n            if (numberingType) {\n                return {\n                    listType: 'OL',\n                    styleType: numberingType,\n                    index:\n                        !isNewList(listMarker) &&\n                        previousListStyle === numberingType &&\n                        previousIndex\n                            ? previousIndex + 1\n                            : undefined,\n                };\n            }\n        }\n    }\n    return undefined;\n}\n\nconst getPreviousListIndex = (\n    model: ContentModelDocument,\n    previousListItem?: ContentModelListItem\n) => {\n    return previousListItem ? findListItemsInSameThread(model, previousListItem).length : undefined;\n};\n\nconst getPreviousListLevel = (model: ContentModelDocument, paragraph: ContentModelParagraph) => {\n    const blocks = getOperationalBlocks<ContentModelListItem>(\n        model,\n        ['ListItem'],\n        ['TableCell']\n    )[0];\n    let listItem: ContentModelListItem | undefined = undefined;\n    if (blocks) {\n        const listBlockIndex = blocks.parent.blocks.indexOf(paragraph);\n\n        if (listBlockIndex > -1) {\n            for (let i = listBlockIndex - 1; i > -1; i--) {\n                const item = blocks.parent.blocks[i];\n                if (isBlockGroupOfType<ContentModelListItem>(item, 'ListItem')) {\n                    listItem = item;\n                    break;\n                }\n            }\n        }\n    }\n\n    return listItem;\n};\n\nconst getPreviousListStyle = (list?: ContentModelListItem) => {\n    if (list?.levels[0].dataset) {\n        return updateListMetadata(list.levels[0])?.orderedStyleType;\n    }\n};\n\nconst bulletListType: Record<string, number> = {\n    '*': BulletListType.Disc,\n    '-': BulletListType.Dash,\n    '--': BulletListType.Square,\n    '->': BulletListType.LongArrow,\n    '-->': BulletListType.DoubleLongArrow,\n    '=>': BulletListType.UnfilledArrow,\n    '>': BulletListType.ShortArrow,\n    '—': BulletListType.Hyphen,\n};\n\nconst isNewList = (listMarker: string) => {\n    const marker = listMarker.replace(/[^\\w\\s]/g, '');\n    const pattern = /^[1aAiI]$/;\n    return pattern.test(marker);\n};\n"]}

package/lib/autoFormat/list/keyboardListTrigger.d.ts

@@ -1,5 +1,5 @@
-import type { IEditor } from 'roosterjs-content-model-types';
+import type { ContentModelDocument, ContentModelParagraph, FormatContentModelContext } from 'roosterjs-content-model-types';
 /**
  * @internal
  */
-export declare function keyboardListTrigger(editor: IEditor, shouldSearchForBullet?: boolean, shouldSearchForNumbering?: boolean): void;
+export declare function keyboardListTrigger(model: ContentModelDocument, paragraph: ContentModelParagraph, context: FormatContentModelContext, shouldSearchForBullet?: boolean, shouldSearchForNumbering?: boolean): boolean;

package/lib/autoFormat/list/keyboardListTrigger.js

@@ -2,32 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keyboardListTrigger = void 0;
 var getListTypeStyle_1 = require("./getListTypeStyle");
-var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
 var roosterjs_content_model_api_1 = require("roosterjs-content-model-api");
 /**
  * @internal
  */
-function keyboardListTrigger(editor, shouldSearchForBullet, shouldSearchForNumbering) {
+function keyboardListTrigger(model, paragraph, context, shouldSearchForBullet, shouldSearchForNumbering) {
     if (shouldSearchForBullet === void 0) { shouldSearchForBullet = true; }
     if (shouldSearchForNumbering === void 0) { shouldSearchForNumbering = true; }
     if (shouldSearchForBullet || shouldSearchForNumbering) {
-        editor.formatContentModel(function (model, context) {
-            var listStyleType = (0, getListTypeStyle_1.getListTypeStyle)(model, shouldSearchForBullet, shouldSearchForNumbering);
-            if (listStyleType) {
-                var segmentsAndParagraphs = (0, roosterjs_content_model_dom_1.getSelectedSegmentsAndParagraphs)(model, false);
-                if (segmentsAndParagraphs[0] && segmentsAndParagraphs[0][1]) {
-                    segmentsAndParagraphs[0][1].segments.splice(0, 1);
-                }
-                var listType = listStyleType.listType, styleType = listStyleType.styleType, index = listStyleType.index;
-                triggerList(model, listType, styleType, index);
-                context.canUndoByBackspace = true;
-                return true;
-            }
-            return false;
-        }, {
-            apiName: 'autoToggleList',
-        });
+        var listStyleType = (0, getListTypeStyle_1.getListTypeStyle)(model, shouldSearchForBullet, shouldSearchForNumbering);
+        if (listStyleType) {
+            paragraph.segments.splice(0, 1);
+            var listType = listStyleType.listType, styleType = listStyleType.styleType, index = listStyleType.index;
+            triggerList(model, listType, styleType, index);
+            context.canUndoByBackspace = true;
+            return true;
+        }
     }
+    return false;
 }
 exports.keyboardListTrigger = keyboardListTrigger;
 var triggerList = function (model, listType, styleType, index) {

package/lib/autoFormat/list/keyboardListTrigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboardListTrigger.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/list/keyboardListTrigger.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AACtD,2EAA+E;AAC/E,2EAIqC;AAGrC;;GAEG;AACH,SAAgB,mBAAmB,CAC/B,MAAe,EACf,qBAAqC,EACrC,wBAAwC;IADxC,sCAAA,EAAA,4BAAqC;IACrC,yCAAA,EAAA,+BAAwC;IAExC,IAAI,qBAAqB,IAAI,wBAAwB,EAAE;QACnD,MAAM,CAAC,kBAAkB,CACrB,UAAC,KAAK,EAAE,OAAO;YACX,IAAM,aAAa,GAAG,IAAA,mCAAgB,EAClC,KAAK,EACL,qBAAqB,EACrB,wBAAwB,CAC3B,CAAC;YACF,IAAI,aAAa,EAAE;gBACf,IAAM,qBAAqB,GAAG,IAAA,8DAAgC,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAC7E,IAAI,qBAAqB,CAAC,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;oBACzD,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;iBACrD;gBACO,IAAA,QAAQ,GAAuB,aAAa,SAApC,EAAE,SAAS,GAAY,aAAa,UAAzB,EAAE,KAAK,GAAK,aAAa,MAAlB,CAAmB;gBACrD,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;gBAC/C,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAElC,OAAO,IAAI,CAAC;aACf;YAED,OAAO,KAAK,CAAC;QACjB,CAAC,EACD;YACI,OAAO,EAAE,gBAAgB;SAC5B,CACJ,CAAC;KACL;AACL,CAAC;AAhCD,kDAgCC;AAED,IAAM,WAAW,GAAG,UAChB,KAA2B,EAC3B,QAAqB,EACrB,SAAiB,EACjB,KAAc;IAEd,IAAA,yCAAW,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7B,IAAM,aAAa,GAAG,QAAQ,IAAI,IAAI,CAAC;IACvC,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,aAAa,EAAE;QACrC,IAAA,qDAAuB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KACzC;IACD,IAAA,+CAAiB,EACb,KAAK,EACL,aAAa;QACT,CAAC,CAAC;YACI,gBAAgB,EAAE,SAAS;SAC9B;QACH,CAAC,CAAC;YACI,kBAAkB,EAAE,SAAS;SAChC,CACV,CAAC;AACN,CAAC,CAAC","sourcesContent":["import { getListTypeStyle } from './getListTypeStyle';\nimport { getSelectedSegmentsAndParagraphs } from 'roosterjs-content-model-dom';\nimport {\n    setListType,\n    setModelListStartNumber,\n    setModelListStyle,\n} from 'roosterjs-content-model-api';\nimport type { ContentModelDocument, IEditor } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function keyboardListTrigger(\n    editor: IEditor,\n    shouldSearchForBullet: boolean = true,\n    shouldSearchForNumbering: boolean = true\n) {\n    if (shouldSearchForBullet || shouldSearchForNumbering) {\n        editor.formatContentModel(\n            (model, context) => {\n                const listStyleType = getListTypeStyle(\n                    model,\n                    shouldSearchForBullet,\n                    shouldSearchForNumbering\n                );\n                if (listStyleType) {\n                    const segmentsAndParagraphs = getSelectedSegmentsAndParagraphs(model, false);\n                    if (segmentsAndParagraphs[0] && segmentsAndParagraphs[0][1]) {\n                        segmentsAndParagraphs[0][1].segments.splice(0, 1);\n                    }\n                    const { listType, styleType, index } = listStyleType;\n                    triggerList(model, listType, styleType, index);\n                    context.canUndoByBackspace = true;\n\n                    return true;\n                }\n\n                return false;\n            },\n            {\n                apiName: 'autoToggleList',\n            }\n        );\n    }\n}\n\nconst triggerList = (\n    model: ContentModelDocument,\n    listType: 'OL' | 'UL',\n    styleType: number,\n    index?: number\n) => {\n    setListType(model, listType);\n    const isOrderedList = listType == 'OL';\n    if (index && index > 1 && isOrderedList) {\n        setModelListStartNumber(model, index);\n    }\n    setModelListStyle(\n        model,\n        isOrderedList\n            ? {\n                  orderedStyleType: styleType,\n              }\n            : {\n                  unorderedStyleType: styleType,\n              }\n    );\n};\n"]}
+{"version":3,"file":"keyboardListTrigger.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/autoFormat/list/keyboardListTrigger.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AACtD,2EAIqC;AAOrC;;GAEG;AACH,SAAgB,mBAAmB,CAC/B,KAA2B,EAC3B,SAAgC,EAChC,OAAkC,EAClC,qBAAqC,EACrC,wBAAwC;IADxC,sCAAA,EAAA,4BAAqC;IACrC,yCAAA,EAAA,+BAAwC;IAExC,IAAI,qBAAqB,IAAI,wBAAwB,EAAE;QACnD,IAAM,aAAa,GAAG,IAAA,mCAAgB,EAClC,KAAK,EACL,qBAAqB,EACrB,wBAAwB,CAC3B,CAAC;QACF,IAAI,aAAa,EAAE;YACf,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACxB,IAAA,QAAQ,GAAuB,aAAa,SAApC,EAAE,SAAS,GAAY,aAAa,UAAzB,EAAE,KAAK,GAAK,aAAa,MAAlB,CAAmB;YACrD,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YAC/C,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAElC,OAAO,IAAI,CAAC;SACf;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAvBD,kDAuBC;AAED,IAAM,WAAW,GAAG,UAChB,KAA2B,EAC3B,QAAqB,EACrB,SAAiB,EACjB,KAAc;IAEd,IAAA,yCAAW,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC7B,IAAM,aAAa,GAAG,QAAQ,IAAI,IAAI,CAAC;IACvC,IAAI,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,aAAa,EAAE;QACrC,IAAA,qDAAuB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;KACzC;IACD,IAAA,+CAAiB,EACb,KAAK,EACL,aAAa;QACT,CAAC,CAAC;YACI,gBAAgB,EAAE,SAAS;SAC9B;QACH,CAAC,CAAC;YACI,kBAAkB,EAAE,SAAS;SAChC,CACV,CAAC;AACN,CAAC,CAAC","sourcesContent":["import { getListTypeStyle } from './getListTypeStyle';\nimport {\n    setListType,\n    setModelListStartNumber,\n    setModelListStyle,\n} from 'roosterjs-content-model-api';\nimport type {\n    ContentModelDocument,\n    ContentModelParagraph,\n    FormatContentModelContext,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport function keyboardListTrigger(\n    model: ContentModelDocument,\n    paragraph: ContentModelParagraph,\n    context: FormatContentModelContext,\n    shouldSearchForBullet: boolean = true,\n    shouldSearchForNumbering: boolean = true\n) {\n    if (shouldSearchForBullet || shouldSearchForNumbering) {\n        const listStyleType = getListTypeStyle(\n            model,\n            shouldSearchForBullet,\n            shouldSearchForNumbering\n        );\n        if (listStyleType) {\n            paragraph.segments.splice(0, 1);\n            const { listType, styleType, index } = listStyleType;\n            triggerList(model, listType, styleType, index);\n            context.canUndoByBackspace = true;\n\n            return true;\n        }\n    }\n    return false;\n}\n\nconst triggerList = (\n    model: ContentModelDocument,\n    listType: 'OL' | 'UL',\n    styleType: number,\n    index?: number\n) => {\n    setListType(model, listType);\n    const isOrderedList = listType == 'OL';\n    if (index && index > 1 && isOrderedList) {\n        setModelListStartNumber(model, index);\n    }\n    setModelListStyle(\n        model,\n        isOrderedList\n            ? {\n                  orderedStyleType: styleType,\n              }\n            : {\n                  unorderedStyleType: styleType,\n              }\n    );\n};\n"]}

package/lib/edit/deleteSteps/deleteList.js

@@ -6,15 +6,21 @@ var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
  * @internal
  */
 var deleteList = function (context) {
+    if (context.deleteResult != 'notDeleted') {
+        return;
+    }
     var _a = context.insertPoint, paragraph = _a.paragraph, marker = _a.marker, path = _a.path;
-    if (context.deleteResult == 'nothingToDelete' || context.deleteResult == 'notDeleted') {
-        var index = (0, roosterjs_content_model_dom_1.getClosestAncestorBlockGroupIndex)(path, ['ListItem', 'TableCell']);
+    if (paragraph.segments[0] == marker) {
+        var index = (0, roosterjs_content_model_dom_1.getClosestAncestorBlockGroupIndex)(path, ['ListItem'], ['TableCell', 'FormatContainer']);
         var item = path[index];
-        if (item &&
-            index >= 0 &&
-            paragraph.segments[0] == marker &&
-            item.blockGroupType == 'ListItem') {
-            item.levels = [];
+        var lastLevel = item === null || item === void 0 ? void 0 : item.levels[item.levels.length - 1];
+        if (lastLevel && (item === null || item === void 0 ? void 0 : item.blocks[0]) == paragraph) {
+            if (lastLevel.format.displayForDummyItem == 'block') {
+                item.levels.pop();
+            }
+            else {
+                lastLevel.format.displayForDummyItem = 'block';
+            }
             context.deleteResult = 'range';
         }
     }

package/lib/edit/deleteSteps/deleteList.js.map

@@ -1 +1 @@
-{"version":3,"file":"deleteList.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/deleteList.ts"],"names":[],"mappings":";;;AAAA,2EAAgF;AAGhF;;GAEG;AACI,IAAM,UAAU,GAAwB,UAAA,OAAO;IAC5C,IAAA,KAA8B,OAAO,CAAC,WAAW,EAA/C,SAAS,eAAA,EAAE,MAAM,YAAA,EAAE,IAAI,UAAwB,CAAC;IAExD,IAAI,OAAO,CAAC,YAAY,IAAI,iBAAiB,IAAI,OAAO,CAAC,YAAY,IAAI,YAAY,EAAE;QACnF,IAAM,KAAK,GAAG,IAAA,+DAAiC,EAAC,IAAI,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;QACjF,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,IACI,IAAI;YACJ,KAAK,IAAI,CAAC;YACV,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM;YAC/B,IAAI,CAAC,cAAc,IAAI,UAAU,EACnC;YACE,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;YACjB,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;SAClC;KACJ;AACL,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["import { getClosestAncestorBlockGroupIndex } from 'roosterjs-content-model-dom';\nimport type { DeleteSelectionStep } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const deleteList: DeleteSelectionStep = context => {\n    const { paragraph, marker, path } = context.insertPoint;\n\n    if (context.deleteResult == 'nothingToDelete' || context.deleteResult == 'notDeleted') {\n        const index = getClosestAncestorBlockGroupIndex(path, ['ListItem', 'TableCell']);\n        const item = path[index];\n        if (\n            item &&\n            index >= 0 &&\n            paragraph.segments[0] == marker &&\n            item.blockGroupType == 'ListItem'\n        ) {\n            item.levels = [];\n            context.deleteResult = 'range';\n        }\n    }\n};\n"]}
+{"version":3,"file":"deleteList.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/deleteList.ts"],"names":[],"mappings":";;;AAAA,2EAAgF;AAGhF;;GAEG;AACI,IAAM,UAAU,GAAwB,UAAA,OAAO;IAClD,IAAI,OAAO,CAAC,YAAY,IAAI,YAAY,EAAE;QACtC,OAAO;KACV;IAEK,IAAA,KAA8B,OAAO,CAAC,WAAW,EAA/C,SAAS,eAAA,EAAE,MAAM,YAAA,EAAE,IAAI,UAAwB,CAAC;IAExD,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE;QACjC,IAAM,KAAK,GAAG,IAAA,+DAAiC,EAC3C,IAAI,EACJ,CAAC,UAAU,CAAC,EACZ,CAAC,WAAW,EAAE,iBAAiB,CAAC,CACnC,CAAC;QACF,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAqC,CAAC;QAC7D,IAAM,SAAS,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEvD,IAAI,SAAS,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC,CAAC,CAAC,KAAI,SAAS,EAAE;YAC3C,IAAI,SAAS,CAAC,MAAM,CAAC,mBAAmB,IAAI,OAAO,EAAE;gBACjD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;aACrB;iBAAM;gBACH,SAAS,CAAC,MAAM,CAAC,mBAAmB,GAAG,OAAO,CAAC;aAClD;YAED,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;SAClC;KACJ;AACL,CAAC,CAAC;AA1BW,QAAA,UAAU,cA0BrB","sourcesContent":["import { getClosestAncestorBlockGroupIndex } from 'roosterjs-content-model-dom';\nimport type { DeleteSelectionStep, ContentModelListItem } from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const deleteList: DeleteSelectionStep = context => {\n    if (context.deleteResult != 'notDeleted') {\n        return;\n    }\n\n    const { paragraph, marker, path } = context.insertPoint;\n\n    if (paragraph.segments[0] == marker) {\n        const index = getClosestAncestorBlockGroupIndex<ContentModelListItem>(\n            path,\n            ['ListItem'],\n            ['TableCell', 'FormatContainer']\n        );\n        const item = path[index] as ContentModelListItem | undefined;\n        const lastLevel = item?.levels[item.levels.length - 1];\n\n        if (lastLevel && item?.blocks[0] == paragraph) {\n            if (lastLevel.format.displayForDummyItem == 'block') {\n                item.levels.pop();\n            } else {\n                lastLevel.format.displayForDummyItem = 'block';\n            }\n\n            context.deleteResult = 'range';\n        }\n    }\n};\n"]}

package/lib/edit/inputSteps/handleEnterOnList.js

@@ -77,7 +77,7 @@ var createNewListItem = function (context, listItem, listParent) {
 };
 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);
+        return (0, roosterjs_content_model_dom_1.createListLevel)(level.listType, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, level.format), { startNumberOverride: undefined, displayForDummyItem: undefined }), level.dataset);
     });
 };
 var createNewParagraph = function (insertPoint) {

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

@@ -1 +1 @@
-{"version":3,"file":"handleEnterOnList.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts"],"names":[],"mappings":";;;;AAAA,2EAWqC;AASrC;;GAEG;AACI,IAAM,iBAAiB,GAAwB,UAAA,OAAO;IACjD,IAAA,YAAY,GAAK,OAAO,aAAZ,CAAa;IACjC,IACI,YAAY,IAAI,iBAAiB;QACjC,YAAY,IAAI,YAAY;QAC5B,YAAY,IAAI,OAAO,EACzB;QACU,IAAA,WAAW,GAAoB,OAAO,YAA3B,EAAE,aAAa,GAAK,OAAO,cAAZ,CAAa;QACvC,IAAA,IAAI,GAAK,WAAW,KAAhB,CAAiB;QAC7B,IAAM,QAAQ,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,QAAQ,CAAC;QACzC,IAAM,KAAK,GAAG,IAAA,+DAAiC,EAAC,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAEnF,IAAM,UAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAM,UAAU,GAAG,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAEnC,IAAI,UAAQ,IAAI,UAAQ,CAAC,cAAc,KAAK,UAAU,IAAI,UAAU,EAAE;YAClE,IAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAQ,CAAC,CAAC;YACtD,IAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;YACnD,IAAI,YAAY,IAAI,OAAO,IAAI,SAAS,EAAE;gBACtC,IAAA,mDAAqB,EAAC,UAAU,CAAC,CAAC;gBAClC,IAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;gBACtD,IACI,IAAA,gDAAkB,EAAuB,YAAY,EAAE,UAAU,CAAC;oBAClE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EACxB;oBACE,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,UAAC,KAAK,EAAE,KAAK;wBACrC,KAAK,CAAC,MAAM,CAAC,mBAAmB,GAAG,SAAS,CAAC;wBAC7C,KAAK,CAAC,OAAO,GAAG,UAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;4BAClC,CAAC,CAAC,UAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO;4BAChC,CAAC,CAAC,EAAE,CAAC;oBACb,CAAC,CAAC,CAAC;oBACH,IAAM,aAAa,GAAG,UAAQ,CAAC,MAAM,CAAC,UAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBAClE,IAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBAC7C,IACI,aAAa,CAAC,SAAS,KAAK,WAAW;wBACvC,aAAa,CAAC,SAAS,KAAK,WAAW;wBACvC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW;4BACjE,iBAAiB,EACvB;wBACE,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;wBAE7B,aAAa,CAAC,QAAQ,CAAC,OAAO,CAC1B,IAAA,mDAAqB,EAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CACnD,CAAC;qBACL;oBACD,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;iBACrC;aACJ;iBAAM,IAAI,YAAY,KAAK,OAAO,EAAE;gBACjC,IAAI,eAAe,CAAC,UAAQ,CAAC,EAAE;oBAC3B,UAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;iBACzB;qBAAM;oBACH,iBAAiB,CAAC,OAAO,EAAE,UAAQ,EAAE,UAAU,CAAC,CAAC;iBACpD;aACJ;YACD,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,cAAc,EAAE,CAAC;YAC3B,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC;SAClC;KACJ;AACL,CAAC,CAAC;AA1DW,QAAA,iBAAiB,qBA0D5B;AAEF,IAAM,eAAe,GAAG,UAAC,QAA8B;IACnD,OAAO,CACH,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAC5B,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,WAAW;QAC5C,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QACxC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,iBAAiB;QAChE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,IAAI,CACtD,CAAC;AACN,CAAC,CAAC;AAEF,IAAM,iBAAiB,GAAG,UACtB,OAAoC,EACpC,QAA8B,EAC9B,UAAkC;IAE1B,IAAA,WAAW,GAAK,OAAO,YAAZ,CAAa;IAChC,IAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtD,IAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAErD,IAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAM,WAAW,GAAG,IAAA,4CAAc,EAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtC,WAAW,CAAC,SAAS,GAAG,YAAY,CAAC;IACrC,OAAO,CAAC,aAAa,GAAG,YAAY,CAAC;IACrC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,IAAM,kBAAkB,GAAG,UAAC,QAA8B;IACtD,OAAO,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,UAAA,KAAK;QAC5B,OAAO,IAAA,6CAAe,EAClB,KAAK,CAAC,QAAQ,kDAEP,KAAK,CAAC,MAAM,KACf,mBAAmB,EAAE,SAAS,KAElC,KAAK,CAAC,OAAO,CAChB,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,IAAM,kBAAkB,GAAG,UAAC,WAAwB;;IACxC,IAAA,SAAS,GAAa,WAAW,UAAxB,EAAE,MAAM,GAAK,WAAW,OAAhB,CAAiB;IAC1C,IAAM,YAAY,GAAG,IAAA,6CAAe,EAChC,KAAK,CAAC,cAAc,EACpB,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,aAAa,CAC1B,CAAC;IAEF,IAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,IAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CACtC,WAAW,EACX,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAW,CAC1C,CAAC;IAEF,CAAA,KAAA,YAAY,CAAC,QAAQ,CAAA,CAAC,IAAI,8DAAI,QAAQ,WAAE;IAExC,IAAA,qDAAuB,EAAC,SAAS,CAAC,CAAC;IAEnC,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,WAAW,IAAI,iBAAiB,EAAlC,CAAkC,CAAC,EAAE;QACnE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,sCAAQ,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;KACpD;IAED,IAAA,gDAAkB,EAAC,YAAY,CAAC,CAAC;IAEjC,OAAO,YAAY,CAAC;AACxB,CAAC,CAAC","sourcesContent":["import {\n    createBr,\n    createListItem,\n    createListLevel,\n    createParagraph,\n    createSelectionMarker,\n    normalizeContentModel,\n    normalizeParagraph,\n    setParagraphNotImplicit,\n    getClosestAncestorBlockGroupIndex,\n    isBlockGroupOfType,\n} from 'roosterjs-content-model-dom';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelListItem,\n    DeleteSelectionStep,\n    InsertPoint,\n    ValidDeleteSelectionContext,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleEnterOnList: DeleteSelectionStep = context => {\n    const { deleteResult } = context;\n    if (\n        deleteResult == 'nothingToDelete' ||\n        deleteResult == 'notDeleted' ||\n        deleteResult == 'range'\n    ) {\n        const { insertPoint, formatContext } = context;\n        const { path } = insertPoint;\n        const rawEvent = formatContext?.rawEvent;\n        const index = getClosestAncestorBlockGroupIndex(path, ['ListItem'], ['TableCell']);\n\n        const listItem = path[index];\n        const listParent = path[index + 1];\n\n        if (listItem && listItem.blockGroupType === 'ListItem' && listParent) {\n            const listIndex = listParent.blocks.indexOf(listItem);\n            const nextBlock = listParent.blocks[listIndex + 1];\n            if (deleteResult == 'range' && nextBlock) {\n                normalizeContentModel(listParent);\n                const nextListItem = listParent.blocks[listIndex + 1];\n                if (\n                    isBlockGroupOfType<ContentModelListItem>(nextListItem, 'ListItem') &&\n                    nextListItem.levels[0]\n                ) {\n                    nextListItem.levels.forEach((level, index) => {\n                        level.format.startNumberOverride = undefined;\n                        level.dataset = listItem.levels[index]\n                            ? listItem.levels[index].dataset\n                            : {};\n                    });\n                    const lastParagraph = listItem.blocks[listItem.blocks.length - 1];\n                    const nextParagraph = nextListItem.blocks[0];\n                    if (\n                        nextParagraph.blockType === 'Paragraph' &&\n                        lastParagraph.blockType === 'Paragraph' &&\n                        lastParagraph.segments[lastParagraph.segments.length - 1].segmentType ===\n                            'SelectionMarker'\n                    ) {\n                        lastParagraph.segments.pop();\n\n                        nextParagraph.segments.unshift(\n                            createSelectionMarker(insertPoint.marker.format)\n                        );\n                    }\n                    context.lastParagraph = undefined;\n                }\n            } else if (deleteResult !== 'range') {\n                if (isEmptyListItem(listItem)) {\n                    listItem.levels.pop();\n                } else {\n                    createNewListItem(context, listItem, listParent);\n                }\n            }\n            rawEvent?.preventDefault();\n            context.deleteResult = 'range';\n        }\n    }\n};\n\nconst isEmptyListItem = (listItem: ContentModelListItem) => {\n    return (\n        listItem.blocks.length === 1 &&\n        listItem.blocks[0].blockType === 'Paragraph' &&\n        listItem.blocks[0].segments.length === 2 &&\n        listItem.blocks[0].segments[0].segmentType === 'SelectionMarker' &&\n        listItem.blocks[0].segments[1].segmentType === 'Br'\n    );\n};\n\nconst createNewListItem = (\n    context: ValidDeleteSelectionContext,\n    listItem: ContentModelListItem,\n    listParent: ContentModelBlockGroup\n) => {\n    const { insertPoint } = context;\n    const listIndex = listParent.blocks.indexOf(listItem);\n    const newParagraph = createNewParagraph(insertPoint);\n\n    const levels = createNewListLevel(listItem);\n    const newListItem = createListItem(levels, insertPoint.marker.format);\n    newListItem.blocks.push(newParagraph);\n    insertPoint.paragraph = newParagraph;\n    context.lastParagraph = newParagraph;\n    listParent.blocks.splice(listIndex + 1, 0, newListItem);\n};\n\nconst createNewListLevel = (listItem: ContentModelListItem) => {\n    return listItem.levels.map(level => {\n        return createListLevel(\n            level.listType,\n            {\n                ...level.format,\n                startNumberOverride: undefined,\n            },\n            level.dataset\n        );\n    });\n};\n\nconst createNewParagraph = (insertPoint: InsertPoint) => {\n    const { paragraph, marker } = insertPoint;\n    const newParagraph = createParagraph(\n        false /*isImplicit*/,\n        paragraph.format,\n        paragraph.segmentFormat\n    );\n\n    const markerIndex = paragraph.segments.indexOf(marker);\n    const segments = paragraph.segments.splice(\n        markerIndex,\n        paragraph.segments.length - markerIndex\n    );\n\n    newParagraph.segments.push(...segments);\n\n    setParagraphNotImplicit(paragraph);\n\n    if (paragraph.segments.every(x => x.segmentType == 'SelectionMarker')) {\n        paragraph.segments.push(createBr(marker.format));\n    }\n\n    normalizeParagraph(newParagraph);\n\n    return newParagraph;\n};\n"]}
+{"version":3,"file":"handleEnterOnList.js","sourceRoot":"","sources":["../../../../../packages/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    createBr,\n    createListItem,\n    createListLevel,\n    createParagraph,\n    createSelectionMarker,\n    normalizeContentModel,\n    normalizeParagraph,\n    setParagraphNotImplicit,\n    getClosestAncestorBlockGroupIndex,\n    isBlockGroupOfType,\n} from 'roosterjs-content-model-dom';\nimport type {\n    ContentModelBlockGroup,\n    ContentModelListItem,\n    DeleteSelectionStep,\n    InsertPoint,\n    ValidDeleteSelectionContext,\n} from 'roosterjs-content-model-types';\n\n/**\n * @internal\n */\nexport const handleEnterOnList: DeleteSelectionStep = context => {\n    const { deleteResult } = context;\n    if (\n        deleteResult == 'nothingToDelete' ||\n        deleteResult == 'notDeleted' ||\n        deleteResult == 'range'\n    ) {\n        const { insertPoint, formatContext } = context;\n        const { path } = insertPoint;\n        const rawEvent = formatContext?.rawEvent;\n        const index = getClosestAncestorBlockGroupIndex(path, ['ListItem'], ['TableCell']);\n\n        const listItem = path[index];\n        const listParent = path[index + 1];\n\n        if (listItem && listItem.blockGroupType === 'ListItem' && listParent) {\n            const listIndex = listParent.blocks.indexOf(listItem);\n            const nextBlock = listParent.blocks[listIndex + 1];\n            if (deleteResult == 'range' && nextBlock) {\n                normalizeContentModel(listParent);\n                const nextListItem = listParent.blocks[listIndex + 1];\n                if (\n                    isBlockGroupOfType<ContentModelListItem>(nextListItem, 'ListItem') &&\n                    nextListItem.levels[0]\n                ) {\n                    nextListItem.levels.forEach((level, index) => {\n                        level.format.startNumberOverride = undefined;\n                        level.dataset = listItem.levels[index]\n                            ? listItem.levels[index].dataset\n                            : {};\n                    });\n                    const lastParagraph = listItem.blocks[listItem.blocks.length - 1];\n                    const nextParagraph = nextListItem.blocks[0];\n                    if (\n                        nextParagraph.blockType === 'Paragraph' &&\n                        lastParagraph.blockType === 'Paragraph' &&\n                        lastParagraph.segments[lastParagraph.segments.length - 1].segmentType ===\n                            'SelectionMarker'\n                    ) {\n                        lastParagraph.segments.pop();\n\n                        nextParagraph.segments.unshift(\n                            createSelectionMarker(insertPoint.marker.format)\n                        );\n                    }\n                    context.lastParagraph = undefined;\n                }\n            } else if (deleteResult !== 'range') {\n                if (isEmptyListItem(listItem)) {\n                    listItem.levels.pop();\n                } else {\n                    createNewListItem(context, listItem, listParent);\n                }\n            }\n            rawEvent?.preventDefault();\n            context.deleteResult = 'range';\n        }\n    }\n};\n\nconst isEmptyListItem = (listItem: ContentModelListItem) => {\n    return (\n        listItem.blocks.length === 1 &&\n        listItem.blocks[0].blockType === 'Paragraph' &&\n        listItem.blocks[0].segments.length === 2 &&\n        listItem.blocks[0].segments[0].segmentType === 'SelectionMarker' &&\n        listItem.blocks[0].segments[1].segmentType === 'Br'\n    );\n};\n\nconst createNewListItem = (\n    context: ValidDeleteSelectionContext,\n    listItem: ContentModelListItem,\n    listParent: ContentModelBlockGroup\n) => {\n    const { insertPoint } = context;\n    const listIndex = listParent.blocks.indexOf(listItem);\n    const newParagraph = createNewParagraph(insertPoint);\n\n    const levels = createNewListLevel(listItem);\n    const newListItem = createListItem(levels, insertPoint.marker.format);\n    newListItem.blocks.push(newParagraph);\n    insertPoint.paragraph = newParagraph;\n    context.lastParagraph = newParagraph;\n    listParent.blocks.splice(listIndex + 1, 0, newListItem);\n};\n\nconst createNewListLevel = (listItem: ContentModelListItem) => {\n    return listItem.levels.map(level => {\n        return createListLevel(\n            level.listType,\n            {\n                ...level.format,\n                startNumberOverride: undefined,\n                displayForDummyItem: undefined, // When ENTER, we should create a new regular list item, so force its dummy item display to undefined\n            },\n            level.dataset\n        );\n    });\n};\n\nconst createNewParagraph = (insertPoint: InsertPoint) => {\n    const { paragraph, marker } = insertPoint;\n    const newParagraph = createParagraph(\n        false /*isImplicit*/,\n        paragraph.format,\n        paragraph.segmentFormat\n    );\n\n    const markerIndex = paragraph.segments.indexOf(marker);\n    const segments = paragraph.segments.splice(\n        markerIndex,\n        paragraph.segments.length - markerIndex\n    );\n\n    newParagraph.segments.push(...segments);\n\n    setParagraphNotImplicit(paragraph);\n\n    if (paragraph.segments.every(x => x.segmentType == 'SelectionMarker')) {\n        paragraph.segments.push(createBr(marker.format));\n    }\n\n    normalizeParagraph(newParagraph);\n\n    return newParagraph;\n};\n"]}

package/lib/edit/keyboardDelete.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.keyboardDelete = void 0;
-var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
 var deleteAllSegmentBefore_1 = require("./deleteSteps/deleteAllSegmentBefore");
 var deleteEmptyQuote_1 = require("./deleteSteps/deleteEmptyQuote");
 var deleteList_1 = require("./deleteSteps/deleteList");
+var roosterjs_content_model_dom_1 = require("roosterjs-content-model-dom");
 var handleKeyboardEventCommon_1 = require("./handleKeyboardEventCommon");
 var deleteWordSelection_1 = require("./deleteSteps/deleteWordSelection");
 var deleteCollapsedSelection_1 = require("./deleteSteps/deleteCollapsedSelection");
@@ -48,8 +48,8 @@ function getDeleteSteps(rawEvent, isMac) {
     return [
         deleteAllSegmentBeforeStep,
         deleteWordSelection,
+        isForward ? null : deleteList_1.deleteList,
         deleteCollapsedSelection,
-        deleteList_1.deleteList,
         deleteQuote,
     ];
 }