Skip to content

Commit f645c4d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into docs/7303
2 parents 1a53041 + 7de42b2 commit f645c4d

File tree

302 files changed

+5852
-2422
lines changed

Some content is hidden

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

302 files changed

+5852
-2422
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ jobs:
229229
name: Tests TypeScript definitions
230230
command: yarn typescript:ci
231231
environment:
232-
NODE_OPTIONS: --max-old-space-size=3072
232+
NODE_OPTIONS: --max-old-space-size=2048
233233
test_e2e:
234234
<<: *default-job
235235
docker:

.codesandbox/ci.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"@mui/x-date-pickers": "packages/x-date-pickers/build",
2323
"@mui/x-date-pickers-pro": "packages/x-date-pickers-pro/build",
2424
"@mui/x-charts": "packages/x-charts/build",
25-
"@mui/x-tree-view": "packages/x-tree-view/build"
25+
"@mui/x-tree-view": "packages/x-tree-view/build",
26+
"@mui/x-tree-view-pro": "packages/x-tree-view-pro/build"
2627
},
2728
"sandboxes": ["/bug-reproductions/x-data-grid"],
2829
"silent": true

.eslintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ module.exports = {
163163
buildPackageRestrictedImports('@mui/x-data-grid-generator', 'x-data-grid-generator'),
164164
buildPackageRestrictedImports('@mui/x-pickers', 'x-pickers'),
165165
buildPackageRestrictedImports('@mui/x-pickers-pro', 'x-pickers-pro'),
166+
buildPackageRestrictedImports('@mui/x-tree-view', 'x-tree-view'),
167+
buildPackageRestrictedImports('@mui/x-tree-view-pro', 'x-tree-view-pro'),
166168
buildPackageRestrictedImports('@mui/x-license', 'x-license'),
167169
],
168170
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Cherry pick master to v6
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- master
7+
types: ['closed']
8+
9+
permissions: {}
10+
11+
jobs:
12+
cherry_pick_to_v6:
13+
runs-on: ubuntu-latest
14+
name: Cherry pick into v6
15+
permissions:
16+
pull-requests: write
17+
contents: write
18+
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
22+
with:
23+
fetch-depth: 0
24+
- name: Cherry pick and create the new PR
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
uses: carloscastrojumo/github-cherry-pick-action@a145da1b8142e752d3cbc11aaaa46a535690f0c5 # v1.0.9
28+
with:
29+
branch: v6.x
30+
body: 'Cherry-pick of #{old_pull_request_id}'
31+
cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
32+
title: '{old_title} (@${{ github.event.pull_request.user.login }})'
33+
labels: |
34+
cherry-pick

