Skip to content

Commit ab95645

Browse files
alexfauquettealexfauquette
committed
Merge remote-tracking branch 'upstream/master' into extract-zoom
2 parents 1cdb254 + e952b46 commit ab95645

196 files changed

Lines changed: 5827 additions & 494 deletions

File tree

Some content is hidden

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

‎.lintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/.git
22
pnpm-lock.yaml
33
netlify/functions
4+
/examples
45
/docs/.next
56
/docs/export
67
/docs/pages/playground/

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- #host-reference -->
22
<!-- lint disable mui-first-block-heading -->
33
<p align="center">
4-
<a href="https://mui.com/x/" rel="noopener" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="MUI X logo"></a>
4+
<a href="https://mui.com/x/" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="MUI X logo"></a>
55
</p>
66

77
<h1 align="center">MUI X</h1>

‎docs/data/charts/bars/BarScatterCompostion.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Box from '@mui/material/Box';
22
import Typography from '@mui/material/Typography';
3-
import { BarPlot } from '@mui/x-charts/BarChart';
4-
import { ScatterPlot } from '@mui/x-charts/ScatterChart';
3+
import { BarPlot, FocusedBar } from '@mui/x-charts/BarChart';
4+
import { ScatterPlot, FocusedScatterMark } from '@mui/x-charts/ScatterChart';
55
import { ChartsXAxis } from '@mui/x-charts/ChartsXAxis';
66
import { ChartsYAxis } from '@mui/x-charts/ChartsYAxis';
77
import { ChartsGrid } from '@mui/x-charts/ChartsGrid';
@@ -100,6 +100,8 @@ export default function BarScatterCompostion() {
100100
<BarPlot />
101101
<ScatterPlot />
102102
<ChartsXAxis axisId="bar" />
103+
<FocusedBar />
104+
<FocusedScatterMark />
103105
<ChartsYAxis />
104106
</ChartsSurface>
105107
</ChartsDataProvider>

‎docs/data/charts/bars/BarScatterCompostion.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Box from '@mui/material/Box';
22
import Typography from '@mui/material/Typography';
3-
import { BarPlot } from '@mui/x-charts/BarChart';
4-
import { ScatterPlot } from '@mui/x-charts/ScatterChart';
3+
import { BarPlot, FocusedBar } from '@mui/x-charts/BarChart';
4+
import { ScatterPlot, FocusedScatterMark } from '@mui/x-charts/ScatterChart';
55
import { ChartsXAxis } from '@mui/x-charts/ChartsXAxis';
66
import { ChartsYAxis } from '@mui/x-charts/ChartsYAxis';
77
import { ChartsGrid } from '@mui/x-charts/ChartsGrid';
@@ -102,6 +102,8 @@ export default function BarScatterCompostion() {
102102
<BarPlot />
103103
<ScatterPlot />
104104
<ChartsXAxis axisId="bar" />
105+
<FocusedBar />
106+
<FocusedScatterMark />
105107
<ChartsYAxis />
106108
</ChartsSurface>
107109
</ChartsDataProvider>

‎docs/data/charts/bars/bars.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ Here's how the bar chart is composed:
326326
<ChartsOverlay />
327327
<ChartsAxisHighlight />
328328
<FocusedBar />
329+
<FocusedScatterMark />
329330
</g>
330331
<ChartsAxis />
331332
<ChartsClipPath id={clipPathId} />

docs/data/charts/scatter-demo/BubbleChartCO2Emissions.js renamed to docs/data/charts/bubble/BubbleChartCO2Emissions.js

File renamed without changes.

docs/data/charts/scatter-demo/BubbleChartCO2Emissions.tsx renamed to docs/data/charts/bubble/BubbleChartCO2Emissions.tsx

File renamed without changes.

docs/data/charts/scatter/ColorScale.js renamed to docs/data/charts/bubble/ColorScale.js

File renamed without changes.

docs/data/charts/scatter/ColorScale.tsx renamed to docs/data/charts/bubble/ColorScale.tsx

File renamed without changes.

docs/data/charts/scatter/DifferentSizeScale.js renamed to docs/data/charts/bubble/DifferentSizeScale.js

File renamed without changes.

0 commit comments

Comments
 (0)