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/components/layout | |
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/components/layout')
-rw-r--r-- | src/components/layout/AppLayout.js | 6 | ||||
-rw-r--r-- | src/components/layout/Sidebar.js | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index a31419a5e..084d93ecd 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -74,8 +74,6 @@ const toggleFullScreen = () => { | |||
74 | ipcRenderer.send('window.toolbar-double-clicked'); | 74 | ipcRenderer.send('window.toolbar-double-clicked'); |
75 | }; | 75 | }; |
76 | 76 | ||
77 | @injectSheet(styles) | ||
78 | @observer | ||
79 | class AppLayout extends Component { | 77 | class AppLayout extends Component { |
80 | static propTypes = { | 78 | static propTypes = { |
81 | classes: PropTypes.object.isRequired, | 79 | classes: PropTypes.object.isRequired, |
@@ -208,4 +206,6 @@ class AppLayout extends Component { | |||
208 | } | 206 | } |
209 | } | 207 | } |
210 | 208 | ||
211 | export default injectIntl(AppLayout); | 209 | export default injectIntl( |
210 | injectSheet(styles, { injectTheme: true })(observer(AppLayout)), | ||
211 | ); | ||
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 728613f42..4f67a8719 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -66,8 +66,6 @@ const messages = defineMessages({ | |||
66 | }, | 66 | }, |
67 | }); | 67 | }); |
68 | 68 | ||
69 | @inject('stores', 'actions') | ||
70 | @observer | ||
71 | class Sidebar extends Component { | 69 | class Sidebar extends Component { |
72 | static propTypes = { | 70 | static propTypes = { |
73 | openSettings: PropTypes.func.isRequired, | 71 | openSettings: PropTypes.func.isRequired, |
@@ -262,4 +260,4 @@ class Sidebar extends Component { | |||
262 | } | 260 | } |
263 | } | 261 | } |
264 | 262 | ||
265 | export default injectIntl(Sidebar); | 263 | export default injectIntl(inject('stores', 'actions')(observer(Sidebar))); |