Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions components/modal/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ class Modal extends React.Component {
if (props.ariaHideApp) {
checkAppElementIsSet();
}

this.selfRef = React.createRef();
}

componentDidMount() {
Expand All @@ -224,14 +226,13 @@ class Modal extends React.Component {
// and manager.jsx are removed. They appear to have
// been created in order to do modals in portals.
if (!this.isUnmounting) {
const el = ReactDOM.findDOMNode(this); // eslint-disable-line react/no-find-dom-node
if (
el &&
el.parentNode &&
el.parentNode.getAttribute('data-slds-modal')
this.selfRef &&
this.selfRef.parentNode &&
this.selfRef.parentNode.getAttribute('data-slds-modal')
) {
ReactDOM.unmountComponentAtNode(el);
document.body.removeChild(el);
ReactDOM.unmountComponentAtNode(this.selfRef);
document.body.removeChild(this.selfRef);
}
}
}
Expand Down