diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 17 | ||||
-rw-r--r-- | src/components/ui/Tabs/TabItem.js | 15 | ||||
-rw-r--r-- | src/components/ui/Tabs/TabItem.tsx | 3 | ||||
-rw-r--r-- | src/components/ui/Tabs/index.js | 6 |
4 files changed, 11 insertions, 30 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 179741338..22089ec45 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -8,7 +8,8 @@ import normalizeUrl from 'normalize-url'; | |||
8 | import Form from '../../../lib/Form'; | 8 | import Form from '../../../lib/Form'; |
9 | import Recipe from '../../../models/Recipe'; | 9 | import Recipe from '../../../models/Recipe'; |
10 | import Service from '../../../models/Service'; | 10 | import Service from '../../../models/Service'; |
11 | import Tabs, { TabItem } from '../../ui/Tabs'; | 11 | import Tabs from '../../ui/Tabs/Tabs'; |
12 | import { TabItem } from '../../ui/Tabs/TabItem'; | ||
12 | import Input from '../../ui/Input'; | 13 | import Input from '../../ui/Input'; |
13 | import Toggle from '../../ui/Toggle'; | 14 | import Toggle from '../../ui/Toggle'; |
14 | import Slider from '../../ui/Slider'; | 15 | import Slider from '../../ui/Slider'; |
@@ -262,11 +263,11 @@ class EditServiceForm extends Component { | |||
262 | <span className="settings__header-item"> | 263 | <span className="settings__header-item"> |
263 | {action === 'add' | 264 | {action === 'add' |
264 | ? intl.formatMessage(messages.addServiceHeadline, { | 265 | ? intl.formatMessage(messages.addServiceHeadline, { |
265 | name: recipe.name, | 266 | name: recipe.name, |
266 | }) | 267 | }) |
267 | : intl.formatMessage(messages.editServiceHeadline, { | 268 | : intl.formatMessage(messages.editServiceHeadline, { |
268 | name: service.name !== '' ? service.name : recipe.name, | 269 | name: service.name !== '' ? service.name : recipe.name, |
269 | })} | 270 | })} |
270 | </span> | 271 | </span> |
271 | </div> | 272 | </div> |
272 | <div className="settings__body"> | 273 | <div className="settings__body"> |
@@ -342,11 +343,9 @@ class EditServiceForm extends Component { | |||
342 | {intl.formatMessage(messages.indirectMessageInfo)} | 343 | {intl.formatMessage(messages.indirectMessageInfo)} |
343 | </p> | 344 | </p> |
344 | </> | 345 | </> |
345 | )} | 346 | )} |
346 | {recipe.allowFavoritesDelineationInUnreadCount && ( | 347 | {recipe.allowFavoritesDelineationInUnreadCount && ( |
347 | <Toggle | 348 | <Toggle field={form.$('onlyShowFavoritesInUnreadCount')} /> |
348 | field={form.$('onlyShowFavoritesInUnreadCount')} | ||
349 | /> | ||
350 | )} | 349 | )} |
351 | </div> | 350 | </div> |
352 | 351 | ||
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js deleted file mode 100644 index d0ef4e798..000000000 --- a/src/components/ui/Tabs/TabItem.js +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | import React, { Component } from 'react'; | ||
2 | |||
3 | import { oneOrManyChildElements } from '../../../prop-types'; | ||
4 | |||
5 | export default class TabItem extends Component { | ||
6 | static propTypes = { | ||
7 | children: oneOrManyChildElements.isRequired, | ||
8 | }; | ||
9 | |||
10 | render() { | ||
11 | const { children } = this.props; | ||
12 | |||
13 | return <>{children}</>; | ||
14 | } | ||
15 | } | ||
diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx new file mode 100644 index 000000000..bd613ddc7 --- /dev/null +++ b/src/components/ui/Tabs/TabItem.tsx | |||
@@ -0,0 +1,3 @@ | |||
1 | import React from 'react'; | ||
2 | |||
3 | export const TabItem = ({ children }) => <>{children}</>; | ||
diff --git a/src/components/ui/Tabs/index.js b/src/components/ui/Tabs/index.js deleted file mode 100644 index e4adb62c7..000000000 --- a/src/components/ui/Tabs/index.js +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | import Tabs from './Tabs'; | ||
2 | import TabItem from './TabItem'; | ||
3 | |||
4 | export default Tabs; | ||
5 | |||
6 | export { TabItem }; | ||