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

Recreate Split when children change #746

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

Recreate Split when children change #746

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bfb0d8
Recreate Split when children change
adam-binks Jun 1, 2022
0a8d945
gutter -> gutterFn
adam-binks Jun 1, 2022
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
52 changes: 36 additions & 16 deletions packages/react-split/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,18 @@ class SplitWrapper extends React.Component {
componentDidMount() {
const { children, gutter, ...options } = this.props

options.gutter = (index, direction) => {
let gutterElement

if (gutter) {
gutterElement = gutter(index, direction)
} else {
gutterElement = document.createElement('div')
gutterElement.className = `gutter gutter-${direction}`
}

// eslint-disable-next-line no-underscore-dangle
gutterElement.__isSplitGutter = true
return gutterElement
}
options.gutter = this.makeGutterFn(gutter)

this.split = Split(this.parent.children, options)
}

componentDidUpdate(prevProps) {
const { children, minSize, sizes, collapsed, ...options } = this.props
const { children, minSize, sizes, collapsed, gutter, ...options } = this.props
const {
minSize: prevMinSize,
sizes: prevSizes,
collapsed: prevCollapsed,
children: prevChildren,
} = prevProps

const otherProps = [
Expand All @@ -41,6 +29,7 @@ class SplitWrapper extends React.Component {
'dragInterval',
'direction',
'cursor',
'children',
]

let needsRecreate = otherProps
Expand All @@ -63,12 +52,26 @@ class SplitWrapper extends React.Component {
needsRecreate = needsRecreate || minSize !== prevMinSize
}

// If children have changed, remove the old gutters
if (prevChildren !== children) {
for (var i = this.parent.children.length - 1; i >=0; i--) {
if (this.parent.children[i].__isSplitGutter) {
this.parent.children[i].remove()
}
}
}

// Destroy and re-create split if options changed
if (needsRecreate) {
options.minSize = minSize
options.sizes = sizes || this.split.getSizes()
if (prevChildren !== children && options.sizes.length !== children.count) {
options.sizes = undefined
}
this.split.destroy(true, true)
options.gutter = (index, direction, pairB) => pairB.previousSibling
options.gutter = (index, direction, pairB) => {
return pairB.previousSibling.__isSplitGutter ? pairB.previousSibling : this.makeGutterFn(gutter)()
}
this.split = Split(
Array.from(this.parent.children).filter(
// eslint-disable-next-line no-underscore-dangle
Expand Down Expand Up @@ -138,6 +141,23 @@ class SplitWrapper extends React.Component {
</div>
)
}

makeGutterFn(gutterFn) {
return function (index, direction) {
let gutterElement

if (gutterFn) {
gutterElement = gutter(index, direction)
} else {
gutterElement = document.createElement('div')
gutterElement.className = `gutter gutter-${direction}`
}

// eslint-disable-next-line no-underscore-dangle
gutterElement.__isSplitGutter = true
return gutterElement
}
}
}

SplitWrapper.propTypes = {
Expand Down