diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-12-04 10:51:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-04 10:51:16 +0100 |
commit | 11c992b04f3cad6badf0ae86da65f490e31dd359 (patch) | |
tree | 749e63f6ba3e9bea48c186b5d8502d328edfd276 /src/features | |
parent | 5.6.4-nightly.24 [skip ci] (diff) | |
download | ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.gz ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.zst ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.zip |
chore: upgrade react-jss to latest (#2302)
Diffstat (limited to 'src/features')
19 files changed, 72 insertions, 81 deletions
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)); |