Merge branch 'next' into support-offline-mode

djhi · djhi · commit 78262e9913b6 · 2025-05-06T10:48:41.000+02:00
diff --git a/examples/crm/package.json b/examples/crm/package.json
@@ -34,11 +34,11 @@
         "@types/papaparse": "^5",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
-        "@vitejs/plugin-react": "^4.2.1",
-        "rollup-plugin-visualizer": "^5.12.0",
-        "rollup-preserve-directives": "^1.1.1",
+        "@vitejs/plugin-react": "^4.3.4",
+        "rollup-plugin-visualizer": "^5.14.0",
+        "rollup-preserve-directives": "^1.1.3",
         "typescript": "^5.1.3",
-        "vite": "^5.0.11",
+        "vite": "^6.2.6",
         "web-vitals": "^3.5.1"
     },
     "scripts": {
diff --git a/examples/demo/package.json b/examples/demo/package.json
@@ -7,6 +7,7 @@
         "@apollo/client": "^3.12.4",
         "@mui/icons-material": "^7.0.0",
         "@mui/material": "^7.0.0",
+        "@types/recharts": "^1.8.10",
         "@vitejs/plugin-react": "^2.2.0",
         "clsx": "^2.1.1",
         "data-generator-retail": "^5.0.0",
@@ -44,11 +45,10 @@
         "@types/node": "^20.10.7",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
-        "@vitejs/plugin-react": "^4.2.1",
-        "rewire": "^5.0.0",
-        "rollup-plugin-visualizer": "^5.12.0",
-        "rollup-preserve-directives": "^1.1.1",
+        "@vitejs/plugin-react": "^4.3.4",
+        "rollup-plugin-visualizer": "^5.14.0",
+        "rollup-preserve-directives": "^1.1.3",
         "typescript": "^5.1.3",
-        "vite": "^5.0.11"
+        "vite": "^6.2.6"
     }
 }
diff --git a/examples/no-code/package.json b/examples/no-code/package.json
@@ -16,9 +16,9 @@
         "react-dom": "^18.3.1"
     },
     "devDependencies": {
-        "@vitejs/plugin-react": "^4.2.1",
+        "@vitejs/plugin-react": "^4.3.4",
         "typescript": "^5.1.3",
-        "vite": "^5.0.11"
+        "vite": "^6.2.6"
     },
     "gitHead": "6eb0f6fcbe3ba237b507f3506d230b3445c0a764"
 }
diff --git a/examples/simple/package.json b/examples/simple/package.json
@@ -32,10 +32,10 @@
     },
     "devDependencies": {
         "@hookform/devtools": "^4.3.3",
-        "@vitejs/plugin-react": "^4.2.1",
+        "@vitejs/plugin-react": "^4.3.4",
         "little-state-machine": "^4.8.1",
         "react-simple-animate": "^3.5.3",
         "typescript": "^5.1.3",
-        "vite": "^5.0.11"
+        "vite": "^6.2.6"
     }
 }
diff --git a/examples/tutorial/package.json b/examples/tutorial/package.json
@@ -19,8 +19,8 @@
     "devDependencies": {
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
-        "@vitejs/plugin-react": "^4.2.1",
+        "@vitejs/plugin-react": "^4.3.4",
         "typescript": "^5.1.3",
-        "vite": "^5.0.11"
+        "vite": "^6.2.6"
     }
 }
diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
         "react-dom": "^18.3.1",
         "storybook": "^8.6.11",
         "ts-jest": "^29.1.0",
-        "tsx": "^4.19.2",
+        "tsx": "^4.19.3",
         "typescript": "^5.1.3",
         "typescript-eslint": "^8.28.0",
         "whatwg-fetch": "^3.0.0"
diff --git a/packages/create-react-admin/templates/common/package.json b/packages/create-react-admin/templates/common/package.json
@@ -25,7 +25,7 @@
         "@types/node": "^20.10.7",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
