diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-12-04 10:51:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-04 10:51:16 +0100 |
commit | 11c992b04f3cad6badf0ae86da65f490e31dd359 (patch) | |
tree | 749e63f6ba3e9bea48c186b5d8502d328edfd276 /src/features/webControls | |
parent | 5.6.4-nightly.24 [skip ci] (diff) | |
download | ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.gz ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.zst ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.zip |
chore: upgrade react-jss to latest (#2302)
Diffstat (limited to 'src/features/webControls')
-rw-r--r-- | src/features/webControls/components/WebControls.js | 6 | ||||
-rw-r--r-- | src/features/webControls/containers/WebControlsScreen.js | 6 |
2 files changed, 5 insertions, 7 deletions
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 => ({ | |||
94 | }, | 94 | }, |
95 | }); | 95 | }); |
96 | 96 | ||
97 | @injectSheet(styles) | ||
98 | @observer | ||
99 | class WebControls extends Component { | 97 | class WebControls extends Component { |
100 | static propTypes = { | 98 | static propTypes = { |
101 | classes: PropTypes.object.isRequired, | 99 | classes: PropTypes.object.isRequired, |
@@ -238,4 +236,6 @@ class WebControls extends Component { | |||
238 | } | 236 | } |
239 | } | 237 | } |
240 | 238 | ||
241 | export default injectIntl(WebControls); | 239 | export default injectIntl( |
240 | injectSheet(styles, { injectTheme: true })(observer(WebControls)), | ||
241 | ); | ||
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 = [ | |||
16 | 'did-navigate-in-page', | 16 | 'did-navigate-in-page', |
17 | ]; | 17 | ]; |
18 | 18 | ||
19 | @inject('stores', 'actions') | ||
20 | @observer | ||
21 | class WebControlsScreen extends Component { | 19 | class WebControlsScreen extends Component { |
22 | @observable url = ''; | 20 | @observable url = ''; |
23 | 21 | ||
@@ -125,9 +123,9 @@ class WebControlsScreen extends Component { | |||
125 | } | 123 | } |
126 | } | 124 | } |
127 | 125 | ||
128 | export default WebControlsScreen; | 126 | export default inject('stores', 'actions')(observer(WebControlsScreen)); |
129 | 127 | ||
130 | WebControlsScreen.wrappedComponent.propTypes = { | 128 | WebControlsScreen.propTypes = { |
131 | service: PropTypes.instanceOf(Service).isRequired, | 129 | service: PropTypes.instanceOf(Service).isRequired, |
132 | stores: PropTypes.shape({ | 130 | stores: PropTypes.shape({ |
133 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 131 | services: PropTypes.instanceOf(ServicesStore).isRequired, |