Skip to content

Fix animations examples #2454

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 2 commits into from
Nov 2, 2015
Merged

Fix animations examples #2454

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
1666ef4
Fix the animations example
taion Nov 2, 2015
a6b6374
Update nested animations example
taion Nov 2, 2015
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
56 changes: 48 additions & 8 deletions examples/animations/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react'
import { render } from 'react-dom'
import ReactCSSTransitionGroup from 'react-addons-css-transition-group'
import StaticContainer from 'react-static-container'
import { createHistory, useBasename } from 'history'
import { Router, Route, Link } from 'react-router'

Expand All @@ -10,23 +11,62 @@ const history = useBasename(createHistory)({
basename: '/animations'
})

class App extends React.Component {
class RouteCSSTransitionGroup extends React.Component {
static contextTypes = {
location: React.PropTypes.object
}

constructor(props, context) {
super(props, context)

this.state = {
previousPathname: null
}
}

componentWillReceiveProps(nextProps, nextContext) {
if (nextContext.location.pathname !== this.context.location.pathname) {
this.setState({ previousPathname: this.context.location.pathname })
}
}

render() {
const { pathname } = this.props.location
const { children, ...props } = this.props
const { previousPathname } = this.state

return (
<ReactCSSTransitionGroup {...props}>
<StaticContainer
key={previousPathname || this.context.location.pathname}
shouldUpdate={!previousPathname}
>
{children}
</StaticContainer>
</ReactCSSTransitionGroup>
)
}

componentDidUpdate() {
if (this.state.previousPathname) {
this.setState({ previousPathname: null })
}
}
}

class App extends React.Component {
render() {
return (
<div>
<ul>
<li><Link to="/page1">Page 1</Link></li>
<li><Link to="/page2">Page 2</Link></li>
</ul>
<ReactCSSTransitionGroup component="div"
transitionName="example"
transitionEnterTimeout={500}
transitionLeaveTimeout={500}
<RouteCSSTransitionGroup
component="div" transitionName="example"
transitionEnterTimeout={500} transitionLeaveTimeout={500}
>
{React.cloneElement(this.props.children || <div />, { key: pathname })}
</ReactCSSTransitionGroup>
{this.props.children}
</RouteCSSTransitionGroup>
</div>
)
}
Expand Down
15 changes: 12 additions & 3 deletions examples/nested-animations/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ class App extends React.Component {
<li><Link to="/page1">Page 1</Link></li>
<li><Link to="/page2">Page 2</Link></li>
</ul>
<ReactCSSTransitionGroup component="div" transitionName="swap">
<ReactCSSTransitionGroup
component="div" transitionName="swap"
transitionEnterTimeout={500} transitionLeaveTimeout={500}
>
{React.cloneElement(this.props.children || <div />, { key: key })}
</ReactCSSTransitionGroup>
</div>
Expand All @@ -42,7 +45,10 @@ class Page1 extends React.Component {
<li><Link to="/page1/tab1">Tab 1</Link></li>
<li><Link to="/page1/tab2">Tab 2</Link></li>
</ul>
<ReactCSSTransitionGroup component="div" transitionName="example">
<ReactCSSTransitionGroup
component="div" transitionName="example"
transitionEnterTimeout={500} transitionLeaveTimeout={500}
>
{React.cloneElement(this.props.children || <div/>, { key: pathname })}
</ReactCSSTransitionGroup>
</div>
Expand All @@ -61,7 +67,10 @@ class Page2 extends React.Component {
<li><Link to="/page2/tab1">Tab 1</Link></li>
<li><Link to="/page2/tab2">Tab 2</Link></li>
</ul>
<ReactCSSTransitionGroup component="div" transitionName="example">
<ReactCSSTransitionGroup
component="div" transitionName="example"
transitionEnterTimeout={500} transitionLeaveTimeout={500}
>
{React.cloneElement(this.props.children || <div/>, { key: pathname })}
</ReactCSSTransitionGroup>
</div>
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"react-addons-css-transition-group": "^0.14.0",
"react-addons-test-utils": "0.14.0",
"react-dom": "^0.14.0",
"react-static-container": "^1.0.0",
"rf-changelog": "^0.4.0",
"style-loader": "^0.12.4",
"webpack": "^1.4.13",
Expand Down