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

Add a condition for reenabling the page scroll when Dialog plugin is destroyed #17674

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Add a condition for reenabling the page scroll when Dialog plugin is destroyed #17674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/ckeditor5-ui/src/dialog/dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ export default class Dialog extends Plugin {
public override destroy(): void {
super.destroy();

this._unlockBodyScroll();
if ( Dialog._visibleDialogPlugin === this ) {
this._unlockBodyScroll();
}
}

/**
Expand Down
18 changes: 18 additions & 0 deletions packages/ckeditor5-ui/tests/dialog/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,24 @@ describe( 'Dialog', () => {

expect( document.documentElement.classList.contains( 'ck-dialog-scroll-locked' ) ).to.be.false;
} );

it( 'should not unlock scrolling on the document if modal was displayed by another plugin instance', () => {
const tempDialogPlugin = new Dialog( editor );

tempDialogPlugin._show( {
position: DialogViewPosition.EDITOR_CENTER,
isModal: true,
className: 'foo'
} );

expect( document.documentElement.classList.contains( 'ck-dialog-scroll-locked' ) ).to.be.true;

dialogPlugin.destroy();

expect( document.documentElement.classList.contains( 'ck-dialog-scroll-locked' ) ).to.be.true;

tempDialogPlugin.destroy();
} );
} );

describe( 'show()', () => {
Expand Down
Loading