diff options
Diffstat (limited to 'src/components/services')
10 files changed, 22 insertions, 27 deletions
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); |