Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 4dacc49
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 17:01:25 2022 -0300

    yarn docs:api

commit 7ca90ca
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 16:34:31 2022 -0300

    Make reason optional

commit 835c66d
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 16:24:26 2022 -0300

    Remove originalRow

commit ee0b648
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 16:09:29 2022 -0300

    cellToMoveFocus -> cellToFocusAfter

commit 17f3bab
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 16:07:20 2022 -0300

    Fix export bug with CSB

commit d3167e0
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 16:07:02 2022 -0300

    Type value with any as default

commit 1b398f6
Merge: 3540d57 949b40a
Author: Matheus Wichman <[email protected]>
Date:   Fri Mar 11 15:55:01 2022 -0300

    Merge branch 'master' into new-editing-api

commit 949b40a
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Fri Mar 11 13:57:16 2022 -0300

    Bump actions/checkout action to v3 (mui#4107)

    Co-authored-by: Renovate Bot <[email protected]>

commit 50f084d
Author: Andrew Cherniavskii <[email protected]>
Date:   Fri Mar 11 15:53:18 2022 +0100

    [DataGrid] Fix error overlay not visible when `autoHeight` is enabled (mui#4110)

commit 3d85cc0
Author: Alexandre Fauquette <[email protected]>
Date:   Fri Mar 11 15:03:20 2022 +0100

    [DataGrid] Fix white blank when scrolling (mui#4158)

commit 19fbfa5
Author: PBM <[email protected]>
Date:   Fri Mar 11 11:47:42 2022 +0100

    [l10n] add missing plPL translations (mui#4153)

commit 8b2cd47
Author: Alexandre Fauquette <[email protected]>
Date:   Fri Mar 11 10:10:12 2022 +0100

    [docs] Clean ValidateRowModelControlGrid demo (mui#4073)

commit 9e2c4b4
Author: Matheus Wichman <[email protected]>
Date:   Thu Mar 10 21:35:46 2022 -0300

    [test] Mock `getComputedStyle` to speed up unit tests (mui#4142)

commit 1922f48
Author: Matheus Wichman <[email protected]>
Date:   Thu Mar 10 14:35:09 2022 -0300

    [test] Upgrade CircleCI convenience image (mui#4143)

commit f04331c
Author: Flavien DELANGLE <[email protected]>
Date:   Thu Mar 10 17:38:18 2022 +0100

    v5.6.1 (mui#4141)

commit 3a507bf
Author: Andrew Cherniavskii <[email protected]>
Date:   Thu Mar 10 16:05:29 2022 +0100

    [core] Upgrade `@mui/monorepo` (mui#4149)

commit 37766c8
Author: Matheus Wichman <[email protected]>
Date:   Thu Mar 10 11:29:32 2022 -0300

    [DataGrid] Rename API method (mui#4148)

commit 1ac64ba
Author: Matheus Wichman <[email protected]>
Date:   Wed Mar 9 15:12:56 2022 -0300

    [DataGrid] Add support for margin between rows (mui#3848)

commit 5551732
Author: Matheus Wichman <[email protected]>
Date:   Wed Mar 9 09:38:18 2022 -0300

    [test] Make focus state out-of-sync warning opt-in (mui#4129)

commit 318f6cc
Author: Flavien DELANGLE <[email protected]>
Date:   Wed Mar 9 13:20:16 2022 +0100

    [DataGridPro] Re-export the components removed by mistake during bundle split (mui#4134)

commit c886092
Author: Flavien DELANGLE <[email protected]>
Date:   Wed Mar 9 13:19:52 2022 +0100

    [core] Prepare the api build scripts for multi packages support (mui#4111)

commit d7daee6
Author: Danail Hadjiatanasov <[email protected]>
Date:   Wed Mar 9 11:49:38 2022 +0100

    [DataGrid] Display column's filter icon if a filter is applied (mui#4120)

commit 5e55a35
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Mar 9 11:41:50 2022 +0100

    Bump MUI Core (mui#4095)

    Co-authored-by: Renovate Bot <[email protected]>

commit b8ed7a0
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Mar 9 11:41:43 2022 +0100

    Bump css-loader to ^6.7.1 (mui#4102)

    Co-authored-by: Renovate Bot <[email protected]>

commit 3b34495
Author: Siriwat K <[email protected]>
Date:   Wed Mar 9 17:25:50 2022 +0700

    [docs] Fix links to prevent duplicate search result (mui#4130)

commit c80a645
Author: Andrew Cherniavskii <[email protected]>
Date:   Wed Mar 9 10:50:15 2022 +0100

    [DataGrid] Fix extending built-in column types (mui#4114)

    Co-authored-by: Matheus Wichman <[email protected]>

commit deb6615
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Mar 8 19:33:17 2022 -0300

    Bump typescript to ^4.6.2 (mui#4104)

    Co-authored-by: Renovate Bot <[email protected]>

commit 1e8de15
Author: Matheus Wichman <[email protected]>
Date:   Tue Mar 8 11:12:20 2022 -0300

    [core] Initialize remaining states before feature hooks (mui#4036)

commit fb4fc20
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Mar 8 13:30:33 2022 +0100

    Bump cpy-cli to ^4.0.0 (mui#4108)

    Co-authored-by: Renovate Bot <[email protected]>

commit b0250ee
Author: Siriwat K <[email protected]>
Date:   Tue Mar 8 18:50:12 2022 +0700

    [docs] Use regex instead of specific url in e2e-website-tests (mui#4121)

commit ff35a77
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Mar 8 11:21:30 2022 +0100

    Bump react-router-dom to ^6.2.2 (mui#4100)

    Co-authored-by: Renovate Bot <[email protected]>

commit 97e51fc
Author: Siriwat K <[email protected]>
Date:   Tue Mar 8 16:01:58 2022 +0700

    [docs] Neglect e2e tests related to search (mui#4118)

commit abd9bcf
Author: Olivier Tassinari <[email protected]>
Date:   Mon Mar 7 19:56:46 2022 +0100

    [core] Make is clearer this is only for questions (mui#4082)

commit 2d1c394
Author: Vishal <[email protected]>
Date:   Mon Mar 7 21:35:09 2022 +0530

    [docs] Fix outdated links to localeTextConstants.ts (mui#4080)

    Co-authored-by: Olivier Tassinari <[email protected]>

commit 0be075d
Author: Flavien DELANGLE <[email protected]>
Date:   Mon Mar 7 15:23:24 2022 +0100

    [DataGrid] Do not loop through rows to compute top level rows count wen the tree is flat (mui#4081)
  • Loading branch information
m4theushw committed Mar 11, 2022
1 parent 741f312 commit f293275
Show file tree
Hide file tree
Showing 141 changed files with 2,302 additions and 958 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ defaults: &defaults
REACT_DIST_TAG: << parameters.react-dist-tag >>
working_directory: /tmp/mui
docker:
- image: circleci/node:12
- image: cimg/node:12.22
# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
# are working on providing this feature back with appropriate security measures.
Expand Down
8 changes: 3 additions & 5 deletions .github/ISSUE_TEMPLATE/3.pro-support.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Pro plan: support'
description: As a Pro plan user, I need support with MUI X.
name: 'Pro plan: question'
description: I'm a Pro plan user, I can't find a solution to my problem with MUI X.
title: "[question] "
labels: ['status: needs triage', 'pro plan', 'support: commercial']
body:
Expand All @@ -8,9 +8,7 @@ body:
value: |
Please provide a searchable summary of the issue in the title above ⬆️.
⚠️ **Don't use this form if the problem is a bug or a feature request, use the dedicated form instead.**
Thanks for contributing by creating an issue! ❤️
⚠️ **Don't use this form if the problem is [a bug](https://github.com/mui/mui-x/issues/new?assignees=&labels=status%3A+needs+triage&template=1.bug.yml) or a [feature request](https://github.com/mui/mui-x/issues/new?assignees=&labels=status%3A+needs+triage&template=2.feature.yml), use the dedicated form instead.**
- type: input
id: contact
attributes:
Expand Down
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/4.premium-support.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: 'Premium plan: question ❔'
description: I'm a Premium plan user, I can't find a solution to my problem with MUI X.
title: "[question] "
labels: ['status: needs triage', 'Premium plan', 'support: commercial']
body:
- type: markdown
attributes:
value: |
Please provide a searchable summary of the issue in the title above ⬆️.
⚠️ **Don't use this form if the problem is [a bug](https://github.com/mui/mui-x/issues/new?assignees=&labels=status%3A+needs+triage&template=1.bug.yml) or a [feature request](https://github.com/mui/mui-x/issues/new?assignees=&labels=status%3A+needs+triage&template=2.feature.yml), use the dedicated form instead.**
- type: input
id: contact
attributes:
label: Order ID 💳
description: The order ID of the purchased Premium plan. Community users can [learn more about support](https://mui.com/getting-started/support/) in the documentation.
placeholder: 'ex. #11111'
validations:
required: true
- type: checkboxes
attributes:
label: Duplicates
description: Please [search the history](https://github.com/mui/mui-x/issues) to see if an issue already exists for the same problem.
options:
- label: I have searched the existing issues
required: true
- type: checkboxes
attributes:
label: Latest version
description: We roll bug fixes, performance enhancements, and other improvements into new releases.
options:
- label: I have tested the latest version
required: true
- type: textarea
attributes:
label: The problem in depth 🔍
- type: textarea
attributes:
label: Your environment 🌎
description: Run `npx @mui/envinfo` and post the results. If you encounter issues with TypeScript please include the used tsconfig.
value: |
<details>
<summary>`npx @mui/envinfo`</summary>
```
Don't forget to mention which browser you used.
Output from `npx @mui/envinfo` goes here.
```
</details>
2 changes: 1 addition & 1 deletion .github/workflows/l10n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js 14.x
uses: actions/setup-node@v3
with:
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,49 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 5.6.1

_Mar 10, 2022_

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

- [DataGrid] Allow to add margins or borders between rows (#3848) @m4theushw

```tsx
<DataGrid getRowSpacing={() => ({ top: 10, bottom: 10 })} />
```

Check the [documentation](https://mui.com/components/data-grid/rows/#row-spacing) for more information.

### `@mui/[email protected]` / `@mui/[email protected]`

#### Changes

- [DataGrid] Display column's filter icon if a filter is applied (#4120) @DanailH
- [DataGrid] Do not loop through rows to compute top level rows count when the tree is flat (#4081) @flaviendelangle
- [DataGrid] Rename API method (#4148) @m4theushw
- [DataGrid] Support extending built-in column types (#4114) @cherniavskii
- [DataGridPro] Re-export the components removed by mistake during bundle split (#4134) @flaviendelangle

### Docs

- [docs] Fix links to prevent duplicate search result (#4130) @siriwatknp
- [docs] Fix outdated links to `localeTextConstants.ts` (#4080) @patilvishal755
- [docs] Neglect e2e tests related to search (#4118) @siriwatknp
- [docs] Use regex instead of specific url in e2e-website-tests (#4121) @siriwatknp

### Core

- [core] Enforce `noImplicitAny` (#4084) @cherniavskii
- [core] Improve the Pro support issue template (#4082) @oliviertassinari
- [core] Initialize remaining states before feature hooks (#4036) @m4theushw
- [core] Merge `page` and `pageSize` state initializer into a single `pagination` state initializer (#4087) @flaviendelangle
- [core] Prepare `yarn docs:api:build` scripts for multi packages support (#4111) @flaviendelangle
- [core] Upgrade `@mui/monorepo` (#4149) @cherniavskii
- [core] Use `buildWarning` and `wrapWithWarningOnCall` for deprecated methods and wrong usages (#4056) @flaviendelangle
- [test] Make focus state out-of-sync warning opt-in (#4129) @m4theushw
- [test] Only test custom input keyboard event in edit mode (#4075) @alexfauquette

## 5.6.0

_Mar 4, 2022_
Expand Down
6 changes: 3 additions & 3 deletions benchmark/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "benchmark",
"version": "5.6.0",
"version": "5.6.1",
"private": true,
"scripts": {
"browser": "webpack --config browser/webpack.config.js && node browser/scripts/benchmark.js"
Expand All @@ -10,12 +10,12 @@
"@emotion/styled": "^11.8.1",
"@material-ui/core": "^5.0.0-beta.5",
"@material-ui/icons": "^5.0.0-beta.5",
"@mui/material": "^5.4.3",
"@mui/material": "^5.5.0",
"@mui/x-data-grid": "^4.0.0",
"@visx/xychart": "^2.9.0",
"ag-grid-community": "^27.0.1",
"ag-grid-react": "^27.0.1",
"css-loader": "^6.6.0",
"css-loader": "^6.7.1",
"html-webpack-plugin": "^5.5.0",
"mui-plus": "^0.0.15",
"playwright": "^1.19.2",
Expand Down
4 changes: 2 additions & 2 deletions docs/data/data-grid/columns/columns.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ const columns: GridColDef[] = [

The `renderCell` render function allows customizing the rendered in "view mode" only.
For the "edit mode", set the `renderEditCell` function to customize the edit component.
Check the [editing page](/components/data-grid/editing) for more details about editing.
Check the [editing page](/components/data-grid/editing/) for more details about editing.

#### Expand cell renderer

Expand Down Expand Up @@ -542,7 +542,7 @@ Those selectors consider all the defined columns, including hidden ones.

{{"demo": "ColumnsSelectorsNoSnap.js", "bg": "inline", "hideToolbar": true}}

More information about the selectors and how to use them on the [dedicated page](/components/data-grid/state#access-the-state).
More information about the selectors and how to use them on the [dedicated page](/components/data-grid/state/#access-the-state).

## API

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<DataGrid rows={rows} columns={columns} />
<DataGrid {...data} columns={columns} />
111 changes: 38 additions & 73 deletions docs/data/data-grid/editing-legacy/ValidateRowModelControlGrid.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import { DataGrid } from '@mui/x-data-grid';
import {
randomCreatedDate,
randomEmail,
randomTraderName,
randomUpdatedDate,
} from '@mui/x-data-grid-generator';
import { useDemoData } from '@mui/x-data-grid-generator';

const VISIBLE_FIELDS = ['name', 'email', 'dateCreated', 'lastUpdated'];

function validateEmail(email) {
const re =
Expand All @@ -15,6 +12,40 @@ function validateEmail(email) {
}

export default function ValidateRowModelControlGrid() {
const { data } = useDemoData({
dataSet: 'Employee',
visibleFields: VISIBLE_FIELDS,
rowLength: 5,
});

const columns = [
{ field: 'name', headerName: 'Name', width: 180, editable: true },
{
field: 'email',
headerName: 'Email',
width: 200,
editable: true,
preProcessEditCellProps: (params) => {
const isValid = validateEmail(params.props.value);
return { ...params.props, error: !isValid };
},
},
{
field: 'dateCreated',
headerName: 'Date Created',
type: 'date',
width: 180,
editable: true,
},
{
field: 'lastUpdated',
headerName: 'Last Login',
type: 'dateTime',
width: 220,
editable: true,
},
];

return (
<Box
sx={{
Expand All @@ -34,73 +65,7 @@ export default function ValidateRowModelControlGrid() {
},
}}
>
<DataGrid rows={rows} columns={columns} />
<DataGrid {...data} columns={columns} />
</Box>
);
}

const columns = [
{ field: 'name', headerName: 'Name', width: 180, editable: true },
{
field: 'email',
headerName: 'Email',
width: 200,
editable: true,
preProcessEditCellProps: (params) => {
const isValid = validateEmail(params.props.value);
return { ...params.props, error: !isValid };
},
},
{
field: 'dateCreated',
headerName: 'Date Created',
type: 'date',
width: 180,
editable: true,
},
{
field: 'lastLogin',
headerName: 'Last Login',
type: 'dateTime',
width: 220,
editable: true,
},
];

const rows = [
{
id: 1,
name: randomTraderName(),
email: randomEmail(),
dateCreated: randomCreatedDate(),
lastLogin: randomUpdatedDate(),
},
{
id: 2,
name: randomTraderName(),
email: randomEmail(),
dateCreated: randomCreatedDate(),
lastLogin: randomUpdatedDate(),
},
{
id: 3,
name: randomTraderName(),
email: randomEmail(),
dateCreated: randomCreatedDate(),
lastLogin: randomUpdatedDate(),
},
{
id: 4,
name: randomTraderName(),
email: randomEmail(),
dateCreated: randomCreatedDate(),
lastLogin: randomUpdatedDate(),
},
{
id: 5,
name: randomTraderName(),
email: randomEmail(),
dateCreated: randomCreatedDate(),
lastLogin: randomUpdatedDate(),
},
];
Loading

0 comments on commit f293275

Please sign in to comment.