From 49710d9805547e9971f7c40a25bccf0f30508f46 Mon Sep 17 00:00:00 2001 From: Sidney Alcantara Date: Sat, 11 Sep 2021 19:57:45 +1000 Subject: [PATCH] upgrade to mui v5 rc & migrate dependencies --- package.json | 12 +- src/App.tsx | 8 +- src/assets/Favicon.tsx | 2 +- src/assets/Logo.tsx | 2 +- src/assets/icons/AddColumn.tsx | 2 +- src/assets/icons/AddRow.tsx | 2 +- src/assets/icons/Backburger.tsx | 2 +- src/assets/icons/CellResize.tsx | 2 +- src/assets/icons/CloudLogs.tsx | 2 +- src/assets/icons/ColumnPlusAfter.tsx | 2 +- src/assets/icons/ColumnPlusBefore.tsx | 2 +- src/assets/icons/ColumnRemove.tsx | 2 +- src/assets/icons/ConnectTable.tsx | 2 +- src/assets/icons/Copy.tsx | 2 +- src/assets/icons/CopyCells.tsx | 2 +- src/assets/icons/Derivative.tsx | 2 +- src/assets/icons/Export.tsx | 2 +- src/assets/icons/Extension.tsx | 2 +- src/assets/icons/Firebase.tsx | 2 +- src/assets/icons/Freeze.tsx | 2 +- src/assets/icons/Go.tsx | 4 +- src/assets/icons/Id.tsx | 2 +- src/assets/icons/Image.tsx | 2 +- src/assets/icons/Import.tsx | 2 +- src/assets/icons/Json.tsx | 2 +- src/assets/icons/MultiSelect.tsx | 2 +- src/assets/icons/Number.tsx | 2 +- src/assets/icons/Percentage.tsx | 2 +- src/assets/icons/RowHeight.tsx | 2 +- src/assets/icons/SingleSelect.tsx | 2 +- src/assets/icons/Slider.tsx | 2 +- src/assets/icons/Status.tsx | 2 +- src/assets/icons/SubTable.tsx | 2 +- src/assets/icons/Unfreeze.tsx | 2 +- src/assets/icons/Upload.tsx | 2 +- src/components/Auth/AuthLayout.tsx | 4 +- src/components/Auth/FirebaseUi.tsx | 8 +- src/components/ButtonWithStatus.tsx | 6 +- src/components/CodeEditor.tsx | 4 +- src/components/CodeEditorHelper/index.tsx | 4 +- src/components/Confirmation.tsx | 16 +- src/components/ConfirmationDialog/Dialog.tsx | 2 +- .../ConnectServiceSelect/PopupContents.tsx | 4 +- src/components/ConnectServiceSelect/index.tsx | 2 +- src/components/ConnectServiceSelect/styles.ts | 2 +- src/components/EmptyState.tsx | 6 +- src/components/ErrorBoundary.tsx | 6 +- src/components/FloatingSearch.tsx | 4 +- src/components/FormattedChip.tsx | 4 +- src/components/HelperText.tsx | 2 +- src/components/Home/AccessDenied.tsx | 4 +- src/components/Home/HomeWelcomePrompt.tsx | 2 +- src/components/Home/TableGrid/TableCard.tsx | 2 +- .../Home/TableGrid/TableCardSkeleton.tsx | 2 +- .../Home/TableGrid/TableGridSkeleton.tsx | 2 +- src/components/Home/TableGrid/index.tsx | 2 +- .../Home/TableList/TableListItem.tsx | 4 +- .../Home/TableList/TableListItemSkeleton.tsx | 2 +- .../Home/TableList/TableListSkeleton.tsx | 2 +- src/components/Home/TableList/index.tsx | 2 +- src/components/InlineOpenInNewIcon.tsx | 4 +- src/components/Loading.tsx | 2 +- .../Modal/ScrollableDialogContent.tsx | 53 ++++ src/components/Modal/SlideTransition.tsx | 4 +- src/components/Modal/index.tsx | 26 +- src/components/Navigation/Breadcrumbs.tsx | 4 +- src/components/Navigation/NavDrawer.tsx | 10 +- src/components/Navigation/NavItem.tsx | 2 +- src/components/Navigation/NavTableSection.tsx | 4 +- .../Navigation/Notifications/index.tsx | 10 +- src/components/Navigation/UserMenu.tsx | 7 +- src/components/Navigation/index.tsx | 4 +- src/components/RenderedHtml.tsx | 2 +- src/components/RichTextEditor.tsx | 4 +- src/components/RichTooltip.tsx | 4 +- src/components/SectionHeading.tsx | 4 +- src/components/SectionHeadingSkeleton.tsx | 2 +- src/components/Settings/MigrateToV2.tsx | 6 +- .../Settings/ProjectSettings/About.tsx | 4 +- .../ProjectSettings/Authentication.tsx | 4 +- .../Settings/ProjectSettings/CloudRun.tsx | 4 +- .../ProjectSettings/Customization.tsx | 2 +- src/components/Settings/SettingsSection.tsx | 2 +- src/components/Settings/SettingsSkeleton.tsx | 2 +- src/components/Settings/ThemeColorPicker.tsx | 6 +- .../Settings/UserManagement/InviteUser.tsx | 5 +- .../Settings/UserManagement/UserItem.tsx | 6 +- .../Settings/UserManagement/UserSkeleton.tsx | 2 +- .../Settings/UserSettings/Account.tsx | 2 +- .../Settings/UserSettings/Personalization.tsx | 2 +- .../Settings/UserSettings/Theme.tsx | 2 +- .../SideDrawer/Form/FieldSkeleton.tsx | 6 +- .../SideDrawer/Form/FieldWrapper.tsx | 10 +- src/components/SideDrawer/Form/Label.tsx | 6 +- src/components/SideDrawer/Form/index.tsx | 2 +- src/components/SideDrawer/Form/utils.ts | 2 +- src/components/SideDrawer/index.tsx | 8 +- src/components/SideDrawer/useStyles.ts | 2 +- src/components/SnackbarProgress.tsx | 2 +- src/components/Table/BulkActions/index.tsx | 10 +- src/components/Table/CellValidation.tsx | 6 +- src/components/Table/ColumnHeader.tsx | 10 +- .../FieldSettings/DefaultValueInput.tsx | 8 +- .../Table/ColumnMenu/FieldSettings/index.tsx | 6 +- .../Table/ColumnMenu/FieldsDropdown.tsx | 4 +- .../Table/ColumnMenu/MenuContents.tsx | 4 +- .../Table/ColumnMenu/NameChange.tsx | 2 +- src/components/Table/ColumnMenu/NewColumn.tsx | 4 +- .../Table/ColumnMenu/Subheading.tsx | 2 +- src/components/Table/ColumnMenu/index.tsx | 25 +- src/components/Table/EmptyTable.tsx | 2 +- src/components/Table/Filters/index.tsx | 10 +- src/components/Table/FinalColumnHeader.tsx | 4 +- src/components/Table/HiddenFields.tsx | 6 +- src/components/Table/Settings/Menu.tsx | 8 +- src/components/Table/Settings/Webhooks.tsx | 26 +- .../Table/Skeleton/HeaderRowSkeleton.tsx | 2 +- .../Table/Skeleton/TableHeaderSkeleton.tsx | 4 +- .../Table/TableHeader/Export/Download.tsx | 4 +- .../Table/TableHeader/Export/Export.tsx | 4 +- .../Table/TableHeader/Export/index.tsx | 25 +- .../TableHeader/Extensions/ExtensionList.tsx | 10 +- .../Extensions/ExtensionMigration.tsx | 10 +- .../TableHeader/Extensions/ExtensionModal.tsx | 12 +- .../Table/TableHeader/Extensions/index.tsx | 2 +- .../Table/TableHeader/ImportCsv.tsx | 14 +- .../Table/TableHeader/LoadedRowsStatus.tsx | 2 +- .../Table/TableHeader/ReExecute.tsx | 4 +- .../Table/TableHeader/RowHeight.tsx | 2 +- .../Table/TableHeader/TableHeaderButton.tsx | 2 +- .../Table/TableHeader/TableLogs.tsx | 16 +- .../Table/TableHeader/TableSettings.tsx | 2 +- src/components/Table/TableHeader/index.tsx | 2 +- src/components/Table/editors/CodeEditor.tsx | 4 +- src/components/Table/editors/NullEditor.tsx | 2 +- src/components/Table/editors/TextEditor.tsx | 4 +- src/components/Table/editors/styles.ts | 2 +- .../Table/formatters/FinalColumn.tsx | 6 +- src/components/Table/styles.ts | 6 +- src/components/TableSettings/form.tsx | 6 +- src/components/TableSettings/index.tsx | 6 +- src/components/Thumbnail.tsx | 6 +- src/components/Wizards/Cell.tsx | 2 +- src/components/Wizards/Column.tsx | 6 +- src/components/Wizards/FadeList.tsx | 2 +- .../Wizards/ImportCsvWizard/Step1Columns.tsx | 8 +- .../ImportCsvWizard/Step2NewColumns.tsx | 6 +- .../Wizards/ImportCsvWizard/Step3Preview.tsx | 4 +- .../Wizards/ImportCsvWizard/index.tsx | 6 +- .../Wizards/ImportWizard/Step1Columns.tsx | 6 +- .../Wizards/ImportWizard/Step2Rename.tsx | 8 +- .../Wizards/ImportWizard/Step3Types.tsx | 6 +- .../Wizards/ImportWizard/Step4Preview.tsx | 4 +- src/components/Wizards/ImportWizard/index.tsx | 2 +- src/components/Wizards/WizardDialog.tsx | 12 +- src/components/fields/Action/ActionFab.tsx | 8 +- .../fields/Action/FormDialog/Dialog.tsx | 2 +- src/components/fields/Action/Settings.tsx | 4 +- .../fields/Action/SideDrawerField.tsx | 4 +- src/components/fields/Action/TableCell.tsx | 4 +- src/components/fields/Action/index.tsx | 2 +- src/components/fields/Aggregate/Settings.tsx | 4 +- src/components/fields/Aggregate/index.tsx | 2 +- .../fields/Checkbox/SideDrawerField.tsx | 4 +- src/components/fields/Checkbox/TableCell.tsx | 4 +- src/components/fields/Checkbox/index.tsx | 2 +- src/components/fields/Code/BasicCell.tsx | 2 +- .../fields/Code/SideDrawerField.tsx | 2 +- src/components/fields/Code/index.tsx | 2 +- src/components/fields/Color/InlineCell.tsx | 4 +- .../fields/Color/SideDrawerField.tsx | 4 +- src/components/fields/Color/index.tsx | 2 +- .../ConnectServiceSelect/PopupContents.tsx | 4 +- .../ConnectServiceSelect/index.tsx | 2 +- .../ConnectServiceSelect/styles.ts | 2 +- .../fields/ConnectService/InlineCell.tsx | 6 +- .../fields/ConnectService/Settings.tsx | 2 +- .../fields/ConnectService/SideDrawerField.tsx | 2 +- .../fields/ConnectService/index.tsx | 2 +- .../ConnectTable/ConnectTableSelect.tsx | 2 +- .../fields/ConnectTable/InlineCell.tsx | 6 +- .../fields/ConnectTable/Settings.tsx | 4 +- .../fields/ConnectTable/SideDrawerField.tsx | 2 +- src/components/fields/Date/Settings.tsx | 2 +- .../fields/Date/SideDrawerField.tsx | 6 +- src/components/fields/Date/TableCell.tsx | 6 +- src/components/fields/Date/index.tsx | 2 +- .../fields/DateTime/SideDrawerField.tsx | 2 +- src/components/fields/DateTime/TableCell.tsx | 2 +- src/components/fields/DateTime/index.tsx | 2 +- src/components/fields/Derivative/Settings.tsx | 4 +- src/components/fields/Duration/index.tsx | 2 +- .../fields/Email/SideDrawerField.tsx | 2 +- src/components/fields/Email/index.tsx | 2 +- .../fields/File/SideDrawerField.tsx | 4 +- src/components/fields/File/TableCell.tsx | 4 +- src/components/fields/File/index.tsx | 2 +- src/components/fields/Id/SideDrawerField.tsx | 2 +- src/components/fields/Id/TableCell.tsx | 2 +- .../fields/Image/SideDrawerField.tsx | 10 +- src/components/fields/Image/TableCell.tsx | 10 +- src/components/fields/Json/BasicCell.tsx | 2 +- src/components/fields/Json/Settings.tsx | 2 +- .../fields/Json/SideDrawerField.tsx | 4 +- src/components/fields/LongText/BasicCell.tsx | 2 +- .../fields/LongText/SideDrawerField.tsx | 2 +- src/components/fields/LongText/index.tsx | 2 +- .../MultiSelect/ConvertStringToArray.tsx | 2 +- .../fields/MultiSelect/InlineCell.tsx | 6 +- .../fields/MultiSelect/PopoverCell.tsx | 2 +- .../fields/MultiSelect/SideDrawerField.tsx | 4 +- .../fields/Number/SideDrawerField.tsx | 2 +- .../fields/Percentage/BasicCell.tsx | 2 +- .../fields/Percentage/SideDrawerField.tsx | 6 +- .../fields/Phone/SideDrawerField.tsx | 2 +- src/components/fields/Phone/index.tsx | 2 +- src/components/fields/Rating/Settings.tsx | 2 +- .../fields/Rating/SideDrawerField.tsx | 8 +- src/components/fields/Rating/TableCell.tsx | 4 +- src/components/fields/Rating/index.tsx | 2 +- src/components/fields/Rating/styles.ts | 2 +- src/components/fields/RichText/TableCell.tsx | 4 +- src/components/fields/RichText/index.tsx | 2 +- src/components/fields/ShortText/Settings.tsx | 2 +- .../fields/ShortText/SideDrawerField.tsx | 2 +- src/components/fields/ShortText/index.tsx | 2 +- .../fields/SingleSelect/InlineCell.tsx | 6 +- .../fields/SingleSelect/PopoverCell.tsx | 2 +- .../fields/SingleSelect/Settings.tsx | 8 +- .../fields/SingleSelect/SideDrawerField.tsx | 4 +- src/components/fields/Slider/Settings.tsx | 2 +- .../fields/Slider/SideDrawerField.tsx | 2 +- src/components/fields/Slider/TableCell.tsx | 4 +- src/components/fields/Status/Settings.tsx | 18 +- .../fields/Status/SideDrawerField.tsx | 4 +- src/components/fields/Status/styles.ts | 2 +- src/components/fields/SubTable/Settings.tsx | 2 +- .../fields/SubTable/SideDrawerField.tsx | 4 +- src/components/fields/SubTable/TableCell.tsx | 6 +- src/components/fields/Url/BasicCell.tsx | 2 +- src/components/fields/Url/SideDrawerField.tsx | 4 +- src/components/fields/Url/index.tsx | 2 +- .../fields/User/SideDrawerField.tsx | 4 +- src/components/fields/User/TableCell.tsx | 3 +- src/components/fields/User/index.tsx | 2 +- .../fields/_withTableCell/withPopoverCell.tsx | 4 +- src/components/fields/types.ts | 2 +- src/contexts/AppContext.tsx | 2 +- src/contexts/SnackbarContext.tsx | 12 +- src/hooks/useTable/useTableData.tsx | 2 +- src/pages/Auth/ImpersonatorAuth.tsx | 2 +- src/pages/Auth/JwtAuth.tsx | 2 +- src/pages/Auth/SetupGuide.tsx | 4 +- src/pages/Auth/SignOut.tsx | 4 +- src/pages/Home.tsx | 14 +- src/pages/Settings/ProjectSettings.tsx | 2 +- src/pages/Settings/UserManagement.tsx | 2 +- src/pages/Settings/UserSettings.tsx | 2 +- src/pages/Table.tsx | 2 +- src/pages/Test.tsx | 4 +- src/theme/CheckboxIcon.tsx | 2 +- src/theme/CheckboxIndeterminateIcon.tsx | 2 +- src/theme/RadioIcon.tsx | 2 +- src/theme/colors.ts | 6 +- src/theme/components.tsx | 48 ++- src/theme/index.tsx | 2 +- src/theme/typography.ts | 6 +- types/@material-ui/styles.ts | 4 +- types/@mui/styles.ts | 5 + yarn.lock | 277 +++++++++++------- 270 files changed, 831 insertions(+), 679 deletions(-) create mode 100644 src/components/Modal/ScrollableDialogContent.tsx create mode 100644 types/@mui/styles.ts diff --git a/package.json b/package.json index 0cb0cc35..a58a61ff 100644 --- a/package.json +++ b/package.json @@ -8,18 +8,19 @@ }, "private": true, "dependencies": { - "@antlerengineering/form-builder": "^3.0.0-2", - "@antlerengineering/multiselect": "^1.0.0-0", "@craco/craco": "^6.2.0", "@date-io/date-fns": "1.x", "@emotion/react": "^11.4.0", "@emotion/styled": "^11.3.0", "@material-ui/core": "^5.0.0-beta.4", - "@material-ui/icons": "^5.0.0-beta.4", - "@material-ui/lab": "^5.0.0-alpha.43", - "@material-ui/styles": "^5.0.0-beta.4", "@mdi/js": "^5.9.55", "@monaco-editor/react": "^4.1.0", + "@mui/icons-material": "^5.0.0-rc.1", + "@mui/lab": "^5.0.0-alpha.46", + "@mui/material": "^5.0.0-rc.1", + "@mui/styles": "^5.0.0-rc.1", + "@rowy/form-builder": "^0.1.1", + "@rowy/multiselect": "^0.1.4", "@tinymce/tinymce-react": "^3.4.0", "algoliasearch": "^4.8.6", "ansi-to-react": "^6.1.5", @@ -48,6 +49,7 @@ "react-dnd-html5-backend": "^11.1.3", "react-dom": "^17.0.2", "react-dropzone": "^10.1.8", + "react-element-scroll-hook": "^1.1.0", "react-firebaseui": "^5.0.2", "react-helmet": "^6.1.0", "react-hook-form": "^6", diff --git a/src/App.tsx b/src/App.tsx index ac519f01..a7d65ce3 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,10 +1,10 @@ import { lazy, Suspense } from "react"; import { Route, Switch, Link, Redirect } from "react-router-dom"; -import LocalizationProvider from "@material-ui/lab/LocalizationProvider"; -import AdapterDateFns from "@material-ui/lab/AdapterDateFns"; +import LocalizationProvider from "@mui/lab/LocalizationProvider"; +import AdapterDateFns from "@mui/lab/AdapterDateFns"; -import { StyledEngineProvider } from "@material-ui/core/styles"; -import { Button } from "@material-ui/core"; +import { StyledEngineProvider } from "@mui/material/styles"; +import { Button } from "@mui/material"; import "./space-grotesk.css"; import CustomBrowserRouter from "utils/CustomBrowserRouter"; diff --git a/src/assets/Favicon.tsx b/src/assets/Favicon.tsx index 8e608324..bd680c50 100644 --- a/src/assets/Favicon.tsx +++ b/src/assets/Favicon.tsx @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export default function Favicon() { const theme = useTheme(); diff --git a/src/assets/Logo.tsx b/src/assets/Logo.tsx index 97495247..88aea6c3 100644 --- a/src/assets/Logo.tsx +++ b/src/assets/Logo.tsx @@ -1,5 +1,5 @@ import { SVGProps } from "react"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export default function Logo(props: SVGProps) { const theme = useTheme(); diff --git a/src/assets/icons/AddColumn.tsx b/src/assets/icons/AddColumn.tsx index 92148511..3f107132 100644 --- a/src/assets/icons/AddColumn.tsx +++ b/src/assets/icons/AddColumn.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiTableColumnPlusAfter } from "@mdi/js"; export default function AddColumn(props: SvgIconProps) { diff --git a/src/assets/icons/AddRow.tsx b/src/assets/icons/AddRow.tsx index 35c65e89..6d59f3f1 100644 --- a/src/assets/icons/AddRow.tsx +++ b/src/assets/icons/AddRow.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function AddRow(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Backburger.tsx b/src/assets/icons/Backburger.tsx index 7d71de1d..2f3da913 100644 --- a/src/assets/icons/Backburger.tsx +++ b/src/assets/icons/Backburger.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiBackburger } from "@mdi/js"; export default function Backburger(props: SvgIconProps) { diff --git a/src/assets/icons/CellResize.tsx b/src/assets/icons/CellResize.tsx index f061c186..e5fab8c2 100644 --- a/src/assets/icons/CellResize.tsx +++ b/src/assets/icons/CellResize.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiArrowSplitVertical } from "@mdi/js"; export default function CellResize(props: SvgIconProps) { diff --git a/src/assets/icons/CloudLogs.tsx b/src/assets/icons/CloudLogs.tsx index 75a843ef..6a406a14 100644 --- a/src/assets/icons/CloudLogs.tsx +++ b/src/assets/icons/CloudLogs.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiFileTree } from "@mdi/js"; export default function CloudLogs(props: SvgIconProps) { diff --git a/src/assets/icons/ColumnPlusAfter.tsx b/src/assets/icons/ColumnPlusAfter.tsx index 6a4a22b5..566a74c9 100644 --- a/src/assets/icons/ColumnPlusAfter.tsx +++ b/src/assets/icons/ColumnPlusAfter.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiTableColumnPlusAfter } from "@mdi/js"; export default function ColumnPlusAfter(props: SvgIconProps) { diff --git a/src/assets/icons/ColumnPlusBefore.tsx b/src/assets/icons/ColumnPlusBefore.tsx index eeea588f..8f0d0eb9 100644 --- a/src/assets/icons/ColumnPlusBefore.tsx +++ b/src/assets/icons/ColumnPlusBefore.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiTableColumnPlusBefore } from "@mdi/js"; export default function ColumnPlusBefore(props: SvgIconProps) { diff --git a/src/assets/icons/ColumnRemove.tsx b/src/assets/icons/ColumnRemove.tsx index 8e854e46..b956169c 100644 --- a/src/assets/icons/ColumnRemove.tsx +++ b/src/assets/icons/ColumnRemove.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiTableColumnRemove } from "@mdi/js"; export default function ColumnRemove(props: SvgIconProps) { diff --git a/src/assets/icons/ConnectTable.tsx b/src/assets/icons/ConnectTable.tsx index 14889b6c..9660eaf5 100644 --- a/src/assets/icons/ConnectTable.tsx +++ b/src/assets/icons/ConnectTable.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function ConnectTable(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Copy.tsx b/src/assets/icons/Copy.tsx index 6c3e5125..09a516ca 100644 --- a/src/assets/icons/Copy.tsx +++ b/src/assets/icons/Copy.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function Copy(props: SvgIconProps) { return ( diff --git a/src/assets/icons/CopyCells.tsx b/src/assets/icons/CopyCells.tsx index 65d4b13a..236b8161 100644 --- a/src/assets/icons/CopyCells.tsx +++ b/src/assets/icons/CopyCells.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function CopyCells(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Derivative.tsx b/src/assets/icons/Derivative.tsx index f771a40d..554549a0 100644 --- a/src/assets/icons/Derivative.tsx +++ b/src/assets/icons/Derivative.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiFunctionVariant } from "@mdi/js"; export default function Derivative(props: SvgIconProps) { diff --git a/src/assets/icons/Export.tsx b/src/assets/icons/Export.tsx index 925e3df1..bca2a0f1 100644 --- a/src/assets/icons/Export.tsx +++ b/src/assets/icons/Export.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function Export(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Extension.tsx b/src/assets/icons/Extension.tsx index 6468fe71..23818c0a 100644 --- a/src/assets/icons/Extension.tsx +++ b/src/assets/icons/Extension.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiPuzzleOutline } from "@mdi/js"; export default function Extension(props: SvgIconProps) { diff --git a/src/assets/icons/Firebase.tsx b/src/assets/icons/Firebase.tsx index b77c9e6c..23076a3b 100644 --- a/src/assets/icons/Firebase.tsx +++ b/src/assets/icons/Firebase.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiFirebase } from '@mdi/js'; export default function AddColumn(props: SvgIconProps) { diff --git a/src/assets/icons/Freeze.tsx b/src/assets/icons/Freeze.tsx index baf03e3a..303419a9 100644 --- a/src/assets/icons/Freeze.tsx +++ b/src/assets/icons/Freeze.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function FileDownload(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Go.tsx b/src/assets/icons/Go.tsx index 705609e7..4449ed51 100644 --- a/src/assets/icons/Go.tsx +++ b/src/assets/icons/Go.tsx @@ -1,5 +1,5 @@ -import ChevronRightIcon from "@material-ui/icons/ChevronRight"; -import { SvgIconProps } from "@material-ui/core/SvgIcon"; +import ChevronRightIcon from "@mui/icons-material/ChevronRight"; +import { SvgIconProps } from "@mui/material/SvgIcon"; /** Right chevron icon with optical alignment */ export default function Go(props: SvgIconProps) { diff --git a/src/assets/icons/Id.tsx b/src/assets/icons/Id.tsx index 2a7be4ef..1d737789 100644 --- a/src/assets/icons/Id.tsx +++ b/src/assets/icons/Id.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiIdentifier } from "@mdi/js"; export default function Id(props: SvgIconProps) { diff --git a/src/assets/icons/Image.tsx b/src/assets/icons/Image.tsx index 694078b1..fc77f3b3 100644 --- a/src/assets/icons/Image.tsx +++ b/src/assets/icons/Image.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiImageOutline } from "@mdi/js"; export default function Image(props: SvgIconProps) { diff --git a/src/assets/icons/Import.tsx b/src/assets/icons/Import.tsx index ef9c9139..bdce2c46 100644 --- a/src/assets/icons/Import.tsx +++ b/src/assets/icons/Import.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function Export(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Json.tsx b/src/assets/icons/Json.tsx index a3bde93e..8766ec4a 100644 --- a/src/assets/icons/Json.tsx +++ b/src/assets/icons/Json.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiCodeJson } from "@mdi/js"; export default function Json(props: SvgIconProps) { diff --git a/src/assets/icons/MultiSelect.tsx b/src/assets/icons/MultiSelect.tsx index 1564e3d9..d85446aa 100644 --- a/src/assets/icons/MultiSelect.tsx +++ b/src/assets/icons/MultiSelect.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiFormatListBulletedSquare } from "@mdi/js"; export default function MultiSelect(props: SvgIconProps) { diff --git a/src/assets/icons/Number.tsx b/src/assets/icons/Number.tsx index cd4e0d67..2047158d 100644 --- a/src/assets/icons/Number.tsx +++ b/src/assets/icons/Number.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiNumeric } from "@mdi/js"; export default function Number(props: SvgIconProps) { diff --git a/src/assets/icons/Percentage.tsx b/src/assets/icons/Percentage.tsx index 413cb002..8e46822e 100644 --- a/src/assets/icons/Percentage.tsx +++ b/src/assets/icons/Percentage.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiPercent } from "@mdi/js"; export default function Percentage(props: SvgIconProps) { diff --git a/src/assets/icons/RowHeight.tsx b/src/assets/icons/RowHeight.tsx index 188bc078..e7bc5fd5 100644 --- a/src/assets/icons/RowHeight.tsx +++ b/src/assets/icons/RowHeight.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiTableRowHeight } from "@mdi/js"; export default function RowHeight(props: SvgIconProps) { diff --git a/src/assets/icons/SingleSelect.tsx b/src/assets/icons/SingleSelect.tsx index 0af1d051..4651e21c 100644 --- a/src/assets/icons/SingleSelect.tsx +++ b/src/assets/icons/SingleSelect.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function SingleSelect(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Slider.tsx b/src/assets/icons/Slider.tsx index 87bf8510..f3847720 100644 --- a/src/assets/icons/Slider.tsx +++ b/src/assets/icons/Slider.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function Slider(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Status.tsx b/src/assets/icons/Status.tsx index 1e74485b..e9d87693 100644 --- a/src/assets/icons/Status.tsx +++ b/src/assets/icons/Status.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiPulse } from "@mdi/js"; export default function Status(props: SvgIconProps) { diff --git a/src/assets/icons/SubTable.tsx b/src/assets/icons/SubTable.tsx index 14b6c3e7..d7fd74a2 100644 --- a/src/assets/icons/SubTable.tsx +++ b/src/assets/icons/SubTable.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function SubTable(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Unfreeze.tsx b/src/assets/icons/Unfreeze.tsx index f72a6c4d..d7035e14 100644 --- a/src/assets/icons/Unfreeze.tsx +++ b/src/assets/icons/Unfreeze.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; export default function FileDownload(props: SvgIconProps) { return ( diff --git a/src/assets/icons/Upload.tsx b/src/assets/icons/Upload.tsx index c70a33cc..aa62d8a1 100644 --- a/src/assets/icons/Upload.tsx +++ b/src/assets/icons/Upload.tsx @@ -1,4 +1,4 @@ -import SvgIcon, { SvgIconProps } from "@material-ui/core/SvgIcon"; +import SvgIcon, { SvgIconProps } from "@mui/material/SvgIcon"; import { mdiUploadOutline } from "@mdi/js"; export default function Upload(props: SvgIconProps) { diff --git a/src/components/Auth/AuthLayout.tsx b/src/components/Auth/AuthLayout.tsx index 981502cb..9d2ea677 100644 --- a/src/components/Auth/AuthLayout.tsx +++ b/src/components/Auth/AuthLayout.tsx @@ -1,8 +1,8 @@ import Helmet from "react-helmet"; import { use100vh } from "react-div-100vh"; -import { useTheme, Paper, Typography, LinearProgress } from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; +import { useTheme, Paper, Typography, LinearProgress } from "@mui/material"; +import { alpha } from "@mui/material/styles"; import bgPattern from "assets/bg-pattern.svg"; import bgPatternDark from "assets/bg-pattern-dark.svg"; diff --git a/src/components/Auth/FirebaseUi.tsx b/src/components/Auth/FirebaseUi.tsx index 2782fd7b..d66ac82d 100644 --- a/src/components/Auth/FirebaseUi.tsx +++ b/src/components/Auth/FirebaseUi.tsx @@ -4,10 +4,10 @@ import clsx from "clsx"; import StyledFirebaseAuth from "react-firebaseui/StyledFirebaseAuth"; import { Props as FirebaseUiProps } from "react-firebaseui"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Typography } from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; -import Skeleton from "@material-ui/core/Skeleton"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Typography } from "@mui/material"; +import { alpha } from "@mui/material/styles"; +import Skeleton from "@mui/material/Skeleton"; import { auth, db } from "@src/firebase"; import { defaultUiConfig, getSignInOptions } from "@src/firebase/firebaseui"; diff --git a/src/components/ButtonWithStatus.tsx b/src/components/ButtonWithStatus.tsx index 87a141bd..581e62e4 100644 --- a/src/components/ButtonWithStatus.tsx +++ b/src/components/ButtonWithStatus.tsx @@ -1,9 +1,9 @@ import React from "react"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Button, ButtonProps } from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Button, ButtonProps } from "@mui/material"; +import { alpha } from "@mui/material/styles"; export const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/CodeEditor.tsx b/src/components/CodeEditor.tsx index 34e1b486..0c02862b 100644 --- a/src/components/CodeEditor.tsx +++ b/src/components/CodeEditor.tsx @@ -2,8 +2,8 @@ import React, { useRef, useMemo, useState } from "react"; import clsx from "clsx"; import Editor, { useMonaco } from "@monaco-editor/react"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { useTheme } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { useTheme } from "@mui/material"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/CodeEditorHelper/index.tsx b/src/components/CodeEditorHelper/index.tsx index 862635cf..660f5e3e 100644 --- a/src/components/CodeEditorHelper/index.tsx +++ b/src/components/CodeEditorHelper/index.tsx @@ -5,8 +5,8 @@ import { Tooltip, Chip, Button, -} from "@material-ui/core"; -import OpenIcon from "@material-ui/icons/OpenInNew"; +} from "@mui/material"; +import OpenIcon from "@mui/icons-material/OpenInNew"; export interface ICodeEditorHelperProps { docLink: string; additionalVariables?: { diff --git a/src/components/Confirmation.tsx b/src/components/Confirmation.tsx index 08e7134a..a227a67f 100644 --- a/src/components/Confirmation.tsx +++ b/src/components/Confirmation.tsx @@ -1,13 +1,13 @@ import React, { useState } from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import Button from "@material-ui/core/Button"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogContent from "@material-ui/core/DialogContent"; -import DialogContentText from "@material-ui/core/DialogContentText"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import TextField from "@material-ui/core/TextField"; +import { makeStyles, createStyles } from "@mui/styles"; +import Button from "@mui/material/Button"; +import Dialog from "@mui/material/Dialog"; +import DialogActions from "@mui/material/DialogActions"; +import DialogContent from "@mui/material/DialogContent"; +import DialogContentText from "@mui/material/DialogContentText"; +import DialogTitle from "@mui/material/DialogTitle"; +import TextField from "@mui/material/TextField"; const useStyles = makeStyles(() => createStyles({ diff --git a/src/components/ConfirmationDialog/Dialog.tsx b/src/components/ConfirmationDialog/Dialog.tsx index f710e2b1..915ce8d4 100644 --- a/src/components/ConfirmationDialog/Dialog.tsx +++ b/src/components/ConfirmationDialog/Dialog.tsx @@ -8,7 +8,7 @@ import { DialogTitle, TextField, Button, -} from "@material-ui/core"; +} from "@mui/material"; import { SlideTransitionMui } from "components/Modal/SlideTransition"; diff --git a/src/components/ConnectServiceSelect/PopupContents.tsx b/src/components/ConnectServiceSelect/PopupContents.tsx index 632e3f40..cfd77e59 100644 --- a/src/components/ConnectServiceSelect/PopupContents.tsx +++ b/src/components/ConnectServiceSelect/PopupContents.tsx @@ -16,8 +16,8 @@ import { TextField, Typography, Radio, -} from "@material-ui/core"; -import SearchIcon from "@material-ui/icons/Search"; +} from "@mui/material"; +import SearchIcon from "@mui/icons-material/Search"; import { IConnectServiceSelectProps } from "."; import useStyles from "./styles"; diff --git a/src/components/ConnectServiceSelect/index.tsx b/src/components/ConnectServiceSelect/index.tsx index f4485e03..4bcb56bf 100644 --- a/src/components/ConnectServiceSelect/index.tsx +++ b/src/components/ConnectServiceSelect/index.tsx @@ -1,7 +1,7 @@ import { lazy, Suspense } from "react"; import clsx from "clsx"; -import { TextField, TextFieldProps } from "@material-ui/core"; +import { TextField, TextFieldProps } from "@mui/material"; import useStyles from "./styles"; import Loading from "components/Loading"; import ErrorBoundary from "components/ErrorBoundary"; diff --git a/src/components/ConnectServiceSelect/styles.ts b/src/components/ConnectServiceSelect/styles.ts index 251f1431..72b9b4cd 100644 --- a/src/components/ConnectServiceSelect/styles.ts +++ b/src/components/ConnectServiceSelect/styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; export const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/EmptyState.tsx b/src/components/EmptyState.tsx index b1c7d0bf..6ac2a78d 100644 --- a/src/components/EmptyState.tsx +++ b/src/components/EmptyState.tsx @@ -6,9 +6,9 @@ import { Stack, Typography, SvgIconTypeMap, -} from "@material-ui/core"; -import { OverridableComponent } from "@material-ui/core/OverridableComponent"; -import ErrorIcon from "@material-ui/icons/ErrorOutline"; +} from "@mui/material"; +import { OverridableComponent } from "@mui/material/OverridableComponent"; +import ErrorIcon from "@mui/icons-material/ErrorOutline"; export interface IEmptyStateProps extends Partial { /** Primary message displayed under the icon */ diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx index 56dcced2..aa9f78ae 100644 --- a/src/components/ErrorBoundary.tsx +++ b/src/components/ErrorBoundary.tsx @@ -1,9 +1,9 @@ import React from "react"; import EmptyState, { IEmptyStateProps } from "./EmptyState"; -import { Button } from "@material-ui/core"; -import ReloadIcon from "@material-ui/icons/Refresh"; -import OpenInNewIcon from "@material-ui/icons/OpenInNew"; +import { Button } from "@mui/material"; +import ReloadIcon from "@mui/icons-material/Refresh"; +import OpenInNewIcon from "@mui/icons-material/OpenInNew"; import meta from "../../package.json"; class ErrorBoundary extends React.Component< IEmptyStateProps & { render?: (errorMessage: string) => React.ReactNode } diff --git a/src/components/FloatingSearch.tsx b/src/components/FloatingSearch.tsx index 6f3e4c99..6783f6dc 100644 --- a/src/components/FloatingSearch.tsx +++ b/src/components/FloatingSearch.tsx @@ -4,8 +4,8 @@ import { TextField, FilledTextFieldProps, InputAdornment, -} from "@material-ui/core"; -import SearchIcon from "@material-ui/icons/Search"; +} from "@mui/material"; +import SearchIcon from "@mui/icons-material/Search"; import SlideTransition from "components/Modal/SlideTransition"; import { APP_BAR_HEIGHT } from "components/Navigation"; diff --git a/src/components/FormattedChip.tsx b/src/components/FormattedChip.tsx index d18a8165..3787313c 100644 --- a/src/components/FormattedChip.tsx +++ b/src/components/FormattedChip.tsx @@ -1,6 +1,6 @@ import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Chip, ChipProps } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Chip, ChipProps } from "@mui/material"; export const VARIANTS = ["yes", "no", "maybe"]; diff --git a/src/components/HelperText.tsx b/src/components/HelperText.tsx index 61b295e9..dab222ac 100644 --- a/src/components/HelperText.tsx +++ b/src/components/HelperText.tsx @@ -1,4 +1,4 @@ -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export interface IHelperTextProps { children: React.ReactNode; diff --git a/src/components/Home/AccessDenied.tsx b/src/components/Home/AccessDenied.tsx index c42d2cff..d49f4a60 100644 --- a/src/components/Home/AccessDenied.tsx +++ b/src/components/Home/AccessDenied.tsx @@ -1,7 +1,7 @@ import { Link } from "react-router-dom"; -import { Typography, Link as MuiLink, Button } from "@material-ui/core"; -import SecurityIcon from "@material-ui/icons/SecurityOutlined"; +import { Typography, Link as MuiLink, Button } from "@mui/material"; +import SecurityIcon from "@mui/icons-material/SecurityOutlined"; import EmptyState from "components/EmptyState"; diff --git a/src/components/Home/HomeWelcomePrompt.tsx b/src/components/Home/HomeWelcomePrompt.tsx index a2d9fbfe..f4212070 100644 --- a/src/components/Home/HomeWelcomePrompt.tsx +++ b/src/components/Home/HomeWelcomePrompt.tsx @@ -1,4 +1,4 @@ -import { Zoom, Stack, Typography } from "@material-ui/core"; +import { Zoom, Stack, Typography } from "@mui/material"; export default function HomeWelcomePrompt() { return ( diff --git a/src/components/Home/TableGrid/TableCard.tsx b/src/components/Home/TableGrid/TableCard.tsx index f0df5040..e2e76d6c 100644 --- a/src/components/Home/TableGrid/TableCard.tsx +++ b/src/components/Home/TableGrid/TableCard.tsx @@ -7,7 +7,7 @@ import { Typography, CardActions, Button, -} from "@material-ui/core"; +} from "@mui/material"; import GoIcon from "assets/icons/Go"; import { Table } from "contexts/ProjectContext"; diff --git a/src/components/Home/TableGrid/TableCardSkeleton.tsx b/src/components/Home/TableGrid/TableCardSkeleton.tsx index 08645003..c6611bde 100644 --- a/src/components/Home/TableGrid/TableCardSkeleton.tsx +++ b/src/components/Home/TableGrid/TableCardSkeleton.tsx @@ -4,7 +4,7 @@ import { Typography, CardActions, Skeleton, -} from "@material-ui/core"; +} from "@mui/material"; export default function TableCardSkeleton() { return ( diff --git a/src/components/Home/TableGrid/TableGridSkeleton.tsx b/src/components/Home/TableGrid/TableGridSkeleton.tsx index fcdb257f..8f9dd62c 100644 --- a/src/components/Home/TableGrid/TableGridSkeleton.tsx +++ b/src/components/Home/TableGrid/TableGridSkeleton.tsx @@ -1,4 +1,4 @@ -import { Container, Paper, Box, Grid } from "@material-ui/core"; +import { Container, Paper, Box, Grid } from "@mui/material"; import SectionHeadingSkeleton from "components/SectionHeadingSkeleton"; import TableCardSkeleton from "./TableCardSkeleton"; diff --git a/src/components/Home/TableGrid/index.tsx b/src/components/Home/TableGrid/index.tsx index f1cdf11e..493116b2 100644 --- a/src/components/Home/TableGrid/index.tsx +++ b/src/components/Home/TableGrid/index.tsx @@ -1,6 +1,6 @@ import { TransitionGroup } from "react-transition-group"; -import { Box, Grid, Collapse } from "@material-ui/core"; +import { Box, Grid, Collapse } from "@mui/material"; import SectionHeading from "components/SectionHeading"; import TableCard from "./TableCard"; diff --git a/src/components/Home/TableList/TableListItem.tsx b/src/components/Home/TableList/TableListItem.tsx index 3213febf..a427f30f 100644 --- a/src/components/Home/TableList/TableListItem.tsx +++ b/src/components/Home/TableList/TableListItem.tsx @@ -5,8 +5,8 @@ import { ListItemButton, Typography, IconButton, -} from "@material-ui/core"; -import GoIcon from "@material-ui/icons/ArrowForward"; +} from "@mui/material"; +import GoIcon from "@mui/icons-material/ArrowForward"; import { Table } from "contexts/ProjectContext"; diff --git a/src/components/Home/TableList/TableListItemSkeleton.tsx b/src/components/Home/TableList/TableListItemSkeleton.tsx index f8aa09c1..a2854ee8 100644 --- a/src/components/Home/TableList/TableListItemSkeleton.tsx +++ b/src/components/Home/TableList/TableListItemSkeleton.tsx @@ -1,4 +1,4 @@ -import { ListItem, Skeleton } from "@material-ui/core"; +import { ListItem, Skeleton } from "@mui/material"; export default function TableListItemSkeleton() { return ( diff --git a/src/components/Home/TableList/TableListSkeleton.tsx b/src/components/Home/TableList/TableListSkeleton.tsx index f01e6bb6..5bb44174 100644 --- a/src/components/Home/TableList/TableListSkeleton.tsx +++ b/src/components/Home/TableList/TableListSkeleton.tsx @@ -1,4 +1,4 @@ -import { Container, Box, Paper } from "@material-ui/core"; +import { Container, Box, Paper } from "@mui/material"; import SectionHeadingSkeleton from "components/SectionHeadingSkeleton"; import TableListItemSkeleton from "./TableListItemSkeleton"; diff --git a/src/components/Home/TableList/index.tsx b/src/components/Home/TableList/index.tsx index dafe8e6c..991f2555 100644 --- a/src/components/Home/TableList/index.tsx +++ b/src/components/Home/TableList/index.tsx @@ -1,6 +1,6 @@ import { TransitionGroup } from "react-transition-group"; -import { Box, Paper, Collapse, List } from "@material-ui/core"; +import { Box, Paper, Collapse, List } from "@mui/material"; import SectionHeading from "components/SectionHeading"; import TableListItem from "./TableListItem"; diff --git a/src/components/InlineOpenInNewIcon.tsx b/src/components/InlineOpenInNewIcon.tsx index 7d829c8f..f0d264ad 100644 --- a/src/components/InlineOpenInNewIcon.tsx +++ b/src/components/InlineOpenInNewIcon.tsx @@ -1,5 +1,5 @@ -import { SvgIconProps } from "@material-ui/core/SvgIcon"; -import OpenInNewIcon from "@material-ui/icons/OpenInNew"; +import { SvgIconProps } from "@mui/material/SvgIcon"; +import OpenInNewIcon from "@mui/icons-material/OpenInNew"; export default function InlineOpenInNewIcon(props: SvgIconProps) { return ( diff --git a/src/components/Loading.tsx b/src/components/Loading.tsx index d0e94ba2..9a68f2d6 100644 --- a/src/components/Loading.tsx +++ b/src/components/Loading.tsx @@ -6,7 +6,7 @@ import { StackProps, CircularProgress, Typography, -} from "@material-ui/core"; +} from "@mui/material"; interface ILoadingProps extends Partial { message?: string; fullScreen?: boolean; diff --git a/src/components/Modal/ScrollableDialogContent.tsx b/src/components/Modal/ScrollableDialogContent.tsx new file mode 100644 index 00000000..eb91d006 --- /dev/null +++ b/src/components/Modal/ScrollableDialogContent.tsx @@ -0,0 +1,53 @@ +import { memo } from "react"; +import useScrollInfo from "react-element-scroll-hook"; + +import { + Divider, + DividerProps, + DialogContent, + DialogContentProps, +} from "@mui/material"; + +const MemoizedDialogContent = memo(function MemoizedDialogContent({ + setRef, + ...props +}: DialogContentProps & { setRef: any }) { + return ; +}); + +export interface IScrollableDialogContentProps extends DialogContentProps { + disableTopDivider?: boolean; + disableBottomDivider?: boolean; + dividerSx?: DividerProps["sx"]; + topDividerSx?: DividerProps["sx"]; + bottomDividerSx?: DividerProps["sx"]; +} + +export default function ScrollableDialogContent({ + disableTopDivider = false, + disableBottomDivider = false, + dividerSx, + topDividerSx, + bottomDividerSx, + ...props +}: IScrollableDialogContentProps) { + const [scrollInfo, setRef] = useScrollInfo(); + + return ( + <> + {!disableTopDivider && + scrollInfo.y.percentage !== null && + scrollInfo.y.percentage > 0 && ( + + )} + + + + {!disableBottomDivider && + scrollInfo.y.percentage !== null && + scrollInfo.y.percentage < 1 && ( + + )} + + ); +} diff --git a/src/components/Modal/SlideTransition.tsx b/src/components/Modal/SlideTransition.tsx index efcbc8d5..a151847d 100644 --- a/src/components/Modal/SlideTransition.tsx +++ b/src/components/Modal/SlideTransition.tsx @@ -1,8 +1,8 @@ import React from "react"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; import { Transition } from "react-transition-group"; import { TransitionProps } from "react-transition-group/Transition"; -import { TransitionProps as MuiTransitionProps } from "@material-ui/core/transitions"; +import { TransitionProps as MuiTransitionProps } from "@mui/material/transitions"; export const SlideTransition: React.ForwardRefExoticComponent< Pick & React.RefAttributes diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx index 5d195a3f..e7b1e64e 100644 --- a/src/components/Modal/index.tsx +++ b/src/components/Modal/index.tsx @@ -8,14 +8,17 @@ import { Stack, DialogTitle, IconButton, - DialogContent, DialogActions, Button, ButtonProps, -} from "@material-ui/core"; -import CloseIcon from "@material-ui/icons/Close"; + Slide, +} from "@mui/material"; +import CloseIcon from "@mui/icons-material/Close"; import { SlideTransitionMui } from "./SlideTransition"; +import ScrollableDialogContent, { + IScrollableDialogContentProps, +} from "./ScrollableDialogContent"; export interface IModalProps extends Partial> { onClose: () => void; @@ -35,6 +38,7 @@ export interface IModalProps extends Partial> { hideCloseButton?: boolean; fullHeight?: boolean; + ScrollableDialogContentProps?: Partial; } export default function Modal({ @@ -48,6 +52,7 @@ export default function Modal({ actions, hideCloseButton, fullHeight, + ScrollableDialogContentProps, ...props }: IModalProps) { const theme = useTheme(); @@ -64,10 +69,11 @@ export default function Modal({ return ( @@ -109,7 +113,9 @@ export default function Modal({ {header} - {children || body} + + {children || body} + {footer} diff --git a/src/components/Navigation/Breadcrumbs.tsx b/src/components/Navigation/Breadcrumbs.tsx index fb434ea6..c44cee6e 100644 --- a/src/components/Navigation/Breadcrumbs.tsx +++ b/src/components/Navigation/Breadcrumbs.tsx @@ -8,8 +8,8 @@ import { BreadcrumbsProps, Link, Typography, -} from "@material-ui/core"; -import ArrowRightIcon from "@material-ui/icons/ChevronRight"; +} from "@mui/material"; +import ArrowRightIcon from "@mui/icons-material/ChevronRight"; import { useProjectContext } from "contexts/ProjectContext"; import useRouter from "hooks/useRouter"; diff --git a/src/components/Navigation/NavDrawer.tsx b/src/components/Navigation/NavDrawer.tsx index 7cb89751..8762f8c6 100644 --- a/src/components/Navigation/NavDrawer.tsx +++ b/src/components/Navigation/NavDrawer.tsx @@ -10,11 +10,11 @@ import { ListItemIcon, ListItemText, Divider, -} from "@material-ui/core"; -import HomeIcon from "@material-ui/icons/HomeOutlined"; -import SettingsIcon from "@material-ui/icons/SettingsOutlined"; -import ProjectSettingsIcon from "@material-ui/icons/BuildCircleOutlined"; -import UserManagementIcon from "@material-ui/icons/AccountCircleOutlined"; +} from "@mui/material"; +import HomeIcon from "@mui/icons-material/HomeOutlined"; +import SettingsIcon from "@mui/icons-material/SettingsOutlined"; +import ProjectSettingsIcon from "@mui/icons-material/BuildCircleOutlined"; +import UserManagementIcon from "@mui/icons-material/AccountCircleOutlined"; import CloseIcon from "assets/icons/Backburger"; import { APP_BAR_HEIGHT } from "."; diff --git a/src/components/Navigation/NavItem.tsx b/src/components/Navigation/NavItem.tsx index 2d670ba0..004c4c36 100644 --- a/src/components/Navigation/NavItem.tsx +++ b/src/components/Navigation/NavItem.tsx @@ -1,5 +1,5 @@ import { Link, useLocation } from "react-router-dom"; -import { MenuItem, MenuItemProps } from "@material-ui/core"; +import { MenuItem, MenuItemProps } from "@mui/material"; export default function NavItem(props: MenuItemProps) { const { pathname } = useLocation(); diff --git a/src/components/Navigation/NavTableSection.tsx b/src/components/Navigation/NavTableSection.tsx index 5d2e33ae..50e5c988 100644 --- a/src/components/Navigation/NavTableSection.tsx +++ b/src/components/Navigation/NavTableSection.tsx @@ -1,8 +1,8 @@ import { useState } from "react"; import { useLocation } from "react-router-dom"; -import { List, ListItemText, Collapse } from "@material-ui/core"; -import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; +import { List, ListItemText, Collapse } from "@mui/material"; +import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; import NavItem from "./NavItem"; import { Table } from "contexts/ProjectContext"; diff --git a/src/components/Navigation/Notifications/index.tsx b/src/components/Navigation/Notifications/index.tsx index 2864b2fd..42765c09 100644 --- a/src/components/Navigation/Notifications/index.tsx +++ b/src/components/Navigation/Notifications/index.tsx @@ -9,14 +9,14 @@ import { ListItemText, ListItemSecondaryAction, Badge, -} from "@material-ui/core"; +} from "@mui/material"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; -import ErrorIcon from "@material-ui/icons/Error"; -import DeleteIcon from "@material-ui/icons/Delete"; +import ErrorIcon from "@mui/icons-material/Error"; +import DeleteIcon from "@mui/icons-material/Delete"; -import BellIcon from "@material-ui/icons/Notifications"; +import BellIcon from "@mui/icons-material/Notifications"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/Navigation/UserMenu.tsx b/src/components/Navigation/UserMenu.tsx index b12cf8a6..dc1d1976 100644 --- a/src/components/Navigation/UserMenu.tsx +++ b/src/components/Navigation/UserMenu.tsx @@ -13,9 +13,9 @@ import { ListItemSecondaryAction, Divider, Grow, -} from "@material-ui/core"; -import AccountCircleIcon from "@material-ui/icons/AccountCircleOutlined"; -import ArrowRightIcon from "@material-ui/icons/ArrowRight"; +} from "@mui/material"; +import AccountCircleIcon from "@mui/icons-material/AccountCircleOutlined"; +import ArrowRightIcon from "@mui/icons-material/ArrowRight"; import { useAppContext } from "contexts/AppContext"; import routes from "constants/routes"; @@ -71,7 +71,6 @@ export default function UserMenu(props: IconButtonProps) { createStyles({ diff --git a/src/components/RichTextEditor.tsx b/src/components/RichTextEditor.tsx index d635555f..aea50780 100644 --- a/src/components/RichTextEditor.tsx +++ b/src/components/RichTextEditor.tsx @@ -14,8 +14,8 @@ import "tinymce/plugins/help"; import "tinymce/plugins/code"; import { Editor } from "@tinymce/tinymce-react"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { useTheme } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { useTheme } from "@mui/material"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/RichTooltip.tsx b/src/components/RichTooltip.tsx index d6f17e59..5c333fc3 100644 --- a/src/components/RichTooltip.tsx +++ b/src/components/RichTooltip.tsx @@ -1,14 +1,14 @@ import React, { useState } from "react"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { Tooltip, TooltipProps, Typography, Button, ButtonProps, -} from "@material-ui/core"; +} from "@mui/material"; import { colord, extend } from "colord"; import mixPlugin from "colord/plugins/lch"; diff --git a/src/components/SectionHeading.tsx b/src/components/SectionHeading.tsx index 5678ddc6..ab90df48 100644 --- a/src/components/SectionHeading.tsx +++ b/src/components/SectionHeading.tsx @@ -2,8 +2,8 @@ import { forwardRef } from "react"; import _camelCase from "lodash/camelCase"; import { HashLink } from "react-router-hash-link"; -import { Stack, StackProps, Typography, IconButton } from "@material-ui/core"; -import LinkIcon from "@material-ui/icons/Link"; +import { Stack, StackProps, Typography, IconButton } from "@mui/material"; +import LinkIcon from "@mui/icons-material/Link"; import { APP_BAR_HEIGHT } from "components/Navigation"; diff --git a/src/components/SectionHeadingSkeleton.tsx b/src/components/SectionHeadingSkeleton.tsx index cc8be045..dd1ea2e0 100644 --- a/src/components/SectionHeadingSkeleton.tsx +++ b/src/components/SectionHeadingSkeleton.tsx @@ -1,4 +1,4 @@ -import { Stack, StackProps, Skeleton } from "@material-ui/core"; +import { Stack, StackProps, Skeleton } from "@mui/material"; export default function SectionHeadingSkeleton({ sx, ...props }: StackProps) { return ( diff --git a/src/components/Settings/MigrateToV2.tsx b/src/components/Settings/MigrateToV2.tsx index 9ea29120..bcba0cc1 100644 --- a/src/components/Settings/MigrateToV2.tsx +++ b/src/components/Settings/MigrateToV2.tsx @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; import createPersistedState from "use-persisted-state"; -import { Typography, Link, Button } from "@material-ui/core"; -import LoadingButton from "@material-ui/lab/LoadingButton"; -import OpenInNewIcon from "@material-ui/icons/OpenInNew"; +import { Typography, Link, Button } from "@mui/material"; +import LoadingButton from "@mui/lab/LoadingButton"; +import OpenInNewIcon from "@mui/icons-material/OpenInNew"; import Modal from "components/Modal"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/Settings/ProjectSettings/About.tsx b/src/components/Settings/ProjectSettings/About.tsx index a0a16344..97186cba 100644 --- a/src/components/Settings/ProjectSettings/About.tsx +++ b/src/components/Settings/ProjectSettings/About.tsx @@ -2,8 +2,8 @@ import { useState, useCallback, useEffect } from "react"; import createPersistedState from "use-persisted-state"; import { differenceInDays } from "date-fns"; -import { Grid, Typography, Button, Link, Divider } from "@material-ui/core"; -import LoadingButton from "@material-ui/lab/LoadingButton"; +import { Grid, Typography, Button, Link, Divider } from "@mui/material"; +import LoadingButton from "@mui/lab/LoadingButton"; import Logo from "assets/Logo"; import InlineOpenInNewIcon from "components/InlineOpenInNewIcon"; diff --git a/src/components/Settings/ProjectSettings/Authentication.tsx b/src/components/Settings/ProjectSettings/Authentication.tsx index f9333089..5980a7bf 100644 --- a/src/components/Settings/ProjectSettings/Authentication.tsx +++ b/src/components/Settings/ProjectSettings/Authentication.tsx @@ -2,8 +2,8 @@ import { useState } from "react"; import { authOptions } from "firebase/firebaseui"; import _startCase from "lodash/startCase"; -import MultiSelect from "@antlerengineering/multiselect"; -import { Typography, Link } from "@material-ui/core"; +import MultiSelect from "@rowy/multiselect"; +import { Typography, Link } from "@mui/material"; import InlineOpenInNewIcon from "components/InlineOpenInNewIcon"; import { IProjectSettingsChildProps } from "pages/Settings/ProjectSettings"; diff --git a/src/components/Settings/ProjectSettings/CloudRun.tsx b/src/components/Settings/ProjectSettings/CloudRun.tsx index df065e3f..45d2cd1e 100644 --- a/src/components/Settings/ProjectSettings/CloudRun.tsx +++ b/src/components/Settings/ProjectSettings/CloudRun.tsx @@ -1,5 +1,5 @@ -import { Typography, Link, Grid, TextField } from "@material-ui/core"; -import LoadingButton from "@material-ui/lab/LoadingButton"; +import { Typography, Link, Grid, TextField } from "@mui/material"; +import LoadingButton from "@mui/lab/LoadingButton"; import InlineOpenInNewIcon from "components/InlineOpenInNewIcon"; import { IProjectSettingsChildProps } from "pages/Settings/ProjectSettings"; diff --git a/src/components/Settings/ProjectSettings/Customization.tsx b/src/components/Settings/ProjectSettings/Customization.tsx index 4e50b2ae..33ebf73f 100644 --- a/src/components/Settings/ProjectSettings/Customization.tsx +++ b/src/components/Settings/ProjectSettings/Customization.tsx @@ -1,7 +1,7 @@ import { lazy, Suspense, useState } from "react"; import { IProjectSettingsChildProps } from "pages/Settings/ProjectSettings"; -import { FormControlLabel, Checkbox, Collapse } from "@material-ui/core"; +import { FormControlLabel, Checkbox, Collapse } from "@mui/material"; import Loading from "components/Loading"; // prettier-ignore diff --git a/src/components/Settings/SettingsSection.tsx b/src/components/Settings/SettingsSection.tsx index 3a105c1c..d24f1fcc 100644 --- a/src/components/Settings/SettingsSection.tsx +++ b/src/components/Settings/SettingsSection.tsx @@ -1,4 +1,4 @@ -import { Paper, PaperProps } from "@material-ui/core"; +import { Paper, PaperProps } from "@mui/material"; import SectionHeading from "components/SectionHeading"; import SlideTransition from "components/Modal/SlideTransition"; diff --git a/src/components/Settings/SettingsSkeleton.tsx b/src/components/Settings/SettingsSkeleton.tsx index 4f6a87d6..3b87946b 100644 --- a/src/components/Settings/SettingsSkeleton.tsx +++ b/src/components/Settings/SettingsSkeleton.tsx @@ -1,4 +1,4 @@ -import { Typography, Paper, Skeleton, Stack, Divider } from "@material-ui/core"; +import { Typography, Paper, Skeleton, Stack, Divider } from "@mui/material"; export default function SettingsSkeleton() { return ( diff --git a/src/components/Settings/ThemeColorPicker.tsx b/src/components/Settings/ThemeColorPicker.tsx index 1a7c2d96..86ec2044 100644 --- a/src/components/Settings/ThemeColorPicker.tsx +++ b/src/components/Settings/ThemeColorPicker.tsx @@ -1,9 +1,9 @@ import { useState } from "react"; import { ChromePicker } from "react-color"; -import { Grid, Typography, Stack, Box, Button } from "@material-ui/core"; -import PassIcon from "@material-ui/icons/Check"; -import FailIcon from "@material-ui/icons/Error"; +import { Grid, Typography, Stack, Box, Button } from "@mui/material"; +import PassIcon from "@mui/icons-material/Check"; +import FailIcon from "@mui/icons-material/Error"; import { PRIMARY, DARK_PRIMARY } from "theme/colors"; import themes from "theme"; diff --git a/src/components/Settings/UserManagement/InviteUser.tsx b/src/components/Settings/UserManagement/InviteUser.tsx index 63a34826..212bff1c 100644 --- a/src/components/Settings/UserManagement/InviteUser.tsx +++ b/src/components/Settings/UserManagement/InviteUser.tsx @@ -6,8 +6,8 @@ import { DialogContentText, Link as MuiLink, TextField, -} from "@material-ui/core"; -import AddIcon from "@material-ui/icons/PersonAddOutlined"; +} from "@mui/material"; +import AddIcon from "@mui/icons-material/PersonAddOutlined"; import Modal from "components/Modal"; @@ -53,7 +53,6 @@ export default function InviteUser() { label="Email Address" id="invite-email" fullWidth - autoFocus placeholder="name@example.com" /> diff --git a/src/components/Settings/UserManagement/UserItem.tsx b/src/components/Settings/UserManagement/UserItem.tsx index 601d565e..03ee051f 100644 --- a/src/components/Settings/UserManagement/UserItem.tsx +++ b/src/components/Settings/UserManagement/UserItem.tsx @@ -5,11 +5,11 @@ import { ListItemText, Tooltip, IconButton, -} from "@material-ui/core"; +} from "@mui/material"; import CopyIcon from "assets/icons/Copy"; -import DeleteIcon from "@material-ui/icons/DeleteOutlined"; +import DeleteIcon from "@mui/icons-material/DeleteOutlined"; -import MultiSelect from "@antlerengineering/multiselect"; +import MultiSelect from "@rowy/multiselect"; import { User } from "pages/Settings/UserManagement"; export default function UserItem({ diff --git a/src/components/Settings/UserManagement/UserSkeleton.tsx b/src/components/Settings/UserManagement/UserSkeleton.tsx index 80dcc9e7..5ea70e8b 100644 --- a/src/components/Settings/UserManagement/UserSkeleton.tsx +++ b/src/components/Settings/UserManagement/UserSkeleton.tsx @@ -5,7 +5,7 @@ import { Avatar, ListItemText, Stack, -} from "@material-ui/core"; +} from "@mui/material"; export default function UserSkeleton() { return ( diff --git a/src/components/Settings/UserSettings/Account.tsx b/src/components/Settings/UserSettings/Account.tsx index 6d36a158..90ef50a3 100644 --- a/src/components/Settings/UserSettings/Account.tsx +++ b/src/components/Settings/UserSettings/Account.tsx @@ -1,7 +1,7 @@ import { IUserSettingsChildProps } from "pages/Settings/UserSettings"; import { Link } from "react-router-dom"; -import { Grid, Avatar, Typography, Button } from "@material-ui/core"; +import { Grid, Avatar, Typography, Button } from "@mui/material"; import routes from "constants/routes"; diff --git a/src/components/Settings/UserSettings/Personalization.tsx b/src/components/Settings/UserSettings/Personalization.tsx index 352fa16a..900adeb3 100644 --- a/src/components/Settings/UserSettings/Personalization.tsx +++ b/src/components/Settings/UserSettings/Personalization.tsx @@ -1,7 +1,7 @@ import { lazy, Suspense, useState } from "react"; import { IUserSettingsChildProps } from "pages/Settings/UserSettings"; -import { FormControlLabel, Checkbox, Collapse } from "@material-ui/core"; +import { FormControlLabel, Checkbox, Collapse } from "@mui/material"; import Loading from "components/Loading"; // prettier-ignore diff --git a/src/components/Settings/UserSettings/Theme.tsx b/src/components/Settings/UserSettings/Theme.tsx index 24a2127b..999d8143 100644 --- a/src/components/Settings/UserSettings/Theme.tsx +++ b/src/components/Settings/UserSettings/Theme.tsx @@ -3,7 +3,7 @@ import { RadioGroup, FormControlLabel, Radio, -} from "@material-ui/core"; +} from "@mui/material"; import { useAppContext } from "contexts/AppContext"; diff --git a/src/components/SideDrawer/Form/FieldSkeleton.tsx b/src/components/SideDrawer/Form/FieldSkeleton.tsx index 2096b0ff..c1be021d 100644 --- a/src/components/SideDrawer/Form/FieldSkeleton.tsx +++ b/src/components/SideDrawer/Form/FieldSkeleton.tsx @@ -1,6 +1,6 @@ -import { useTheme } from "@material-ui/core"; -import { Skeleton } from "@material-ui/core"; -import { SkeletonProps } from "@material-ui/lab"; +import { useTheme } from "@mui/material"; +import { Skeleton } from "@mui/material"; +import { SkeletonProps } from "@mui/lab"; export default function FieldSkeleton(props: SkeletonProps) { const theme = useTheme(); diff --git a/src/components/SideDrawer/Form/FieldWrapper.tsx b/src/components/SideDrawer/Form/FieldWrapper.tsx index 889abbba..1741232a 100644 --- a/src/components/SideDrawer/Form/FieldWrapper.tsx +++ b/src/components/SideDrawer/Form/FieldWrapper.tsx @@ -1,10 +1,10 @@ import React, { Suspense } from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, Typography, IconButton } from "@material-ui/core"; -import DebugIcon from "@material-ui/icons/BugReportOutlined"; -import LaunchIcon from "@material-ui/icons/Launch"; -import LockIcon from "@material-ui/icons/LockOutlined"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, Typography, IconButton } from "@mui/material"; +import DebugIcon from "@mui/icons-material/BugReportOutlined"; +import LaunchIcon from "@mui/icons-material/Launch"; +import LockIcon from "@mui/icons-material/LockOutlined"; import ErrorBoundary from "components/ErrorBoundary"; import FieldSkeleton from "./FieldSkeleton"; diff --git a/src/components/SideDrawer/Form/Label.tsx b/src/components/SideDrawer/Form/Label.tsx index 6416e849..b6ec77a2 100644 --- a/src/components/SideDrawer/Form/Label.tsx +++ b/src/components/SideDrawer/Form/Label.tsx @@ -1,11 +1,11 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { FormLabel, FormLabelProps, Tooltip, IconButton, -} from "@material-ui/core"; -import HelpIcon from "@material-ui/icons/HelpOutline"; +} from "@mui/material"; +import HelpIcon from "@mui/icons-material/HelpOutline"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/SideDrawer/Form/index.tsx b/src/components/SideDrawer/Form/index.tsx index 87849609..7f812d37 100644 --- a/src/components/SideDrawer/Form/index.tsx +++ b/src/components/SideDrawer/Form/index.tsx @@ -3,7 +3,7 @@ import { useForm } from "react-hook-form"; import _sortBy from "lodash/sortBy"; import _isEmpty from "lodash/isEmpty"; -import { Grid } from "@material-ui/core"; +import { Grid } from "@mui/material"; import { Values } from "./utils"; import { getFieldProp } from "components/fields"; diff --git a/src/components/SideDrawer/Form/utils.ts b/src/components/SideDrawer/Form/utils.ts index 3f96e5ba..8ecb113a 100644 --- a/src/components/SideDrawer/Form/utils.ts +++ b/src/components/SideDrawer/Form/utils.ts @@ -1,5 +1,5 @@ import { Control } from "react-hook-form"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { FieldType } from "constants/fields"; import { colord } from "colord"; diff --git a/src/components/SideDrawer/index.tsx b/src/components/SideDrawer/index.tsx index 2d6207c3..6ff6bd61 100644 --- a/src/components/SideDrawer/index.tsx +++ b/src/components/SideDrawer/index.tsx @@ -4,10 +4,10 @@ import _isNil from "lodash/isNil"; import _isEmpty from "lodash/isEmpty"; import queryString from "query-string"; -import { Drawer, Fab } from "@material-ui/core"; -import ChevronIcon from "@material-ui/icons/KeyboardArrowLeft"; -import ChevronUpIcon from "@material-ui/icons/KeyboardArrowUp"; -import ChevronDownIcon from "@material-ui/icons/KeyboardArrowDown"; +import { Drawer, Fab } from "@mui/material"; +import ChevronIcon from "@mui/icons-material/KeyboardArrowLeft"; +import ChevronUpIcon from "@mui/icons-material/KeyboardArrowUp"; +import ChevronDownIcon from "@mui/icons-material/KeyboardArrowDown"; import Form from "./Form"; import ErrorBoundary from "components/ErrorBoundary"; diff --git a/src/components/SideDrawer/useStyles.ts b/src/components/SideDrawer/useStyles.ts index 3cfdccd1..b9a05b19 100644 --- a/src/components/SideDrawer/useStyles.ts +++ b/src/components/SideDrawer/useStyles.ts @@ -1,4 +1,4 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { DRAWER_WIDTH, DRAWER_COLLAPSED_WIDTH } from "./index"; import { APP_BAR_HEIGHT } from "components/Navigation"; import { TABLE_HEADER_HEIGHT } from "components/Table/TableHeader"; diff --git a/src/components/SnackbarProgress.tsx b/src/components/SnackbarProgress.tsx index 70c427ec..28cf9cd9 100644 --- a/src/components/SnackbarProgress.tsx +++ b/src/components/SnackbarProgress.tsx @@ -1,5 +1,5 @@ import { useState, Dispatch, SetStateAction, MutableRefObject } from "react"; -import { Stack, CircularProgress } from "@material-ui/core"; +import { Stack, CircularProgress } from "@mui/material"; export interface ISnackbarProgressRef { setProgress: Dispatch>; diff --git a/src/components/Table/BulkActions/index.tsx b/src/components/Table/BulkActions/index.tsx index c092a3b5..90e80c8e 100644 --- a/src/components/Table/BulkActions/index.tsx +++ b/src/components/Table/BulkActions/index.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import _find from "lodash/find"; import { useSnackbar } from "notistack"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { alpha, Grow, @@ -13,12 +13,12 @@ import { Typography, TextField, MenuItem, -} from "@material-ui/core"; +} from "@mui/material"; import CopyCellsIcon from "assets/icons/CopyCells"; -import ClearSelectionIcon from "@material-ui/icons/IndeterminateCheckBox"; -import DeleteIcon from "@material-ui/icons/DeleteForever"; -import ArrowDropUpIcon from "@material-ui/icons/ArrowDropUp"; +import ClearSelectionIcon from "@mui/icons-material/IndeterminateCheckBox"; +import DeleteIcon from "@mui/icons-material/DeleteForever"; +import ArrowDropUpIcon from "@mui/icons-material/ArrowDropUp"; import { useConfirmation } from "components/ConfirmationDialog/Context"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/Table/CellValidation.tsx b/src/components/Table/CellValidation.tsx index ce1fda8e..02fb78db 100644 --- a/src/components/Table/CellValidation.tsx +++ b/src/components/Table/CellValidation.tsx @@ -1,6 +1,6 @@ -import { styled } from "@material-ui/core/styles"; -import ErrorIcon from "@material-ui/icons/ErrorOutline"; -import WarningIcon from "@material-ui/icons/WarningAmber"; +import { styled } from "@mui/material/styles"; +import ErrorIcon from "@mui/icons-material/ErrorOutline"; +import WarningIcon from "@mui/icons-material/WarningAmber"; import RichTooltip from "components/RichTooltip"; diff --git a/src/components/Table/ColumnHeader.tsx b/src/components/Table/ColumnHeader.tsx index 56a2d0cf..c5cf728c 100644 --- a/src/components/Table/ColumnHeader.tsx +++ b/src/components/Table/ColumnHeader.tsx @@ -4,7 +4,7 @@ import { HeaderRendererProps } from "react-data-grid"; import { useDrag, useDrop, DragObjectWithType } from "react-dnd"; import useCombinedRefs from "hooks/useCombinedRefs"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { alpha, Tooltip, @@ -12,10 +12,10 @@ import { Grid, IconButton, Typography, -} from "@material-ui/core"; -import SortDescIcon from "@material-ui/icons/ArrowDownward"; -import DropdownIcon from "@material-ui/icons/MoreHoriz"; -import LockIcon from "@material-ui/icons/LockOutlined"; +} from "@mui/material"; +import SortDescIcon from "@mui/icons-material/ArrowDownward"; +import DropdownIcon from "@mui/icons-material/MoreHoriz"; +import LockIcon from "@mui/icons-material/LockOutlined"; import { FieldType } from "constants/fields"; import { getFieldProp } from "components/fields"; diff --git a/src/components/Table/ColumnMenu/FieldSettings/DefaultValueInput.tsx b/src/components/Table/ColumnMenu/FieldSettings/DefaultValueInput.tsx index 4b2941a3..c60beeb9 100644 --- a/src/components/Table/ColumnMenu/FieldSettings/DefaultValueInput.tsx +++ b/src/components/Table/ColumnMenu/FieldSettings/DefaultValueInput.tsx @@ -2,15 +2,15 @@ import React from "react"; import { useForm } from "react-hook-form"; import { IMenuModalProps } from ".."; -import { makeStyles, createStyles } from "@material-ui/styles"; -import Switch from "@material-ui/core/Switch"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; +import { makeStyles, createStyles } from "@mui/styles"; +import Switch from "@mui/material/Switch"; +import FormControlLabel from "@mui/material/FormControlLabel"; import { Typography, TextField, MenuItem, ListItemText, -} from "@material-ui/core"; +} from "@mui/material"; import Subheading from "../Subheading"; import { getFieldProp } from "components/fields"; diff --git a/src/components/Table/ColumnMenu/FieldSettings/index.tsx b/src/components/Table/ColumnMenu/FieldSettings/index.tsx index dada154b..97fc3ea0 100644 --- a/src/components/Table/ColumnMenu/FieldSettings/index.tsx +++ b/src/components/Table/ColumnMenu/FieldSettings/index.tsx @@ -17,9 +17,9 @@ import { useAppContext } from "contexts/AppContext"; import { useConfirmation } from "components/ConfirmationDialog"; import { FieldType } from "constants/fields"; -import Typography from "@material-ui/core/Typography"; -import Divider from "@material-ui/core/Divider"; -import Button from "@material-ui/core/Button"; +import Typography from "@mui/material/Typography"; +import Divider from "@mui/material/Divider"; +import Button from "@mui/material/Button"; import routes from "constants/routes"; import { SETTINGS } from "config/dbPaths"; import { name as appName } from "@root/package.json"; diff --git a/src/components/Table/ColumnMenu/FieldsDropdown.tsx b/src/components/Table/ColumnMenu/FieldsDropdown.tsx index 30e367a8..169e4d2c 100644 --- a/src/components/Table/ColumnMenu/FieldsDropdown.tsx +++ b/src/components/Table/ColumnMenu/FieldsDropdown.tsx @@ -1,5 +1,5 @@ -import MultiSelect from "@antlerengineering/multiselect"; -import { ListItemIcon } from "@material-ui/core"; +import MultiSelect from "@rowy/multiselect"; +import { ListItemIcon } from "@mui/material"; import { FIELDS } from "components/fields"; import { FieldType } from "constants/fields"; diff --git a/src/components/Table/ColumnMenu/MenuContents.tsx b/src/components/Table/ColumnMenu/MenuContents.tsx index 03b63db8..14cf9180 100644 --- a/src/components/Table/ColumnMenu/MenuContents.tsx +++ b/src/components/Table/ColumnMenu/MenuContents.tsx @@ -5,8 +5,8 @@ import { ListItemIcon, ListSubheader, Divider, -} from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; +} from "@mui/material"; +import { alpha } from "@mui/material/styles"; export interface IMenuContentsProps { menuItems: { diff --git a/src/components/Table/ColumnMenu/NameChange.tsx b/src/components/Table/ColumnMenu/NameChange.tsx index b656745c..04dbbf73 100644 --- a/src/components/Table/ColumnMenu/NameChange.tsx +++ b/src/components/Table/ColumnMenu/NameChange.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { IMenuModalProps } from "."; -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; import Modal from "components/Modal"; diff --git a/src/components/Table/ColumnMenu/NewColumn.tsx b/src/components/Table/ColumnMenu/NewColumn.tsx index 3b54a1e7..36b4bdd5 100644 --- a/src/components/Table/ColumnMenu/NewColumn.tsx +++ b/src/components/Table/ColumnMenu/NewColumn.tsx @@ -2,8 +2,8 @@ import { useState, useEffect } from "react"; import _camel from "lodash/camelCase"; import { IMenuModalProps } from "."; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { TextField } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { TextField } from "@mui/material"; import Modal from "components/Modal"; import { FieldType } from "constants/fields"; diff --git a/src/components/Table/ColumnMenu/Subheading.tsx b/src/components/Table/ColumnMenu/Subheading.tsx index bf2043a7..acf23d6d 100644 --- a/src/components/Table/ColumnMenu/Subheading.tsx +++ b/src/components/Table/ColumnMenu/Subheading.tsx @@ -1,4 +1,4 @@ -import { useTheme, Typography, TypographyProps } from "@material-ui/core"; +import { useTheme, Typography, TypographyProps } from "@mui/material"; export default function Subheading(props: TypographyProps<"h2">) { const theme = useTheme(); diff --git a/src/components/Table/ColumnMenu/index.tsx b/src/components/Table/ColumnMenu/index.tsx index bbabebad..19d3bd4f 100644 --- a/src/components/Table/ColumnMenu/index.tsx +++ b/src/components/Table/ColumnMenu/index.tsx @@ -1,18 +1,18 @@ import React, { useState, useEffect } from "react"; -import { Menu, ListItem, ListItemIcon, ListItemText } from "@material-ui/core"; -import LockOpenIcon from "@material-ui/icons/LockOpen"; -import LockIcon from "@material-ui/icons/LockOutlined"; -import VisibilityOffIcon from "@material-ui/icons/VisibilityOffOutlined"; -import VisibilityIcon from "@material-ui/icons/VisibilityOutlined"; +import { Menu, ListItem, ListItemIcon, ListItemText } from "@mui/material"; +import LockOpenIcon from "@mui/icons-material/LockOpen"; +import LockIcon from "@mui/icons-material/LockOutlined"; +import VisibilityOffIcon from "@mui/icons-material/VisibilityOffOutlined"; +import VisibilityIcon from "@mui/icons-material/VisibilityOutlined"; import FreezeIcon from "assets/icons/Freeze"; import UnfreezeIcon from "assets/icons/Unfreeze"; import CellResizeIcon from "assets/icons/CellResize"; -import ArrowDownwardIcon from "@material-ui/icons/ArrowDownward"; -import ArrowUpwardIcon from "@material-ui/icons/ArrowUpward"; -import EditIcon from "@material-ui/icons/EditOutlined"; -// import ReorderIcon from "@material-ui/icons/Reorder"; -import SettingsIcon from "@material-ui/icons/SettingsOutlined"; +import ArrowDownwardIcon from "@mui/icons-material/ArrowDownward"; +import ArrowUpwardIcon from "@mui/icons-material/ArrowUpward"; +import EditIcon from "@mui/icons-material/EditOutlined"; +// import ReorderIcon from "@mui/icons-material/Reorder"; +import SettingsIcon from "@mui/icons-material/SettingsOutlined"; import ColumnPlusBeforeIcon from "assets/icons/ColumnPlusBefore"; import ColumnPlusAfterIcon from "assets/icons/ColumnPlusAfter"; import ColumnRemoveIcon from "assets/icons/ColumnRemove"; @@ -28,7 +28,7 @@ import { FieldType } from "constants/fields"; import { getFieldProp } from "components/fields"; import { Column } from "react-data-grid"; -import { PopoverProps } from "@material-ui/core"; +import { PopoverProps } from "@mui/material"; const INITIAL_MODAL = { type: "", data: {} }; @@ -276,9 +276,8 @@ export default function ColumnMenu() { <> {column.type !== FieldType.last && ( }, }, - tabs: { - marginLeft: "calc(var(--dialog-spacing) * -1)", - marginRight: "calc(var(--dialog-spacing) * -1)", - marginTop: theme.spacing(1), - }, tab: { minWidth: 0 }, divider: { margin: "-1px calc(var(--dialog-spacing) * -1) 0", @@ -101,15 +96,14 @@ export default function Export() { title={mode} header={ <> - + {(tableState?.filters && tableState?.filters.length !== 0) || (tableState?.orderBy && tableState?.orderBy.length !== 0) ? "The filters and sorting applied to the table will be used in the export." : "No filters or sorting will be applied on the exported data."} - + setMode(v)} indicatorColor="primary" textColor="primary" @@ -118,6 +112,7 @@ export default function Export() { action={(actions) => setTimeout(() => actions?.updateIndicator(), 200) } + sx={{ mt: 1 }} > } + ScrollableDialogContentProps={{ + disableTopDivider: true, + disableBottomDivider: true, + }} > diff --git a/src/components/Table/TableHeader/Extensions/ExtensionList.tsx b/src/components/Table/TableHeader/Extensions/ExtensionList.tsx index 08c52d37..3acecad9 100644 --- a/src/components/Table/TableHeader/Extensions/ExtensionList.tsx +++ b/src/components/Table/TableHeader/Extensions/ExtensionList.tsx @@ -15,12 +15,12 @@ import { Switch, Tooltip, Typography, -} from "@material-ui/core"; -import AddIcon from "@material-ui/icons/Add"; +} from "@mui/material"; +import AddIcon from "@mui/icons-material/Add"; import ExtensionIcon from "assets/icons/Extension"; -import DuplicateIcon from "@material-ui/icons/ContentCopy"; -import EditIcon from "@material-ui/icons/Edit"; -import DeleteIcon from "@material-ui/icons/DeleteForever"; +import DuplicateIcon from "@mui/icons-material/ContentCopy"; +import EditIcon from "@mui/icons-material/Edit"; +import DeleteIcon from "@mui/icons-material/DeleteForever"; import EmptyState from "components/EmptyState"; import { extensionTypes, IExtension, IExtensionType } from "./utils"; diff --git a/src/components/Table/TableHeader/Extensions/ExtensionMigration.tsx b/src/components/Table/TableHeader/Extensions/ExtensionMigration.tsx index 2e5816ee..e8476b74 100644 --- a/src/components/Table/TableHeader/Extensions/ExtensionMigration.tsx +++ b/src/components/Table/TableHeader/Extensions/ExtensionMigration.tsx @@ -1,11 +1,11 @@ import { useState } from "react"; import firebase from "firebase/app"; -import { Button, Link, Typography } from "@material-ui/core"; -import LoadingButton from "@material-ui/lab/LoadingButton"; -import DownloadIcon from "@material-ui/icons/FileDownloadOutlined"; -import OpenInNewIcon from "@material-ui/icons/OpenInNew"; -import GoIcon from "@material-ui/icons/ChevronRight"; +import { Button, Link, Typography } from "@mui/material"; +import LoadingButton from "@mui/lab/LoadingButton"; +import DownloadIcon from "@mui/icons-material/FileDownloadOutlined"; +import OpenInNewIcon from "@mui/icons-material/OpenInNew"; +import GoIcon from "@mui/icons-material/ChevronRight"; import Modal from "components/Modal"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/Table/TableHeader/Extensions/ExtensionModal.tsx b/src/components/Table/TableHeader/Extensions/ExtensionModal.tsx index f20efb90..f4648cf2 100644 --- a/src/components/Table/TableHeader/Extensions/ExtensionModal.tsx +++ b/src/components/Table/TableHeader/Extensions/ExtensionModal.tsx @@ -18,12 +18,12 @@ import { Tab, TextField, Typography, -} from "@material-ui/core"; -import TabContext from "@material-ui/lab/TabContext"; -import TabList from "@material-ui/lab/TabList"; -import TabPanel from "@material-ui/lab/TabPanel"; -import AddIcon from "@material-ui/icons/AddBox"; -import DeleteIcon from "@material-ui/icons/RemoveCircle"; +} from "@mui/material"; +import TabContext from "@mui/lab/TabContext"; +import TabList from "@mui/lab/TabList"; +import TabPanel from "@mui/lab/TabPanel"; +import AddIcon from "@mui/icons-material/AddBox"; +import DeleteIcon from "@mui/icons-material/RemoveCircle"; import Modal, { IModalProps } from "components/Modal"; import CodeEditor from "../../editors/CodeEditor"; diff --git a/src/components/Table/TableHeader/Extensions/index.tsx b/src/components/Table/TableHeader/Extensions/index.tsx index de36712b..2028155f 100644 --- a/src/components/Table/TableHeader/Extensions/index.tsx +++ b/src/components/Table/TableHeader/Extensions/index.tsx @@ -3,7 +3,7 @@ import _isEqual from "lodash/isEqual"; import { db } from "../../../../firebase"; import { useSnackbar } from "notistack"; -import { Breadcrumbs, Typography, Button } from "@material-ui/core"; +import { Breadcrumbs, Typography, Button } from "@mui/material"; import TableHeaderButton from "../TableHeaderButton"; import ExtensionIcon from "assets/icons/Extension"; diff --git a/src/components/Table/TableHeader/ImportCsv.tsx b/src/components/Table/TableHeader/ImportCsv.tsx index acd08731..5d5dcc38 100644 --- a/src/components/Table/TableHeader/ImportCsv.tsx +++ b/src/components/Table/TableHeader/ImportCsv.tsx @@ -4,7 +4,7 @@ import parse from "csv-parse"; import { useDropzone } from "react-dropzone"; import { useDebouncedCallback } from "use-debounce"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { Button, Popover, @@ -13,18 +13,18 @@ import { Typography, TextField, FormHelperText, -} from "@material-ui/core"; +} from "@mui/material"; -import Tab from "@material-ui/core/Tab"; -import TabContext from "@material-ui/lab/TabContext"; -import TabList from "@material-ui/lab/TabList"; -import TabPanel from "@material-ui/lab/TabPanel"; +import Tab from "@mui/material/Tab"; +import TabContext from "@mui/lab/TabContext"; +import TabList from "@mui/lab/TabList"; +import TabPanel from "@mui/lab/TabPanel"; import TableHeaderButton from "./TableHeaderButton"; import ImportIcon from "assets/icons/Import"; import FileUploadIcon from "assets/icons/Upload"; -import CheckIcon from "@material-ui/icons/CheckCircle"; +import CheckIcon from "@mui/icons-material/CheckCircle"; import ImportCsvWizard, { IImportCsvWizardProps, diff --git a/src/components/Table/TableHeader/LoadedRowsStatus.tsx b/src/components/Table/TableHeader/LoadedRowsStatus.tsx index bc9c3542..e28484a0 100644 --- a/src/components/Table/TableHeader/LoadedRowsStatus.tsx +++ b/src/components/Table/TableHeader/LoadedRowsStatus.tsx @@ -1,4 +1,4 @@ -import { Tooltip, Typography } from "@material-ui/core"; +import { Tooltip, Typography } from "@mui/material"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/Table/TableHeader/ReExecute.tsx b/src/components/Table/TableHeader/ReExecute.tsx index 733f02f9..d31804ff 100644 --- a/src/components/Table/TableHeader/ReExecute.tsx +++ b/src/components/Table/TableHeader/ReExecute.tsx @@ -1,12 +1,12 @@ import { useState } from "react"; import TableHeaderButton from "./TableHeaderButton"; -import LoopIcon from "@material-ui/icons/Loop"; +import LoopIcon from "@mui/icons-material/Loop"; import { useProjectContext } from "contexts/ProjectContext"; import { db } from "../../../firebase"; import { isCollectionGroup } from "utils/fns"; -import CircularProgress from "@material-ui/core/CircularProgress"; +import CircularProgress from "@mui/material/CircularProgress"; import Modal from "components/Modal"; diff --git a/src/components/Table/TableHeader/RowHeight.tsx b/src/components/Table/TableHeader/RowHeight.tsx index f81bff43..d4670567 100644 --- a/src/components/Table/TableHeader/RowHeight.tsx +++ b/src/components/Table/TableHeader/RowHeight.tsx @@ -5,7 +5,7 @@ import { TextField, ListSubheader, MenuItem, -} from "@material-ui/core"; +} from "@mui/material"; import RowHeightIcon from "assets/icons/RowHeight"; import TableHeaderButton from "./TableHeaderButton"; diff --git a/src/components/Table/TableHeader/TableHeaderButton.tsx b/src/components/Table/TableHeader/TableHeaderButton.tsx index 4bf28341..6733f740 100644 --- a/src/components/Table/TableHeader/TableHeaderButton.tsx +++ b/src/components/Table/TableHeader/TableHeaderButton.tsx @@ -1,5 +1,5 @@ import { forwardRef } from "react"; -import { Tooltip, Button, ButtonProps } from "@material-ui/core"; +import { Tooltip, Button, ButtonProps } from "@mui/material"; export interface ITableHeaderButtonProps extends Partial { title: string; diff --git a/src/components/Table/TableHeader/TableLogs.tsx b/src/components/Table/TableHeader/TableLogs.tsx index f235e350..e570049c 100644 --- a/src/components/Table/TableHeader/TableLogs.tsx +++ b/src/components/Table/TableHeader/TableLogs.tsx @@ -21,16 +21,16 @@ import { Tab, IconButton, Button, -} from "@material-ui/core"; +} from "@mui/material"; import Modal from "components/Modal"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import LogsIcon from "assets/icons/CloudLogs"; -import SuccessIcon from "@material-ui/icons/CheckCircle"; -import FailIcon from "@material-ui/icons/Cancel"; -import ExpandIcon from "@material-ui/icons/ExpandLess"; -import CollapseIcon from "@material-ui/icons/ExpandMore"; -import OpenIcon from "@material-ui/icons/OpenInNew"; -import CloseIcon from "@material-ui/icons/Close"; +import SuccessIcon from "@mui/icons-material/CheckCircle"; +import FailIcon from "@mui/icons-material/Cancel"; +import ExpandIcon from "@mui/icons-material/ExpandLess"; +import CollapseIcon from "@mui/icons-material/ExpandMore"; +import OpenIcon from "@mui/icons-material/OpenInNew"; +import CloseIcon from "@mui/icons-material/Close"; import TableHeaderButton from "./TableHeaderButton"; import Ansi from "ansi-to-react"; import EmptyState from "components/EmptyState"; diff --git a/src/components/Table/TableHeader/TableSettings.tsx b/src/components/Table/TableHeader/TableSettings.tsx index 61895f4a..05005c2f 100644 --- a/src/components/Table/TableHeader/TableSettings.tsx +++ b/src/components/Table/TableHeader/TableSettings.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import _find from "lodash/find"; import TableHeaderButton from "./TableHeaderButton"; -import SettingsIcon from "@material-ui/icons/SettingsOutlined"; +import SettingsIcon from "@mui/icons-material/SettingsOutlined"; import TableSettingsDialog, { TableSettingsDialogModes, diff --git a/src/components/Table/TableHeader/index.tsx b/src/components/Table/TableHeader/index.tsx index 702ea22a..530a11b2 100644 --- a/src/components/Table/TableHeader/index.tsx +++ b/src/components/Table/TableHeader/index.tsx @@ -1,4 +1,4 @@ -import { Stack, Button } from "@material-ui/core"; +import { Stack, Button } from "@mui/material"; import { isCollectionGroup } from "utils/fns"; import AddRowIcon from "assets/icons/AddRow"; diff --git a/src/components/Table/editors/CodeEditor.tsx b/src/components/Table/editors/CodeEditor.tsx index 47d2b71d..5b63a717 100644 --- a/src/components/Table/editors/CodeEditor.tsx +++ b/src/components/Table/editors/CodeEditor.tsx @@ -1,6 +1,6 @@ import { useRef, useMemo, useState } from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { useTheme } from "@material-ui/core/styles"; +import { makeStyles, createStyles } from "@mui/styles"; +import { useTheme } from "@mui/material/styles"; import Editor, { useMonaco } from "@monaco-editor/react"; import { useProjectContext } from "contexts/ProjectContext"; import { FieldType } from "constants/fields"; diff --git a/src/components/Table/editors/NullEditor.tsx b/src/components/Table/editors/NullEditor.tsx index 3ec5954b..9a9c3ebc 100644 --- a/src/components/Table/editors/NullEditor.tsx +++ b/src/components/Table/editors/NullEditor.tsx @@ -2,7 +2,7 @@ import React from "react"; import { EditorProps } from "react-data-grid"; // import _findIndex from "lodash/findIndex"; -import { withStyles, WithStyles } from "@material-ui/styles"; +import { withStyles, WithStyles } from "@mui/styles"; import styles from "./styles"; /** diff --git a/src/components/Table/editors/TextEditor.tsx b/src/components/Table/editors/TextEditor.tsx index 19f8c9a7..ddf68d18 100644 --- a/src/components/Table/editors/TextEditor.tsx +++ b/src/components/Table/editors/TextEditor.tsx @@ -1,8 +1,8 @@ import { useRef, useLayoutEffect } from "react"; import { EditorProps } from "react-data-grid"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { TextField } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { TextField } from "@mui/material"; import { FieldType } from "constants/fields"; import { getCellValue } from "utils/fns"; diff --git a/src/components/Table/editors/styles.ts b/src/components/Table/editors/styles.ts index ea265fd2..0eb31315 100644 --- a/src/components/Table/editors/styles.ts +++ b/src/components/Table/editors/styles.ts @@ -1,4 +1,4 @@ -import { createStyles } from "@material-ui/core"; +import { createStyles } from "@mui/material"; export const styles = createStyles({ "@global": { diff --git a/src/components/Table/formatters/FinalColumn.tsx b/src/components/Table/formatters/FinalColumn.tsx index bd4f4bf2..3074cc27 100644 --- a/src/components/Table/formatters/FinalColumn.tsx +++ b/src/components/Table/formatters/FinalColumn.tsx @@ -1,9 +1,9 @@ import { FormatterProps } from "react-data-grid"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Stack, Tooltip, IconButton, alpha } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Stack, Tooltip, IconButton, alpha } from "@mui/material"; import CopyCellsIcon from "assets/icons/CopyCells"; -import DeleteIcon from "@material-ui/icons/DeleteOutlined"; +import DeleteIcon from "@mui/icons-material/DeleteOutlined"; import { useConfirmation } from "components/ConfirmationDialog/Context"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/Table/styles.ts b/src/components/Table/styles.ts index b27a3934..7cefa71d 100644 --- a/src/components/Table/styles.ts +++ b/src/components/Table/styles.ts @@ -1,5 +1,5 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; -import { alpha, darken, lighten } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { alpha, darken, lighten } from "@mui/material"; import { APP_BAR_HEIGHT } from "components/Navigation"; import { DRAWER_COLLAPSED_WIDTH } from "components/SideDrawer"; @@ -60,7 +60,7 @@ export const useStyles = makeStyles((theme) => "--checkbox-disabled-background-color": "#ddd", "--selection-color": theme.palette.primary.main, "--font-size": "0.75rem", - "--cell-padding": theme.spacing(0, 1.5), + "--cell-padding": theme.spacing(0, 1.25), border: "none", backgroundColor: "transparent", diff --git a/src/components/TableSettings/form.tsx b/src/components/TableSettings/form.tsx index a3b439f5..847e4204 100644 --- a/src/components/TableSettings/form.tsx +++ b/src/components/TableSettings/form.tsx @@ -1,8 +1,8 @@ -import { Field, FieldType } from "@antlerengineering/form-builder"; +import { Field, FieldType } from "@rowy/form-builder"; import { TableSettingsDialogModes } from "./index"; -import { Link, Typography } from "@material-ui/core"; -import OpenInNewIcon from "@material-ui/icons/OpenInNew"; +import { Link, Typography } from "@mui/material"; +import OpenInNewIcon from "@mui/icons-material/OpenInNew"; import { projectId } from "../../firebase"; import WIKI_LINKS from "constants/wikiLinks"; import { name } from "@root/package.json"; diff --git a/src/components/TableSettings/index.tsx b/src/components/TableSettings/index.tsx index 7cb08163..ba110d15 100644 --- a/src/components/TableSettings/index.tsx +++ b/src/components/TableSettings/index.tsx @@ -2,12 +2,12 @@ import { useState, useEffect } from "react"; import _camelCase from "lodash/camelCase"; import _find from "lodash/find"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Button, DialogContentText } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Button, DialogContentText } from "@mui/material"; import Confirmation from "components/Confirmation"; -import { FormDialog } from "@antlerengineering/form-builder"; +import { FormDialog } from "@rowy/form-builder"; import { tableSettings } from "./form"; import { useProjectContext, Table } from "contexts/ProjectContext"; diff --git a/src/components/Thumbnail.tsx b/src/components/Thumbnail.tsx index 68d9dd06..2382b8cb 100644 --- a/src/components/Thumbnail.tsx +++ b/src/components/Thumbnail.tsx @@ -2,9 +2,9 @@ import React, { Suspense } from "react"; import clsx from "clsx"; import { useImage } from "react-image"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import Skeleton from "@material-ui/core/Skeleton"; -import BrokenImageIcon from "@material-ui/icons/BrokenImageOutlined"; +import { makeStyles, createStyles } from "@mui/styles"; +import Skeleton from "@mui/material/Skeleton"; +import BrokenImageIcon from "@mui/icons-material/BrokenImageOutlined"; import ErrorBoundary from "./ErrorBoundary"; diff --git a/src/components/Wizards/Cell.tsx b/src/components/Wizards/Cell.tsx index 09fe8014..2eb2f1fe 100644 --- a/src/components/Wizards/Cell.tsx +++ b/src/components/Wizards/Cell.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { FieldType } from "constants/fields"; import { getFieldProp } from "components/fields"; diff --git a/src/components/Wizards/Column.tsx b/src/components/Wizards/Column.tsx index 91cbcbcb..23ad164e 100644 --- a/src/components/Wizards/Column.tsx +++ b/src/components/Wizards/Column.tsx @@ -1,8 +1,8 @@ import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, GridProps, Typography } from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, GridProps, Typography } from "@mui/material"; +import { alpha } from "@mui/material/styles"; import { FieldType } from "constants/fields"; import { getFieldProp } from "components/fields"; diff --git a/src/components/Wizards/FadeList.tsx b/src/components/Wizards/FadeList.tsx index ec2ead28..882262bb 100644 --- a/src/components/Wizards/FadeList.tsx +++ b/src/components/Wizards/FadeList.tsx @@ -1,7 +1,7 @@ import React from "react"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/Wizards/ImportCsvWizard/Step1Columns.tsx b/src/components/Wizards/ImportCsvWizard/Step1Columns.tsx index d6d5bd0c..cb995dbd 100644 --- a/src/components/Wizards/ImportCsvWizard/Step1Columns.tsx +++ b/src/components/Wizards/ImportCsvWizard/Step1Columns.tsx @@ -1,12 +1,12 @@ import { useState } from "react"; -import MultiSelect from "@antlerengineering/multiselect"; +import MultiSelect from "@rowy/multiselect"; import _find from "lodash/find"; import _findIndex from "lodash/findIndex"; import _camel from "lodash/camelCase"; import _sortBy from "lodash/sortBy"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { Grid, Typography, @@ -14,8 +14,8 @@ import { FormControlLabel, Checkbox, Chip, -} from "@material-ui/core"; -import ArrowIcon from "@material-ui/icons/ArrowForward"; +} from "@mui/material"; +import ArrowIcon from "@mui/icons-material/ArrowForward"; import { IStepProps } from "."; import FadeList from "../FadeList"; diff --git a/src/components/Wizards/ImportCsvWizard/Step2NewColumns.tsx b/src/components/Wizards/ImportCsvWizard/Step2NewColumns.tsx index a1cebf74..2d656124 100644 --- a/src/components/Wizards/ImportCsvWizard/Step2NewColumns.tsx +++ b/src/components/Wizards/ImportCsvWizard/Step2NewColumns.tsx @@ -2,9 +2,9 @@ import { useState } from "react"; import _find from "lodash/find"; import { parseJSON } from "date-fns"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, Typography, Divider, ButtonBase } from "@material-ui/core"; -import ChevronRightIcon from "@material-ui/icons/ChevronRight"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, Typography, Divider, ButtonBase } from "@mui/material"; +import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import { IStepProps } from "."; import FadeList from "../FadeList"; diff --git a/src/components/Wizards/ImportCsvWizard/Step3Preview.tsx b/src/components/Wizards/ImportCsvWizard/Step3Preview.tsx index dc08e050..7ab2353b 100644 --- a/src/components/Wizards/ImportCsvWizard/Step3Preview.tsx +++ b/src/components/Wizards/ImportCsvWizard/Step3Preview.tsx @@ -1,8 +1,8 @@ import { ScrollSync, ScrollSyncPane } from "react-scroll-sync"; import _find from "lodash/find"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid } from "@mui/material"; import { IStepProps } from "."; import Column from "../Column"; diff --git a/src/components/Wizards/ImportCsvWizard/index.tsx b/src/components/Wizards/ImportCsvWizard/index.tsx index f3864406..13656993 100644 --- a/src/components/Wizards/ImportCsvWizard/index.tsx +++ b/src/components/Wizards/ImportCsvWizard/index.tsx @@ -3,9 +3,9 @@ import { useSnackbar } from "notistack"; import _mergeWith from "lodash/mergeWith"; import _find from "lodash/find"; -import { useTheme, useMediaQuery, Typography, Link } from "@material-ui/core"; -import Alert from "@material-ui/core/Alert"; -import AlertTitle from "@material-ui/core/AlertTitle"; +import { useTheme, useMediaQuery, Typography, Link } from "@mui/material"; +import Alert from "@mui/material/Alert"; +import AlertTitle from "@mui/material/AlertTitle"; import WizardDialog from "../WizardDialog"; import Step1Columns from "./Step1Columns"; diff --git a/src/components/Wizards/ImportWizard/Step1Columns.tsx b/src/components/Wizards/ImportWizard/Step1Columns.tsx index ce1ed978..e5188d30 100644 --- a/src/components/Wizards/ImportWizard/Step1Columns.tsx +++ b/src/components/Wizards/ImportWizard/Step1Columns.tsx @@ -8,15 +8,15 @@ import { import _sortBy from "lodash/sortBy"; import _startCase from "lodash/startCase"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { Grid, Typography, Divider, FormControlLabel, Checkbox, -} from "@material-ui/core"; -import DragHandleIcon from "@material-ui/icons/DragHandle"; +} from "@mui/material"; +import DragHandleIcon from "@mui/icons-material/DragHandle"; import { IStepProps } from "."; import FadeList from "../FadeList"; diff --git a/src/components/Wizards/ImportWizard/Step2Rename.tsx b/src/components/Wizards/ImportWizard/Step2Rename.tsx index 15de3079..5c3ba31d 100644 --- a/src/components/Wizards/ImportWizard/Step2Rename.tsx +++ b/src/components/Wizards/ImportWizard/Step2Rename.tsx @@ -1,6 +1,6 @@ import { useState } from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { Grid, Typography, @@ -9,9 +9,9 @@ import { ButtonBase, TextField, InputAdornment, -} from "@material-ui/core"; -import EditIcon from "@material-ui/icons/Edit"; -import DoneIcon from "@material-ui/icons/Done"; +} from "@mui/material"; +import EditIcon from "@mui/icons-material/Edit"; +import DoneIcon from "@mui/icons-material/Done"; import { IStepProps } from "."; import FadeList from "../FadeList"; diff --git a/src/components/Wizards/ImportWizard/Step3Types.tsx b/src/components/Wizards/ImportWizard/Step3Types.tsx index 41fa7696..c2ec88a8 100644 --- a/src/components/Wizards/ImportWizard/Step3Types.tsx +++ b/src/components/Wizards/ImportWizard/Step3Types.tsx @@ -1,8 +1,8 @@ import { useState } from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, Typography, Divider, ButtonBase } from "@material-ui/core"; -import ChevronRightIcon from "@material-ui/icons/ChevronRight"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, Typography, Divider, ButtonBase } from "@mui/material"; +import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import { IStepProps } from "."; import FadeList from "../FadeList"; diff --git a/src/components/Wizards/ImportWizard/Step4Preview.tsx b/src/components/Wizards/ImportWizard/Step4Preview.tsx index 7bbc1c5a..39a14598 100644 --- a/src/components/Wizards/ImportWizard/Step4Preview.tsx +++ b/src/components/Wizards/ImportWizard/Step4Preview.tsx @@ -1,7 +1,7 @@ import { ScrollSync, ScrollSyncPane } from "react-scroll-sync"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid } from "@mui/material"; import { IStepProps } from "."; import Column from "../Column"; diff --git a/src/components/Wizards/ImportWizard/index.tsx b/src/components/Wizards/ImportWizard/index.tsx index 7e8abca0..95c05a3c 100644 --- a/src/components/Wizards/ImportWizard/index.tsx +++ b/src/components/Wizards/ImportWizard/index.tsx @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import _merge from "lodash/merge"; -import { useTheme, useMediaQuery, Typography } from "@material-ui/core"; +import { useTheme, useMediaQuery, Typography } from "@mui/material"; import WizardDialog from "../WizardDialog"; import Step1Columns from "./Step1Columns"; diff --git a/src/components/Wizards/WizardDialog.tsx b/src/components/Wizards/WizardDialog.tsx index babe5bb8..5e4b4670 100644 --- a/src/components/Wizards/WizardDialog.tsx +++ b/src/components/Wizards/WizardDialog.tsx @@ -1,7 +1,7 @@ import React, { useState } from "react"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { useTheme, useMediaQuery, @@ -14,11 +14,11 @@ import { MobileStepper, DialogContent, Button, -} from "@material-ui/core"; -import { alpha } from "@material-ui/core/styles"; -import CloseIcon from "@material-ui/icons/Close"; -import ChevronRightIcon from "@material-ui/icons/ChevronRight"; -import ChevronLeftIcon from "@material-ui/icons/ChevronLeft"; +} from "@mui/material"; +import { alpha } from "@mui/material/styles"; +import CloseIcon from "@mui/icons-material/Close"; +import ChevronRightIcon from "@mui/icons-material/ChevronRight"; +import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"; import { SlideTransitionMui } from "components/Modal/SlideTransition"; diff --git a/src/components/fields/Action/ActionFab.tsx b/src/components/fields/Action/ActionFab.tsx index db9eb782..0ada75fc 100644 --- a/src/components/fields/Action/ActionFab.tsx +++ b/src/components/fields/Action/ActionFab.tsx @@ -2,10 +2,10 @@ import { useState } from "react"; import _get from "lodash/get"; import { useSnackbar } from "notistack"; -import { Fab, FabProps, CircularProgress } from "@material-ui/core"; -import PlayIcon from "@material-ui/icons/PlayArrow"; -import RefreshIcon from "@material-ui/icons/Refresh"; -import UndoIcon from "@material-ui/icons/Undo"; +import { Fab, FabProps, CircularProgress } from "@mui/material"; +import PlayIcon from "@mui/icons-material/PlayArrow"; +import RefreshIcon from "@mui/icons-material/Refresh"; +import UndoIcon from "@mui/icons-material/Undo"; import { useProjectContext } from "contexts/ProjectContext"; import { cloudFunction } from "firebase/callables"; diff --git a/src/components/fields/Action/FormDialog/Dialog.tsx b/src/components/fields/Action/FormDialog/Dialog.tsx index d942a32d..19ee5c85 100644 --- a/src/components/fields/Action/FormDialog/Dialog.tsx +++ b/src/components/fields/Action/FormDialog/Dialog.tsx @@ -1,6 +1,6 @@ import * as yup from "yup"; -import { FormDialog } from "@antlerengineering/form-builder"; +import { FormDialog } from "@rowy/form-builder"; const yupReducer = (validationConfig) => (acc, currKey) => { if (validationConfig[currKey] !== null) { diff --git a/src/components/fields/Action/Settings.tsx b/src/components/fields/Action/Settings.tsx index 8ffbea08..895c3ce6 100644 --- a/src/components/fields/Action/Settings.tsx +++ b/src/components/fields/Action/Settings.tsx @@ -5,8 +5,8 @@ import { Switch, FormControlLabel, Divider, -} from "@material-ui/core"; -import MultiSelect from "@antlerengineering/multiselect"; +} from "@mui/material"; +import MultiSelect from "@rowy/multiselect"; import FieldSkeleton from "components/SideDrawer/Form/FieldSkeleton"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/fields/Action/SideDrawerField.tsx b/src/components/fields/Action/SideDrawerField.tsx index 186fcc1d..8d8cdcf4 100644 --- a/src/components/fields/Action/SideDrawerField.tsx +++ b/src/components/fields/Action/SideDrawerField.tsx @@ -1,8 +1,8 @@ import { Controller, useWatch } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, Link } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, Link } from "@mui/material"; import ActionFab from "./ActionFab"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; diff --git a/src/components/fields/Action/TableCell.tsx b/src/components/fields/Action/TableCell.tsx index e83adaa2..d50c5da1 100644 --- a/src/components/fields/Action/TableCell.tsx +++ b/src/components/fields/Action/TableCell.tsx @@ -1,8 +1,8 @@ import { IHeavyCellProps } from "../types"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid } from "@mui/material"; import ActionFab from "./ActionFab"; import { sanitiseCallableName, isUrl } from "utils/fns"; diff --git a/src/components/fields/Action/index.tsx b/src/components/fields/Action/index.tsx index 96c1f88e..8496d55e 100644 --- a/src/components/fields/Action/index.tsx +++ b/src/components/fields/Action/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import ActionIcon from "@material-ui/icons/TouchAppOutlined"; +import ActionIcon from "@mui/icons-material/TouchAppOutlined"; import BasicCell from "./BasicCell"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Aggregate/Settings.tsx b/src/components/fields/Aggregate/Settings.tsx index ec2e8ada..f739c940 100644 --- a/src/components/fields/Aggregate/Settings.tsx +++ b/src/components/fields/Aggregate/Settings.tsx @@ -1,6 +1,6 @@ import { lazy, Suspense } from "react"; -import { Typography } from "@material-ui/core"; -import MultiSelect from "@antlerengineering/multiselect"; +import { Typography } from "@mui/material"; +import MultiSelect from "@rowy/multiselect"; import FieldSkeleton from "components/SideDrawer/Form/FieldSkeleton"; import { FieldType } from "constants/fields"; import FieldsDropdown from "components/Table/ColumnMenu/FieldsDropdown"; diff --git a/src/components/fields/Aggregate/index.tsx b/src/components/fields/Aggregate/index.tsx index 5220e558..ddbb4c22 100644 --- a/src/components/fields/Aggregate/index.tsx +++ b/src/components/fields/Aggregate/index.tsx @@ -1,7 +1,7 @@ import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import AggregateIcon from "@material-ui/icons/LayersOutlined"; +import AggregateIcon from "@mui/icons-material/LayersOutlined"; import BasicCell from "../_BasicCell/BasicCellNull"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Checkbox/SideDrawerField.tsx b/src/components/fields/Checkbox/SideDrawerField.tsx index 9dba3fd9..240cb2f6 100644 --- a/src/components/fields/Checkbox/SideDrawerField.tsx +++ b/src/components/fields/Checkbox/SideDrawerField.tsx @@ -2,8 +2,8 @@ import clsx from "clsx"; import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { ButtonBase, FormControlLabel, Switch } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { ButtonBase, FormControlLabel, Switch } from "@mui/material"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; diff --git a/src/components/fields/Checkbox/TableCell.tsx b/src/components/fields/Checkbox/TableCell.tsx index afd4d757..dccc33db 100644 --- a/src/components/fields/Checkbox/TableCell.tsx +++ b/src/components/fields/Checkbox/TableCell.tsx @@ -1,8 +1,8 @@ import { IHeavyCellProps } from "../types"; import _get from "lodash/get"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { FormControlLabel, Switch } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { FormControlLabel, Switch } from "@mui/material"; import Confirmation from "components/Confirmation"; diff --git a/src/components/fields/Checkbox/index.tsx b/src/components/fields/Checkbox/index.tsx index 1d21a676..570f412c 100644 --- a/src/components/fields/Checkbox/index.tsx +++ b/src/components/fields/Checkbox/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import CheckboxIcon from "@material-ui/icons/ToggleOnOutlined"; +import CheckboxIcon from "@mui/icons-material/ToggleOnOutlined"; import BasicCell from "../_BasicCell/BasicCellName"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Code/BasicCell.tsx b/src/components/fields/Code/BasicCell.tsx index 70ee4d6e..b37e6c50 100644 --- a/src/components/fields/Code/BasicCell.tsx +++ b/src/components/fields/Code/BasicCell.tsx @@ -1,6 +1,6 @@ import { IBasicCellProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export default function Code({ value }: IBasicCellProps) { const theme = useTheme(); diff --git a/src/components/fields/Code/SideDrawerField.tsx b/src/components/fields/Code/SideDrawerField.tsx index d018125d..67e9e571 100644 --- a/src/components/fields/Code/SideDrawerField.tsx +++ b/src/components/fields/Code/SideDrawerField.tsx @@ -2,7 +2,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; import CodeEditor from "components/CodeEditor"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/Code/index.tsx b/src/components/fields/Code/index.tsx index d373f37e..63f121fb 100644 --- a/src/components/fields/Code/index.tsx +++ b/src/components/fields/Code/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import CodeIcon from "@material-ui/icons/Code"; +import CodeIcon from "@mui/icons-material/Code"; import BasicCell from "./BasicCell"; import withSideDrawerEditor from "components/Table/editors/withSideDrawerEditor"; diff --git a/src/components/fields/Color/InlineCell.tsx b/src/components/fields/Color/InlineCell.tsx index 4109e95b..e1813c96 100644 --- a/src/components/fields/Color/InlineCell.tsx +++ b/src/components/fields/Color/InlineCell.tsx @@ -2,8 +2,8 @@ import React from "react"; import clsx from "clsx"; import { IPopoverInlineCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, ButtonBase } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, ButtonBase } from "@mui/material"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/Color/SideDrawerField.tsx b/src/components/fields/Color/SideDrawerField.tsx index c42ee895..b93e2ebd 100644 --- a/src/components/fields/Color/SideDrawerField.tsx +++ b/src/components/fields/Color/SideDrawerField.tsx @@ -3,8 +3,8 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; import { ChromePicker } from "react-color"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, ButtonBase, Typography, Collapse } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, ButtonBase, Typography, Collapse } from "@mui/material"; // import { useFieldStyles } from "components/SideDrawer/Form/utils"; diff --git a/src/components/fields/Color/index.tsx b/src/components/fields/Color/index.tsx index de8d3607..14ce4c3f 100644 --- a/src/components/fields/Color/index.tsx +++ b/src/components/fields/Color/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withPopoverCell from "../_withTableCell/withPopoverCell"; -import ColorIcon from "@material-ui/icons/Colorize"; +import ColorIcon from "@mui/icons-material/Colorize"; import BasicCell from "../_BasicCell/BasicCellNull"; import InlineCell from "./InlineCell"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/ConnectService/ConnectServiceSelect/PopupContents.tsx b/src/components/fields/ConnectService/ConnectServiceSelect/PopupContents.tsx index 368eca79..cd42447b 100644 --- a/src/components/fields/ConnectService/ConnectServiceSelect/PopupContents.tsx +++ b/src/components/fields/ConnectService/ConnectServiceSelect/PopupContents.tsx @@ -16,8 +16,8 @@ import { TextField, Typography, Radio, -} from "@material-ui/core"; -import SearchIcon from "@material-ui/icons/Search"; +} from "@mui/material"; +import SearchIcon from "@mui/icons-material/Search"; import { IConnectServiceSelectProps } from "."; import useStyles from "./styles"; diff --git a/src/components/fields/ConnectService/ConnectServiceSelect/index.tsx b/src/components/fields/ConnectService/ConnectServiceSelect/index.tsx index f3351f68..39ed05ef 100644 --- a/src/components/fields/ConnectService/ConnectServiceSelect/index.tsx +++ b/src/components/fields/ConnectService/ConnectServiceSelect/index.tsx @@ -1,7 +1,7 @@ import { Suspense } from "react"; import clsx from "clsx"; -import { TextField, TextFieldProps } from "@material-ui/core"; +import { TextField, TextFieldProps } from "@mui/material"; import useStyles from "./styles"; import Loading from "components/Loading"; diff --git a/src/components/fields/ConnectService/ConnectServiceSelect/styles.ts b/src/components/fields/ConnectService/ConnectServiceSelect/styles.ts index 251f1431..72b9b4cd 100644 --- a/src/components/fields/ConnectService/ConnectServiceSelect/styles.ts +++ b/src/components/fields/ConnectService/ConnectServiceSelect/styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; export const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/ConnectService/InlineCell.tsx b/src/components/fields/ConnectService/InlineCell.tsx index 5bc6ac64..b49e346c 100644 --- a/src/components/fields/ConnectService/InlineCell.tsx +++ b/src/components/fields/ConnectService/InlineCell.tsx @@ -2,9 +2,9 @@ import React from "react"; import clsx from "clsx"; import { IPopoverInlineCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { ButtonBase, Grid, Chip } from "@material-ui/core"; -import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; +import { makeStyles, createStyles } from "@mui/styles"; +import { ButtonBase, Grid, Chip } from "@mui/material"; +import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/ConnectService/Settings.tsx b/src/components/fields/ConnectService/Settings.tsx index 044d82e8..95276d0c 100644 --- a/src/components/fields/ConnectService/Settings.tsx +++ b/src/components/fields/ConnectService/Settings.tsx @@ -1,4 +1,4 @@ -import { TextField, FormControlLabel, Switch } from "@material-ui/core"; +import { TextField, FormControlLabel, Switch } from "@mui/material"; export default function Settings({ config, handleChange }) { return ( diff --git a/src/components/fields/ConnectService/SideDrawerField.tsx b/src/components/fields/ConnectService/SideDrawerField.tsx index e08f0dd7..3b91ecb0 100644 --- a/src/components/fields/ConnectService/SideDrawerField.tsx +++ b/src/components/fields/ConnectService/SideDrawerField.tsx @@ -2,7 +2,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; import { get } from "lodash"; -import { useTheme, Grid, Chip } from "@material-ui/core"; +import { useTheme, Grid, Chip } from "@mui/material"; import ConnectServiceSelect from "./ConnectServiceSelect"; diff --git a/src/components/fields/ConnectService/index.tsx b/src/components/fields/ConnectService/index.tsx index de773e8d..a6c28e0b 100644 --- a/src/components/fields/ConnectService/index.tsx +++ b/src/components/fields/ConnectService/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withPopoverCell from "../_withTableCell/withPopoverCell"; -import ConnectServiceIcon from "@material-ui/icons/Http"; +import ConnectServiceIcon from "@mui/icons-material/Http"; import BasicCell from "../_BasicCell/BasicCellNull"; import InlineCell from "./InlineCell"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/ConnectTable/ConnectTableSelect.tsx b/src/components/fields/ConnectTable/ConnectTableSelect.tsx index 0adcbec1..98f06fad 100644 --- a/src/components/fields/ConnectTable/ConnectTableSelect.tsx +++ b/src/components/fields/ConnectTable/ConnectTableSelect.tsx @@ -5,7 +5,7 @@ import _find from "lodash/find"; import _get from "lodash/get"; import _pick from "lodash/pick"; -import MultiSelect, { MultiSelectProps } from "@antlerengineering/multiselect"; +import MultiSelect, { MultiSelectProps } from "@rowy/multiselect"; import Loading from "components/Loading"; import { getAlgoliaSearchKey } from "../../../firebase/callables"; import createPersistedState from "use-persisted-state"; diff --git a/src/components/fields/ConnectTable/InlineCell.tsx b/src/components/fields/ConnectTable/InlineCell.tsx index 90c51a5a..d13c4e5c 100644 --- a/src/components/fields/ConnectTable/InlineCell.tsx +++ b/src/components/fields/ConnectTable/InlineCell.tsx @@ -2,9 +2,9 @@ import React from "react"; import clsx from "clsx"; import { IPopoverInlineCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { ButtonBase, Grid, Chip } from "@material-ui/core"; -import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; +import { makeStyles, createStyles } from "@mui/styles"; +import { ButtonBase, Grid, Chip } from "@mui/material"; +import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/ConnectTable/Settings.tsx b/src/components/fields/ConnectTable/Settings.tsx index 9cc7514e..fc0fcbb6 100644 --- a/src/components/fields/ConnectTable/Settings.tsx +++ b/src/components/fields/ConnectTable/Settings.tsx @@ -2,8 +2,8 @@ import { useEffect, useState } from "react"; import { ISettingsProps } from "../types"; import _sortBy from "lodash/sortBy"; -import { TextField } from "@material-ui/core"; -import MultiSelect from "@antlerengineering/multiselect"; +import { TextField } from "@mui/material"; +import MultiSelect from "@rowy/multiselect"; import { FieldType } from "constants/fields"; import { db } from "../../../firebase"; diff --git a/src/components/fields/ConnectTable/SideDrawerField.tsx b/src/components/fields/ConnectTable/SideDrawerField.tsx index b03d653c..e537d59f 100644 --- a/src/components/fields/ConnectTable/SideDrawerField.tsx +++ b/src/components/fields/ConnectTable/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { useTheme, Grid, Chip } from "@material-ui/core"; +import { useTheme, Grid, Chip } from "@mui/material"; import ConnectTableSelect from "./ConnectTableSelect"; diff --git a/src/components/fields/Date/Settings.tsx b/src/components/fields/Date/Settings.tsx index 2ade90cf..d66e6ede 100644 --- a/src/components/fields/Date/Settings.tsx +++ b/src/components/fields/Date/Settings.tsx @@ -1,7 +1,7 @@ import { ISettingsProps } from "../types"; import Subheading from "components/Table/ColumnMenu/Subheading"; -import MultiSelect from "@antlerengineering/multiselect"; +import MultiSelect from "@rowy/multiselect"; import { DATE_FORMAT } from "constants/dates"; export default function Settings({ handleChange, config }: ISettingsProps) { diff --git a/src/components/fields/Date/SideDrawerField.tsx b/src/components/fields/Date/SideDrawerField.tsx index 8998bb8e..112971bf 100644 --- a/src/components/fields/Date/SideDrawerField.tsx +++ b/src/components/fields/Date/SideDrawerField.tsx @@ -1,9 +1,9 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { useTheme } from "@material-ui/core"; -import LocalizationProvider from "@material-ui/lab/LocalizationProvider"; -import AdapterDateFns from "@material-ui/lab/AdapterDateFns"; +import { useTheme } from "@mui/material"; +import LocalizationProvider from "@mui/lab/LocalizationProvider"; +import AdapterDateFns from "@mui/lab/AdapterDateFns"; import { transformValue, sanitizeValue } from "./utils"; diff --git a/src/components/fields/Date/TableCell.tsx b/src/components/fields/Date/TableCell.tsx index 9f098cfb..6dea26d1 100644 --- a/src/components/fields/Date/TableCell.tsx +++ b/src/components/fields/Date/TableCell.tsx @@ -1,8 +1,8 @@ import { IHeavyCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import MobileDatePicker from "@material-ui/lab/MobileDatePicker"; -import { TextField } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import MobileDatePicker from "@mui/lab/MobileDatePicker"; +import { TextField } from "@mui/material"; import { transformValue } from "./utils"; diff --git a/src/components/fields/Date/index.tsx b/src/components/fields/Date/index.tsx index 53e4415b..07950786 100644 --- a/src/components/fields/Date/index.tsx +++ b/src/components/fields/Date/index.tsx @@ -3,7 +3,7 @@ import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; import { parse, format } from "date-fns"; import { DATE_FORMAT } from "constants/dates"; -import DateIcon from "@material-ui/icons/TodayOutlined"; +import DateIcon from "@mui/icons-material/TodayOutlined"; import BasicCell from "./BasicCell"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/DateTime/SideDrawerField.tsx b/src/components/fields/DateTime/SideDrawerField.tsx index c281392c..fd5c1443 100644 --- a/src/components/fields/DateTime/SideDrawerField.tsx +++ b/src/components/fields/DateTime/SideDrawerField.tsx @@ -1,6 +1,6 @@ import { ISideDrawerFieldProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; // import { // KeyboardDateTimePicker, // KeyboardDateTimePickerProps, diff --git a/src/components/fields/DateTime/TableCell.tsx b/src/components/fields/DateTime/TableCell.tsx index 2d03aa4d..d450114d 100644 --- a/src/components/fields/DateTime/TableCell.tsx +++ b/src/components/fields/DateTime/TableCell.tsx @@ -1,6 +1,6 @@ import { IHeavyCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { transformValue } from "../Date/utils"; diff --git a/src/components/fields/DateTime/index.tsx b/src/components/fields/DateTime/index.tsx index 33f286e6..aa94cf2b 100644 --- a/src/components/fields/DateTime/index.tsx +++ b/src/components/fields/DateTime/index.tsx @@ -3,7 +3,7 @@ import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; import { parseJSON } from "date-fns"; -import DateTimeIcon from "@material-ui/icons/AccessTime"; +import DateTimeIcon from "@mui/icons-material/AccessTime"; import BasicCell from "./BasicCell"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Derivative/Settings.tsx b/src/components/fields/Derivative/Settings.tsx index 01fbbe5b..21d67f43 100644 --- a/src/components/fields/Derivative/Settings.tsx +++ b/src/components/fields/Derivative/Settings.tsx @@ -1,6 +1,6 @@ import { lazy, Suspense } from "react"; -import { Typography, Grid } from "@material-ui/core"; -import MultiSelect from "@antlerengineering/multiselect"; +import { Typography, Grid } from "@mui/material"; +import MultiSelect from "@rowy/multiselect"; import FieldSkeleton from "components/SideDrawer/Form/FieldSkeleton"; import { FieldType } from "constants/fields"; import FieldsDropdown from "components/Table/ColumnMenu/FieldsDropdown"; diff --git a/src/components/fields/Duration/index.tsx b/src/components/fields/Duration/index.tsx index cb592f68..b067ee4d 100644 --- a/src/components/fields/Duration/index.tsx +++ b/src/components/fields/Duration/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import DurationIcon from "@material-ui/icons/Timer"; +import DurationIcon from "@mui/icons-material/Timer"; import BasicCell from "../_BasicCell/BasicCellNull"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Email/SideDrawerField.tsx b/src/components/fields/Email/SideDrawerField.tsx index 858aceaf..e6a97652 100644 --- a/src/components/fields/Email/SideDrawerField.tsx +++ b/src/components/fields/Email/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; export default function Email({ control, diff --git a/src/components/fields/Email/index.tsx b/src/components/fields/Email/index.tsx index 392f699d..bd18d781 100644 --- a/src/components/fields/Email/index.tsx +++ b/src/components/fields/Email/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import EmailIcon from "@material-ui/icons/MailOutlined"; +import EmailIcon from "@mui/icons-material/MailOutlined"; import BasicCell from "../_BasicCell/BasicCellValue"; import TextEditor from "components/Table/editors/TextEditor"; diff --git a/src/components/fields/File/SideDrawerField.tsx b/src/components/fields/File/SideDrawerField.tsx index c010004b..8031eaaf 100644 --- a/src/components/fields/File/SideDrawerField.tsx +++ b/src/components/fields/File/SideDrawerField.tsx @@ -7,7 +7,7 @@ import { format } from "date-fns"; import { useDropzone } from "react-dropzone"; import useUploader, { FileValue } from "hooks/useTable/useUploader"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { alpha, ButtonBase, @@ -16,7 +16,7 @@ import { Tooltip, Chip, CircularProgress, -} from "@material-ui/core"; +} from "@mui/material"; import UploadIcon from "assets/icons/Upload"; import { FileIcon } from "."; diff --git a/src/components/fields/File/TableCell.tsx b/src/components/fields/File/TableCell.tsx index cec48189..34b80485 100644 --- a/src/components/fields/File/TableCell.tsx +++ b/src/components/fields/File/TableCell.tsx @@ -6,7 +6,7 @@ import _findIndex from "lodash/findIndex"; import clsx from "clsx"; import { format } from "date-fns"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { alpha, Stack, @@ -15,7 +15,7 @@ import { Chip, IconButton, CircularProgress, -} from "@material-ui/core"; +} from "@mui/material"; import UploadIcon from "assets/icons/Upload"; import { useConfirmation } from "components/ConfirmationDialog"; diff --git a/src/components/fields/File/index.tsx b/src/components/fields/File/index.tsx index bb30651a..2bdedfed 100644 --- a/src/components/fields/File/index.tsx +++ b/src/components/fields/File/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import FileIcon from "@material-ui/icons/AttachFile"; +import FileIcon from "@mui/icons-material/AttachFile"; import BasicCell from "../_BasicCell/BasicCellNull"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Id/SideDrawerField.tsx b/src/components/fields/Id/SideDrawerField.tsx index bf79cd89..2acd3514 100644 --- a/src/components/fields/Id/SideDrawerField.tsx +++ b/src/components/fields/Id/SideDrawerField.tsx @@ -1,6 +1,6 @@ import { ISideDrawerFieldProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; export default function Id({ docRef }: ISideDrawerFieldProps) { diff --git a/src/components/fields/Id/TableCell.tsx b/src/components/fields/Id/TableCell.tsx index ac975d75..8611b6f0 100644 --- a/src/components/fields/Id/TableCell.tsx +++ b/src/components/fields/Id/TableCell.tsx @@ -1,6 +1,6 @@ import { IHeavyCellProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export default function Id({ docRef }: IHeavyCellProps) { const theme = useTheme(); diff --git a/src/components/fields/Image/SideDrawerField.tsx b/src/components/fields/Image/SideDrawerField.tsx index 2445e3b0..ea0e7ae7 100644 --- a/src/components/fields/Image/SideDrawerField.tsx +++ b/src/components/fields/Image/SideDrawerField.tsx @@ -6,7 +6,7 @@ import { Controller } from "react-hook-form"; import { useDropzone } from "react-dropzone"; import useUploader from "hooks/useTable/useUploader"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { alpha, ButtonBase, @@ -14,11 +14,11 @@ import { Grid, CircularProgress, Tooltip, -} from "@material-ui/core"; +} from "@mui/material"; -import AddIcon from "@material-ui/icons/AddAPhotoOutlined"; -import DeleteIcon from "@material-ui/icons/DeleteOutlined"; -import OpenIcon from "@material-ui/icons/OpenInNewOutlined"; +import AddIcon from "@mui/icons-material/AddAPhotoOutlined"; +import DeleteIcon from "@mui/icons-material/DeleteOutlined"; +import OpenIcon from "@mui/icons-material/OpenInNewOutlined"; import { IMAGE_MIME_TYPES } from "."; import Thumbnail from "components/Thumbnail"; diff --git a/src/components/fields/Image/TableCell.tsx b/src/components/fields/Image/TableCell.tsx index e0a2c68f..3226f991 100644 --- a/src/components/fields/Image/TableCell.tsx +++ b/src/components/fields/Image/TableCell.tsx @@ -5,7 +5,7 @@ import { useDropzone } from "react-dropzone"; import _findIndex from "lodash/findIndex"; import clsx from "clsx"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { alpha, Stack, @@ -14,10 +14,10 @@ import { ButtonBase, CircularProgress, Tooltip, -} from "@material-ui/core"; -import AddIcon from "@material-ui/icons/AddAPhotoOutlined"; -import DeleteIcon from "@material-ui/icons/DeleteOutlined"; -import OpenIcon from "@material-ui/icons/OpenInNewOutlined"; +} from "@mui/material"; +import AddIcon from "@mui/icons-material/AddAPhotoOutlined"; +import DeleteIcon from "@mui/icons-material/DeleteOutlined"; +import OpenIcon from "@mui/icons-material/OpenInNewOutlined"; import { useConfirmation } from "components/ConfirmationDialog"; import useUploader, { FileValue } from "hooks/useTable/useUploader"; diff --git a/src/components/fields/Json/BasicCell.tsx b/src/components/fields/Json/BasicCell.tsx index 3d3ab635..74bc6ba2 100644 --- a/src/components/fields/Json/BasicCell.tsx +++ b/src/components/fields/Json/BasicCell.tsx @@ -1,7 +1,7 @@ import jsonFormat from "json-format"; import { IBasicCellProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export default function Json({ value }: IBasicCellProps) { const theme = useTheme(); diff --git a/src/components/fields/Json/Settings.tsx b/src/components/fields/Json/Settings.tsx index dda39d13..cecf0164 100644 --- a/src/components/fields/Json/Settings.tsx +++ b/src/components/fields/Json/Settings.tsx @@ -1,4 +1,4 @@ -import { Switch, FormControlLabel } from "@material-ui/core"; +import { Switch, FormControlLabel } from "@mui/material"; const Settings = ({ config, handleChange }) => { return ( diff --git a/src/components/fields/Json/SideDrawerField.tsx b/src/components/fields/Json/SideDrawerField.tsx index 50771f49..3cdc5297 100644 --- a/src/components/fields/Json/SideDrawerField.tsx +++ b/src/components/fields/Json/SideDrawerField.tsx @@ -5,8 +5,8 @@ import { ISideDrawerFieldProps } from "../types"; import ReactJson from "react-json-view"; import jsonFormat from "json-format"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { useTheme } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { useTheme } from "@mui/material"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; const isValidJson = (val: any) => { diff --git a/src/components/fields/LongText/BasicCell.tsx b/src/components/fields/LongText/BasicCell.tsx index e27e2b24..172253aa 100644 --- a/src/components/fields/LongText/BasicCell.tsx +++ b/src/components/fields/LongText/BasicCell.tsx @@ -1,6 +1,6 @@ import { IBasicCellProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; export default function LongText({ value }: IBasicCellProps) { const theme = useTheme(); diff --git a/src/components/fields/LongText/SideDrawerField.tsx b/src/components/fields/LongText/SideDrawerField.tsx index ee297422..f57462f2 100644 --- a/src/components/fields/LongText/SideDrawerField.tsx +++ b/src/components/fields/LongText/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; export default function LongText({ control, diff --git a/src/components/fields/LongText/index.tsx b/src/components/fields/LongText/index.tsx index fb7bd1f1..f0058bab 100644 --- a/src/components/fields/LongText/index.tsx +++ b/src/components/fields/LongText/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import LongTextIcon from "@material-ui/icons/Notes"; +import LongTextIcon from "@mui/icons-material/Notes"; import BasicCell from "./BasicCell"; import withSideDrawerEditor from "components/Table/editors/withSideDrawerEditor"; diff --git a/src/components/fields/MultiSelect/ConvertStringToArray.tsx b/src/components/fields/MultiSelect/ConvertStringToArray.tsx index 4046f4de..cb917d73 100644 --- a/src/components/fields/MultiSelect/ConvertStringToArray.tsx +++ b/src/components/fields/MultiSelect/ConvertStringToArray.tsx @@ -1,4 +1,4 @@ -import { Grid, Tooltip, Button } from "@material-ui/core"; +import { Grid, Tooltip, Button } from "@mui/material"; export const ConvertStringToArray = ({ value, onSubmit }) => ( diff --git a/src/components/fields/MultiSelect/InlineCell.tsx b/src/components/fields/MultiSelect/InlineCell.tsx index 2b22af44..ef5495de 100644 --- a/src/components/fields/MultiSelect/InlineCell.tsx +++ b/src/components/fields/MultiSelect/InlineCell.tsx @@ -2,9 +2,9 @@ import React from "react"; import clsx from "clsx"; import { IPopoverInlineCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { ButtonBase, Grid } from "@material-ui/core"; -import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; +import { makeStyles, createStyles } from "@mui/styles"; +import { ButtonBase, Grid } from "@mui/material"; +import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; import { sanitiseValue } from "./utils"; import FormattedChip from "components/FormattedChip"; diff --git a/src/components/fields/MultiSelect/PopoverCell.tsx b/src/components/fields/MultiSelect/PopoverCell.tsx index a64352e0..ad4c0cb4 100644 --- a/src/components/fields/MultiSelect/PopoverCell.tsx +++ b/src/components/fields/MultiSelect/PopoverCell.tsx @@ -1,6 +1,6 @@ import { IPopoverCellProps } from "../types"; -import MultiSelect_ from "@antlerengineering/multiselect"; +import MultiSelect_ from "@rowy/multiselect"; import { sanitiseValue } from "./utils"; diff --git a/src/components/fields/MultiSelect/SideDrawerField.tsx b/src/components/fields/MultiSelect/SideDrawerField.tsx index 04643533..d0ab4e5c 100644 --- a/src/components/fields/MultiSelect/SideDrawerField.tsx +++ b/src/components/fields/MultiSelect/SideDrawerField.tsx @@ -1,8 +1,8 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { useTheme, Grid } from "@material-ui/core"; -import MultiSelect_ from "@antlerengineering/multiselect"; +import { useTheme, Grid } from "@mui/material"; +import MultiSelect_ from "@rowy/multiselect"; import FormattedChip from "components/FormattedChip"; import { sanitiseValue } from "./utils"; diff --git a/src/components/fields/Number/SideDrawerField.tsx b/src/components/fields/Number/SideDrawerField.tsx index 544de117..b965859b 100644 --- a/src/components/fields/Number/SideDrawerField.tsx +++ b/src/components/fields/Number/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; export default function Number_({ control, diff --git a/src/components/fields/Percentage/BasicCell.tsx b/src/components/fields/Percentage/BasicCell.tsx index 0edc7a5e..2fffb3f0 100644 --- a/src/components/fields/Percentage/BasicCell.tsx +++ b/src/components/fields/Percentage/BasicCell.tsx @@ -1,6 +1,6 @@ import { IBasicCellProps } from "../types"; -import { useTheme } from "@material-ui/core"; +import { useTheme } from "@mui/material"; import { resultColorsScale } from "utils/color"; export default function Percentage({ value }: IBasicCellProps) { diff --git a/src/components/fields/Percentage/SideDrawerField.tsx b/src/components/fields/Percentage/SideDrawerField.tsx index 78df5770..111559ab 100644 --- a/src/components/fields/Percentage/SideDrawerField.tsx +++ b/src/components/fields/Percentage/SideDrawerField.tsx @@ -1,9 +1,9 @@ import { Controller, useWatch } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { TextField } from "@material-ui/core"; -import { emphasize } from "@material-ui/core/styles"; +import { makeStyles, createStyles } from "@mui/styles"; +import { TextField } from "@mui/material"; +import { emphasize } from "@mui/material/styles"; import { resultColorsScale } from "utils/color"; const useStyles = makeStyles((theme) => diff --git a/src/components/fields/Phone/SideDrawerField.tsx b/src/components/fields/Phone/SideDrawerField.tsx index f42bb944..7e82d54d 100644 --- a/src/components/fields/Phone/SideDrawerField.tsx +++ b/src/components/fields/Phone/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; export default function Phone({ control, diff --git a/src/components/fields/Phone/index.tsx b/src/components/fields/Phone/index.tsx index 10390b15..1bba638a 100644 --- a/src/components/fields/Phone/index.tsx +++ b/src/components/fields/Phone/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import PhoneIcon from "@material-ui/icons/PhoneOutlined"; +import PhoneIcon from "@mui/icons-material/PhoneOutlined"; import BasicCell from "../_BasicCell/BasicCellValue"; import TextEditor from "components/Table/editors/TextEditor"; diff --git a/src/components/fields/Rating/Settings.tsx b/src/components/fields/Rating/Settings.tsx index 60d623df..d733f3f5 100644 --- a/src/components/fields/Rating/Settings.tsx +++ b/src/components/fields/Rating/Settings.tsx @@ -1,6 +1,6 @@ import { ISettingsProps } from "../types"; -import { Slider } from "@material-ui/core"; +import { Slider } from "@mui/material"; import Subheading from "components/Table/ColumnMenu/Subheading"; export default function Settings({ handleChange, config }: ISettingsProps) { diff --git a/src/components/fields/Rating/SideDrawerField.tsx b/src/components/fields/Rating/SideDrawerField.tsx index 911905c7..18c61a36 100644 --- a/src/components/fields/Rating/SideDrawerField.tsx +++ b/src/components/fields/Rating/SideDrawerField.tsx @@ -1,10 +1,10 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { Grid } from "@material-ui/core"; -import { Rating as MuiRating } from "@material-ui/core"; -import "@material-ui/lab"; -import StarBorderIcon from "@material-ui/icons/StarBorder"; +import { Grid } from "@mui/material"; +import { Rating as MuiRating } from "@mui/material"; +import "@mui/lab"; +import StarBorderIcon from "@mui/icons-material/StarBorder"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; import { useRatingStyles } from "./styles"; diff --git a/src/components/fields/Rating/TableCell.tsx b/src/components/fields/Rating/TableCell.tsx index 68fe4ba4..931c1f0a 100644 --- a/src/components/fields/Rating/TableCell.tsx +++ b/src/components/fields/Rating/TableCell.tsx @@ -1,7 +1,7 @@ import { IHeavyCellProps } from "../types"; -import MuiRating from "@material-ui/core/Rating"; -import StarBorderIcon from "@material-ui/icons/StarBorder"; +import MuiRating from "@mui/material/Rating"; +import StarBorderIcon from "@mui/icons-material/StarBorder"; import { useRatingStyles } from "./styles"; diff --git a/src/components/fields/Rating/index.tsx b/src/components/fields/Rating/index.tsx index 3202fcfa..b4855915 100644 --- a/src/components/fields/Rating/index.tsx +++ b/src/components/fields/Rating/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import RatingIcon from "@material-ui/icons/StarBorder"; +import RatingIcon from "@mui/icons-material/StarBorder"; import BasicCell from "../_BasicCell/BasicCellNull"; import NullEditor from "components/Table/editors/NullEditor"; diff --git a/src/components/fields/Rating/styles.ts b/src/components/fields/Rating/styles.ts index 4ec6cb89..2878a64b 100644 --- a/src/components/fields/Rating/styles.ts +++ b/src/components/fields/Rating/styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; export const useRatingStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/RichText/TableCell.tsx b/src/components/fields/RichText/TableCell.tsx index c9f861ae..ad55d057 100644 --- a/src/components/fields/RichText/TableCell.tsx +++ b/src/components/fields/RichText/TableCell.tsx @@ -1,7 +1,7 @@ import { IHeavyCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Tooltip, Fade } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Tooltip, Fade } from "@mui/material"; import { useProjectContext } from "contexts/ProjectContext"; import RenderedHtml from "components/RenderedHtml"; diff --git a/src/components/fields/RichText/index.tsx b/src/components/fields/RichText/index.tsx index da2f29d3..ffe93e9e 100644 --- a/src/components/fields/RichText/index.tsx +++ b/src/components/fields/RichText/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import RichTextIcon from "@material-ui/icons/TextFormat"; +import RichTextIcon from "@mui/icons-material/TextFormat"; import BasicCell from "../_BasicCell/BasicCellNull"; import withSideDrawerEditor from "components/Table/editors/withSideDrawerEditor"; diff --git a/src/components/fields/ShortText/Settings.tsx b/src/components/fields/ShortText/Settings.tsx index 8864c49c..385f6e58 100644 --- a/src/components/fields/ShortText/Settings.tsx +++ b/src/components/fields/ShortText/Settings.tsx @@ -1,4 +1,4 @@ -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; import Subheading from "components/Table/ColumnMenu/Subheading"; export default function Settings({ handleChange, config }) { diff --git a/src/components/fields/ShortText/SideDrawerField.tsx b/src/components/fields/ShortText/SideDrawerField.tsx index 7d79756a..b27b9a36 100644 --- a/src/components/fields/ShortText/SideDrawerField.tsx +++ b/src/components/fields/ShortText/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { TextField } from "@material-ui/core"; +import { TextField } from "@mui/material"; export default function ShortText({ control, diff --git a/src/components/fields/ShortText/index.tsx b/src/components/fields/ShortText/index.tsx index 9e146a31..8a4d212d 100644 --- a/src/components/fields/ShortText/index.tsx +++ b/src/components/fields/ShortText/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import ShortTextIcon from "@material-ui/icons/ShortText"; +import ShortTextIcon from "@mui/icons-material/ShortText"; import BasicCell from "../_BasicCell/BasicCellValue"; import TextEditor from "components/Table/editors/TextEditor"; diff --git a/src/components/fields/SingleSelect/InlineCell.tsx b/src/components/fields/SingleSelect/InlineCell.tsx index dd31b5aa..875168c4 100644 --- a/src/components/fields/SingleSelect/InlineCell.tsx +++ b/src/components/fields/SingleSelect/InlineCell.tsx @@ -2,9 +2,9 @@ import React from "react"; import clsx from "clsx"; import { IPopoverInlineCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { ButtonBase } from "@material-ui/core"; -import ArrowDropDownIcon from "@material-ui/icons/ArrowDropDown"; +import { makeStyles, createStyles } from "@mui/styles"; +import { ButtonBase } from "@mui/material"; +import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; import { sanitiseValue } from "./utils"; diff --git a/src/components/fields/SingleSelect/PopoverCell.tsx b/src/components/fields/SingleSelect/PopoverCell.tsx index 78b6cd09..228cabec 100644 --- a/src/components/fields/SingleSelect/PopoverCell.tsx +++ b/src/components/fields/SingleSelect/PopoverCell.tsx @@ -1,6 +1,6 @@ import { IPopoverCellProps } from "../types"; -import MultiSelect_ from "@antlerengineering/multiselect"; +import MultiSelect_ from "@rowy/multiselect"; import { sanitiseValue } from "./utils"; diff --git a/src/components/fields/SingleSelect/Settings.tsx b/src/components/fields/SingleSelect/Settings.tsx index 79546c3d..3bc65380 100644 --- a/src/components/fields/SingleSelect/Settings.tsx +++ b/src/components/fields/SingleSelect/Settings.tsx @@ -1,15 +1,15 @@ import { useState, useRef } from "react"; -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; import { TextField, Grid, IconButton, Typography, Divider, -} from "@material-ui/core"; -import AddIcon from "@material-ui/icons/AddCircle"; -import RemoveIcon from "@material-ui/icons/CancelRounded"; +} from "@mui/material"; +import AddIcon from "@mui/icons-material/AddCircle"; +import RemoveIcon from "@mui/icons-material/CancelRounded"; import Subheading from "components/Table/ColumnMenu/Subheading"; diff --git a/src/components/fields/SingleSelect/SideDrawerField.tsx b/src/components/fields/SingleSelect/SideDrawerField.tsx index aae7c899..2ae8e13d 100644 --- a/src/components/fields/SingleSelect/SideDrawerField.tsx +++ b/src/components/fields/SingleSelect/SideDrawerField.tsx @@ -1,8 +1,8 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { useTheme } from "@material-ui/core"; -import MultiSelect_ from "@antlerengineering/multiselect"; +import { useTheme } from "@mui/material"; +import MultiSelect_ from "@rowy/multiselect"; import FormattedChip from "components/FormattedChip"; import { sanitiseValue } from "./utils"; diff --git a/src/components/fields/Slider/Settings.tsx b/src/components/fields/Slider/Settings.tsx index 279ce807..81d0fbc6 100644 --- a/src/components/fields/Slider/Settings.tsx +++ b/src/components/fields/Slider/Settings.tsx @@ -1,4 +1,4 @@ -import { TextField, FormControlLabel, Switch } from "@material-ui/core"; +import { TextField, FormControlLabel, Switch } from "@mui/material"; import Subheading from "components/Table/ColumnMenu/Subheading"; export default function Settings({ handleChange, config }) { diff --git a/src/components/fields/Slider/SideDrawerField.tsx b/src/components/fields/Slider/SideDrawerField.tsx index 2d8cadc7..ac8ce7e0 100644 --- a/src/components/fields/Slider/SideDrawerField.tsx +++ b/src/components/fields/Slider/SideDrawerField.tsx @@ -1,7 +1,7 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { Slider as MuiSlider, Grid, Typography } from "@material-ui/core"; +import { Slider as MuiSlider, Grid, Typography } from "@mui/material"; export default function Slider({ control, diff --git a/src/components/fields/Slider/TableCell.tsx b/src/components/fields/Slider/TableCell.tsx index 08c861ea..fff728e8 100644 --- a/src/components/fields/Slider/TableCell.tsx +++ b/src/components/fields/Slider/TableCell.tsx @@ -1,7 +1,7 @@ import { IHeavyCellProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid } from "@mui/material"; import { resultColorsScale } from "utils/color"; diff --git a/src/components/fields/Status/Settings.tsx b/src/components/fields/Status/Settings.tsx index 5b0f1196..a8d40e64 100644 --- a/src/components/fields/Status/Settings.tsx +++ b/src/components/fields/Status/Settings.tsx @@ -2,17 +2,17 @@ import { useState, useEffect } from "react"; import { ISettingsProps } from "../types"; import Subheading from "components/Table/ColumnMenu/Subheading"; -import Button from "@material-ui/core/Button"; -import IconButton from "@material-ui/core/IconButton"; -import Grid from "@material-ui/core/Grid"; -import Divider from "@material-ui/core/Divider"; +import Button from "@mui/material/Button"; +import IconButton from "@mui/material/IconButton"; +import Grid from "@mui/material/Grid"; +import Divider from "@mui/material/Divider"; -import EditIcon from "@material-ui/icons/Edit"; +import EditIcon from "@mui/icons-material/Edit"; import Modal from "components/Modal"; -import DeleteIcon from "@material-ui/icons/Delete"; -import Typography from "@material-ui/core/Typography"; -import TextField from "@material-ui/core/TextField"; -import MultiSelect from "@antlerengineering/multiselect"; +import DeleteIcon from "@mui/icons-material/Delete"; +import Typography from "@mui/material/Typography"; +import TextField from "@mui/material/TextField"; +import MultiSelect from "@rowy/multiselect"; const EMPTY_STATE: { isOpen: boolean; diff --git a/src/components/fields/Status/SideDrawerField.tsx b/src/components/fields/Status/SideDrawerField.tsx index d19600ab..a64d833f 100644 --- a/src/components/fields/Status/SideDrawerField.tsx +++ b/src/components/fields/Status/SideDrawerField.tsx @@ -1,9 +1,9 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { Grid } from "@material-ui/core"; +import { Grid } from "@mui/material"; -import "@material-ui/lab"; +import "@mui/lab"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; import { useStatusStyles } from "./styles"; diff --git a/src/components/fields/Status/styles.ts b/src/components/fields/Status/styles.ts index 82345aa3..f176ddab 100644 --- a/src/components/fields/Status/styles.ts +++ b/src/components/fields/Status/styles.ts @@ -1,4 +1,4 @@ -import { makeStyles, createStyles } from "@material-ui/styles"; +import { makeStyles, createStyles } from "@mui/styles"; export const useStatusStyles = makeStyles((theme) => createStyles({ diff --git a/src/components/fields/SubTable/Settings.tsx b/src/components/fields/SubTable/Settings.tsx index fa6eac62..04271a77 100644 --- a/src/components/fields/SubTable/Settings.tsx +++ b/src/components/fields/SubTable/Settings.tsx @@ -1,4 +1,4 @@ -import MultiSelect from "@antlerengineering/multiselect"; +import MultiSelect from "@rowy/multiselect"; import { FieldType } from "constants/fields"; import { useProjectContext } from "contexts/ProjectContext"; diff --git a/src/components/fields/SubTable/SideDrawerField.tsx b/src/components/fields/SubTable/SideDrawerField.tsx index 5cf590f0..21af0615 100644 --- a/src/components/fields/SubTable/SideDrawerField.tsx +++ b/src/components/fields/SubTable/SideDrawerField.tsx @@ -2,8 +2,8 @@ import { useWatch } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; import { Link } from "react-router-dom"; -import { Grid, IconButton } from "@material-ui/core"; -import LaunchIcon from "@material-ui/icons/Launch"; +import { Grid, IconButton } from "@mui/material"; +import LaunchIcon from "@mui/icons-material/Launch"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; import { useSubTableData } from "./utils"; diff --git a/src/components/fields/SubTable/TableCell.tsx b/src/components/fields/SubTable/TableCell.tsx index c7003437..5fb28dfe 100644 --- a/src/components/fields/SubTable/TableCell.tsx +++ b/src/components/fields/SubTable/TableCell.tsx @@ -2,9 +2,9 @@ import { IHeavyCellProps } from "../types"; import clsx from "clsx"; import { Link } from "react-router-dom"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, IconButton } from "@material-ui/core"; -import LaunchIcon from "@material-ui/icons/Launch"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, IconButton } from "@mui/material"; +import LaunchIcon from "@mui/icons-material/Launch"; import { useSubTableData } from "./utils"; diff --git a/src/components/fields/Url/BasicCell.tsx b/src/components/fields/Url/BasicCell.tsx index 07d8335b..79d00c2e 100644 --- a/src/components/fields/Url/BasicCell.tsx +++ b/src/components/fields/Url/BasicCell.tsx @@ -1,6 +1,6 @@ import { IBasicCellProps } from "../types"; -import { Link } from "@material-ui/core"; +import { Link } from "@mui/material"; export default function Url({ value }: IBasicCellProps) { if (!value || typeof value !== "string") return null; diff --git a/src/components/fields/Url/SideDrawerField.tsx b/src/components/fields/Url/SideDrawerField.tsx index 0669d7a9..6a7b6161 100644 --- a/src/components/fields/Url/SideDrawerField.tsx +++ b/src/components/fields/Url/SideDrawerField.tsx @@ -1,8 +1,8 @@ import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { Grid, TextField, IconButton } from "@material-ui/core"; -import LaunchIcon from "@material-ui/icons/Launch"; +import { Grid, TextField, IconButton } from "@mui/material"; +import LaunchIcon from "@mui/icons-material/Launch"; export default function Url({ control, diff --git a/src/components/fields/Url/index.tsx b/src/components/fields/Url/index.tsx index b758fba8..327bde1b 100644 --- a/src/components/fields/Url/index.tsx +++ b/src/components/fields/Url/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withBasicCell from "../_withTableCell/withBasicCell"; -import UrlIcon from "@material-ui/icons/Link"; +import UrlIcon from "@mui/icons-material/Link"; import BasicCell from "../_BasicCell/BasicCellValue"; import TextEditor from "components/Table/editors/TextEditor"; diff --git a/src/components/fields/User/SideDrawerField.tsx b/src/components/fields/User/SideDrawerField.tsx index 62d494d4..21b84d8b 100644 --- a/src/components/fields/User/SideDrawerField.tsx +++ b/src/components/fields/User/SideDrawerField.tsx @@ -2,8 +2,8 @@ import clsx from "clsx"; import { Controller } from "react-hook-form"; import { ISideDrawerFieldProps } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grid, Typography, Avatar } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grid, Typography, Avatar } from "@mui/material"; import { useFieldStyles } from "components/SideDrawer/Form/utils"; import { format } from "date-fns"; diff --git a/src/components/fields/User/TableCell.tsx b/src/components/fields/User/TableCell.tsx index 4eaabe21..ae110517 100644 --- a/src/components/fields/User/TableCell.tsx +++ b/src/components/fields/User/TableCell.tsx @@ -1,6 +1,6 @@ import { IHeavyCellProps } from "../types"; -import { Tooltip, Chip, Avatar } from "@material-ui/core"; +import { Tooltip, Chip, Avatar } from "@mui/material"; import { format } from "date-fns"; import { DATE_TIME_FORMAT } from "constants/dates"; @@ -18,6 +18,7 @@ export default function User({ value }: IHeavyCellProps) { size="small" avatar={} label={value.displayName} + sx={{ height: 24 }} /> ); diff --git a/src/components/fields/User/index.tsx b/src/components/fields/User/index.tsx index 3dcdcc5d..41a32a9f 100644 --- a/src/components/fields/User/index.tsx +++ b/src/components/fields/User/index.tsx @@ -2,7 +2,7 @@ import { lazy } from "react"; import { IFieldConfig, FieldType } from "components/fields/types"; import withHeavyCell from "../_withTableCell/withHeavyCell"; -import UserIcon from "@material-ui/icons/PersonOutlined"; +import UserIcon from "@mui/icons-material/PersonOutlined"; import BasicCell from "../_BasicCell/BasicCellNull"; import withSideDrawerEditor from "components/Table/editors/withSideDrawerEditor"; diff --git a/src/components/fields/_withTableCell/withPopoverCell.tsx b/src/components/fields/_withTableCell/withPopoverCell.tsx index 7b417e2a..03eeb46b 100644 --- a/src/components/fields/_withTableCell/withPopoverCell.tsx +++ b/src/components/fields/_withTableCell/withPopoverCell.tsx @@ -6,8 +6,8 @@ import { IPopoverCellProps, } from "../types"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Popover, PopoverProps } from "@material-ui/core"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Popover, PopoverProps } from "@mui/material"; import ErrorBoundary from "components/ErrorBoundary"; import CellValidation from "components/Table/CellValidation"; diff --git a/src/components/fields/types.ts b/src/components/fields/types.ts index 5750ecf4..8bb9a56a 100644 --- a/src/components/fields/types.ts +++ b/src/components/fields/types.ts @@ -2,7 +2,7 @@ import { FieldType } from "constants/fields"; import { FormatterProps, EditorProps } from "react-data-grid"; import { Control } from "react-hook-form"; -import { PopoverProps } from "@material-ui/core"; +import { PopoverProps } from "@mui/material"; export { FieldType }; diff --git a/src/contexts/AppContext.tsx b/src/contexts/AppContext.tsx index a521c8ad..d3f9623f 100644 --- a/src/contexts/AppContext.tsx +++ b/src/contexts/AppContext.tsx @@ -3,7 +3,7 @@ import firebase from "firebase/app"; import createPersistedState from "use-persisted-state"; import _merge from "lodash/merge"; -import { useMediaQuery, ThemeProvider, CssBaseline } from "@material-ui/core"; +import { useMediaQuery, ThemeProvider, CssBaseline } from "@mui/material"; import ErrorBoundary from "components/ErrorBoundary"; diff --git a/src/contexts/SnackbarContext.tsx b/src/contexts/SnackbarContext.tsx index a5c60a82..dc9d3d40 100644 --- a/src/contexts/SnackbarContext.tsx +++ b/src/contexts/SnackbarContext.tsx @@ -3,12 +3,12 @@ import { SnackbarProviderProps, } from "notistack"; -import { makeStyles, createStyles } from "@material-ui/styles"; -import { Grow } from "@material-ui/core"; -import ErrorIcon from "@material-ui/icons/ErrorOutline"; -import InfoIcon from "@material-ui/icons/InfoOutlined"; -import SuccessIcon from "@material-ui/icons/Check"; -import WarningIcon from "@material-ui/icons/WarningAmber"; +import { makeStyles, createStyles } from "@mui/styles"; +import { Grow } from "@mui/material"; +import ErrorIcon from "@mui/icons-material/ErrorOutline"; +import InfoIcon from "@mui/icons-material/InfoOutlined"; +import SuccessIcon from "@mui/icons-material/Check"; +import WarningIcon from "@mui/icons-material/WarningAmber"; const useStyles = makeStyles((theme) => createStyles({ diff --git a/src/hooks/useTable/useTableData.tsx b/src/hooks/useTable/useTableData.tsx index 0d24521d..48bf451d 100644 --- a/src/hooks/useTable/useTableData.tsx +++ b/src/hooks/useTable/useTableData.tsx @@ -1,7 +1,7 @@ import { db } from "../../firebase"; import { useSnackbar } from "notistack"; -import Button from "@material-ui/core/Button"; +import Button from "@mui/material/Button"; import { useEffect, useReducer } from "react"; import _isEqual from "lodash/isEqual"; import _merge from "lodash/merge"; diff --git a/src/pages/Auth/ImpersonatorAuth.tsx b/src/pages/Auth/ImpersonatorAuth.tsx index 2b08ee26..f056c34a 100644 --- a/src/pages/Auth/ImpersonatorAuth.tsx +++ b/src/pages/Auth/ImpersonatorAuth.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import { useSnackbar } from "notistack"; -import { Typography, Button, TextField } from "@material-ui/core"; +import { Typography, Button, TextField } from "@mui/material"; import AuthLayout from "components/Auth/AuthLayout"; import FirebaseUi from "components/Auth/FirebaseUi"; diff --git a/src/pages/Auth/JwtAuth.tsx b/src/pages/Auth/JwtAuth.tsx index 022d2ce9..deaddf71 100644 --- a/src/pages/Auth/JwtAuth.tsx +++ b/src/pages/Auth/JwtAuth.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { useSnackbar } from "notistack"; -import { TextField, Typography, Button } from "@material-ui/core"; +import { TextField, Typography, Button } from "@mui/material"; import { auth } from "../../firebase"; import AuthLayout from "components/Auth/AuthLayout"; diff --git a/src/pages/Auth/SetupGuide.tsx b/src/pages/Auth/SetupGuide.tsx index 0898b35e..0d938871 100644 --- a/src/pages/Auth/SetupGuide.tsx +++ b/src/pages/Auth/SetupGuide.tsx @@ -1,5 +1,5 @@ -import { Button } from "@material-ui/core"; -import OpenInNewIcon from "@material-ui/icons/OpenInNew"; +import { Button } from "@mui/material"; +import OpenInNewIcon from "@mui/icons-material/OpenInNew"; import AuthLayout from "components/Auth/AuthLayout"; import EmptyState from "components/EmptyState"; diff --git a/src/pages/Auth/SignOut.tsx b/src/pages/Auth/SignOut.tsx index b9a8dc3d..e3fc830a 100644 --- a/src/pages/Auth/SignOut.tsx +++ b/src/pages/Auth/SignOut.tsx @@ -1,8 +1,8 @@ import { useEffect } from "react"; import { Link } from "react-router-dom"; -import { Button } from "@material-ui/core"; -import CheckIcon from "@material-ui/icons/Check"; +import { Button } from "@mui/material"; +import CheckIcon from "@mui/icons-material/Check"; import AuthLayout from "components/Auth/AuthLayout"; import EmptyState from "components/EmptyState"; diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index fc08892c..142e3bf7 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -15,13 +15,13 @@ import { IconButton, Zoom, Fade, -} from "@material-ui/core"; -import ViewListIcon from "@material-ui/icons/ViewListOutlined"; -import ViewGridIcon from "@material-ui/icons/ViewModuleOutlined"; -import FavoriteBorderIcon from "@material-ui/icons/FavoriteBorder"; -import FavoriteIcon from "@material-ui/icons/Favorite"; -import EditIcon from "@material-ui/icons/EditOutlined"; -import AddIcon from "@material-ui/icons/Add"; +} from "@mui/material"; +import ViewListIcon from "@mui/icons-material/ViewListOutlined"; +import ViewGridIcon from "@mui/icons-material/ViewModuleOutlined"; +import FavoriteBorderIcon from "@mui/icons-material/FavoriteBorder"; +import FavoriteIcon from "@mui/icons-material/Favorite"; +import EditIcon from "@mui/icons-material/EditOutlined"; +import AddIcon from "@mui/icons-material/Add"; import FloatingSearch from "components/FloatingSearch"; import SlideTransition from "components/Modal/SlideTransition"; diff --git a/src/pages/Settings/ProjectSettings.tsx b/src/pages/Settings/ProjectSettings.tsx index a46e10c4..0ed2224b 100644 --- a/src/pages/Settings/ProjectSettings.tsx +++ b/src/pages/Settings/ProjectSettings.tsx @@ -2,7 +2,7 @@ import { useEffect } from "react"; import { useSnackbar } from "notistack"; import { useDebouncedCallback } from "use-debounce"; -import { Container, Stack, Fade } from "@material-ui/core"; +import { Container, Stack, Fade } from "@mui/material"; import SettingsSkeleton from "components/Settings/SettingsSkeleton"; import SettingsSection from "components/Settings/SettingsSection"; diff --git a/src/pages/Settings/UserManagement.tsx b/src/pages/Settings/UserManagement.tsx index b3e38879..199463cf 100644 --- a/src/pages/Settings/UserManagement.tsx +++ b/src/pages/Settings/UserManagement.tsx @@ -8,7 +8,7 @@ import { List, Fade, Collapse, -} from "@material-ui/core"; +} from "@mui/material"; import FloatingSearch from "components/FloatingSearch"; import SlideTransition from "components/Modal/SlideTransition"; diff --git a/src/pages/Settings/UserSettings.tsx b/src/pages/Settings/UserSettings.tsx index 1464d426..96866fa9 100644 --- a/src/pages/Settings/UserSettings.tsx +++ b/src/pages/Settings/UserSettings.tsx @@ -2,7 +2,7 @@ import { useEffect } from "react"; import { useSnackbar } from "notistack"; import { useDebouncedCallback } from "use-debounce"; -import { Container, Stack, Fade } from "@material-ui/core"; +import { Container, Stack, Fade } from "@mui/material"; import SettingsSkeleton from "components/Settings/SettingsSkeleton"; import SettingsSection from "components/Settings/SettingsSection"; diff --git a/src/pages/Table.tsx b/src/pages/Table.tsx index 2b216f79..edacc7fc 100644 --- a/src/pages/Table.tsx +++ b/src/pages/Table.tsx @@ -4,7 +4,7 @@ import queryString from "query-string"; import _isEmpty from "lodash/isEmpty"; import _find from "lodash/find"; -import { Hidden } from "@material-ui/core"; +import { Hidden } from "@mui/material"; import Navigation from "components/Navigation"; import Breadcrumbs from "components/Navigation/Breadcrumbs"; diff --git a/src/pages/Test.tsx b/src/pages/Test.tsx index c9b92a22..32bdcc27 100644 --- a/src/pages/Test.tsx +++ b/src/pages/Test.tsx @@ -34,8 +34,8 @@ import { TextField, Tabs, Tab, -} from "@material-ui/core"; -import SparkIcon from "@material-ui/icons/OfflineBoltOutlined"; +} from "@mui/material"; +import SparkIcon from "@mui/icons-material/OfflineBoltOutlined"; import { useConfirmation } from "components/ConfirmationDialog"; import SnackbarProgress, { diff --git a/src/theme/CheckboxIcon.tsx b/src/theme/CheckboxIcon.tsx index 9df64fcd..e4671437 100644 --- a/src/theme/CheckboxIcon.tsx +++ b/src/theme/CheckboxIcon.tsx @@ -1,4 +1,4 @@ -import { Box } from "@material-ui/core"; +import { Box } from "@mui/material"; import { toRem } from "./typography"; export default function CheckboxIcon() { diff --git a/src/theme/CheckboxIndeterminateIcon.tsx b/src/theme/CheckboxIndeterminateIcon.tsx index afa1f515..aada32e6 100644 --- a/src/theme/CheckboxIndeterminateIcon.tsx +++ b/src/theme/CheckboxIndeterminateIcon.tsx @@ -1,4 +1,4 @@ -import { Box } from "@material-ui/core"; +import { Box } from "@mui/material"; import { toRem } from "./typography"; export default function CheckboxIndeterminateIcon() { diff --git a/src/theme/RadioIcon.tsx b/src/theme/RadioIcon.tsx index 1740929b..6953f1b2 100644 --- a/src/theme/RadioIcon.tsx +++ b/src/theme/RadioIcon.tsx @@ -1,4 +1,4 @@ -import { Box } from "@material-ui/core"; +import { Box } from "@mui/material"; import { toRem } from "./typography"; export default function RadioIcon() { diff --git a/src/theme/colors.ts b/src/theme/colors.ts index 8b803db9..6bacca5d 100644 --- a/src/theme/colors.ts +++ b/src/theme/colors.ts @@ -1,11 +1,11 @@ -import { ThemeOptions } from "@material-ui/core/styles"; -import { Shadows } from "@material-ui/core/styles/shadows"; +import { ThemeOptions } from "@mui/material/styles"; +import { Shadows } from "@mui/material/styles/shadows"; import { colord, extend } from "colord"; import lchPlugin from "colord/plugins/lch"; extend([lchPlugin]); -declare module "@material-ui/core/styles/createPalette" { +declare module "@mui/material/styles/createPalette" { interface TypeAction { activeOpacity: number; input: string; diff --git a/src/theme/components.tsx b/src/theme/components.tsx index 2d3df1a6..e459796b 100644 --- a/src/theme/components.tsx +++ b/src/theme/components.tsx @@ -1,4 +1,4 @@ -import { Theme, ThemeOptions } from "@material-ui/core/styles"; +import { Theme, ThemeOptions } from "@mui/material/styles"; import { toRem } from "./typography"; import RadioIcon from "theme/RadioIcon"; @@ -9,7 +9,7 @@ import { colord, extend } from "colord"; import mixPlugin from "colord/plugins/mix"; extend([mixPlugin]); -declare module "@material-ui/core/styles/createTransitions" { +declare module "@mui/material/styles/createTransitions" { interface Easing { strong: string; } @@ -96,9 +96,8 @@ export const components = (theme: Theme): ThemeOptions => { "--dialog-spacing": theme.spacing(3), [theme.breakpoints.down("sm")]: { - "--dialog-spacing": theme.spacing(2), + "--dialog-spacing": theme.spacing(2.5), }, - padding: "0 var(--dialog-spacing)", }, paperWidthXs: { @@ -107,22 +106,35 @@ export const components = (theme: Theme): ThemeOptions => { paperFullScreen: { borderBottomLeftRadius: 0, borderBottomRightRadius: 0, - marginTop: theme.spacing(1), - maxHeight: `calc(100% - ${theme.spacing(1)})`, + marginTop: `calc(env(safe-area-inset-top) + ${theme.spacing(1)})`, + maxHeight: `calc(100% - env(safe-area-inset-top) - ${theme.spacing( + 1 + )})`, + maxWidth: "100% !important", + + paddingLeft: "env(safe-area-inset-left)", + paddingRight: "env(safe-area-inset-right)", + paddingBottom: "env(safe-area-inset-bottom)", }, }, }, MuiDialogTitle: { styleOverrides: { root: { - padding: `calc(var(--dialog-spacing) - (28px - 16px) / 2) 0`, + padding: "var(--dialog-spacing)", + paddingTop: (64 - 28) / 2, + paddingBottom: (64 - 28) / 2, + + [theme.breakpoints.down("sm")]: { + paddingTop: (56 - 28) / 2, + paddingBottom: (56 - 28) / 2, + }, }, }, }, MuiDialogContent: { styleOverrides: { root: { - margin: "0 calc(var(--dialog-spacing) * -1)", padding: theme.spacing(0, "var(--dialog-spacing)", 1), "&:last-child": { paddingBottom: "var(--dialog-spacing)" }, @@ -146,8 +158,8 @@ export const components = (theme: Theme): ThemeOptions => { "& .MuiButton-root": { minWidth: 100 }, }, spacing: { - padding: theme.spacing(2, 0), - [theme.breakpoints.down("sm")]: { padding: theme.spacing(1.5, 0) }, + padding: theme.spacing(2, 1), + [theme.breakpoints.down("sm")]: { padding: theme.spacing(1.5, 1) }, }, }, }, @@ -354,6 +366,22 @@ export const components = (theme: Theme): ThemeOptions => { root: { right: theme.spacing(0.75) }, }, }, + MuiAutocomplete: { + styleOverrides: { + listbox: { + "& .MuiAutocomplete-option": { + margin: theme.spacing(0, 1), + padding: theme.spacing(0.5, 1), + paddingLeft: theme.spacing(1) + " !important", + minHeight: 32, + borderRadius: theme.shape.borderRadius, + }, + }, + groupLabel: { + background: "transparent", + }, + }, + }, MuiButton: { defaultProps: { diff --git a/src/theme/index.tsx b/src/theme/index.tsx index 8255b37b..0713836c 100644 --- a/src/theme/index.tsx +++ b/src/theme/index.tsx @@ -1,4 +1,4 @@ -import { createTheme, ThemeOptions } from "@material-ui/core/styles"; +import { createTheme, ThemeOptions } from "@mui/material/styles"; import _merge from "lodash/merge"; import { typography } from "theme/typography"; diff --git a/src/theme/typography.ts b/src/theme/typography.ts index 46868fee..0b9fdd57 100644 --- a/src/theme/typography.ts +++ b/src/theme/typography.ts @@ -1,10 +1,10 @@ -import { ThemeOptions } from "@material-ui/core/styles"; +import { ThemeOptions } from "@mui/material/styles"; import { FontStyle, TypographyStyleOptions, -} from "@material-ui/core/styles/createTypography"; +} from "@mui/material/styles/createTypography"; -declare module "@material-ui/core/styles/createTypography" { +declare module "@mui/material/styles/createTypography" { interface FontStyle { fontFamilyMono: string; fontFamilyHeading: string; diff --git a/types/@material-ui/styles.ts b/types/@material-ui/styles.ts index 6c189b2c..8d4c4941 100644 --- a/types/@material-ui/styles.ts +++ b/types/@material-ui/styles.ts @@ -1,5 +1,5 @@ -import { Theme } from "@material-ui/core/styles"; +import { Theme } from "@mui/material/styles"; -declare module "@material-ui/styles" { +declare module "@mui/styles" { interface DefaultTheme extends Theme {} } diff --git a/types/@mui/styles.ts b/types/@mui/styles.ts new file mode 100644 index 00000000..6c189b2c --- /dev/null +++ b/types/@mui/styles.ts @@ -0,0 +1,5 @@ +import { Theme } from "@material-ui/core/styles"; + +declare module "@material-ui/styles" { + interface DefaultTheme extends Theme {} +} diff --git a/yarn.lock b/yarn.lock index 4b614d59..352f7e33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -106,32 +106,6 @@ "@algolia/logger-common" "4.10.4" "@algolia/requester-common" "4.10.4" -"@antlerengineering/form-builder@^3.0.0-2": - version "3.0.0-2" - resolved "https://registry.yarnpkg.com/@antlerengineering/form-builder/-/form-builder-3.0.0-2.tgz#08d65e3ddf72ded2fcf8dfbbeb7afa20baa4d205" - integrity sha512-+RWHaXZ/AsHEcShZjy68nhOStC2bubkfk7wdavCG1dzGRmevxLtyB1hPa7LzX+i7lTwVHHFzeZRu/S50Bj6yQw== - dependencies: - "@antlerengineering/multiselect" "^1.0.0-0" - "@hookform/resolvers" "^2.6.0" - "@mdi/js" "^5.9.55" - array-move "^3.0.1" - date-fns "^2.22.1" - dompurify "^2.2.9" - lodash "^4.17.21" - lodash-es "^4.17.21" - react-color "^2.19.3" - react-dnd "^14.0.2" - react-dnd-html5-backend "^14.0.0" - react-element-scroll-hook "^1.1.0" - react-hook-form "^7.10.0" - use-debounce "^3.4.3" - yup "^0.32.9" - -"@antlerengineering/multiselect@^1.0.0-0": - version "1.0.0-0" - resolved "https://registry.yarnpkg.com/@antlerengineering/multiselect/-/multiselect-1.0.0-0.tgz#589908f5f7a9485b3d615a1f2193e6fd32f26074" - integrity sha512-7hPWwtzO0SmjA+JHKgYQSCUlBOrE4jD7fhsmKAzNAISwdSUoOE3qDZN7kMSpdoc0vndVfoDgOkPs5UUwOFDQ2g== - "@apidevtools/json-schema-ref-parser@^9.0.3": version "9.0.9" resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#d720f9256e3609621280584f2b47ae165359268b" @@ -2175,9 +2149,9 @@ "@hapi/hoek" "^8.3.0" "@hookform/resolvers@^2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.6.0.tgz#a4497fe33807d4ba09c34f41549f87a642550886" - integrity sha512-1Pbxjc4HEzATEcRsyDfkEQR/3OWaQwbemW9HTTYH+ZiLF2mzafl5Pn++65gwNnJSGzXUp5LIq3Nz2+Cz4m2U8A== + version "2.8.0" + resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.8.0.tgz#32e82b072ff71c71e62fb2901b129642a0c5897e" + integrity sha512-ALlr0Bg6zDHdRsdqkwfWGPMnIxP4hqMRPvFDHp7lWXQeA7rKykto3cWqQQh1s0PzX043RHwMB6OHVPMwFJqwxg== "@icons/material@^0.2.4": version "0.2.4" @@ -2395,32 +2369,6 @@ react-is "^17.0.2" react-transition-group "^4.4.0" -"@material-ui/icons@^5.0.0-beta.4": - version "5.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-5.0.0-beta.5.tgz#54295b9aa120910c88900e3d08082b7acbeb73c0" - integrity sha512-C2KHSf8mvDn22rzsV0UfsJyBYI3Nt/LItcKPJBAG9kgqdBHAuLMH2lfKmdMuX55qd8O+NO5rM7aIHdYQRjfcMQ== - dependencies: - "@babel/runtime" "^7.14.8" - -"@material-ui/lab@^5.0.0-alpha.43": - version "5.0.0-alpha.44" - resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-5.0.0-alpha.44.tgz#3b914047031a12ff7575fa5bb775dda7e90519f1" - integrity sha512-x5Tovc8rgxAoLZ8Hcm45tfCVlgYnUEbxIoRAQ2Bc+rEulYfdZY+xq492mt4wzwSCh8ZoTq7IwrL1sXN/SaLPdA== - dependencies: - "@babel/runtime" "^7.14.8" - "@date-io/date-fns" "^2.10.6" - "@date-io/dayjs" "^2.10.6" - "@date-io/luxon" "^2.10.6" - "@date-io/moment" "^2.10.6" - "@material-ui/system" "5.0.0-beta.5" - "@material-ui/unstyled" "5.0.0-alpha.44" - "@material-ui/utils" "5.0.0-beta.5" - clsx "^1.0.4" - prop-types "^15.7.2" - react-is "^17.0.2" - react-transition-group "^4.4.1" - rifm "^0.12.0" - "@material-ui/private-theming@5.0.0-beta.5": version "5.0.0-beta.5" resolved "https://registry.yarnpkg.com/@material-ui/private-theming/-/private-theming-5.0.0-beta.5.tgz#b8168bd15a609a78bf411e5afac2f38b513b5f18" @@ -2439,29 +2387,6 @@ "@emotion/cache" "^11.4.0" prop-types "^15.7.2" -"@material-ui/styles@^5.0.0-beta.4": - version "5.0.0-beta.5" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-5.0.0-beta.5.tgz#776626c7e57c96f248f7999fa767ef6d75b06690" - integrity sha512-qG88DGXNWgsdO8uhmJy0qVXX7TOIvCg9v6sL6CNDluPlao1cgw5UiHBkVBDqMJIOj+KiqThWzh/akzV+oEngSQ== - dependencies: - "@babel/runtime" "^7.14.8" - "@emotion/hash" "^0.8.0" - "@material-ui/private-theming" "5.0.0-beta.5" - "@material-ui/types" "6.0.2" - "@material-ui/utils" "5.0.0-beta.5" - clsx "^1.0.4" - csstype "^3.0.2" - hoist-non-react-statics "^3.3.2" - jss "^10.7.1" - jss-plugin-camel-case "^10.7.1" - jss-plugin-default-unit "^10.7.1" - jss-plugin-global "^10.7.1" - jss-plugin-nested "^10.7.1" - jss-plugin-props-sort "^10.7.1" - jss-plugin-rule-value-function "^10.7.1" - jss-plugin-vendor-prefixer "^10.7.1" - prop-types "^15.7.2" - "@material-ui/system@5.0.0-beta.5": version "5.0.0-beta.5" resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-5.0.0-beta.5.tgz#5f828cae175f3eaf0bf2b71f1c76d421b44ab5eb" @@ -2524,6 +2449,134 @@ "@monaco-editor/loader" "^1.1.1" prop-types "^15.7.2" +"@mui/core@5.0.0-alpha.46": + version "5.0.0-alpha.46" + resolved "https://registry.yarnpkg.com/@mui/core/-/core-5.0.0-alpha.46.tgz#f4c0e5b2ad346e31e74bb96b684f6734b55cc9e6" + integrity sha512-LZa0s450YSHv58xlMRIWszE0zsqqTyxgP+l70gUyPvYwCfQErkxsvRjEInKI5GCrYDcr3N+jlKJ5MSRZDvtvig== + dependencies: + "@babel/runtime" "^7.14.8" + "@emotion/is-prop-valid" "^1.1.0" + "@mui/utils" "5.0.0-rc.1" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + +"@mui/icons-material@^5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.0.0-rc.1.tgz#ffb5ec5195d2bf8105da6a78b7d6b9fc195c8511" + integrity sha512-w9tfGQaND221fkPaCp70gHg/8f4mk1RYx22YBLtV4wV0SLoI3d4+41DRrqTxeyKB1WIxETDVxaAqeBthrXM6hg== + dependencies: + "@babel/runtime" "^7.14.8" + +"@mui/lab@^5.0.0-alpha.46": + version "5.0.0-alpha.46" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.46.tgz#456403bf1c8a810f052733119b9013778054bdf8" + integrity sha512-aGgX3GWOOPq7RuxDI4wQMrm+J7q7cvPDLxN1uS85oIZnMrFLTrFZaQlf4x6LQJtFpVTa7LKuhzNU6kLT37BWMg== + dependencies: + "@babel/runtime" "^7.14.8" + "@date-io/date-fns" "^2.10.6" + "@date-io/dayjs" "^2.10.6" + "@date-io/luxon" "^2.10.6" + "@date-io/moment" "^2.10.6" + "@mui/core" "5.0.0-alpha.46" + "@mui/system" "5.0.0-rc.1" + "@mui/utils" "5.0.0-rc.1" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + react-transition-group "^4.4.1" + rifm "^0.12.0" + +"@mui/material@^5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.0.0-rc.1.tgz#456218bfeb659dfb17c516ecc03f86013feaf253" + integrity sha512-23lEM2n0Y8VcFbk7mjNZzbAHDh7wu5P4foe1hDiSJaipBX4ESWnBAwo9exxQbFrDd+l2xtLzaoTmTOVOgkElrA== + dependencies: + "@babel/runtime" "^7.14.8" + "@mui/core" "5.0.0-alpha.46" + "@mui/system" "5.0.0-rc.1" + "@mui/types" "7.0.0-rc.1" + "@mui/utils" "5.0.0-rc.1" + "@popperjs/core" "^2.4.4" + "@types/react-transition-group" "^4.2.0" + clsx "^1.1.1" + csstype "^3.0.8" + hoist-non-react-statics "^3.3.2" + prop-types "^15.7.2" + react-is "^17.0.2" + react-transition-group "^4.4.0" + +"@mui/private-theming@5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.0.0-rc.1.tgz#eab6d20db119b6f2176d76ed725f53b9ebc12e97" + integrity sha512-dibj1bc+tX4+sKOhSAYoJVndk7MAVZkYLKRa3E3GDObDe5I/YOv0fS8cvfB3sTFiQWxbdKj//p2QJtos6o83NQ== + dependencies: + "@babel/runtime" "^7.14.8" + "@mui/utils" "5.0.0-rc.1" + prop-types "^15.7.2" + +"@mui/styled-engine@5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.0.0-rc.1.tgz#8a0c68e88868c42944042e01e28a0d11b6caf756" + integrity sha512-cYK3oGHzriPqULPSy5iitupk6JbvvwVqBC1n1gxISZzm7wEsBx0hDCDhh7tgCa1B7CXdl0Ntl27PXJjtukoo/A== + dependencies: + "@babel/runtime" "^7.14.8" + "@emotion/cache" "^11.4.0" + prop-types "^15.7.2" + +"@mui/styles@^5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.0.0-rc.1.tgz#479c082afbdef116ad5323e15e3f1324efd29205" + integrity sha512-lOAEpHDTOv/mLGBXvu0zO+FJihezo3Z4PKggTEGIdEuZUvz2slyJOtlSGwvbURK7+dGT04jFBfMOHbPR1JODSw== + dependencies: + "@babel/runtime" "^7.14.8" + "@emotion/hash" "^0.8.0" + "@mui/private-theming" "5.0.0-rc.1" + "@mui/types" "7.0.0-rc.1" + "@mui/utils" "5.0.0-rc.1" + clsx "^1.1.1" + csstype "^3.0.8" + hoist-non-react-statics "^3.3.2" + jss "^10.7.1" + jss-plugin-camel-case "^10.7.1" + jss-plugin-default-unit "^10.7.1" + jss-plugin-global "^10.7.1" + jss-plugin-nested "^10.7.1" + jss-plugin-props-sort "^10.7.1" + jss-plugin-rule-value-function "^10.7.1" + jss-plugin-vendor-prefixer "^10.7.1" + prop-types "^15.7.2" + +"@mui/system@5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.0.0-rc.1.tgz#24c99469b48c350802929f6097f671742be9a7f1" + integrity sha512-c+esT+9wZR5aNcssMHg5Wm19VdX+uyhNLLTzqAg8oW36LBeIMTfiN18GShcxnFV3faje78Nr3BhmMFn9yBunMA== + dependencies: + "@babel/runtime" "^7.14.8" + "@mui/private-theming" "5.0.0-rc.1" + "@mui/styled-engine" "5.0.0-rc.1" + "@mui/types" "7.0.0-rc.1" + "@mui/utils" "5.0.0-rc.1" + clsx "^1.1.1" + csstype "^3.0.8" + prop-types "^15.7.2" + +"@mui/types@7.0.0-rc.1": + version "7.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.0.0-rc.1.tgz#276090e2cd062a5e9241cf8d4ad795a4ee10eb03" + integrity sha512-4vYFVi8ExcC7EEuk5melw/XPG2DVPeXI/HUYnQj+3t5NESpdvLJhbbvmHH366ZWAhXR2FechYWo/cQfGIsSG8Q== + +"@mui/utils@5.0.0-rc.1": + version "5.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.0.0-rc.1.tgz#8427d1117a380b8c861be9a6bbf51075e776cd63" + integrity sha512-FSh/zaZqfzz0Iz7/RHb2ajA/q6dfFKeNIXZCl7sZeYq9L1u8GR4IHi4n1MphLiJTco02XBw3KwME9Bqmk73LEQ== + dependencies: + "@babel/runtime" "^7.14.8" + "@types/prop-types" "^15.7.4" + "@types/react-is" "^16.7.1 || ^17.0.0" + prop-types "^15.7.2" + react-is "^17.0.2" + "@napi-rs/triples@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c" @@ -2678,6 +2731,31 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rowy/form-builder@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@rowy/form-builder/-/form-builder-0.1.1.tgz#17bbf7bfe2fcd2c4ec95edcdcb17ef0d22eb7f12" + integrity sha512-KEuQrljHwM+ByTzVZ3AaUPsECebPYqjbO3Yyj9y10gGA+AScdQk3En66nT2TdZjdkGsGKk+EwQi5E3FwN0jMrA== + dependencies: + "@hookform/resolvers" "^2.6.0" + "@mdi/js" "^5.9.55" + array-move "^3.0.1" + date-fns "^2.22.1" + dompurify "^2.2.9" + lodash "^4.17.21" + lodash-es "^4.17.21" + react-color "^2.19.3" + react-dnd "^14.0.2" + react-dnd-html5-backend "^14.0.0" + react-element-scroll-hook "^1.1.0" + react-hook-form "^7.10.0" + use-debounce "^3.4.3" + yup "^0.32.9" + +"@rowy/multiselect@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@rowy/multiselect/-/multiselect-0.1.4.tgz#b95045ed56949a1560a8439f269529cd50908dfb" + integrity sha512-jhDq2oRiV3cGMJ4nRzIkWKGxrbtQBKecGssOlOJjLqqR/O4FNKO1UwR4PA7WsX69zuo18sC7ndqr7M0gN6sEHw== + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -6041,7 +6119,7 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^3.0.2: +csstype@^3.0.2, csstype@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== @@ -6092,16 +6170,11 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-fns@^2.19.0: +date-fns@^2.19.0, date-fns@^2.22.1: version "2.23.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9" integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA== -date-fns@^2.22.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4" - integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg== - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -6449,16 +6522,11 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -dompurify@^2.2.6: +dompurify@^2.2.6, dompurify@^2.2.9: version "2.3.1" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== -dompurify@^2.2.9: - version "2.3.0" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz#07bb39515e491588e5756b1d3e8375b5964814e2" - integrity sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw== - domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -13492,9 +13560,9 @@ react-dnd-html5-backend@^11.1.3: dnd-core "^11.1.3" react-dnd-html5-backend@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-14.0.0.tgz#28d660a2ad1e07447c34a65cd25f7de8f1657194" - integrity sha512-2wAQqRFC1hbRGmk6+dKhOXsyQQOn3cN8PSZyOUeOun9J8t3tjZ7PS2+aFu7CVu2ujMDwTJR3VTwZh8pj2kCv7g== + version "14.0.1" + resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-14.0.1.tgz#37d43d6b6ddd91069101969d9eac6d688a9d57ef" + integrity sha512-ZDmpvFpd1NR4riw/CMbr8C3mgP6ZhsTf0c48a36kw4ZW8emgiugNlAz/qhhZ4/Pz9TO6DZ63sQohUTTl+AWGiA== dependencies: dnd-core "14.0.0" @@ -13509,9 +13577,9 @@ react-dnd@^11.1.3: hoist-non-react-statics "^3.3.0" react-dnd@^14.0.2: - version "14.0.2" - resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-14.0.2.tgz#57266baec92b887301f81fa3b77f87168d159733" - integrity sha512-JoEL78sBCg8SzjOKMlkR70GWaPORudhWuTNqJ56lb2P8Vq0eM2+er3ZrMGiSDhOmzaRPuA9SNBz46nHCrjn11A== + version "14.0.3" + resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-14.0.3.tgz#1762c1ec84815439f2d8a6a40efd1f57eee41ba6" + integrity sha512-i73Hx5SKfDRdwXe30+CjF/DidiRdt/gwpPN14ajkPR20t/0osnNKFNHg3DLV6RZym+DJ0pO9H5APeMsBWGU3+Q== dependencies: "@react-dnd/invariant" "^2.0.0" "@react-dnd/shallowequal" "^2.0.0" @@ -13587,9 +13655,9 @@ react-hook-form@^6: integrity sha512-prq82ofMbnRyj5wqDe8hsTRcdR25jQ+B8KtCS7BLCzjFHAwNuCjRwzPuP4eYLsEBjEIeYd6try+pdLdw0kPkpg== react-hook-form@^7.10.0: - version "7.11.0" - resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.11.0.tgz#9cae5e21ba1c1a98a40c65cfee07db9e677edc21" - integrity sha512-aJVvL5VV6JqUWvwx9fbrhc6La83aQAfXfqQr+TD/sWy3LPdqYBgBIHBt8WAKWzKRm3g29YV2CLfn4wkhNB9b+g== + version "7.15.2" + resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.15.2.tgz#c4d4fa44a5df755648ab19034062ae37087536b0" + integrity sha512-tPcLlsTXaOtZkyc1IGGaJfQ6amo2sJiM6DDufE7WG+S4N8s5Wr60HGtnKS7gPnnZL93pFPQYrSj7WDB5An2VVw== react-image@^4.0.3: version "4.0.3" @@ -13910,20 +13978,13 @@ redeyed@~2.1.0: dependencies: esprima "~4.0.0" -redux@^4.0.0, redux@^4.0.4: +redux@^4.0.0, redux@^4.0.4, redux@^4.0.5: version "4.1.1" resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47" integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw== dependencies: "@babel/runtime" "^7.9.2" -redux@^4.0.5: - version "4.1.0" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4" - integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g== - dependencies: - "@babel/runtime" "^7.9.2" - regenerate-unicode-properties@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"