Skip to content

Improve behavior of transitionLeave=false and height transition #34

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

Merged
merged 4 commits into from
Feb 27, 2017
Merged

Improve behavior of transitionLeave=false and height transition #34

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3eeb346
Remove element at once when transitonLeave is false
wifilinker Nov 24, 2016
b277790
Use next component sizes when current does not exist
wifilinker Nov 25, 2016
59c4102
Avoid silencing transition when this.state.nextChild exists
wifilinker Nov 29, 2016
dc9fb62
Add class with `-height-active` suffix when transitioning
wifilinker Dec 8, 2016
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
37 changes: 29 additions & 8 deletions src/ReactCSSTransitionReplace.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
currentChild: this.props.children ? React.Children.only(this.props.children) : undefined,
currentChildKey: this.props.children ? '1' : '',
nextChild: undefined,
activeHeightTransition: false,
nextChildKey: '',
height: null,
width: null,
Expand All @@ -101,7 +102,9 @@ export default class ReactCSSTransitionReplace extends React.Component {
const nextChild = nextProps.children ? React.Children.only(nextProps.children) : false
const currentChild = this.state.currentChild

if (currentChild && nextChild && nextChild.key === currentChild.key) {
// Avoid silencing the transition when this.state.nextChild exists because it means that there’s
// already a transition ongoing that has to be replaced.
if (currentChild && nextChild && nextChild.key === currentChild.key && !this.state.nextChild) {
// Nothing changed, but we are re-rendering so update the currentChild.
return this.setState({
currentChild: nextChild,
Expand All @@ -117,12 +120,19 @@ export default class ReactCSSTransitionReplace extends React.Component {

const {state } = this

// When transitionLeave is set to false, refs.curr does not exist when refs.next is being
// transitioned into existence. When another child is set for this component at the point
// where only refs.next exists, we want to use the width/height of refs.next instead of
// refs.curr.
const ref = this.refs.curr || this.refs.next

// Set the next child to start the transition, and set the current height.
this.setState({
nextChild,
activeHeightTransition: false,
nextChildKey: state.currentChildKey ? String(Number(state.currentChildKey) + 1) : '1',
height: state.currentChild ? ReactDOM.findDOMNode(this.refs.curr).offsetHeight : 0,
width: state.currentChild && this.props.changeWidth ? ReactDOM.findDOMNode(this.refs.curr).offsetWidth : null,
height: state.currentChild ? ReactDOM.findDOMNode(ref).offsetHeight : 0,
width: state.currentChild && this.props.changeWidth ? ReactDOM.findDOMNode(ref).offsetWidth : null,
})

// Enqueue setting the next height to trigger the height transition.
Expand All @@ -133,7 +143,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
if (!this.isTransitioning && !this.state.isLeaving) {
const {currentChild, nextChild } = this.state

if (currentChild && (nextChild || nextChild === false || nextChild === null)) {
if (currentChild && (nextChild || nextChild === false || nextChild === null) && this.props.transitionLeave) {
this.leaveCurrent()
}
if (nextChild) {
Expand All @@ -146,6 +156,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
this.timeout = setTimeout(() => {
if (!nextChild) {
return this.setState({
activeHeightTransition: true,
height: 0,
width: this.props.changeWidth ? 0 : null,
})
Expand All @@ -154,6 +165,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
const nextNode = ReactDOM.findDOMNode(this.refs.next)
if (nextNode) {
this.setState({
activeHeightTransition: true,
height: nextNode.offsetHeight,
width: this.props.changeWidth ? nextNode.offsetWidth : null,
})
Expand Down Expand Up @@ -189,6 +201,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
this.setState({
currentChild: state.nextChild,
currentChildKey: state.nextChildKey,
activeHeightTransition: false,
nextChild: undefined,
nextChildKey: '',
height: null,
Expand Down Expand Up @@ -223,6 +236,7 @@ export default class ReactCSSTransitionReplace extends React.Component {
clearTimeout(this.timeout)
return this.setState({
nextChild: undefined,
activeHeightTransition: false,
nextChildKey: '',
height: null,
width: null,
Expand Down Expand Up @@ -253,17 +267,17 @@ export default class ReactCSSTransitionReplace extends React.Component {
}

render() {
const {currentChild, currentChildKey, nextChild, nextChildKey, height, width, isLeaving} = this.state
const {currentChild, currentChildKey, nextChild, nextChildKey, height, width, isLeaving, activeHeightTransition} = this.state
const childrenToRender = []

const {
overflowHidden, transitionName, changeWidth, component,
transitionAppear, transitionEnter, transitionLeave,
transitionAppearTimeout, transitionEnterTimeout, transitionLeaveTimeout,
...containerProps,
...containerProps
} = this.props

if (currentChild) {
if (currentChild && !nextChild && !transitionLeave || currentChild && transitionLeave) {
childrenToRender.push(
React.createElement(
'span',
Expand All @@ -281,7 +295,14 @@ export default class ReactCSSTransitionReplace extends React.Component {
? transitionName.height || ''
: `${transitionName}-height`

containerProps.className = `${containerProps.className || ''} ${heightClassName}`
// Similarly to ReactCSSTransitionGroup, adding `-height-active` suffix to the
// container when we are transitioning height.
const activeHeightClassName = (nextChild && activeHeightTransition && heightClassName)
? `${heightClassName}-active`
: ''

containerProps.className = `${containerProps.className || ''} ${heightClassName} ${activeHeightClassName}`

containerProps.style = {
...containerProps.style,
position: 'relative',
Expand Down