Skip to content

Commit 73d8eab

Browse files
Merge branch 'master' into all-pluggin-way
2 parents b497d9c + 5999d29 commit 73d8eab

File tree

257 files changed

+1464
-1021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+1464
-1021
lines changed

docs/data/charts/axis/CustomDomainYAxis.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ import TextField from '@mui/material/TextField';
55
import MenuItem from '@mui/material/MenuItem';
66

77
const settings = {
8-
valueFormatter: (value) => `${value}%`,
98
height: 200,
10-
showTooltip: true,
11-
showHighlight: true,
129
series: [{ data: [60, -15, 66, 68, 87, 82, 83, 85, 92, 75, 76, 50, 91] }],
1310
margin: { top: 10, bottom: 20 },
1411
};

docs/data/charts/axis/CustomDomainYAxis.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import * as React from 'react';
22
import Box from '@mui/material/Box';
3-
import { BarChart } from '@mui/x-charts/BarChart';
3+
import { BarChart, BarChartProps } from '@mui/x-charts/BarChart';
44
import TextField from '@mui/material/TextField';
55
import MenuItem from '@mui/material/MenuItem';
66

7-
const settings = {
8-
valueFormatter: (value: number | null) => `${value}%`,
7+
const settings: BarChartProps = {
98
height: 200,
10-
showTooltip: true,
11-
showHighlight: true,
129
series: [{ data: [60, -15, 66, 68, 87, 82, 83, 85, 92, 75, 76, 50, 91] }],
1310
margin: { top: 10, bottom: 20 },
1411
};

docs/data/charts/styling/ColorTemplate.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ const legendPlacement = {
3333
horizontal: 'right',
3434
},
3535
direction: 'vertical',
36-
itemGap: 2,
3736
},
3837
},
3938
margin: {

docs/data/charts/styling/ColorTemplate.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { ScatterChart } from '@mui/x-charts/ScatterChart';
2+
import { ScatterChart, ScatterChartProps } from '@mui/x-charts/ScatterChart';
33
import { ScatterValueType } from '@mui/x-charts/models';
44
import Stack from '@mui/material/Stack';
55
import TextField from '@mui/material/TextField';
@@ -29,23 +29,22 @@ function getGaussianSeriesData(
2929
});
3030
}
3131