.github/workflows/closed-issue-message.yaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@ jobs:
1414
GH_REPO: ${{ github.repository }}
1515
NUMBER: ${{ github.event.issue.number }}
1616
BODY: |
17-
:warning: **This issue has been closed.**
18-
If you have a similar problem, please open a [new issue](https://github.com/mui/mui-x/issues/new/choose) and provide details about your specific problem.
19-
If you can provide additional information related to this topic that could help future readers, please feel free to leave a comment.
17+
:warning: **This issue has been closed.** If you have a similar problem but not exactly the same, please open a [new issue](https://github.com/mui/mui-x/issues/new/choose).
18+
Now, if you have additional information related to this issue or things that could help future readers, feel free to leave a comment.
2019
APPENDIX: |
2120
22-
**How did we do @${{ github.event.issue.user.login }}?**
23-
Your experience with our support team matters to us. If you have a moment, please share your thoughts through our [brief survey](https://tally.so/r/w4r5Mk?issue=${{ github.event.issue.number }}).
21+
@${{ github.event.issue.user.login }}: How did we do? Your experience with our support team matters to us. If you have a moment, please share your thoughts in this short [Support Satisfaction survey](https://tally.so/r/w4r5Mk?issue=${{ github.event.issue.number }}&productId=x).
2422
2523
if: github.event.issue.state_reason != 'inactivity'
2624
runs-on: ubuntu-latest
2725
permissions:
2826
issues: write
2927
steps:
28+
- uses: actions-cool/check-user-permission@a0668c9aec87f3875fc56170b6452a453e9dd819
29+
id: checkUser
30+
with:
31+
require: 'write'
3032
- name: Add comment for outside contributors
31-
if: github.event.issue.author_association != 'MEMBER' && github.event.issue.author_association != 'OWNER'
33+
if: steps.checkUser.outputs.check-result == 'false'
3234
run: gh issue comment "$NUMBER" --body "$BODY $APPENDIX"
3335
- name: Add comment for maintainers
34-
if: github.event.issue.author_association == 'MEMBER' || github.event.issue.author_association == 'OWNER'
36+
if: steps.checkUser.outputs.check-result == 'true'
3537
run: gh issue comment "$NUMBER" --body "$BODY"

CHANGELOG.md

+74-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,77 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## 7.1.0
7+
8+
_Mar 28, 2024_
9+
10+
We'd like to offer a big thanks to the 10 contributors who made this release possible. Here are some highlights ✨:
11+
12+
- 🚀 Add `resizeThrottleMs` prop (#12556) @romgrk
13+
- 🌍 Improve Chinese (Hong Kong) (zh-HK) and Italian (it-IT) locale on the Pickers
14+
- 🐞 Bugfixes
15+
- 📚 Documentation improvements
16+
17+
### Data Grid
18+
19+
#### `@mui/x-data-grid@7.1.0`
20+
21+
- [DataGrid] Add `resizeThrottleMs` prop (#12556) @romgrk
22+
- [DataGrid] Do not publish `rowEditStop` event if row has fields with errors (#11383) @cherniavskii
23+
- [DataGrid] Fix bug in suspense (#12553) @romgrk
24+
- [DataGrid] Fix missing class name in the `GridToolbarQuickFilter` component (#12484) @jhawkins11
25+
26+
#### `@mui/x-data-grid-pro@7.1.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
27+
28+
Same changes as in `@mui/x-data-grid@7.1.0`.
29+
30+
#### `@mui/x-data-grid-premium@7.1.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
31+
32+
Same changes as in `@mui/x-data-grid-pro@7.1.0`.
33+
34+
### Date and Time Pickers
35+
36+
#### `@mui/x-date-pickers@7.1.0`
37+
38+
- [fields] Fix placeholder override (#12589) @flaviendelangle
39+
- [l10n] Improve Chinese (Hong Kong) (zh-HK) locale (#12547) @samchiu90
40+
- [l10n] Improve Italian (it-IT) locale (#12549) @antomanc
41+
- [pickers] Prepare compatibility with `@mui/zero-runtime` (stop using `ownerState` in `styled`) (#12003) @flaviendelangle
42+
43+
#### `@mui/x-date-pickers-pro@7.1.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
44+
45+
Same changes as in `@mui/x-date-pickers@7.1.0`, plus:
46+
47+
- [DateRangePicker] Fix selection behavior with single input field when `readOnly` (#12593) @LukasTy
48+
49+
### Charts
50+
51+
#### `@mui/x-charts@7.1.0`
52+
53+
- [charts] Fix tooltip causing crash on data change (#12571) @Rishi556
54+
55+
### Tree View
56+
57+
#### `@mui/x-tree-view@7.1.0`
58+
59+
- [TreeView] Do not use outdated version of the state to compute new label first char in `RichTreeView` (#12512) @flaviendelangle
60+
61+
### Docs
62+
63+
- [docs] Add example to add a second icon next to the field's opening button (#12524) @flaviendelangle
64+
- [docs] Add missing note to Data Grid migration guide (#12557) @romgrk
65+
- [docs] Fix Charts title for SEO (#12545) @oliviertassinari
66+
- [docs] Fix small typo (#12558) @diogoparente
67+
- [docs] Improve codemod related documentation (#12582) @MBilalShafi
68+
- [docs] Reduce noise in migration docs side navigation (#12552) @cherniavskii
69+
- [docs] Sync static images from core repository (#12525) @LukasTy
70+
71+
### Core
72+
73+
- [core] Fix `l10n` script on Windows (#12550) @LukasTy
74+
- [core] Include `DateTimeRangePicker` tag in `releaseChangelog` (#12526) @LukasTy
75+
- [core] Upgrade monorepo (#12536) @cherniavskii
76+
677
## v7.0.0
778

879
_Mar 22, 2024_
@@ -459,13 +530,13 @@ We'd like to offer a big thanks to the 10 contributors who made this release pos
459530

460531
- 🎁 Introduce a new DOM structure for the field components that provides a better accessibility
461532
- 🚀 Simplify Data Grid DOM structure for improved performance (#12013) @romgrk
462-
- 🕥 The support for IE11 has been removed (#12151) @flaviendelangle
533+
- 🕥 The support for IE 11 has been removed (#12151) @flaviendelangle
463534
- 🐞 Bugfixes
464535
- 📚 Documentation improvements
465536

466537
### Breaking changes
467538

468-
- The support for IE11 has been removed from all MUI X packages. The `legacy` bundle that used to support old browsers like IE11 is no longer included.
539+
- The support for IE 11 has been removed from all MUI X packages. The `legacy` bundle that used to support old browsers like IE 11 is no longer included.
469540

470541
### Data Grid
471542

@@ -570,7 +641,7 @@ These components are no longer exported from `@mui/x-charts`:
570641

571642
### Tree View / `@mui/x-tree-view@7.0.0-beta.4`
572643

573-
- [TreeView] Stop using custom `findIndex` to support IE11 (#12129) @flaviendelangle
644+
- [TreeView] Stop using custom `findIndex` to support IE 11 (#12129) @flaviendelangle
574645

575646
### Docs
576647

babel.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const defaultAlias = {
1616
'@mui/x-date-pickers-pro': resolveAliasPath('./packages/x-date-pickers-pro/src'),
1717
'@mui/x-charts': resolveAliasPath('./packages/x-charts/src'),
1818
'@mui/x-tree-view': resolveAliasPath('./packages/x-tree-view/src'),
19+
'@mui/x-tree-view-pro': resolveAliasPath('./packages/x-tree-view-pro/src'),
1920
'@mui/material-nextjs': '@mui/monorepo/packages/mui-material-nextjs/src',
2021
'@mui-internal/api-docs-builder': resolveAliasPath(
2122
'./node_modules/@mui/monorepo/packages/api-docs-builder',

docs/babel.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const alias = {
1010
'@mui/x-date-pickers-pro': '../packages/x-date-pickers-pro/src',
1111
'@mui/x-charts': '../packages/x-charts/src',
1212
'@mui/x-tree-view': '../packages/x-tree-view/src',
13+
'@mui/x-tree-view-pro': '../packages/x-tree-view-pro/src',
1314
'@mui/x-license': '../packages/x-license/src',
1415
'@mui/docs': '../node_modules/@mui/monorepo/packages/mui-docs/src',
1516
'@mui/monorepo': '../node_modules/@mui/monorepo',

docs/data/charts/getting-started/getting-started.md

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
title: React Chart library - Getting started
32
productId: x-charts
43
githubLabel: 'component: charts'
54
packageName: '@mui/x-charts'

docs/data/charts/overview/overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: React Chart library
2+
title: React Charts
33
productId: x-charts
44
githubLabel: 'component: charts'
55
packageName: '@mui/x-charts'

docs/data/charts/pie/PieShapeNoSnap.js

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export default function PieShapeNoSnap() {
5252
` cx: ${props.cx},`,
5353
` cy: ${props.cy},`,
5454
` }`,
55+
` ]}`,
5556
'/>',
5657
].join('\n');
5758
}}

docs/data/data-grid/localization/data.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"languageTag": "fa-IR",
164164
"importName": "faIR",
165165
"localeName": "Persian",
166-
"missingKeysCount": 3,
166+
"missingKeysCount": 0,
167167
"totalKeysCount": 117,
168168
"githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/locales/faIR.ts"
169169
},
@@ -187,7 +187,7 @@
187187
"languageTag": "pt-BR",
188188
"importName": "ptBR",
189189
"localeName": "Portuguese (Brazil)",
190-
"missingKeysCount": 3,
190+
"missingKeysCount": 0,
191191
"totalKeysCount": 117,
192192
"githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/locales/ptBR.ts"
193193
},
@@ -219,7 +219,7 @@
219219
"languageTag": "es-ES",
220220
"importName": "esES",
221221
"localeName": "Spanish",
222-
"missingKeysCount": 3,
222+
"missingKeysCount": 0,
223223
"totalKeysCount": 117,
224224
"githubLink": "https://github.com/mui/mui-x/blob/master/packages/x-data-grid/src/locales/esES.ts"
225225
},
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import * as React from 'react';
2+
import { DataGridPro } from '@mui/x-data-grid-pro';
3+
import { useDemoData } from '@mui/x-data-grid-generator';
4+
import FormControlLabel from '@mui/material/FormControlLabel';
5+
import Switch from '@mui/material/Switch';
6+
import Box from '@mui/material/Box';
7+
8+
export default function CheckboxSelectionVisibleOnlyGrid() {
9+
const [checkboxSelectionVisibleOnly, setCheckboxSelectionVisibleOnly] =
10+
React.useState(false);
11+
12+
const { data } = useDemoData({
13+
dataSet: 'Commodity',
14+
rowLength: 300,
15+
maxColumns: 5,
16+
});
17+
18+
return (
19+
<div style={{ width: '100%' }}>
20+
<Box sx={{ mb: 1 }}>
21+
<FormControlLabel
22+
label="checkboxSelectionVisibleOnly"
23+
control={
24+
<Switch
25+
checked={checkboxSelectionVisibleOnly}
26+
onChange={(event) =>
27+
setCheckboxSelectionVisibleOnly(event.target.checked)
28+
}
29+
/>
30+
}
31+
/>
32+
</Box>
33+
<div style={{ height: 400 }}>
34+
<DataGridPro
35+
{...data}
36+
initialState={{
37+
...data.initialState,
38+
pagination: { paginationModel: { pageSize: 50 } },
39+
}}
40+
pageSizeOptions={[5, 10, 25, 50, 100]}
41+
pagination
42+
checkboxSelection
43+
checkboxSelectionVisibleOnly={checkboxSelectionVisibleOnly}
44+
/>
45+
</div>
46+
</div>
47+
);
48+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import * as React from 'react';
2+
import { DataGridPro } from '@mui/x-data-grid-pro';
3+
import { useDemoData } from '@mui/x-data-grid-generator';
4+
import FormControlLabel from '@mui/material/FormControlLabel';
5+
import Switch from '@mui/material/Switch';
6+
import Box from '@mui/material/Box';
7+
8+
export default function CheckboxSelectionVisibleOnlyGrid() {
9+
const [checkboxSelectionVisibleOnly, setCheckboxSelectionVisibleOnly] =
10+
React.useState(false);
11+
12+
const { data } = useDemoData({
13+
dataSet: 'Commodity',
14+
rowLength: 300,
15+
maxColumns: 5,
16+
});
17+
18+
return (
19+
<div style={{ width: '100%' }}>
20+
<Box sx={{ mb: 1 }}>
21+
<FormControlLabel
22+
label="checkboxSelectionVisibleOnly"
23+
control={
24+
<Switch
25+
checked={checkboxSelectionVisibleOnly}
26+
onChange={(event) =>
27+
setCheckboxSelectionVisibleOnly(event.target.checked)
28+
}
29+
/>
30+
}
31+
/>
32+
</Box>
33+
<div style={{ height: 400 }}>
34+
<DataGridPro
35+
{...data}
36+
initialState={{
37+
...data.initialState,
38+
pagination: { paginationModel: { pageSize: 50 } },
39+
}}
40+
pageSizeOptions={[5, 10, 25, 50, 100]}
41+
pagination
42+
checkboxSelection
43+
checkboxSelectionVisibleOnly={checkboxSelectionVisibleOnly}
44+
/>
45+
</div>
46+
</div>
47+
);
48+
}

docs/data/data-grid/row-selection/row-selection.md

+7
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,13 @@ Always set the `checkboxSelection` prop to `true` even when providing a custom c
6464
Otherwise, the data grid might remove your column.
6565
:::
6666

67+
### Visible rows selection [<span class="plan-pro"></span>](/x/introduction/licensing/#pro-plan 'Pro plan')
68+
69+
By default, when you click the "Select All" checkbox, all rows in the data grid are selected.
70+
If you want to change this behavior and only select the rows that are currently visible on the page, you can use the `checkboxSelectionVisibleOnly` prop.
71+
72+
{{"demo": "CheckboxSelectionVisibleOnlyGrid.js", "bg": "inline"}}
73+
6774
## Usage with server-side pagination
6875

6976
Using the controlled selection with `paginationMode="server"` may result in selected rows being lost when the page is changed.

0 commit comments

Comments
 (0)