From 11c992b04f3cad6badf0ae86da65f490e31dd359 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Sat, 4 Dec 2021 10:51:16 +0100 Subject: chore: upgrade react-jss to latest (#2302) --- src/features/webControls/components/WebControls.js | 6 +++--- src/features/webControls/containers/WebControlsScreen.js | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src/features/webControls') diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index 5650d4cd1..99d78eda0 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js @@ -94,8 +94,6 @@ const styles = theme => ({ }, }); -@injectSheet(styles) -@observer class WebControls extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -238,4 +236,6 @@ class WebControls extends Component { } } -export default injectIntl(WebControls); +export default injectIntl( + injectSheet(styles, { injectTheme: true })(observer(WebControls)), +); diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.js index 6fba5db86..3dac6997c 100644 --- a/src/features/webControls/containers/WebControlsScreen.js +++ b/src/features/webControls/containers/WebControlsScreen.js @@ -16,8 +16,6 @@ const URL_EVENTS = [ 'did-navigate-in-page', ]; -@inject('stores', 'actions') -@observer class WebControlsScreen extends Component { @observable url = ''; @@ -125,9 +123,9 @@ class WebControlsScreen extends Component { } } -export default WebControlsScreen; +export default inject('stores', 'actions')(observer(WebControlsScreen)); -WebControlsScreen.wrappedComponent.propTypes = { +WebControlsScreen.propTypes = { service: PropTypes.instanceOf(Service).isRequired, stores: PropTypes.shape({ services: PropTypes.instanceOf(ServicesStore).isRequired, -- cgit v1.2.3-70-g09d2