Skip to content

Fix #3087 Delete paragraph styles when there is nothing else to be deleted #3094

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
JiuqingSong merged 6 commits into from
Jul 23, 2025
Merged

Fix #3087 Delete paragraph styles when there is nothing else to be deleted #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9e5d22
Fix #3087
JiuqingSong Jul 21, 2025
f3118e6
Update packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/…
JiuqingSong Jul 22, 2025
e10a476
Update packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/…
JiuqingSong Jul 22, 2025
1478dd3
Update packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/…
JiuqingSong Jul 22, 2025
b8c367a
Merge branch 'master' into u/jisong/3087
JiuqingSong Jul 22, 2025
0d5d5c5
Merge branch 'master' into u/jisong/3087
JiuqingSong Jul 23, 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
24 changes: 24 additions & 0 deletions packages/roosterjs-content-model-plugins/lib/edit/deleteSteps/deleteParagraphStyle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import type { DeleteSelectionStep } from 'roosterjs-content-model-types';

/**
* @internal
*/
export const deleteParagraphStyle: DeleteSelectionStep = context => {
if (context.deleteResult === 'nothingToDelete') {
const { insertPoint } = context;
const { paragraph } = insertPoint;

// If the paragraph is empty, we will delete any style in it
// This is to ensure the paragraph style is reset to default when there is no content in the paragraph
if (
paragraph.segments.every(
s => s.segmentType === 'SelectionMarker' || s.segmentType === 'Br'
) &&
paragraph.segments.filter(s => s.segmentType === 'Br').length <= 1 &&
Object.keys(paragraph.format).length > 0
) {
paragraph.format = {};
context.deleteResult = 'range';
}
}
};
2 changes: 2 additions & 0 deletions packages/roosterjs-content-model-plugins/lib/edit/keyboardDelete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { deleteAllSegmentBefore } from './deleteSteps/deleteAllSegmentBefore';
import { deleteEmptyQuote } from './deleteSteps/deleteEmptyQuote';
import { deleteList } from './deleteSteps/deleteList';
import { deleteParagraphStyle } from './deleteSteps/deleteParagraphStyle';
import {
ChangeSource,
deleteSelection,
Expand Down Expand Up @@ -84,6 +85,7 @@ function getDeleteSteps(rawEvent: KeyboardEvent, isMac: boolean): (DeleteSelecti
isForward ? null : deleteList,
deleteCollapsedSelection,
deleteQuote,
deleteParagraphStyle,
];
}

Expand Down
101 changes: 101 additions & 0 deletions packages/roosterjs-content-model-plugins/test/edit/deleteSteps/deleteParagraphStyleTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import { deleteParagraphStyle } from '../../../lib/edit/deleteSteps/deleteParagraphStyle';
import { ValidDeleteSelectionContext } from 'roosterjs-content-model-types';

