diff --git a/packages/manager/package.json b/packages/manager/package.json index 41241a56de8..21b07e4e746 100644 --- a/packages/manager/package.json +++ b/packages/manager/package.json @@ -25,6 +25,7 @@ "@lukemorales/query-key-factory": "^1.3.4", "@mui/icons-material": "^5.14.7", "@mui/material": "^5.14.7", + "@mui/utils": "^5.14.7", "@mui/x-date-pickers": "^7.12.0", "@paypal/react-paypal-js": "^7.8.3", "@reach/tabs": "^0.10.5", diff --git a/packages/ui/src/foundations/themes/index.ts b/packages/ui/src/foundations/themes/index.ts index a874f0c0bba..c94d55ac8ae 100644 --- a/packages/ui/src/foundations/themes/index.ts +++ b/packages/ui/src/foundations/themes/index.ts @@ -1,4 +1,5 @@ import { createTheme } from '@mui/material/styles'; +import { deepmerge } from '@mui/utils'; // Themes & Brands import { darkTheme } from './dark'; @@ -107,4 +108,4 @@ declare module '@mui/material/styles/createTheme' { export const inputMaxWidth = _inputMaxWidth; export const light = createTheme(lightTheme); -export const dark = createTheme(lightTheme, darkTheme); +export const dark = createTheme(deepmerge(lightTheme, darkTheme)); diff --git a/yarn.lock b/yarn.lock index 39b3c3fa612..4219a830d0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1165,7 +1165,7 @@ resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.17.tgz#329826062d4079de5ea2b97007575cebbba1fdbc" integrity sha512-oyumoJgB6jDV8JFzRqjBo2daUuHpzDjoO/e3IrRhhHo/FxJlaVhET6mcNrKHUq2E+R+q3ql0qAtvQ4rfWHhAeQ== -"@mui/utils@^5.16.6": +"@mui/utils@^5.14.7", "@mui/utils@^5.16.6": version "5.16.6" resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.16.6.tgz#905875bbc58d3dcc24531c3314a6807aba22a711" integrity sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA== @@ -10426,9 +10426,9 @@ yallist@^3.0.2: integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== yaml@^1.10.0, yaml@^1.7.2, yaml@^2.3.0, yaml@~2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130" - integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q== + version "2.6.0" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.0.tgz#14059ad9d0b1680d0f04d3a60fe00f3a857303c3" + integrity sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ== yargs-parser@^21.1.1: version "21.1.1"