Skip to content

Commit 57c5ca6

Browse files
committed
Merge branch 'integrate-datatable-in-guessers' of github.com:marmelab/react-admin into integrate-datatable-in-guessers
2 parents 66ce6d0 + 902d861 commit 57c5ca6

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

docs/AutoPersistInStore.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ title: "The AutoPersistInStore Component"
55

66
# `<AutoPersistInStore>`
77

8-
This [Enterprise Edition](https://react-admin-ee.marmelab.com)<img class="icon" src="./img/premium.svg" alt="React Admin Enterprise Edition icon" /> component prevents data loss in forms by automatically saving the form data in the store when users navigate away from the page. When users return to the page, it reapplies the saved data to the form.
8+
This [Enterprise Edition](https://react-admin-ee.marmelab.com)<img class="icon" src="./img/premium.svg" alt="React Admin Enterprise Edition icon" /> component prevents data loss in forms by automatically saving the form data in the store when users update it. When users return to the page, it reapplies the saved data to the form.
99

1010
<video controls autoplay playsinline muted loop>
1111
<source src="./img/AutoPersistInStore.mp4" type="video/mp4"/>
1212
Your browser does not support the video tag.
1313
</video>
1414

15-
The temporary form data is only saved when the user navigates away from the page, and it is removed when the user submits the form or closes the tab. Users can opt out of the prefilling by clicking the "Cancel" button in the notification.
15+
The temporary form data is saved on change, and it is removed when the user submits the form or closes the tab. Users can opt out of the prefilling by clicking the "Cancel" button in the notification.
1616

17-
Saved data is not sent to the server. It is only persisted using the [store](./Store.md) and is removed when the user logs out.
17+
Saved data is not sent to the server. It is only persisted using the [store](./Store.md) and is removed when the user logs out.
1818

1919
## Usage
2020

@@ -35,15 +35,15 @@ const PostEdit = () => (
3535
);
3636
```
3737

38-
The component will automatically save the form data in the store on unmount and reapply it when the form is mounted again.
38+
The component will automatically save the form data in the store on change and reapply it when the form is mounted again.
3939

4040
It works both on create and edit forms.
4141

4242
## Props
4343

44-
| Prop | Required | Type | Default | Description |
45-
| --------------------- | -------- | ---------- | -------------------------------------------------------- | ------------------------------------------------------------- |
46-
| `getStoreKey` | - | `function` | - | Function to use your own store key. |
44+
| Prop | Required | Type | Default | Description |
45+
| --------------------- | -------- | ---------- | -------------------------------------------------------- | --------------------------------------------------------------------- |
46+
| `getStoreKey` | - | `function` | - | Function to use your own store key. |
4747
| `notificationMessage` | - | `string` | "Applied previous unsaved changes" | Notification message to inform users that their previously saved changes have been applied. |
4848

4949
## `getStoreKey`
@@ -68,10 +68,9 @@ You can override this key by passing a custom function as the `getStoreKey` prop
6868
/>
6969
```
7070

71-
7271
## `notificationMessage`
7372

74-
When `<AutoPersistInStore>` component applies the changes from the store to a form, react-admin informs users with a notification.
73+
When `<AutoPersistInStore>` component applies the changes from the store to a form, react-admin informs users with a notification.
7574

7675
The default notification message is `ra-form-layout.auto_persist_in_store.applied_changes`, which is translated using the i18n provider (the default English translation is `Applied previous unsaved changes`).
7776

docs/CreateReactAdmin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ npx create-react-admin@latest your-admin-name
3232
# Using npm
3333
npm create react-admin@latest your-admin-name
3434
# Using yarn
35-
yarn create react-admin@latest your-admin-name
35+
yarn create react-admin your-admin-name
3636
# Using bun
3737
bun create react-admin@latest your-admin-name
3838
```

docs/Fields.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,9 +615,10 @@ const AuthorField = () => {
615615

616616
You can find components for react-admin in third-party repositories.
617617

618-
- [OoDeLally/react-admin-clipboard-list-field](https://github.com/OoDeLally/react-admin-clipboard-list-field): a quick and customizable copy-to-clipboard field.
619618
- [MrHertal/react-admin-json-view](https://github.com/MrHertal/react-admin-json-view): JSON field and input for react-admin.
620-
- [alexgschwend/react-admin-color-picker](https://github.com/alexgschwend/react-admin-color-picker): a color field
619+
- [alexgschwend/react-admin-color-picker](https://github.com/alexgschwend/react-admin-color-picker): a color field.
620+
- [huyanhvn/react-admin-clipboard-field](https://github.com/huyanhvn/react-admin-clipboard-field): a wrapper to TextField that copies field content to clipboard.
621+
- [OoDeLally/react-admin-clipboard-list-field](https://github.com/OoDeLally/react-admin-clipboard-list-field): copy various formats of the same value to clipboard.
621622

622623
## TypeScript
623624

docs/SelectInput.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ You can render some options as disabled by setting the `disabled` field in some
107107
const choices = [
108108
{ id: 'tech', name: 'Tech' },
109109
{ id: 'lifestyle', name: 'Lifestyle' },
110-
{ id: 'people', name: 'People', disable: true },
110+
{ id: 'people', name: 'People', disabled: true },
111111
];
112112
<SelectInput source="author_id" choices={choices} />
113113
```

docs/img/AutoPersistInStore.mp4

-226 KB
Binary file not shown.

examples/crm/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Atomic CRM
22

3-
[Atomic CRM](https://marmelab.com/atomic-crm/) is a CRM template built with [react-admin](https://github.com/marmelab/react-admin) and Supabse. You can test it online at https://marmelab.com/react-admin-crm.
3+
[Atomic CRM](https://marmelab.com/atomic-crm/) is a CRM template built with [react-admin](https://github.com/marmelab/react-admin) and Supabase. You can test it online at https://marmelab.com/react-admin-crm.
44

55
https://user-images.githubusercontent.com/99944/116970434-4a926480-acb8-11eb-8ce2-0602c680e45e.mp4
66

packages/create-react-admin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ npm create react-admin@latest my-app
99
# or
1010
npx create react-admin@latest my-app
1111
# or
12-
yarn create react-admin@latest my-app
12+
yarn create react-admin my-app
1313
# or
1414
bun create react-admin@latest my-app
1515
```

packages/create-react-admin/src/cli.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ const cli = meow(
8888
Examples
8989
$ npx create-react-admin@latest my-admin
9090
$ npx create-react-admin@latest my-admin --data-provider json-server --auth-provider local-auth-provider --resource posts --resource comments --install npm
91-
$ yarn create react-admin@latest my-admin
92-
$ yarn create react-admin@latest my-admin --data-provider json-server --auth-provider local-auth-provider --resource posts --resource comments --install npm
91+
$ yarn create react-admin my-admin
92+
$ yarn create react-admin my-admin --data-provider json-server --auth-provider local-auth-provider --resource posts --resource comments --install npm
9393
$ bun create react-admin@latest my-admin
9494
$ bun create react-admin@latest my-admin --data-provider json-server --auth-provider local-auth-provider --resource posts --resource comments --install npm
9595
`,

0 commit comments

Comments
 (0)