From fb684ceb6d1e1be228b5934277c11c92d4855658 Mon Sep 17 00:00:00 2001
From: Jorge <jorge.costa@developer.pt>
Date: Thu, 21 Feb 2019 16:02:24 +0000
Subject: [PATCH 1/2] Fix: Global inserter does not validates block
 restrictions

---
 .../src/components/inserter/menu.js           | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
index 1ed720113e7668..9d92e40074c3f2 100644
--- a/packages/block-editor/src/components/inserter/menu.js
+++ b/packages/block-editor/src/components/inserter/menu.js
@@ -360,21 +360,30 @@ export class InserterMenu extends Component {
 }
 
 export default compose(
-	withSelect( ( select, { rootClientId } ) => {
+	withSelect( ( select, { clientId, isAppender, rootClientId } ) => {
 		const {
 			getInserterItems,
 			getBlockName,
+			getBlockRootClientId,
+			getBlockSelectionEnd,
 		} = select( 'core/block-editor' );
 		const {
 			getChildBlockNames,
 		} = select( 'core/blocks' );
 
-		const rootBlockName = getBlockName( rootClientId );
+		let destinationRootClientId = rootClientId;
+		if ( ! destinationRootClientId && ! clientId && ! isAppender ) {
+			const end = getBlockSelectionEnd();
+			if ( end ) {
+				destinationRootClientId = getBlockRootClientId( end ) || undefined;
+			}
+		}
+		const destinationRootBlockName = getBlockName( destinationRootClientId );
 
 		return {
-			rootChildBlocks: getChildBlockNames( rootBlockName ),
-			items: getInserterItems( rootClientId ),
-			rootClientId,
+			rootChildBlocks: getChildBlockNames( destinationRootBlockName ),
+			items: getInserterItems( destinationRootClientId ),
+			destinationRootClientId,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, { select } ) => {
@@ -393,45 +402,34 @@ export default compose(
 		// Since it's a function only called when the event handlers are called,
 		// it's fine to extract it.
 		// eslint-disable-next-line no-restricted-syntax
-		function getInsertionPoint() {
+		function getInsertionIndex() {
 			const {
 				getBlockIndex,
-				getBlockRootClientId,
 				getBlockSelectionEnd,
 				getBlockOrder,
 			} = select( 'core/block-editor' );
-			const { clientId, rootClientId, isAppender } = ownProps;
+			const { clientId, destinationRootClientId, isAppender } = ownProps;
 
 			// If the clientId is defined, we insert at the position of the block.
 			if ( clientId ) {
-				return {
-					index: getBlockIndex( clientId, rootClientId ),
-					rootClientId,
-				};
+				return getBlockIndex( clientId, destinationRootClientId );
 			}
 
 			// If there a selected block, we insert after the selected block.
 			const end = getBlockSelectionEnd();
 			if ( ! isAppender && end ) {
-				const selectedBlockRootClientId = getBlockRootClientId( end ) || undefined;
-				return {
-					index: getBlockIndex( end, selectedBlockRootClientId ) + 1,
-					rootClientId: selectedBlockRootClientId,
-				};
+				return getBlockIndex( end, destinationRootClientId ) + 1;
 			}
 
 			// Otherwise, we insert at the end of the current rootClientId
-			return {
-				index: getBlockOrder( rootClientId ).length,
-				rootClientId,
-			};
+			return getBlockOrder( destinationRootClientId ).length;
 		}
 
 		return {
 			fetchReusableBlocks,
 			showInsertionPoint() {
-				const { index, rootClientId } = getInsertionPoint();
-				showInsertionPoint( rootClientId, index );
+				const index = getInsertionIndex();
+				showInsertionPoint( ownProps.destinationRootClientId, index );
 			},
 			hideInsertionPoint,
 			onSelect( item ) {
@@ -449,8 +447,11 @@ export default compose(
 				if ( ! isAppender && selectedBlock && isUnmodifiedDefaultBlock( selectedBlock ) ) {
 					replaceBlocks( selectedBlock.clientId, insertedBlock );
 				} else {
-					const { index, rootClientId } = getInsertionPoint();
-					insertBlock( insertedBlock, index, rootClientId );
+					insertBlock(
+						insertedBlock,
+						getInsertionIndex(),
+						ownProps.destinationRootClientId
+					);
 				}
 
 				ownProps.onSelect();

From 764a5f090b7f4ede7768842ce58db83d406a0a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20=28Greg=29=20Zi=C3=B3=C5=82kowski?=
 <grzegorz.ziolkowski@automattic.com>
Date: Mon, 11 Mar 2019 10:21:13 +0100
Subject: [PATCH 2/2] Update menu.js

---
 packages/block-editor/src/components/inserter/menu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
index 9d92e40074c3f2..8033b613c69ac7 100644
--- a/packages/block-editor/src/components/inserter/menu.js
+++ b/packages/block-editor/src/components/inserter/menu.js
@@ -397,7 +397,7 @@ export default compose(
 			__experimentalFetchReusableBlocks: fetchReusableBlocks,
 		} = dispatch( 'core/editor' );
 
-		// To avoid duplication, getInsertionPoint is extracted and used in two event handlers
+		// To avoid duplication, getInsertionIndex is extracted and used in two event handlers
 		// This breaks the withDispatch not containing any logic rule.
 		// Since it's a function only called when the event handlers are called,
 		// it's fine to extract it.