From 27d5bd77b4f04d0c9ad83d4b237166b7fe38931c Mon Sep 17 00:00:00 2001
From: lprnmns <manasalperen@gmail.com>
Date: Fri, 4 Sep 2026 23:26:08 +0300
Subject: [PATCH 1/2] fix: preserve autocomplete selection on blur

---
 .../src/input/AutocompleteInput.spec.tsx           | 12 ++++++++++++
 .../src/input/AutocompleteInput.tsx                | 14 +++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
index 459daa35f98..9ef934d8e08 100644
--- a/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
+++ b/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
@@ -1212,6 +1212,18 @@ describe('<AutocompleteInput />', () => {
     });
 
     describe('onCreate', () => {
+        it('should keep a clicked choice on blur when autoSelect is enabled', async () => {
+            render(<OnCreate autoSelect autoHighlight />);
+            const input = (await screen.findByLabelText(
+                'Author'
+            )) as HTMLInputElement;
+
+            fireEvent.focus(input);
+            fireEvent.click(await screen.findByText('Victor Hugo'));
+            fireEvent.blur(input);
+
+            expect(input.value).toEqual('Victor Hugo');
+        });
         it("shouldn't include an option with the create label when the input is empty", async () => {
             render(<OnCreate />);
             const input = (await screen.findByLabelText(
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
index d5e8eb96a06..be86cb0c412 100644
--- a/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
+++ b/packages/ra-ui-materialui/src/input/AutocompleteInput.tsx
@@ -619,6 +619,13 @@ If you provided a React element for the optionText prop, you must also provide t
         (event: any, newValue: any, reason: AutocompleteChangeReason) => {
             // This prevents auto-submitting a form inside a dialog passed to the `create` prop
             event.preventDefault();
+            if (
+                reason === 'blur' &&
+                typeof newValue === 'string' &&
+                doesQueryMatchSelection(newValue)
+            ) {
+                return;
+            }
             if (reason === 'createOption') {
                 // When users press the enter key after typing a new value, we can handle it as if they clicked on the create option
                 handleChangeWithCreateSupport(
@@ -634,7 +641,12 @@ If you provided a React element for the optionText prop, you must also provide t
                 newValue != null ? newValue : emptyValue
             );
         },
-        [emptyValue, getCreateItem, handleChangeWithCreateSupport]
+        [
+            doesQueryMatchSelection,
+            emptyValue,
+            getCreateItem,
+            handleChangeWithCreateSupport,
+        ]
     );
 
     const oneSecondHasPassed = useTimeout(1000, filterValue);

From dcd5c1acdf315834bf6c8b60b244a8e018c2cacf Mon Sep 17 00:00:00 2001
From: lprnmns <manasalperen@gmail.com>
Date: Tue, 8 Sep 2026 19:55:25 +0300
Subject: [PATCH 2/2] test: add auto-select creation story

---
 .../ra-ui-materialui/src/input/AutocompleteInput.spec.tsx   | 3 ++-
 .../src/input/AutocompleteInput.stories.tsx                 | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
index 9ef934d8e08..85ce2ee4d6d 100644
--- a/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
+++ b/packages/ra-ui-materialui/src/input/AutocompleteInput.spec.tsx
@@ -26,6 +26,7 @@ import {
     InsideReferenceInputOnChange,
     WithInputProps,
     OnCreate,
+    OnCreateWithAutoSelect,
     OnCreateSlow,
     CreateLabel,
     CreateItemLabel,
@@ -1213,7 +1214,7 @@ describe('<AutocompleteInput />', () => {
 
     describe('onCreate', () => {
         it('should keep a clicked choice on blur when autoSelect is enabled', async () => {
-            render(<OnCreate autoSelect autoHighlight />);
+            render(<OnCreateWithAutoSelect />);
             const input = (await screen.findByLabelText(
                 'Author'
             )) as HTMLInputElement;
diff --git a/packages/ra-ui-materialui/src/input/AutocompleteInput.stories.tsx b/packages/ra-ui-materialui/src/input/AutocompleteInput.stories.tsx
index bf5d25229ed..95e95c15d44 100644
--- a/packages/ra-ui-materialui/src/input/AutocompleteInput.stories.tsx
+++ b/packages/ra-ui-materialui/src/input/AutocompleteInput.stories.tsx
@@ -375,6 +375,12 @@ OnCreate.argTypes = {
     },
 };
 
+export const OnCreateWithAutoSelect = () => (
+    <Wrapper>
+        <OnCreateInput autoSelect autoHighlight />
+    </Wrapper>
+);
+
 const AutocompleteWithCreateInReferenceInput = () => {
     const [create] = useCreate();
     const handleCreateAuthor = async (authorName?: string) => {