Skip to content

Commit 1b9eb1d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into map-tooltip
2 parents f3a2fe6 + bcde11c commit 1b9eb1d

324 files changed

Lines changed: 15831 additions & 3526 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.

.circleci/config.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
code-infra: https://raw.githubusercontent.com/mui/mui-public/023c96ed6ca37cdb1ff687787e61257c0960285a/.circleci/orbs/code-infra.yml
4+
code-infra: https://raw.githubusercontent.com/mui/mui-public/f5b3498d2fb7a68d366ab7db1f94434b32c4b94d/.circleci/orbs/code-infra.yml
55

66
parameters:
77
browserstack-force:
@@ -152,6 +152,9 @@ jobs:
152152
- code-infra/valelint
153153
test_static:
154154
<<: *default-job
155+
environment:
156+
<<: *default-environment
157+
NODE_OPTIONS: --max-old-space-size=3584
155158
steps:
156159
- checkout
157160
- install-deps

.npmrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

docs/data/charts/bars/bars.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,11 @@ When you set `skipAnimation` to `true`, the chart renders without animations.
275275

276276
## Performance
277277

278+
### SVG batch rendering
279+
278280
By default, each bar is drawn as an SVG `rect` element.
279281
With many bars, this can slow down rendering.
282+
280283
To render bars more efficiently, you can set the `renderer` prop to `"svg-batch"`.
281284
This has some trade-offs:
282285

docs/data/charts/map/BasicGeoDataPlot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import Box from '@mui/material/Box';
33
import { feature as topojsonFeature } from 'topojson-client';
4-
import countriesTopology from 'world-atlas/countries-110m.json';
4+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
55
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
66
import { GeoDataPlot, MapShapePlot } from '@mui/x-charts-premium/Map';
77
import { ChartsTooltip } from '@mui/x-charts-premium/ChartsTooltip';

docs/data/charts/map/BasicGeoDataPlot.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as React from 'react';
22
import Box from '@mui/material/Box';
33
import { feature as topojsonFeature } from 'topojson-client';
4-
import countriesTopology from 'world-atlas/countries-110m.json';
4+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
55
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
66
import { GeoDataPlot, MapShapePlot } from '@mui/x-charts-premium/Map';
77
import { ChartsTooltip } from '@mui/x-charts-premium/ChartsTooltip';

docs/data/charts/map/ColorScaleMapShape.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
66
import ToggleButton from '@mui/material/ToggleButton';
77
import { interpolateBlues } from 'd3-scale-chromatic';
88
import { feature as topojsonFeature } from 'topojson-client';
9-
import countriesTopology from 'world-atlas/countries-110m.json';
9+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
1010
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
1111
import { GeoDataPlot, MapShapePlot } from '@mui/x-charts-premium/Map';
1212
import { ChartsSurface } from '@mui/x-charts/ChartsSurface';

docs/data/charts/map/ColorScaleMapShape.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
66
import ToggleButton from '@mui/material/ToggleButton';
77
import { interpolateBlues } from 'd3-scale-chromatic';
88
import { feature as topojsonFeature } from 'topojson-client';
9-
import countriesTopology from 'world-atlas/countries-110m.json';
9+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
1010
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
1111
import { GeoDataPlot, MapShapePlot } from '@mui/x-charts-premium/Map';
1212
import { ChartsSurface } from '@mui/x-charts/ChartsSurface';

docs/data/charts/map/GeoDataPlotDemo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Box from '@mui/material/Box';
33
import Stack from '@mui/material/Stack';
44
import TextField from '@mui/material/TextField';
55
import { feature as topojsonFeature } from 'topojson-client';
6-
import countriesTopology from 'world-atlas/countries-110m.json';
6+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
77
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
88
import { GeoDataPlot } from '@mui/x-charts-premium/Map';
99
import { ChartsSurface } from '@mui/x-charts/ChartsSurface';

docs/data/charts/map/GeoDataPlotDemo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Box from '@mui/material/Box';
33
import Stack from '@mui/material/Stack';
44
import TextField from '@mui/material/TextField';
55
import { feature as topojsonFeature } from 'topojson-client';
6-
import countriesTopology from 'world-atlas/countries-110m.json';
6+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
77
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
88
import { GeoDataPlot } from '@mui/x-charts-premium/Map';
99
import { ChartsSurface } from '@mui/x-charts/ChartsSurface';

docs/data/charts/map/HighlightedMapShape.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Stack from '@mui/material/Stack';
44
import TextField from '@mui/material/TextField';
55
import MenuItem from '@mui/material/MenuItem';
66
import { feature as topojsonFeature } from 'topojson-client';
7-
import countriesTopology from 'world-atlas/countries-110m.json';
7+
import countriesTopology from 'visionscarto-world-atlas/world/110m.json';
88
import { Unstable_ChartsGeoDataProviderPremium as ChartsGeoDataProviderPremium } from '@mui/x-charts-premium/ChartsGeoDataProviderPremium';
99
import { GeoDataPlot, MapShapePlot } from '@mui/x-charts-premium/Map';
1010
import { ChartsSurface } from '@mui/x-charts/ChartsSurface';

0 commit comments

Comments
 (0)