Utils: Fix focusable matching contenteditable=false (#5224)

WordPress · Mar 7, 2018 · cf4cc73 · cf4cc73
1 parent ab44213
commit cf4cc73
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/utils/focus/focusable.js b/utils/focus/focusable.js
@@ -33,7 +33,7 @@ const SELECTOR = [
 	'object',
 	'embed',
 	'area[href]',
-	'[contenteditable]',
+	'[contenteditable]:not([contenteditable=false])',
 ].join( ',' );
 
 /**

diff --git a/utils/focus/test/focusable.js b/utils/focus/test/focusable.js
@@ -85,6 +85,27 @@ describe( 'focusable', () => {
 			expect( find( map ) ).toEqual( [] );
 		} );
 
+		it( 'finds contenteditable', () => {
+			const node = createElement( 'div' );
+			const div = createElement( 'div' );
+			node.appendChild( div );
+
+			div.setAttribute( 'contenteditable', '' );
+			expect( find( node ) ).toEqual( [ div ] );
+
+			div.setAttribute( 'contenteditable', 'true' );
+			expect( find( node ) ).toEqual( [ div ] );
+		} );
+
+		it( 'ignores contenteditable=false', () => {
+			const node = createElement( 'div' );
+			const div = createElement( 'div' );
+			node.appendChild( div );
+
+			div.setAttribute( 'contenteditable', 'false' );
+			expect( find( node ) ).toEqual( [] );
+		} );
+
 		it( 'ignores invisible inputs', () => {
 			const node = createElement( 'div' );
 			const input = createElement( 'input' );