Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump MUI Core #4601

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions docs/data/toolpad/core/components/sign-in-page/customTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,18 +436,6 @@ export const inputsCustomizations = {
}),
},
},
MuiLoadingButton: {
styleOverrides: {
root: ({ theme }) => ({
'& .MuiLoadingButton-loadingIndicator': {
color: gray[400],
...theme.applyStyles('dark', {
color: gray[600],
}),
},
}),
},
},
MuiCheckbox: {
defaultProps: {
disableRipple: true,
Expand Down
14 changes: 0 additions & 14 deletions docs/data/toolpad/core/components/sign-in-page/customTheme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -465,20 +465,6 @@ export const inputsCustomizations: Components<Theme> = {
}),
},
},
// @ts-ignore TODO: MuiLoadingButton is not present in the default `theme`
MuiLoadingButton: {
styleOverrides: {
// @ts-ignore
root: ({ theme }) => ({
'& .MuiLoadingButton-loadingIndicator': {
color: gray[400],
...theme.applyStyles('dark', {
color: gray[600],
}),
},
}),
},
},
MuiCheckbox: {
defaultProps: {
disableRipple: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import { DialogsProvider, useDialogs } from '@toolpad/core/useDialogs';
import Button from '@mui/material/Button';
import LoadingButton from '@mui/lab/LoadingButton';
import Dialog from '@mui/material/Dialog';
import DialogTitle from '@mui/material/DialogTitle';
import DialogContent from '@mui/material/DialogContent';
Expand Down Expand Up @@ -38,7 +37,7 @@ function TransactionDialog({ payload, open, onClose }) {
<DialogTitle>Confirm transfer</DialogTitle>
<DialogContent>{payload.component}</DialogContent>
<DialogActions>
<LoadingButton
<Button
loading={loading}
disabled={!isValidCsrf}
onClick={async () => {
Expand All @@ -52,7 +51,7 @@ function TransactionDialog({ payload, open, onClose }) {
}}
>
Submit
</LoadingButton>
</Button>
</DialogActions>
</Dialog>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
import { DialogsProvider, useDialogs, DialogProps } from '@toolpad/core/useDialogs';
import Button from '@mui/material/Button';
import LoadingButton from '@mui/lab/LoadingButton';
import Dialog from '@mui/material/Dialog';
import DialogTitle from '@mui/material/DialogTitle';
import DialogContent from '@mui/material/DialogContent';
Expand Down Expand Up @@ -45,7 +44,7 @@ function TransactionDialog({
<DialogTitle>Confirm transfer</DialogTitle>
<DialogContent>{payload.component}</DialogContent>
<DialogActions>
<LoadingButton
<Button
loading={loading}
disabled={!isValidCsrf}
onClick={async () => {
Expand All @@ -59,7 +58,7 @@ function TransactionDialog({
}}
>
Submit
</LoadingButton>
</Button>
</DialogActions>
</Dialog>
);
Expand Down
16 changes: 8 additions & 8 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
"@emotion/server": "11.11.0",
"@emotion/styled": "11.14.0",
"@mui/base": "5.0.0-beta.68",
"@mui/docs": "6.3.1",
"@mui/icons-material": "6.3.1",
"@mui/internal-markdown": "1.0.24",
"@mui/docs": "6.4.0",
"@mui/icons-material": "6.4.0",
"@mui/internal-markdown": "1.0.25",
"@mui/joy": "5.0.0-beta.51",
"@mui/lab": "6.0.0-beta.22",
"@mui/material": "6.3.1",
"@mui/lab": "6.0.0-beta.23",
"@mui/material": "6.4.0",
"@mui/material-nextjs": "6.3.1",
"@mui/styles": "6.3.1",
"@mui/system": "6.3.1",
"@mui/utils": "6.3.1",
"@mui/styles": "6.4.0",
"@mui/system": "6.4.0",
"@mui/utils": "6.4.0",
"@mui/x-date-pickers": "7.23.6",
"@mui/x-date-pickers-pro": "7.23.6",
"@mui/x-license": "7.23.6",
Expand Down
42 changes: 42 additions & 0 deletions docs/pages/toolpad/core/api/sign-in-button.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,48 @@
"isGlobal": false,
"isDeprecated": true
},
{
"key": "loading",
"className": "",
"description": "Styles applied to the root element if `loading={true}`.",
"isGlobal": false
},
{
"key": "loadingIconPlaceholder",
"className": "",
"description": "Styles applied to the loadingIconPlaceholder element.",
"isGlobal": false
},
{
"key": "loadingIndicator",
"className": "",
"description": "Styles applied to the loadingIndicator element.",
"isGlobal": false
},
{
"key": "loadingPositionCenter",
"className": "",
"description": "Styles applied to the root element if `loadingPosition=\"center\"`.",
"isGlobal": false
},
{
"key": "loadingPositionEnd",
"className": "",
"description": "Styles applied to the root element if `loadingPosition=\"end\"`.",
"isGlobal": false
},
{
"key": "loadingPositionStart",
"className": "",
"description": "Styles applied to the root element if `loadingPosition=\"start\"`.",
"isGlobal": false
},
{
"key": "loadingWrapper",
"className": "",
"description": "Styles applied to the loadingWrapper element.",
"isGlobal": false
},
{
"key": "outlined",
"className": "",
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/toolpad/core/api/sign-in-page.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
{
"name": "submitButton",
"description": "The custom submit button component used in the credentials form.",
"default": "LoadingButton",
"default": "Button",
"class": null
},
{
Expand Down
42 changes: 42 additions & 0 deletions docs/pages/toolpad/core/api/sign-out-button.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,48 @@
"isGlobal": false,
"isDeprecated": true
},
{
"key": "loading",
"className": "",
"description": "Styles applied to the root element if `loading={true}`.",
"isGlobal": false
},
{
"key": "loadingIconPlaceholder",
"className": "",
"description": "Styles applied to the loadingIconPlaceholder element.",
"isGlobal": false
},
{
"key": "loadingIndicator",
"className": "",
"description": "Styles applied to the loadingIndicator element.",
"isGlobal": false
},
{
"key": "loadingPositionCenter",
"className": "",
"description": "Styles applied to the root element if `loadingPosition=\"center\"`.",
"isGlobal": false
},
{
"key": "loadingPositionEnd",
"className": "",
"description": "Styles applied to the root element if `loadingPosition=\"end\"`.",
"isGlobal": false
},
{
"key": "loadingPositionStart",
"className": "",
"description": "Styles applied to the root element if `loadingPosition=\"start\"`.",
"isGlobal": false
},
{
"key": "loadingWrapper",
"className": "",
"description": "Styles applied to the loadingWrapper element.",
"isGlobal": false
},
{
"key": "outlined",
"className": "",
Expand Down
32 changes: 32 additions & 0 deletions docs/translations/api-docs/sign-in-button/sign-in-button.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,38 @@
"conditions": "supplied and <code>size=\"small\"</code>",
"deprecationInfo": "Combine the <a href=\"/material-ui/api/button/#button-classes-icon\">.MuiButton-icon</a> and <a href=\"/material-ui/api/button/#button-classes-sizeSmall\">.MuiButtonSizeSmall</a> classes instead. See <a href=\"/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
},
"loading": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loading={true}</code>"
},
"loadingIconPlaceholder": {
"description": "Styles applied to {{nodeName}}.",
"nodeName": "the loadingIconPlaceholder element"
},
"loadingIndicator": {
"description": "Styles applied to {{nodeName}}.",
"nodeName": "the loadingIndicator element"
},
"loadingPositionCenter": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loadingPosition=\"center\"</code>"
},
"loadingPositionEnd": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loadingPosition=\"end\"</code>"
},
"loadingPositionStart": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loadingPosition=\"start\"</code>"
},
"loadingWrapper": {
"description": "Styles applied to {{nodeName}}.",
"nodeName": "the loadingWrapper element"
},
"outlined": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
Expand Down
32 changes: 32 additions & 0 deletions docs/translations/api-docs/sign-out-button/sign-out-button.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,38 @@
"conditions": "supplied and <code>size=\"small\"</code>",
"deprecationInfo": "Combine the <a href=\"/material-ui/api/button/#button-classes-icon\">.MuiButton-icon</a> and <a href=\"/material-ui/api/button/#button-classes-sizeSmall\">.MuiButtonSizeSmall</a> classes instead. See <a href=\"/material-ui/migration/migrating-from-deprecated-apis/\">Migrating from deprecated APIs</a> for more details."
},
"loading": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loading={true}</code>"
},
"loadingIconPlaceholder": {
"description": "Styles applied to {{nodeName}}.",
"nodeName": "the loadingIconPlaceholder element"
},
"loadingIndicator": {
"description": "Styles applied to {{nodeName}}.",
"nodeName": "the loadingIndicator element"
},
"loadingPositionCenter": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loadingPosition=\"center\"</code>"
},
"loadingPositionEnd": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loadingPosition=\"end\"</code>"
},
"loadingPositionStart": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
"conditions": "<code>loadingPosition=\"start\"</code>"
},
"loadingWrapper": {
"description": "Styles applied to {{nodeName}}.",
"nodeName": "the loadingWrapper element"
},
"outlined": {
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
"nodeName": "the root element",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,7 @@ export const inputsCustomizations: Components<Theme> = {
},
},
],
}),
},
},
// @ts-ignore TODO: MuiLoadingButton is not present in the default `theme`
MuiLoadingButton: {
styleOverrides: {
// @ts-ignore
root: ({ theme }) => ({
'& .MuiLoadingButton-loadingIndicator': {
'& .MuiButton-loadingIndicator': {
color: gray[400],
...theme.applyStyles('dark', {
color: gray[600],
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@babel/preset-typescript": "7.26.0",
"@mui/internal-babel-plugin-resolve-imports": "1.0.20",
"@mui/internal-docs-utils": "1.0.16",
"@mui/internal-markdown": "1.0.24",
"@mui/internal-scripts": "1.0.32",
"@mui/internal-markdown": "1.0.25",
"@mui/internal-scripts": "1.0.33",
"@mui/monorepo": "github:mui/material-ui#dd69cf07e7aace1efad91e5b8e733c7efcf6c02c",
"@mui/x-charts": "7.23.6",
"@next/eslint-plugin-next": "14.2.23",
Expand Down
8 changes: 4 additions & 4 deletions packages/toolpad-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
},
"dependencies": {
"@babel/runtime": "^7.26.0",
"@mui/lab": "6.0.0-beta.22",
"@mui/utils": "6.3.1",
"@mui/lab": "6.0.0-beta.23",
"@mui/utils": "6.4.0",
"@toolpad/utils": "workspace:*",
"@vitejs/plugin-react": "4.3.4",
"client-only": "^0.0.1",
Expand All @@ -65,8 +65,8 @@
"prop-types": "15.8.1"
},
"devDependencies": {
"@mui/icons-material": "6.3.1",
"@mui/material": "6.3.1",
"@mui/icons-material": "6.4.0",
"@mui/material": "6.4.0",
"@types/invariant": "2.2.37",
"@types/prop-types": "15.7.14",
"@types/react": "^19.0.0",
Expand Down
Loading
Loading