Skip to content

Return false for Shift+Tab outdent when only when segment before marker are spaces. #3474

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
Bryan Valverde U (BryanValverdeU) merged 5 commits into from
Oct 16, 2026
Merged

Return false for Shift+Tab outdent when only when segment before marker are spaces. #3474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
93473ca
Return false for Shift+Tab outdent when only entities precede the marker
BryanValverdeU Oct 14, 2026
64d77af
Simplify entity-before-marker check to generic non-Text fallback
BryanValverdeU Oct 14, 2026
f38380c
Fix test type error: provide valid ContentModelEntity shape in handle…
BryanValverdeU Oct 14, 2026
2a79bf3
Fix browser-dependent font expectation in PowerPoint paste test
BryanValverdeU Oct 15, 2026
a91619c
Merge origin/master into u/bvalverde/fixTabOutdentWithEntity
BryanValverdeU Oct 16, 2026
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
3 changes: 3 additions & 0 deletions packages/roosterjs-content-model-plugins/lib/edit/tabUtils/handleTabOnParagraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export function handleTabOnParagraph(
if (markerIndex <= 0) {
return false;
}

const tabText = paragraph.segments[markerIndex - 1];
const tabSpacesLength = tabSpaces.length;

Expand All @@ -117,6 +118,8 @@ export function handleTabOnParagraph(
} else {
return false;
}
} else {
return false;
}
}
}
Expand Down
43 changes: 43 additions & 0 deletions packages/roosterjs-content-model-plugins/test/edit/tabUtils/handleTabOnParagraphTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,49 @@ describe('handleTabOnParagraph', () => {
runTest(model, paragraph, rawEvent, true);
});

it('Outdent - collapsed range should return false when only entities exist before the marker', () => {
const model: ContentModelDocument = {
blockGroupType: 'Document',
blocks: [
{
blockType: 'Paragraph',
segments: [
{
blockType: 'Entity',
segmentType: 'Entity',
format: {},
entityFormat: {
id: 'entity-1',
entityType: 'test',
isReadonly: true,
},
wrapper: document.createElement('span'),
},
{
segmentType: 'SelectionMarker',
isSelected: true,
format: {},
},
{
segmentType: 'Text',
text: 'test',
format: {},
},
],
format: {},
},
],
format: {},
};
const paragraph = model.blocks[0] as ContentModelParagraph;
const rawEvent = new KeyboardEvent('keydown', {
key: 'Tab',
shiftKey: true,
});

runTest(model, paragraph, rawEvent, false);
});

it('Indent - expanded range should return true', () => {
const model: ContentModelDocument = {
blockGroupType: 'Document',
Expand Down
8 changes: 5 additions & 3 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 @@ -11,7 +11,6 @@ import {
pptClipboardContent3,
pptClipboardContent4,
} from './htmlTemplates/powerPointClipboardContent';
import { itChromeOnly } from 'roosterjs-content-model-dom/test/testUtils';

describe('PowerPoint', () => {
let editor: IEditor = undefined!;
Expand All @@ -34,7 +33,10 @@ describe('PowerPoint', () => {
document.getElementById('PowerPoint')?.remove();
});

itChromeOnly('PowerPoint 1', () => {
it('PowerPoint 1', () => {
const fontStyle = document.createElement('span').style;
fontStyle.fontFamily = 'Courier New';

paste(editor!, pptClipboardContent1, 'normal');

expect(setProcessorF.setProcessor).toHaveBeenCalledTimes(2);
Expand Down Expand Up @@ -107,7 +109,7 @@ describe('PowerPoint', () => {
isSelected: false,
segmentType: 'SelectionMarker',
format: {
fontFamily: '"Courier New"',
fontFamily: fontStyle.fontFamily,
fontSize: '7pt',
textColor: 'rgb(0, 0, 0)',
},
Expand Down
Loading