diff --git a/package-lock.json b/package-lock.json index b854bda7b..4e4b47b20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,8 +15,8 @@ "@fortawesome/free-solid-svg-icons": "^6.6.0", "@fortawesome/react-fontawesome": "^0.2.2", "@mdx-js/react": "^3.0.1", - "@mui/icons-material": "^5.16.7", - "@mui/material": "^5.16.7", + "@mui/icons-material": "^6.1.1", + "@mui/material": "^6.1.1", "@tippyjs/react": "^4.2.6", "chroma-js": "^3.1.1", "react": "^18.3.1", @@ -2176,9 +2176,9 @@ "dev": true }, "node_modules/@babel/runtime": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz", - "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==", + "version": "7.25.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", + "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2271,9 +2271,9 @@ } }, "node_modules/@emotion/cache": { - "version": "11.13.0", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.0.tgz", - "integrity": "sha512-hPV345J/tH0Cwk2wnU/3PBzORQ9HeX+kQSbwI+jslzpRCHE6fSGTohswksA/Ensr8znPzwfzKZCmAM9Lmlhp7g==", + "version": "11.13.1", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz", + "integrity": "sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==", "dependencies": { "@emotion/memoize": "^0.9.0", "@emotion/sheet": "^1.4.0", @@ -3488,32 +3488,32 @@ ] }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.16.7", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz", - "integrity": "sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-6.1.1.tgz", + "integrity": "sha512-VdQC1tPIIcZAnf62L2M1eQif0x2vlKg3YK4kGYbtijSH4niEgI21GnstykW1vQIs+Bc6L+Hua2GATYVjilJ22A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" } }, "node_modules/@mui/icons-material": { - "version": "5.16.7", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.16.7.tgz", - "integrity": "sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-6.1.1.tgz", + "integrity": "sha512-sy/YKwcLPW8VcacNP2uWMYR9xyWuwO9NN9FXuGEU90bRshBXj8pdKk+joe3TCW7oviVS3zXLHlc94wQ0jNsQRQ==", "dependencies": { - "@babel/runtime": "^7.23.9" + "@babel/runtime": "^7.25.6" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@mui/material": "^5.0.0", - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0" + "@mui/material": "^6.1.1", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -3522,25 +3522,25 @@ } }, "node_modules/@mui/material": { - "version": "5.16.7", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.16.7.tgz", - "integrity": "sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/core-downloads-tracker": "^5.16.7", - "@mui/system": "^5.16.7", - "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.6", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.1.1.tgz", + "integrity": "sha512-b+eULldTqtqTCbN++2BtBWCir/1LwEYw+2mIlOt2GiEUh1EBBw4/wIukGKKNt3xrCZqRA80yLLkV6tF61Lq3cA==", + "dependencies": { + "@babel/runtime": "^7.25.6", + "@mui/core-downloads-tracker": "^6.1.1", + "@mui/system": "^6.1.1", + "@mui/types": "^7.2.17", + "@mui/utils": "^6.1.1", "@popperjs/core": "^2.11.8", - "@types/react-transition-group": "^4.4.10", - "clsx": "^2.1.0", + "@types/react-transition-group": "^4.4.11", + "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1", "react-is": "^18.3.1", "react-transition-group": "^4.4.5" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -3549,9 +3549,10 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" + "@mui/material-pigment-css": "^6.1.1", + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -3560,30 +3561,33 @@ "@emotion/styled": { "optional": true }, + "@mui/material-pigment-css": { + "optional": true + }, "@types/react": { "optional": true } } }, "node_modules/@mui/private-theming": { - "version": "5.16.6", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.16.6.tgz", - "integrity": "sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-6.1.1.tgz", + "integrity": "sha512-JlrjIdhyZUtewtdAuUsvi3ZnO0YS49IW4Mfz19ZWTlQ0sDGga6LNPVwHClWr2/zJK2we2BQx9/i8M32rgKuzrg==", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/utils": "^5.16.6", + "@babel/runtime": "^7.25.6", + "@mui/utils": "^6.1.1", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0" + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -3592,17 +3596,18 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.16.6", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.16.6.tgz", - "integrity": "sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-6.1.1.tgz", + "integrity": "sha512-HJyIoMpFb11fnHuRtUILOXgq6vj4LhIlE8maG4SwP/W+E5sa7HFexhnB3vOMT7bKys4UKNxhobC8jwWxYilGsA==", "dependencies": { - "@babel/runtime": "^7.23.9", - "@emotion/cache": "^11.11.0", + "@babel/runtime": "^7.25.6", + "@emotion/cache": "^11.13.1", + "@emotion/sheet": "^1.4.0", "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -3611,7 +3616,7 @@ "peerDependencies": { "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", - "react": "^17.0.0 || ^18.0.0" + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -3623,21 +3628,21 @@ } }, "node_modules/@mui/system": { - "version": "5.16.7", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.16.7.tgz", - "integrity": "sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA==", - "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/private-theming": "^5.16.6", - "@mui/styled-engine": "^5.16.6", - "@mui/types": "^7.2.15", - "@mui/utils": "^5.16.6", - "clsx": "^2.1.0", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-6.1.1.tgz", + "integrity": "sha512-PaYsCz2tUOcpu3T0okDEsSuP/yCDIj9JZ4Tox1JovRSKIjltHpXPsXZSGr3RiWdtM1MTQMFMCZzu0+CKbyy+Kw==", + "dependencies": { + "@babel/runtime": "^7.25.6", + "@mui/private-theming": "^6.1.1", + "@mui/styled-engine": "^6.1.1", + "@mui/types": "^7.2.17", + "@mui/utils": "^6.1.1", + "clsx": "^2.1.1", "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", @@ -3646,8 +3651,8 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0" + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -3662,11 +3667,11 @@ } }, "node_modules/@mui/types": { - "version": "7.2.15", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.15.tgz", - "integrity": "sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q==", + "version": "7.2.17", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.17.tgz", + "integrity": "sha512-oyumoJgB6jDV8JFzRqjBo2daUuHpzDjoO/e3IrRhhHo/FxJlaVhET6mcNrKHUq2E+R+q3ql0qAtvQ4rfWHhAeQ==", "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0" + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -3675,27 +3680,27 @@ } }, "node_modules/@mui/utils": { - "version": "5.16.6", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.16.6.tgz", - "integrity": "sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.1.1.tgz", + "integrity": "sha512-HlRrgdJSPbYDXPpoVMWZV8AE7WcFtAk13rWNWAEVWKSanzBBkymjz3km+Th/Srowsh4pf1fTSP1B0L116wQBYw==", "dependencies": { - "@babel/runtime": "^7.23.9", - "@mui/types": "^7.2.15", + "@babel/runtime": "^7.25.6", + "@mui/types": "^7.2.17", "@types/prop-types": "^15.7.12", "clsx": "^2.1.1", "prop-types": "^15.8.1", "react-is": "^18.3.1" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/mui-org" }, "peerDependencies": { - "@types/react": "^17.0.0 || ^18.0.0", - "react": "^17.0.0 || ^18.0.0" + "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -5468,9 +5473,9 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", - "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", + "version": "4.4.11", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz", + "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==", "dependencies": { "@types/react": "*" } diff --git a/package.json b/package.json index 5909ea442..96c4439d7 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "@fortawesome/free-solid-svg-icons": "^6.6.0", "@fortawesome/react-fontawesome": "^0.2.2", "@mdx-js/react": "^3.0.1", - "@mui/icons-material": "^5.16.7", - "@mui/material": "^5.16.7", + "@mui/icons-material": "^6.1.1", + "@mui/material": "^6.1.1", "@tippyjs/react": "^4.2.6", "chroma-js": "^3.1.1", "react": "^18.3.1", diff --git a/src/assets/theme/components/card/muiCard.ts b/src/assets/theme/components/card/muiCard.ts index c3315fe51..947b77690 100644 --- a/src/assets/theme/components/card/muiCard.ts +++ b/src/assets/theme/components/card/muiCard.ts @@ -29,11 +29,11 @@ Coded by www.creative-tim.com * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadows, rgba } from '../..'; -export const MuiCard: Components['MuiCard'] = { +export const MuiCard: ThemeComponentOptions['MuiCard'] = { styleOverrides: { root: ({ theme: { palette } }) => ({ display: 'flex', diff --git a/src/assets/theme/components/card/muiCardContent.ts b/src/assets/theme/components/card/muiCardContent.ts index 01ce95811..53bfc0dee 100644 --- a/src/assets/theme/components/card/muiCardContent.ts +++ b/src/assets/theme/components/card/muiCardContent.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -import type { Components, Theme } from '@mui/material'; - /** ========================================================= * Material Kit 2 React - v2.1.0 @@ -31,7 +29,9 @@ import type { Components, Theme } from '@mui/material'; * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -export const MuiCardContent: Components['MuiCardContent'] = { +import type { ThemeComponentOptions } from '../../theme'; + +export const MuiCardContent: ThemeComponentOptions['MuiCardContent'] = { styleOverrides: { root: { marginTop: 0, diff --git a/src/assets/theme/components/card/muiCardMedia.ts b/src/assets/theme/components/card/muiCardMedia.ts index 5e4e37d50..60aae9d0a 100644 --- a/src/assets/theme/components/card/muiCardMedia.ts +++ b/src/assets/theme/components/card/muiCardMedia.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders } from '../..'; -export const MuiCardMedia: Components['MuiCardMedia'] = { +export const MuiCardMedia: ThemeComponentOptions['MuiCardMedia'] = { styleOverrides: { root: { borderRadius: borders.radius.xl, diff --git a/src/assets/theme/components/dialog/muiDialog.ts b/src/assets/theme/components/dialog/muiDialog.ts index 8eb9d45b8..d4db88a4e 100644 --- a/src/assets/theme/components/dialog/muiDialog.ts +++ b/src/assets/theme/components/dialog/muiDialog.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadows } from '../..'; -export const MuiDialog: Components['MuiDialog'] = { +export const MuiDialog: ThemeComponentOptions['MuiDialog'] = { styleOverrides: { paper: { borderRadius: borders.radius.lg, diff --git a/src/assets/theme/components/dialog/muiDialogActions.ts b/src/assets/theme/components/dialog/muiDialogActions.ts index 052f40a33..1f5d24c43 100644 --- a/src/assets/theme/components/dialog/muiDialogActions.ts +++ b/src/assets/theme/components/dialog/muiDialogActions.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; /** ========================================================= @@ -31,7 +31,7 @@ import type { Components, Theme } from '@mui/material'; * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -export const MuiDialogActions: Components['MuiDialogActions'] = { +export const MuiDialogActions: ThemeComponentOptions['MuiDialogActions'] = { styleOverrides: { root: { padding: '1rem', diff --git a/src/assets/theme/components/dialog/muiDialogContent.ts b/src/assets/theme/components/dialog/muiDialogContent.ts index 235df7a4a..370923c40 100644 --- a/src/assets/theme/components/dialog/muiDialogContent.ts +++ b/src/assets/theme/components/dialog/muiDialogContent.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize, borders } from '../..'; -export const MuiDialogContent: Components['MuiDialogContent'] = { +export const MuiDialogContent: ThemeComponentOptions['MuiDialogContent'] = { styleOverrides: { root: ({ theme: { palette } }) => ({ padding: '1rem', diff --git a/src/assets/theme/components/dialog/muiDialogContentText.ts b/src/assets/theme/components/dialog/muiDialogContentText.ts index b05975d59..bfe119476 100644 --- a/src/assets/theme/components/dialog/muiDialogContentText.ts +++ b/src/assets/theme/components/dialog/muiDialogContentText.ts @@ -29,15 +29,16 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize } from '../..'; -export const MuiDialogContentText: Components['MuiDialogContentText'] = { - styleOverrides: { - root: ({ theme: { palette } }) => ({ - fontSize: fontSize.md, - color: palette.text.primary, - }), - }, -}; +export const MuiDialogContentText: ThemeComponentOptions['MuiDialogContentText'] = + { + styleOverrides: { + root: ({ theme: { palette } }) => ({ + fontSize: fontSize.md, + color: palette.text.primary, + }), + }, + }; diff --git a/src/assets/theme/components/dialog/muiDialogTitle.ts b/src/assets/theme/components/dialog/muiDialogTitle.ts index 558c4d4f8..8614ae1c4 100644 --- a/src/assets/theme/components/dialog/muiDialogTitle.ts +++ b/src/assets/theme/components/dialog/muiDialogTitle.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize } from '../..'; -export const MuiDialogTitle: Components['MuiDialogTitle'] = { +export const MuiDialogTitle: ThemeComponentOptions['MuiDialogTitle'] = { styleOverrides: { root: { padding: '1rem', diff --git a/src/assets/theme/components/form/muiAutocomplete.ts b/src/assets/theme/components/form/muiAutocomplete.ts index b301c2cc3..c8b5e9fb6 100644 --- a/src/assets/theme/components/form/muiAutocomplete.ts +++ b/src/assets/theme/components/form/muiAutocomplete.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadows, dark, darker, fontSize } from '../..'; -export const MuiAutocomplete: Components['MuiAutocomplete'] = { +export const MuiAutocomplete: ThemeComponentOptions['MuiAutocomplete'] = { styleOverrides: { popper: ({ theme: { palette } }) => ({ boxShadow: boxShadows.lg, diff --git a/src/assets/theme/components/form/muiCheckbox.ts b/src/assets/theme/components/form/muiCheckbox.ts index 5a5ca330e..d4299b1d0 100644 --- a/src/assets/theme/components/form/muiCheckbox.ts +++ b/src/assets/theme/components/form/muiCheckbox.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, linearGradient } from '../..'; -export const MuiCheckbox: Components['MuiCheckbox'] = { +export const MuiCheckbox: ThemeComponentOptions['MuiCheckbox'] = { styleOverrides: { root: ({ theme: { palette }, ownerState: { color } }) => { const usedColor = diff --git a/src/assets/theme/components/form/muiFormControlLabel.ts b/src/assets/theme/components/form/muiFormControlLabel.ts index 9fa02f26f..df338338f 100644 --- a/src/assets/theme/components/form/muiFormControlLabel.ts +++ b/src/assets/theme/components/form/muiFormControlLabel.ts @@ -29,30 +29,31 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { dark, fontSize, fontWeight } from '../..'; -export const MuiFormControlLabel: Components['MuiFormControlLabel'] = { - styleOverrides: { - root: { - display: 'block', - minHeight: '1.5rem', - marginBottom: '0.125rem', - }, - - label: { - display: 'inline-block', - fontSize: fontSize.sm, - fontWeight: fontWeight.bold, - color: dark, - lineHeight: 1, - transform: 'translateY(0.0625rem)', - marginLeft: '0.25rem', +export const MuiFormControlLabel: ThemeComponentOptions['MuiFormControlLabel'] = + { + styleOverrides: { + root: { + display: 'block', + minHeight: '1.5rem', + marginBottom: '0.125rem', + }, - '&.Mui-disabled': { + label: { + display: 'inline-block', + fontSize: fontSize.sm, + fontWeight: fontWeight.bold, color: dark, + lineHeight: 1, + transform: 'translateY(0.0625rem)', + marginLeft: '0.25rem', + + '&.Mui-disabled': { + color: dark, + }, }, }, - }, -}; + }; diff --git a/src/assets/theme/components/form/muiFormLabel.ts b/src/assets/theme/components/form/muiFormLabel.ts index 57c2d6bdf..82074fc99 100644 --- a/src/assets/theme/components/form/muiFormLabel.ts +++ b/src/assets/theme/components/form/muiFormLabel.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize } from '../..'; -export const MuiFormLabel: Components['MuiFormLabel'] = { +export const MuiFormLabel: ThemeComponentOptions['MuiFormLabel'] = { styleOverrides: { root: ({ theme }) => ({ color: theme.palette.text.primary, diff --git a/src/assets/theme/components/form/muiInput.ts b/src/assets/theme/components/form/muiInput.ts index fd42612eb..f630a3aa7 100644 --- a/src/assets/theme/components/form/muiInput.ts +++ b/src/assets/theme/components/form/muiInput.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { dark, fontSize } from '../..'; -export const MuiInput: Components['MuiInput'] = { +export const MuiInput: ThemeComponentOptions['MuiInput'] = { styleOverrides: { root: ({ theme: { palette }, ownerState: { color } }) => ({ fontSize: `${fontSize.sm} !important`, diff --git a/src/assets/theme/components/form/muiInputBase.ts b/src/assets/theme/components/form/muiInputBase.ts index c8a9a6a11..1c7fedbf7 100644 --- a/src/assets/theme/components/form/muiInputBase.ts +++ b/src/assets/theme/components/form/muiInputBase.ts @@ -14,11 +14,11 @@ * limitations under the License. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize } from '../..'; -export const MuiInputBase: Components['MuiInputBase'] = { +export const MuiInputBase: ThemeComponentOptions['MuiInputBase'] = { styleOverrides: { root: { fontSize: `${fontSize.sm} !important`, diff --git a/src/assets/theme/components/form/muiInputLabel.ts b/src/assets/theme/components/form/muiInputLabel.ts index 1f563714e..940c3232d 100644 --- a/src/assets/theme/components/form/muiInputLabel.ts +++ b/src/assets/theme/components/form/muiInputLabel.ts @@ -29,11 +29,12 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Palette, PaletteColor, Theme } from '@mui/material'; +import type { Palette, PaletteColor } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize } from '../..'; -export const MuiInputLabel: Components['MuiInputLabel'] = { +export const MuiInputLabel: ThemeComponentOptions['MuiInputLabel'] = { styleOverrides: { root: ({ theme: { palette }, ownerState: { color } }) => ({ fontSize: `${fontSize.sm} !important`, diff --git a/src/assets/theme/components/form/muiOutlinedInput.ts b/src/assets/theme/components/form/muiOutlinedInput.ts index 0adac5cea..7fe0fe17d 100644 --- a/src/assets/theme/components/form/muiOutlinedInput.ts +++ b/src/assets/theme/components/form/muiOutlinedInput.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize } from '../..'; -export const MuiOutlinedInput: Components['MuiOutlinedInput'] = { +export const MuiOutlinedInput: ThemeComponentOptions['MuiOutlinedInput'] = { styleOverrides: { root: ({ theme: { palette }, ownerState: { color } }) => ({ backgroundColor: `${palette.quaternary.main} !important`, diff --git a/src/assets/theme/components/form/muiRadio.ts b/src/assets/theme/components/form/muiRadio.ts index 8fce08f10..eccb803f3 100644 --- a/src/assets/theme/components/form/muiRadio.ts +++ b/src/assets/theme/components/form/muiRadio.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, linearGradient } from '../..'; -export const MuiRadio: Components['MuiRadio'] = { +export const MuiRadio: ThemeComponentOptions['MuiRadio'] = { styleOverrides: { root: ({ theme: { palette }, ownerState: { color } }) => { const usedColor = diff --git a/src/assets/theme/components/form/muiSelect.ts b/src/assets/theme/components/form/muiSelect.ts index 8676f4fd4..d03283f52 100644 --- a/src/assets/theme/components/form/muiSelect.ts +++ b/src/assets/theme/components/form/muiSelect.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; -export const MuiSelect: Components['MuiSelect'] = { +export const MuiSelect: ThemeComponentOptions['MuiSelect'] = { styleOverrides: { select: { display: 'grid', diff --git a/src/assets/theme/components/form/muiSwitch.ts b/src/assets/theme/components/form/muiSwitch.ts index 7e398e25f..19eaa2b8e 100644 --- a/src/assets/theme/components/form/muiSwitch.ts +++ b/src/assets/theme/components/form/muiSwitch.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadows, darker, linearGradient } from '../..'; -export const MuiSwitch: Components['MuiSwitch'] = { +export const MuiSwitch: ThemeComponentOptions['MuiSwitch'] = { defaultProps: { disableRipple: false, }, diff --git a/src/assets/theme/components/form/muiTextField.ts b/src/assets/theme/components/form/muiTextField.ts index bf4e9f1e3..b4592c5ca 100644 --- a/src/assets/theme/components/form/muiTextField.ts +++ b/src/assets/theme/components/form/muiTextField.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; -export const MuiTextField: Components['MuiTextField'] = { +export const MuiTextField: ThemeComponentOptions['MuiTextField'] = { styleOverrides: { root: { backgroundColor: 'transparent', diff --git a/src/assets/theme/components/list/muiList.ts b/src/assets/theme/components/list/muiList.ts index 2f23c532b..aa428bc16 100644 --- a/src/assets/theme/components/list/muiList.ts +++ b/src/assets/theme/components/list/muiList.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; -export const MuiList: Components['MuiList'] = { +export const MuiList: ThemeComponentOptions['MuiList'] = { styleOverrides: { padding: { paddingTop: 0, diff --git a/src/assets/theme/components/list/muiListItem.ts b/src/assets/theme/components/list/muiListItem.ts index bba15195a..4e76f1dcd 100644 --- a/src/assets/theme/components/list/muiListItem.ts +++ b/src/assets/theme/components/list/muiListItem.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; -export const MuiListItem: Components['MuiListItem'] = { +export const MuiListItem: ThemeComponentOptions['MuiListItem'] = { defaultProps: { disableGutters: true, }, diff --git a/src/assets/theme/components/list/muiListItemText.ts b/src/assets/theme/components/list/muiListItemText.ts index c17ad90b4..af5b5c6dc 100644 --- a/src/assets/theme/components/list/muiListItemText.ts +++ b/src/assets/theme/components/list/muiListItemText.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; -export const MuiListItemText: Components['MuiListItemText'] = { +export const MuiListItemText: ThemeComponentOptions['MuiListItemText'] = { styleOverrides: { root: { marginTop: 0, diff --git a/src/assets/theme/components/menu/muiMenu.ts b/src/assets/theme/components/menu/muiMenu.ts index fefef1b7a..ff8336594 100644 --- a/src/assets/theme/components/menu/muiMenu.ts +++ b/src/assets/theme/components/menu/muiMenu.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadows, fontSize } from '../..'; -export const MuiMenu: Components['MuiMenu'] = { +export const MuiMenu: ThemeComponentOptions['MuiMenu'] = { defaultProps: { disableAutoFocusItem: true, }, diff --git a/src/assets/theme/components/menu/muiMenuItem.ts b/src/assets/theme/components/menu/muiMenuItem.ts index ae4a0bd1f..d09e0d1db 100644 --- a/src/assets/theme/components/menu/muiMenuItem.ts +++ b/src/assets/theme/components/menu/muiMenuItem.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, dark, fontSize } from '../..'; -export const MuiMenuItem: Components['MuiMenuItem'] = { +export const MuiMenuItem: ThemeComponentOptions['MuiMenuItem'] = { styleOverrides: { root: ({ theme: { palette } }) => ({ minWidth: '10rem', diff --git a/src/assets/theme/components/muiAppBar.ts b/src/assets/theme/components/muiAppBar.ts index 143c63d66..a4407ed6a 100644 --- a/src/assets/theme/components/muiAppBar.ts +++ b/src/assets/theme/components/muiAppBar.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; /** ========================================================= @@ -30,7 +30,7 @@ Coded by www.creative-tim.com * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -export const MuiAppBar: Components['MuiAppBar'] = { +export const MuiAppBar: ThemeComponentOptions['MuiAppBar'] = { defaultProps: { color: 'transparent', }, diff --git a/src/assets/theme/components/muiAvatar.ts b/src/assets/theme/components/muiAvatar.ts index d50f3dc63..9ba552eea 100644 --- a/src/assets/theme/components/muiAvatar.ts +++ b/src/assets/theme/components/muiAvatar.ts @@ -29,11 +29,10 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; - +import type { ThemeComponentOptions } from '../theme'; import { borders } from '..'; -export const MuiAvatar: Components['MuiAvatar'] = { +export const MuiAvatar: ThemeComponentOptions['MuiAvatar'] = { styleOverrides: { root: { transition: 'all 200ms ease-in-out', diff --git a/src/assets/theme/components/muiBreadcrumbs.ts b/src/assets/theme/components/muiBreadcrumbs.ts index c9845e61f..c68fe2df5 100644 --- a/src/assets/theme/components/muiBreadcrumbs.ts +++ b/src/assets/theme/components/muiBreadcrumbs.ts @@ -29,11 +29,10 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; - +import type { ThemeComponentOptions } from '../theme'; import { fontSize } from '..'; -export const MuiBreadcrumbs: Components['MuiBreadcrumbs'] = { +export const MuiBreadcrumbs: ThemeComponentOptions['MuiBreadcrumbs'] = { styleOverrides: { li: { lineHeight: 0, diff --git a/src/assets/theme/components/muiButton.ts b/src/assets/theme/components/muiButton.ts index ed14e6e81..2e01e339a 100644 --- a/src/assets/theme/components/muiButton.ts +++ b/src/assets/theme/components/muiButton.ts @@ -29,11 +29,10 @@ Coded by www.creative-tim.com * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; - +import type { ThemeComponentOptions } from '../theme'; import { borders, fontSize, fontWeight } from '..'; -export const MuiButton: Components['MuiButton'] = { +export const MuiButton: ThemeComponentOptions['MuiButton'] = { defaultProps: { disableRipple: false, }, diff --git a/src/assets/theme/components/muiButtonBase.ts b/src/assets/theme/components/muiButtonBase.ts index 0630f4945..b874981de 100644 --- a/src/assets/theme/components/muiButtonBase.ts +++ b/src/assets/theme/components/muiButtonBase.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; -export const MuiButtonBase: Components['MuiButtonBase'] = { +export const MuiButtonBase: ThemeComponentOptions['MuiButtonBase'] = { defaultProps: { disableRipple: false, }, diff --git a/src/assets/theme/components/muiContainer.ts b/src/assets/theme/components/muiContainer.ts index 1c2b99a38..13eaf645a 100644 --- a/src/assets/theme/components/muiContainer.ts +++ b/src/assets/theme/components/muiContainer.ts @@ -29,9 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Breakpoint, Components, Theme } from '@mui/material'; +import type { Breakpoint, Theme } from '@mui/material'; import type { OverridesStyleRules } from '@mui/material/styles/overrides'; +import type { ThemeComponentOptions } from '../theme'; + // Material Kit 2 React base styles import { breakpoints } from '../base/breakpoints'; @@ -40,7 +42,7 @@ const { } = breakpoints; const buildMaxWidthByBreakpoint = ( - theme: Theme, + theme: Omit, breakpoint: Breakpoint, maxWidth: number, ): OverridesStyleRules => ({ @@ -49,9 +51,9 @@ const buildMaxWidthByBreakpoint = ( }, }); -export const MuiContainer: Components['MuiContainer'] = { +export const MuiContainer: ThemeComponentOptions['MuiContainer'] = { styleOverrides: { - root: ({ theme }: { theme: Theme }) => ({ + root: ({ theme }) => ({ paddingRight: '2rem !important', paddingLeft: '2rem !important', marginRight: 'auto !important', diff --git a/src/assets/theme/components/muiCssBaseline.ts b/src/assets/theme/components/muiCssBaseline.ts index b1d308854..48f75ee84 100644 --- a/src/assets/theme/components/muiCssBaseline.ts +++ b/src/assets/theme/components/muiCssBaseline.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; -export const MuiCssBaseline: Components['MuiCssBaseline'] = { +export const MuiCssBaseline: ThemeComponentOptions['MuiCssBaseline'] = { styleOverrides: ({ palette }) => ({ html: { scrollBehavior: 'smooth', diff --git a/src/assets/theme/components/muiDivider.ts b/src/assets/theme/components/muiDivider.ts index d30cb722d..0c5ae43f4 100644 --- a/src/assets/theme/components/muiDivider.ts +++ b/src/assets/theme/components/muiDivider.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; import { dark, rgba } from '..'; -export const MuiDivider: Components['MuiDivider'] = { +export const MuiDivider: ThemeComponentOptions['MuiDivider'] = { styleOverrides: { root: { background: rgba(dark, 0.2), diff --git a/src/assets/theme/components/muiIcon.ts b/src/assets/theme/components/muiIcon.ts index abf4432f7..0a07b3924 100644 --- a/src/assets/theme/components/muiIcon.ts +++ b/src/assets/theme/components/muiIcon.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; import { fontSize } from '..'; -export const MuiIcon: Components['MuiIcon'] = { +export const MuiIcon: ThemeComponentOptions['MuiIcon'] = { defaultProps: { baseClassName: 'material-icons-round', fontSize: 'inherit', diff --git a/src/assets/theme/components/muiIconButton.ts b/src/assets/theme/components/muiIconButton.ts index 0119d0862..34148e702 100644 --- a/src/assets/theme/components/muiIconButton.ts +++ b/src/assets/theme/components/muiIconButton.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; -export const MuiIconButton: Components['MuiIconButton'] = { +export const MuiIconButton: ThemeComponentOptions['MuiIconButton'] = { styleOverrides: { root: { '&:hover': { diff --git a/src/assets/theme/components/muiLinearProgress.ts b/src/assets/theme/components/muiLinearProgress.ts index 60c96ae23..32900d103 100644 --- a/src/assets/theme/components/muiLinearProgress.ts +++ b/src/assets/theme/components/muiLinearProgress.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; import { borders } from '..'; -export const MuiLinearProgress: Components['MuiLinearProgress'] = { +export const MuiLinearProgress: ThemeComponentOptions['MuiLinearProgress'] = { styleOverrides: { root: ({ theme: { palette } }) => ({ height: '0.375rem', diff --git a/src/assets/theme/components/muiLink.ts b/src/assets/theme/components/muiLink.ts index d14fc84b3..e2310fc10 100644 --- a/src/assets/theme/components/muiLink.ts +++ b/src/assets/theme/components/muiLink.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; /** ========================================================= @@ -31,7 +31,7 @@ Coded by www.creative-tim.com * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -export const MuiLink: Components['MuiLink'] = { +export const MuiLink: ThemeComponentOptions['MuiLink'] = { defaultProps: { underline: 'none', color: 'inherit', diff --git a/src/assets/theme/components/muiPopover.ts b/src/assets/theme/components/muiPopover.ts index 036841660..4531e937c 100644 --- a/src/assets/theme/components/muiPopover.ts +++ b/src/assets/theme/components/muiPopover.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; import { borders, boxShadows } from '..'; -export const MuiPopover: Components['MuiPopover'] = { +export const MuiPopover: ThemeComponentOptions['MuiPopover'] = { styleOverrides: { paper: { backgroundColor: 'transparent', diff --git a/src/assets/theme/components/muiSlider.ts b/src/assets/theme/components/muiSlider.ts index 5e3218b89..aac290278 100644 --- a/src/assets/theme/components/muiSlider.ts +++ b/src/assets/theme/components/muiSlider.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; import { borders, boxShadow } from '..'; -export const MuiSlider: Components['MuiSlider'] = { +export const MuiSlider: ThemeComponentOptions['MuiSlider'] = { styleOverrides: { root: { width: '100%', diff --git a/src/assets/theme/components/muiSvgIcon.ts b/src/assets/theme/components/muiSvgIcon.ts index 939eebe96..f4eb684fd 100644 --- a/src/assets/theme/components/muiSvgIcon.ts +++ b/src/assets/theme/components/muiSvgIcon.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; import { fontSize } from '..'; -export const MuiSvgIcon: Components['MuiSvgIcon'] = { +export const MuiSvgIcon: ThemeComponentOptions['MuiSvgIcon'] = { defaultProps: { fontSize: 'inherit', }, diff --git a/src/assets/theme/components/muiTooltip.ts b/src/assets/theme/components/muiTooltip.ts index bbae6fe08..6429a0432 100644 --- a/src/assets/theme/components/muiTooltip.ts +++ b/src/assets/theme/components/muiTooltip.ts @@ -29,7 +29,7 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../theme'; // @mui material components import Fade from '@mui/material/Fade'; @@ -37,7 +37,7 @@ import Fade from '@mui/material/Fade'; // Material Kit 2 React base styles import { borders, fontSize } from '..'; -export const MuiTooltip: Components['MuiTooltip'] = { +export const MuiTooltip: ThemeComponentOptions['MuiTooltip'] = { defaultProps: { arrow: true, TransitionComponent: Fade, diff --git a/src/assets/theme/components/stepper/muiStep.ts b/src/assets/theme/components/stepper/muiStep.ts index 2db6de141..513d0ef55 100644 --- a/src/assets/theme/components/stepper/muiStep.ts +++ b/src/assets/theme/components/stepper/muiStep.ts @@ -29,9 +29,9 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; -export const MuiStep: Components['MuiStep'] = { +export const MuiStep: ThemeComponentOptions['MuiStep'] = { styleOverrides: { root: { padding: '0 0.375rem', diff --git a/src/assets/theme/components/stepper/muiStepConnector.ts b/src/assets/theme/components/stepper/muiStepConnector.ts index f6ce5d55c..09430e2cd 100644 --- a/src/assets/theme/components/stepper/muiStepConnector.ts +++ b/src/assets/theme/components/stepper/muiStepConnector.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders } from '../..'; -export const MuiStepConnector: Components['MuiStepConnector'] = { +export const MuiStepConnector: ThemeComponentOptions['MuiStepConnector'] = { styleOverrides: { root: { color: '#9fc9ff', diff --git a/src/assets/theme/components/stepper/muiStepIcon.ts b/src/assets/theme/components/stepper/muiStepIcon.ts index ac2aaa3f5..d4ae467d2 100644 --- a/src/assets/theme/components/stepper/muiStepIcon.ts +++ b/src/assets/theme/components/stepper/muiStepIcon.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { boxShadow } from '../..'; -export const MuiStepIcon: Components['MuiStepIcon'] = { +export const MuiStepIcon: ThemeComponentOptions['MuiStepIcon'] = { styleOverrides: { root: { background: '#9fc9ff', diff --git a/src/assets/theme/components/stepper/muiStepLabel.ts b/src/assets/theme/components/stepper/muiStepLabel.ts index ad3b025e3..46c01a68e 100644 --- a/src/assets/theme/components/stepper/muiStepLabel.ts +++ b/src/assets/theme/components/stepper/muiStepLabel.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { fontSize, rgba, fontWeight } from '../..'; -export const MuiStepLabel: Components['MuiStepLabel'] = { +export const MuiStepLabel: ThemeComponentOptions['MuiStepLabel'] = { styleOverrides: { label: { marginTop: '0.5rem !important', diff --git a/src/assets/theme/components/stepper/muiStepper.ts b/src/assets/theme/components/stepper/muiStepper.ts index fe45bae61..a0c65fe22 100644 --- a/src/assets/theme/components/stepper/muiStepper.ts +++ b/src/assets/theme/components/stepper/muiStepper.ts @@ -29,12 +29,12 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import type { PaletteColorKey } from '@mui/material/styles'; import { borders, boxShadows, isPaletteColorName, linearGradient } from '../..'; -export const MuiStepper: Components['MuiStepper'] = { +export const MuiStepper: ThemeComponentOptions['MuiStepper'] = { styleOverrides: { root: ({ theme: { palette }, ownerState: { color } }) => { const usedColor = diff --git a/src/assets/theme/components/table/muiTableCell.ts b/src/assets/theme/components/table/muiTableCell.ts index bffaa100b..7b713e4f5 100644 --- a/src/assets/theme/components/table/muiTableCell.ts +++ b/src/assets/theme/components/table/muiTableCell.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders } from '../..'; -export const MuiTableCell: Components['MuiTableCell'] = { +export const MuiTableCell: ThemeComponentOptions['MuiTableCell'] = { styleOverrides: { root: ({ theme: { palette } }) => ({ padding: '0.75rem 1rem', diff --git a/src/assets/theme/components/table/muiTableContainer.ts b/src/assets/theme/components/table/muiTableContainer.ts index 34d87c8ac..dd0bbbae5 100644 --- a/src/assets/theme/components/table/muiTableContainer.ts +++ b/src/assets/theme/components/table/muiTableContainer.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadows } from '../..'; -export const MuiTableContainer: Components['MuiTableContainer'] = { +export const MuiTableContainer: ThemeComponentOptions['MuiTableContainer'] = { styleOverrides: { root: { backgroundColor: 'white', diff --git a/src/assets/theme/components/table/muiTableHead.ts b/src/assets/theme/components/table/muiTableHead.ts index 263597793..a13a434ab 100644 --- a/src/assets/theme/components/table/muiTableHead.ts +++ b/src/assets/theme/components/table/muiTableHead.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders } from '../..'; -export const MuiTableHead: Components['MuiTableHead'] = { +export const MuiTableHead: ThemeComponentOptions['MuiTableHead'] = { styleOverrides: { root: { display: 'block', diff --git a/src/assets/theme/components/tabs/muiTab.ts b/src/assets/theme/components/tabs/muiTab.ts index 7b15f6e53..db5972d51 100644 --- a/src/assets/theme/components/tabs/muiTab.ts +++ b/src/assets/theme/components/tabs/muiTab.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, fontWeight, fontSize, dark } from '../..'; -export const MuiTab: Components['MuiTab'] = { +export const MuiTab: ThemeComponentOptions['MuiTab'] = { styleOverrides: { root: { display: 'flex', diff --git a/src/assets/theme/components/tabs/muiTabs.ts b/src/assets/theme/components/tabs/muiTabs.ts index f30d41946..5783468a6 100644 --- a/src/assets/theme/components/tabs/muiTabs.ts +++ b/src/assets/theme/components/tabs/muiTabs.ts @@ -29,11 +29,11 @@ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. */ -import type { Components, Theme } from '@mui/material'; +import type { ThemeComponentOptions } from '../../theme'; import { borders, boxShadow } from '../..'; -export const MuiTabs: Components['MuiTabs'] = { +export const MuiTabs: ThemeComponentOptions['MuiTabs'] = { styleOverrides: { root: ({ theme: { palette } }) => ({ position: 'relative', diff --git a/src/assets/theme/theme.ts b/src/assets/theme/theme.ts index 2e8f52ff8..2287c5762 100644 --- a/src/assets/theme/theme.ts +++ b/src/assets/theme/theme.ts @@ -30,8 +30,9 @@ Coded by www.creative-tim.com */ // @mui material components -import type { Theme } from '@mui/material'; +import type { Components, Theme } from '@mui/material'; import { createTheme } from '@mui/material'; +import type { CssVarsTheme } from '@mui/material/styles/createThemeWithVars'; import { responsiveFontSizes } from './responsiveFont'; @@ -93,6 +94,10 @@ import { MuiTooltip, } from './components'; +export type ThemeComponentOptions = Components< + Omit & CssVarsTheme +>; + const generatedTheme = createTheme({ breakpoints, palette,