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

[core] Replace @mui/base with @mui/utils + @mui/material #13823

Merged
merged 28 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ee019d9
[core] Remove @mui/base as dependency
mnajdova Jul 12, 2024
8062f12
use latest Material UI commit
mnajdova Jul 12, 2024
4fb62bc
fix wrong imports & few package.json changes
mnajdova Jul 12, 2024
249a721
prettier
mnajdova Jul 12, 2024
04a45f2
imports fixes
mnajdova Jul 12, 2024
d719a0c
Update packages/x-tree-view/src/TreeItem/TreeItem.tsx
mnajdova Jul 16, 2024
741d029
replace unstable_composeClasses imports
mnajdova Jul 16, 2024
5c81ebf
use latest version
mnajdova Jul 16, 2024
ed8ccd0
revert latest changes
mnajdova Jul 16, 2024
2d4b70f
Merge branch 'master' into update/base-ui-imports
mnajdova Jul 16, 2024
e64e8b3
pnpm-lock.yaml
mnajdova Jul 16, 2024
3a9bb14
Merge branch 'master' into update/base-ui-imports
mnajdova Jul 16, 2024
afd1a7e
bump to latest version
mnajdova Jul 16, 2024
d000988
Add `@mui/material-nextjs` to renovate `MUI Core` group
LukasTy Jul 18, 2024
119807b
Align `@mui/material` peer dep versions
LukasTy Jul 18, 2024
8f7608f
Merge remote-tracking branch 'upstream/master' into update/base-ui-im…
LukasTy Jul 18, 2024
142b850
Align `@mui` dep versions
LukasTy Jul 18, 2024
c5f9ca5
Update import
LukasTy Jul 18, 2024
dee7977
dedupe
LukasTy Jul 18, 2024
880496d
Merge branch 'master' into update/base-ui-imports
mnajdova Jul 30, 2024
dcb987b
revert unintentional change
mnajdova Jul 30, 2024
ab0a2ef
Remove Base UI dependency from the packages
mnajdova Jul 30, 2024
5b864d1
apply RREADME.md change
mnajdova Jul 30, 2024
0bbfb6d
lock file
LukasTy Jul 30, 2024
397f494
Remove `@mui/base` from `docs`
LukasTy Jul 30, 2024
bb30d35
Avoid using `@mui/base`
LukasTy Jul 30, 2024
c0d3c6f
Use material `button` to avoid extra line and destruction of `preview…
LukasTy Jul 30, 2024
a225cc3
Merge remote-tracking branch 'upstream/master' into update/base-ui-im…
LukasTy Jul 31, 2024
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
2 changes: 1 addition & 1 deletion docs/data/charts/zoom-and-pan/ZoomControlled.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { LineChartPro } from '@mui/x-charts-pro/LineChartPro';

import { Button } from '@mui/base';
import Button from '@mui/material/Button';

export default function ZoomControlled() {
const [zoom, setZoom] = React.useState([
Expand Down
2 changes: 1 addition & 1 deletion docs/data/charts/zoom-and-pan/ZoomControlled.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { LineChartPro } from '@mui/x-charts-pro/LineChartPro';
import { ZoomData } from '@mui/x-charts-pro/context';
import { Button } from '@mui/base';
import Button from '@mui/material/Button';
JCQuintas marked this conversation as resolved.
Show resolved Hide resolved

export default function ZoomControlled() {
const [zoom, setZoom] = React.useState<ZoomData[]>([
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Portal } from '@mui/base/Portal';
import Portal from '@mui/material/Portal';
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
import Box from '@mui/material/Box';
import Grid from '@mui/material/Grid';
import { DataGrid, GridToolbarQuickFilter, GridToolbar } from '@mui/x-data-grid';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Portal } from '@mui/base/Portal';
import Portal from '@mui/material/Portal';
import Box from '@mui/material/Box';
import Grid from '@mui/material/Grid';
import { DataGrid, GridToolbarQuickFilter, GridToolbar } from '@mui/x-data-grid';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';

import { unstable_useForkRef as useForkRef } from '@mui/utils';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import Box from '@mui/material/Box';
import Stack from '@mui/material/Stack';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Dayjs } from 'dayjs';
import { unstable_useForkRef as useForkRef } from '@mui/utils';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import Box from '@mui/material/Box';
import Stack from '@mui/material/Stack';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';

import { unstable_useForkRef as useForkRef } from '@mui/utils';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import Box from '@mui/material/Box';
import IconButton from '@mui/material/IconButton';
import InputAdornment from '@mui/material/InputAdornment';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Dayjs } from 'dayjs';
import { unstable_useForkRef as useForkRef } from '@mui/utils';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import Box from '@mui/material/Box';
import IconButton from '@mui/material/IconButton';
import InputAdornment from '@mui/material/InputAdornment';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';

import useForkRef from '@mui/utils/useForkRef';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import { styled } from '@mui/material/styles';
import Stack from '@mui/material/Stack';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Dayjs } from 'dayjs';
import useForkRef from '@mui/utils/useForkRef';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import { styled } from '@mui/material/styles';
import Stack from '@mui/material/Stack';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';

import useForkRef from '@mui/utils/useForkRef';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
import { styled } from '@mui/material/styles';
import IconButton from '@mui/material/IconButton';
import InputAdornment from '@mui/material/InputAdornment';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Dayjs } from 'dayjs';
import useForkRef from '@mui/utils/useForkRef';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import { styled } from '@mui/material/styles';
import IconButton from '@mui/material/IconButton';
import InputAdornment from '@mui/material/InputAdornment';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import {
useColorScheme as useMaterialColorScheme,
Experimental_CssVarsProvider as MaterialCssVarsProvider,
} from '@mui/material/styles';
import useSlotProps from '@mui/utils/useSlotProps';
import {
extendTheme as extendJoyTheme,
useColorScheme,
styled,
CssVarsProvider,
THEME_ID,
} from '@mui/joy/styles';
import { useSlotProps } from '@mui/base/utils';
import Input from '@mui/joy/Input';
import Stack from '@mui/joy/Stack';
import FormControl from '@mui/joy/FormControl';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import {
useColorScheme as useMaterialColorScheme,
Experimental_CssVarsProvider as MaterialCssVarsProvider,
} from '@mui/material/styles';
import useSlotProps from '@mui/utils/useSlotProps';
import {
extendTheme as extendJoyTheme,
useColorScheme,
styled,
CssVarsProvider,
THEME_ID,
} from '@mui/joy/styles';
import { useSlotProps } from '@mui/base/utils';
import Input, { InputProps } from '@mui/joy/Input';
import Stack, { StackProps } from '@mui/joy/Stack';
import FormControl from '@mui/joy/FormControl';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import {
useColorScheme as useMaterialColorScheme,
Experimental_CssVarsProvider as MaterialCssVarsProvider,
} from '@mui/material/styles';
import useSlotProps from '@mui/utils/useSlotProps';
import {
extendTheme as extendJoyTheme,
useColorScheme,
CssVarsProvider,
THEME_ID,
} from '@mui/joy/styles';
import { useSlotProps } from '@mui/base/utils';
import Input from '@mui/joy/Input';
import FormControl from '@mui/joy/FormControl';
import FormLabel from '@mui/joy/FormLabel';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import {
useColorScheme as useMaterialColorScheme,
Experimental_CssVarsProvider as MaterialCssVarsProvider,
} from '@mui/material/styles';
import useSlotProps from '@mui/utils/useSlotProps';
import {
extendTheme as extendJoyTheme,
useColorScheme,
CssVarsProvider,
THEME_ID,
} from '@mui/joy/styles';
import { useSlotProps } from '@mui/base/utils';
import Input, { InputProps } from '@mui/joy/Input';
import FormControl from '@mui/joy/FormControl';
import FormLabel from '@mui/joy/FormLabel';
Expand Down
2 changes: 0 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"@emotion/react": "^11.13.0",
"@emotion/server": "^11.11.0",
"@emotion/styled": "^11.13.0",
"@mui/base": "^5.0.0-beta.40",
"@mui/docs": "6.0.0-beta.2",
"@mui/icons-material": "^5.16.5",
"@mui/joy": "^5.0.0-beta.48",
Expand Down Expand Up @@ -66,7 +65,6 @@
"date-fns-jalali": "^2.30.0-0",
"dayjs": "^1.11.11",
"doctrine": "^3.0.0",
"d3-scale-chromatic": "^3.1.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already defined in line 64.

"exceljs": "^4.4.0",
"fg-loadcss": "^3.1.0",
"jscodeshift": "0.16.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/date-range-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/date-time-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/date-time-range-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/desktop-date-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{ "name": "field", "description": "", "class": null },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/desktop-time-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/x/api/date-pickers/time-picker.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
{
"name": "desktopTrapFocus",
"description": "Custom component for trapping the focus inside the views on desktop.",
"default": "FocusTrap from '@mui/base'.",
"default": "TrapFocus from '@mui/material'.",
"class": null
},
{
Expand Down
1 change: 0 additions & 1 deletion packages/x-charts-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
},
"dependencies": {
"@babel/runtime": "^7.25.0",
"@mui/base": "^5.0.0-beta.40",
"@mui/system": "^5.16.5",
"@mui/utils": "^5.16.5",
"@mui/x-charts": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts-pro/src/Heatmap/HeatmapItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { styled } from '@mui/material/styles';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import composeClasses from '@mui/utils/composeClasses';
import { useItemHighlighted } from '@mui/x-charts/context';
import { useInteractionItemProps, SeriesId } from '@mui/x-charts/internals';
Expand Down
1 change: 0 additions & 1 deletion packages/x-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
},
"dependencies": {
"@babel/runtime": "^7.25.0",
"@mui/base": "^5.0.0-beta.40",
"@mui/system": "^5.16.5",
"@mui/utils": "^5.16.5",
"@react-spring/rafz": "^9.7.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/BarChart/BarElement.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import generateUtilityClass from '@mui/utils/generateUtilityClass';
import { styled } from '@mui/material/styles';
import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/BarChart/BarLabel/BarLabelItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import PropTypes from 'prop-types';
import { SlotComponentPropsFromProps } from '../../internals/SlotComponentPropsFromProps';
import { useUtilityClasses } from './barLabelClasses';
Expand Down
4 changes: 2 additions & 2 deletions packages/x-charts/src/ChartsLegend/ChartsLegend.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { useSlotProps } from '@mui/base/utils';
import { unstable_composeClasses as composeClasses } from '@mui/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import composeClasses from '@mui/utils/composeClasses';
import { useThemeProps, useTheme, Theme } from '@mui/material/styles';
import { getSeriesToDisplay } from './utils';
import { ChartsLegendClasses, getLegendUtilityClass } from './chartsLegendClasses';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/ChartsLegend/LegendPerItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { NoSsr } from '@mui/base/NoSsr';
import NoSsr from '@mui/material/NoSsr';
import { useTheme, styled } from '@mui/material/styles';
import { DrawingArea } from '../context/DrawingProvider';
import { DefaultizedProps } from '../models/helpers';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { SxProps, Theme } from '@mui/material/styles';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import { AxisInteractionData } from '../context/InteractionProvider';
import { useCartesianContext } from '../context/CartesianProvider';
import { ChartSeriesDefaultized, ChartSeriesType } from '../models/seriesType/config';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { SxProps, Theme } from '@mui/material/styles';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import { ItemInteractionData } from '../context/InteractionProvider';
import { ChartSeriesDefaultized, ChartSeriesType } from '../models/seriesType/config';
import { ChartsTooltipClasses } from './chartsTooltipClasses';
Expand Down
6 changes: 3 additions & 3 deletions packages/x-charts/src/ChartsTooltip/ChartsTooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { styled, useThemeProps, SxProps, Theme } from '@mui/material/styles';
import { Popper, PopperProps as BasePopperProps } from '@mui/base/Popper';
import { NoSsr } from '@mui/base/NoSsr';
import { useSlotProps } from '@mui/base/utils';
import Popper, { PopperProps as BasePopperProps } from '@mui/material/Popper';
LukasTy marked this conversation as resolved.
Show resolved Hide resolved
import NoSsr from '@mui/material/NoSsr';
import useSlotProps from '@mui/utils/useSlotProps';
import {
AxisInteractionData,
InteractionContext,
Expand Down
4 changes: 2 additions & 2 deletions packages/x-charts/src/ChartsXAxis/ChartsXAxis.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { useSlotProps } from '@mui/base/utils';
import { unstable_composeClasses as composeClasses } from '@mui/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import composeClasses from '@mui/utils/composeClasses';
import { useThemeProps, useTheme, Theme } from '@mui/material/styles';
import { useCartesianContext } from '../context/CartesianProvider';
import { useTicks, TickItemType } from '../hooks/useTicks';
Expand Down
4 changes: 2 additions & 2 deletions packages/x-charts/src/ChartsYAxis/ChartsYAxis.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { useSlotProps } from '@mui/base/utils';
import { unstable_composeClasses as composeClasses } from '@mui/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import composeClasses from '@mui/utils/composeClasses';
import { useThemeProps, useTheme, Theme } from '@mui/material/styles';
import { useCartesianContext } from '../context/CartesianProvider';
import { useTicks } from '../hooks/useTicks';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/LineChart/AreaElement.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import generateUtilityClass from '@mui/utils/generateUtilityClass';
import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
import { SlotComponentPropsFromProps } from '../internals/SlotComponentPropsFromProps';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/LineChart/LineElement.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { useSlotProps } from '@mui/base/utils';
import useSlotProps from '@mui/utils/useSlotProps';
import generateUtilityClass from '@mui/utils/generateUtilityClass';
import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
import { SlotComponentPropsFromProps } from '../internals/SlotComponentPropsFromProps';
Expand Down
Loading