Skip to content

Commit

Permalink
Merge branch 'master' into use-real-world-pie-data
Browse files Browse the repository at this point in the history
Signed-off-by: Jose C Quintas Jr <[email protected]>
  • Loading branch information
JCQuintas authored Aug 27, 2024
2 parents 9f8e28a + 8e82705 commit 20486ad
Show file tree
Hide file tree
Showing 108 changed files with 2,079 additions and 1,595 deletions.
2 changes: 2 additions & 0 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
"packages/x-date-pickers",
"packages/x-date-pickers-pro",
"packages/x-charts",
"packages/x-charts-pro",
"packages/x-charts-vendor",
"packages/x-tree-view",
"packages/x-tree-view-pro",
"packages/x-internals"
],
"publishDirectory": {
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/3.pro-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
id: contact
attributes:
label: Order ID or Support key 💳
description: The order ID of the purchased Pro plan. Community users can [learn more about support](https://mui.com/getting-started/support/) in the documentation.
description: The order ID of the purchased Pro plan. Community users can [learn more about support](https://mui.com/x/introduction/support/) in the documentation.
placeholder: 'e.g. 11111'
validations:
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/4.premium-support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ body:
id: contact
attributes:
label: Order ID or Support key 💳
description: The order ID of the purchased Premium plan. Community users can [learn more about support](https://mui.com/getting-started/support/) in the documentation.
description: The order ID of the purchased Premium plan. Community users can [learn more about support](https://mui.com/x/introduction/support/) in the documentation.
placeholder: 'e.g. 11111'
validations:
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
contact_links:
- name: Support ❔
url: https://mui.com/getting-started/support/
about: I need support with MUI X.
url: https://mui.com/x/introduction/support/
about: I need support with MUI X.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
with:
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -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@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions .github/workflows/support-stackoverflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
# Comment to post on issues marked as support requests. Add a link
# to a support page, or set to `false` to disable
issue-comment: |
👋 Thanks for using MUI X!
👋 Thanks for using this project!
We use GitHub issues as a bug and feature requests tracker, however,
this issue appears to be a support request.
For support, please check out https://mui.com/x/introduction/support/. Thanks!
For support with MUI X please check out https://mui.com/x/introduction/support/. Thanks!
If you have a question on Stack Overflow, you are welcome to link to it here, it might help others.
If your issue is subsequently confirmed as a bug, and the report follows the issue template, it can be reopened.
Expand Down
84 changes: 82 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,86 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 7.14.0

_Aug 23, 2024_

We'd like to offer a big thanks to the 14 contributors who made this release possible. Here are some highlights ✨:

- 💫 Allow [filtering the axis on zoom](https://mui.com/x/react-charts/zoom-and-pan/#zoom-filtering), making the axis adapt by removing values outside the view.

<img width="600" src="https://github.com/user-attachments/assets/e65bbd00-d2a8-4136-81cd-3598f1373c16" alt="filtering the axis on zoom" />

- 📊 Improve bar chart performances
- 🌍 Improve Czech (cs-CZ) and Hebrew (he-IL) locales on the Data Grid
- 🌍 Improve Chinese (zh-HK), Hebrew (he-IL), and Vietnamese (vi-VN) locales on the Date and Time Pickers
- 🐞 Bugfixes

<!--/ HIGHLIGHT_ABOVE_SEPARATOR /-->

### Data Grid

#### `@mui/[email protected]`

- [DataGrid] Use readonly array result for `getTreeDataPath` (#11743) @pcorpet
- [DataGrid] Use `event.key` for `Tab` and `Escape` keys (#14170) @k-rajat19
- [DataGrid] Introduce selectors with arguments (#14236) @MBilalShafi
- [DataGrid] include `api` in `gridCellParams` interface (#14201) @k-rajat19
- [l10n] Improve Czech (cs-CZ) locale (#14135) @chirimiri22
- [l10n] Improve Hebrew (he-IL) locale (#14287) @rotembarsela

#### `@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]`.

#### `@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]`, plus:

- [DataGridPremium] Fix clipboard paste not working for a single cell on non-first page (#14261) @arminmeh
- [DataGridPremium] Fix `onCellSelectionModelChange` not triggered when additional cell range is selected (#14199) @arminmeh

### Date and Time Pickers

#### `@mui/[email protected]`

- [l10n] Improve Chinese (zh-HK) locale (#13289) @yeeharn
- [l10n] Improve Hebrew (he-IL) locale (#14287) @rotembarsela
- [l10n] Improve Vietnamese (vi-VN) locale (#14238) @locnbk2002
- [TimePicker] Handle `Space` and `Enter` on the `TimeClock` component @arthurbalduini

#### `@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] Fix grid overflow with zooming (#14280) @alexfauquette
- [charts] Improve bar chart performances (#14278) @alexfauquette
- [charts] Test pointer events (#14042) @alexfauquette
- [charts] Use `isPointInside` function for both graphs and axis (#14222) @JCQuintas

#### `@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:

- [charts-pro] Zoom axis filtering (#14121) @JCQuintas

### Docs

- [docs] Consistent use of UTC and timezones (#14250) @oliviertassinari
- [docs] Fix missing leading slashes in URLs (#14249) @oliviertassinari
- [docs] Dash usage revision on pickers pages (#14260) @arthurbalduini

### Core

- [core] Follow JSDocs convention @oliviertassinari
- [core] Prepare for material v6 (#14143) @LukasTy
- [code-infra] Set up `eslint-plugin-testing-library` (#14232) @LukasTy
- [infra] Updated mui-x roadmap links with new project URL (#14271) @michelengelen

## 7.13.0

_Aug 16, 2024_
Expand Down Expand Up @@ -58,7 +138,7 @@ Same changes as in `@mui/[email protected]`.
- [charts] Rename `CartesianContextProvider` to `CartesianProvider` (#14102) @JCQuintas
- [charts] Support axis with the same value for all data points (#14191) @alexfauquette

#### `@mui/x-date-[email protected]` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
#### `@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]`.

Expand Down Expand Up @@ -132,7 +212,7 @@ Same changes as in `@mui/[email protected]`.
- [charts] Fix charts vendor publish config (#14073) @JCQuintas
- [charts] Move `plugins` to `PluginProvider` (#14056) @JCQuintas

#### `@mui/x-date-[email protected]` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
#### `@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:

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Contributing to MUI X

## MUI X vs. Material UI, Base UI, MUI System, Joy UI
## MUI X vs. MUI organization

MUI X is an extension of the core open-source libraries of MUI (Material UI, Base UI, MUI System, Joy UI).
MUI X is an extension of the core open-source libraries of the MUI organization (Material UI, Base UI, MUI System, Joy UI).
The repositories are part of the same codebase.
`mui/mui-x` imports the code infrastructure from [`mui/material-ui`](https://github.com/mui/material-ui).
You can find the "contributing" guide for the main repository in [mui/material-ui/CONTRIBUTING.md](https://github.com/mui/material-ui/blob/HEAD/CONTRIBUTING.md).
Expand Down
10 changes: 5 additions & 5 deletions changelogOld/CHANGELOG.v4.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ _Aug 27, 2021_

We have been iterating on the component for [18 months](https://github.com/mui/mui-x/commit/705cb0f387b5f3aa056bf40c4183a2342b317447). With the introduction of the [row edit](https://mui.com/x/react-data-grid/editing/#row-editing) feature, many bug fixes, and polishing of the documentation, we believe the component is ready for a stable release.

The MUI X v4.0.0 release supports [MUI Core](https://github.com/mui/material-ui) v4 and has partial support for v5-beta. With the soon-to-be-released v5 version of the core components, we are moving ongoing work to the v5 release line (Core and X).
The support for existing projects on Material UI v4 won't be a priority going forward. We encourage you to migrate to MUI Core v5-beta and soon MUI X v5-beta. We don't patch, fix, or alter older versions. Using MUI Core v4 with MUI X v5 might lead to extra bundle size and configuration.
The MUI X v4.0.0 release supports [Material UI](https://github.com/mui/material-ui) v4 and has partial support for v5-beta. With the soon-to-be-released v5 version of the core components, we are moving ongoing work to the v5 release line (Core and X).
The support for existing projects on Material UI v4 won't be a priority going forward. We encourage you to migrate to MUI Core v5-beta and soon MUI X v5-beta. We don't patch, fix, or alter older versions. Using Material UI v4 with MUI X v5 might lead to extra bundle size and configuration.

A big thanks to the 6 contributors who made this release possible. Here are some highlights ✨:

Expand Down Expand Up @@ -600,7 +600,7 @@ Big thanks to the 10 contributors who made this release possible. Here are some
- ⚡️ Components that use portals, like `Select` and `Autocomplete`, can now be used in the cell editing (#1772) @m4theushw
- 📃 Apply the `valueFormatter` to the CSV exporting (#1922) @DanailH
- 💅 Rename CSS classes to match the convention of the core components (#1872) @DanailH
- 🌎 Isolate translations from MUI Core and MUI X (#1913) @DanailH
- 🌎 Isolate translations from Material UI and MUI X (#1913) @DanailH
- 🚀 Improve performance when finding column indexes and updating rows (#1903, #1923) @Janpot @N2D4
- 🐞 Bugfixes

Expand All @@ -609,7 +609,7 @@ Big thanks to the 10 contributors who made this release possible. Here are some
#### Breaking changes

- [DataGrid] The `onEditCellChangeCommitted` prop won't be called with an event when committing changes by clicking outside the cell (#1910) @m4theushw
- [DataGrid] Translation for MUI Core components are no longer included in the MUI X translation (#1913) @DanailH
- [DataGrid] Translation for Material UI components are no longer included in the MUI X translation (#1913) @DanailH

```diff
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
Expand Down Expand Up @@ -684,7 +684,7 @@ Big thanks to the 10 contributors who made this release possible. Here are some
- [DataGrid] Improve Brazilian Portuguese (pt-BR) locale (#1861) @aline-matos
- [DataGrid] Improve type of the blur event (#1918) @oliviertassinari
- [DataGrid] Improve updateRows performance (#1923) @N2D4
- [DataGrid] Include MUI Core component localizations in `localeText` (#1913) @DanailH
- [DataGrid] Include Material UI component localizations in `localeText` (#1913) @DanailH
- [DataGrid] Make the CSV export respect the `valueFormatter` (#1922) @DanailH
- [DataGrid] Remove `disableClickEventBubbling` (#1910) @m4theushw
- [DataGrid] Rename CSS classes according to new convention (#1872) @DanailH
Expand Down
4 changes: 2 additions & 2 deletions docs/data/charts/bars/BarAnimation.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ export default function BarAnimation() {
}

const highlightScope = {
highlighted: 'series',
faded: 'global',
highlight: 'series',
fade: 'global',
};

const series = [
Expand Down
4 changes: 2 additions & 2 deletions docs/data/charts/bars/BarAnimation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ export default function BarAnimation() {
}

const highlightScope = {
highlighted: 'series',
faded: 'global',
highlight: 'series',
fade: 'global',
} as const;

const series = [
Expand Down
6 changes: 3 additions & 3 deletions docs/data/charts/bars/BarClickNoSnap.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const barChartsParams = {
label: 'A',
stack: 'total',
highlightScope: {
highlighted: 'item',
highlight: 'item',
},
},
{
Expand All @@ -26,15 +26,15 @@ const barChartsParams = {
label: 'B',
stack: 'total',
highlightScope: {
highlighted: 'item',
highlight: 'item',
},
},
{
id: 'series-3',
data: [4, 2, 5, 4, 1],
label: 'C',
highlightScope: {
highlighted: 'item',
highlight: 'item',
},
},
],
Expand Down
33 changes: 30 additions & 3 deletions docs/data/charts/getting-started/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,18 @@ To help folks using CommonJS, the `@mui/x-charts` package uses a vendored packag

If you need some D3 functions, you can import them with `@mui/x-charts-vendor/d3-color`.

## Displaying Charts
## Displaying charts

A Chart can be rendered in one of two ways: as a single component, or by composing subcomponents.

### Single Charts
### Single charts

For common use cases, the single component is the recommended way.
Those components' names end with "Chart", as opposed to "Plot", and only require the series prop describing the data to render.

{{"demo": "SimpleCharts.js"}}

### Composed Charts
### Composed charts

To combine different Charts, like Lines with Bars, you can use composition with the `ChartContainer` wrapper.

Expand Down Expand Up @@ -118,3 +118,30 @@ Visit the [Axis page](/x/react-charts/axis/) for more details.
MUI X Charts follows the Material UI styling and features all of the customization tools you'd find there, making tweaking charts as straightforward as designing buttons.

Visit the [Styling page](/x/react-charts/styling/) for more details.

## TypeScript

In order to benefit from the [CSS overrides](/material-ui/customization/theme-components/#theme-style-overrides) and [default prop customization](/material-ui/customization/theme-components/#theme-default-props) with the theme, TypeScript users need to import the following types.
Internally, it uses module augmentation to extend the default theme structure.

```tsx
import type {} from '@mui/x-charts/themeAugmentation';
import type {} from '@mui/x-charts-pro/themeAugmentation';

const theme = createTheme({
components: {
MuiChartsAxis: {
styleOverrides: {
tick: {
stroke: '#006BD6',
},
},
},
},
});
```

:::info
You don't have to import the theme augmentation from both `@mui/x-charts` and `@mui/x-charts-pro` when using `@mui/x-charts-pro`.
Importing it from `@mui/x-charts-pro` is enough.
:::
6 changes: 3 additions & 3 deletions docs/data/charts/lines/LineClickNoSnap.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const lineChartsParams = {
area: true,
stack: 'total',
highlightScope: {
highlighted: 'item',
highlight: 'item',
},
},
{
Expand All @@ -28,7 +28,7 @@ const lineChartsParams = {
area: true,
stack: 'total',
highlightScope: {
highlighted: 'item',
highlight: 'item',
},
},
{
Expand All @@ -38,7 +38,7 @@ const lineChartsParams = {
area: true,
stack: 'total',
highlightScope: {
highlighted: 'item',
highlight: 'item',
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion docs/data/charts/pie/PieActiveArc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function PieActiveArc() {
series={[
{
data: desktopOS,
highlightScope: { faded: 'global', highlighted: 'item' },
highlightScope: { fade: 'global', highlight: 'item' },
faded: { innerRadius: 30, additionalRadius: -30, color: 'gray' },
valueFormatter,
},
Expand Down
2 changes: 1 addition & 1 deletion docs/data/charts/pie/PieActiveArc.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function PieActiveArc() {
series={[
{
data: desktopOS,
highlightScope: { faded: 'global', highlighted: 'item' },
highlightScope: { fade: 'global', highlight: 'item' },
faded: { innerRadius: 30, additionalRadius: -30, color: 'gray' },
valueFormatter,
},
Expand Down
2 changes: 1 addition & 1 deletion docs/data/charts/pie/PieActiveArc.tsx.preview
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
series={[
{
data: desktopOS,
highlightScope: { faded: 'global', highlighted: 'item' },
highlightScope: { fade: 'global', highlight: 'item' },
faded: { innerRadius: 30, additionalRadius: -30, color: 'gray' },
valueFormatter,
},
Expand Down
Loading

0 comments on commit 20486ad

Please sign in to comment.