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

chore: Prevent dialog scroll #7710

Merged
merged 2 commits into from
Sep 12, 2024
Merged

chore: Prevent dialog scroll #7710

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b5d7f
chore: Prevent dialog scroll
burkov Sep 12, 2024
d212a8e
chore: preventBodyScroll should not be passed as a part of restProps
burkov Sep 12, 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
10 changes: 8 additions & 2 deletions src/dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface DialogProps extends Partial<TabTrapProps> {
dense?: boolean | null | undefined
native?: boolean
modal?: boolean
preventBodyScroll?: boolean
}

/**
Expand Down Expand Up @@ -68,7 +69,8 @@ export default class Dialog extends PureComponent<DialogProps> {
trapFocus: PropTypes.bool,
portalTarget: PropTypes.instanceOf(HTMLElement),
autoFocusFirst: PropTypes.bool,
'data-test': PropTypes.string
'data-test': PropTypes.string,
preventBodyScroll: PropTypes.bool
};

static defaultProps: Partial<DialogProps> = {
Expand All @@ -82,7 +84,8 @@ export default class Dialog extends PureComponent<DialogProps> {
shortcutOptions: {modal: false},
trapFocus: false,
autoFocusFirst: true,
modal: true
modal: true,
preventBodyScroll: true
};

state = {
Expand Down Expand Up @@ -128,6 +131,9 @@ export default class Dialog extends PureComponent<DialogProps> {
}

toggleScrollPreventer() {
if (!this.props.preventBodyScroll) {
return;
}
if (this.props.show) {
this.scrollPreventer.prevent();
} else {
Expand Down