From 1cc0aa76be5e079758640a891ccd8b7e1924f1de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 16:28:45 +0000 Subject: [PATCH 1/2] Bump @mui/monorepo digest to 04f9116 --- package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index e1bd70bb609..954af6a756d 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@mui/internal-docs-utils": "1.0.16", "@mui/internal-markdown": "1.0.25", "@mui/internal-scripts": "1.0.33", - "@mui/monorepo": "github:mui/material-ui#f273fa539871f6ed744bc60ff9fad0c6230b5c1f", + "@mui/monorepo": "github:mui/material-ui#04f9116e16948bf8f8343d04108dd4ebad035ddc", "@mui/x-charts": "7.27.0", "@next/eslint-plugin-next": "14.2.24", "@playwright/test": "1.47.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 941551deea9..138c54fa688 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,8 +101,8 @@ importers: specifier: 1.0.33 version: 1.0.33 '@mui/monorepo': - specifier: github:mui/material-ui#f273fa539871f6ed744bc60ff9fad0c6230b5c1f - version: https://codeload.github.com/mui/material-ui/tar.gz/f273fa539871f6ed744bc60ff9fad0c6230b5c1f(@babel/core@7.26.0)(encoding@0.1.13) + specifier: github:mui/material-ui#04f9116e16948bf8f8343d04108dd4ebad035ddc + version: https://codeload.github.com/mui/material-ui/tar.gz/04f9116e16948bf8f8343d04108dd4ebad035ddc(@babel/core@7.26.0)(encoding@0.1.13) '@mui/x-charts': specifier: 7.27.0 version: 7.27.0(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react@19.0.0))(@mui/material@6.4.5(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(@mui/system@6.4.3(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) @@ -201,7 +201,7 @@ importers: version: 7.37.4(eslint@8.57.1) eslint-plugin-react-compiler: specifier: latest - version: 19.0.0-beta-21e868a-20250216(eslint@8.57.1) + version: 19.0.0-beta-e1e972c-20250221(eslint@8.57.1) eslint-plugin-react-hooks: specifier: 5.1.0 version: 5.1.0(eslint@8.57.1) @@ -3107,8 +3107,8 @@ packages: '@types/react': optional: true - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/f273fa539871f6ed744bc60ff9fad0c6230b5c1f': - resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/f273fa539871f6ed744bc60ff9fad0c6230b5c1f} + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/04f9116e16948bf8f8343d04108dd4ebad035ddc': + resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/04f9116e16948bf8f8343d04108dd4ebad035ddc} version: 7.0.0-alpha.2 engines: {pnpm: 9.15.4} @@ -6136,8 +6136,8 @@ packages: peerDependencies: eslint: '>=7.0.0' - eslint-plugin-react-compiler@19.0.0-beta-21e868a-20250216: - resolution: {integrity: sha512-LstAv6tKgZylMmJniWxQL9TOY9kwRddLnvBsoTbRsgUDROL5bsg0k5XHMaNJLyX8cxh4iafQ/WxAw5shNUf3GQ==} + eslint-plugin-react-compiler@19.0.0-beta-e1e972c-20250221: + resolution: {integrity: sha512-qdkOo4TJqFfK5td7EVNxDG2zAY44qK+ew7GKZ+nybOS/ONHFVRnluMfC+yjqyBexlfDZJul5ZFzsANJDQa3WSw==} engines: {node: ^14.17.0 || ^16.0.0 || >= 18.0.0} peerDependencies: eslint: '>=7' @@ -12690,7 +12690,7 @@ snapshots: '@emotion/styled': 11.14.0(@emotion/react@11.14.0(@types/react@19.0.10)(react@19.0.0))(@types/react@19.0.10)(react@19.0.0) '@types/react': 19.0.10 - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/f273fa539871f6ed744bc60ff9fad0c6230b5c1f(@babel/core@7.26.0)(encoding@0.1.13)': + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/04f9116e16948bf8f8343d04108dd4ebad035ddc(@babel/core@7.26.0)(encoding@0.1.13)': dependencies: '@googleapis/sheets': 9.3.1(encoding@0.1.13) '@netlify/functions': 3.0.0 @@ -16442,7 +16442,7 @@ snapshots: globals: 13.24.0 rambda: 7.5.0 - eslint-plugin-react-compiler@19.0.0-beta-21e868a-20250216(eslint@8.57.1): + eslint-plugin-react-compiler@19.0.0-beta-e1e972c-20250221(eslint@8.57.1): dependencies: '@babel/core': 7.26.0 '@babel/parser': 7.26.2 From 391bc3b28d44bf50a9e75d604437e6e894bc0a0e Mon Sep 17 00:00:00 2001 From: Pedro Ferreira <10789765+apedroferreira@users.noreply.github.com> Date: Tue, 25 Feb 2025 18:52:10 +0000 Subject: [PATCH 2/2] fix ze errors --- .../components/sign-in-page/customTheme.js | 8 +------ .../components/sign-in-page/customTheme.tsx | 10 +-------- .../CustomDialogWithPayloadAdvanced.js | 5 ++--- .../CustomDialogWithPayloadAdvanced.tsx | 5 ++--- .../theme/customizations/inputs.tsx | 10 +-------- .../src/SignInPage/SignInPage.tsx | 4 ++-- .../toolpad-studio-components/src/Button.tsx | 2 +- .../toolpad-studio-components/src/Form.tsx | 11 +++++----- .../src/components/SystemDialogs.tsx | 7 +++---- .../toolpad-studio/src/runtime/SignInPage.tsx | 21 +++++++++---------- .../PageEditor/QueryEditor/index.tsx | 8 +++---- .../propertyControls/DataProviderSelector.tsx | 5 ++--- .../toolpadDataSources/QueryInputPanel.tsx | 7 +++---- .../src/toolpadDataSources/local/client.tsx | 7 +++---- .../src/toolpadDataSources/rest/client.tsx | 5 ++--- .../src/toolpadDataSources/sql/client.tsx | 5 ++--- 16 files changed, 44 insertions(+), 76 deletions(-) diff --git a/docs/data/toolpad/core/components/sign-in-page/customTheme.js b/docs/data/toolpad/core/components/sign-in-page/customTheme.js index 695aabae665..352ed0aa820 100644 --- a/docs/data/toolpad/core/components/sign-in-page/customTheme.js +++ b/docs/data/toolpad/core/components/sign-in-page/customTheme.js @@ -433,13 +433,7 @@ export const inputsCustomizations = { }, }, ], - }), - }, - }, - MuiLoadingButton: { - styleOverrides: { - root: ({ theme }) => ({ - '& .MuiLoadingButton-loadingIndicator': { + '& .MuiButton-loadingIndicator': { color: gray[400], ...theme.applyStyles('dark', { color: gray[600], diff --git a/docs/data/toolpad/core/components/sign-in-page/customTheme.tsx b/docs/data/toolpad/core/components/sign-in-page/customTheme.tsx index 8f9764019aa..d1bbcadcfe1 100644 --- a/docs/data/toolpad/core/components/sign-in-page/customTheme.tsx +++ b/docs/data/toolpad/core/components/sign-in-page/customTheme.tsx @@ -462,15 +462,7 @@ export const inputsCustomizations: Components = { }, }, ], - }), - }, - }, - // @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], diff --git a/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.js b/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.js index 65260bb3c12..0d74de5a5f6 100644 --- a/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.js +++ b/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.js @@ -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'; @@ -38,7 +37,7 @@ function TransactionDialog({ payload, open, onClose }) { Confirm transfer {payload.component} - { @@ -52,7 +51,7 @@ function TransactionDialog({ payload, open, onClose }) { }} > Submit - + ); diff --git a/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.tsx b/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.tsx index 1f6688f5cfc..c845f7b9194 100644 --- a/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.tsx +++ b/docs/data/toolpad/core/components/use-dialogs/CustomDialogWithPayloadAdvanced.tsx @@ -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'; @@ -45,7 +44,7 @@ function TransactionDialog({ Confirm transfer {payload.component} - { @@ -59,7 +58,7 @@ function TransactionDialog({ }} > Submit - + ); diff --git a/examples/core/auth-nextjs-themed/theme/customizations/inputs.tsx b/examples/core/auth-nextjs-themed/theme/customizations/inputs.tsx index 6a5f28d1f98..80904cfc722 100644 --- a/examples/core/auth-nextjs-themed/theme/customizations/inputs.tsx +++ b/examples/core/auth-nextjs-themed/theme/customizations/inputs.tsx @@ -217,15 +217,7 @@ export const inputsCustomizations: Components = { }, }, ], - }), - }, - }, - // @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], diff --git a/packages/toolpad-core/src/SignInPage/SignInPage.tsx b/packages/toolpad-core/src/SignInPage/SignInPage.tsx index 35f223efc52..021e692460a 100644 --- a/packages/toolpad-core/src/SignInPage/SignInPage.tsx +++ b/packages/toolpad-core/src/SignInPage/SignInPage.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import Alert from '@mui/material/Alert'; +import Button, { ButtonProps } from '@mui/material/Button'; import Box from '@mui/material/Box'; import Stack from '@mui/material/Stack'; import Checkbox from '@mui/material/Checkbox'; @@ -17,7 +18,6 @@ import FingerprintIcon from '@mui/icons-material/Fingerprint'; import AppleIcon from '@mui/icons-material/Apple'; import { alpha, useTheme, SxProps, type Theme } from '@mui/material/styles'; import { LinkProps } from '@mui/material/Link'; -import Button, { ButtonProps } from '@mui/material/Button'; import GoogleIcon from './icons/Google'; import FacebookIcon from './icons/Facebook'; import TwitterIcon from './icons/Twitter'; @@ -269,7 +269,7 @@ export interface SignInPageProps { signUpLink?: LinkProps; rememberMe?: Partial; form?: Partial>; - oAuthButton?: LoadingButtonProps; + oAuthButton?: ButtonProps; }; /** * The prop used to customize the styles on the `SignInPage` container diff --git a/packages/toolpad-studio-components/src/Button.tsx b/packages/toolpad-studio-components/src/Button.tsx index 8e934e58bb5..712e4e9b859 100644 --- a/packages/toolpad-studio-components/src/Button.tsx +++ b/packages/toolpad-studio-components/src/Button.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { LoadingButton as MuiButton, LoadingButtonProps as MuiButtonProps } from '@mui/lab'; +import { Button as MuiButton, ButtonProps as MuiButtonProps } from '@mui/material'; import createBuiltin from './createBuiltin'; import { SX_PROP_HELPER_TEXT } from './constants'; diff --git a/packages/toolpad-studio-components/src/Form.tsx b/packages/toolpad-studio-components/src/Form.tsx index 5d33ca2c4f1..30bf4514402 100644 --- a/packages/toolpad-studio-components/src/Form.tsx +++ b/packages/toolpad-studio-components/src/Form.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; -import { Box, BoxProps, Stack, styled } from '@mui/material'; -import { LoadingButton } from '@mui/lab'; +import { Box, BoxProps, Button, Stack, styled } from '@mui/material'; import { useNode } from '@toolpad/studio-runtime'; import { equalProperties } from '@toolpad/utils/collections'; import { @@ -104,16 +103,16 @@ function Form({ sx={{ flex: formControlsFullWidth ? 1 : '0 1 auto' }} > {hasResetButton ? ( - Reset - + ) : null} - {submitButtonText} - + diff --git a/packages/toolpad-studio/src/components/SystemDialogs.tsx b/packages/toolpad-studio/src/components/SystemDialogs.tsx index 8e1d82eaf41..d06ea7d4e24 100644 --- a/packages/toolpad-studio/src/components/SystemDialogs.tsx +++ b/packages/toolpad-studio/src/components/SystemDialogs.tsx @@ -1,4 +1,3 @@ -import { LoadingButton, LoadingButtonProps } from '@mui/lab'; import { Dialog, DialogTitle, @@ -21,11 +20,11 @@ const SystemDialogCancelButton = React.forwardRef ), ); -const SystemDialogOkButton = React.forwardRef( +const SystemDialogOkButton = React.forwardRef( ({ children = 'ok', ...props }, ref) => ( - + ), ); diff --git a/packages/toolpad-studio/src/runtime/SignInPage.tsx b/packages/toolpad-studio/src/runtime/SignInPage.tsx index 23abeb6d71f..4f6b8bf872e 100644 --- a/packages/toolpad-studio/src/runtime/SignInPage.tsx +++ b/packages/toolpad-studio/src/runtime/SignInPage.tsx @@ -12,7 +12,6 @@ import { import GitHubIcon from '@mui/icons-material/GitHub'; import PasswordIcon from '@mui/icons-material/Password'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; -import { LoadingButton } from '@mui/lab'; import { useSearchParams } from 'react-router'; import { useForm, Controller, SubmitHandler } from 'react-hook-form'; import { AuthProvider, AuthContext } from './useAuth'; @@ -165,7 +164,7 @@ export default function SignInPage() { /> )} /> - Sign in - + ) : ( {authProviders.includes('github') ? ( - } @@ -195,10 +194,10 @@ export default function SignInPage() { }} > Sign in with GitHub - + ) : null} {authProviders.includes('google') ? ( - Sign in with Google - + ) : null} {authProviders.includes('azure-ad') ? ( - Sign in with Azure AD - + ) : null} {authProviders.includes('credentials') ? ( @@ -251,7 +250,7 @@ export default function SignInPage() { OR ) : null} - } @@ -262,7 +261,7 @@ export default function SignInPage() { fullWidth > Sign in with credentials - + ) : null} diff --git a/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/QueryEditor/index.tsx b/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/QueryEditor/index.tsx index c31c4167b54..233dfdd0866 100644 --- a/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/QueryEditor/index.tsx +++ b/packages/toolpad-studio/src/toolpad/AppEditor/PageEditor/QueryEditor/index.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { NodeId } from '@toolpad/studio-runtime'; -import { Stack, Chip, Tab, IconButton, LinearProgress } from '@mui/material'; -import { LoadingButton, TabList, TabContext, TabPanel } from '@mui/lab'; +import { Button, Stack, Chip, Tab, IconButton, LinearProgress } from '@mui/material'; +import { TabList, TabContext, TabPanel } from '@mui/lab'; import ClearOutlinedIcon from '@mui/icons-material/ClearOutlined'; import CircleIcon from '@mui/icons-material/Circle'; import CancelPresentationIcon from '@mui/icons-material/CancelPresentation'; @@ -251,7 +251,7 @@ export default function QueryEditor() { ))}
- Save   - + - Create - + diff --git a/packages/toolpad-studio/src/toolpadDataSources/QueryInputPanel.tsx b/packages/toolpad-studio/src/toolpadDataSources/QueryInputPanel.tsx index fabc9f46e01..1c48078967d 100644 --- a/packages/toolpad-studio/src/toolpadDataSources/QueryInputPanel.tsx +++ b/packages/toolpad-studio/src/toolpadDataSources/QueryInputPanel.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; -import { Box } from '@mui/material'; -import { LoadingButton } from '@mui/lab'; +import { Box, Button } from '@mui/material'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; export interface QueryInputPanelProps { @@ -20,14 +19,14 @@ export default function QueryInputPanel({ {actions} {children} - } onClick={onRunPreview} disabled={previewDisabled} variant="outlined" > Preview - + ); } diff --git a/packages/toolpad-studio/src/toolpadDataSources/local/client.tsx b/packages/toolpad-studio/src/toolpadDataSources/local/client.tsx index 35ab700ee5c..5316176b7f2 100644 --- a/packages/toolpad-studio/src/toolpadDataSources/local/client.tsx +++ b/packages/toolpad-studio/src/toolpadDataSources/local/client.tsx @@ -1,7 +1,6 @@ import * as React from 'react'; -import LoadingButton from '@mui/lab/LoadingButton'; import { BindableAttrEntries } from '@toolpad/studio-runtime'; -import { Alert, Box, Divider, Stack, Tab, Link, Typography } from '@mui/material'; +import { Alert, Box, Button, Divider, Stack, Tab, Link, Typography } from '@mui/material'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import { TabContext, TabList } from '@mui/lab'; import { useBrowserJsRuntime } from '@toolpad/studio-runtime/jsBrowserRuntime'; @@ -407,7 +406,7 @@ function QueryEditor({ > - } > Run - + diff --git a/packages/toolpad-studio/src/toolpadDataSources/rest/client.tsx b/packages/toolpad-studio/src/toolpadDataSources/rest/client.tsx index dd10f1ef7fd..9110b72ae8e 100644 --- a/packages/toolpad-studio/src/toolpadDataSources/rest/client.tsx +++ b/packages/toolpad-studio/src/toolpadDataSources/rest/client.tsx @@ -22,7 +22,6 @@ import { inputLabelClasses, inputBaseClasses, } from '@mui/material'; -import LoadingButton from '@mui/lab/LoadingButton'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import { Controller, useForm } from 'react-hook-form'; import { TabContext, TabList } from '@mui/lab'; @@ -707,7 +706,7 @@ function QueryEditor({ - } > Run - + diff --git a/packages/toolpad-studio/src/toolpadDataSources/sql/client.tsx b/packages/toolpad-studio/src/toolpadDataSources/sql/client.tsx index e3554aeaef7..b5261ad70e0 100644 --- a/packages/toolpad-studio/src/toolpadDataSources/sql/client.tsx +++ b/packages/toolpad-studio/src/toolpadDataSources/sql/client.tsx @@ -1,4 +1,3 @@ -import { LoadingButton } from '@mui/lab'; import { Box, Button, @@ -164,7 +163,7 @@ export function ConnectionParamsInput({ - Test connection - + {connectionStatus ? (