From 354ffea92be3a1030c730b6bb8ece7f680e01b12 Mon Sep 17 00:00:00 2001 From: Balaji Vijayakumar Date: Wed, 26 Oct 2022 09:47:11 +0530 Subject: refactor: convert TabBar to typescript --- src/components/layout/Sidebar.tsx | 68 ++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 23 deletions(-) (limited to 'src/components/layout') diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index a81229dca..c37447357 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx @@ -3,28 +3,28 @@ import ReactTooltip from 'react-tooltip'; import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; import { inject, observer } from 'mobx-react'; import { + mdiBell, + mdiBellOff, mdiCheckAll, - mdiViewGrid, - mdiPlusBox, + mdiChevronDown, + mdiChevronRight, mdiCog, - mdiBellOff, - mdiBell, mdiLock, mdiMenu, - mdiChevronDown, - mdiChevronRight, + mdiPlusBox, + mdiViewGrid, mdiViewSplitVertical, } from '@mdi/js'; import Tabbar from '../services/tabs/Tabbar'; import { - settingsShortcutKey, + addNewServiceShortcutKey, lockFerdiumShortcutKey, + muteFerdiumShortcutKey, + settingsShortcutKey, + splitModeToggleShortcutKey, todosToggleShortcutKey, workspaceToggleShortcutKey, - addNewServiceShortcutKey, - splitModeToggleShortcutKey, - muteFerdiumShortcutKey, } from '../../environment'; import { todosStore } from '../../features/todos'; import { todoActions } from '../../features/todos/actions'; @@ -86,21 +86,25 @@ interface IProps extends WrappedComponentProps { actions?: Actions; stores?: RealStores; - deleteService: () => void; - updateService: () => void; - hibernateService: () => void; - wakeUpService: () => void; toggleMuteApp: () => void; toggleCollapseMenu: () => void; toggleWorkspaceDrawer: () => void; - openSettings: (arg: { path: string }) => void; + openSettings: (args: { path: string }) => void; closeSettings: () => void; - setActive: () => void; - reorder: () => void; - reload: () => void; - toggleNotifications: () => void; - toggleAudio: () => void; - toggleDarkMode: () => void; + setActive: (args: { serviceId: string }) => void; + reorder: (args: { oldIndex: number; newIndex: number }) => void; + reload: (args: { serviceId: string }) => void; + toggleNotifications: (args: { serviceId: string }) => void; + toggleAudio: (args: { serviceId: string }) => void; + toggleDarkMode: (args: { serviceId: string }) => void; + deleteService: (args: { serviceId: string }) => void; + hibernateService: (args: { serviceId: string }) => void; + wakeUpService: (args: { serviceId: string }) => void; + updateService: (args: { + serviceId: string; + serviceData: { isEnabled: boolean; isMediaPlaying: boolean }; + redirect: boolean; + }) => void; } interface IState { @@ -180,10 +184,28 @@ class Sidebar extends Component { return (
this.enableToolTip()} disableToolTip={() => this.disableToolTip()} - useHorizontalStyle={stores!.settings.all.app.useHorizontalStyle} + reorder={this.props.reorder} + reload={this.props.reload} + toggleNotifications={this.props.toggleNotifications} + toggleAudio={this.props.toggleAudio} + toggleDarkMode={this.props.toggleDarkMode} + deleteService={this.props.deleteService} + updateService={this.props.updateService} + hibernateService={this.props.hibernateService} + wakeUpService={this.props.wakeUpService} /> <> {numberActiveButtons <= 1 || hideCollapseButton ? null : ( -- cgit v1.2.3-54-g00ecf