diff --git a/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap b/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap
index 1cb43f93a8d..4e8db2e6eb0 100644
--- a/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap
+++ b/src/components/inline_edit/__snapshots__/inline_edit_form.test.tsx.snap
@@ -667,9 +667,7 @@ exports[`EuiInlineEditForm Read Mode isReadOnly 1`] = `
- Click to edit this text inline.
-
+ />
`;
diff --git a/src/components/inline_edit/__snapshots__/inline_edit_text.test.tsx.snap b/src/components/inline_edit/__snapshots__/inline_edit_text.test.tsx.snap
index c3e7dcba701..c5d30da1fe7 100644
--- a/src/components/inline_edit/__snapshots__/inline_edit_text.test.tsx.snap
+++ b/src/components/inline_edit/__snapshots__/inline_edit_text.test.tsx.snap
@@ -29,9 +29,7 @@ exports[`EuiInlineEditText isReadOnly 1`] = `
- Click to edit this text inline.
-
+ />
`;
diff --git a/src/components/inline_edit/__snapshots__/inline_edit_title.test.tsx.snap b/src/components/inline_edit/__snapshots__/inline_edit_title.test.tsx.snap
index 393e8d316f1..1db0a616d9a 100644
--- a/src/components/inline_edit/__snapshots__/inline_edit_title.test.tsx.snap
+++ b/src/components/inline_edit/__snapshots__/inline_edit_title.test.tsx.snap
@@ -21,6 +21,7 @@ exports[`EuiInlineEditTitle isReadOnly 1`] = `
>
Hello World!
@@ -30,9 +31,7 @@ exports[`EuiInlineEditTitle isReadOnly 1`] = `
- Click to edit this text inline.
-
+ />
`;
diff --git a/src/components/inline_edit/inline_edit_form.tsx b/src/components/inline_edit/inline_edit_form.tsx
index 9806fab5d15..b0df19e44e9 100644
--- a/src/components/inline_edit/inline_edit_form.tsx
+++ b/src/components/inline_edit/inline_edit_form.tsx
@@ -201,9 +201,11 @@ export const EuiInlineEditForm: FunctionComponent = ({
const editModeInputOnKeyDown = (event: KeyboardEvent) => {
switch (event.key) {
case keys.ENTER:
+ event.preventDefault(); // Enter keypresses will not proceed otherwise on webkit browsers & screen readers
saveInlineEditValue();
break;
case keys.ESCAPE:
+ event.preventDefault(); // NVDA will trigger Browse mode otherwise
cancelInlineEdit();
break;
}
@@ -249,14 +251,11 @@ export const EuiInlineEditForm: FunctionComponent = ({
)}
/>
-
- {!isReadOnly && (
-
- )}
+
@@ -342,10 +341,12 @@ export const EuiInlineEditForm: FunctionComponent = ({
{children(readModeValue)}
-
+ {!isReadOnly && (
+
+ )}
>
);
diff --git a/src/components/inline_edit/inline_edit_title.tsx b/src/components/inline_edit/inline_edit_title.tsx
index 451cd1a4697..ffa1b7ea077 100644
--- a/src/components/inline_edit/inline_edit_title.tsx
+++ b/src/components/inline_edit/inline_edit_title.tsx
@@ -96,7 +96,9 @@ export const EuiInlineEditTitle: FunctionComponent = ({
>
{(titleReadModeValue) => (
- {titleReadModeValue}
+
+ {titleReadModeValue}
+
)}