Skip to content

Fix Word Desktop paste case (316584) #3034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BryanValverdeU merged 3 commits into from
May 20, 2025
Merged

Fix Word Desktop paste case (316584) #3034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87a9c03
Fix Word Desktop paste case
BryanValverdeU May 13, 2025
550a321
Merge branch 'master' into u/bvalverde/fixWordListPastingIssue
JiuqingSong May 13, 2025
68c5833
Merge branch 'master' into u/bvalverde/fixWordListPastingIssue
BryanValverdeU May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions packages/roosterjs-content-model-plugins/lib/paste/WordDesktop/processWordLists.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { getListStyleTypeFromString, isEmpty } from 'roosterjs-content-model-dom';
import { processAsListItem, setupListFormat } from '../utils/customListUtils';
import {
getListStyleTypeFromString,
isElementOfType,
isEmpty,
isNodeOfType,
} from 'roosterjs-content-model-dom';
import type { WordMetadata } from './WordMetadata';
import type {
ContentModelBlockGroup,
Expand Down Expand Up @@ -92,7 +97,7 @@ export function processWordList(

processAsListItem(context, element, group, listFormatMetadata, listItem => {
if (listType == 'OL') {
setStartNumber(listItem, context, listMetadata);
setStartNumber(listItem, context, listMetadata, element);
}
});

Expand Down Expand Up @@ -160,7 +165,8 @@ function getBulletFromMetadata(listMetadata: WordMetadata | undefined, listType:
function setStartNumber(
listItem: ContentModelListItem,
context: DomToModelContext,
listMetadata: WordMetadata | undefined
listMetadata: WordMetadata | undefined,
element: HTMLElement
) {
const {
listParent,
Expand All @@ -185,6 +191,15 @@ function setStartNumber(

if (start != undefined && !isNaN(start) && knownLevel.length != levels.length) {
listItem.levels[listItem.levels.length - 1].format.startNumberOverride = start;
} else if (
isElementOfType(element, 'li') &&
isNodeOfType(element.parentElement, 'ELEMENT_NODE') &&
isElementOfType(element.parentElement, 'ol') &&
element.parentElement.firstElementChild == element &&
knownLevel.length != element.parentElement.start
) {
listItem.levels[listItem.levels.length - 1].format.startNumberOverride =
element.parentElement.start;
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions packages/roosterjs-content-model-plugins/test/paste/e2e/cmPasteFromPowerPointDesktopTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ describe('PowerPoint', () => {
document.getElementById('PowerPoint')?.remove();
});

function copy(string1: any) {
window.navigator.clipboard.writeText(JSON.stringify(string1));
}

it('PowerPoint 1', () => {
paste(editor!, pptClipboardContent1, 'normal');

Expand Down Expand Up @@ -2607,7 +2603,6 @@ describe('PowerPoint', () => {
const model = editor?.getContentModelCopy('connected');
expect(model).toBeDefined();
if (model) {
copy(model);
expectEqual(model, {
blockGroupType: 'Document',
blocks: [
Expand Down
Loading
Loading