chore: upgrade react-jss to latest (#2302)

10 files changed, 37 insertions, 38 deletions

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({
   },
 });
 
-const styles = () => ({
+const styles = {
   form: {
     display: 'flex',
   },
@@ -32,10 +32,8 @@ const styles = () => ({
   submitButton: {
     height: 'inherit',
   },
-});
+};
 
-@injectSheet(styles)
-@observer
 class CreateWorkspaceForm extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -94,4 +92,6 @@ class CreateWorkspaceForm extends Component {
   }
 }
 
-export default injectIntl(CreateWorkspaceForm);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(CreateWorkspaceForm)),
+);
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({
   },
 });
 
-const styles = () => ({
+const styles = {
   nameInput: {
     height: 'auto',
   },
@@ -68,10 +68,8 @@ const styles = () => ({
   keepLoadedInfo: {
     marginBottom: '2rem !important',
   },
-});
+};
 
-@injectSheet(styles)
-@observer
 class EditWorkspaceForm extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -230,4 +228,6 @@ class EditWorkspaceForm extends Component {
   }
 }
 
-export default injectIntl(EditWorkspaceForm);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(EditWorkspaceForm)),
+);
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 => ({
   },
 });
 
-@injectSheet(styles)
-@observer
 class WorkspaceDrawer extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -175,4 +173,6 @@ class WorkspaceDrawer extends Component {
   }
 }
 
-export default injectIntl(WorkspaceDrawer);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawer)),
+);
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 => ({
   },
 });
 
-@injectSheet(styles)
-@observer
 class WorkspaceDrawerItem extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -150,4 +148,6 @@ class WorkspaceDrawerItem extends Component {
   }
 }
 
-export default injectIntl(WorkspaceDrawerItem);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(observer(WorkspaceDrawerItem)),
+);
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 = {
   onItemClick: (workspace) => void;
 };
 
-@injectSheet(styles)
-@observer
 class WorkspaceItem extends Component<Props> {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -42,4 +40,6 @@ class WorkspaceItem extends Component<Props> {
   }
 }
 
-export default WorkspaceItem;
+export default injectSheet(styles, { injectTheme: true })(
+  observer(WorkspaceItem),
+);
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 = {
   service: any;
 };
 
-@injectSheet(styles)
-@observer
 class WorkspaceServiceListItem extends Component<Props> {
   render() {
     const { classes, isInWorkspace, onToggle, service } = this.props;
@@ -63,4 +61,6 @@ class WorkspaceServiceListItem extends Component<Props> {
   }
 }
 
-export default WorkspaceServiceListItem;
+export default injectSheet(styles, { injectTheme: true })(
+  observer(WorkspaceServiceListItem),
+);
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 => ({
   },
 });
 
-@injectSheet(styles)
-@observer
 class WorkspaceSwitchingIndicator extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -85,4 +83,8 @@ class WorkspaceSwitchingIndicator extends Component {
   }
 }
 
-export default injectIntl(WorkspaceSwitchingIndicator);
+export default injectIntl(
+  injectSheet(styles, { injectTheme: true })(
+    observer(WorkspaceSwitchingIndicator),
+  ),
+);
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({
   },
 });
 
-const styles = () => ({
+const styles = {
   table: {
     width: '100%',
     '& td': {
@@ -67,11 +67,8 @@ const styles = () => ({
     margin: [-8, 0, 0, 20],
     alignSelf: 'center',
   },
-});
+};
 
-@inject('stores')
-@injectSheet(styles)
-@observer
 class WorkspacesDashboard extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -190,9 +187,13 @@ class WorkspacesDashboard extends Component {
   }
 }
 
-export default injectIntl(WorkspacesDashboard);
+export default injectIntl(
+  inject('stores')(
+    injectSheet(styles, { injectTheme: true })(observer(WorkspacesDashboard)),
+  ),
+);
 
-WorkspacesDashboard.wrappedComponent.propTypes = {
+WorkspacesDashboard.propTypes = {
   stores: PropTypes.shape({
     ui: PropTypes.instanceOf(UIStore).isRequired,
   }).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 = {
   };
 };
 
-@inject('stores', 'actions')
-@observer
 class EditWorkspaceScreen extends Component<Props> {
   // @ts-expect-error Not all code paths return a value.
   onDelete = () => {
@@ -58,4 +56,4 @@ class EditWorkspaceScreen extends Component<Props> {
   }
 }
 
-export default EditWorkspaceScreen;
+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 = {
   };
 };
 
-@inject('stores', 'actions')
-@observer
 class WorkspacesScreen extends Component<Props> {
   render() {
     const { actions } = this.props;
@@ -38,4 +36,4 @@ class WorkspacesScreen extends Component<Props> {
   }
 }
 
-export default WorkspacesScreen;
+export default inject('stores', 'actions')(observer(WorkspacesScreen));