Skip to content

Commit 9fb2615

Browse files
committed
Update animations example
Also, added TODO about why it's still broken.
1 parent 43c7ee8 commit 9fb2615

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

examples/animations/app.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
/** @jsx React.DOM */
21
// TODO: animations aren't happening, not sure what the problem is
32
var React = require('react');
43
var TransitionGroup = require('react/lib/ReactCSSTransitionGroup');
54
var Router = require('react-router');
6-
var { Route, Link, ActiveRouteHandler, ActiveState } = Router;
5+
var { Route, RouteHandler, Link } = Router;
76

87
var App = React.createClass({
9-
mixins: [ActiveState],
8+
mixins: [ Router.State ],
109

1110
render: function () {
12-
var name = this.getActiveRoutes().reverse()[0].name;
11+
var name = this.getRoutes().reverse()[0].name;
12+
1313
return (
1414
<div>
1515
<ul>
1616
<li><Link to="page1">Page 1</Link></li>
1717
<li><Link to="page2">Page 2</Link></li>
1818
</ul>
1919
<TransitionGroup component="div" transitionName="example">
20-
<ActiveRouteHandler key={name} />
20+
<RouteHandler key={name}/>
2121
</TransitionGroup>
2222
</div>
2323
);
@@ -53,6 +53,6 @@ var routes = (
5353
</Route>
5454
);
5555

56-
var el = document.getElementById('example');
57-
Router.run(routes, (Handler) => React.render(<Handler/>, el));
58-
56+
Router.run(routes, function (Handler) {
57+
React.render(<Handler/>, document.getElementById('example'));
58+
});

modules/mixins/RouteHandlerContext.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ var RouteHandlerContext = {
99
pushRouteHandlerElement: function (element) {
1010
var elements = this.getElements();
1111

12+
13+
// TODO: This breaks the animation example because the old element
14+
// is still in the page while we transition to the new one.
1215
invariant(
1316
!elements.some(function (el) {
1417
return el._owner === element._owner

0 commit comments

Comments
 (0)