Merge remote-tracking branch 'upstream/master' into poc-time-band-scale

mui · alexfauquette · Jun 26, 2024 · Jun 13, 2024 · Jun 13, 2024 · Jun 18, 2024
commit b3bec07a8b8dc3f2dd0573204e8808e2a50178c1
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
@@ -11,7 +11,6 @@
  "packages/x-date-pickers",
  "packages/x-date-pickers-pro",
  "packages/x-charts",
- "packages/x-charts-pro",
  "packages/x-tree-view"
  ],
  "publishDirectory": {

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -5,8 +5,7 @@ const path = require('path');
 const ENABLE_REACT_COMPILER_PLUGIN = process.env.ENABLE_REACT_COMPILER_PLUGIN ?? false;
 
 // Enable React Compiler Plugin rules per package
-const ENABLE_REACT_COMPILER_PLUGIN_CHARTS =
- process.env.ENABLE_REACT_COMPILER_PLUGIN_CHARTS ?? false;
+const ENABLE_REACT_COMPILER_PLUGIN_CHARTS = process.env.ENABLE_REACT_COMPILER_PLUGIN_CHARTS ?? true;
 const ENABLE_REACT_COMPILER_PLUGIN_DATA_GRID =
  process.env.ENABLE_REACT_COMPILER_PLUGIN_DATA_GRID ?? false;
 const ENABLE_REACT_COMPILER_PLUGIN_DATE_PICKERS =

diff --git a/.github/workflows/cherry-pick-master-to-v6.yml b/.github/workflows/cherry-pick-master-to-v6.yml
@@ -18,7 +18,7 @@ jobs:
  if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
  steps:
  - name: Checkout
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  with:
  fetch-depth: 0
  - name: Cherry pick and create the new PR

diff --git a/.github/workflows/cherry-pick-next-to-master.yml b/.github/workflows/cherry-pick-next-to-master.yml
@@ -18,7 +18,7 @@ jobs:
  if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
  steps:
  - name: Checkout
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  with:
  fetch-depth: 0
  - name: Cherry pick and create the new PR

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,10 +16,10 @@ jobs:
  security-events: write
  steps:
  - name: Checkout repository
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+ uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
  with:
  languages: typescript
  # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
  # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
  # queries: security-extended,security-and-quality
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+ uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
diff --git a/.github/workflows/l10n.yml b/.github/workflows/l10n.yml
@@ -17,7 +17,7 @@ jobs:
  issues: write
  steps:
  - run: echo "${{ github.actor }}"
- - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
  with:
  run_install: false

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -23,7 +23,7 @@ jobs:
 
  steps:
  - name: Checkout code
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  with:
  persist-credentials: false
 
@@ -44,6 +44,6 @@ jobs:
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: Upload to code-scanning
- uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+ uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
  with:
  sarif_file: results.sarif
diff --git a/.github/workflows/vale-action.yml b/.github/workflows/vale-action.yml
@@ -12,7 +12,7 @@ jobs:
  contents: read
  pull-requests: write
  steps:
- - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+ - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
  - uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
  with:
  reporter: github-pr-review

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,87 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 7.7.0
+
+_Jun 13, 2024_
+
+We'd like to offer a big thanks to the 12 contributors who made this release possible. Here are some highlights ✨:
+
+- 🎁 Allow customization of the Pickers month and the year buttons
+- 🌍 Improve Persian (fa-IR), Portuguese (pt-PT), and Russian (ru-RU) locales on the Data Grid
+- 🌍 Improve Korean (ko-KR) and Persian (fa-IR) locales on the Date and Time Pickers
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+<!--/ HIGHLIGHT_ABOVE_SEPARATOR /-->
+
+### Data Grid
+
+#### `@mui/[email protected]`
+
+- [DataGrid] Add `getFilterState` method (#13418) @cherniavskii
+- [DataGrid] Do not show resize separators for column groups (#13455) @cherniavskii
+- [l10n] Improve Persian (fa-IR) locale (#13402) @fakhamatia
+- [l10n] Improve Portuguese (pt-PT) locale (#13384) @olavocarvalho
+- [l10n] Improve Russian (ru-RU) locale (#11210) @dastan-akhmetov-scity
+
+#### `@mui/[email protected]` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/[email protected]`, plus:
+
+- [DataGridPro] Do not render detail panel if the focused cell is not visible (#13456) @cherniavskii
+
+#### `@mui/[email protected]` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/[email protected]`.
+
+### Date and Time Pickers
+
+#### `@mui/[email protected]`
+
+- [l10n] Improve Korean (ko-KR) locale (#13452) @ryxxn
+- [l10n] Improve Persian (fa-IR) locale (#13402) @fakhamatia
+- [pickers] Allow to customize the month and the year buttons (#13321) @flaviendelangle
+
+#### `@mui/[email protected]` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/[email protected]`.
+
+### Charts
+
+#### `@mui/[email protected]`
+
+- [charts] Add watermark on the pro `ResponsiveChartContainer` (#13398) @alexfauquette
+- [charts] Allow to specify y-axis configuration (#13438) @alexfauquette
+- [charts] Fix eslint for react compiler (#13444) @alexfauquette
+- [charts] Improve themeAugmentation typing (#13433) @noraleonte
+- [charts] Move the `ZAxisContextProvider` by default in the `ChartContainer` (#13465) @alexfauquette
+- [charts] Use plugins to define series extremum and colors (#13397) @alexfauquette
+
+### Tree View
+
+#### `@mui/[email protected]`
+
+- [TreeView] Improve TypeScript for plugins (#13380) @flaviendelangle
+- [TreeView] Improve the typing of the cancelable events (#13152) @flaviendelangle
+- [TreeView] Prepare support for PigmentCSS (#13412) @flaviendelangle
+- [TreeView] Refactor the tree view internals to prepare for headless API (#13311) @flaviendelangle
+
+### Docs
+
+- [docs] Add `renderHeader` recipe to the Master Details docs (#13370) @michelengelen
+- [docs] Add lazy loading detail panel demo (#13453) @cherniavskii
+- [docs] Add small edits to the Data Grid overview page (#13060) @danilo-leal
+- [docs] Update a11y pages description (#13417) @danilo-leal
+- [docs] improve the writing on the "Quick filter outside of the grid" example (#13155) @michelengelen
+
+### Core
+
+- [core] Add `eslint-plugin-react-compiler` experimental version and rules (#13415) @JCQuintas
+- [core] Minor setup cleanup (#13467) @LukasTy
+- [infra] Adjust CI setup (#13448) @LukasTy
+- [test] Add tests for the custom slots of `TreeItem2` (#13314) @flaviendelangle
+
 ## 7.6.2
 
 _Jun 6, 2024_

diff --git a/docs/data/charts/axis/AxisTextCustomizationNoSnap.js b/docs/data/charts/axis/AxisTextCustomizationNoSnap.js
@@ -2,96 +2,11 @@ import * as React from 'react';
 import Box from '@mui/material/Box';
 import ChartsUsageDemo from 'docsx/src/modules/components/ChartsUsageDemo';
 import { BarChart } from '@mui/x-charts/BarChart';
+import { dataset } from '../dataset/weather';
 
 const chartSetting = {
  height: 300,
 };
-const dataset = [
- {
- london: 59,
- paris: 57,
- newYork: 86,
- seoul: 21,
- month: 'Jan',
- },
- {
- london: 50,
- paris: 52,
- newYork: 78,
- seoul: 28,
- month: 'Fev',
- },
- {
- london: 47,
- paris: 53,
- newYork: 106,
- seoul: 41,
- month: 'Mar',
- },
- {
- london: 54,
- paris: 56,
- newYork: 92,
- seoul: 73,
- month: 'Apr',
- },
- {
- london: 57,
- paris: 69,
- newYork: 92,
- seoul: 99,
- month: 'May',
- },
- {
- london: 60,
- paris: 63,
- newYork: 103,
- seoul: 144,
- month: 'June',
- },
- {
- london: 59,
- paris: 60,
- newYork: 105,
- seoul: 319,
- month: 'July',
- },
- {
- london: 65,
- paris: 60,
- newYork: 106,
- seoul: 249,
- month: 'Aug',
- },
- {
- london: 51,
- paris: 51,
- newYork: 95,
- seoul: 131,
- month: 'Sept',
- },
- {
- london: 60,
- paris: 65,
- newYork: 97,
- seoul: 55,
- month: 'Oct',
- },
- {
- london: 67,
- paris: 64,
- newYork: 76,
- seoul: 48,
- month: 'Nov',
- },
- {
- london: 61,
- paris: 70,
- newYork: 103,
- seoul: 25,
- month: 'Dec',
- },
-];
 
 const valueFormatter = (value) => `${value}mm`;
 

diff --git a/docs/data/charts/axis/GridDemo.js b/docs/data/charts/axis/GridDemo.js
@@ -2,97 +2,12 @@ import * as React from 'react';
 import { axisClasses } from '@mui/x-charts/ChartsAxis';
 import { chartsGridClasses } from '@mui/x-charts/ChartsGrid';
 import { BarChart } from '@mui/x-charts/BarChart';
+import { dataset } from '../dataset/weather';
 
 const chartSetting = {
  yAxis: [{ label: 'rainfall (mm)' }],
  height: 300,
 };
-const dataset = [
- {
- london: 59,
- paris: 57,
- newYork: 86,
- seoul: 21,
- month: 'Jan',
- },
- {
- london: 50,
- paris: 52,
- newYork: 78,
- seoul: 28,
- month: 'Fev',
- },
- {
- london: 47,
- paris: 53,
- newYork: 106,
- seoul: 41,
- month: 'Mar',
- },
- {
- london: 54,
- paris: 56,
- newYork: 92,
- seoul: 73,
- month: 'Apr',
- },
- {
- london: 57,
- paris: 69,
- newYork: 92,
- seoul: 99,
- month: 'May',
- },
- {
- london: 60,
- paris: 63,
- newYork: 103,
- seoul: 144,
- month: 'June',
- },
- {
- london: 59,
- paris: 60,
- newYork: 105,
- seoul: 319,
- month: 'July',
- },
- {
- london: 65,
- paris: 60,
- newYork: 106,
- seoul: 249,
- month: 'Aug',
- },
- {
- london: 51,
- paris: 51,
- newYork: 95,
- seoul: 131,
- month: 'Sept',
- },
- {
- london: 60,
- paris: 65,
- newYork: 97,
- seoul: 55,
- month: 'Oct',
- },
- {
- london: 67,
- paris: 64,
- newYork: 76,
- seoul: 48,
- month: 'Nov',
- },
- {
- london: 61,
- paris: 70,
- newYork: 103,
- seoul: 25,
- month: 'Dec',
- },
-];
 
 const valueFormatter = (value) => `${value}mm`;