Improve tabindex logic

WordPress · Feb 23, 2024 · e6f3bb7 · e6f3bb7
1 parent a0517a9
commit e6f3bb7
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
@@ -294,12 +294,7 @@ export function RichTextWrapper(
 	}
 
 	const TagName = tagName;
-	let tabIndex;
-	if ( shouldDisableEditing ) {
-		tabIndex = 0;
-	} else {
-		tabIndex = props.tabIndex === 0 ? null : props.tabIndex;
-	}
+	const tabIndex = props.tabIndex === 0 ? null : props.tabIndex;
 	return (
 		<>
 			{ isSelected && (
@@ -394,13 +389,13 @@ export function RichTextWrapper(
 					props.className,
 					'rich-text'
 				) }
-				// Setting tabIndex to 0 is unnecessary, the element is already
+				// Setting tabIndex to 0 is unnecessary, if the element is already
 				// focusable because it's contentEditable. This also fixes a
 				// Safari bug where it's not possible to Shift+Click multi
 				// select blocks when Shift Clicking into an element with
 				// tabIndex because Safari will focus the element. However,
 				// Safari will correctly ignore nested contentEditable elements.
-				tabIndex={ tabIndex }
+				tabIndex={ shouldDisableEditing ? 0 : tabIndex }
 				data-wp-block-attribute-key={ identifier }
 			/>
 		</>