Mamaduka · Oct 6, 2026 · Oct 5, 2026 · ciampo · Oct 5, 2026 · Mamaduka
@@ -38,6 +38,7 @@
 -   `ResizableBox`: Update `re-resizable` to `6.11.2`, which supports React 18 and renders the top and left handles before the content so focus order matches visual order ([#83754](https://github.com/WordPress/gutenberg/pull/83754)).
 -   `PaletteEdit`: Keep an item's slug when it is renamed, so blocks and styles that reference the preset keep working ([#83750](https://github.com/WordPress/gutenberg/pull/83750)).
 -   `FocalPointPicker`: End a drag when the pointer is released outside the control, including over the editor canvas ([#83348](https://github.com/WordPress/gutenberg/pull/83348)).
+-   `ContentEditableControl`: Keep a disabled field focusable (out of the tab order), so a field disabled while it has focus keeps it instead of dropping focus on the body ([#84083](https://github.com/WordPress/gutenberg/pull/84083)).
 
 ### Internal
 

@@ -41,9 +41,8 @@ control in `@wordpress/dataviews` for the canonical assembly).
  - Required: No
  - Default: `false`
 
-Whether the field is non-editable. A disabled field is not
-`contentEditable` (so it is neither focusable nor editable) and exposes
-`aria-disabled` to assistive technology.
+Whether the field is non-editable. A disabled field exposes
+`aria-disabled`, leaves the tab order, and keeps focus if it had it.
 
 ### `hideLabelFromVision`
 

@@ -58,9 +58,10 @@ function UnforwardedContentEditableControl(
 				aria-disabled={ disabled || undefined }
 				aria-required={ required || undefined }
 				ref={ mergedRefs }
-				// A disabled field is not `contentEditable`, which also
-				// removes it from the tab order.
+				// Not editable and out of the tab order, but still focusable:
+				// a field disabled while focused keeps focus.
 				contentEditable={ ! disabled }
+				tabIndex={ disabled ? -1 : undefined }
 				suppressContentEditableWarning
 				{ ...additionalProps }
 				{ ...controlProps }

@@ -67,6 +67,21 @@ describe( 'ContentEditableControl', () => {
 		expect( textbox ).toHaveAttribute( 'contenteditable', 'false' );
 	} );
 
+	it( 'keeps a disabled field focusable but out of the tab order', () => {
+		const { rerender } = render( <ContentEditableControl label="Note" /> );
+
+		expect( screen.getByRole( 'textbox' ) ).not.toHaveAttribute(
+			'tabindex'
+		);
+
+		rerender( <ContentEditableControl label="Note" disabled /> );
+
+		expect( screen.getByRole( 'textbox' ) ).toHaveAttribute(
+			'tabindex',
+			'-1'
+		);
+	} );
+
 	it( 'exposes `required` via aria-required', () => {
 		render( <ContentEditableControl label="Note" required /> );
 

@@ -9,9 +9,8 @@ export type ContentEditableControlProps = Pick<
 	 */
 	label: string;
 	/**
-	 * Whether the field is non-editable. A disabled field is not
-	 * `contentEditable` (so it is neither focusable nor editable) and exposes
-	 * `aria-disabled` to assistive technology.
+	 * Whether the field is non-editable. A disabled field exposes
+	 * `aria-disabled`, leaves the tab order, and keeps focus if it had it.
 	 *
 	 * @default false
 	 */

diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
@@ -21,6 +21,7 @@
 -   Notes: Add an Undo action to the "Note deleted." snackbar, and stop the editor's undo from bringing back the highlight of a deleted note ([#83988](https://github.com/WordPress/gutenberg/pull/83988)).
 -   Notes: Stop the editor's undo from detaching a newly added note from its block, or bringing back the highlight of a resolved note ([#84079](https://github.com/WordPress/gutenberg/pull/84079)).
 -   Notes: Delete notes permanently when they can't be moved to the trash, instead of failing with an error ([#84102](https://github.com/WordPress/gutenberg/pull/84102)).
+-   Notes: Disable the note form field while a note or reply is being sent, instead of accepting text the save would not include ([#84083](https://github.com/WordPress/gutenberg/pull/84083)).
 
 ### Internal
 

diff --git a/packages/editor/src/components/collab-sidebar/note-form.jsx b/packages/editor/src/components/collab-sidebar/note-form.jsx
@@ -50,23 +50,15 @@ export function NoteForm( { onSubmit, onCancel, note, labels } ) {
 			return;
 		}
 		setIsSubmitting( true );
-		const submitted = inputComment;
 
 		/*
 		 * The note actions resolve with the saved record on success and
 		 * `undefined` on failure (they surface their own error notice),
-		 * so only discard the draft once the save actually succeeded.
+		 * so only discard the content once the save actually succeeded.
 		 */
-		const result = await onSubmit( submitted );
+		const result = await onSubmit( inputComment );
 		if ( result ) {
-			/*
-			 * The field stays editable while the request is in flight, so
-			 * keep anything typed since; clearing unconditionally would
-			 * discard it.
-			 */
-			setInputComment( ( current ) =>
-				current === submitted ? '' : current
-			);
+			setInputComment( '' );
 		}
 
 		setIsSubmitting( false );
@@ -102,6 +94,7 @@ export function NoteForm( { onSubmit, onCancel, note, labels } ) {
 				hideLabelFromVision
 				value={ inputComment }
 				onChange={ setInputComment }
+				disabled={ isSubmitting }
 				placeholder={ labels?.placeholder }
 				allowedFormats={ ALLOWED_NOTE_FORMATS }
 				completers={ NOTE_COMPLETERS }

diff --git a/packages/editor/src/components/collab-sidebar/rich-text-control/index.tsx b/packages/editor/src/components/collab-sidebar/rich-text-control/index.tsx
@@ -291,9 +291,7 @@ export default function RichTextControl( {
 	 */
 	const enterRef = useRefEffect< HTMLElement >(
 		( element ) => {
-			// A disabled field is not editable; nothing to handle. (Real
-			// keyboard input cannot reach it either, since a
-			// non-`contentEditable` div is not focusable.)
+			// A disabled field is not editable; nothing to handle.
 			if ( disabled ) {
 				return;
 			}