Fix insertion point displaying when there are no inserter items (#32576)

WordPress · Jun 16, 2021 · 80ab980 · 80ab980
1 parent b33794d
commit 80ab980
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
@@ -1215,7 +1215,17 @@ export function getBlockInsertionPoint( state ) {
  * @return {?boolean} Whether the insertion point is visible or not.
  */
 export function isBlockInsertionPointVisible( state ) {
-	return state.insertionPoint !== null;
+	const insertionPoint = state.insertionPoint;
+
+	if ( ! state.insertionPoint ) {
+		return false;
+	}
+
+	if ( getTemplateLock( state, insertionPoint.rootClientId ) ) {
+		return false;
+	}
+
+	return true;
 }
 
 /**

diff --git a/packages/block-editor/src/store/test/selectors.js b/packages/block-editor/src/store/test/selectors.js
@@ -2255,12 +2255,43 @@ describe( 'selectors', () => {
 			expect( isBlockInsertionPointVisible( state ) ).toBe( false );
 		} );
 
+		it( 'should return false if the rootClientId has a truthy template lock', () => {
+			const state = {
+				insertionPoint: {
+					rootClientId: 'testClientId',
+					index: 5,
+				},
+				blockListSettings: {
+					testClientId: {
+						templateLock: 'all',
+					},
+				},
+			};
+
+			expect( isBlockInsertionPointVisible( state ) ).toBe( false );
+		} );
+
+		it( 'should return false if the rootClientId is undefined, and the settings has a template lock', () => {
+			const state = {
+				insertionPoint: {
+					rootClientId: undefined,
+					index: 5,
+				},
+				settings: {
+					templateLock: 'all',
+				},
+			};
+
+			expect( isBlockInsertionPointVisible( state ) ).toBe( false );
+		} );
+
 		it( 'should return true if assigned insertion point', () => {
 			const state = {
 				insertionPoint: {
 					rootClientId: undefined,
 					index: 5,
 				},
+				settings: {},
 			};
 
 			expect( isBlockInsertionPointVisible( state ) ).toBe( true );