Skip to content

Commit 65a69e1

Browse files
committed
Merge remote-tracking branch 'origin/master' into 9112-destructuring-defaultprops
2 parents 27f69ec + 4947205 commit 65a69e1

36 files changed

+778
-521
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## v4.12.3
4+
5+
* Fix `<FileField>` should not propagate click ([#9133](https://github.com/marmelab/react-admin/pull/9133)) ([slax57](https://github.com/slax57))
6+
* [TypeScript] Fix TS errors with `<ArrayField>` and `<ChipField>` in stories ([#9132](https://github.com/marmelab/react-admin/pull/9132)) ([slax57](https://github.com/slax57))
7+
* [Doc] Rename Architecture page to Key Concepts ([#9078](https://github.com/marmelab/react-admin/pull/9078)) ([fzaninotto](https://github.com/fzaninotto))
8+
* [Doc] Fix HowTos order and syntax in various chapters ([#9123](https://github.com/marmelab/react-admin/pull/9123)) ([fzaninotto](https://github.com/fzaninotto))
9+
* [Doc] Fix deprecated bulkActionButtons prop of List component ([#9135](https://github.com/marmelab/react-admin/pull/9135)) ([smeng9](https://github.com/smeng9))
10+
* [chore] Bump semver from 5.7.1 to 5.7.2 ([#9091](https://github.com/marmelab/react-admin/pull/9091)) ([dependabot[bot]](https://github.com/apps/dependabot))
11+
312
## v4.12.2
413

514
* Fix `useUnique` should allow value if the only matching record is the current one ([#9118](https://github.com/marmelab/react-admin/pull/9118)) ([djhi](https://github.com/djhi))

docs/Architecture.md

Lines changed: 391 additions & 116 deletions
Large diffs are not rendered by default.

docs/Community.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Thousands of new react-admin applications are created every month. [Many develop
99

1010
We're doing our best to keep it a convivial place where people want to hang out and help/be helped.
1111

12+
## Newsletter
13+
1214
{% include newsletter.html %}
1315

1416
## Discord

docs/Confirm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ const BulkResetViewsButton = () => {
6969
| `cancel` | Optional | `string` | 'ra.action. cancel' | Label of the cancel button |
7070
| `confirm` | Optional | `string` | 'ra.action. confirm' | Label of the confirm button |
7171
| `confirmColor` | Optional | `string` | 'primary' | Color of the confirm button |
72-
| `ConfirmIcon` | Optional | `ReactElement` | `<Check Circle/>` | Icon element of the confirm button |
73-
| `CancelIcon` | Optional | `ReactElement` | `<Error OutlineIcon/>` | Icon element of the cancel button |
72+
| `ConfirmIcon` | Optional | `Component` | `CheckCircleIcon` | Icon component of the confirm button |
73+
| `CancelIcon` | Optional | `Component` | `ErrorOutlineIcon` | Icon component of the cancel button |
7474
| `translate Options` | Optional | `{ id?: string, name?: string }` | {} | Custom id and name to be used in the dialog title |
7575
| `sx` | Optional | `SxProps` | '' | Material UI shortcut for defining custom styles with access to the theme |
7676

0 commit comments

Comments
 (0)