Preserve original selectBlock behaviour

WordPress · Dec 5, 2024 · 5e9373f · 5e9373f
1 parent b9c9925
commit 5e9373f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js b/packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js
@@ -43,6 +43,10 @@ export function useFocusFirstElement( { clientId, initialPosition } ) {
 			return;
 		}
 
+		if ( initialPosition === undefined || initialPosition === null ) {
+			return;
+		}
+
 		if ( ! ref.current ) {
 			return;
 		}
@@ -54,7 +58,7 @@ export function useFocusFirstElement( { clientId, initialPosition } ) {
 			return;
 		}
 
-		if ( initialPosition === undefined || initialPosition === null ) {
+		if ( initialPosition === true ) {
 			ref.current.focus();
 			return;
 		}

diff --git a/packages/block-editor/src/components/writing-flow/use-input.js b/packages/block-editor/src/components/writing-flow/use-input.js
@@ -159,7 +159,7 @@ export default function useInput() {
 
 							if ( nextClientId ) {
 								event.preventDefault();
-								selectBlock( nextClientId, null );
+								selectBlock( nextClientId, true );
 							}
 						}
 					}