tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Rerender Bundle on route change (#4120)

Browse Source
This commit is contained in:
Sorin Davidoi
2017-07-08 18:34:55 +02:00
committed by Eugen Rochko
parent 46f5d3a2e9
commit 91cacb1e8f
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/mastodon/features/ui/util/react_router_helpers.js
View File

@@ -31,13 +31,11 @@ export class WrappedRoute extends React.Component {
} }
renderComponent = ({ match }) => { renderComponent = ({ match }) => {
this.match = match; // Needed for this.renderBundle const { component, content, multiColumn } = this.props;
const { component } = this.props;
return ( return (
<BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}> <BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
{this.renderBundle} {Component => <Component params={match.params} multiColumn={multiColumn}>{content}</Component>}
</BundleContainer> </BundleContainer>
); );
} }
@@ -50,12 +48,6 @@ export class WrappedRoute extends React.Component {
return <BundleColumnError {...props} />; return <BundleColumnError {...props} />;
} }
renderBundle = (Component) => {
const { match: { params }, props: { content, multiColumn } } = this;
return <Component params={params} multiColumn={multiColumn}>{content}</Component>;
}
render () { render () {
const { component: Component, content, ...rest } = this.props; const { component: Component, content, ...rest } = this.props;