32-
const legendPlacement = {
32+
const legendPlacement: Partial<ScatterChartProps> = {
3333
slotProps: {
3434
legend: {
3535
position: {
3636
vertical: 'middle',
3737
horizontal: 'right',
3838
},
3939
direction: 'vertical',
40-
itemGap: 2,
4140
},
4241
},
4342
margin: {
4443
top: 20,
4544
right: 20,
4645
left: 30,
4746
},
48-
} as const;
47+
};
4948
const series = [
5049
{ label: 'Series 1', data: getGaussianSeriesData([-5, 0]) },
5150
{ label: 'Series 2', data: getGaussianSeriesData([-4, 0]) },

docs/data/charts/styling/MuiColorTemplate.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const legendPlacement = {
3939
slotProps: {
4040
legend: {
4141
direction: 'vertical',
42-
itemGap: 2,
4342
},
4443
},
4544
margin: {

docs/data/charts/styling/MuiColorTemplate.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Button from '@mui/material/Button';
99
import Brightness4Icon from '@mui/icons-material/Brightness4';
1010
import Brightness7Icon from '@mui/icons-material/Brightness7';
1111
import { Chance } from 'chance';
12-
import { ScatterChart } from '@mui/x-charts/ScatterChart';
12+
import { ScatterChart, ScatterChartProps } from '@mui/x-charts/ScatterChart';
1313
import { ScatterValueType } from '@mui/x-charts/models';
1414
import {
1515
blueberryTwilightPalette,
@@ -39,18 +39,17 @@ function getGaussianSeriesData(
3939
});
4040
}
4141

42-
const legendPlacement = {
42+
const legendPlacement: Partial<ScatterChartProps> = {
4343
slotProps: {
4444
legend: {
4545
direction: 'vertical',
46-
itemGap: 2,
4746
},
4847
},
4948
margin: {
5049
top: 20,
5150
right: 20,
5251
},
53-
} as const;
52+
};
5453

5554
const series = [
5655
{ label: 'Series 1', data: getGaussianSeriesData([-5, 0]) },

docs/data/data-grid/column-recipes/ColumnSizingPersistWidthOrder.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default function ColumnSizingPersistWidthOrder() {
5050
}
5151

5252
const useColumnsState = (
53-
apiRef: React.MutableRefObject<GridApiPro>,
53+
apiRef: React.RefObject<GridApiPro>,
5454
columns: GridColDef[],
5555
) => {
5656
const [widths, setWidths] = React.useState<Record<GridColDef['field'], number>>(

docs/data/data-grid/components/CustomColumnsPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function ColumnGroup({
4343
}: {
4444
group: GridColumnGroup;
4545
columnLookup: GridColumnLookup;
46-
apiRef: React.MutableRefObject<GridApi>;
46+
apiRef: React.RefObject<GridApi>;
4747
columnVisibilityModel: GridColumnVisibilityModel;
4848
}) {
4949
const leaves = React.useMemo(() => {

docs/data/data-grid/export/CustomExport.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
import MenuItem from '@mui/material/MenuItem';
1717
import { ButtonProps } from '@mui/material/Button';
1818

19-
const getJson = (apiRef: React.MutableRefObject<GridApi>) => {
19+
const getJson = (apiRef: React.RefObject<GridApi>) => {
2020
// Select rows and columns
2121
const filteredSortedRowIds = gridFilteredSortedRowIdsSelector(apiRef);
2222
const visibleColumnsField = gridVisibleColumnFieldsSelector(apiRef);

docs/data/data-grid/filtering-recipes/QuickFilterOutsideOfGrid.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ import * as React from 'react';
22
import Portal from '@mui/material/Portal';
33
import Box from '@mui/material/Box';
44
import Grid from '@mui/material/Grid';
5-
import { DataGrid, GridToolbarQuickFilter, GridToolbar } from '@mui/x-data-grid';
5+
import {
6+
DataGrid,
7+
GridPortalWrapper,
8+
GridToolbarQuickFilter,
9+
GridToolbar,
10+
} from '@mui/x-data-grid';
611
import { useDemoData } from '@mui/x-data-grid-generator';
712

813
function MyCustomToolbar(props) {
914
return (
1015
<React.Fragment>
1116
<Portal container={() => document.getElementById('filter-panel')}>
12-
<GridToolbarQuickFilter />
17+
<GridPortalWrapper>
18+
<GridToolbarQuickFilter />
19+
</GridPortalWrapper>
1320
</Portal>
1421
<GridToolbar {...props} />
1522
</React.Fragment>

docs/data/data-grid/filtering-recipes/QuickFilterOutsideOfGrid.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@ import * as React from 'react';
22
import Portal from '@mui/material/Portal';
33
import Box from '@mui/material/Box';
44
import Grid from '@mui/material/Grid';
5-
import { DataGrid, GridToolbarQuickFilter, GridToolbar } from '@mui/x-data-grid';
5+
import {
6+
DataGrid,
7+
GridPortalWrapper,
8+
GridToolbarQuickFilter,
9+
GridToolbar,
10+
} from '@mui/x-data-grid';
611
import { useDemoData } from '@mui/x-data-grid-generator';
712

813
function MyCustomToolbar(props: any) {
914
return (
1015
<React.Fragment>
1116
<Portal container={() => document.getElementById('filter-panel')!}>
12-
<GridToolbarQuickFilter />
17+
<GridPortalWrapper>
18+
<GridToolbarQuickFilter />
19+
</GridPortalWrapper>
1320
</Portal>
1421
<GridToolbar {...props} />
1522
</React.Fragment>

docs/data/date-pickers/calendar-systems/AdapterHijri.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const cacheRtl = createCache({
2424

2525
function ButtonDateTimeField(props) {
2626
const { internalProps, forwardedProps } = useSplitFieldProps(props, 'date');
27-
const { value, timezone, format } = internalProps;
2827
const {
2928
InputProps,
3029
slotProps,
@@ -37,16 +36,18 @@ function ButtonDateTimeField(props) {
3736
} = forwardedProps;
3837

3938
const pickerContext = usePickerContext();
40-
41-
const parsedFormat = useParsedFormat(internalProps);
39+
const parsedFormat = useParsedFormat();
4240
const { hasValidationError } = useValidation({
4341
validator: validateDate,
44-
value,
45-
timezone,
42+
value: pickerContext.value,
43+
timezone: pickerContext.timezone,
4644
props: internalProps,
4745
});
4846

49-
const valueStr = value == null ? parsedFormat : value.format(format);
47+
const valueStr =
48+
pickerContext.value == null
49+
? parsedFormat
50+
: pickerContext.value.format(pickerContext.fieldFormat);
5051

5152
return (
5253
<Button

docs/data/date-pickers/calendar-systems/AdapterHijri.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ const cacheRtl = createCache({
2828

2929
function ButtonDateTimeField(props: DateTimePickerFieldProps) {
3030
const { internalProps, forwardedProps } = useSplitFieldProps(props, 'date');
31-
const { value, timezone, format } = internalProps;
3231
const {
3332
InputProps,
3433
slotProps,
@@ -41,16 +40,18 @@ function ButtonDateTimeField(props: DateTimePickerFieldProps) {
4140
} = forwardedProps;
4241

4342
const pickerContext = usePickerContext();
44-
45-
const parsedFormat = useParsedFormat(internalProps);
43+
const parsedFormat = useParsedFormat();
4644
const { hasValidationError } = useValidation({
4745
validator: validateDate,
48-
value,
49-
timezone,
46+
value: pickerContext.value,
47+
timezone: pickerContext.timezone,
5048
props: internalProps,
5149
});
5250

53-
const valueStr = value == null ? parsedFormat : value.format(format);
51+
const valueStr =
52+
pickerContext.value == null
53+
? parsedFormat
54+
: pickerContext.value.format(pickerContext.fieldFormat);
5455

5556
return (
5657
<Button

docs/data/date-pickers/custom-field/BrowserV7MultiInputRangeField.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,12 @@ const BrowserTextField = React.forwardRef((props, ref) => {
8080
const BrowserMultiInputDateRangeField = React.forwardRef((props, ref) => {
8181
const {
8282
slotProps,
83-
value,
84-
format,
85-
onChange,
8683
readOnly,
87-
disabled,
8884
shouldDisableDate,
8985
minDate,
9086
maxDate,
9187
disableFuture,
9288
disablePast,
93-
selectedSections,
94-
onSelectedSectionsChange,
9589
className,
9690
unstableStartFieldRef,
9791
unstableEndFieldRef,
@@ -111,18 +105,12 @@ const BrowserMultiInputDateRangeField = React.forwardRef((props, ref) => {
111105

112106
const fieldResponse = useMultiInputDateRangeField({
113107
sharedProps: {
114-
value,
115-
format,
116-
onChange,
117108
readOnly,
118-
disabled,
119109
shouldDisableDate,
120110
minDate,
121111
maxDate,
122112
disableFuture,
123113
disablePast,
124-
selectedSections,
125-
onSelectedSectionsChange,
126114
enableAccessibleFieldDOMStructure: true,
127115
},
128116
startTextFieldProps,

docs/data/date-pickers/custom-field/BrowserV7MultiInputRangeField.tsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,12 @@ const BrowserMultiInputDateRangeField = React.forwardRef(
116116
(props: BrowserMultiInputDateRangeFieldProps, ref: React.Ref<HTMLDivElement>) => {
117117
const {
118118
slotProps,
119-
value,
120-
format,
121-
onChange,
122119
readOnly,
123-
disabled,
124120
shouldDisableDate,
125121
minDate,
126122
maxDate,
127123
disableFuture,
128124
disablePast,
129-
selectedSections,
130-
onSelectedSectionsChange,
131125
className,
132126
unstableStartFieldRef,
133127
unstableEndFieldRef,
@@ -150,18 +144,12 @@ const BrowserMultiInputDateRangeField = React.forwardRef(
150144
MultiInputFieldSlotTextFieldProps
151145
>({
152146
sharedProps: {
153-
value,
154-
format,
155-
onChange,
156147
readOnly,
157-
disabled,
158148
shouldDisableDate,
159149
minDate,
160150
maxDate,
161151
disableFuture,
162152
disablePast,
163-
selectedSections,
164-
onSelectedSectionsChange,
165153
enableAccessibleFieldDOMStructure: true,
166154
},
167155
startTextFieldProps,

docs/data/date-pickers/custom-field/JoyV6Field.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ import { unstable_useDateField as useDateField } from '@mui/x-date-pickers/DateF
2121
const joyTheme = extendJoyTheme();
2222

2323
const JoyDateField = React.forwardRef((props, ref) => {
24-
const fieldResponse = useDateField({
25-
...props,
26-
enableAccessibleFieldDOMStructure: false,
27-
});
24+
const fieldResponse = useDateField(props);
2825

2926
const {
3027
// Should be ignored
@@ -64,6 +61,7 @@ const JoyDatePicker = React.forwardRef((props, ref) => {
6461
<DatePicker
6562
ref={ref}
6663
{...props}
64+
enableAccessibleFieldDOMStructure={false}
6765
slots={{ ...props.slots, field: JoyDateField }}
6866
/>
6967
);

docs/data/date-pickers/custom-field/JoyV6Field.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ const joyTheme = extendJoyTheme();
2626

2727
const JoyDateField = React.forwardRef(
2828
(props: DatePickerFieldProps<false>, ref: React.Ref<HTMLDivElement>) => {
29-
const fieldResponse = useDateField<false, typeof props>({
30-
...props,
31-
enableAccessibleFieldDOMStructure: false,
32-
});
29+
const fieldResponse = useDateField<false, typeof props>(props);
3330

3431
const {
3532
// Should be ignored
@@ -73,6 +70,7 @@ const JoyDatePicker = React.forwardRef(
7370
<DatePicker
7471
ref={ref}
7572
{...props}
73+
enableAccessibleFieldDOMStructure={false}
7674
slots={{ ...props.slots, field: JoyDateField }}
7775
/>
7876
);

0 commit comments

Comments
 (0)