Skip to content

Commit

Permalink
Merge branch 'master' into variant-orientation-context
Browse files Browse the repository at this point in the history
  • Loading branch information
flaviendelangle committed Nov 19, 2024
2 parents e9e51c4 + 625b38e commit 4d04b0c
Show file tree
Hide file tree
Showing 273 changed files with 3,904 additions and 2,294 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ module.exports = {
...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'error' } : {}),
// TODO move to @mui/monorepo, codebase is moving away from default exports https://github.com/mui/material-ui/issues/21862
'import/prefer-default-export': 'off',
'import/no-relative-packages': 'error',
'import/no-restricted-paths': [
'error',
{
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.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@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
1 change: 0 additions & 1 deletion .github/workflows/create-cherry-pick-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ jobs:
uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@master
permissions:
contents: write
issues: write
pull-requests: write
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@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
with:
sarif_file: results.sarif
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
[![Renovate status](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://github.com/mui/mui-x/issues/2081)
[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/mui/mui-x.svg)](https://isitmaintained.com/project/mui/mui-x 'Average time to resolve an issue')
[![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/mui-org)](https://opencollective.com/mui-org)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6293/badge)](https://bestpractices.coreinfrastructure.org/projects/6293)

<!-- [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8715/badge)](https://www.bestpractices.dev/projects/8715) -->
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/6293/badge)](https://www.bestpractices.dev/projects/6293)

</div>

Expand Down
2 changes: 2 additions & 0 deletions docs/data/charts/areas-demo/AreaChartFillByValue.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export default function AreaChartFillByValue() {
sx={{
[`& .${areaElementClasses.root}`]: {
fill: 'url(#swich-color-id-1)',
filter: 'none', // Remove the default filter.
},
}}
>
Expand All @@ -66,6 +67,7 @@ export default function AreaChartFillByValue() {
sx={{
[`& .${areaElementClasses.root}`]: {
fill: 'url(#swich-color-id-2)',
filter: 'none', // Remove the default filter.
},
}}
>
Expand Down
2 changes: 2 additions & 0 deletions docs/data/charts/areas-demo/AreaChartFillByValue.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export default function AreaChartFillByValue() {
sx={{
[`& .${areaElementClasses.root}`]: {
fill: 'url(#swich-color-id-1)',
filter: 'none', // Remove the default filter.
},
}}
>
Expand All @@ -73,6 +74,7 @@ export default function AreaChartFillByValue() {
sx={{
[`& .${areaElementClasses.root}`]: {
fill: 'url(#swich-color-id-2)',
filter: 'none', // Remove the default filter.
},
}}
>
Expand Down
2 changes: 1 addition & 1 deletion docs/data/charts/getting-started/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ yarn add @mui/material @emotion/react @emotion/styled
### Usage with D3

To help folks using CommonJS, the `@mui/x-charts` package uses a vendored package named `@mui/x-charts-vendor` to access D3 libraries.
You can import D3 functions from `@mui/x-charts-vendor/d3-color`.
You can import D3 functions from `@mui/x-charts-vendor/d3-scale`.

## Rendering Charts

Expand Down
11 changes: 6 additions & 5 deletions docs/data/charts/line-demo/LineWithPrediction.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ function CustomAnimatedLine(props) {
height={top + height + bottom}
/>
</clipPath>
<g clipPath={`url(#${clipIdleft})`}>
<AnimatedLine {...other} sx={sxBefore} />
<g clipPath={`url(#${clipIdleft})`} className="line-before">
<AnimatedLine {...other} />
</g>
<g clipPath={`url(#${clipIdRight})`}>
<AnimatedLine {...other} sx={sxAfter} />
<g clipPath={`url(#${clipIdRight})`} className="line-after">
<AnimatedLine {...other} />
</g>
</React.Fragment>
);
Expand All @@ -64,7 +64,8 @@ export default function LineWithPrediction() {
height={200}
width={400}
slots={{ line: CustomAnimatedLine }}
slotProps={{ line: { limit: 5, sxAfter: { strokeDasharray: '10 5' } } }}
slotProps={{ line: { limit: 5 } }}
sx={{ '& .line-after path': { strokeDasharray: '10 5' } }}
/>
);
}
11 changes: 6 additions & 5 deletions docs/data/charts/line-demo/LineWithPrediction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ function CustomAnimatedLine(props: CustomAnimatedLineProps) {
height={top + height + bottom}
/>
</clipPath>
<g clipPath={`url(#${clipIdleft})`}>
<AnimatedLine {...other} sx={sxBefore} />
<g clipPath={`url(#${clipIdleft})`} className="line-before">
<AnimatedLine {...other} />
</g>
<g clipPath={`url(#${clipIdRight})`}>
<AnimatedLine {...other} sx={sxAfter} />
<g clipPath={`url(#${clipIdRight})`} className="line-after">
<AnimatedLine {...other} />
</g>
</React.Fragment>
);
Expand All @@ -71,7 +71,8 @@ export default function LineWithPrediction() {
height={200}
width={400}
slots={{ line: CustomAnimatedLine }}
slotProps={{ line: { limit: 5, sxAfter: { strokeDasharray: '10 5' } } as any }}
slotProps={{ line: { limit: 5 } as any }}
sx={{ '& .line-after path': { strokeDasharray: '10 5' } }}
/>
);
}
3 changes: 2 additions & 1 deletion docs/data/charts/line-demo/LineWithPrediction.tsx.preview
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
height={200}
width={400}
slots={{ line: CustomAnimatedLine }}
slotProps={{ line: { limit: 5, sxAfter: { strokeDasharray: '10 5' } } as any }}
slotProps={{ line: { limit: 5 } as any }}
sx={{ '& .line-after path': { strokeDasharray: '10 5' } }}
/>
1 change: 1 addition & 0 deletions docs/data/charts/lines/CSSCustomization.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default function CSSCustomization() {
},
'& .MuiAreaElement-series-Germany': {
fill: "url('#myGradient')",
filter: 'none', // Remove the default filtering
},
}}
xAxis={[
Expand Down
1 change: 1 addition & 0 deletions docs/data/charts/lines/CSSCustomization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default function CSSCustomization() {
},
'& .MuiAreaElement-series-Germany': {
fill: "url('#myGradient')",
filter: 'none', // Remove the default filtering
},
}}
xAxis={[
Expand Down
Loading

0 comments on commit 4d04b0c

Please sign in to comment.