Skip to content

fix(OverlayView): use ReactDOM.createPortal in React@^16 #895

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(OverlayView): use ReactDOM.createPortal in React@^16 #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6754cb
fix(OverlayView): use `ReactDOM.createPortal` in React@^16
urikphytech Aug 20, 2018
278cf08
fix(tx): fix "destructure non-iterable instance" error on CI builds
urikphytech Aug 20, 2018
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
32 changes: 24 additions & 8 deletions src/macros/OverlayView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,17 @@ export class OverlayView extends React.PureComponent {
const mapPanes = this.state[OVERLAY_VIEW].getPanes()
mapPanes[mapPaneName].appendChild(this.containerElement)

ReactDOM.unstable_renderSubtreeIntoContainer(
this,
React.Children.only(this.props.children),
this.containerElement,
this.onPositionElement
)
if (React.version.match(/^16/)) {
this.onPositionElement()
this.forceUpdate()
} else {
ReactDOM.unstable_renderSubtreeIntoContainer(
this,
React.Children.only(this.props.children),
this.containerElement,
this.onPositionElement
)
}
}

onPositionElement() {
Expand All @@ -124,7 +129,9 @@ export class OverlayView extends React.PureComponent {

onRemove() {
this.containerElement.parentNode.removeChild(this.containerElement)
ReactDOM.unmountComponentAtNode(this.containerElement)
if (!React.version.match(/^16/)) {
ReactDOM.unmountComponentAtNode(this.containerElement)
}
this.containerElement = null
}

Expand All @@ -140,7 +147,10 @@ export class OverlayView extends React.PureComponent {
updaterMap,
prevProps
)
_.delay(this.state[OVERLAY_VIEW].draw)

if (!React.version.match(/^16/)) {
_.delay(this.state[OVERLAY_VIEW].draw)
}
}

componentWillUnmount() {
Expand All @@ -156,6 +166,12 @@ export class OverlayView extends React.PureComponent {
}

render() {
if (React.version.match(/^16/) && this.containerElement) {
return ReactDOM.createPortal(
React.Children.only(this.props.children),
this.containerElement
)
}
return false
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/tx/ClassDefinition.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function contentToJS(KlassName, $, $content) {
const $constructorTable = $content.find(
`[summary="class ${KlassName} - Constructor"]`
)
const [, constructorArgs] = $constructorTable
const constructorArgs = $constructorTable
.find(`tr > td > code`)
.text()
.match(/\S+\((.*)\)/)
Expand Down