From 11c992b04f3cad6badf0ae86da65f490e31dd359 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Sat, 4 Dec 2021 10:51:16 +0100 Subject: chore: upgrade react-jss to latest (#2302) --- src/components/services/tabs/TabBarSortableList.js | 3 +-- src/components/services/tabs/TabItem.js | 11 +++++++---- src/components/services/tabs/Tabbar.js | 3 +-- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src/components/services/tabs') 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'; import TabItem from './TabItem'; -@observer class TabBarSortableList extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -75,4 +74,4 @@ class TabBarSortableList extends Component { } } -export default SortableContainer(TabBarSortableList); +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 = { }, }; -@injectSheet(styles) -@inject('stores') -@observer class TabItem extends Component { static propTypes = { classes: PropTypes.object.isRequired, @@ -402,4 +399,10 @@ class TabItem extends Component { } } -export default injectIntl(SortableElement(TabItem)); +export default injectIntl( + SortableElement( + injectSheet(styles, { injectTheme: true })( + inject('stores')(observer(TabItem)), + ), + ), +); 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'; import TabBarSortableList from './TabBarSortableList'; -@observer class TabBar extends Component { static propTypes = { services: MobxPropTypes.arrayOrObservableArray.isRequired, @@ -120,4 +119,4 @@ class TabBar extends Component { } } -export default TabBar; +export default observer(TabBar); -- cgit v1.2.3-54-g00ecf