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

BUGFIX: Limit click-outside handling for dialogs to their semi-transparent overlay #3492

Merged
merged 6 commits into from
Jul 4, 2023
+394 −130
Merged

BUGFIX: Limit click-outside handling for dialogs to their semi-transparent overlay #3492

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfd2024
BUGFIX: Limit click-outside handling for dialogs to their semi-transp…
grebaldi May 12, 2023
4cdec2c
BUGFIX: Prevent webpack from bundling `react-ui-components` twice
grebaldi Jun 21, 2023
54cdf7c
BUGFIX: Ensure that dialogs are closed in correct order on escape key…
grebaldi Jun 12, 2023
e947e75
TASK: Remove dependency to react-close-on-escape
grebaldi Jun 12, 2023
4f309a8
TASK: Replace react-portal with native portal for dialog component
grebaldi Jun 12, 2023
11735bb
Merge remote-tracking branch 'origin/7.3' into bugfix/2925/dialog-cli…
mhsdesign Jul 3, 2023
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
5 changes: 3 additions & 2 deletions packages/react-ui-components/src/Dialog/__snapshots__/dialog.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ exports[`<Dialog/> Portal should render correctly. 1`] = `
<section
autoFocus={true}
className="dialogClassName wideClassName errorClassName"
onClick={[Function]}
role="dialog"
tabIndex={0}
>
<clickOutside(DialogWithoutEscape)
<DialogWithoutEscape
actions={
Array [
"Foo 1",
Expand Down Expand Up @@ -79,7 +80,7 @@ exports[`<Dialog/> Portal should render correctly. 1`] = `
type="error"
>
Foo children
</clickOutside(DialogWithoutEscape)>
</DialogWithoutEscape>
</section>
</Portal>
</CloseOnEscape>
Expand Down
17 changes: 8 additions & 9 deletions packages/react-ui-components/src/Dialog/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import mergeClassNames from 'classnames';
import React, {PureComponent, ReactNode} from 'react';
import enhanceWithClickOutside from '../enhanceWithClickOutside/index';
import CloseOnEscape from 'react-close-on-escape';
import {Portal} from 'react-portal';

Expand Down Expand Up @@ -129,10 +128,6 @@ export class DialogWithoutEscape extends PureComponent<DialogProps> {
this.ref = ref;
}

public readonly handleClickOutside = () => {
this.props.onRequestClose();
}

public readonly componentDidMount = (): void => {
document.addEventListener('keydown', (event : KeyboardEvent) => this.handleKeyPress(event));
const {autoFocus} = this.props;
Expand All @@ -158,8 +153,6 @@ export class DialogWithoutEscape extends PureComponent<DialogProps> {
}
}

const EnhancedDialogWithoutEscapeWithClickOutside = enhanceWithClickOutside(DialogWithoutEscape);

// tslint:disable-next-line:max-classes-per-file
class DialogWithEscape extends PureComponent<DialogProps> {
public render(): JSX.Element | null {
Expand Down Expand Up @@ -198,8 +191,8 @@ class DialogWithEscape extends PureComponent<DialogProps> {
return (
<CloseOnEscape onEscape={this.onEscape}>
<Portal>
<section {...rest} className={sectionClassName} role="dialog" tabIndex={0}>
<EnhancedDialogWithoutEscapeWithClickOutside {...this.props}/>
<section {...rest} className={sectionClassName} role="dialog" tabIndex={0} onClick={this.handleOverlayClick}>
<DialogWithoutEscape {...this.props}/>
</section>
</Portal>
</CloseOnEscape>
Expand All @@ -209,6 +202,12 @@ class DialogWithEscape extends PureComponent<DialogProps> {
private readonly onEscape = () => {
this.props.onRequestClose();
}

private readonly handleOverlayClick = (ev: React.MouseEvent) => {
if (ev.target === ev.currentTarget) {
this.props.onRequestClose();
}
}
}

export default DialogWithEscape;