diff options
Diffstat (limited to 'src/components/services/tabs')
-rw-r--r-- | src/components/services/tabs/TabBarSortableList.js | 3 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 11 | ||||
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 3 |
3 files changed, 9 insertions, 8 deletions
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); |