From 038002fb735c408eb7b4b5b04dbd1b21021549f4 Mon Sep 17 00:00:00 2001
From: Jiuqing Song <jisong@microsoft.com>
Date: Mon, 4 Nov 2024 09:33:13 -0800
Subject: [PATCH] Fix #2857

---
 .../lib/edit/inputSteps/handleEnterOnList.ts  |   2 +-
 .../edit/inputSteps/handleEnterOnListTest.ts  | 102 ++++++++++++++++++
 2 files changed, 103 insertions(+), 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
index 224510a39f6..de044090317 100644
--- a/packages/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts
+++ b/packages/roosterjs-content-model-plugins/lib/edit/inputSteps/handleEnterOnList.ts
@@ -98,7 +98,7 @@ const createNewListItem = (
     const levels = createNewListLevel(listItem);
     const newListItem: ShallowMutableContentModelListItem = createListItem(
         levels,
-        insertPoint.marker.format
+        listItem.formatHolder.format
     );
 
     newListItem.blocks.push(newParagraph);
diff --git a/packages/roosterjs-content-model-plugins/test/edit/inputSteps/handleEnterOnListTest.ts b/packages/roosterjs-content-model-plugins/test/edit/inputSteps/handleEnterOnListTest.ts
index da42138e570..8a25562b7cf 100644
--- a/packages/roosterjs-content-model-plugins/test/edit/inputSteps/handleEnterOnListTest.ts
+++ b/packages/roosterjs-content-model-plugins/test/edit/inputSteps/handleEnterOnListTest.ts
@@ -1797,6 +1797,108 @@ describe('handleEnterOnList', () => {
         };
         runTest(model, expectedModel, 'range', listItem);
     });
+
+    it('Selection Marker has styles from previous list item', () => {
+        const model: ContentModelDocument = {
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            segments: [
+                                {
+                                    segmentType: 'SelectionMarker',
+                                    isSelected: true,
+                                    format: { fontSize: '20pt', fontWeight: 'bold' },
+                                },
+                                {
+                                    segmentType: 'Text',
+                                    text: 'test',
+                                    format: { fontWeight: 'bold' },
+                                },
+                            ],
+                            format: {},
+                        },
+                    ],
+                    format: {},
+                    formatHolder: {
+                        segmentType: 'SelectionMarker',
+                        format: { fontSize: '10pt' },
+                    },
+                    levels: [{ listType: 'UL', format: {}, dataset: {} }],
+                },
+            ],
+        };
+        const listItem: ContentModelListItem = {
+            blockType: 'BlockGroup',
+            blockGroupType: 'ListItem',
+            blocks: [
+                {
+                    blockType: 'Paragraph',
+                    segments: [
+                        {
+                            segmentType: 'SelectionMarker',
+                            isSelected: true,
+                            format: { fontSize: '20pt', fontWeight: 'bold' },
+                        },
+                        {
+                            segmentType: 'Text',
+                            text: 'test',
+                            format: { fontWeight: 'bold' },
+                        },
+                    ],
+                    format: {},
+                },
+            ],
+            levels: [
+                {
+                    listType: 'UL',
+                    format: {
+                        startNumberOverride: undefined,
+                        displayForDummyItem: undefined,
+                    },
+                    dataset: {},
+                },
+            ],
+            formatHolder: {
+                segmentType: 'SelectionMarker',
+                isSelected: false,
+                format: { fontSize: '10pt' },
+            },
+            format: {},
+        };
+        const expectedModel: ContentModelDocument = {
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'BlockGroup',
+                    blockGroupType: 'ListItem',
+                    blocks: [
+                        {
+                            blockType: 'Paragraph',
+                            segments: [
+                                {
+                                    segmentType: 'Br',
+                                    format: { fontSize: '20pt', fontWeight: 'bold' },
+                                },
+                            ],
+                            format: {},
+                            segmentFormat: { fontSize: '20pt' },
+                        },
+                    ],
+                    format: {},
+                    formatHolder: { segmentType: 'SelectionMarker', format: { fontSize: '10pt' } },
+                    levels: [{ listType: 'UL', format: {}, dataset: {} }],
+                },
+                listItem,
+            ],
+        };
+
+        runTest(model, expectedModel, 'range', listItem);
+    });
 });
 
 describe('handleEnterOnList - keyboardEnter', () => {