Skip to content
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

Do not prevent shift tab #2907

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Do not prevent shift tab #2907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5099bf3
fix shift+tab
juliaroldi Dec 10, 2024
28bedd0
Merge branch 'master' into u/juliaroldi/shift-tab
juliaroldi Dec 11, 2024
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
49 changes: 26 additions & 23 deletions packages/roosterjs-content-model-plugins/lib/autoFormat/AutoFormatPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,30 +207,33 @@ export class AutoFormatPlugin implements EditorPlugin {
}
break;
case 'Tab':
formatTextSegmentBeforeSelectionMarker(
editor,
(model, _previousSegment, paragraph, _markerFormat, context) => {
const { autoBullet, autoNumbering } = this.options;
let shouldList = false;
if (autoBullet || autoNumbering) {
shouldList = keyboardListTrigger(
model,
paragraph,
context,
autoBullet,
autoNumbering
);
context.canUndoByBackspace = shouldList;
event.rawEvent.preventDefault();
if (!rawEvent.shiftKey) {
formatTextSegmentBeforeSelectionMarker(
editor,
(model, _previousSegment, paragraph, _markerFormat, context) => {
const { autoBullet, autoNumbering } = this.options;
let shouldList = false;
if (autoBullet || autoNumbering) {
shouldList = keyboardListTrigger(
model,
paragraph,
context,
autoBullet,
autoNumbering
);
context.canUndoByBackspace = shouldList;
}
if (shouldList) {
event.rawEvent.preventDefault();
}
return shouldList;
},
{
changeSource: ChangeSource.AutoFormat,
apiName: 'autoToggleList',
}

return shouldList;
},
{
changeSource: ChangeSource.AutoFormat,
apiName: 'autoToggleList',
}
);
);
}
}
}
}
Expand Down
49 changes: 46 additions & 3 deletions packages/roosterjs-content-model-plugins/test/autoFormat/AutoFormatPluginTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,6 @@ describe('Content Model Auto Format Plugin Test', () => {
format: {},
};

event.rawEvent.preventDefault = jasmine.createSpy('preventDefault');

formatTextSegmentBeforeSelectionMarkerSpy.and.callFake((editor, callback, options) => {
callback(
inputModel,
Expand Down Expand Up @@ -445,6 +443,7 @@ describe('Content Model Auto Format Plugin Test', () => {
key: 'Tab',
defaultPrevented: false,
handledByEditFeature: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
};
runTest(
Expand Down Expand Up @@ -506,6 +505,7 @@ describe('Content Model Auto Format Plugin Test', () => {
key: 'Tab',
defaultPrevented: false,
handledByEditFeature: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
};
runTest(
Expand Down Expand Up @@ -567,6 +567,7 @@ describe('Content Model Auto Format Plugin Test', () => {
key: 'Tab',
defaultPrevented: false,
handledByEditFeature: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
};
runTest(
Expand All @@ -592,7 +593,7 @@ describe('Content Model Auto Format Plugin Test', () => {
},
{ autoBullet: true, autoNumbering: false },
true,
true
false
);
});

Expand All @@ -603,6 +604,7 @@ describe('Content Model Auto Format Plugin Test', () => {
key: 'Tab',
defaultPrevented: false,
handledByEditFeature: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
};
runTest(
Expand Down Expand Up @@ -639,6 +641,7 @@ describe('Content Model Auto Format Plugin Test', () => {
key: 'Ctrl',
defaultPrevented: false,
handledByEditFeature: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
};
runTest(
Expand Down Expand Up @@ -675,6 +678,7 @@ describe('Content Model Auto Format Plugin Test', () => {
key: 'Tab',
defaultPrevented: true,
handledByEditFeature: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
};
runTest(
Expand Down Expand Up @@ -710,6 +714,45 @@ describe('Content Model Auto Format Plugin Test', () => {
rawEvent: {
key: 'Tab',
defaultPrevented: false,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
handledByEditFeature: true,
};
runTest(
event,
true,
{
blockGroupType: 'Document',
format: {},
blocks: [
{
blockType: 'Paragraph',
format: {},
segments: [
{
segmentType: 'Text',
text: '*',
format: {},
},
marker,
],
},
],
},
{ autoBullet: true, autoNumbering: true },
false,
false
);
});

it('[TAB] should not trigger keyboardListTrigger - shift key', () => {
const event: KeyDownEvent = {
eventType: 'keyDown',
rawEvent: {
key: 'Tab',
defaultPrevented: false,
shiftKey: true,
preventDefault: jasmine.createSpy('preventDefault'),
} as any,
handledByEditFeature: true,
};
Expand Down
Loading