From 4ef4e45ee4976d466bdd0e13dd75c6d08e9b2a9c Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Tue, 15 Nov 2022 08:50:22 +0100 Subject: [PATCH] fix(styles) Remove Theme type annotation (#12544) * tss-react doesn't need a type anotation for the Theme * Update tss-react to 4.4.4 --- package-lock.json | 14 +++++++------- package.json | 2 +- react/features/base/buttons/CopyButton.web.tsx | 3 +-- .../components/participants-pane-list/ListItem.tsx | 3 +-- react/features/base/label/components/web/Label.tsx | 3 +-- .../premeeting/components/web/ActionButton.tsx | 3 +-- .../premeeting/components/web/ConnectionStatus.tsx | 3 +-- .../premeeting/components/web/PreMeetingScreen.tsx | 3 +-- react/features/base/ui/components/web/Button.tsx | 3 +-- react/features/base/ui/components/web/Checkbox.tsx | 3 +-- .../base/ui/components/web/ClickableIcon.tsx | 3 +-- .../base/ui/components/web/ContextMenu.tsx | 3 +-- .../base/ui/components/web/ContextMenuItem.tsx | 3 +-- .../ui/components/web/ContextMenuItemGroup.tsx | 3 +-- react/features/base/ui/components/web/Dialog.tsx | 3 +-- react/features/base/ui/components/web/Input.tsx | 3 +-- react/features/base/ui/components/web/Select.tsx | 3 +-- react/features/base/ui/components/web/Switch.tsx | 3 +-- react/features/base/ui/components/web/Tabs.tsx | 3 +-- .../chat/components/web/NewMessagesButton.tsx | 3 +-- .../components/web/RaisedHandsCountLabel.tsx | 3 +-- .../display-name/components/web/DisplayName.tsx | 3 +-- .../components/web/DisplayNameBadge.tsx | 3 +-- .../components/web/StageParticipantNameLabel.tsx | 3 +-- .../components/web/RaisedHandIndicator.tsx | 3 +-- react/features/gifs/components/web/GifsMenu.tsx | 3 +-- .../web/CopyMeetingLinkSection.tsx | 3 +-- .../add-people-dialog/web/DialInLimit.tsx | 3 +-- .../add-people-dialog/web/DialInSection.tsx | 3 +-- .../add-people-dialog/web/InviteByEmailSection.tsx | 3 +-- .../components/web/KeyboardShortcutsDialog.tsx | 3 +-- .../components/ScreenSharePlaceholder.web.tsx | 3 +-- .../components/web/NotificationsContainer.tsx | 2 +- .../components/web/CollapsibleRoom.tsx | 3 +-- .../components/web/JoinQuickActionButton.tsx | 3 +-- .../components/web/RoomParticipantContextMenu.tsx | 3 +-- .../components/web/FooterContextMenu.tsx | 3 +-- .../components/web/LobbyParticipantItem.tsx | 3 +-- .../components/web/LobbyParticipants.tsx | 3 +-- .../components/web/MeetingParticipants.tsx | 3 +-- .../components/web/ParticipantItem.tsx | 3 +-- .../components/web/ParticipantQuickAction.tsx | 3 +-- .../components/web/ParticipantsPane.tsx | 3 +-- .../components/web/RaisedHandIndicator.tsx | 3 +-- react/features/polls/components/web/PollAnswer.tsx | 3 +-- react/features/polls/components/web/PollCreate.tsx | 3 +-- .../prejoin/components/web/DropdownButton.tsx | 3 +-- .../components/web/dialogs/CallingDialog.tsx | 3 +-- .../components/web/dialogs/DialInDialog.tsx | 3 +-- .../components/web/dialogs/DialOutDialog.tsx | 3 +-- .../components/web/preview/DeviceStatus.tsx | 3 +-- .../salesforce/components/web/RecordItem.tsx | 3 +-- .../components/web/SalesforceLinkDialog.tsx | 3 +-- .../speaker-stats/components/web/SpeakerStats.tsx | 3 +-- .../components/web/SpeakerStatsLabels.tsx | 3 +-- .../components/web/SpeakerStatsList.tsx | 3 +-- .../components/web/SpeakerStatsSearch.tsx | 3 +-- .../subtitles/components/LanguageListItem.web.tsx | 3 +-- .../components/LanguageSelectorDialog.web.tsx | 3 +-- react/features/toolbox/components/web/Drawer.tsx | 3 +-- .../components/web/ParticipantContextMenu.tsx | 3 +-- .../video-quality/components/Slider.web.tsx | 3 +-- .../components/UploadImageButton.tsx | 6 ++---- .../components/VirtualBackgroundDialog.tsx | 3 +-- 64 files changed, 71 insertions(+), 133 deletions(-) diff --git a/package-lock.json b/package-lock.json index c76d082c71..6a2deede95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -127,7 +127,7 @@ "resemblejs": "4.0.0", "seamless-scroll-polyfill": "2.1.8", "styled-components": "3.4.9", - "tss-react": "4.0.0", + "tss-react": "4.4.4", "util": "0.12.1", "uuid": "8.3.2", "wasm-check": "2.0.1", @@ -19019,9 +19019,9 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "node_modules/tss-react": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.0.0.tgz", - "integrity": "sha512-pPkOKWiWWPbKdQFnGGeHEgRceUwkjrv0eldVCAdBll3j6Y3Ys/xwqsnlWYwWOU3SMJygVRE/S4CsIYx6KPpOkA==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.4.4.tgz", + "integrity": "sha512-Bzyg99bIQq3Lk4Rwc5XMOps58c1biw1rghCkApIX5XkAB+/VjGCIFSl63PePhmiRNvKRxJRpawGPPxHytiw1TA==", "dependencies": { "@emotion/cache": "*", "@emotion/serialize": "*", @@ -34738,9 +34738,9 @@ "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, "tss-react": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.0.0.tgz", - "integrity": "sha512-pPkOKWiWWPbKdQFnGGeHEgRceUwkjrv0eldVCAdBll3j6Y3Ys/xwqsnlWYwWOU3SMJygVRE/S4CsIYx6KPpOkA==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/tss-react/-/tss-react-4.4.4.tgz", + "integrity": "sha512-Bzyg99bIQq3Lk4Rwc5XMOps58c1biw1rghCkApIX5XkAB+/VjGCIFSl63PePhmiRNvKRxJRpawGPPxHytiw1TA==", "requires": { "@emotion/cache": "*", "@emotion/serialize": "*", diff --git a/package.json b/package.json index 43f32e9e39..f1f2cf5334 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "resemblejs": "4.0.0", "seamless-scroll-polyfill": "2.1.8", "styled-components": "3.4.9", - "tss-react": "4.0.0", + "tss-react": "4.4.4", "util": "0.12.1", "uuid": "8.3.2", "wasm-check": "2.0.1", diff --git a/react/features/base/buttons/CopyButton.web.tsx b/react/features/base/buttons/CopyButton.web.tsx index a23137bf47..b39f170767 100644 --- a/react/features/base/buttons/CopyButton.web.tsx +++ b/react/features/base/buttons/CopyButton.web.tsx @@ -1,5 +1,4 @@ /* eslint-disable react/jsx-no-bind */ -import { Theme } from '@mui/material'; import React, { useEffect, useState } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -8,7 +7,7 @@ import { IconCheck, IconCopy } from '../icons/svg'; import { withPixelLineHeight } from '../styles/functions.web'; import { copyText } from '../util/copyText.web'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { copyButton: { ...withPixelLineHeight(theme.typography.bodyShortBold), diff --git a/react/features/base/components/participants-pane-list/ListItem.tsx b/react/features/base/components/participants-pane-list/ListItem.tsx index aed7a081ad..7067d7b578 100644 --- a/react/features/base/components/participants-pane-list/ListItem.tsx +++ b/react/features/base/components/participants-pane-list/ListItem.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactNode } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -76,7 +75,7 @@ interface IProps { } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { alignItems: 'center', diff --git a/react/features/base/label/components/web/Label.tsx b/react/features/base/label/components/web/Label.tsx index d594fde5ec..ba5f470f83 100644 --- a/react/features/base/label/components/web/Label.tsx +++ b/react/features/base/label/components/web/Label.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -45,7 +44,7 @@ interface IProps { } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { label: { ...withPixelLineHeight(theme.typography.labelRegular), diff --git a/react/features/base/premeeting/components/web/ActionButton.tsx b/react/features/base/premeeting/components/web/ActionButton.tsx index 3e5f6400d4..d4154cd826 100644 --- a/react/features/base/premeeting/components/web/ActionButton.tsx +++ b/react/features/base/premeeting/components/web/ActionButton.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactNode, useCallback } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -80,7 +79,7 @@ interface IProps { type: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { actionButton: { ...withPixelLineHeight(theme.typography.bodyLongBold), diff --git a/react/features/base/premeeting/components/web/ConnectionStatus.tsx b/react/features/base/premeeting/components/web/ConnectionStatus.tsx index 5b223b9e0f..69d5b9b687 100644 --- a/react/features/base/premeeting/components/web/ConnectionStatus.tsx +++ b/react/features/base/premeeting/components/web/ConnectionStatus.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback, useState } from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -25,7 +24,7 @@ interface IProps extends WithTranslation { connectionType?: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { connectionStatus: { borderRadius: '6px', diff --git a/react/features/base/premeeting/components/web/PreMeetingScreen.tsx b/react/features/base/premeeting/components/web/PreMeetingScreen.tsx index e71827d7f6..2d55fbb2b9 100644 --- a/react/features/base/premeeting/components/web/PreMeetingScreen.tsx +++ b/react/features/base/premeeting/components/web/PreMeetingScreen.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { ReactNode } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -85,7 +84,7 @@ interface IProps { videoTrack?: Object; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { subtitle: { ...withPixelLineHeight(theme.typography.heading5), diff --git a/react/features/base/ui/components/web/Button.tsx b/react/features/base/ui/components/web/Button.tsx index 98a4d500bb..5502b20dcb 100644 --- a/react/features/base/ui/components/web/Button.tsx +++ b/react/features/base/ui/components/web/Button.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -47,7 +46,7 @@ interface IProps extends IButtonProps { testId?: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { button: { backgroundColor: theme.palette.action01, diff --git a/react/features/base/ui/components/web/Checkbox.tsx b/react/features/base/ui/components/web/Checkbox.tsx index ef5baaeb94..9bf4c1c8c8 100644 --- a/react/features/base/ui/components/web/Checkbox.tsx +++ b/react/features/base/ui/components/web/Checkbox.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -40,7 +39,7 @@ interface ICheckboxProps { onChange: (e: React.ChangeEvent) => void; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { formControl: { ...withPixelLineHeight(theme.typography.bodyLongRegular), diff --git a/react/features/base/ui/components/web/ClickableIcon.tsx b/react/features/base/ui/components/web/ClickableIcon.tsx index 79a426296b..b50ed32a8f 100644 --- a/react/features/base/ui/components/web/ClickableIcon.tsx +++ b/react/features/base/ui/components/web/ClickableIcon.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -12,7 +11,7 @@ interface IProps { onClick: () => void; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { button: { padding: '2px', diff --git a/react/features/base/ui/components/web/ContextMenu.tsx b/react/features/base/ui/components/web/ContextMenu.tsx index 4bddc5936c..b05dc9659b 100644 --- a/react/features/base/ui/components/web/ContextMenu.tsx +++ b/react/features/base/ui/components/web/ContextMenu.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactNode, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; @@ -104,7 +103,7 @@ interface IProps { const MAX_HEIGHT = 400; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { contextMenu: { backgroundColor: theme.palette.ui01, diff --git a/react/features/base/ui/components/web/ContextMenuItem.tsx b/react/features/base/ui/components/web/ContextMenuItem.tsx index 7a451d9a52..14a86225b8 100644 --- a/react/features/base/ui/components/web/ContextMenuItem.tsx +++ b/react/features/base/ui/components/web/ContextMenuItem.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactNode } from 'react'; import { useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; @@ -71,7 +70,7 @@ export interface IProps { textClassName?: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { contextMenuItem: { alignItems: 'center', diff --git a/react/features/base/ui/components/web/ContextMenuItemGroup.tsx b/react/features/base/ui/components/web/ContextMenuItemGroup.tsx index 9aa083f32b..c6a62b567a 100644 --- a/react/features/base/ui/components/web/ContextMenuItemGroup.tsx +++ b/react/features/base/ui/components/web/ContextMenuItemGroup.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactNode } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -18,7 +17,7 @@ interface IProps { children?: ReactNode; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { contextMenuItemGroup: { '&:not(:empty)': { diff --git a/react/features/base/ui/components/web/Dialog.tsx b/react/features/base/ui/components/web/Dialog.tsx index 363b5f66b2..eee71c2f2d 100644 --- a/react/features/base/ui/components/web/Dialog.tsx +++ b/react/features/base/ui/components/web/Dialog.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback, useContext, useEffect } from 'react'; import FocusLock from 'react-focus-lock'; import { useTranslation } from 'react-i18next'; @@ -15,7 +14,7 @@ import ClickableIcon from './ClickableIcon'; import { DialogTransitionContext } from './DialogTransition'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { width: '100%', diff --git a/react/features/base/ui/components/web/Input.tsx b/react/features/base/ui/components/web/Input.tsx index 24299d569c..c6c6edc009 100644 --- a/react/features/base/ui/components/web/Input.tsx +++ b/react/features/base/ui/components/web/Input.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import TextareaAutosize from 'react-textarea-autosize'; import { makeStyles } from 'tss-react/mui'; @@ -26,7 +25,7 @@ interface IProps extends IInputProps { type?: 'text' | 'email' | 'number' | 'password'; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { inputContainer: { display: 'flex', diff --git a/react/features/base/ui/components/web/Select.tsx b/react/features/base/ui/components/web/Select.tsx index 322e0eb47c..39c04efc34 100644 --- a/react/features/base/ui/components/web/Select.tsx +++ b/react/features/base/ui/components/web/Select.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ChangeEvent } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -53,7 +52,7 @@ interface ISelectProps { value: number | string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { display: 'flex', diff --git a/react/features/base/ui/components/web/Switch.tsx b/react/features/base/ui/components/web/Switch.tsx index 4baef2a2ae..79ac14d725 100644 --- a/react/features/base/ui/components/web/Switch.tsx +++ b/react/features/base/ui/components/web/Switch.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -15,7 +14,7 @@ interface IProps extends ISwitchProps { id?: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { position: 'relative', diff --git a/react/features/base/ui/components/web/Tabs.tsx b/react/features/base/ui/components/web/Tabs.tsx index aad1d47a25..b61724cbb1 100644 --- a/react/features/base/ui/components/web/Tabs.tsx +++ b/react/features/base/ui/components/web/Tabs.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -18,7 +17,7 @@ interface ITabProps { }>; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { display: 'flex' diff --git a/react/features/chat/components/web/NewMessagesButton.tsx b/react/features/chat/components/web/NewMessagesButton.tsx index ae760537c0..920ca0966b 100644 --- a/react/features/chat/components/web/NewMessagesButton.tsx +++ b/react/features/chat/components/web/NewMessagesButton.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -17,7 +16,7 @@ export interface INewMessagesButtonProps extends WithTranslation { onGoToFirstUnreadMessage: () => void; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { position: 'absolute', diff --git a/react/features/conference/components/web/RaisedHandsCountLabel.tsx b/react/features/conference/components/web/RaisedHandsCountLabel.tsx index 2298858b77..3ba5911726 100644 --- a/react/features/conference/components/web/RaisedHandsCountLabel.tsx +++ b/react/features/conference/components/web/RaisedHandsCountLabel.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -12,7 +11,7 @@ import Label from '../../../base/label/components/web/Label'; import { Tooltip } from '../../../base/tooltip'; import { open as openParticipantsPane } from '../../../participants-pane/actions'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { label: { backgroundColor: theme.palette.warning02, diff --git a/react/features/display-name/components/web/DisplayName.tsx b/react/features/display-name/components/web/DisplayName.tsx index 512c2c5507..32168b6835 100644 --- a/react/features/display-name/components/web/DisplayName.tsx +++ b/react/features/display-name/components/web/DisplayName.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -50,7 +49,7 @@ interface IProps { thumbnailType: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { displayName: { ...withPixelLineHeight(theme.typography.labelBold), diff --git a/react/features/display-name/components/web/DisplayNameBadge.tsx b/react/features/display-name/components/web/DisplayNameBadge.tsx index 0962c75d97..4d1d4b3676 100644 --- a/react/features/display-name/components/web/DisplayNameBadge.tsx +++ b/react/features/display-name/components/web/DisplayNameBadge.tsx @@ -1,8 +1,7 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { const { text01 } = theme.palette; return { diff --git a/react/features/display-name/components/web/StageParticipantNameLabel.tsx b/react/features/display-name/components/web/StageParticipantNameLabel.tsx index d1e1ae21db..fe829a0187 100644 --- a/react/features/display-name/components/web/StageParticipantNameLabel.tsx +++ b/react/features/display-name/components/web/StageParticipantNameLabel.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React from 'react'; import { useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; @@ -22,7 +21,7 @@ import { isLayoutTileView } from '../../../video-layout'; import DisplayNameBadge from './DisplayNameBadge'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { badgeContainer: { ...withPixelLineHeight(theme.typography.bodyShortRegularLarge), diff --git a/react/features/filmstrip/components/web/RaisedHandIndicator.tsx b/react/features/filmstrip/components/web/RaisedHandIndicator.tsx index 09a1f62472..10636c0b23 100644 --- a/react/features/filmstrip/components/web/RaisedHandIndicator.tsx +++ b/react/features/filmstrip/components/web/RaisedHandIndicator.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; @@ -31,7 +30,7 @@ interface IProps { tooltipPosition: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { raisedHandIndicator: { backgroundColor: theme.palette.warning02, diff --git a/react/features/gifs/components/web/GifsMenu.tsx b/react/features/gifs/components/web/GifsMenu.tsx index bace70a00a..58b62078e0 100644 --- a/react/features/gifs/components/web/GifsMenu.tsx +++ b/react/features/gifs/components/web/GifsMenu.tsx @@ -1,7 +1,6 @@ /* eslint-disable lines-around-comment */ import { GiphyFetch, TrendingOptions } from '@giphy/js-fetch-api'; import { Grid } from '@giphy/react-components'; -import { Theme } from '@mui/material'; import React, { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { batch, useDispatch, useSelector } from 'react-redux'; @@ -29,7 +28,7 @@ import { const OVERFLOW_DRAWER_PADDING = 16; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { gifsMenu: { width: '100%', diff --git a/react/features/invite/components/add-people-dialog/web/CopyMeetingLinkSection.tsx b/react/features/invite/components/add-people-dialog/web/CopyMeetingLinkSection.tsx index af6e5453af..122750f646 100644 --- a/react/features/invite/components/add-people-dialog/web/CopyMeetingLinkSection.tsx +++ b/react/features/invite/components/add-people-dialog/web/CopyMeetingLinkSection.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -15,7 +14,7 @@ interface IProps { url: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { label: { display: 'block', diff --git a/react/features/invite/components/add-people-dialog/web/DialInLimit.tsx b/react/features/invite/components/add-people-dialog/web/DialInLimit.tsx index 4975ba82e5..84154d82ef 100644 --- a/react/features/invite/components/add-people-dialog/web/DialInLimit.tsx +++ b/react/features/invite/components/add-people-dialog/web/DialInLimit.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -7,7 +6,7 @@ import { translate } from '../../../../base/i18n/functions'; import { withPixelLineHeight } from '../../../../base/styles/functions.web'; import { UPGRADE_OPTIONS_LINK, UPGRADE_OPTIONS_TEXT } from '../../../constants'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { limitContainer: { backgroundColor: theme.palette.warning01, diff --git a/react/features/invite/components/add-people-dialog/web/DialInSection.tsx b/react/features/invite/components/add-people-dialog/web/DialInSection.tsx index 426d4f3696..e0622e87d2 100644 --- a/react/features/invite/components/add-people-dialog/web/DialInSection.tsx +++ b/react/features/invite/components/add-people-dialog/web/DialInSection.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; @@ -21,7 +20,7 @@ interface IProps { phoneNumber: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { '& .info-label': { diff --git a/react/features/invite/components/add-people-dialog/web/InviteByEmailSection.tsx b/react/features/invite/components/add-people-dialog/web/InviteByEmailSection.tsx index a8f6494e0c..1e87770332 100644 --- a/react/features/invite/components/add-people-dialog/web/InviteByEmailSection.tsx +++ b/react/features/invite/components/add-people-dialog/web/InviteByEmailSection.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -35,7 +34,7 @@ interface IProps { inviteTextiOS: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { marginTop: theme.spacing(4) diff --git a/react/features/keyboard-shortcuts/components/web/KeyboardShortcutsDialog.tsx b/react/features/keyboard-shortcuts/components/web/KeyboardShortcutsDialog.tsx index 46d4151e54..d0a5b84110 100644 --- a/react/features/keyboard-shortcuts/components/web/KeyboardShortcutsDialog.tsx +++ b/react/features/keyboard-shortcuts/components/web/KeyboardShortcutsDialog.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -25,7 +24,7 @@ interface IProps { * * @returns {Object} */ -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { list: { listStyleType: 'none', diff --git a/react/features/large-video/components/ScreenSharePlaceholder.web.tsx b/react/features/large-video/components/ScreenSharePlaceholder.web.tsx index 9511ea48a6..5899694fc5 100644 --- a/react/features/large-video/components/ScreenSharePlaceholder.web.tsx +++ b/react/features/large-video/components/ScreenSharePlaceholder.web.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { WithTranslation } from 'react-i18next'; import { useStore } from 'react-redux'; @@ -9,7 +8,7 @@ import { translate } from '../../base/i18n/functions'; // @ts-ignore import { setSeeWhatIsBeingShared } from '../actions.web'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { overlayContainer: { width: '100%', diff --git a/react/features/notifications/components/web/NotificationsContainer.tsx b/react/features/notifications/components/web/NotificationsContainer.tsx index ab75d86bad..bf0fa98c06 100644 --- a/react/features/notifications/components/web/NotificationsContainer.tsx +++ b/react/features/notifications/components/web/NotificationsContainer.tsx @@ -1,6 +1,6 @@ import { FlagGroupContext } from '@atlaskit/flag/flag-group'; import { AtlasKitThemeProvider } from '@atlaskit/theme'; -import { Theme } from '@mui/material'; +import { Theme } from '@mui/material/styles'; import { withStyles } from '@mui/styles'; import clsx from 'clsx'; import React, { Component } from 'react'; diff --git a/react/features/participants-pane/components/breakout-rooms/components/web/CollapsibleRoom.tsx b/react/features/participants-pane/components/breakout-rooms/components/web/CollapsibleRoom.tsx index b79acc705f..cdce555be3 100644 --- a/react/features/participants-pane/components/breakout-rooms/components/web/CollapsibleRoom.tsx +++ b/react/features/participants-pane/components/breakout-rooms/components/web/CollapsibleRoom.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactElement, useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; @@ -80,7 +79,7 @@ interface IProps { toggleParticipantMenu: Function; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { boxShadow: 'none' diff --git a/react/features/participants-pane/components/breakout-rooms/components/web/JoinQuickActionButton.tsx b/react/features/participants-pane/components/breakout-rooms/components/web/JoinQuickActionButton.tsx index a0c4adb42f..d4dad40282 100644 --- a/react/features/participants-pane/components/breakout-rooms/components/web/JoinQuickActionButton.tsx +++ b/react/features/participants-pane/components/breakout-rooms/components/web/JoinQuickActionButton.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch } from 'react-redux'; @@ -20,7 +19,7 @@ interface IProps { }; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { button: { marginRight: theme.spacing(2) diff --git a/react/features/participants-pane/components/breakout-rooms/components/web/RoomParticipantContextMenu.tsx b/react/features/participants-pane/components/breakout-rooms/components/web/RoomParticipantContextMenu.tsx index 7f194357a5..ddd0db433e 100644 --- a/react/features/participants-pane/components/breakout-rooms/components/web/RoomParticipantContextMenu.tsx +++ b/react/features/participants-pane/components/breakout-rooms/components/web/RoomParticipantContextMenu.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; @@ -49,7 +48,7 @@ interface IProps { onSelect: (force?: any) => void; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { text: { color: theme.palette.text02, diff --git a/react/features/participants-pane/components/web/FooterContextMenu.tsx b/react/features/participants-pane/components/web/FooterContextMenu.tsx index 6123afbcb0..0881033395 100644 --- a/react/features/participants-pane/components/web/FooterContextMenu.tsx +++ b/react/features/participants-pane/components/web/FooterContextMenu.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -39,7 +38,7 @@ import { SETTINGS_TABS } from '../../../settings/constants'; // @ts-ignore import { MuteEveryonesVideoDialog } from '../../../video-menu/components'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { contextMenu: { bottom: 'auto', diff --git a/react/features/participants-pane/components/web/LobbyParticipantItem.tsx b/react/features/participants-pane/components/web/LobbyParticipantItem.tsx index 9bec78894f..bd106764c2 100644 --- a/react/features/participants-pane/components/web/LobbyParticipantItem.tsx +++ b/react/features/participants-pane/components/web/LobbyParticipantItem.tsx @@ -1,6 +1,5 @@ // eslint-disable-next-line lines-around-comment -import { Theme } from '@mui/material'; import React, { useCallback, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; @@ -39,7 +38,7 @@ interface IProps { participant: IParticipant; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { button: { marginRight: theme.spacing(2) diff --git a/react/features/participants-pane/components/web/LobbyParticipants.tsx b/react/features/participants-pane/components/web/LobbyParticipants.tsx index dc97095cbf..10c299b2d4 100644 --- a/react/features/participants-pane/components/web/LobbyParticipants.tsx +++ b/react/features/participants-pane/components/web/LobbyParticipants.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -22,7 +21,7 @@ import { useLobbyActions, useParticipantDrawer } from '../../hooks'; // @ts-ignore import LobbyParticipantItems from './LobbyParticipantItems'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { drawerActions: { listStyleType: 'none', diff --git a/react/features/participants-pane/components/web/MeetingParticipants.tsx b/react/features/participants-pane/components/web/MeetingParticipants.tsx index a85d213bc6..1bfe634dd8 100644 --- a/react/features/participants-pane/components/web/MeetingParticipants.tsx +++ b/react/features/participants-pane/components/web/MeetingParticipants.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -30,7 +29,7 @@ import MeetingParticipantContextMenu from './MeetingParticipantContextMenu'; // @ts-ignore import MeetingParticipantItems from './MeetingParticipantItems'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { heading: { color: theme.palette.text02, diff --git a/react/features/participants-pane/components/web/ParticipantItem.tsx b/react/features/participants-pane/components/web/ParticipantItem.tsx index 34d8676de5..4afa798707 100644 --- a/react/features/participants-pane/components/web/ParticipantItem.tsx +++ b/react/features/participants-pane/components/web/ParticipantItem.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactElement, useCallback } from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -97,7 +96,7 @@ interface IProps extends WithTranslation { youText?: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { nameContainer: { display: 'flex', diff --git a/react/features/participants-pane/components/web/ParticipantQuickAction.tsx b/react/features/participants-pane/components/web/ParticipantQuickAction.tsx index fc76ea7c65..200a4237f9 100644 --- a/react/features/participants-pane/components/web/ParticipantQuickAction.tsx +++ b/react/features/participants-pane/components/web/ParticipantQuickAction.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch } from 'react-redux'; @@ -46,7 +45,7 @@ interface IProps { participantName: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { button: { marginRight: theme.spacing(2) diff --git a/react/features/participants-pane/components/web/ParticipantsPane.tsx b/react/features/participants-pane/components/web/ParticipantsPane.tsx index 2f15444abc..54f2dadf2f 100644 --- a/react/features/participants-pane/components/web/ParticipantsPane.tsx +++ b/react/features/participants-pane/components/web/ParticipantsPane.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -32,7 +31,7 @@ import LobbyParticipants from './LobbyParticipants'; import MeetingParticipants from './MeetingParticipants'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { boxSizing: 'border-box' as const, diff --git a/react/features/participants-pane/components/web/RaisedHandIndicator.tsx b/react/features/participants-pane/components/web/RaisedHandIndicator.tsx index cec4838e8b..cf4566ebf3 100644 --- a/react/features/participants-pane/components/web/RaisedHandIndicator.tsx +++ b/react/features/participants-pane/components/web/RaisedHandIndicator.tsx @@ -1,11 +1,10 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; import Icon from '../../../base/icons/components/Icon'; import { IconRaiseHand } from '../../../base/icons/svg'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { indicator: { backgroundColor: theme.palette.warning02, diff --git a/react/features/polls/components/web/PollAnswer.tsx b/react/features/polls/components/web/PollAnswer.tsx index 07bf6c3a4d..2ae0575cce 100644 --- a/react/features/polls/components/web/PollAnswer.tsx +++ b/react/features/polls/components/web/PollAnswer.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -9,7 +8,7 @@ import { BUTTON_TYPES } from '../../../base/ui/constants.web'; import { isSubmitAnswerDisabled } from '../../functions'; import AbstractPollAnswer, { AbstractProps } from '../AbstractPollAnswer'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { buttonMargin: { marginRight: theme.spacing(2) diff --git a/react/features/polls/components/web/PollCreate.tsx b/react/features/polls/components/web/PollCreate.tsx index b274424bc0..95f2865d8d 100644 --- a/react/features/polls/components/web/PollCreate.tsx +++ b/react/features/polls/components/web/PollCreate.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -15,7 +14,7 @@ import AbstractPollCreate from '../AbstractPollCreate'; // @ts-ignore import type { AbstractProps } from '../AbstractPollCreate'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { buttonMargin: { marginRight: theme.spacing(2) diff --git a/react/features/prejoin/components/web/DropdownButton.tsx b/react/features/prejoin/components/web/DropdownButton.tsx index fed643b8de..0bc2fa3910 100644 --- a/react/features/prejoin/components/web/DropdownButton.tsx +++ b/react/features/prejoin/components/web/DropdownButton.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -33,7 +32,7 @@ interface IProps { } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { prejoinPreviewDropdownBtn: { alignItems: 'center', diff --git a/react/features/prejoin/components/web/dialogs/CallingDialog.tsx b/react/features/prejoin/components/web/dialogs/CallingDialog.tsx index 84a07264bc..526d7d919d 100644 --- a/react/features/prejoin/components/web/dialogs/CallingDialog.tsx +++ b/react/features/prejoin/components/web/dialogs/CallingDialog.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -36,7 +35,7 @@ interface IProps extends WithTranslation { status: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { callingDialog: { padding: theme.spacing(3), diff --git a/react/features/prejoin/components/web/dialogs/DialInDialog.tsx b/react/features/prejoin/components/web/dialogs/DialInDialog.tsx index ca076b9303..b161bd96b0 100644 --- a/react/features/prejoin/components/web/dialogs/DialInDialog.tsx +++ b/react/features/prejoin/components/web/dialogs/DialInDialog.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -47,7 +46,7 @@ interface IProps extends WithTranslation { passCode: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { dialInDialog: { textAlign: 'center', diff --git a/react/features/prejoin/components/web/dialogs/DialOutDialog.tsx b/react/features/prejoin/components/web/dialogs/DialOutDialog.tsx index 64b65392ec..53eea631d5 100644 --- a/react/features/prejoin/components/web/dialogs/DialOutDialog.tsx +++ b/react/features/prejoin/components/web/dialogs/DialOutDialog.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -32,7 +31,7 @@ interface IProps extends WithTranslation { onTextButtonClick: Function; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { dialOutDialog: { padding: theme.spacing(3) diff --git a/react/features/prejoin/components/web/preview/DeviceStatus.tsx b/react/features/prejoin/components/web/preview/DeviceStatus.tsx index 45ae1072c6..87b7e8af5c 100644 --- a/react/features/prejoin/components/web/preview/DeviceStatus.tsx +++ b/react/features/prejoin/components/web/preview/DeviceStatus.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -27,7 +26,7 @@ export interface IProps extends WithTranslation { deviceStatusType?: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { deviceStatus: { alignItems: 'center', diff --git a/react/features/salesforce/components/web/RecordItem.tsx b/react/features/salesforce/components/web/RecordItem.tsx index 5734a9233e..65d690a115 100644 --- a/react/features/salesforce/components/web/RecordItem.tsx +++ b/react/features/salesforce/components/web/RecordItem.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -31,7 +30,7 @@ interface IProps { type: string; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { recordItem: { display: 'flex', diff --git a/react/features/salesforce/components/web/SalesforceLinkDialog.tsx b/react/features/salesforce/components/web/SalesforceLinkDialog.tsx index 91ec2144d3..9998020270 100644 --- a/react/features/salesforce/components/web/SalesforceLinkDialog.tsx +++ b/react/features/salesforce/components/web/SalesforceLinkDialog.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ import Spinner from '@atlaskit/spinner'; -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch } from 'react-redux'; @@ -17,7 +16,7 @@ import { useSalesforceLinkDialog } from '../../useSalesforceLinkDialog'; import { RecordItem } from './RecordItem'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { container: { minHeight: '450px', diff --git a/react/features/speaker-stats/components/web/SpeakerStats.tsx b/react/features/speaker-stats/components/web/SpeakerStats.tsx index a40eb0c1d3..d865a40fbc 100644 --- a/react/features/speaker-stats/components/web/SpeakerStats.tsx +++ b/react/features/speaker-stats/components/web/SpeakerStats.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback, useEffect } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; @@ -18,7 +17,7 @@ import SpeakerStatsLabels from './SpeakerStatsLabels'; import SpeakerStatsList from './SpeakerStatsList'; import SpeakerStatsSearch from './SpeakerStatsSearch'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { speakerStats: { '& .row': { diff --git a/react/features/speaker-stats/components/web/SpeakerStatsLabels.tsx b/react/features/speaker-stats/components/web/SpeakerStatsLabels.tsx index d8ba13a2fa..b19c9db951 100644 --- a/react/features/speaker-stats/components/web/SpeakerStatsLabels.tsx +++ b/react/features/speaker-stats/components/web/SpeakerStatsLabels.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -9,7 +8,7 @@ import { withPixelLineHeight } from '../../../base/styles/functions.web'; import { Tooltip } from '../../../base/tooltip'; import { FACE_EXPRESSIONS_EMOJIS } from '../../../face-landmarks/constants'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { labels: { padding: '22px 0 7px 0', diff --git a/react/features/speaker-stats/components/web/SpeakerStatsList.tsx b/react/features/speaker-stats/components/web/SpeakerStatsList.tsx index 6ad5187884..5b89f5872d 100644 --- a/react/features/speaker-stats/components/web/SpeakerStatsList.tsx +++ b/react/features/speaker-stats/components/web/SpeakerStatsList.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -11,7 +10,7 @@ import abstractSpeakerStatsList from '../AbstractSpeakerStatsList'; // @ts-ignore import SpeakerStatsItem from './SpeakerStatsItem'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { list: { marginTop: theme.spacing(3), diff --git a/react/features/speaker-stats/components/web/SpeakerStatsSearch.tsx b/react/features/speaker-stats/components/web/SpeakerStatsSearch.tsx index 6670c4fba9..c2ea6fdcc8 100644 --- a/react/features/speaker-stats/components/web/SpeakerStatsSearch.tsx +++ b/react/features/speaker-stats/components/web/SpeakerStatsSearch.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; @@ -11,7 +10,7 @@ import { withPixelLineHeight } from '../../../base/styles/functions.web'; import { MOBILE_BREAKPOINT } from '../../constants'; import { isSpeakerStatsSearchDisabled } from '../../functions'; -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { speakerStatsSearchContainer: { position: 'relative' diff --git a/react/features/subtitles/components/LanguageListItem.web.tsx b/react/features/subtitles/components/LanguageListItem.web.tsx index 1c8897b8ea..185df380ee 100644 --- a/react/features/subtitles/components/LanguageListItem.web.tsx +++ b/react/features/subtitles/components/LanguageListItem.web.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -25,7 +24,7 @@ interface ILanguageListItemProps extends WithTranslation { selected?: boolean; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { itemContainer: { display: 'flex', diff --git a/react/features/subtitles/components/LanguageSelectorDialog.web.tsx b/react/features/subtitles/components/LanguageSelectorDialog.web.tsx index c8bd0e3cda..cb69992569 100644 --- a/react/features/subtitles/components/LanguageSelectorDialog.web.tsx +++ b/react/features/subtitles/components/LanguageSelectorDialog.web.tsx @@ -1,5 +1,4 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import i18next from 'i18next'; import React, { useCallback, useEffect, useState } from 'react'; import { WithTranslation } from 'react-i18next'; @@ -27,7 +26,7 @@ interface ILanguageSelectorDialogProps extends WithTranslation { _translationLanguagesHead: Array; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { paragraphWrapper: { fontSize: 14, diff --git a/react/features/toolbox/components/web/Drawer.tsx b/react/features/toolbox/components/web/Drawer.tsx index 2d7e8568c9..770069de08 100644 --- a/react/features/toolbox/components/web/Drawer.tsx +++ b/react/features/toolbox/components/web/Drawer.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { ReactElement, useCallback } from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -28,7 +27,7 @@ interface IProps { onClose: Function; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { drawer: { backgroundColor: theme.palette.ui01, diff --git a/react/features/video-menu/components/web/ParticipantContextMenu.tsx b/react/features/video-menu/components/web/ParticipantContextMenu.tsx index c6e8a8c214..e28cb4c5f0 100644 --- a/react/features/video-menu/components/web/ParticipantContextMenu.tsx +++ b/react/features/video-menu/components/web/ParticipantContextMenu.tsx @@ -1,6 +1,5 @@ /* eslint-disable lines-around-comment */ -import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; @@ -106,7 +105,7 @@ interface IProps { thumbnailMenu?: boolean; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { text: { color: theme.palette.text02, diff --git a/react/features/video-quality/components/Slider.web.tsx b/react/features/video-quality/components/Slider.web.tsx index 1eda90e4b4..afefbfd70e 100644 --- a/react/features/video-quality/components/Slider.web.tsx +++ b/react/features/video-quality/components/Slider.web.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React from 'react'; import { makeStyles } from 'tss-react/mui'; @@ -35,7 +34,7 @@ interface IProps { value: number; } -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { // keep the same height for all elements: // input, input track & fake track(div) const height = 6; diff --git a/react/features/virtual-background/components/UploadImageButton.tsx b/react/features/virtual-background/components/UploadImageButton.tsx index 0018ec2420..d0f2c7630a 100644 --- a/react/features/virtual-background/components/UploadImageButton.tsx +++ b/react/features/virtual-background/components/UploadImageButton.tsx @@ -1,4 +1,3 @@ -import { Theme } from '@mui/material'; import React, { useCallback, useRef } from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -39,8 +38,7 @@ interface IProps extends WithTranslation { storedImages: Array; } -// @ts-ignore -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { addBackground: { marginRight: theme.spacing(2) @@ -50,7 +48,7 @@ const useStyles = makeStyles()((theme: Theme) => { }, label: { fontSize: '14px', - fontWeight: '600', + fontWeight: 600, lineHeight: '20px', marginTop: theme.spacing(3), marginBottom: theme.spacing(2), diff --git a/react/features/virtual-background/components/VirtualBackgroundDialog.tsx b/react/features/virtual-background/components/VirtualBackgroundDialog.tsx index 9f98993824..85a6f2aab4 100644 --- a/react/features/virtual-background/components/VirtualBackgroundDialog.tsx +++ b/react/features/virtual-background/components/VirtualBackgroundDialog.tsx @@ -4,7 +4,6 @@ import Spinner from '@atlaskit/spinner'; import Bourne from '@hapi/bourne'; // @ts-ignore import { jitsiLocalStorage } from '@jitsi/js-utils/jitsi-local-storage'; -import { Theme } from '@mui/material'; import React, { useCallback, useEffect, useState } from 'react'; import { WithTranslation } from 'react-i18next'; import { makeStyles } from 'tss-react/mui'; @@ -112,7 +111,7 @@ function _mapStateToProps(state: IReduxState): Object { const VirtualBackgroundDialog = translate(connect(_mapStateToProps)(VirtualBackground)); -const useStyles = makeStyles()((theme: Theme) => { +const useStyles = makeStyles()(theme => { return { dialogContainer: { width: 'auto'