-        "@vitejs/plugin-react": "^4.0.1",
+        "@vitejs/plugin-react": "^4.3.4",
         "eslint": "^9.23.0",
         "eslint-config-prettier": "^10.1.1",
         "eslint-plugin-prettier": "^5.2.5",
@@ -35,6 +35,6 @@
         "prettier": "^3.3.3",
         "typescript": "^5.1.6",
         "typescript-eslint": "^8.28.0",
-        "vite": "^5.3.5"
+        "vite": "^6.2.6"
     }
 }
diff --git a/packages/create-react-admin/templates/ra-data-fakerest/package.json b/packages/create-react-admin/templates/ra-data-fakerest/package.json
@@ -9,6 +9,6 @@
         "@testing-library/dom": "^10.4.0",
         "@testing-library/react": "^16.0.0",
         "jsdom": "^24.1.1",
-        "vitest": "^2.0.5"
+        "vitest": "^3.1.1"
     }
 }
diff --git a/packages/ra-core/src/form/choices/useChoices.tsx b/packages/ra-core/src/form/choices/useChoices.tsx
@@ -27,6 +27,8 @@ export interface UseChoicesOptions {
     optionText?: OptionText;
     disableValue?: string;
     translateChoice?: boolean;
+    createValue?: string;
+    createHintValue?: string;
 }
 
 /*
@@ -45,11 +47,20 @@ export const useChoices = ({
     optionValue = 'id',
     disableValue = 'disabled',
     translateChoice = true,
+    createValue = '@@ra-create',
+    createHintValue = '@@ra-create-hint',
 }: UseChoicesOptions) => {
     const translate = useTranslate();
 
     const getChoiceText = useCallback(
         choice => {
+            if (choice?.id === createValue || choice?.id === createHintValue) {
+                return get(
+                    choice,
+                    typeof optionText === 'string' ? optionText : 'name'
+                );
+            }
+
             if (isValidElement<{ record: any }>(optionText)) {
                 return (
                     <RecordContextProvider value={choice}>
@@ -68,7 +79,7 @@ export const useChoices = ({
                   ? translate(String(choiceName), { _: choiceName })
                   : String(choiceName);
         },
-        [optionText, translate, translateChoice]
+        [createHintValue, createValue, optionText, translate, translateChoice]
     );
 
     const getChoiceValue = useCallback(
diff --git a/packages/ra-core/src/form/useSuggestions.ts b/packages/ra-core/src/form/useSuggestions.ts
@@ -30,6 +30,7 @@ export const useSuggestions = ({
     choices,
     createText = 'ra.action.create',
     createValue = '@@create',
+    createHintValue = '@@ra-create-hint',
     limitChoicesToValue,
     matchSuggestion,
     optionText,
@@ -43,6 +44,8 @@ export const useSuggestions = ({
         optionText,
         optionValue,
         translateChoice,
+        createValue,
+        createHintValue,
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -93,7 +96,6 @@ export interface UseSuggestionsOptions extends UseChoicesOptions {
     allowDuplicates?: boolean;
     choices?: any[];
     createText?: string;
-    createValue?: any;
     limitChoicesToValue?: boolean;
     matchSuggestion?: (
         filter: string,
diff --git a/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.spec.tsx
@@ -23,6 +23,7 @@ import { Notification } from '../layout';
 import {
     Basic,
     NoRecordRepresentation,
+    WithCustomTitleAndContent,
     WithDefaultTranslation,
 } from './DeleteWithConfirmButton.stories';
 
@@ -341,6 +342,19 @@ describe('<DeleteWithConfirmButton />', () => {
         });
     });
 
+    it('should use the provided strings as the confirmation title and content', async () => {
+        render(<WithCustomTitleAndContent />);
+        fireEvent.click(
+            within(
+                (await screen.findByText('War and Peace')).closest(
+                    'tr'
+                ) as HTMLElement
+            ).getByText('Delete')
+        );
+        await screen.findByText('Delete me?');
+        await screen.findByText('Please confirm the deletion');
+    });
+
     it('should use the record representation in the confirmation title and content with a resource specific translation', async () => {
         render(<Basic />);
         fireEvent.click(
diff --git a/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.stories.tsx b/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.stories.tsx
@@ -231,6 +231,29 @@ export const WithDefaultTranslation = () => (
     </TestMemoryRouter>
 );
 
+export const WithCustomTitleAndContent = () => (
+    <TestMemoryRouter initialEntries={['/books']}>
+        <AdminContext
+            dataProvider={dataProvider}
+            i18nProvider={i18nProviderDefault}
+        >
+            <AdminUI>
+                <Resource
+                    name="books"
+                    list={
+                        <BookList>
+                            <DeleteWithConfirmButton
+                                confirmTitle="Delete me?"
+                                confirmContent="Please confirm the deletion"
+                            />
+                        </BookList>
+                    }
+                />
+            </AdminUI>
+        </AdminContext>
+    </TestMemoryRouter>
+);
+
 export const NoRecordRepresentation = () => (
     <TestMemoryRouter initialEntries={['/authors']}>
         <AdminContext dataProvider={dataProvider} i18nProvider={i18nProvider}>
diff --git a/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/DeleteWithConfirmButton.tsx
@@ -100,22 +100,26 @@ export const DeleteWithConfirmButton = <RecordType extends RaRecord = any>(
                     recordRepresentation,
                     name: resourceName,
                     id: record?.id,
-                    _: translate('ra.message.delete_title', {
-                        recordRepresentation,
-                        name: resourceName,
-                        id: record?.id,
-                    }),
+                    _:
+                        confirmTitleProp ??
+                        translate('ra.message.delete_title', {
+                            recordRepresentation,
+                            name: resourceName,
+                            id: record?.id,
+                        }),
                     ...titleTranslateOptions,
                 }}
                 contentTranslateOptions={{
                     recordRepresentation,
                     name: resourceName,
                     id: record?.id,
-                    _: translate('ra.message.delete_content', {
-                        recordRepresentation,
-                        name: resourceName,
-                        id: record?.id,
-                    }),
+                    _:
+                        confirmContentProp ??
+                        translate('ra.message.delete_content', {
+                            recordRepresentation,
+                            name: resourceName,
+                            id: record?.id,
+                        }),
                     ...contentTranslateOptions,
                 }}
                 onConfirm={handleDelete}
diff --git a/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.spec.tsx b/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.spec.tsx
@@ -19,6 +19,7 @@ import { MutationOptions } from './UpdateButton.stories';
 import {
     Basic,
     NoRecordRepresentation,
+    WithCustomTitleAndContent,
     WithDefaultTranslation,
 } from './UpdateWithConfirmButton.stories';
 
@@ -280,6 +281,19 @@ describe('<UpdateWithConfirmButton />', () => {
         ).toBeNull();
     });
 
+    it('should use the provided strings as the confirmation title and content', async () => {
+        render(<WithCustomTitleAndContent />);
+        fireEvent.click(
+            within(
+                (await screen.findByText('War and Peace')).closest(
+                    'tr'
+                ) as HTMLElement
+            ).getByText('Update')
+        );
+        await screen.findByText('Update me?');
+        await screen.findByText('Please confirm the update');
+    });
+
     it('should use the record representation in the confirmation title and content with a resource specific translation', async () => {
         render(<Basic />);
         fireEvent.click(
diff --git a/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.stories.tsx b/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.stories.tsx
@@ -213,6 +213,30 @@ export const Basic = () => (
     </TestMemoryRouter>
 );
 
+export const WithCustomTitleAndContent = () => (
+    <TestMemoryRouter initialEntries={['/books']}>
+        <AdminContext
+            dataProvider={dataProvider}
+            i18nProvider={i18nProviderDefault}
+        >
+            <AdminUI>
+                <Resource
+                    name="books"
+                    list={
+                        <BookList>
+                            <UpdateWithConfirmButton
+                                data={{ title: 'modified' }}
+                                confirmTitle="Update me?"
+                                confirmContent="Please confirm the update"
+                            />
+                        </BookList>
+                    }
+                />
+            </AdminUI>
+        </AdminContext>
+    </TestMemoryRouter>
+);
+
 export const WithDefaultTranslation = () => (
     <TestMemoryRouter initialEntries={['/books']}>
         <AdminContext
diff --git a/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.tsx b/packages/ra-ui-materialui/src/button/UpdateWithConfirmButton.tsx
@@ -96,7 +96,7 @@ export const UpdateWithConfirmButton = (
         }
     );
 
-    const handleClick = e => {
+    const handleClick = (e: React.MouseEvent) => {
         setOpen(true);
         e.stopPropagation();
     };
@@ -155,21 +155,25 @@ export const UpdateWithConfirmButton = (
                     smart_count: 1,
                     name: resourceName,
                     recordRepresentation,
-                    _: translate('ra.message.bulk_update_title', {
-                        smart_count: 1,
-                        name: resourceName,
-                        recordRepresentation,
-                    }),
+                    _:
+                        confirmTitleProp ??
+                        translate('ra.message.bulk_update_title', {
+                            smart_count: 1,
+                            name: resourceName,
+                            recordRepresentation,
+                        }),
                 }}
                 contentTranslateOptions={{
                     smart_count: 1,
                     name: resourceName,
                     recordRepresentation,
-                    _: translate('ra.message.bulk_update_content', {
-                        smart_count: 1,
-                        name: resourceName,
-                        recordRepresentation,
-                    }),
+                    _:
+                        confirmContentProp ??
+                        translate('ra.message.bulk_update_content', {
+                            smart_count: 1,
+                            name: resourceName,
+                            recordRepresentation,
+                        }),
                 }}
                 onConfirm={handleUpdate}
                 onClose={handleDialogClose}
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.stories.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.stories.tsx
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
diff --git a/packages/ra-ui-materialui/src/input/SelectInput.spec.tsx b/packages/ra-ui-materialui/src/input/SelectInput.spec.tsx
diff --git a/packages/ra-ui-materialui/src/input/SelectInput.stories.tsx b/packages/ra-ui-materialui/src/input/SelectInput.stories.tsx
diff --git a/packages/ra-ui-materialui/src/input/SelectInput.tsx b/packages/ra-ui-materialui/src/input/SelectInput.tsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@`
`32`	`32`	`},`
`33`	`33`	`"devDependencies": {`
`34`	`34`	`"@hookform/devtools": "^4.3.3",`
`35`		`- "@vitejs/plugin-react": "^4.2.1",`
	`35`	`+ "@vitejs/plugin-react": "^4.3.4",`
`36`	`36`	`"little-state-machine": "^4.8.1",`
`37`	`37`	`"react-simple-animate": "^3.5.3",`
`38`	`38`	`"typescript": "^5.1.3",`
`39`		`- "vite": "^5.0.11"`
	`39`	`+ "vite": "^6.2.6"`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`"devDependencies": {`
`20`	`20`	`"@types/react": "^18.3.3",`
`21`	`21`	`"@types/react-dom": "^18.3.0",`
`22`		`- "@vitejs/plugin-react": "^4.2.1",`
	`22`	`+ "@vitejs/plugin-react": "^4.3.4",`
`23`	`23`	`"typescript": "^5.1.3",`
`24`		`- "vite": "^5.0.11"`
	`24`	`+ "vite": "^6.2.6"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`"@testing-library/dom": "^10.4.0",`
`10`	`10`	`"@testing-library/react": "^16.0.0",`
`11`	`11`	`"jsdom": "^24.1.1",`
`12`		`- "vitest": "^2.0.5"`
	`12`	`+ "vitest": "^3.1.1"`
`13`	`13`	`}`
`14`	`14`	`}`