describe('deleteParagraphStyle', () => {
it('should delete paragraph style when paragraph is empty', () => {
const context: ValidDeleteSelectionContext = {
deleteResult: 'nothingToDelete',
insertPoint: {
paragraph: {
segments: [
{ segmentType: 'Br' } as any,
{ segmentType: 'SelectionMarker' } as any,
],
format: {
textAlign: 'center',
},
blockType: 'Paragraph',
},
marker: null!,
path: [],
},
};

deleteParagraphStyle(context);

expect(context.deleteResult).toBe('range');
expect(context.insertPoint.paragraph.format).toEqual({});
});

it('should not delete paragraph style when paragraph is not empty', () => {
const context: ValidDeleteSelectionContext = {
deleteResult: 'nothingToDelete',
insertPoint: {
paragraph: {
segments: [{ segmentType: 'Text', text: 'Hello World' } as any],
format: {
textAlign: 'center',
},
blockType: 'Paragraph',
},
marker: null!,
path: [],
},
};

deleteParagraphStyle(context);

expect(context.deleteResult).toBe('nothingToDelete');
expect(context.insertPoint.paragraph.format).toEqual({
textAlign: 'center',
});
});

it('should not delete paragraph style when paragraph has multiple line breaks', () => {
const context: ValidDeleteSelectionContext = {
deleteResult: 'nothingToDelete',
insertPoint: {
paragraph: {
segments: [
{ segmentType: 'Br' } as any,
{ segmentType: 'Br' } as any,
{ segmentType: 'SelectionMarker' } as any,
],
format: {
textAlign: 'center',
},
blockType: 'Paragraph',
},
marker: null!,
path: [],
},
};

deleteParagraphStyle(context);

expect(context.deleteResult).toBe('nothingToDelete');
expect(context.insertPoint.paragraph.format).toEqual({
textAlign: 'center',
});
});

it('should not delete paragraph style when paragraph has no format', () => {
const context: ValidDeleteSelectionContext = {
deleteResult: 'nothingToDelete',
insertPoint: {
paragraph: {
segments: [{ segmentType: 'Text', text: 'Hello World' } as any],
format: {},
blockType: 'Paragraph',
},
marker: null!,
path: [],
},
};

deleteParagraphStyle(context);

expect(context.deleteResult).toBe('nothingToDelete');
expect(context.insertPoint.paragraph.format).toEqual({});
});
});
56 changes: 47 additions & 9 deletions packages/roosterjs-content-model-plugins/test/edit/keyboardDeleteTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ContentModelDocument, DOMSelection, IEditor } from 'roosterjs-content-m
import { deleteAllSegmentBefore } from '../../lib/edit/deleteSteps/deleteAllSegmentBefore';
import { deleteEmptyQuote } from '../../lib/edit/deleteSteps/deleteEmptyQuote';
import { deleteList } from '../../lib/edit/deleteSteps/deleteList';
import { deleteParagraphStyle } from '../../lib/edit/deleteSteps/deleteParagraphStyle';
import { DeleteResult, DeleteSelectionStep } from 'roosterjs-content-model-types';
import { editingTestCommon } from './editingTestCommon';
import { keyboardDelete } from '../../lib/edit/keyboardDelete';
Expand Down Expand Up @@ -90,7 +91,7 @@ describe('keyboardDelete', () => {
blockGroupType: 'Document',
blocks: [],
},
[null!, null!, null!, forwardDeleteCollapsedSelection, null!],
[null!, null!, null!, forwardDeleteCollapsedSelection, null!, deleteParagraphStyle],
'notDeleted',
true,
0
Expand All @@ -108,7 +109,14 @@ describe('keyboardDelete', () => {
blockGroupType: 'Document',
blocks: [],
},
[null!, null!, deleteList, backwardDeleteCollapsedSelection, deleteEmptyQuote],
[
null!,
null!,
deleteList,
backwardDeleteCollapsedSelection,
deleteEmptyQuote,
deleteParagraphStyle,
],
'notDeleted',
true,
0
Expand All @@ -128,7 +136,14 @@ describe('keyboardDelete', () => {
blockGroupType: 'Document',
blocks: [],
},
[null!, forwardDeleteWordSelection, null!, forwardDeleteCollapsedSelection, null!],
[
null!,
forwardDeleteWordSelection,
null!,
forwardDeleteCollapsedSelection,
null!,
deleteParagraphStyle,
],
'notDeleted',
true,
0
Expand All @@ -154,6 +169,7 @@ describe('keyboardDelete', () => {
deleteList,
backwardDeleteCollapsedSelection,
deleteEmptyQuote,
deleteParagraphStyle,
],
'notDeleted',
true,
Expand All @@ -174,7 +190,7 @@ describe('keyboardDelete', () => {
blockGroupType: 'Document',
blocks: [],
},
[null!, null!, null!, forwardDeleteCollapsedSelection, null!],
[null!, null!, null!, forwardDeleteCollapsedSelection, null!, deleteParagraphStyle],
'notDeleted',
true,
0
Expand All @@ -200,6 +216,7 @@ describe('keyboardDelete', () => {
deleteList,
backwardDeleteCollapsedSelection,
deleteEmptyQuote,
deleteParagraphStyle,
],
'notDeleted',
true,
Expand Down Expand Up @@ -242,7 +259,7 @@ describe('keyboardDelete', () => {
},
],
},
[null!, null!, null!, forwardDeleteCollapsedSelection, null!],
[null!, null!, null!, forwardDeleteCollapsedSelection, null!, deleteParagraphStyle],
'notDeleted',
true,
0
Expand Down Expand Up @@ -284,7 +301,14 @@ describe('keyboardDelete', () => {
},
],
},
[null!, null!, deleteList, backwardDeleteCollapsedSelection, deleteEmptyQuote],
[
null!,
null!,
deleteList,
backwardDeleteCollapsedSelection,
deleteEmptyQuote,
deleteParagraphStyle,
],
'notDeleted',
true,
0
Expand Down Expand Up @@ -336,7 +360,7 @@ describe('keyboardDelete', () => {
},
],
},
[null!, null!, null!, forwardDeleteCollapsedSelection, null!],
[null!, null!, null!, forwardDeleteCollapsedSelection, null!, deleteParagraphStyle],
'singleChar',
false,
1
Expand Down Expand Up @@ -388,7 +412,14 @@ describe('keyboardDelete', () => {
},
],
},
[null!, null!, deleteList, backwardDeleteCollapsedSelection, deleteEmptyQuote],
[
null!,
null!,
deleteList,
backwardDeleteCollapsedSelection,
deleteEmptyQuote,
deleteParagraphStyle,
],
'singleChar',
false,
1
Expand Down Expand Up @@ -482,7 +513,14 @@ describe('keyboardDelete', () => {
},
],
},
[null!, null!, deleteList, backwardDeleteCollapsedSelection, deleteEmptyQuote],
[
null!,
null!,
deleteList,
backwardDeleteCollapsedSelection,
deleteEmptyQuote,
deleteParagraphStyle,
],
'singleChar',
false,
1
Expand Down
Loading