diff options
Diffstat (limited to 'src')
116 files changed, 310 insertions, 398 deletions
diff --git a/src/I18n.tsx b/src/I18n.tsx index 39b5273c1..5d969da1f 100644 --- a/src/I18n.tsx +++ b/src/I18n.tsx | |||
@@ -16,8 +16,6 @@ type Props = { | |||
16 | children: ReactNode; | 16 | children: ReactNode; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | @inject('stores') | ||
20 | @observer | ||
21 | class I18N extends Component<Props> { | 19 | class I18N extends Component<Props> { |
22 | componentDidUpdate() { | 20 | componentDidUpdate() { |
23 | window['ferdi'].menu.rebuild(); | 21 | window['ferdi'].menu.rebuild(); |
@@ -39,4 +37,4 @@ class I18N extends Component<Props> { | |||
39 | } | 37 | } |
40 | } | 38 | } |
41 | 39 | ||
42 | export default I18N; | 40 | export default inject('stores')(observer(I18N)); |
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index f26282cfc..94ff5d54d 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -19,7 +19,6 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar'; | |||
19 | import { GITHUB_FERDI_URL } from '../../config'; | 19 | import { GITHUB_FERDI_URL } from '../../config'; |
20 | import { Icon } from '../ui/icon'; | 20 | import { Icon } from '../ui/icon'; |
21 | 21 | ||
22 | @observer | ||
23 | class AuthLayout extends Component { | 22 | class AuthLayout extends Component { |
24 | static propTypes = { | 23 | static propTypes = { |
25 | children: oneOrManyChildElements.isRequired, | 24 | children: oneOrManyChildElements.isRequired, |
@@ -107,4 +106,4 @@ class AuthLayout extends Component { | |||
107 | } | 106 | } |
108 | } | 107 | } |
109 | 108 | ||
110 | export default injectIntl(AuthLayout); | 109 | export default injectIntl(observer(AuthLayout)); |
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 9aeebc5c8..c284c0d19 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js | |||
@@ -34,7 +34,6 @@ const messages = defineMessages({ | |||
34 | }, | 34 | }, |
35 | }); | 35 | }); |
36 | 36 | ||
37 | @observer | ||
38 | class ChangeServer extends Component { | 37 | class ChangeServer extends Component { |
39 | static propTypes = { | 38 | static propTypes = { |
40 | onSubmit: PropTypes.func.isRequired, | 39 | onSubmit: PropTypes.func.isRequired, |
@@ -131,4 +130,4 @@ class ChangeServer extends Component { | |||
131 | } | 130 | } |
132 | } | 131 | } |
133 | 132 | ||
134 | export default injectIntl(ChangeServer); | 133 | export default injectIntl(observer(ChangeServer)); |
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index fe2fe9872..8f70318ed 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js | |||
@@ -28,7 +28,6 @@ const messages = defineMessages({ | |||
28 | }, | 28 | }, |
29 | }); | 29 | }); |
30 | 30 | ||
31 | @observer | ||
32 | class Import extends Component { | 31 | class Import extends Component { |
33 | static propTypes = { | 32 | static propTypes = { |
34 | services: MobxPropTypes.arrayOrObservableArray.isRequired, | 33 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -166,4 +165,4 @@ class Import extends Component { | |||
166 | } | 165 | } |
167 | } | 166 | } |
168 | 167 | ||
169 | export default injectIntl(Import); | 168 | export default injectIntl(observer(Import)); |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index dd71c2450..a23af7c6b 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -43,7 +43,6 @@ const messages = defineMessages({ | |||
43 | }, | 43 | }, |
44 | }); | 44 | }); |
45 | 45 | ||
46 | @observer | ||
47 | class Invite extends Component { | 46 | class Invite extends Component { |
48 | static propTypes = { | 47 | static propTypes = { |
49 | onSubmit: PropTypes.func.isRequired, | 48 | onSubmit: PropTypes.func.isRequired, |
@@ -198,4 +197,4 @@ class Invite extends Component { | |||
198 | } | 197 | } |
199 | } | 198 | } |
200 | 199 | ||
201 | export default injectIntl(Invite); | 200 | export default injectIntl(observer(Invite)); |
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 5b36b9fc2..2ed429199 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -48,7 +48,6 @@ const messages = defineMessages({ | |||
48 | }, | 48 | }, |
49 | }); | 49 | }); |
50 | 50 | ||
51 | @observer | ||
52 | class Locked extends Component { | 51 | class Locked extends Component { |
53 | static propTypes = { | 52 | static propTypes = { |
54 | onSubmit: PropTypes.func.isRequired, | 53 | onSubmit: PropTypes.func.isRequired, |
@@ -149,4 +148,4 @@ class Locked extends Component { | |||
149 | } | 148 | } |
150 | } | 149 | } |
151 | 150 | ||
152 | export default injectIntl(Locked); | 151 | export default injectIntl(observer(Locked)); |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 0c327d67e..c1602a047 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -71,8 +71,6 @@ const messages = defineMessages({ | |||
71 | }, | 71 | }, |
72 | }); | 72 | }); |
73 | 73 | ||
74 | @inject('actions') | ||
75 | @observer | ||
76 | class Login extends Component { | 74 | class Login extends Component { |
77 | static propTypes = { | 75 | static propTypes = { |
78 | onSubmit: PropTypes.func.isRequired, | 76 | onSubmit: PropTypes.func.isRequired, |
@@ -215,4 +213,4 @@ class Login extends Component { | |||
215 | } | 213 | } |
216 | } | 214 | } |
217 | 215 | ||
218 | export default injectIntl(Login); | 216 | export default injectIntl(inject('actions')(observer(Login))); |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index d5bc7fa80..b4d51f43d 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -38,7 +38,6 @@ const messages = defineMessages({ | |||
38 | }, | 38 | }, |
39 | }); | 39 | }); |
40 | 40 | ||
41 | @observer | ||
42 | class Password extends Component { | 41 | class Password extends Component { |
43 | static propTypes = { | 42 | static propTypes = { |
44 | onSubmit: PropTypes.func.isRequired, | 43 | onSubmit: PropTypes.func.isRequired, |
@@ -119,4 +118,4 @@ class Password extends Component { | |||
119 | } | 118 | } |
120 | } | 119 | } |
121 | 120 | ||
122 | export default injectIntl(Password); | 121 | export default injectIntl(observer(Password)); |
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index 47fe88f43..a24f4e4d5 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js | |||
@@ -131,8 +131,6 @@ const styles = theme => ({ | |||
131 | }, | 131 | }, |
132 | }); | 132 | }); |
133 | 133 | ||
134 | @injectSheet(styles) | ||
135 | @observer | ||
136 | class SetupAssistant extends Component { | 134 | class SetupAssistant extends Component { |
137 | static propTypes = { | 135 | static propTypes = { |
138 | classes: PropTypes.object.isRequired, | 136 | classes: PropTypes.object.isRequired, |
@@ -327,4 +325,6 @@ class SetupAssistant extends Component { | |||
327 | } | 325 | } |
328 | } | 326 | } |
329 | 327 | ||
330 | export default injectIntl(SetupAssistant); | 328 | export default injectIntl( |
329 | injectSheet(styles, { injectTheme: true })(observer(SetupAssistant)), | ||
330 | ); | ||
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 00625a3ac..ac86dcdc3 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -75,8 +75,6 @@ const messages = defineMessages({ | |||
75 | }, | 75 | }, |
76 | }); | 76 | }); |
77 | 77 | ||
78 | @inject('actions') | ||
79 | @observer | ||
80 | class Signup extends Component { | 78 | class Signup extends Component { |
81 | static propTypes = { | 79 | static propTypes = { |
82 | onSubmit: PropTypes.func.isRequired, | 80 | onSubmit: PropTypes.func.isRequired, |
@@ -217,4 +215,4 @@ class Signup extends Component { | |||
217 | } | 215 | } |
218 | } | 216 | } |
219 | 217 | ||
220 | export default injectIntl(Signup); | 218 | export default injectIntl(inject('actions')(observer(Signup))); |
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 809ec67a7..794c78987 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -22,8 +22,6 @@ const messages = defineMessages({ | |||
22 | }, | 22 | }, |
23 | }); | 23 | }); |
24 | 24 | ||
25 | @inject('actions') | ||
26 | @observer | ||
27 | class Login extends Component { | 25 | class Login extends Component { |
28 | static propTypes = { | 26 | static propTypes = { |
29 | loginRoute: PropTypes.string.isRequired, | 27 | loginRoute: PropTypes.string.isRequired, |
@@ -93,4 +91,4 @@ class Login extends Component { | |||
93 | } | 91 | } |
94 | } | 92 | } |
95 | 93 | ||
96 | export default injectIntl(Login); | 94 | export default injectIntl(inject('actions')(observer(Login))); |
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))); |
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index b9e7eca53..5adb22c84 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js | |||
@@ -68,8 +68,6 @@ const styles = theme => ({ | |||
68 | }, | 68 | }, |
69 | }); | 69 | }); |
70 | 70 | ||
71 | @injectSheet(styles) | ||
72 | @observer | ||
73 | class ConnectionLostBanner extends Component { | 71 | class ConnectionLostBanner extends Component { |
74 | static propTypes = { | 72 | static propTypes = { |
75 | classes: PropTypes.object.isRequired, | 73 | classes: PropTypes.object.isRequired, |
@@ -103,4 +101,4 @@ class ConnectionLostBanner extends Component { | |||
103 | } | 101 | } |
104 | } | 102 | } |
105 | 103 | ||
106 | export default injectIntl(ConnectionLostBanner); | 104 | export default injectIntl(injectSheet(styles)(observer(ConnectionLostBanner))); |
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js index 5c93de80f..d605b3a52 100644 --- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js +++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js | |||
@@ -31,8 +31,6 @@ const messages = defineMessages({ | |||
31 | }, | 31 | }, |
32 | }); | 32 | }); |
33 | 33 | ||
34 | @injectSheet(styles) | ||
35 | @observer | ||
36 | class WebviewErrorHandler extends Component { | 34 | class WebviewErrorHandler extends Component { |
37 | static propTypes = { | 35 | static propTypes = { |
38 | name: PropTypes.string.isRequired, | 36 | name: PropTypes.string.isRequired, |
@@ -71,4 +69,6 @@ class WebviewErrorHandler extends Component { | |||
71 | } | 69 | } |
72 | } | 70 | } |
73 | 71 | ||
74 | export default injectIntl(WebviewErrorHandler); | 72 | export default injectIntl( |
73 | injectSheet(styles, { injectTheme: true })(observer(WebviewErrorHandler)), | ||
74 | ); | ||
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index f60d4bca6..b4658618e 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js | |||
@@ -16,7 +16,6 @@ const messages = defineMessages({ | |||
16 | }, | 16 | }, |
17 | }); | 17 | }); |
18 | 18 | ||
19 | @observer | ||
20 | class ServiceDisabled extends Component { | 19 | class ServiceDisabled extends Component { |
21 | static propTypes = { | 20 | static propTypes = { |
22 | name: PropTypes.string.isRequired, | 21 | name: PropTypes.string.isRequired, |
@@ -40,4 +39,4 @@ class ServiceDisabled extends Component { | |||
40 | } | 39 | } |
41 | } | 40 | } |
42 | 41 | ||
43 | export default injectIntl(ServiceDisabled); | 42 | export default injectIntl(observer(ServiceDisabled)); |
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 1ffdd2153..6fc1f1400 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -16,8 +16,6 @@ import SettingsStore from '../../../stores/SettingsStore'; | |||
16 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | 16 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; |
17 | import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config'; | 17 | import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config'; |
18 | 18 | ||
19 | @inject('stores', 'actions') | ||
20 | @observer | ||
21 | class ServiceView extends Component { | 19 | class ServiceView extends Component { |
22 | static propTypes = { | 20 | static propTypes = { |
23 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 21 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
@@ -163,4 +161,4 @@ class ServiceView extends Component { | |||
163 | } | 161 | } |
164 | } | 162 | } |
165 | 163 | ||
166 | export default ServiceView; | 164 | export default inject('stores', 'actions')(observer(ServiceView)); |
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index c70494edd..713a0c21d 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -9,7 +9,6 @@ import ServiceModel from '../../../models/Service'; | |||
9 | 9 | ||
10 | const debug = require('debug')('Ferdi:Services'); | 10 | const debug = require('debug')('Ferdi:Services'); |
11 | 11 | ||
12 | @observer | ||
13 | class ServiceWebview extends Component { | 12 | class ServiceWebview extends Component { |
14 | static propTypes = { | 13 | static propTypes = { |
15 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 14 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
@@ -116,4 +115,4 @@ class ServiceWebview extends Component { | |||
116 | } | 115 | } |
117 | } | 116 | } |
118 | 117 | ||
119 | export default ServiceWebview; | 118 | export default observer(ServiceWebview); |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 1edf31bd3..0587b553f 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -44,9 +44,6 @@ const styles = { | |||
44 | }, | 44 | }, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | @injectSheet(styles) | ||
48 | @inject('actions') | ||
49 | @observer | ||
50 | class Services extends Component { | 47 | class Services extends Component { |
51 | static propTypes = { | 48 | static propTypes = { |
52 | services: MobxPropTypes.arrayOrObservableArray, | 49 | services: MobxPropTypes.arrayOrObservableArray, |
@@ -197,4 +194,8 @@ class Services extends Component { | |||
197 | } | 194 | } |
198 | } | 195 | } |
199 | 196 | ||
200 | export default injectIntl(Services); | 197 | export default injectIntl( |
198 | injectSheet(styles, { injectTheme: true })( | ||
199 | inject('actions')(observer(Services)), | ||
200 | ), | ||
201 | ); | ||
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 3607435b3..1ca5ba415 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
@@ -26,7 +26,6 @@ const messages = defineMessages({ | |||
26 | }, | 26 | }, |
27 | }); | 27 | }); |
28 | 28 | ||
29 | @observer | ||
30 | class WebviewCrashHandler extends Component { | 29 | class WebviewCrashHandler extends Component { |
31 | static propTypes = { | 30 | static propTypes = { |
32 | name: PropTypes.string.isRequired, | 31 | name: PropTypes.string.isRequired, |
@@ -81,4 +80,4 @@ class WebviewCrashHandler extends Component { | |||
81 | } | 80 | } |
82 | } | 81 | } |
83 | 82 | ||
84 | export default injectIntl(WebviewCrashHandler); | 83 | export default injectIntl(observer(WebviewCrashHandler)); |
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js index 3049b6efa..e01461e5c 100644 --- a/src/components/services/tabs/TabBarSortableList.js +++ b/src/components/services/tabs/TabBarSortableList.js | |||
@@ -5,7 +5,6 @@ import { SortableContainer } from 'react-sortable-hoc'; | |||
5 | 5 | ||
6 | import TabItem from './TabItem'; | 6 | import TabItem from './TabItem'; |
7 | 7 | ||
8 | @observer | ||
9 | class TabBarSortableList extends Component { | 8 | class TabBarSortableList extends Component { |
10 | static propTypes = { | 9 | static propTypes = { |
11 | services: MobxPropTypes.arrayOrObservableArray.isRequired, | 10 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -75,4 +74,4 @@ class TabBarSortableList extends Component { | |||
75 | } | 74 | } |
76 | } | 75 | } |
77 | 76 | ||
78 | export default SortableContainer(TabBarSortableList); | 77 | export default SortableContainer(observer(TabBarSortableList)); |
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 14be37153..8e163bce6 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -114,9 +114,6 @@ const styles = { | |||
114 | }, | 114 | }, |
115 | }; | 115 | }; |
116 | 116 | ||
117 | @injectSheet(styles) | ||
118 | @inject('stores') | ||
119 | @observer | ||
120 | class TabItem extends Component { | 117 | class TabItem extends Component { |
121 | static propTypes = { | 118 | static propTypes = { |
122 | classes: PropTypes.object.isRequired, | 119 | classes: PropTypes.object.isRequired, |
@@ -402,4 +399,10 @@ class TabItem extends Component { | |||
402 | } | 399 | } |
403 | } | 400 | } |
404 | 401 | ||
405 | export default injectIntl(SortableElement(TabItem)); | 402 | export default injectIntl( |
403 | SortableElement( | ||
404 | injectSheet(styles, { injectTheme: true })( | ||
405 | inject('stores')(observer(TabItem)), | ||
406 | ), | ||
407 | ), | ||
408 | ); | ||
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index 94d6f33c1..d9e11df41 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -4,7 +4,6 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | |||
4 | 4 | ||
5 | import TabBarSortableList from './TabBarSortableList'; | 5 | import TabBarSortableList from './TabBarSortableList'; |
6 | 6 | ||
7 | @observer | ||
8 | class TabBar extends Component { | 7 | class TabBar extends Component { |
9 | static propTypes = { | 8 | static propTypes = { |
10 | services: MobxPropTypes.arrayOrObservableArray.isRequired, | 9 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -120,4 +119,4 @@ class TabBar extends Component { | |||
120 | } | 119 | } |
121 | } | 120 | } |
122 | 121 | ||
123 | export default TabBar; | 122 | export default observer(TabBar); |
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index e9119a944..de13e95ab 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js | |||
@@ -16,7 +16,6 @@ const messages = defineMessages({ | |||
16 | }, | 16 | }, |
17 | }); | 17 | }); |
18 | 18 | ||
19 | @observer | ||
20 | class SettingsLayout extends Component { | 19 | class SettingsLayout extends Component { |
21 | static propTypes = { | 20 | static propTypes = { |
22 | navigation: PropTypes.element.isRequired, | 21 | navigation: PropTypes.element.isRequired, |
@@ -78,4 +77,4 @@ class SettingsLayout extends Component { | |||
78 | } | 77 | } |
79 | } | 78 | } |
80 | 79 | ||
81 | export default injectIntl(SettingsLayout); | 80 | export default injectIntl(observer(SettingsLayout)); |
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 6c489e64b..d0c56af05 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -64,7 +64,6 @@ const messages = defineMessages({ | |||
64 | }, | 64 | }, |
65 | }); | 65 | }); |
66 | 66 | ||
67 | @observer | ||
68 | class AccountDashboard extends Component { | 67 | class AccountDashboard extends Component { |
69 | static propTypes = { | 68 | static propTypes = { |
70 | user: MobxPropTypes.observableObject.isRequired, | 69 | user: MobxPropTypes.observableObject.isRequired, |
@@ -229,4 +228,4 @@ class AccountDashboard extends Component { | |||
229 | } | 228 | } |
230 | } | 229 | } |
231 | 230 | ||
232 | export default injectIntl(AccountDashboard); | 231 | export default injectIntl(observer(AccountDashboard)); |
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index dbb1365b0..2fdb6e574 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -42,8 +42,6 @@ const messages = defineMessages({ | |||
42 | }, | 42 | }, |
43 | }); | 43 | }); |
44 | 44 | ||
45 | @inject('stores', 'actions') | ||
46 | @observer | ||
47 | class SettingsNavigation extends Component { | 45 | class SettingsNavigation extends Component { |
48 | static propTypes = { | 46 | static propTypes = { |
49 | stores: PropTypes.shape({ | 47 | stores: PropTypes.shape({ |
@@ -175,4 +173,4 @@ class SettingsNavigation extends Component { | |||
175 | } | 173 | } |
176 | } | 174 | } |
177 | 175 | ||
178 | export default injectIntl(SettingsNavigation); | 176 | export default injectIntl(inject('stores', 'actions')(observer(SettingsNavigation))); |
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js index 1e910e6dc..df5b42222 100644 --- a/src/components/settings/recipes/RecipeItem.js +++ b/src/components/settings/recipes/RecipeItem.js | |||
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; | |||
4 | 4 | ||
5 | import RecipePreviewModel from '../../../models/RecipePreview'; | 5 | import RecipePreviewModel from '../../../models/RecipePreview'; |
6 | 6 | ||
7 | @observer | ||
8 | class RecipeItem extends Component { | 7 | class RecipeItem extends Component { |
9 | static propTypes = { | 8 | static propTypes = { |
10 | recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, | 9 | recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, |
@@ -31,4 +30,4 @@ class RecipeItem extends Component { | |||
31 | } | 30 | } |
32 | } | 31 | } |
33 | 32 | ||
34 | export default RecipeItem; | 33 | export default observer(RecipeItem); |
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 7ec285431..d9f53d74e 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -105,8 +105,6 @@ const styles = { | |||
105 | }, | 105 | }, |
106 | }; | 106 | }; |
107 | 107 | ||
108 | @injectSheet(styles) | ||
109 | @observer | ||
110 | class RecipesDashboard extends Component { | 108 | class RecipesDashboard extends Component { |
111 | static propTypes = { | 109 | static propTypes = { |
112 | recipes: MobxPropTypes.arrayOrObservableArray.isRequired, | 110 | recipes: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -247,16 +245,18 @@ class RecipesDashboard extends Component { | |||
247 | {intl.formatMessage(messages.nothingFound)} | 245 | {intl.formatMessage(messages.nothingFound)} |
248 | </p> | 246 | </p> |
249 | 247 | ||
250 | <RecipeItem | 248 | {customWebsiteRecipe && customWebsiteRecipe.id && ( |
251 | key={customWebsiteRecipe.id} | 249 | <RecipeItem |
252 | recipe={customWebsiteRecipe} | 250 | key={customWebsiteRecipe.id} |
253 | onClick={() => | 251 | recipe={customWebsiteRecipe} |
254 | isLoggedIn && | 252 | onClick={() => |
255 | showAddServiceInterface({ | 253 | isLoggedIn && |
256 | recipeId: customWebsiteRecipe.id, | 254 | showAddServiceInterface({ |
257 | }) | 255 | recipeId: customWebsiteRecipe.id, |
258 | } | 256 | }) |
259 | /> | 257 | } |
258 | /> | ||
259 | )} | ||
260 | </div> | 260 | </div> |
261 | )} | 261 | )} |
262 | {communityRecipes.map(recipe => ( | 262 | {communityRecipes.map(recipe => ( |
@@ -295,4 +295,6 @@ class RecipesDashboard extends Component { | |||
295 | } | 295 | } |
296 | } | 296 | } |
297 | 297 | ||
298 | export default injectIntl(RecipesDashboard); | 298 | export default injectIntl( |
299 | injectSheet(styles, { injectTheme: true })(observer(RecipesDashboard)), | ||
300 | ); | ||
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 6b4cc721d..f0e791b87 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -134,7 +134,6 @@ const messages = defineMessages({ | |||
134 | }, | 134 | }, |
135 | }); | 135 | }); |
136 | 136 | ||
137 | @observer | ||
138 | class EditServiceForm extends Component { | 137 | class EditServiceForm extends Component { |
139 | static propTypes = { | 138 | static propTypes = { |
140 | recipe: PropTypes.instanceOf(Recipe).isRequired, | 139 | recipe: PropTypes.instanceOf(Recipe).isRequired, |
@@ -500,4 +499,4 @@ class EditServiceForm extends Component { | |||
500 | } | 499 | } |
501 | } | 500 | } |
502 | 501 | ||
503 | export default injectIntl(EditServiceForm); | 502 | export default injectIntl(observer(EditServiceForm)); |
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index 6dd53a102..bcbbca3de 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js | |||
@@ -25,7 +25,6 @@ const messages = defineMessages({ | |||
25 | }, | 25 | }, |
26 | }); | 26 | }); |
27 | 27 | ||
28 | @observer | ||
29 | class ServiceError extends Component { | 28 | class ServiceError extends Component { |
30 | render() { | 29 | render() { |
31 | const { intl } = this.props; | 30 | const { intl } = this.props; |
@@ -60,4 +59,4 @@ class ServiceError extends Component { | |||
60 | } | 59 | } |
61 | } | 60 | } |
62 | 61 | ||
63 | export default injectIntl(ServiceError); | 62 | export default injectIntl(observer(ServiceError)); |
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index d83e5fd56..23250ad09 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js | |||
@@ -24,7 +24,6 @@ const messages = defineMessages({ | |||
24 | }, | 24 | }, |
25 | }); | 25 | }); |
26 | 26 | ||
27 | @observer | ||
28 | class ServiceItem extends Component { | 27 | class ServiceItem extends Component { |
29 | static propTypes = { | 28 | static propTypes = { |
30 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 29 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
@@ -91,4 +90,4 @@ class ServiceItem extends Component { | |||
91 | } | 90 | } |
92 | } | 91 | } |
93 | 92 | ||
94 | export default injectIntl(ServiceItem); | 93 | export default injectIntl(observer(ServiceItem)); |
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index aae6eb855..81c5faa70 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js | |||
@@ -51,7 +51,6 @@ const messages = defineMessages({ | |||
51 | }, | 51 | }, |
52 | }); | 52 | }); |
53 | 53 | ||
54 | @observer | ||
55 | class ServicesDashboard extends Component { | 54 | class ServicesDashboard extends Component { |
56 | static propTypes = { | 55 | static propTypes = { |
57 | services: MobxPropTypes.arrayOrObservableArray.isRequired, | 56 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -188,4 +187,4 @@ class ServicesDashboard extends Component { | |||
188 | } | 187 | } |
189 | } | 188 | } |
190 | 189 | ||
191 | export default injectIntl(ServicesDashboard); | 190 | export default injectIntl(observer(ServicesDashboard)); |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 9f51b54d5..d9df9c41c 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -188,7 +188,6 @@ const messages = defineMessages({ | |||
188 | 188 | ||
189 | const Hr = () => <hr style={{ marginBottom: 20 }} />; | 189 | const Hr = () => <hr style={{ marginBottom: 20 }} />; |
190 | 190 | ||
191 | @observer | ||
192 | class EditSettingsForm extends Component { | 191 | class EditSettingsForm extends Component { |
193 | static propTypes = { | 192 | static propTypes = { |
194 | checkForUpdates: PropTypes.func.isRequired, | 193 | checkForUpdates: PropTypes.func.isRequired, |
@@ -847,4 +846,4 @@ class EditSettingsForm extends Component { | |||
847 | } | 846 | } |
848 | } | 847 | } |
849 | 848 | ||
850 | export default injectIntl(EditSettingsForm); | 849 | export default injectIntl(observer(EditSettingsForm)); |
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 38d124266..802284051 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js | |||
@@ -90,8 +90,6 @@ const styles = { | |||
90 | }, | 90 | }, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | @injectSheet(styles) | ||
94 | @observer | ||
95 | class TeamDashboard extends Component { | 93 | class TeamDashboard extends Component { |
96 | static propTypes = { | 94 | static propTypes = { |
97 | isLoading: PropTypes.bool.isRequired, | 95 | isLoading: PropTypes.bool.isRequired, |
@@ -197,4 +195,6 @@ class TeamDashboard extends Component { | |||
197 | } | 195 | } |
198 | } | 196 | } |
199 | 197 | ||
200 | export default injectIntl(TeamDashboard); | 198 | export default injectIntl( |
199 | injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)), | ||
200 | ); | ||
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 1b8a4f25a..95498d9bb 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -37,7 +37,6 @@ const messages = defineMessages({ | |||
37 | }, | 37 | }, |
38 | }); | 38 | }); |
39 | 39 | ||
40 | @observer | ||
41 | class EditUserForm extends Component { | 40 | class EditUserForm extends Component { |
42 | static propTypes = { | 41 | static propTypes = { |
43 | status: MobxPropTypes.observableArray.isRequired, | 42 | status: MobxPropTypes.observableArray.isRequired, |
@@ -128,4 +127,4 @@ class EditUserForm extends Component { | |||
128 | } | 127 | } |
129 | } | 128 | } |
130 | 129 | ||
131 | export default injectIntl(EditUserForm); | 130 | export default injectIntl(observer(EditUserForm)); |
diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx index c7c290a57..0bb9cb50f 100644 --- a/src/components/ui/AppLoader/index.tsx +++ b/src/components/ui/AppLoader/index.tsx | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import injectSheet, { withTheme } from 'react-jss'; | ||
3 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
4 | 3 | ||
4 | import injectStyle from 'react-jss'; | ||
5 | import FullscreenLoader from '../FullscreenLoader'; | 5 | import FullscreenLoader from '../FullscreenLoader'; |
6 | import { shuffleArray } from '../../../helpers/array-helpers'; | 6 | import { shuffleArray } from '../../../helpers/array-helpers'; |
7 | 7 | ||
@@ -24,8 +24,6 @@ type Props = { | |||
24 | texts: string[]; | 24 | texts: string[]; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | @injectSheet(styles) | ||
28 | @withTheme | ||
29 | class AppLoader extends Component<Props> { | 27 | class AppLoader extends Component<Props> { |
30 | static defaultProps = { | 28 | static defaultProps = { |
31 | texts: textList, | 29 | texts: textList, |
@@ -77,4 +75,4 @@ class AppLoader extends Component<Props> { | |||
77 | } | 75 | } |
78 | } | 76 | } |
79 | 77 | ||
80 | export default AppLoader; | 78 | export default injectStyle(styles, { injectTheme: true })(AppLoader); |
diff --git a/src/components/ui/Button.js b/src/components/ui/Button.js index d90a8d62d..a52f1cadb 100644 --- a/src/components/ui/Button.js +++ b/src/components/ui/Button.js | |||
@@ -4,8 +4,6 @@ import { observer, inject } from 'mobx-react'; | |||
4 | import Loader from 'react-loader'; | 4 | import Loader from 'react-loader'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | 6 | ||
7 | @inject('stores') | ||
8 | @observer | ||
9 | class Button extends Component { | 7 | class Button extends Component { |
10 | static propTypes = { | 8 | static propTypes = { |
11 | className: PropTypes.string, | 9 | className: PropTypes.string, |
@@ -90,4 +88,4 @@ class Button extends Component { | |||
90 | } | 88 | } |
91 | } | 89 | } |
92 | 90 | ||
93 | export default Button; | 91 | export default inject('stores')(observer(Button)); |
diff --git a/src/components/ui/FAB.tsx b/src/components/ui/FAB.tsx index 0d871e948..cb9c5f126 100644 --- a/src/components/ui/FAB.tsx +++ b/src/components/ui/FAB.tsx | |||
@@ -14,7 +14,6 @@ type Props = { | |||
14 | htmlForm: string; | 14 | htmlForm: string; |
15 | }; | 15 | }; |
16 | 16 | ||
17 | @observer | ||
18 | class Button extends Component<Props> { | 17 | class Button extends Component<Props> { |
19 | static defaultProps = { | 18 | static defaultProps = { |
20 | disabled: false, | 19 | disabled: false, |
@@ -46,4 +45,4 @@ class Button extends Component<Props> { | |||
46 | } | 45 | } |
47 | } | 46 | } |
48 | 47 | ||
49 | export default Button; | 48 | export default observer(Button); |
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index f5943f3f3..39b6c5a4c 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js | |||
@@ -1,16 +1,13 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import injectSheet, { withTheme } from 'react-jss'; | 4 | import injectStyle from 'react-jss'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | 6 | ||
7 | import Loader from '../Loader'; | 7 | import Loader from '../Loader'; |
8 | 8 | ||
9 | import styles from './styles'; | 9 | import styles from './styles'; |
10 | 10 | ||
11 | @withTheme | ||
12 | @injectSheet(styles) | ||
13 | @observer | ||
14 | class FullscreenLoader extends Component { | 11 | class FullscreenLoader extends Component { |
15 | static propTypes = { | 12 | static propTypes = { |
16 | className: PropTypes.string, | 13 | className: PropTypes.string, |
@@ -48,4 +45,6 @@ class FullscreenLoader extends Component { | |||
48 | } | 45 | } |
49 | } | 46 | } |
50 | 47 | ||
51 | export default FullscreenLoader; | 48 | export default injectStyle(styles, { injectTheme: true })( |
49 | observer(FullscreenLoader), | ||
50 | ); | ||
diff --git a/src/components/ui/ImageUpload.tsx b/src/components/ui/ImageUpload.tsx index 52c097ef0..b07e211c2 100644 --- a/src/components/ui/ImageUpload.tsx +++ b/src/components/ui/ImageUpload.tsx | |||
@@ -15,7 +15,6 @@ type Props = { | |||
15 | textUpload: string; | 15 | textUpload: string; |
16 | }; | 16 | }; |
17 | 17 | ||
18 | @observer | ||
19 | class ImageUpload extends Component<Props> { | 18 | class ImageUpload extends Component<Props> { |
20 | static defaultProps = { | 19 | static defaultProps = { |
21 | multiple: false, | 20 | multiple: false, |
@@ -102,4 +101,4 @@ class ImageUpload extends Component<Props> { | |||
102 | } | 101 | } |
103 | } | 102 | } |
104 | 103 | ||
105 | export default ImageUpload; | 104 | export default observer(ImageUpload); |
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index 89b085907..c1a6013c2 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js | |||
@@ -16,7 +16,6 @@ const messages = defineMessages({ | |||
16 | }, | 16 | }, |
17 | }); | 17 | }); |
18 | 18 | ||
19 | @observer | ||
20 | class InfoBar extends Component { | 19 | class InfoBar extends Component { |
21 | static propTypes = { | 20 | static propTypes = { |
22 | // eslint-disable-next-line react/forbid-prop-types | 21 | // eslint-disable-next-line react/forbid-prop-types |
@@ -102,4 +101,4 @@ class InfoBar extends Component { | |||
102 | } | 101 | } |
103 | } | 102 | } |
104 | 103 | ||
105 | export default injectIntl(InfoBar); | 104 | export default injectIntl(observer(InfoBar)); |
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js index c0ba8f13c..6634a6808 100644 --- a/src/components/ui/Infobox.js +++ b/src/components/ui/Infobox.js | |||
@@ -19,7 +19,6 @@ const messages = defineMessages({ | |||
19 | }, | 19 | }, |
20 | }); | 20 | }); |
21 | 21 | ||
22 | @observer | ||
23 | class Infobox extends Component { | 22 | class Infobox extends Component { |
24 | static propTypes = { | 23 | static propTypes = { |
25 | // eslint-disable-next-line react/forbid-prop-types | 24 | // eslint-disable-next-line react/forbid-prop-types |
@@ -112,4 +111,4 @@ class Infobox extends Component { | |||
112 | } | 111 | } |
113 | } | 112 | } |
114 | 113 | ||
115 | export default injectIntl(Infobox); | 114 | export default injectIntl(observer(Infobox)); |
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js index 8d37d7a05..fa1b44699 100644 --- a/src/components/ui/Input.js +++ b/src/components/ui/Input.js | |||
@@ -5,7 +5,9 @@ import { Field } from 'mobx-react-form'; | |||
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | import { defineMessages, injectIntl } from 'react-intl'; | 6 | import { defineMessages, injectIntl } from 'react-intl'; |
7 | 7 | ||
8 | import { mdiEye, mdiEyeOff } from '@mdi/js'; | ||
8 | import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers'; | 9 | import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers'; |
10 | import { Icon } from './icon'; | ||
9 | 11 | ||
10 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
11 | passwordToggle: { | 13 | passwordToggle: { |
@@ -14,7 +16,6 @@ const messages = defineMessages({ | |||
14 | }, | 16 | }, |
15 | }); | 17 | }); |
16 | 18 | ||
17 | @observer | ||
18 | class Input extends Component { | 19 | class Input extends Component { |
19 | static propTypes = { | 20 | static propTypes = { |
20 | field: PropTypes.instanceOf(Field).isRequired, | 21 | field: PropTypes.instanceOf(Field).isRequired, |
@@ -115,9 +116,6 @@ class Input extends Component { | |||
115 | type="button" | 116 | type="button" |
116 | className={classnames({ | 117 | className={classnames({ |
117 | 'franz-form__input-modifier': true, | 118 | 'franz-form__input-modifier': true, |
118 | mdi: true, | ||
119 | 'mdi-eye': !this.state.showPassword, | ||
120 | 'mdi-eye-off': this.state.showPassword, | ||
121 | })} | 119 | })} |
122 | onClick={() => | 120 | onClick={() => |
123 | this.setState(prevState => ({ | 121 | this.setState(prevState => ({ |
@@ -126,7 +124,9 @@ class Input extends Component { | |||
126 | } | 124 | } |
127 | tabIndex={-1} | 125 | tabIndex={-1} |
128 | aria-label={intl.formatMessage(messages.passwordToggle)} | 126 | aria-label={intl.formatMessage(messages.passwordToggle)} |
129 | /> | 127 | > |
128 | <Icon icon={this.state.showPassword ? mdiEye : mdiEyeOff} /> | ||
129 | </button> | ||
130 | )} | 130 | )} |
131 | {scorePassword && ( | 131 | {scorePassword && ( |
132 | <div className="franz-form__password-score"> | 132 | <div className="franz-form__password-score"> |
@@ -152,4 +152,4 @@ class Input extends Component { | |||
152 | } | 152 | } |
153 | } | 153 | } |
154 | 154 | ||
155 | export default injectIntl(Input); | 155 | export default injectIntl(observer(Input)); |
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js index 40766c984..565547736 100644 --- a/src/components/ui/Link.js +++ b/src/components/ui/Link.js | |||
@@ -9,8 +9,6 @@ import { matchRoute } from '../../helpers/routing-helpers'; | |||
9 | import { openExternalUrl } from '../../helpers/url-helpers'; | 9 | import { openExternalUrl } from '../../helpers/url-helpers'; |
10 | 10 | ||
11 | // TODO: create container component for this component | 11 | // TODO: create container component for this component |
12 | @inject('stores') | ||
13 | @observer | ||
14 | class Link extends Component { | 12 | class Link extends Component { |
15 | onClick(e) { | 13 | onClick(e) { |
16 | if (this.props.disabled) { | 14 | if (this.props.disabled) { |
@@ -60,7 +58,7 @@ class Link extends Component { | |||
60 | } | 58 | } |
61 | } | 59 | } |
62 | 60 | ||
63 | Link.wrappedComponent.propTypes = { | 61 | Link.propTypes = { |
64 | stores: PropTypes.shape({ | 62 | stores: PropTypes.shape({ |
65 | router: PropTypes.instanceOf(RouterStore).isRequired, | 63 | router: PropTypes.instanceOf(RouterStore).isRequired, |
66 | }).isRequired, | 64 | }).isRequired, |
@@ -75,7 +73,7 @@ Link.wrappedComponent.propTypes = { | |||
75 | disabled: PropTypes.bool, | 73 | disabled: PropTypes.bool, |
76 | }; | 74 | }; |
77 | 75 | ||
78 | Link.wrappedComponent.defaultProps = { | 76 | Link.defaultProps = { |
79 | className: '', | 77 | className: '', |
80 | activeClassName: '', | 78 | activeClassName: '', |
81 | strictFilter: false, | 79 | strictFilter: false, |
@@ -84,4 +82,4 @@ Link.wrappedComponent.defaultProps = { | |||
84 | style: {}, | 82 | style: {}, |
85 | }; | 83 | }; |
86 | 84 | ||
87 | export default Link; | 85 | export default inject('stores')(observer(Link)); |
diff --git a/src/components/ui/Loader.tsx b/src/components/ui/Loader.tsx index 1173c11e7..171d0e290 100644 --- a/src/components/ui/Loader.tsx +++ b/src/components/ui/Loader.tsx | |||
@@ -12,8 +12,6 @@ type Props = { | |||
12 | stores: FerdiStores; | 12 | stores: FerdiStores; |
13 | }; | 13 | }; |
14 | 14 | ||
15 | @inject('stores') | ||
16 | @observer | ||
17 | class LoaderComponent extends Component<Props> { | 15 | class LoaderComponent extends Component<Props> { |
18 | static defaultProps = { | 16 | static defaultProps = { |
19 | loaded: false, | 17 | loaded: false, |
@@ -43,4 +41,4 @@ class LoaderComponent extends Component<Props> { | |||
43 | } | 41 | } |
44 | } | 42 | } |
45 | 43 | ||
46 | export default LoaderComponent; | 44 | export default inject('stores')(observer(LoaderComponent)); |
diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx index f2f4461b8..c3c78b419 100644 --- a/src/components/ui/Modal/index.tsx +++ b/src/components/ui/Modal/index.tsx | |||
@@ -18,7 +18,6 @@ type Props = { | |||
18 | showClose: boolean; | 18 | showClose: boolean; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | @injectCSS(styles) | ||
22 | class Modal extends Component<Props> { | 21 | class Modal extends Component<Props> { |
23 | static defaultProps = { | 22 | static defaultProps = { |
24 | className: null, | 23 | className: null, |
@@ -64,4 +63,4 @@ class Modal extends Component<Props> { | |||
64 | } | 63 | } |
65 | } | 64 | } |
66 | 65 | ||
67 | export default Modal; | 66 | export default injectCSS(styles)(Modal); |
diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx index 594ea70e4..a033a5fe0 100644 --- a/src/components/ui/Radio.tsx +++ b/src/components/ui/Radio.tsx | |||
@@ -10,7 +10,6 @@ type Props = { | |||
10 | showLabel: boolean; | 10 | showLabel: boolean; |
11 | }; | 11 | }; |
12 | 12 | ||
13 | @observer | ||
14 | class Radio extends Component<Props> { | 13 | class Radio extends Component<Props> { |
15 | static defaultProps = { | 14 | static defaultProps = { |
16 | focus: false, | 15 | focus: false, |
@@ -74,4 +73,4 @@ class Radio extends Component<Props> { | |||
74 | } | 73 | } |
75 | } | 74 | } |
76 | 75 | ||
77 | export default Radio; | 76 | export default observer(Radio); |
diff --git a/src/components/ui/SearchInput.tsx b/src/components/ui/SearchInput.tsx index 49a50a4a0..6a6a1692e 100644 --- a/src/components/ui/SearchInput.tsx +++ b/src/components/ui/SearchInput.tsx | |||
@@ -17,7 +17,6 @@ type Props = { | |||
17 | autoFocus: boolean; | 17 | autoFocus: boolean; |
18 | }; | 18 | }; |
19 | 19 | ||
20 | @observer | ||
21 | class SearchInput extends Component<Props> { | 20 | class SearchInput extends Component<Props> { |
22 | static defaultProps = { | 21 | static defaultProps = { |
23 | value: '', | 22 | value: '', |
@@ -115,4 +114,4 @@ class SearchInput extends Component<Props> { | |||
115 | } | 114 | } |
116 | } | 115 | } |
117 | 116 | ||
118 | export default SearchInput; | 117 | export default observer(SearchInput); |
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js index a560da332..0fc32e573 100644 --- a/src/components/ui/Select.js +++ b/src/components/ui/Select.js | |||
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; | |||
4 | import { Field } from 'mobx-react-form'; | 4 | import { Field } from 'mobx-react-form'; |
5 | import classnames from 'classnames'; | 5 | import classnames from 'classnames'; |
6 | 6 | ||
7 | @observer | ||
8 | class Select extends Component { | 7 | class Select extends Component { |
9 | static propTypes = { | 8 | static propTypes = { |
10 | field: PropTypes.instanceOf(Field).isRequired, | 9 | field: PropTypes.instanceOf(Field).isRequired, |
@@ -98,4 +97,4 @@ class Select extends Component { | |||
98 | } | 97 | } |
99 | } | 98 | } |
100 | 99 | ||
101 | export default Select; | 100 | export default observer(Select); |
diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js index f067f8955..d403d107d 100644 --- a/src/components/ui/ServiceIcon.js +++ b/src/components/ui/ServiceIcon.js | |||
@@ -24,8 +24,6 @@ const styles = theme => ({ | |||
24 | }, | 24 | }, |
25 | }); | 25 | }); |
26 | 26 | ||
27 | @injectSheet(styles) | ||
28 | @observer | ||
29 | class ServiceIcon extends Component { | 27 | class ServiceIcon extends Component { |
30 | static propTypes = { | 28 | static propTypes = { |
31 | classes: PropTypes.object.isRequired, | 29 | classes: PropTypes.object.isRequired, |
@@ -56,4 +54,6 @@ class ServiceIcon extends Component { | |||
56 | } | 54 | } |
57 | } | 55 | } |
58 | 56 | ||
59 | export default ServiceIcon; | 57 | export default injectSheet(styles, { injectTheme: true })( |
58 | observer(ServiceIcon), | ||
59 | ); | ||
diff --git a/src/components/ui/Slider.js b/src/components/ui/Slider.js index dea6e0563..a581e7a65 100644 --- a/src/components/ui/Slider.js +++ b/src/components/ui/Slider.js | |||
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; | |||
4 | import classnames from 'classnames'; | 4 | import classnames from 'classnames'; |
5 | import { Field } from 'mobx-react-form'; | 5 | import { Field } from 'mobx-react-form'; |
6 | 6 | ||
7 | @observer | ||
8 | class Slider extends Component { | 7 | class Slider extends Component { |
9 | static propTypes = { | 8 | static propTypes = { |
10 | field: PropTypes.instanceOf(Field).isRequired, | 9 | field: PropTypes.instanceOf(Field).isRequired, |
@@ -64,4 +63,4 @@ class Slider extends Component { | |||
64 | } | 63 | } |
65 | } | 64 | } |
66 | 65 | ||
67 | export default Slider; | 66 | export default observer(Slider); |
diff --git a/src/components/ui/StatusBarTargetUrl.js b/src/components/ui/StatusBarTargetUrl.js index 38b436742..d8d329d52 100644 --- a/src/components/ui/StatusBarTargetUrl.js +++ b/src/components/ui/StatusBarTargetUrl.js | |||
@@ -5,7 +5,6 @@ import classnames from 'classnames'; | |||
5 | 5 | ||
6 | import Appear from './effects/Appear'; | 6 | import Appear from './effects/Appear'; |
7 | 7 | ||
8 | @observer | ||
9 | class StatusBarTargetUrl extends Component { | 8 | class StatusBarTargetUrl extends Component { |
10 | static propTypes = { | 9 | static propTypes = { |
11 | className: PropTypes.string, | 10 | className: PropTypes.string, |
@@ -33,4 +32,4 @@ class StatusBarTargetUrl extends Component { | |||
33 | } | 32 | } |
34 | } | 33 | } |
35 | 34 | ||
36 | export default StatusBarTargetUrl; | 35 | export default observer(StatusBarTargetUrl); |
diff --git a/src/components/ui/Tabs/Tabs.js b/src/components/ui/Tabs/Tabs.js index 77803974b..5d2da6293 100644 --- a/src/components/ui/Tabs/Tabs.js +++ b/src/components/ui/Tabs/Tabs.js | |||
@@ -5,7 +5,6 @@ import classnames from 'classnames'; | |||
5 | 5 | ||
6 | import { oneOrManyChildElements } from '../../../prop-types'; | 6 | import { oneOrManyChildElements } from '../../../prop-types'; |
7 | 7 | ||
8 | @observer | ||
9 | class Tab extends Component { | 8 | class Tab extends Component { |
10 | constructor(props) { | 9 | constructor(props) { |
11 | super(props); | 10 | super(props); |
@@ -69,4 +68,4 @@ class Tab extends Component { | |||
69 | } | 68 | } |
70 | } | 69 | } |
71 | 70 | ||
72 | export default Tab; | 71 | export default observer(Tab); |
diff --git a/src/components/ui/Toggle.js b/src/components/ui/Toggle.js index dfc319735..a82be690e 100644 --- a/src/components/ui/Toggle.js +++ b/src/components/ui/Toggle.js | |||
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; | |||
4 | import classnames from 'classnames'; | 4 | import classnames from 'classnames'; |
5 | import { Field } from 'mobx-react-form'; | 5 | import { Field } from 'mobx-react-form'; |
6 | 6 | ||
7 | @observer | ||
8 | class Toggle extends Component { | 7 | class Toggle extends Component { |
9 | static propTypes = { | 8 | static propTypes = { |
10 | field: PropTypes.instanceOf(Field).isRequired, | 9 | field: PropTypes.instanceOf(Field).isRequired, |
@@ -69,4 +68,4 @@ class Toggle extends Component { | |||
69 | } | 68 | } |
70 | } | 69 | } |
71 | 70 | ||
72 | export default Toggle; | 71 | export default observer(Toggle); |
diff --git a/src/components/ui/ToggleRaw.js b/src/components/ui/ToggleRaw.js index 74292a870..e482b97b4 100644 --- a/src/components/ui/ToggleRaw.js +++ b/src/components/ui/ToggleRaw.js | |||
@@ -6,7 +6,6 @@ import PropTypes from 'prop-types'; | |||
6 | import { observer } from 'mobx-react'; | 6 | import { observer } from 'mobx-react'; |
7 | import classnames from 'classnames'; | 7 | import classnames from 'classnames'; |
8 | 8 | ||
9 | @observer | ||
10 | class ToggleRaw extends Component { | 9 | class ToggleRaw extends Component { |
11 | static propTypes = { | 10 | static propTypes = { |
12 | onChange: PropTypes.func.isRequired, | 11 | onChange: PropTypes.func.isRequired, |
@@ -74,4 +73,4 @@ class ToggleRaw extends Component { | |||
74 | } | 73 | } |
75 | } | 74 | } |
76 | 75 | ||
77 | export default ToggleRaw; | 76 | export default observer(ToggleRaw); |
diff --git a/src/components/ui/WebviewLoader/index.js b/src/components/ui/WebviewLoader/index.js index 8d4513172..20945d191 100644 --- a/src/components/ui/WebviewLoader/index.js +++ b/src/components/ui/WebviewLoader/index.js | |||
@@ -14,8 +14,6 @@ const messages = defineMessages({ | |||
14 | }, | 14 | }, |
15 | }); | 15 | }); |
16 | 16 | ||
17 | @injectSheet(styles) | ||
18 | @observer | ||
19 | class WebviewLoader extends Component { | 17 | class WebviewLoader extends Component { |
20 | static propTypes = { | 18 | static propTypes = { |
21 | name: PropTypes.string.isRequired, | 19 | name: PropTypes.string.isRequired, |
@@ -34,4 +32,6 @@ class WebviewLoader extends Component { | |||
34 | } | 32 | } |
35 | } | 33 | } |
36 | 34 | ||
37 | export default injectIntl(WebviewLoader); | 35 | export default injectIntl( |
36 | injectSheet(styles, { injectTheme: true })(observer(WebviewLoader)), | ||
37 | ); | ||
diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx index dc1e76f7f..410748a64 100644 --- a/src/components/ui/badge/ProBadge.tsx +++ b/src/components/ui/badge/ProBadge.tsx | |||
@@ -1,14 +1,13 @@ | |||
1 | import { mdiStar } from '@mdi/js'; | 1 | import { mdiStar } from '@mdi/js'; |
2 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
3 | import { Component } from 'react'; | 3 | import { Component } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle, { WithStylesProps } from 'react-jss'; |
5 | 5 | ||
6 | import { Theme } from '../../../themes'; | 6 | import { Theme } from '../../../themes'; |
7 | import { Icon } from '../icon'; | 7 | import { Icon } from '../icon'; |
8 | import { Badge } from './index'; | 8 | import { Badge } from './index'; |
9 | import { IWithStyle } from '../typings/generic'; | ||
10 | 9 | ||
11 | interface IProps extends IWithStyle { | 10 | interface IProps extends WithStylesProps<typeof styles> { |
12 | badgeClasses?: string; | 11 | badgeClasses?: string; |
13 | iconClasses?: string; | 12 | iconClasses?: string; |
14 | inverted?: boolean; | 13 | inverted?: boolean; |
@@ -61,4 +60,6 @@ class ProBadgeComponent extends Component<IProps> { | |||
61 | } | 60 | } |
62 | } | 61 | } |
63 | 62 | ||
64 | export const ProBadge = injectStyle(styles)(ProBadgeComponent); | 63 | export const ProBadge = injectStyle(styles, { injectTheme: true })( |
64 | ProBadgeComponent, | ||
65 | ); | ||
diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx index 61bede937..a7ed866a5 100644 --- a/src/components/ui/badge/index.tsx +++ b/src/components/ui/badge/index.tsx | |||
@@ -1,11 +1,10 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Component, ReactNode } from 'react'; | 2 | import { Component, ReactNode } from 'react'; |
3 | import injectStyle from 'react-jss'; | 3 | import injectStyle, { WithStylesProps } from 'react-jss'; |
4 | 4 | ||
5 | import { Theme } from '../../../themes'; | 5 | import { Theme } from '../../../themes'; |
6 | import { IWithStyle } from '../typings/generic'; | ||
7 | 6 | ||
8 | interface IProps extends IWithStyle { | 7 | interface IProps extends WithStylesProps<typeof styles> { |
9 | type: string; | 8 | type: string; |
10 | className?: string; | 9 | className?: string; |
11 | children: ReactNode; | 10 | children: ReactNode; |
@@ -68,4 +67,4 @@ class BadgeComponent extends Component<IProps> { | |||
68 | } | 67 | } |
69 | } | 68 | } |
70 | 69 | ||
71 | export const Badge = injectStyle(styles)(BadgeComponent); | 70 | export const Badge = injectStyle(styles, { injectTheme: true })(BadgeComponent); |
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx index 12e5e4449..d91b1ee19 100644 --- a/src/components/ui/button/index.tsx +++ b/src/components/ui/button/index.tsx | |||
@@ -2,11 +2,11 @@ import Icon from '@mdi/react'; | |||
2 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
3 | import { Property } from 'csstype'; | 3 | import { Property } from 'csstype'; |
4 | import { Component, MouseEvent } from 'react'; | 4 | import { Component, MouseEvent } from 'react'; |
5 | import injectStyle, { withTheme } from 'react-jss'; | 5 | import injectStyle, { WithStylesProps } from 'react-jss'; |
6 | import Loader from 'react-loader'; | 6 | import Loader from 'react-loader'; |
7 | 7 | ||
8 | import { Theme } from '../../../themes'; | 8 | import { Theme } from '../../../themes'; |
9 | import { IFormField, IWithStyle } from '../typings/generic'; | 9 | import { IFormField } from '../typings/generic'; |
10 | 10 | ||
11 | type ButtonType = | 11 | type ButtonType = |
12 | | 'primary' | 12 | | 'primary' |
@@ -16,7 +16,7 @@ type ButtonType = | |||
16 | | 'warning' | 16 | | 'warning' |
17 | | 'inverted'; | 17 | | 'inverted'; |
18 | 18 | ||
19 | interface IProps extends IFormField, IWithStyle { | 19 | interface IProps extends IFormField, WithStylesProps<typeof styles> { |
20 | className?: string; | 20 | className?: string; |
21 | disabled?: boolean; | 21 | disabled?: boolean; |
22 | id?: string; | 22 | id?: string; |
@@ -179,7 +179,7 @@ class ButtonComponent extends Component<IProps> { | |||
179 | const { | 179 | const { |
180 | classes, | 180 | classes, |
181 | className, | 181 | className, |
182 | theme, | 182 | // theme, |
183 | disabled, | 183 | disabled, |
184 | id, | 184 | id, |
185 | label, | 185 | label, |
@@ -213,7 +213,7 @@ class ButtonComponent extends Component<IProps> { | |||
213 | loaded={false} | 213 | loaded={false} |
214 | width={4} | 214 | width={4} |
215 | scale={0.45} | 215 | scale={0.45} |
216 | color={theme.buttonLoaderColor[buttonType!]} | 216 | // color={theme.buttonLoaderColor[buttonType!]} |
217 | parentClassName={classes.loader} | 217 | parentClassName={classes.loader} |
218 | /> | 218 | /> |
219 | )} | 219 | )} |
@@ -262,4 +262,6 @@ class ButtonComponent extends Component<IProps> { | |||
262 | } | 262 | } |
263 | } | 263 | } |
264 | 264 | ||
265 | export const Button = injectStyle(styles)(withTheme(ButtonComponent)); | 265 | export const Button = injectStyle(styles, { injectTheme: true })( |
266 | ButtonComponent, | ||
267 | ); | ||
diff --git a/src/components/ui/error/index.tsx b/src/components/ui/error/index.tsx index 8439bfc8b..ff3bc31c6 100644 --- a/src/components/ui/error/index.tsx +++ b/src/components/ui/error/index.tsx | |||
@@ -17,4 +17,4 @@ class ErrorComponent extends Component<IProps> { | |||
17 | } | 17 | } |
18 | } | 18 | } |
19 | 19 | ||
20 | export const Error = injectSheet(styles)(ErrorComponent); | 20 | export const Error = injectSheet(styles, { injectTheme: true })(ErrorComponent); |
diff --git a/src/components/ui/headline/index.tsx b/src/components/ui/headline/index.tsx index ea2949102..d9954c38f 100644 --- a/src/components/ui/headline/index.tsx +++ b/src/components/ui/headline/index.tsx | |||
@@ -1,11 +1,11 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Component, createElement, ReactNode } from 'react'; | 2 | import { Component, createElement, ReactNode } from 'react'; |
3 | import injectStyle from 'react-jss'; | 3 | import injectStyle, { WithStylesProps } from 'react-jss'; |
4 | 4 | ||
5 | import { Theme } from '../../../themes'; | 5 | import { Theme } from '../../../themes'; |
6 | import { IWithStyle, Omit } from '../typings/generic'; | 6 | import { Omit } from '../typings/generic'; |
7 | 7 | ||
8 | interface IProps extends IWithStyle { | 8 | interface IProps extends WithStylesProps<typeof styles> { |
9 | level?: number; | 9 | level?: number; |
10 | className?: string; | 10 | className?: string; |
11 | children: string | ReactNode; | 11 | children: string | ReactNode; |
@@ -55,9 +55,9 @@ class HeadlineComponent extends Component<IProps> { | |||
55 | } | 55 | } |
56 | } | 56 | } |
57 | 57 | ||
58 | const Headline = injectStyle(styles)(HeadlineComponent); | 58 | const Headline = injectStyle(styles, { injectTheme: true })(HeadlineComponent); |
59 | 59 | ||
60 | const createH = (level: number) => (props: Omit<IProps, 'classes' | 'theme'>) => | 60 | const createH = (level: number) => (props: Omit<IProps, 'classes'>) => |
61 | ( | 61 | ( |
62 | <Headline level={level} {...props}> | 62 | <Headline level={level} {...props}> |
63 | {props.children} | 63 | {props.children} |
diff --git a/src/components/ui/icon/index.tsx b/src/components/ui/icon/index.tsx index 85bb61d13..52f61d2d7 100644 --- a/src/components/ui/icon/index.tsx +++ b/src/components/ui/icon/index.tsx | |||
@@ -1,12 +1,11 @@ | |||
1 | import MdiIcon from '@mdi/react'; | 1 | import MdiIcon from '@mdi/react'; |
2 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
3 | import { Component } from 'react'; | 3 | import { Component } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle, { WithStylesProps } from 'react-jss'; |
5 | 5 | ||
6 | import { Theme } from '../../../themes'; | 6 | import { Theme } from '../../../themes'; |
7 | import { IWithStyle } from '../typings/generic'; | ||
8 | 7 | ||
9 | interface IProps extends IWithStyle { | 8 | interface IProps extends WithStylesProps<typeof styles> { |
10 | icon: string; | 9 | icon: string; |
11 | size?: number; | 10 | size?: number; |
12 | className?: string; | 11 | className?: string; |
@@ -43,4 +42,4 @@ class IconComponent extends Component<IProps> { | |||
43 | } | 42 | } |
44 | } | 43 | } |
45 | 44 | ||
46 | export const Icon = injectStyle(styles)(IconComponent); | 45 | export const Icon = injectStyle(styles, { injectTheme: true })(IconComponent); |
diff --git a/src/components/ui/infobox/index.tsx b/src/components/ui/infobox/index.tsx index 87940c4d4..7b2ce527b 100644 --- a/src/components/ui/infobox/index.tsx +++ b/src/components/ui/infobox/index.tsx | |||
@@ -1,13 +1,12 @@ | |||
1 | import { mdiClose } from '@mdi/js'; | 1 | import { mdiClose } from '@mdi/js'; |
2 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
3 | import { Component, ReactNode } from 'react'; | 3 | import { Component, ReactNode } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle, { WithStylesProps } from 'react-jss'; |
5 | 5 | ||
6 | import { Theme } from '../../../themes'; | 6 | import { Theme } from '../../../themes'; |
7 | import { Icon } from '../icon'; | 7 | import { Icon } from '../icon'; |
8 | import { IWithStyle } from '../typings/generic'; | ||
9 | 8 | ||
10 | interface IProps extends IWithStyle { | 9 | interface IProps extends WithStylesProps<typeof styles> { |
11 | icon?: string; | 10 | icon?: string; |
12 | type?: string; | 11 | type?: string; |
13 | dismissable?: boolean; | 12 | dismissable?: boolean; |
@@ -202,4 +201,6 @@ class InfoboxComponent extends Component<IProps, IState> { | |||
202 | } | 201 | } |
203 | } | 202 | } |
204 | 203 | ||
205 | export const Infobox = injectStyle(styles)(InfoboxComponent); | 204 | export const Infobox = injectStyle(styles, { injectTheme: true })( |
205 | InfoboxComponent, | ||
206 | ); | ||
diff --git a/src/components/ui/input/index.tsx b/src/components/ui/input/index.tsx index c46cafc5c..bfbee33b9 100644 --- a/src/components/ui/input/index.tsx +++ b/src/components/ui/input/index.tsx | |||
@@ -2,9 +2,9 @@ import { mdiEye, mdiEyeOff } from '@mdi/js'; | |||
2 | import Icon from '@mdi/react'; | 2 | import Icon from '@mdi/react'; |
3 | import classnames from 'classnames'; | 3 | import classnames from 'classnames'; |
4 | import { Component, createRef, InputHTMLAttributes } from 'react'; | 4 | import { Component, createRef, InputHTMLAttributes } from 'react'; |
5 | import injectSheet from 'react-jss'; | 5 | import injectSheet, { WithStylesProps } from 'react-jss'; |
6 | 6 | ||
7 | import { IFormField, IWithStyle } from '../typings/generic'; | 7 | import { IFormField } from '../typings/generic'; |
8 | 8 | ||
9 | import { Error } from '../error'; | 9 | import { Error } from '../error'; |
10 | import { Label } from '../label'; | 10 | import { Label } from '../label'; |
@@ -20,7 +20,7 @@ interface IData { | |||
20 | interface IProps | 20 | interface IProps |
21 | extends InputHTMLAttributes<HTMLInputElement>, | 21 | extends InputHTMLAttributes<HTMLInputElement>, |
22 | IFormField, | 22 | IFormField, |
23 | IWithStyle { | 23 | WithStylesProps<typeof styles> { |
24 | focus?: boolean; | 24 | focus?: boolean; |
25 | prefix?: string; | 25 | prefix?: string; |
26 | suffix?: string; | 26 | suffix?: string; |
@@ -205,4 +205,4 @@ class InputComponent extends Component<IProps, IState> { | |||
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | export const Input = injectSheet(styles)(InputComponent); | 208 | export const Input = injectSheet(styles, { injectTheme: true })(InputComponent); |
diff --git a/src/components/ui/label/index.tsx b/src/components/ui/label/index.tsx index 4d86f23f7..dcc14bff4 100644 --- a/src/components/ui/label/index.tsx +++ b/src/components/ui/label/index.tsx | |||
@@ -1,15 +1,16 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Classes } from 'jss'; | ||
3 | import { Component, LabelHTMLAttributes } from 'react'; | 2 | import { Component, LabelHTMLAttributes } from 'react'; |
4 | import injectSheet from 'react-jss'; | 3 | import injectSheet, { WithStylesProps } from 'react-jss'; |
5 | 4 | ||
6 | import { IFormField } from '../typings/generic'; | 5 | import { IFormField } from '../typings/generic'; |
7 | 6 | ||
8 | import styles from './styles'; | 7 | import styles from './styles'; |
9 | 8 | ||
10 | interface ILabel extends IFormField, LabelHTMLAttributes<HTMLLabelElement> { | 9 | interface ILabel |
11 | classes: Classes; | 10 | extends IFormField, |
12 | isRequired: boolean; | 11 | LabelHTMLAttributes<HTMLLabelElement>, |
12 | WithStylesProps<typeof styles> { | ||
13 | isRequired?: boolean; | ||
13 | } | 14 | } |
14 | 15 | ||
15 | class LabelComponent extends Component<ILabel> { | 16 | class LabelComponent extends Component<ILabel> { |
@@ -49,4 +50,4 @@ class LabelComponent extends Component<ILabel> { | |||
49 | } | 50 | } |
50 | } | 51 | } |
51 | 52 | ||
52 | export const Label = injectSheet(styles)(LabelComponent); | 53 | export const Label = injectSheet(styles, { injectTheme: true })(LabelComponent); |
diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx index 0607bd48b..d56995ccc 100644 --- a/src/components/ui/loader/index.tsx +++ b/src/components/ui/loader/index.tsx | |||
@@ -1,25 +1,25 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Component } from 'react'; | 2 | import { Component } from 'react'; |
3 | import injectStyle, { withTheme } from 'react-jss'; | 3 | import injectStyle, { WithStylesProps } from 'react-jss'; |
4 | import ReactLoader from 'react-loader'; | 4 | import ReactLoader from 'react-loader'; |
5 | 5 | ||
6 | import { IWithStyle } from '../typings/generic'; | 6 | interface IProps extends WithStylesProps<typeof styles> { |
7 | |||
8 | interface IProps extends IWithStyle { | ||
9 | className?: string; | 7 | className?: string; |
10 | color?: string; | 8 | color?: string; |
11 | } | 9 | } |
12 | 10 | ||
13 | const styles = () => ({ | 11 | const styles = theme => ({ |
14 | container: { | 12 | container: { |
15 | position: 'relative', | 13 | position: 'relative', |
16 | height: 60, | 14 | height: 60, |
17 | }, | 15 | }, |
16 | loader: {}, | ||
17 | color: theme.colorText, | ||
18 | }); | 18 | }); |
19 | 19 | ||
20 | class LoaderComponent extends Component<IProps> { | 20 | class LoaderComponent extends Component<IProps> { |
21 | render() { | 21 | render() { |
22 | const { classes, className, color, theme } = this.props; | 22 | const { classes, className, color } = this.props; |
23 | 23 | ||
24 | return ( | 24 | return ( |
25 | <div | 25 | <div |
@@ -33,7 +33,7 @@ class LoaderComponent extends Component<IProps> { | |||
33 | loaded={false} | 33 | loaded={false} |
34 | width={4} | 34 | width={4} |
35 | scale={0.75} | 35 | scale={0.75} |
36 | color={color || theme.colorText} | 36 | color={color || classes.color} |
37 | parentClassName={classes.loader} | 37 | parentClassName={classes.loader} |
38 | /> | 38 | /> |
39 | </div> | 39 | </div> |
@@ -41,4 +41,6 @@ class LoaderComponent extends Component<IProps> { | |||
41 | } | 41 | } |
42 | } | 42 | } |
43 | 43 | ||
44 | export const Loader = injectStyle(styles)(withTheme(LoaderComponent)); | 44 | export const Loader = injectStyle(styles, { injectTheme: true })( |
45 | LoaderComponent, | ||
46 | ); | ||
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx index 2605503a3..ac509aa7c 100644 --- a/src/components/ui/select/index.tsx +++ b/src/components/ui/select/index.tsx | |||
@@ -6,10 +6,10 @@ import { | |||
6 | import Icon from '@mdi/react'; | 6 | import Icon from '@mdi/react'; |
7 | import classnames from 'classnames'; | 7 | import classnames from 'classnames'; |
8 | import { ChangeEvent, Component, createRef } from 'react'; | 8 | import { ChangeEvent, Component, createRef } from 'react'; |
9 | import injectStyle from 'react-jss'; | 9 | import injectStyle, { WithStylesProps } from 'react-jss'; |
10 | 10 | ||
11 | import { Theme } from '../../../themes'; | 11 | import { Theme } from '../../../themes'; |
12 | import { IFormField, IWithStyle } from '../typings/generic'; | 12 | import { IFormField } from '../typings/generic'; |
13 | 13 | ||
14 | import { Error } from '../error'; | 14 | import { Error } from '../error'; |
15 | import { Label } from '../label'; | 15 | import { Label } from '../label'; |
@@ -23,7 +23,7 @@ interface IData { | |||
23 | [index: string]: string; | 23 | [index: string]: string; |
24 | } | 24 | } |
25 | 25 | ||
26 | interface IProps extends IFormField, IWithStyle { | 26 | interface IProps extends IFormField, WithStylesProps<typeof styles> { |
27 | actionText: string; | 27 | actionText: string; |
28 | className?: string; | 28 | className?: string; |
29 | inputClassName?: string; | 29 | inputClassName?: string; |
@@ -146,6 +146,7 @@ const styles = (theme: Theme) => ({ | |||
146 | disabled: { | 146 | disabled: { |
147 | opacity: theme.selectDisabledOpacity, | 147 | opacity: theme.selectDisabledOpacity, |
148 | }, | 148 | }, |
149 | input: {}, | ||
149 | }); | 150 | }); |
150 | 151 | ||
151 | class SelectComponent extends Component<IProps> { | 152 | class SelectComponent extends Component<IProps> { |
@@ -457,4 +458,6 @@ class SelectComponent extends Component<IProps> { | |||
457 | } | 458 | } |
458 | } | 459 | } |
459 | 460 | ||
460 | export const Select = injectStyle(styles)(SelectComponent); | 461 | export const Select = injectStyle(styles, { injectTheme: true })( |
462 | SelectComponent, | ||
463 | ); | ||
diff --git a/src/components/ui/textarea/index.tsx b/src/components/ui/textarea/index.tsx index 1b16698eb..a47465806 100644 --- a/src/components/ui/textarea/index.tsx +++ b/src/components/ui/textarea/index.tsx | |||
@@ -1,8 +1,8 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Component, createRef, TextareaHTMLAttributes } from 'react'; | 2 | import { Component, createRef, TextareaHTMLAttributes } from 'react'; |
3 | import injectSheet from 'react-jss'; | 3 | import injectSheet, { WithStylesProps } from 'react-jss'; |
4 | 4 | ||
5 | import { IFormField, IWithStyle } from '../typings/generic'; | 5 | import { IFormField } from '../typings/generic'; |
6 | 6 | ||
7 | import { Error } from '../error'; | 7 | import { Error } from '../error'; |
8 | import { Label } from '../label'; | 8 | import { Label } from '../label'; |
@@ -17,7 +17,7 @@ interface IData { | |||
17 | interface IProps | 17 | interface IProps |
18 | extends TextareaHTMLAttributes<HTMLTextAreaElement>, | 18 | extends TextareaHTMLAttributes<HTMLTextAreaElement>, |
19 | IFormField, | 19 | IFormField, |
20 | IWithStyle { | 20 | WithStylesProps<typeof styles> { |
21 | focus?: boolean; | 21 | focus?: boolean; |
22 | data: IData; | 22 | data: IData; |
23 | textareaClassName?: string; | 23 | textareaClassName?: string; |
@@ -123,4 +123,6 @@ class TextareaComponent extends Component<IProps> { | |||
123 | } | 123 | } |
124 | } | 124 | } |
125 | 125 | ||
126 | export const Textarea = injectSheet(styles)(TextareaComponent); | 126 | export const Textarea = injectSheet(styles, { injectTheme: true })( |
127 | TextareaComponent, | ||
128 | ); | ||
diff --git a/src/components/ui/toggle/index.tsx b/src/components/ui/toggle/index.tsx index 7b6ba147f..856581a21 100644 --- a/src/components/ui/toggle/index.tsx +++ b/src/components/ui/toggle/index.tsx | |||
@@ -1,10 +1,10 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Property } from 'csstype'; | 2 | import { Property } from 'csstype'; |
3 | import { Component, InputHTMLAttributes } from 'react'; | 3 | import { Component, InputHTMLAttributes } from 'react'; |
4 | import injectStyle from 'react-jss'; | 4 | import injectStyle, { WithStylesProps } from 'react-jss'; |
5 | 5 | ||
6 | import { Theme } from '../../../themes'; | 6 | import { Theme } from '../../../themes'; |
7 | import { IFormField, IWithStyle } from '../typings/generic'; | 7 | import { IFormField } from '../typings/generic'; |
8 | 8 | ||
9 | import { Error } from '../error'; | 9 | import { Error } from '../error'; |
10 | import { Label } from '../label'; | 10 | import { Label } from '../label'; |
@@ -13,7 +13,7 @@ import { Wrapper } from '../wrapper'; | |||
13 | interface IProps | 13 | interface IProps |
14 | extends InputHTMLAttributes<HTMLInputElement>, | 14 | extends InputHTMLAttributes<HTMLInputElement>, |
15 | IFormField, | 15 | IFormField, |
16 | IWithStyle { | 16 | WithStylesProps<typeof styles> { |
17 | className?: string; | 17 | className?: string; |
18 | } | 18 | } |
19 | 19 | ||
@@ -122,4 +122,6 @@ class ToggleComponent extends Component<IProps> { | |||
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
125 | export const Toggle = injectStyle(styles)(ToggleComponent); | 125 | export const Toggle = injectStyle(styles, { injectTheme: true })( |
126 | ToggleComponent, | ||
127 | ); | ||
diff --git a/src/components/ui/typings/generic.ts b/src/components/ui/typings/generic.ts index 65b996d59..3aec0bc40 100644 --- a/src/components/ui/typings/generic.ts +++ b/src/components/ui/typings/generic.ts | |||
@@ -1,7 +1,3 @@ | |||
1 | import { Classes } from 'jss'; | ||
2 | |||
3 | import { Theme } from '../../../themes'; | ||
4 | |||
5 | export interface IFormField { | 1 | export interface IFormField { |
6 | showLabel?: boolean; | 2 | showLabel?: boolean; |
7 | label?: string; | 3 | label?: string; |
@@ -10,10 +6,5 @@ export interface IFormField { | |||
10 | noMargin?: boolean; | 6 | noMargin?: boolean; |
11 | } | 7 | } |
12 | 8 | ||
13 | export interface IWithStyle { | ||
14 | classes: Classes; | ||
15 | theme: Theme; | ||
16 | } | ||
17 | |||
18 | export type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N; | 9 | export type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N; |
19 | export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; | 10 | export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; |
diff --git a/src/components/ui/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx index ffcd6fe0b..bc385d319 100644 --- a/src/components/ui/wrapper/index.tsx +++ b/src/components/ui/wrapper/index.tsx | |||
@@ -1,9 +1,8 @@ | |||
1 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
2 | import { Component, ReactNode } from 'react'; | 2 | import { Component, ReactNode } from 'react'; |
3 | import injectStyle from 'react-jss'; | 3 | import injectStyle, { WithStylesProps } from 'react-jss'; |
4 | import { IWithStyle } from '../typings/generic'; | ||
5 | 4 | ||
6 | interface IProps extends IWithStyle { | 5 | interface IProps extends WithStylesProps<typeof styles> { |
7 | children: ReactNode; | 6 | children: ReactNode; |
8 | className?: string; | 7 | className?: string; |
9 | identifier: string; | 8 | identifier: string; |
@@ -34,4 +33,6 @@ class WrapperComponent extends Component<IProps> { | |||
34 | } | 33 | } |
35 | } | 34 | } |
36 | 35 | ||
37 | export const Wrapper = injectStyle(styles)(WrapperComponent); | 36 | export const Wrapper = injectStyle(styles, { injectTheme: true })( |
37 | WrapperComponent, | ||
38 | ); | ||
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.js index cddcd91c2..6a8b126f1 100644 --- a/src/components/util/ErrorBoundary/index.js +++ b/src/components/util/ErrorBoundary/index.js | |||
@@ -18,7 +18,6 @@ const messages = defineMessages({ | |||
18 | }, | 18 | }, |
19 | }); | 19 | }); |
20 | 20 | ||
21 | @injectSheet(styles) | ||
22 | class ErrorBoundary extends Component { | 21 | class ErrorBoundary extends Component { |
23 | state = { | 22 | state = { |
24 | hasError: false, | 23 | hasError: false, |
@@ -56,4 +55,6 @@ class ErrorBoundary extends Component { | |||
56 | } | 55 | } |
57 | } | 56 | } |
58 | 57 | ||
59 | export default injectIntl(ErrorBoundary); | 58 | export default injectIntl( |
59 | injectSheet(styles, { injectTheme: true })(ErrorBoundary), | ||
60 | ); | ||
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index aa36e3969..e6d6dcf8a 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -14,8 +14,6 @@ import AppLoader from '../../components/ui/AppLoader'; | |||
14 | import { oneOrManyChildElements } from '../../prop-types'; | 14 | import { oneOrManyChildElements } from '../../prop-types'; |
15 | import FeaturesStore from '../../stores/FeaturesStore'; | 15 | import FeaturesStore from '../../stores/FeaturesStore'; |
16 | 16 | ||
17 | @inject('stores', 'actions') | ||
18 | @observer | ||
19 | class AuthLayoutContainer extends Component { | 17 | class AuthLayoutContainer extends Component { |
20 | static propTypes = { | 18 | static propTypes = { |
21 | children: oneOrManyChildElements.isRequired, | 19 | children: oneOrManyChildElements.isRequired, |
@@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component { | |||
71 | } | 69 | } |
72 | } | 70 | } |
73 | 71 | ||
74 | AuthLayoutContainer.wrappedComponent.propTypes = { | 72 | AuthLayoutContainer.propTypes = { |
75 | stores: PropTypes.shape({ | 73 | stores: PropTypes.shape({ |
76 | app: PropTypes.instanceOf(AppStore).isRequired, | 74 | app: PropTypes.instanceOf(AppStore).isRequired, |
77 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 75 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
@@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = { | |||
85 | }).isRequired, | 83 | }).isRequired, |
86 | }; | 84 | }; |
87 | 85 | ||
88 | export default AuthLayoutContainer; | 86 | export default inject('stores', 'actions')(observer(AuthLayoutContainer)); |
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js index dcc913c39..60bfde088 100644 --- a/src/containers/auth/ChangeServerScreen.js +++ b/src/containers/auth/ChangeServerScreen.js | |||
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router'; | |||
5 | import ChangeServer from '../../components/auth/ChangeServer'; | 5 | import ChangeServer from '../../components/auth/ChangeServer'; |
6 | import SettingsStore from '../../stores/SettingsStore'; | 6 | import SettingsStore from '../../stores/SettingsStore'; |
7 | 7 | ||
8 | @inject('stores', 'actions') | ||
9 | @observer | ||
10 | class ChangeServerScreen extends Component { | 8 | class ChangeServerScreen extends Component { |
11 | constructor(props) { | 9 | constructor(props) { |
12 | super(props); | 10 | super(props); |
@@ -34,7 +32,7 @@ class ChangeServerScreen extends Component { | |||
34 | } | 32 | } |
35 | } | 33 | } |
36 | 34 | ||
37 | ChangeServerScreen.wrappedComponent.propTypes = { | 35 | ChangeServerScreen.propTypes = { |
38 | actions: PropTypes.shape({ | 36 | actions: PropTypes.shape({ |
39 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 37 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
40 | }).isRequired, | 38 | }).isRequired, |
@@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = { | |||
44 | }).isRequired, | 42 | }).isRequired, |
45 | }; | 43 | }; |
46 | 44 | ||
47 | export default ChangeServerScreen; | 45 | export default inject('stores', 'actions')(observer(ChangeServerScreen)); |
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index 46e2d41f0..c01c3d355 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js | |||
@@ -5,8 +5,6 @@ import { RouterStore } from 'mobx-react-router'; | |||
5 | import Import from '../../components/auth/Import'; | 5 | import Import from '../../components/auth/Import'; |
6 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
7 | 7 | ||
8 | @inject('stores', 'actions') | ||
9 | @observer | ||
10 | class ImportScreen extends Component { | 8 | class ImportScreen extends Component { |
11 | render() { | 9 | render() { |
12 | const { actions, stores } = this.props; | 10 | const { actions, stores } = this.props; |
@@ -26,7 +24,7 @@ class ImportScreen extends Component { | |||
26 | } | 24 | } |
27 | } | 25 | } |
28 | 26 | ||
29 | ImportScreen.wrappedComponent.propTypes = { | 27 | ImportScreen.propTypes = { |
30 | actions: PropTypes.shape({ | 28 | actions: PropTypes.shape({ |
31 | user: PropTypes.instanceOf(UserStore).isRequired, | 29 | user: PropTypes.instanceOf(UserStore).isRequired, |
32 | }).isRequired, | 30 | }).isRequired, |
@@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = { | |||
36 | }).isRequired, | 34 | }).isRequired, |
37 | }; | 35 | }; |
38 | 36 | ||
39 | export default ImportScreen; | 37 | export default inject('stores', 'actions')(observer(ImportScreen)); |
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index e252242ae..fc66227cc 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js | |||
@@ -3,8 +3,6 @@ import PropTypes from 'prop-types'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Invite from '../../components/auth/Invite'; | 4 | import Invite from '../../components/auth/Invite'; |
5 | 5 | ||
6 | @inject('stores', 'actions') | ||
7 | @observer | ||
8 | class InviteScreen extends Component { | 6 | class InviteScreen extends Component { |
9 | render() { | 7 | render() { |
10 | const { actions } = this.props; | 8 | const { actions } = this.props; |
@@ -13,7 +11,7 @@ class InviteScreen extends Component { | |||
13 | } | 11 | } |
14 | } | 12 | } |
15 | 13 | ||
16 | InviteScreen.wrappedComponent.propTypes = { | 14 | InviteScreen.propTypes = { |
17 | actions: PropTypes.shape({ | 15 | actions: PropTypes.shape({ |
18 | user: PropTypes.shape({ | 16 | user: PropTypes.shape({ |
19 | invite: PropTypes.func.isRequired, | 17 | invite: PropTypes.func.isRequired, |
@@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = { | |||
21 | }).isRequired, | 19 | }).isRequired, |
22 | }; | 20 | }; |
23 | 21 | ||
24 | export default InviteScreen; | 22 | export default inject('stores', 'actions')(observer(InviteScreen)); |
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js index 945e41284..87a00800f 100644 --- a/src/containers/auth/LockedScreen.js +++ b/src/containers/auth/LockedScreen.js | |||
@@ -7,8 +7,6 @@ import SettingsStore from '../../stores/SettingsStore'; | |||
7 | import { hash } from '../../helpers/password-helpers'; | 7 | import { hash } from '../../helpers/password-helpers'; |
8 | import UserStore from '../../stores/UserStore'; | 8 | import UserStore from '../../stores/UserStore'; |
9 | 9 | ||
10 | @inject('stores', 'actions') | ||
11 | @observer | ||
12 | class LockedScreen extends Component { | 10 | class LockedScreen extends Component { |
13 | state = { | 11 | state = { |
14 | error: false, | 12 | error: false, |
@@ -76,7 +74,7 @@ class LockedScreen extends Component { | |||
76 | } | 74 | } |
77 | } | 75 | } |
78 | 76 | ||
79 | LockedScreen.wrappedComponent.propTypes = { | 77 | LockedScreen.propTypes = { |
80 | actions: PropTypes.shape({ | 78 | actions: PropTypes.shape({ |
81 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 79 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
82 | }).isRequired, | 80 | }).isRequired, |
@@ -86,4 +84,4 @@ LockedScreen.wrappedComponent.propTypes = { | |||
86 | }).isRequired, | 84 | }).isRequired, |
87 | }; | 85 | }; |
88 | 86 | ||
89 | export default LockedScreen; | 87 | export default inject('stores', 'actions')(observer(LockedScreen)); |
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index 3f8c67fa8..572a38ea1 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js | |||
@@ -6,8 +6,6 @@ import UserStore from '../../stores/UserStore'; | |||
6 | 6 | ||
7 | import { globalError as globalErrorPropType } from '../../prop-types'; | 7 | import { globalError as globalErrorPropType } from '../../prop-types'; |
8 | 8 | ||
9 | @inject('stores', 'actions') | ||
10 | @observer | ||
11 | class LoginScreen extends Component { | 9 | class LoginScreen extends Component { |
12 | static propTypes = { | 10 | static propTypes = { |
13 | error: globalErrorPropType.isRequired, | 11 | error: globalErrorPropType.isRequired, |
@@ -32,7 +30,7 @@ class LoginScreen extends Component { | |||
32 | } | 30 | } |
33 | } | 31 | } |
34 | 32 | ||
35 | LoginScreen.wrappedComponent.propTypes = { | 33 | LoginScreen.propTypes = { |
36 | actions: PropTypes.shape({ | 34 | actions: PropTypes.shape({ |
37 | user: PropTypes.instanceOf(UserStore).isRequired, | 35 | user: PropTypes.instanceOf(UserStore).isRequired, |
38 | }).isRequired, | 36 | }).isRequired, |
@@ -41,4 +39,4 @@ LoginScreen.wrappedComponent.propTypes = { | |||
41 | }).isRequired, | 39 | }).isRequired, |
42 | }; | 40 | }; |
43 | 41 | ||
44 | export default LoginScreen; | 42 | export default inject('stores', 'actions')(observer(LoginScreen)); |
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index 836d4cc88..4b2c1b4a2 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js | |||
@@ -4,8 +4,6 @@ import { inject, observer } from 'mobx-react'; | |||
4 | import Password from '../../components/auth/Password'; | 4 | import Password from '../../components/auth/Password'; |
5 | import UserStore from '../../stores/UserStore'; | 5 | import UserStore from '../../stores/UserStore'; |
6 | 6 | ||
7 | @inject('stores', 'actions') | ||
8 | @observer | ||
9 | class PasswordScreen extends Component { | 7 | class PasswordScreen extends Component { |
10 | render() { | 8 | render() { |
11 | const { actions, stores } = this.props; | 9 | const { actions, stores } = this.props; |
@@ -22,7 +20,7 @@ class PasswordScreen extends Component { | |||
22 | } | 20 | } |
23 | } | 21 | } |
24 | 22 | ||
25 | PasswordScreen.wrappedComponent.propTypes = { | 23 | PasswordScreen.propTypes = { |
26 | actions: PropTypes.shape({ | 24 | actions: PropTypes.shape({ |
27 | user: PropTypes.instanceOf(UserStore).isRequired, | 25 | user: PropTypes.instanceOf(UserStore).isRequired, |
28 | }).isRequired, | 26 | }).isRequired, |
@@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = { | |||
31 | }).isRequired, | 29 | }).isRequired, |
32 | }; | 30 | }; |
33 | 31 | ||
34 | export default PasswordScreen; | 32 | export default inject('stores', 'actions')(observer(PasswordScreen)); |
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js index 8cdd95a88..f6392712d 100644 --- a/src/containers/auth/SetupAssistantScreen.js +++ b/src/containers/auth/SetupAssistantScreen.js | |||
@@ -14,8 +14,6 @@ import ServicesStore from '../../stores/ServicesStore'; | |||
14 | import RecipesStore from '../../stores/RecipesStore'; | 14 | import RecipesStore from '../../stores/RecipesStore'; |
15 | import UserStore from '../../stores/UserStore'; | 15 | import UserStore from '../../stores/UserStore'; |
16 | 16 | ||
17 | @inject('stores', 'actions') | ||
18 | @observer | ||
19 | class SetupAssistantScreen extends Component { | 17 | class SetupAssistantScreen extends Component { |
20 | constructor(props) { | 18 | constructor(props) { |
21 | super(props); | 19 | super(props); |
@@ -120,7 +118,7 @@ class SetupAssistantScreen extends Component { | |||
120 | } | 118 | } |
121 | } | 119 | } |
122 | 120 | ||
123 | SetupAssistantScreen.wrappedComponent.propTypes = { | 121 | SetupAssistantScreen.propTypes = { |
124 | stores: PropTypes.shape({ | 122 | stores: PropTypes.shape({ |
125 | services: PropTypes.instanceOf(ServicesStore), | 123 | services: PropTypes.instanceOf(ServicesStore), |
126 | router: PropTypes.instanceOf(RouterStore).isRequired, | 124 | router: PropTypes.instanceOf(RouterStore).isRequired, |
@@ -134,4 +132,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = { | |||
134 | }).isRequired, | 132 | }).isRequired, |
135 | }; | 133 | }; |
136 | 134 | ||
137 | export default SetupAssistantScreen; | 135 | export default inject('stores', 'actions')(observer(SetupAssistantScreen)); |
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index 3b19f3c50..1dd8d0772 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js | |||
@@ -8,8 +8,6 @@ import FeaturesStore from '../../stores/FeaturesStore'; | |||
8 | 8 | ||
9 | import { globalError as globalErrorPropType } from '../../prop-types'; | 9 | import { globalError as globalErrorPropType } from '../../prop-types'; |
10 | 10 | ||
11 | @inject('stores', 'actions') | ||
12 | @observer | ||
13 | class SignupScreen extends Component { | 11 | class SignupScreen extends Component { |
14 | static propTypes = { | 12 | static propTypes = { |
15 | error: globalErrorPropType.isRequired, | 13 | error: globalErrorPropType.isRequired, |
@@ -36,7 +34,7 @@ class SignupScreen extends Component { | |||
36 | } | 34 | } |
37 | } | 35 | } |
38 | 36 | ||
39 | SignupScreen.wrappedComponent.propTypes = { | 37 | SignupScreen.propTypes = { |
40 | actions: PropTypes.shape({ | 38 | actions: PropTypes.shape({ |
41 | user: PropTypes.instanceOf(UserStore).isRequired, | 39 | user: PropTypes.instanceOf(UserStore).isRequired, |
42 | }).isRequired, | 40 | }).isRequired, |
@@ -46,4 +44,4 @@ SignupScreen.wrappedComponent.propTypes = { | |||
46 | }).isRequired, | 44 | }).isRequired, |
47 | }; | 45 | }; |
48 | 46 | ||
49 | export default SignupScreen; | 47 | export default inject('stores', 'actions')(observer(SignupScreen)); |
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index 7a23d9ba9..18b6b2eda 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js | |||
@@ -6,8 +6,6 @@ import Welcome from '../../components/auth/Welcome'; | |||
6 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
7 | import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; | 7 | import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; |
8 | 8 | ||
9 | @inject('stores', 'actions') | ||
10 | @observer | ||
11 | class LoginScreen extends Component { | 9 | class LoginScreen extends Component { |
12 | render() { | 10 | render() { |
13 | const { user, recipePreviews } = this.props.stores; | 11 | const { user, recipePreviews } = this.props.stores; |
@@ -23,11 +21,11 @@ class LoginScreen extends Component { | |||
23 | } | 21 | } |
24 | } | 22 | } |
25 | 23 | ||
26 | LoginScreen.wrappedComponent.propTypes = { | 24 | LoginScreen.propTypes = { |
27 | stores: PropTypes.shape({ | 25 | stores: PropTypes.shape({ |
28 | user: PropTypes.instanceOf(UserStore).isRequired, | 26 | user: PropTypes.instanceOf(UserStore).isRequired, |
29 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, | 27 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, |
30 | }).isRequired, | 28 | }).isRequired, |
31 | }; | 29 | }; |
32 | 30 | ||
33 | export default LoginScreen; | 31 | export default inject('stores', 'actions')(observer(LoginScreen)); |
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 50a28803f..9b0edc85e 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -24,8 +24,6 @@ import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawe | |||
24 | import { workspaceStore } from '../../features/workspaces'; | 24 | import { workspaceStore } from '../../features/workspaces'; |
25 | import WorkspacesStore from '../../features/workspaces/store'; | 25 | import WorkspacesStore from '../../features/workspaces/store'; |
26 | 26 | ||
27 | @inject('stores', 'actions') | ||
28 | @observer | ||
29 | class AppLayoutContainer extends Component { | 27 | class AppLayoutContainer extends Component { |
30 | static defaultProps = { | 28 | static defaultProps = { |
31 | children: null, | 29 | children: null, |
@@ -171,7 +169,7 @@ class AppLayoutContainer extends Component { | |||
171 | } | 169 | } |
172 | } | 170 | } |
173 | 171 | ||
174 | AppLayoutContainer.wrappedComponent.propTypes = { | 172 | AppLayoutContainer.propTypes = { |
175 | stores: PropTypes.shape({ | 173 | stores: PropTypes.shape({ |
176 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 174 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
177 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 175 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
@@ -194,4 +192,4 @@ AppLayoutContainer.wrappedComponent.propTypes = { | |||
194 | children: oneOrManyChildElements, | 192 | children: oneOrManyChildElements, |
195 | }; | 193 | }; |
196 | 194 | ||
197 | export default AppLayoutContainer; | 195 | export default inject('stores', 'actions')(observer(AppLayoutContainer)); |
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index f7c9b8164..aae230577 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -12,8 +12,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; | |||
12 | import { LIVE_FRANZ_API } from '../../config'; | 12 | import { LIVE_FRANZ_API } from '../../config'; |
13 | import { WEBSITE } from '../../environment-remote'; | 13 | import { WEBSITE } from '../../environment-remote'; |
14 | 14 | ||
15 | @inject('stores', 'actions') | ||
16 | @observer | ||
17 | class AccountScreen extends Component { | 15 | class AccountScreen extends Component { |
18 | onCloseWindow() { | 16 | onCloseWindow() { |
19 | const { user, features } = this.props.stores; | 17 | const { user, features } = this.props.stores; |
@@ -74,7 +72,7 @@ class AccountScreen extends Component { | |||
74 | } | 72 | } |
75 | } | 73 | } |
76 | 74 | ||
77 | AccountScreen.wrappedComponent.propTypes = { | 75 | AccountScreen.propTypes = { |
78 | stores: PropTypes.shape({ | 76 | stores: PropTypes.shape({ |
79 | user: PropTypes.instanceOf(UserStore).isRequired, | 77 | user: PropTypes.instanceOf(UserStore).isRequired, |
80 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 78 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
@@ -87,4 +85,4 @@ AccountScreen.wrappedComponent.propTypes = { | |||
87 | }).isRequired, | 85 | }).isRequired, |
88 | }; | 86 | }; |
89 | 87 | ||
90 | export default AccountScreen; | 88 | export default inject('stores', 'actions')(observer(AccountScreen)); |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index ddf7fab36..24b827993 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -111,8 +111,6 @@ const messages = defineMessages({ | |||
111 | }, | 111 | }, |
112 | }); | 112 | }); |
113 | 113 | ||
114 | @inject('stores', 'actions') | ||
115 | @observer | ||
116 | class EditServiceScreen extends Component { | 114 | class EditServiceScreen extends Component { |
117 | onSubmit(data) { | 115 | onSubmit(data) { |
118 | const { action } = this.props.router.params; | 116 | const { action } = this.props.router.params; |
@@ -438,7 +436,7 @@ class EditServiceScreen extends Component { | |||
438 | } | 436 | } |
439 | } | 437 | } |
440 | 438 | ||
441 | EditServiceScreen.wrappedComponent.propTypes = { | 439 | EditServiceScreen.propTypes = { |
442 | stores: PropTypes.shape({ | 440 | stores: PropTypes.shape({ |
443 | user: PropTypes.instanceOf(UserStore).isRequired, | 441 | user: PropTypes.instanceOf(UserStore).isRequired, |
444 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, | 442 | recipes: PropTypes.instanceOf(RecipesStore).isRequired, |
@@ -451,4 +449,6 @@ EditServiceScreen.wrappedComponent.propTypes = { | |||
451 | }).isRequired, | 449 | }).isRequired, |
452 | }; | 450 | }; |
453 | 451 | ||
454 | export default injectIntl(EditServiceScreen); | 452 | export default injectIntl( |
453 | inject('stores', 'actions')(observer(EditServiceScreen)), | ||
454 | ); | ||
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 720f2c8a1..ddf6876b9 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -245,8 +245,6 @@ const messages = defineMessages({ | |||
245 | }, | 245 | }, |
246 | }); | 246 | }); |
247 | 247 | ||
248 | @inject('stores', 'actions') | ||
249 | @observer | ||
250 | class EditSettingsScreen extends Component { | 248 | class EditSettingsScreen extends Component { |
251 | constructor(props) { | 249 | constructor(props) { |
252 | super(props); | 250 | super(props); |
@@ -753,7 +751,7 @@ class EditSettingsScreen extends Component { | |||
753 | } | 751 | } |
754 | } | 752 | } |
755 | 753 | ||
756 | EditSettingsScreen.wrappedComponent.propTypes = { | 754 | EditSettingsScreen.propTypes = { |
757 | stores: PropTypes.shape({ | 755 | stores: PropTypes.shape({ |
758 | app: PropTypes.instanceOf(AppStore).isRequired, | 756 | app: PropTypes.instanceOf(AppStore).isRequired, |
759 | user: PropTypes.instanceOf(UserStore).isRequired, | 757 | user: PropTypes.instanceOf(UserStore).isRequired, |
@@ -771,4 +769,6 @@ EditSettingsScreen.wrappedComponent.propTypes = { | |||
771 | }).isRequired, | 769 | }).isRequired, |
772 | }; | 770 | }; |
773 | 771 | ||
774 | export default injectIntl(EditSettingsScreen); | 772 | export default injectIntl( |
773 | inject('stores', 'actions')(observer(EditSettingsScreen)), | ||
774 | ); | ||
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index 1dc0aa8e6..baa2d7b71 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -49,8 +49,6 @@ const messages = defineMessages({ | |||
49 | }, | 49 | }, |
50 | }); | 50 | }); |
51 | 51 | ||
52 | @inject('stores', 'actions') | ||
53 | @observer | ||
54 | class EditUserScreen extends Component { | 52 | class EditUserScreen extends Component { |
55 | componentWillUnmount() { | 53 | componentWillUnmount() { |
56 | this.props.actions.user.resetStatus(); | 54 | this.props.actions.user.resetStatus(); |
@@ -150,7 +148,7 @@ class EditUserScreen extends Component { | |||
150 | } | 148 | } |
151 | } | 149 | } |
152 | 150 | ||
153 | EditUserScreen.wrappedComponent.propTypes = { | 151 | EditUserScreen.propTypes = { |
154 | stores: PropTypes.shape({ | 152 | stores: PropTypes.shape({ |
155 | user: PropTypes.instanceOf(UserStore).isRequired, | 153 | user: PropTypes.instanceOf(UserStore).isRequired, |
156 | }).isRequired, | 154 | }).isRequired, |
@@ -159,4 +157,6 @@ EditUserScreen.wrappedComponent.propTypes = { | |||
159 | }).isRequired, | 157 | }).isRequired, |
160 | }; | 158 | }; |
161 | 159 | ||
162 | export default injectIntl(EditUserScreen); | 160 | export default injectIntl( |
161 | inject('stores', 'actions')(observer(EditUserScreen)), | ||
162 | ); | ||
diff --git a/src/containers/settings/InviteScreen.js b/src/containers/settings/InviteScreen.js index 592b4b11c..86723554c 100644 --- a/src/containers/settings/InviteScreen.js +++ b/src/containers/settings/InviteScreen.js | |||
@@ -6,8 +6,6 @@ import Invite from '../../components/auth/Invite'; | |||
6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
7 | import UserStore from '../../stores/UserStore'; | 7 | import UserStore from '../../stores/UserStore'; |
8 | 8 | ||
9 | @inject('stores', 'actions') | ||
10 | @observer | ||
11 | class InviteScreen extends Component { | 9 | class InviteScreen extends Component { |
12 | componentWillUnmount() { | 10 | componentWillUnmount() { |
13 | this.props.stores.user.inviteRequest.reset(); | 11 | this.props.stores.user.inviteRequest.reset(); |
@@ -32,7 +30,7 @@ class InviteScreen extends Component { | |||
32 | } | 30 | } |
33 | } | 31 | } |
34 | 32 | ||
35 | InviteScreen.wrappedComponent.propTypes = { | 33 | InviteScreen.propTypes = { |
36 | actions: PropTypes.shape({ | 34 | actions: PropTypes.shape({ |
37 | user: PropTypes.instanceOf(UserStore).isRequired, | 35 | user: PropTypes.instanceOf(UserStore).isRequired, |
38 | }).isRequired, | 36 | }).isRequired, |
@@ -41,4 +39,4 @@ InviteScreen.wrappedComponent.propTypes = { | |||
41 | }).isRequired, | 39 | }).isRequired, |
42 | }; | 40 | }; |
43 | 41 | ||
44 | export default InviteScreen; | 42 | export default inject('stores', 'actions')(observer(InviteScreen)); |
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js index 7f55e54c5..6b629d3d8 100644 --- a/src/containers/settings/RecipesScreen.js +++ b/src/containers/settings/RecipesScreen.js | |||
@@ -19,8 +19,6 @@ import RecipePreview from '../../models/RecipePreview'; | |||
19 | import AppStore from '../../stores/AppStore'; | 19 | import AppStore from '../../stores/AppStore'; |
20 | import { openPath } from '../../helpers/url-helpers'; | 20 | import { openPath } from '../../helpers/url-helpers'; |
21 | 21 | ||
22 | @inject('stores', 'actions') | ||
23 | @observer | ||
24 | class RecipesScreen extends Component { | 22 | class RecipesScreen extends Component { |
25 | static propTypes = { | 23 | static propTypes = { |
26 | params: PropTypes.shape({ | 24 | params: PropTypes.shape({ |
@@ -182,7 +180,7 @@ class RecipesScreen extends Component { | |||
182 | } | 180 | } |
183 | } | 181 | } |
184 | 182 | ||
185 | RecipesScreen.wrappedComponent.propTypes = { | 183 | RecipesScreen.propTypes = { |
186 | stores: PropTypes.shape({ | 184 | stores: PropTypes.shape({ |
187 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, | 185 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, |
188 | recipes: PropTypes.instanceOf(RecipeStore).isRequired, | 186 | recipes: PropTypes.instanceOf(RecipeStore).isRequired, |
@@ -198,4 +196,4 @@ RecipesScreen.wrappedComponent.propTypes = { | |||
198 | }).isRequired, | 196 | }).isRequired, |
199 | }; | 197 | }; |
200 | 198 | ||
201 | export default RecipesScreen; | 199 | export default inject('stores', 'actions')(observer(RecipesScreen)); |
diff --git a/src/containers/settings/ServicesScreen.js b/src/containers/settings/ServicesScreen.js index a657b6e6c..2970b2a54 100644 --- a/src/containers/settings/ServicesScreen.js +++ b/src/containers/settings/ServicesScreen.js | |||
@@ -10,8 +10,6 @@ import ServiceStore from '../../stores/ServicesStore'; | |||
10 | import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; | 10 | import ServicesDashboard from '../../components/settings/services/ServicesDashboard'; |
11 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 11 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
12 | 12 | ||
13 | @inject('stores', 'actions') | ||
14 | @observer | ||
15 | class ServicesScreen extends Component { | 13 | class ServicesScreen extends Component { |
16 | componentWillUnmount() { | 14 | componentWillUnmount() { |
17 | this.props.actions.service.resetFilter(); | 15 | this.props.actions.service.resetFilter(); |
@@ -57,7 +55,7 @@ class ServicesScreen extends Component { | |||
57 | } | 55 | } |
58 | } | 56 | } |
59 | 57 | ||
60 | ServicesScreen.wrappedComponent.propTypes = { | 58 | ServicesScreen.propTypes = { |
61 | stores: PropTypes.shape({ | 59 | stores: PropTypes.shape({ |
62 | user: PropTypes.instanceOf(UserStore).isRequired, | 60 | user: PropTypes.instanceOf(UserStore).isRequired, |
63 | services: PropTypes.instanceOf(ServiceStore).isRequired, | 61 | services: PropTypes.instanceOf(ServiceStore).isRequired, |
@@ -68,4 +66,4 @@ ServicesScreen.wrappedComponent.propTypes = { | |||
68 | }).isRequired, | 66 | }).isRequired, |
69 | }; | 67 | }; |
70 | 68 | ||
71 | export default ServicesScreen; | 69 | export default inject('stores', 'actions')(observer(ServicesScreen)); |
diff --git a/src/containers/settings/SettingsWindow.js b/src/containers/settings/SettingsWindow.js index 35db3a434..0e6ce4df3 100644 --- a/src/containers/settings/SettingsWindow.js +++ b/src/containers/settings/SettingsWindow.js | |||
@@ -11,8 +11,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary'; | |||
11 | import { workspaceStore } from '../../features/workspaces'; | 11 | import { workspaceStore } from '../../features/workspaces'; |
12 | import UIStore from '../../stores/UIStore'; | 12 | import UIStore from '../../stores/UIStore'; |
13 | 13 | ||
14 | @inject('stores', 'actions') | ||
15 | @observer | ||
16 | class SettingsContainer extends Component { | 14 | class SettingsContainer extends Component { |
17 | portalRoot = document.querySelector('#portalContainer'); | 15 | portalRoot = document.querySelector('#portalContainer'); |
18 | 16 | ||
@@ -48,7 +46,7 @@ class SettingsContainer extends Component { | |||
48 | } | 46 | } |
49 | } | 47 | } |
50 | 48 | ||
51 | SettingsContainer.wrappedComponent.propTypes = { | 49 | SettingsContainer.propTypes = { |
52 | children: PropTypes.element.isRequired, | 50 | children: PropTypes.element.isRequired, |
53 | stores: PropTypes.shape({ | 51 | stores: PropTypes.shape({ |
54 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 52 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
@@ -58,4 +56,4 @@ SettingsContainer.wrappedComponent.propTypes = { | |||
58 | }).isRequired, | 56 | }).isRequired, |
59 | }; | 57 | }; |
60 | 58 | ||
61 | export default SettingsContainer; | 59 | export default inject('stores', 'actions')(observer(SettingsContainer)); |
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js index d3600f8ea..b4ad952b2 100644 --- a/src/containers/settings/SupportScreen.js +++ b/src/containers/settings/SupportScreen.js | |||
@@ -6,7 +6,6 @@ import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDas | |||
6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 6 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
7 | import AppStore from '../../stores/AppStore'; | 7 | import AppStore from '../../stores/AppStore'; |
8 | 8 | ||
9 | @inject('actions') | ||
10 | class SupportScreen extends Component { | 9 | class SupportScreen extends Component { |
11 | constructor(props) { | 10 | constructor(props) { |
12 | super(props); | 11 | super(props); |
@@ -27,10 +26,10 @@ class SupportScreen extends Component { | |||
27 | } | 26 | } |
28 | } | 27 | } |
29 | 28 | ||
30 | SupportScreen.wrappedComponent.propTypes = { | 29 | SupportScreen.propTypes = { |
31 | actions: PropTypes.shape({ | 30 | actions: PropTypes.shape({ |
32 | app: PropTypes.instanceOf(AppStore).isRequired, | 31 | app: PropTypes.instanceOf(AppStore).isRequired, |
33 | }).isRequired, | 32 | }).isRequired, |
34 | }; | 33 | }; |
35 | 34 | ||
36 | export default SupportScreen; | 35 | export default inject('actions')(SupportScreen); |
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index 928262a59..0a8b92b47 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js | |||
@@ -10,8 +10,6 @@ import TeamDashboard from '../../components/settings/team/TeamDashboard'; | |||
10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
11 | import { DEV_API_FRANZ_WEBSITE } from '../../config'; | 11 | import { DEV_API_FRANZ_WEBSITE } from '../../config'; |
12 | 12 | ||
13 | @inject('stores', 'actions') | ||
14 | @observer | ||
15 | class TeamScreen extends Component { | 13 | class TeamScreen extends Component { |
16 | handleWebsiteLink(route) { | 14 | handleWebsiteLink(route) { |
17 | const { actions, stores } = this.props; | 15 | const { actions, stores } = this.props; |
@@ -44,7 +42,7 @@ class TeamScreen extends Component { | |||
44 | } | 42 | } |
45 | } | 43 | } |
46 | 44 | ||
47 | TeamScreen.wrappedComponent.propTypes = { | 45 | TeamScreen.propTypes = { |
48 | stores: PropTypes.shape({ | 46 | stores: PropTypes.shape({ |
49 | user: PropTypes.instanceOf(UserStore).isRequired, | 47 | user: PropTypes.instanceOf(UserStore).isRequired, |
50 | app: PropTypes.instanceOf(AppStore).isRequired, | 48 | app: PropTypes.instanceOf(AppStore).isRequired, |
@@ -56,4 +54,4 @@ TeamScreen.wrappedComponent.propTypes = { | |||
56 | }).isRequired, | 54 | }).isRequired, |
57 | }; | 55 | }; |
58 | 56 | ||
59 | export default TeamScreen; | 57 | export default inject('stores', 'actions')(observer(TeamScreen)); |
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts index af15b157e..95f211e52 100644 --- a/src/electron/ipc-api/download.ts +++ b/src/electron/ipc-api/download.ts | |||
@@ -48,7 +48,7 @@ export default (params: { mainWindow: BrowserWindow }) => { | |||
48 | 48 | ||
49 | debug('File blob saved to', saveDialog.filePath); | 49 | debug('File blob saved to', saveDialog.filePath); |
50 | } catch (error) { | 50 | } catch (error) { |
51 | console.log(error); | 51 | console.error(error); |
52 | } | 52 | } |
53 | } | 53 | } |
54 | } catch (error) { | 54 | } catch (error) { |
diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js index 652233e55..89b0a4e72 100644 --- a/src/features/basicAuth/Component.js +++ b/src/features/basicAuth/Component.js | |||
@@ -22,8 +22,6 @@ const messages = defineMessages({ | |||
22 | }, | 22 | }, |
23 | }); | 23 | }); |
24 | 24 | ||
25 | @injectSheet(styles) | ||
26 | @observer | ||
27 | class BasicAuthModal extends Component { | 25 | class BasicAuthModal extends Component { |
28 | static propTypes = { | 26 | static propTypes = { |
29 | classes: PropTypes.object.isRequired, | 27 | classes: PropTypes.object.isRequired, |
@@ -97,4 +95,6 @@ class BasicAuthModal extends Component { | |||
97 | ); | 95 | ); |
98 | } | 96 | } |
99 | } | 97 | } |
100 | export default injectIntl(BasicAuthModal); | 98 | export default injectIntl( |
99 | injectSheet(styles, { injectTheme: true })(observer(BasicAuthModal)), | ||
100 | ); | ||
diff --git a/src/features/nightlyBuilds/Component.js b/src/features/nightlyBuilds/Component.js index 64f782c8f..0966480d0 100644 --- a/src/features/nightlyBuilds/Component.js +++ b/src/features/nightlyBuilds/Component.js | |||
@@ -29,7 +29,7 @@ const messages = defineMessages({ | |||
29 | }, | 29 | }, |
30 | }); | 30 | }); |
31 | 31 | ||
32 | const styles = () => ({ | 32 | const styles = { |
33 | info: { | 33 | info: { |
34 | paddingTop: 20, | 34 | paddingTop: 20, |
35 | paddingBottom: 20, | 35 | paddingBottom: 20, |
@@ -51,11 +51,8 @@ const styles = () => ({ | |||
51 | background: '#c45a5a !important', | 51 | background: '#c45a5a !important', |
52 | color: '#ffffff !important', | 52 | color: '#ffffff !important', |
53 | }, | 53 | }, |
54 | }); | 54 | }; |
55 | 55 | ||
56 | @injectSheet(styles) | ||
57 | @inject('stores', 'actions') | ||
58 | @observer | ||
59 | class NightlyBuildsModal extends Component { | 56 | class NightlyBuildsModal extends Component { |
60 | close() { | 57 | close() { |
61 | ModalState.isModalVisible = false; | 58 | ModalState.isModalVisible = false; |
@@ -119,7 +116,7 @@ class NightlyBuildsModal extends Component { | |||
119 | } | 116 | } |
120 | } | 117 | } |
121 | 118 | ||
122 | NightlyBuildsModal.wrappedComponent.propTypes = { | 119 | NightlyBuildsModal.propTypes = { |
123 | stores: PropTypes.shape({ | 120 | stores: PropTypes.shape({ |
124 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 121 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
125 | }).isRequired, | 122 | }).isRequired, |
@@ -131,4 +128,8 @@ NightlyBuildsModal.wrappedComponent.propTypes = { | |||
131 | classes: PropTypes.object.isRequired, | 128 | classes: PropTypes.object.isRequired, |
132 | }; | 129 | }; |
133 | 130 | ||
134 | export default injectIntl(NightlyBuildsModal); | 131 | export default injectIntl( |
132 | injectSheet(styles)( | ||
133 | inject('stores', 'actions')(observer(NightlyBuildsModal)), | ||
134 | ), | ||
135 | ); | ||
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js index 30bdc13b6..953fc7c21 100644 --- a/src/features/publishDebugInfo/Component.js +++ b/src/features/publishDebugInfo/Component.js | |||
@@ -85,14 +85,7 @@ const styles = theme => ({ | |||
85 | }, | 85 | }, |
86 | }); | 86 | }); |
87 | 87 | ||
88 | @injectSheet(styles) | ||
89 | @inject('stores', 'actions') | ||
90 | @observer | ||
91 | class PublishDebugLogModal extends Component { | 88 | class PublishDebugLogModal extends Component { |
92 | static propTypes = { | ||
93 | classes: PropTypes.object.isRequired, | ||
94 | }; | ||
95 | |||
96 | state = { | 89 | state = { |
97 | log: null, | 90 | log: null, |
98 | error: false, | 91 | error: false, |
@@ -221,13 +214,18 @@ class PublishDebugLogModal extends Component { | |||
221 | } | 214 | } |
222 | } | 215 | } |
223 | 216 | ||
224 | PublishDebugLogModal.wrappedComponent.propTypes = { | 217 | PublishDebugLogModal.propTypes = { |
225 | stores: PropTypes.shape({ | 218 | stores: PropTypes.shape({ |
226 | app: PropTypes.instanceOf(AppStore).isRequired, | 219 | app: PropTypes.instanceOf(AppStore).isRequired, |
227 | }).isRequired, | 220 | }).isRequired, |
228 | actions: PropTypes.shape({ | 221 | actions: PropTypes.shape({ |
229 | service: PropTypes.instanceOf(ServicesStore).isRequired, | 222 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
230 | }).isRequired, | 223 | }).isRequired, |
224 | classes: PropTypes.object.isRequired, | ||
231 | }; | 225 | }; |
232 | 226 | ||
233 | export default injectIntl(PublishDebugLogModal); | 227 | export default injectIntl( |
228 | injectSheet(styles, { injectTheme: true })( | ||
229 | inject('stores', 'actions')(observer(PublishDebugLogModal)), | ||
230 | ), | ||
231 | ); | ||
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js index 75587cc1d..7f9424b6d 100644 --- a/src/features/quickSwitch/Component.js +++ b/src/features/quickSwitch/Component.js | |||
@@ -81,9 +81,6 @@ const styles = theme => ({ | |||
81 | }, | 81 | }, |
82 | }); | 82 | }); |
83 | 83 | ||
84 | @injectSheet(styles) | ||
85 | @inject('stores', 'actions') | ||
86 | @observer | ||
87 | class QuickSwitchModal extends Component { | 84 | class QuickSwitchModal extends Component { |
88 | static propTypes = { | 85 | static propTypes = { |
89 | classes: PropTypes.object.isRequired, | 86 | classes: PropTypes.object.isRequired, |
@@ -349,13 +346,18 @@ class QuickSwitchModal extends Component { | |||
349 | } | 346 | } |
350 | } | 347 | } |
351 | 348 | ||
352 | QuickSwitchModal.wrappedComponent.propTypes = { | 349 | QuickSwitchModal.propTypes = { |
353 | stores: PropTypes.shape({ | 350 | stores: PropTypes.shape({ |
354 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 351 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
355 | }).isRequired, | 352 | }).isRequired, |
356 | actions: PropTypes.shape({ | 353 | actions: PropTypes.shape({ |
357 | service: PropTypes.instanceOf(ServicesStore).isRequired, | 354 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
358 | }).isRequired, | 355 | }).isRequired, |
356 | classes: PropTypes.object.isRequired, | ||
359 | }; | 357 | }; |
360 | 358 | ||
361 | export default injectIntl(QuickSwitchModal); | 359 | export default injectIntl( |
360 | injectSheet(styles, { injectTheme: true })( | ||
361 | inject('stores', 'actions')(observer(QuickSwitchModal)), | ||
362 | ), | ||
363 | ); | ||
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js index 1d423544b..780864b91 100644 --- a/src/features/todos/components/TodosWebview.js +++ b/src/features/todos/components/TodosWebview.js | |||
@@ -48,8 +48,6 @@ const styles = theme => ({ | |||
48 | }, | 48 | }, |
49 | }); | 49 | }); |
50 | 50 | ||
51 | @injectSheet(styles) | ||
52 | @observer | ||
53 | class TodosWebview extends Component { | 51 | class TodosWebview extends Component { |
54 | static propTypes = { | 52 | static propTypes = { |
55 | classes: PropTypes.object.isRequired, | 53 | classes: PropTypes.object.isRequired, |
@@ -128,7 +126,6 @@ class TodosWebview extends Component { | |||
128 | const { handleClientMessage } = this.props; | 126 | const { handleClientMessage } = this.props; |
129 | if (!this.webview) return; | 127 | if (!this.webview) return; |
130 | this.webview.addEventListener('ipc-message', e => { | 128 | this.webview.addEventListener('ipc-message', e => { |
131 | // console.log(e); | ||
132 | handleClientMessage({ channel: e.channel, message: e.args[0] }); | 129 | handleClientMessage({ channel: e.channel, message: e.args[0] }); |
133 | }); | 130 | }); |
134 | } | 131 | } |
@@ -201,4 +198,6 @@ class TodosWebview extends Component { | |||
201 | } | 198 | } |
202 | } | 199 | } |
203 | 200 | ||
204 | export default TodosWebview; | 201 | export default injectSheet(styles, { injectTheme: true })( |
202 | observer(TodosWebview), | ||
203 | ); | ||
diff --git a/src/features/todos/containers/TodosScreen.js b/src/features/todos/containers/TodosScreen.js index 536810d2d..b97506767 100644 --- a/src/features/todos/containers/TodosScreen.js +++ b/src/features/todos/containers/TodosScreen.js | |||
@@ -10,8 +10,6 @@ import { TODOS_MIN_WIDTH } from '../../../config'; | |||
10 | import { todoActions } from '../actions'; | 10 | import { todoActions } from '../actions'; |
11 | import ServicesStore from '../../../stores/ServicesStore'; | 11 | import ServicesStore from '../../../stores/ServicesStore'; |
12 | 12 | ||
13 | @inject('stores', 'actions') | ||
14 | @observer | ||
15 | class TodosScreen extends Component { | 13 | class TodosScreen extends Component { |
16 | render() { | 14 | render() { |
17 | if ( | 15 | if ( |
@@ -44,9 +42,9 @@ class TodosScreen extends Component { | |||
44 | } | 42 | } |
45 | } | 43 | } |
46 | 44 | ||
47 | export default TodosScreen; | 45 | export default inject('stores', 'actions')(observer(TodosScreen)); |
48 | 46 | ||
49 | TodosScreen.wrappedComponent.propTypes = { | 47 | TodosScreen.propTypes = { |
50 | stores: PropTypes.shape({ | 48 | stores: PropTypes.shape({ |
51 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 49 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
52 | services: PropTypes.instanceOf(ServicesStore).isRequired, | 50 | services: PropTypes.instanceOf(ServicesStore).isRequired, |
diff --git a/src/features/todos/store.js b/src/features/todos/store.js index d158ed480..2bf4e8fab 100644 --- a/src/features/todos/store.js +++ b/src/features/todos/store.js | |||
@@ -187,10 +187,6 @@ export default class TodoStore extends FeatureStore { | |||
187 | break; | 187 | break; |
188 | default: | 188 | default: |
189 | debug('Other message received', channel, message); | 189 | debug('Other message received', channel, message); |
190 | console.log( | ||
191 | 'this.stores.services.isTodosServiceAdded', | ||
192 | this.stores.services.isTodosServiceAdded, | ||
193 | ); | ||
194 | if (this.stores.services.isTodosServiceAdded) { | 190 | if (this.stores.services.isTodosServiceAdded) { |
195 | this.actions.service.handleIPCMessage({ | 191 | this.actions.service.handleIPCMessage({ |
196 | serviceId: this.stores.services.isTodosServiceAdded.id, | 192 | serviceId: this.stores.services.isTodosServiceAdded.id, |
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, |
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js index 75f6d9f4a..54475eccb 100644 --- a/src/features/workspaces/components/CreateWorkspaceForm.js +++ b/src/features/workspaces/components/CreateWorkspaceForm.js | |||
@@ -21,7 +21,7 @@ const messages = defineMessages({ | |||
21 | }, | 21 | }, |
22 | }); | 22 | }); |
23 | 23 | ||
24 | const styles = () => ({ | 24 | const styles = { |
25 | form: { | 25 | form: { |
26 | display: 'flex', | 26 | display: 'flex', |
27 | }, | 27 | }, |
@@ -32,10 +32,8 @@ const styles = () => ({ | |||
32 | submitButton: { | 32 | submitButton: { |
33 | height: 'inherit', | 33 | height: 'inherit', |
34 | }, | 34 | }, |
35 | }); | 35 | }; |
36 | 36 | ||
37 | @injectSheet(styles) | ||
38 | @observer | ||
39 | class CreateWorkspaceForm extends Component { | 37 | class CreateWorkspaceForm extends Component { |
40 | static propTypes = { | 38 | static propTypes = { |
41 | classes: PropTypes.object.isRequired, | 39 | classes: PropTypes.object.isRequired, |
@@ -94,4 +92,6 @@ class CreateWorkspaceForm extends Component { | |||
94 | } | 92 | } |
95 | } | 93 | } |
96 | 94 | ||
97 | export default injectIntl(CreateWorkspaceForm); | 95 | export default injectIntl( |
96 | injectSheet(styles, { injectTheme: true })(observer(CreateWorkspaceForm)), | ||
97 | ); | ||
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index fa3ea4289..e8bd9d60c 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js | |||
@@ -58,7 +58,7 @@ const messages = defineMessages({ | |||
58 | }, | 58 | }, |
59 | }); | 59 | }); |
60 | 60 | ||
61 | const styles = () => ({ | 61 | const styles = { |
62 | nameInput: { | 62 | nameInput: { |
63 | height: 'auto', | 63 | height: 'auto', |
64 | }, | 64 | }, |
@@ -68,10 +68,8 @@ const styles = () => ({ | |||
68 | keepLoadedInfo: { | 68 | keepLoadedInfo: { |
69 | marginBottom: '2rem !important', | 69 | marginBottom: '2rem !important', |
70 | }, | 70 | }, |
71 | }); | 71 | }; |
72 | 72 | ||
73 | @injectSheet(styles) | ||
74 | @observer | ||
75 | class EditWorkspaceForm extends Component { | 73 | class EditWorkspaceForm extends Component { |
76 | static propTypes = { | 74 | static propTypes = { |
77 | classes: PropTypes.object.isRequired, | 75 | classes: PropTypes.object.isRequired, |
@@ -230,4 +228,6 @@ class EditWorkspaceForm extends Component { | |||
230 | } | 228 | } |
231 | } | 229 | } |
232 | 230 | ||
233 | export default injectIntl(EditWorkspaceForm); | 231 | export default injectIntl( |
232 | injectSheet(styles, { injectTheme: true })(observer(EditWorkspaceForm)), | ||
233 | ); | ||
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index d66e0f10d..4fd2b1153 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -88,8 +88,6 @@ const styles = theme => ({ | |||
88 | }, | 88 | }, |
89 | }); | 89 | }); |
90 | 90 | ||
91 | @injectSheet(styles) | ||
92 | @observer | ||
93 | class WorkspaceDrawer extends Component { | 91 | class WorkspaceDrawer extends Component { |
94 | static propTypes = { | 92 | static propTypes = { |
95 | classes: PropTypes.object.isRequired, | 93 | classes: PropTypes.object.isRequired, |
@@ -175,4 +173,6 @@ class WorkspaceDrawer extends Component { | |||
175 | } | 173 | } |
176 | } | 174 | } |
177 | 175 | ||
178 | export default injectIntl(WorkspaceDrawer); | 176 | export default injectIntl( |
177 | injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawer)), | ||
178 | ); | ||
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js index d3c9fa767..22c0a39d9 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.js +++ b/src/features/workspaces/components/WorkspaceDrawerItem.js | |||
@@ -65,8 +65,6 @@ const styles = theme => ({ | |||
65 | }, | 65 | }, |
66 | }); | 66 | }); |
67 | 67 | ||
68 | @injectSheet(styles) | ||
69 | @observer | ||
70 | class WorkspaceDrawerItem extends Component { | 68 | class WorkspaceDrawerItem extends Component { |
71 | static propTypes = { | 69 | static propTypes = { |
72 | classes: PropTypes.object.isRequired, | 70 | classes: PropTypes.object.isRequired, |
@@ -150,4 +148,6 @@ class WorkspaceDrawerItem extends Component { | |||
150 | } | 148 | } |
151 | } | 149 | } |
152 | 150 | ||
153 | export default injectIntl(WorkspaceDrawerItem); | 151 | export default injectIntl( |
152 | injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawerItem)), | ||
153 | ); | ||
diff --git a/src/features/workspaces/components/WorkspaceItem.tsx b/src/features/workspaces/components/WorkspaceItem.tsx index 6fb02d2f5..f46375c7a 100644 --- a/src/features/workspaces/components/WorkspaceItem.tsx +++ b/src/features/workspaces/components/WorkspaceItem.tsx | |||
@@ -22,8 +22,6 @@ type Props = { | |||
22 | onItemClick: (workspace) => void; | 22 | onItemClick: (workspace) => void; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | @injectSheet(styles) | ||
26 | @observer | ||
27 | class WorkspaceItem extends Component<Props> { | 25 | class WorkspaceItem extends Component<Props> { |
28 | static propTypes = { | 26 | static propTypes = { |
29 | classes: PropTypes.object.isRequired, | 27 | classes: PropTypes.object.isRequired, |
@@ -42,4 +40,6 @@ class WorkspaceItem extends Component<Props> { | |||
42 | } | 40 | } |
43 | } | 41 | } |
44 | 42 | ||
45 | export default WorkspaceItem; | 43 | export default injectSheet(styles, { injectTheme: true })( |
44 | observer(WorkspaceItem), | ||
45 | ); | ||
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx index 6e012eb1e..46fda0103 100644 --- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx +++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx | |||
@@ -36,8 +36,6 @@ type Props = { | |||
36 | service: any; | 36 | service: any; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | @injectSheet(styles) | ||
40 | @observer | ||
41 | class WorkspaceServiceListItem extends Component<Props> { | 39 | class WorkspaceServiceListItem extends Component<Props> { |
42 | render() { | 40 | render() { |
43 | const { classes, isInWorkspace, onToggle, service } = this.props; | 41 | const { classes, isInWorkspace, onToggle, service } = this.props; |
@@ -63,4 +61,6 @@ class WorkspaceServiceListItem extends Component<Props> { | |||
63 | } | 61 | } |
64 | } | 62 | } |
65 | 63 | ||
66 | export default WorkspaceServiceListItem; | 64 | export default injectSheet(styles, { injectTheme: true })( |
65 | observer(WorkspaceServiceListItem), | ||
66 | ); | ||
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js index ff4e9475a..b2e0adfe7 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js | |||
@@ -53,8 +53,6 @@ const styles = theme => ({ | |||
53 | }, | 53 | }, |
54 | }); | 54 | }); |
55 | 55 | ||
56 | @injectSheet(styles) | ||
57 | @observer | ||
58 | class WorkspaceSwitchingIndicator extends Component { | 56 | class WorkspaceSwitchingIndicator extends Component { |
59 | static propTypes = { | 57 | static propTypes = { |
60 | classes: PropTypes.object.isRequired, | 58 | classes: PropTypes.object.isRequired, |
@@ -85,4 +83,8 @@ class WorkspaceSwitchingIndicator extends Component { | |||
85 | } | 83 | } |
86 | } | 84 | } |
87 | 85 | ||
88 | export default injectIntl(WorkspaceSwitchingIndicator); | 86 | export default injectIntl( |
87 | injectSheet(styles, { injectTheme: true })( | ||
88 | observer(WorkspaceSwitchingIndicator), | ||
89 | ), | ||
90 | ); | ||
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 1087580b1..9c2f65731 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js | |||
@@ -49,7 +49,7 @@ const messages = defineMessages({ | |||
49 | }, | 49 | }, |
50 | }); | 50 | }); |
51 | 51 | ||
52 | const styles = () => ({ | 52 | const styles = { |
53 | table: { | 53 | table: { |
54 | width: '100%', | 54 | width: '100%', |
55 | '& td': { | 55 | '& td': { |
@@ -67,11 +67,8 @@ const styles = () => ({ | |||
67 | margin: [-8, 0, 0, 20], | 67 | margin: [-8, 0, 0, 20], |
68 | alignSelf: 'center', | 68 | alignSelf: 'center', |
69 | }, | 69 | }, |
70 | }); | 70 | }; |
71 | 71 | ||
72 | @inject('stores') | ||
73 | @injectSheet(styles) | ||
74 | @observer | ||
75 | class WorkspacesDashboard extends Component { | 72 | class WorkspacesDashboard extends Component { |
76 | static propTypes = { | 73 | static propTypes = { |
77 | classes: PropTypes.object.isRequired, | 74 | classes: PropTypes.object.isRequired, |
@@ -190,9 +187,13 @@ class WorkspacesDashboard extends Component { | |||
190 | } | 187 | } |
191 | } | 188 | } |
192 | 189 | ||
193 | export default injectIntl(WorkspacesDashboard); | 190 | export default injectIntl( |
191 | inject('stores')( | ||
192 | injectSheet(styles, { injectTheme: true })(observer(WorkspacesDashboard)), | ||
193 | ), | ||
194 | ); | ||
194 | 195 | ||
195 | WorkspacesDashboard.wrappedComponent.propTypes = { | 196 | WorkspacesDashboard.propTypes = { |
196 | stores: PropTypes.shape({ | 197 | stores: PropTypes.shape({ |
197 | ui: PropTypes.instanceOf(UIStore).isRequired, | 198 | ui: PropTypes.instanceOf(UIStore).isRequired, |
198 | }).isRequired, | 199 | }).isRequired, |
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.tsx b/src/features/workspaces/containers/EditWorkspaceScreen.tsx index 8e8f8179d..0351ddafb 100644 --- a/src/features/workspaces/containers/EditWorkspaceScreen.tsx +++ b/src/features/workspaces/containers/EditWorkspaceScreen.tsx | |||
@@ -17,8 +17,6 @@ type Props = { | |||
17 | }; | 17 | }; |
18 | }; | 18 | }; |
19 | 19 | ||
20 | @inject('stores', 'actions') | ||
21 | @observer | ||
22 | class EditWorkspaceScreen extends Component<Props> { | 20 | class EditWorkspaceScreen extends Component<Props> { |
23 | // @ts-expect-error Not all code paths return a value. | 21 | // @ts-expect-error Not all code paths return a value. |
24 | onDelete = () => { | 22 | onDelete = () => { |
@@ -58,4 +56,4 @@ class EditWorkspaceScreen extends Component<Props> { | |||
58 | } | 56 | } |
59 | } | 57 | } |
60 | 58 | ||
61 | export default EditWorkspaceScreen; | 59 | export default inject('stores', 'actions')(observer(EditWorkspaceScreen)); |
diff --git a/src/features/workspaces/containers/WorkspacesScreen.tsx b/src/features/workspaces/containers/WorkspacesScreen.tsx index a07e92439..33808b69d 100644 --- a/src/features/workspaces/containers/WorkspacesScreen.tsx +++ b/src/features/workspaces/containers/WorkspacesScreen.tsx | |||
@@ -17,8 +17,6 @@ type Props = { | |||
17 | }; | 17 | }; |
18 | }; | 18 | }; |
19 | 19 | ||
20 | @inject('stores', 'actions') | ||
21 | @observer | ||
22 | class WorkspacesScreen extends Component<Props> { | 20 | class WorkspacesScreen extends Component<Props> { |
23 | render() { | 21 | render() { |
24 | const { actions } = this.props; | 22 | const { actions } = this.props; |
@@ -38,4 +36,4 @@ class WorkspacesScreen extends Component<Props> { | |||
38 | } | 36 | } |
39 | } | 37 | } |
40 | 38 | ||
41 | export default WorkspacesScreen; | 39 | export default inject('stores', 'actions')(observer(WorkspacesScreen)); |
diff --git a/src/lib/Form.ts b/src/lib/Form.ts index 9b8321948..14ea82948 100644 --- a/src/lib/Form.ts +++ b/src/lib/Form.ts | |||
@@ -1,4 +1,5 @@ | |||
1 | import Form from 'mobx-react-form'; | 1 | import Form from 'mobx-react-form'; |
2 | import vjf from 'mobx-react-form/lib/validators/VJF'; | ||
2 | 3 | ||
3 | export default class DefaultForm extends Form { | 4 | export default class DefaultForm extends Form { |
4 | bindings() { | 5 | bindings() { |
@@ -29,4 +30,10 @@ export default class DefaultForm extends Form { | |||
29 | // // }, | 30 | // // }, |
30 | }; | 31 | }; |
31 | } | 32 | } |
33 | |||
34 | plugins() { | ||
35 | return { | ||
36 | vjf: vjf(), | ||
37 | }; | ||
38 | } | ||
32 | } | 39 | } |
diff --git a/src/routes.tsx b/src/routes.tsx index 569da06a7..192090737 100644 --- a/src/routes.tsx +++ b/src/routes.tsx | |||
@@ -36,8 +36,6 @@ type Props = { | |||
36 | history: any; | 36 | history: any; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | @inject('stores', 'actions') | ||
40 | @observer | ||
41 | class Routes extends Component<Props> { | 39 | class Routes extends Component<Props> { |
42 | render() { | 40 | render() { |
43 | const { locked } = this.props.stores.settings.app; | 41 | const { locked } = this.props.stores.settings.app; |
@@ -94,4 +92,4 @@ class Routes extends Component<Props> { | |||
94 | } | 92 | } |
95 | } | 93 | } |
96 | 94 | ||
97 | export default Routes; | 95 | export default inject('stores', 'actions')(observer(Routes)); |
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 3d418c4c5..09ee8890a 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -799,8 +799,6 @@ export default class ServicesStore extends Store { | |||
799 | options.icon = '/assets/img/notification-badge.gif'; | 799 | options.icon = '/assets/img/notification-badge.gif'; |
800 | } | 800 | } |
801 | 801 | ||
802 | console.log(title, options); | ||
803 | |||
804 | this.actions.app.notify({ | 802 | this.actions.app.notify({ |
805 | notificationId: args[0].notificationId, | 803 | notificationId: args[0].notificationId, |
806 | title, | 804 | title, |