Skip to content

Commit

Permalink
Merge branch 'mui:master' into focused_cell_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
yaredtsy authored Jul 17, 2023
2 parents ef75b50 + b942dcd commit b9c7537
Show file tree
Hide file tree
Showing 128 changed files with 2,759 additions and 1,089 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/5.priority-support.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Priority support: SLA ⏰'
description: I'm a Premium plan user and I have the priority support add-on, I can't find a solution to my problem with MUI X.
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with MUI X.
title: '[question] '
labels: ['status: needs triage', 'support: commercial', 'support: unknown']
body:
Expand Down
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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
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@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
2 changes: 1 addition & 1 deletion .github/workflows/l10n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- name: Use Node.js 18.x
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 18
cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/priority-support-validation-prompt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Find Comment
uses: peter-evans/find-comment@v2 # v2.4.0
uses: peter-evans/find-comment@a54c31d7fa095754bfef525c0c8e5e5674c4b4b1 # v2.4.0
id: findComment
with:
issue-number: ${{ github.event.issue.number }}
Expand All @@ -25,11 +25,11 @@ jobs:

- name: Create comment
if: ${{ steps.findComment.outputs.comment-id == '' && contains(github.event.label.name, 'unknown') }}
uses: peter-evans/create-or-update-comment@5f728c3dae25f329afbe34ee4d08eef25569d79f # v3.0.2
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
with:
issue-number: ${{ github.event.issue.number }}
body: |
You have created a priority support request ⏰. Please validate your support key using the link below:
You have created a support request under the ["Priority Support"](https://mui.com/legal/technical-support-sla/#priority-support) terms, which is a paid add-on to MUI X Premium ⏰. Please validate your support key using the link below:
https://tools-public.mui.com/prod/pages/jyhs86t?repo=mui-x&issueId=${{ github.event.issue.number }}
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Update comment
if: ${{ steps.findComment.outputs.comment-id != '' && contains(github.event.label.name, 'priority') }}
uses: peter-evans/create-or-update-comment@5f728c3dae25f329afbe34ee4d08eef25569d79f # v3.0.2
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
with:
comment-id: ${{ steps.findComment.outputs.comment-id }}
body: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -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@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
with:
sarif_file: results.sarif
59 changes: 59 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,65 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 6.10.0

_Jul 13, 2023_

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

- ⚡ Improve data grid filtering performance
- 🎁 Include column groups in the CSV export
- 🌍 Improve Polish (pl-PL) locale for the data grid
- 🌍 Improve Norwegian (nb-NO) locale for the pickers

### Data Grid

#### `@mui/x-data-grid@6.10.0`

- [DataGrid] Allow to exclude hidden columns from the quick filter (#9610) @cherniavskii
- [DataGrid] Filtering performance: remove indirection (#9334) @romgrk
- [DataGrid] Fix props propagation on `GridToolbarQuickFilter` component (#9633) @giladappsforce
- [DataGrid] Fix quick filter input lag (#9630) @cherniavskii
- [DataGrid] Include column groups in the CSV export (#9585) @cherniavskii
- [DataGrid] Make `rowExpansionChange` event public (#9611) @MBilalShafi
- [l10n] Improve Polish (pl-PL) locale (#9625) @ch1llysense

#### `@mui/x-data-grid-pro@6.10.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link)

Same changes as in `@mui/x-data-grid@6.10.0`.

#### `@mui/x-data-grid-premium@6.10.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link)

Same changes as in `@mui/x-data-grid-pro@6.10.0`.

### Date Pickers

#### `@mui/x-date-pickers@6.10.0`

- [pickers] Fix date calendar issues (#9652) @LukasTy
- [l10n] Improve Norwegian (nb-NO) locale (#9608) @JosteinBrevik

#### `@mui/x-date-pickers-pro@6.10.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link)

Same changes as in `@mui/x-date-pickers@6.10.0`.

### Charts / `@mui/x-charts@6.0.0-alpha.3`

- [charts] Allow configuring bar size (#9632) @alexfauquette
- [charts] Simplify custom components creation (#9561) @alexfauquette

### Docs

- [docs] Add slot components usage alert (#9660) @LukasTy
- [docs] Fix casing Cell selection @oliviertassinari

### Core

- [core] Disambiguate eslint plugin name @oliviertassinari
- [core] Update priority support issue template and prompt (#9574) @DanailH
- [CHANGELOG] Clarify each plan (#9446) @oliviertassinari
- [license] Fix error terminology (#9614) @oliviertassinari

## 6.9.2

_Jul 6, 2023_
Expand Down
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@emotion/styled": "^11.11.0",
"@material-ui/core": "^5.0.0-beta.5",
"@material-ui/icons": "^5.0.0-beta.5",
"@mui/material": "^5.13.6",
"@mui/material": "^5.14.0",
"@mui/x-data-grid": "^4.0.0",
"ag-grid-community": "^29.3.5",
"ag-grid-react": "^29.3.5",
Expand Down
68 changes: 68 additions & 0 deletions docs/data/charts/bars/BarGapNoSnap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import * as React from 'react';
import ChartsUsageDemo from 'docsx/src/modules/components/ChartsUsageDemo';
import { BarChart } from '@mui/x-charts/BarChart';

const series = [
{ data: [1, 5, 2], stack: 'a' },
{ data: [2, 3, 4], stack: 'a' },
{ data: [3, 2, 3], stack: 'b' },
{ data: [8, 3, 6], stack: 'b' },
{ data: [11, 6, 9] },
];
export default function BarGapNoSnap() {
return (
<ChartsUsageDemo
componentName="Bar gap"
data={[
{
propName: `categoryGapRatio`,
knob: 'number',
defaultValue: 0.3,
step: 0.1,
min: 0,
max: 1,
},
{
propName: `barGapRatio`,
knob: 'number',
defaultValue: 0.1,
step: 0.1,
min: -2,
max: 5,
},
]}
renderDemo={(props) => (
<BarChart
series={series}
width={500}
height={300}
margin={{ top: 5 }}
xAxis={[
{
scaleType: 'band',
data: ['Page 1', 'Page 2', 'Page 3'],
categoryGapRatio: props.categoryGapRatio,
barGapRatio: props.barGapRatio,
},
]}
/>
)}
getCode={({ props }) => {
return [
`import { BarChart } from '@mui/x-charts/BarChart';`,
'',
`<BarChart`,
` // ...`,
` xAxis={[`,
` {`,
` scaleType: 'band'`,
` data: ['Page 1', 'Page 2', 'Page 3']`,
` categoryGapRatio: ${props.categoryGapRatio}`,
` barGapRatio: ${props.barGapRatio}`,
` }`,
'/>',
].join('\n');
}}
/>
);
}
14 changes: 14 additions & 0 deletions docs/data/charts/bars/bars.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@ This axis might have `scaleType='band'` and its `data` should have the same leng

{{"demo": "BasicBars.js"}}

## Bar size

You can define bar dimensions with `categoryGapRatio` and `barGapRatio` properties.

The `categoryGapRatio` defines the gap between two categories.
The ratio is obtained by dividing the size of the gap by the size of the category (the space used by bars).

The `barGapRatio` defines the gap between two bars of the same category.
It's the size of the gap divided by the size of the bar.
So a value of `1` will result in a gap between bars equal to the bar width.
And a value of `-1` will make bars overlap on top of each over.

{{"demo": "BarGapNoSnap.js"}}

## Stacking

Each bar series can get a `stack` property expecting a string value.
Expand Down
64 changes: 64 additions & 0 deletions docs/data/charts/components/BasicScaleDemo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import * as React from 'react';
import { styled } from '@mui/material/styles';
import { ResponsiveChartContainer, LinePlot, useDrawingArea } from '@mui/x-charts';

const StyledPath = styled('path')(({ theme }) => ({
fill: 'none',
stroke: theme.palette.text.primary,
shapeRendering: 'crispEdges',
strokeWidth: 1,
pointerEvents: 'none',
}));

const StyledText = styled('text')(({ theme }) => ({
stroke: 'none',
fill: theme.palette.text.primary,
shapeRendering: 'crispEdges',
}));

function DrawingAreaBox() {
const { left, top, width, height } = useDrawingArea();
return (
<React.Fragment>
<StyledPath
d={`M ${left} ${top} l ${width} 0 l 0 ${height} l -${width} 0 Z`}
/>
<circle cx={left} cy={top} r={3} style={{ fill: 'red' }} />
<circle cx={left + width} cy={top + height} r={3} style={{ fill: 'red' }} />
<StyledText
x={left}
y={top}
textAnchor="start"
alignmentBaseline="text-after-edge"
>
({left},{top})
</StyledText>
<StyledText
x={left + width}
y={top + height}
textAnchor="end"
alignmentBaseline="text-before-edge"
>
({left + width},{top + height})
</StyledText>
</React.Fragment>
);
}
export default function BasicScaleDemo() {
return (
<ResponsiveChartContainer
margin={{ top: 20, left: 10, right: 10, bottom: 30 }}
height={300}
series={[
{
type: 'line',
data: [13, 13, 54, 651, 657, 987, 64, 654, 954, 654, 897, 84],
},
]}
xAxis={[{ data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] }]}
>
<LinePlot />
<DrawingAreaBox />
</ResponsiveChartContainer>
);
}
64 changes: 64 additions & 0 deletions docs/data/charts/components/BasicScaleDemo.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import * as React from 'react';
import { styled } from '@mui/material/styles';
import { ResponsiveChartContainer, LinePlot, useDrawingArea } from '@mui/x-charts';

const StyledPath = styled('path')(({ theme }) => ({
fill: 'none',
stroke: theme.palette.text.primary,
shapeRendering: 'crispEdges',
strokeWidth: 1,
pointerEvents: 'none',
}));

const StyledText = styled('text')(({ theme }) => ({
stroke: 'none',
fill: theme.palette.text.primary,
shapeRendering: 'crispEdges',
}));

function DrawingAreaBox() {
const { left, top, width, height } = useDrawingArea();
return (
<React.Fragment>
<StyledPath
d={`M ${left} ${top} l ${width} 0 l 0 ${height} l -${width} 0 Z`}
/>
<circle cx={left} cy={top} r={3} style={{ fill: 'red' }} />
<circle cx={left + width} cy={top + height} r={3} style={{ fill: 'red' }} />
<StyledText
x={left}
y={top}
textAnchor="start"
alignmentBaseline="text-after-edge"
>
({left},{top})
</StyledText>
<StyledText
x={left + width}
y={top + height}
textAnchor="end"
alignmentBaseline="text-before-edge"
>
({left + width},{top + height})
</StyledText>
</React.Fragment>
);
}
export default function BasicScaleDemo() {
return (
<ResponsiveChartContainer
margin={{ top: 20, left: 10, right: 10, bottom: 30 }}
height={300}
series={[
{
type: 'line',
data: [13, 13, 54, 651, 657, 987, 64, 654, 954, 654, 897, 84],
},
]}
xAxis={[{ data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] }]}
>
<LinePlot />
<DrawingAreaBox />
</ResponsiveChartContainer>
);
}
14 changes: 14 additions & 0 deletions docs/data/charts/components/BasicScaleDemo.tsx.preview
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<ResponsiveChartContainer
margin={{ top: 20, left: 10, right: 10, bottom: 30 }}
height={300}
series={[
{
type: 'line',
data: [13, 13, 54, 651, 657, 987, 64, 654, 954, 654, 897, 84],
},
]}
xAxis={[{ data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] }]}
>
<LinePlot />
<DrawingAreaBox />
</ResponsiveChartContainer>
Loading

0 comments on commit b9c7537

Please sign in to comment.