diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2022-11-07 06:50:40 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-07 01:20:40 +0000 |
commit | 93a5de8d8e725cb6fff256a54544d39cf50a16f8 (patch) | |
tree | 6772686892a9e63e183109944c2845fcdeeb8939 /src/features | |
parent | 6.2.1-nightly.40 [skip ci] (diff) | |
download | ferdium-app-93a5de8d8e725cb6fff256a54544d39cf50a16f8.tar.gz ferdium-app-93a5de8d8e725cb6fff256a54544d39cf50a16f8.tar.zst ferdium-app-93a5de8d8e725cb6fff256a54544d39cf50a16f8.zip |
Revert "Remove duplicated Toggle.js component" (#742)
Revert "Remove duplicated Toggle.js component (#741)"
This reverts commit dd238ae7949e72e3b90235f56e14686cc5231f34.
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/workspaces/components/EditWorkspaceForm.js | 2 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceServiceListItem.tsx | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index 509df97e6..6bc9ae6f0 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js | |||
@@ -176,7 +176,7 @@ class EditWorkspaceForm extends Component { | |||
176 | )} | 176 | )} |
177 | <div className={classes.nameInput}> | 177 | <div className={classes.nameInput}> |
178 | <Input {...form.$('name').bind()} /> | 178 | <Input {...form.$('name').bind()} /> |
179 | <Toggle {...form.$('keepLoaded').bind()} /> | 179 | <Toggle field={form.$('keepLoaded')} /> |
180 | <p className={`${classes.keepLoadedInfo} franz-form__label`}> | 180 | <p className={`${classes.keepLoadedInfo} franz-form__label`}> |
181 | {intl.formatMessage(messages.keepLoadedInfo)} | 181 | {intl.formatMessage(messages.keepLoadedInfo)} |
182 | </p> | 182 | </p> |
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx index 420aed595..0233d5749 100644 --- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx +++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx | |||
@@ -1,10 +1,10 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { Component } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import withStyles, { WithStylesProps } from 'react-jss'; | 3 | import injectSheet from 'react-jss'; |
4 | import classnames from 'classnames'; | 4 | import classnames from 'classnames'; |
5 | import Toggle from '../../../components/ui/toggle'; | 5 | |
6 | import Toggle from '../../../components/ui/toggle/index'; | ||
6 | import ServiceIcon from '../../../components/ui/ServiceIcon'; | 7 | import ServiceIcon from '../../../components/ui/ServiceIcon'; |
7 | import Service from '../../../models/Service'; | ||
8 | 8 | ||
9 | const styles = theme => ({ | 9 | const styles = theme => ({ |
10 | listItem: { | 10 | listItem: { |
@@ -29,15 +29,15 @@ const styles = theme => ({ | |||
29 | }, | 29 | }, |
30 | }); | 30 | }); |
31 | 31 | ||
32 | interface IProps extends WithStylesProps<typeof styles> { | 32 | type Props = { |
33 | classes: any; | ||
33 | isInWorkspace: boolean; | 34 | isInWorkspace: boolean; |
34 | onToggle: () => void; | 35 | onToggle: () => void; |
35 | service: Service; | 36 | service: any; |
36 | } | 37 | }; |
37 | 38 | ||
38 | @observer | 39 | class WorkspaceServiceListItem extends Component<Props> { |
39 | class WorkspaceServiceListItem extends Component<IProps> { | 40 | render() { |
40 | render(): ReactElement { | ||
41 | const { classes, isInWorkspace, onToggle, service } = this.props; | 41 | const { classes, isInWorkspace, onToggle, service } = this.props; |
42 | 42 | ||
43 | return ( | 43 | return ( |
@@ -53,7 +53,7 @@ class WorkspaceServiceListItem extends Component<IProps> { | |||
53 | </span> | 53 | </span> |
54 | <Toggle | 54 | <Toggle |
55 | className={classes.toggle} | 55 | className={classes.toggle} |
56 | value={isInWorkspace} | 56 | checked={isInWorkspace} |
57 | onChange={onToggle} | 57 | onChange={onToggle} |
58 | /> | 58 | /> |
59 | </div> | 59 | </div> |
@@ -61,6 +61,6 @@ class WorkspaceServiceListItem extends Component<IProps> { | |||
61 | } | 61 | } |
62 | } | 62 | } |
63 | 63 | ||
64 | export default withStyles(styles, { injectTheme: true })( | 64 | export default injectSheet(styles, { injectTheme: true })( |
65 | WorkspaceServiceListItem, | 65 | observer(WorkspaceServiceListItem), |
66 | ); | 66 | ); |