Fix 300391: [Mail] The numbers will become a continuous sequence afte…

…r typing enter at the last line of the numbering above (#2782) Co-authored-by: Bryan Valverde U <[email protected]>
microsoft · Sep 4, 2024 · a419832 · a419832
1 parent f496042
commit a419832
Show file tree

Hide file tree

Showing 2 changed files with 117 additions and 1 deletion.
diff --git a/packages/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts b/packages/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts
@@ -60,7 +60,11 @@ export const handleEnterOnList: DeleteSelectionStep = context => {
                     nextListItem.levels[0]
                 ) {
                     nextListItem.levels.forEach(level => {
-                        level.format.startNumberOverride = undefined;
+                        // Remove startNumberOverride so that next list item can join current list, unless it is 1.
+                        // List start with 1 means it should be an explicit new list and should never join another list before it
+                        if (level.format.startNumberOverride !== 1) {
+                            level.format.startNumberOverride = undefined;
+                        }
                     });
                 }
             }

diff --git a/packages/roosterjs-content-model-plugins/test/edit/inputSteps/handleEnterOnListTest.ts b/packages/roosterjs-content-model-plugins/test/edit/inputSteps/handleEnterOnListTest.ts
@@ -2439,6 +2439,118 @@ describe('handleEnterOnList - keyboardEnter', () => {
         runTest(input, true, expected, false, 1);
     });
 
+    it('Two separate lists, Enter on first one', () => {
+        const model: ContentModelDocument = {
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    levels: [{ listType: 'OL', format: { startNumberOverride: 1 }, dataset: {} }],
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            format: {},
+                            segments: [
+                                { segmentType: 'Text', text: 'test', format: {} },
+                                { segmentType: 'SelectionMarker', format: {}, isSelected: true },
+                            ],
+                        },
+                    ],
+                    format: {},
+                    formatHolder: { segmentType: 'SelectionMarker', format: {} },
+                },
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    levels: [{ listType: 'OL', format: { startNumberOverride: 1 }, dataset: {} }],
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            format: {},
+                            segments: [{ segmentType: 'Br', format: {} }],
+                        },
+                    ],
+                    format: {},
+                    formatHolder: {
+                        segmentType: 'SelectionMarker',
+                        format: {},
+                    },
+                },
+            ],
+        };
+
+        const expectedModel: ContentModelDocument = {
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    levels: [{ listType: 'OL', format: { startNumberOverride: 1 }, dataset: {} }],
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            format: {},
+                            segments: [{ segmentType: 'Text', text: 'test', format: {} }],
+                        },
+                    ],
+                    format: {},
+                    formatHolder: { segmentType: 'SelectionMarker', format: {} },
+                },
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    levels: [
+                        {
+                            listType: 'OL',
+                            format: {
+                                startNumberOverride: undefined,
+                                displayForDummyItem: undefined,
+                            },
+                            dataset: {},
+                        },
+                    ],
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            format: {},
+                            segments: [
+                                { segmentType: 'SelectionMarker', format: {}, isSelected: true },
+                                { segmentType: 'Br', format: {} },
+                            ],
+                        },
+                    ],
+                    format: {},
+                    formatHolder: { segmentType: 'SelectionMarker', format: {}, isSelected: false },
+                },
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            segments: [{ segmentType: 'Br', format: {} }],
+                            format: {},
+                        },
+                    ],
+                    levels: [
+                        {
+                            listType: 'OL',
+                            format: {
+                                startNumberOverride: 1,
+                            },
+                            dataset: {},
+                        },
+                    ],
+                    formatHolder: { segmentType: 'SelectionMarker', format: {} },
+                    format: {},
+                },
+            ],
+        };
+
+        runTest(model, false, expectedModel, false, 1);
+    });
+
     it('List item contains multiple blocks', () => {
         const model: ContentModelDocument = {
             blockGroupType: 'Document',