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

Ensure focusNode exists when selectionChanges #2724

Merged
merged 3 commits into from
Jun 24, 2024
Merged

Ensure focusNode exists when selectionChanges #2724

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
907a4d7
focus node
juliaroldi Jun 21, 2024
30d8e22
Merge branch 'master' into u/juliaroldi/verify-focus-node
juliaroldi Jun 21, 2024
81b5456
merge if statement
juliaroldi Jun 24, 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
25 changes: 14 additions & 11 deletions packages/roosterjs-content-model-core/lib/corePlugin/selection/SelectionPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,17 +595,20 @@ class SelectionPlugin implements PluginWithState<SelectionPluginState> {
//If am image selection changed to a wider range due a keyboard event, we should update the selection
const selection = this.editor.getDocument().getSelection();

if (newSelection?.type == 'image' && selection) {
if (selection && !isSingleImageInSelection(selection)) {
const range = selection.getRangeAt(0);
this.editor.setDOMSelection({
type: 'range',
range,
isReverted:
selection.focusNode != range.endContainer ||
selection.focusOffset != range.endOffset,
});
}
if (
newSelection?.type == 'image' &&
selection &&
selection.focusNode &&
!isSingleImageInSelection(selection)
) {
const range = selection.getRangeAt(0);
this.editor.setDOMSelection({
type: 'range',
range,
isReverted:
selection.focusNode != range.endContainer ||
selection.focusOffset != range.endOffset,
});
}

// Safari has problem to handle onBlur event. When blur, we cannot get the original selection from editor.
Expand Down
5 changes: 4 additions & 1 deletion packages/roosterjs-content-model-core/test/corePlugin/selection/SelectionPluginTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2456,6 +2456,9 @@ describe('SelectionPlugin selectionChange on image selected', () => {
addEventListenerSpy = jasmine.createSpy('addEventListener');
getRangeAtSpy = jasmine.createSpy('getRangeAt');
getSelectionSpy = jasmine.createSpy('getSelection').and.returnValue({
focusNode: {
nodeName: 'SPAN',
},
getRangeAt: getRangeAtSpy,
});
getDocumentSpy = jasmine.createSpy('getDocument').and.returnValue({
Expand Down Expand Up @@ -2513,7 +2516,7 @@ describe('SelectionPlugin selectionChange on image selected', () => {
expect(setDOMSelectionSpy).toHaveBeenCalledWith({
type: 'range',
range: { startContainer: {} } as Range,
isReverted: false,
isReverted: true,
});
expect(getDOMSelectionSpy).toHaveBeenCalledTimes(1);
});
Expand Down
Loading