Skip to content

Commit

Permalink
Merge branch 'perf-filtering-cache-values' of github.com:romgrk/mui-x…
Browse files Browse the repository at this point in the history
… into perf-filtering-cache-values
  • Loading branch information
romgrk committed Jun 13, 2023
2 parents 071e0a1 + fc09c9b commit 034166a
Show file tree
Hide file tree
Showing 199 changed files with 3,353 additions and 959 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ jobs:
- run:
name: Run visual regression tests
command: xvfb-run yarn test:regressions
# - run:
# name: Upload screenshots to Argos CI
# command: yarn test:argos
- run:
name: Upload screenshots to Argos CI
command: yarn test:argos
test_performance:
<<: *defaults
docker:
Expand Down
26 changes: 13 additions & 13 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ We'd like to offer a big thanks to the 15 contributors who made this release pos

- 🚀 New date time picking UI on [`DesktopDateTimePicker`](https://mui.com/x/react-date-pickers/date-time-picker/)

<img src="https://user-images.githubusercontent.com/4941090/242533399-2b106390-8158-4aba-9ca4-b621c6310977.gif" width="628" />
<img src="https://github.com/mui/mui-x/assets/3165635/4e1fe9f9-03eb-4f23-99dd-80212b21fb23" width="840" height="506" />

- 🚀 Performance improvements
- 🐞 Bugfixes
Expand Down Expand Up @@ -151,17 +151,17 @@ We'd like to offer a big thanks to the 15 contributors who made this release pos
- [charts] Manage series stacking (#8888) @alexfauquette
- [license] List side effects in the license package (#9092) @cherniavskii

## v6.5.0
## 6.5.0

_May 19, 2023_

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

- 💫 Introduce filtering on column headers for `DataGridPro` and `DataGridPremium`:

https://github.com/mui/mui-x/assets/12609561/c4c2bfec-59cf-4cab-932d-dc1983081de9
<img src="https://github.com/mui/mui-x/releases/download/v6.5.0/recording.gif" width="840" height="506" />

See [the documentation](https://mui.com/x/react-data-grid/filtering/#header-filters) for more information
See [the documentation](https://mui.com/x/react-data-grid/filtering/header-filters/) for more information

- 🌍 Improve Hebrew (he-IL) and Czech (cs-CZ) locales
- 📝 Support for editing on pinned rows
Expand Down Expand Up @@ -207,7 +207,7 @@ We'd like to offer a big thanks to the 10 contributors who made this release pos
- [DataGrid] Memoize root props for better performance (#8942) @romgrk
- [test] Skip flaky unit tests in JSDOM (#8994) @cherniavskii

## v6.4.0
## 6.4.0

_May 12, 2023_

Expand Down Expand Up @@ -4240,7 +4240,7 @@ We'd like to offer a big thanks to the 10 contributors who made this release pos
- [docs] Revise and split up "Overview" page into "Introduction" (#4692) @samuelsycamore
- [docs] Use `useKeepGroupedColumnsHiddren` from the grid package on remaining demo (#5382) @flaviendelangle

## v5.12.3
## 5.12.3

_Jun 23, 2022_

Expand Down Expand Up @@ -4291,7 +4291,7 @@ We'd like to offer a big thanks to the 8 contributors who made this release poss
- [test] Throw if date adapter is not found (#5289) @cherniavskii
- [test] Use mock for `ResizeObserver` (#5215) @m4theushw

## v5.12.2
## 5.12.2

_Jun 16, 2022_

Expand Down Expand Up @@ -4334,7 +4334,7 @@ We'd like to offer a big thanks to the 7 contributors who made this release poss
- [core] Fix `GridColTypeDef` usage in demo (#5197) @cherniavskii
- [test] Add `waitFor` before asserting height (#5203) @m4theushw

## v5.12.1
## 5.12.1

_Jun 9, 2022_

Expand Down Expand Up @@ -4391,7 +4391,7 @@ We'd like to offer a big thanks to the 10 contributors who made this release pos
- [test] Fix dynamic row height test failing on Chrome (#5147) @m4theushw
- [test] Remove delay on server demo for regression tests (#5131) @alexfauquette

## v5.12.0
## 5.12.0

_May 31, 2022_

Expand Down Expand Up @@ -4472,7 +4472,7 @@ We'd like to offer a big thanks to the 15 contributors who made this release pos
- [test] Skip Safari and Firefox on broken tests (#4994) @alexfauquette
- [test] Make argos screenshots stable (#5061) @m4theushw

## v5.11.1
## 5.11.1

_May 20, 2022_

Expand Down Expand Up @@ -4564,7 +4564,7 @@ We'd like to offer a big thanks to the 6 contributors who made this release poss
- [core] Simplify rows cache management (#4933) @flaviendelangle
- [core] Use internal icons for quick filter (#4912) @alexfauquette

## v5.11.0
## 5.11.0

_May 13, 2022_

Expand Down Expand Up @@ -4708,7 +4708,7 @@ We'd like to offer a big thanks to the 15 contributors who made this release pos
- [test] Reset cleanup tracking on Karma tests (#4679) @m4theushw
- [test] Restore `sinon` sandbox after each `karma` test (#4689) @m4theushw

## v5.10.0
## 5.10.0

_Apr 25, 2022_

Expand Down Expand Up @@ -4744,7 +4744,7 @@ We'd like to offer a big thanks to the 6 contributors who made this release poss
- [core] Fix the README of the X packages (#4590) @flaviendelangle
- [test] Fix test to not depend on screen resolution (#4587) @m4theushw

## v5.9.0
## 5.9.0

_Apr 14, 2022_

Expand Down
2 changes: 2 additions & 0 deletions docs/data/charts-component-api-pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { MuiPage } from '@mui/monorepo/docs/src/MuiPage';

export default [
{ pathname: '/x/api/charts/area-element', title: 'AreaElement' },
{ pathname: '/x/api/charts/area-plot', title: 'AreaPlot' },
{ pathname: '/x/api/charts/axis', title: 'Axis' },
{ pathname: '/x/api/charts/axis-highlight', title: 'AxisHighlight' },
{ pathname: '/x/api/charts/bar-chart', title: 'BarChart' },
Expand All @@ -12,6 +13,7 @@ export default [
{ pathname: '/x/api/charts/line-element', title: 'LineElement' },
{ pathname: '/x/api/charts/line-plot', title: 'LinePlot' },
{ pathname: '/x/api/charts/mark-element', title: 'MarkElement' },
{ pathname: '/x/api/charts/mark-plot', title: 'MarkPlot' },
{ pathname: '/x/api/charts/scatter', title: 'Scatter' },
{ pathname: '/x/api/charts/scatter-chart', title: 'ScatterChart' },
{ pathname: '/x/api/charts/scatter-plot', title: 'ScatterPlot' },
Expand Down
67 changes: 67 additions & 0 deletions docs/data/charts/areas-demo/PercentAreaChart.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import * as React from 'react';
import { LineChart } from '@mui/x-charts/LineChart';

const time = [
new Date(2015, 1, 0),
new Date(2015, 2, 0),
new Date(2015, 3, 0),
new Date(2015, 4, 0),
new Date(2015, 5, 0),
new Date(2015, 6, 0),
new Date(2015, 7, 0),
];

const a = [4000, 3000, 2000, 2780, 1890, 2390, 3490];
const b = [2400, 1398, 9800, 3908, 4800, 3800, 4300];
const c = [2400, 2210, 2290, 2000, 2181, 2500, 2100];

const getPercents = (array) =>
array.map((v, index) => (100 * v) / (a[index] + b[index] + c[index]));

export default function PercentAreaChart() {
return (
<LineChart
width={500}
height={300}
series={[
{
data: getPercents(a),
type: 'line',
label: 'a',
area: true,
stack: 'total',
color: '#8884d8',
},
{
data: getPercents(b),
type: 'line',
label: 'b',
area: true,
stack: 'total',
color: '#82ca9d',
},
{
data: getPercents(c),
type: 'line',
label: 'c',
area: true,
stack: 'total',
color: '#ffc658',
},
]}
xAxis={[
{
scaleType: 'time',
data: time,
min: time[0].getTime(),
max: time[time.length - 1].getTime(),
},
]}
sx={{
'.MuiMarkElement-root': {
display: 'none',
},
}}
/>
);
}
66 changes: 66 additions & 0 deletions docs/data/charts/areas-demo/PercentAreaChart.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import * as React from 'react';
import { LineChart } from '@mui/x-charts/LineChart';

const time = [
new Date(2015, 1, 0),
new Date(2015, 2, 0),
new Date(2015, 3, 0),
new Date(2015, 4, 0),
new Date(2015, 5, 0),
new Date(2015, 6, 0),
new Date(2015, 7, 0),
];
const a = [4000, 3000, 2000, 2780, 1890, 2390, 3490];
const b = [2400, 1398, 9800, 3908, 4800, 3800, 4300];
const c = [2400, 2210, 2290, 2000, 2181, 2500, 2100];

const getPercents = (array: number[]) =>
array.map((v, index) => (100 * v) / (a[index] + b[index] + c[index]));

export default function PercentAreaChart() {
return (
<LineChart
width={500}
height={300}
series={[
{
data: getPercents(a),
type: 'line',
label: 'a',
area: true,
stack: 'total',
color: '#8884d8',
},
{
data: getPercents(b),
type: 'line',
label: 'b',
area: true,
stack: 'total',
color: '#82ca9d',
},
{
data: getPercents(c),
type: 'line',
label: 'c',
area: true,
stack: 'total',
color: '#ffc658',
},
]}
xAxis={[
{
scaleType: 'time',
data: time,
min: time[0].getTime(),
max: time[time.length - 1].getTime(),
},
]}
sx={{
'.MuiMarkElement-root': {
display: 'none',
},
}}
/>
);
}
29 changes: 29 additions & 0 deletions docs/data/charts/areas-demo/SimpleAreaChart.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import * as React from 'react';
import { LineChart } from '@mui/x-charts/LineChart';

const uData = [4000, 3000, 2000, 2780, 1890, 2390, 3490];
const xLabels = [
'Page A',
'Page B',
'Page C',
'Page D',
'Page E',
'Page F',
'Page G',
];

export default function SimpleAreaChart() {
return (
<LineChart
width={500}
height={300}
series={[{ data: uData, label: 'uv', area: true, color: '#82ca9d' }]}
xAxis={[{ scaleType: 'point', data: xLabels }]}
sx={{
'.MuiLineElement-root, .MuiMarkElement-root': {
display: 'none',
},
}}
/>
);
}
29 changes: 29 additions & 0 deletions docs/data/charts/areas-demo/SimpleAreaChart.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import * as React from 'react';
import { LineChart } from '@mui/x-charts/LineChart';

const uData = [4000, 3000, 2000, 2780, 1890, 2390, 3490];
const xLabels = [
'Page A',
'Page B',
'Page C',
'Page D',
'Page E',
'Page F',
'Page G',
];

export default function SimpleAreaChart() {
return (
<LineChart
width={500}
height={300}
series={[{ data: uData, label: 'uv', area: true, color: '#82ca9d' }]}
xAxis={[{ scaleType: 'point', data: xLabels }]}
sx={{
'.MuiLineElement-root, .MuiMarkElement-root': {
display: 'none',
},
}}
/>
);
}
11 changes: 11 additions & 0 deletions docs/data/charts/areas-demo/SimpleAreaChart.tsx.preview
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<LineChart
width={500}
height={300}
series={[{ data: uData, label: 'uv', area: true, color: '#82ca9d' }]}
xAxis={[{ scaleType: 'point', data: xLabels }]}
sx={{
'.MuiLineElement-root, .MuiMarkElement-root': {
display: 'none',
},
}}
/>
41 changes: 41 additions & 0 deletions docs/data/charts/areas-demo/StackedAreaChart.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import * as React from 'react';
import { LineChart } from '@mui/x-charts/LineChart';

const uData = [4000, 3000, 2000, 2780, 1890, 2390, 3490];
const pData = [2400, 1398, 9800, 3908, 4800, 3800, 4300];
const amtData = [2400, 2210, 2290, 2000, 2181, 2500, 2100];
const xLabels = [
'Page A',
'Page B',
'Page C',
'Page D',
'Page E',
'Page F',
'Page G',
];

export default function StackedAreaChart() {
return (
<LineChart
width={500}
height={300}
series={[
{ data: uData, label: 'uv', area: true, stack: 'total', color: '#8884d8' },
{ data: pData, label: 'pv', area: true, stack: 'total', color: '#82ca9d' },
{
data: amtData,
label: 'amt',
area: true,
stack: 'total',
color: '#ffc658',
},
]}
xAxis={[{ scaleType: 'point', data: xLabels }]}
sx={{
'.MuiLineElement-root, .MuiMarkElement-root': {
display: 'none',
},
}}
/>
);
}
Loading

0 comments on commit 034166a

Please sign in to comment.