From 91cacb1e8f9b2cb20a7cda2195b91d7d85c494e9 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sat, 8 Jul 2017 18:34:55 +0200
Subject: [PATCH] fix: Rerender Bundle on route change (#4120)
---
.../features/ui/util/react_router_helpers.js | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/app/javascript/mastodon/features/ui/util/react_router_helpers.js b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
index e33a6df6f4..ede578e560 100644
--- a/app/javascript/mastodon/features/ui/util/react_router_helpers.js
+++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
@@ -31,13 +31,11 @@ export class WrappedRoute extends React.Component {
}
renderComponent = ({ match }) => {
- this.match = match; // Needed for this.renderBundle
-
- const { component } = this.props;
+ const { component, content, multiColumn } = this.props;
return (
<BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
- {this.renderBundle}
+ {Component => <Component params={match.params} multiColumn={multiColumn}>{content}</Component>}
</BundleContainer>
);
}
@@ -50,12 +48,6 @@ export class WrappedRoute extends React.Component {
return <BundleColumnError {...props} />;
}
- renderBundle = (Component) => {
- const { match: { params }, props: { content, multiColumn } } = this;
-
- return <Component params={params} multiColumn={multiColumn}>{content}</Component>;
- }
-
render () {
const { component: Component, content, ...rest } = this.props;
--
GitLab