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

Jump to bottom

fix(react): modal now mounts child component independently of other modals #23903

Merged
merged 3 commits into from
Sep 13, 2021
Merged

fix(react): modal now mounts child component independently of other modals #23903

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0eb35e
Scope isDismissing to instance of Overlay
puopg Sep 8, 2021
ff48431
Update createOverlayComponent.tsx
puopg Sep 9, 2021
27a2a5c
Update createOverlayComponent.tsx
puopg Sep 9, 2021
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: 4 additions & 6 deletions packages/react/src/components/createOverlayComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@ export const createOverlayComponent = <
forwardedRef?: React.ForwardedRef<OverlayType>;
};

let isDismissing = false;

class Overlay extends React.Component<Props> {
overlay?: OverlayType;
el!: HTMLDivElement;

isDismissing = false;
constructor(props: Props) {
super(props);
if (typeof document !== 'undefined') {
Expand Down Expand Up @@ -75,7 +73,7 @@ export const createOverlayComponent = <
shouldComponentUpdate(nextProps: Props) {
// Check if the overlay component is about to dismiss
if (this.overlay && nextProps.isOpen !== this.props.isOpen && nextProps.isOpen === false) {
isDismissing = true;
this.isDismissing = true;
}

return true;
Expand All @@ -91,7 +89,7 @@ export const createOverlayComponent = <
}
if (this.overlay && prevProps.isOpen !== this.props.isOpen && this.props.isOpen === false) {
await this.overlay.dismiss();
isDismissing = false;
this.isDismissing = false;

/**
* Now that the overlay is dismissed
Expand Down Expand Up @@ -142,7 +140,7 @@ export const createOverlayComponent = <
* overlay is dismissing otherwise component
* will be hidden before animation is done.
*/
return ReactDOM.createPortal(this.props.isOpen || isDismissing ? this.props.children : null, this.el);
return ReactDOM.createPortal(this.props.isOpen || this.isDismissing ? this.props.children : null, this.el);
}
}

Expand Down