From 488ecb968dd23706b3b238aa93a31e80ad9349a2 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Sun, 15 Sep 2019 12:32:19 -0400
Subject: [PATCH 1/2] Make BlockNavigationList component experimental

---
 packages/block-editor/README.md                             | 4 ----
 .../block-editor/src/components/block-navigation/index.js   | 6 +++---
 .../block-editor/src/components/block-navigation/list.js    | 4 ++--
 packages/block-editor/src/components/index.js               | 2 +-
 .../src/navigation-menu/use-block-navigator.js              | 4 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
index 3d3e53c2038411..d9c7818065c0b5 100644
--- a/packages/block-editor/README.md
+++ b/packages/block-editor/README.md
@@ -122,10 +122,6 @@ Undocumented declaration.
 
 Undocumented declaration.
 
-<a name="BlockNavigationList" href="#BlockNavigationList">#</a> **BlockNavigationList**
-
-Undocumented declaration.
-
 <a name="BlockPreview" href="#BlockPreview">#</a> **BlockPreview**
 
 BlockPreview renders a preview of a block or array of blocks.
diff --git a/packages/block-editor/src/components/block-navigation/index.js b/packages/block-editor/src/components/block-navigation/index.js
index f6b82955cb2673..16b36d356fdfbc 100644
--- a/packages/block-editor/src/components/block-navigation/index.js
+++ b/packages/block-editor/src/components/block-navigation/index.js
@@ -14,7 +14,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import BlockNavigationList from './list';
+import __experimentalBlockNavigationList from './list';
 
 function BlockNavigation( { rootBlock, rootBlocks, selectedBlockClientId, selectBlock } ) {
 	if ( ! rootBlocks || rootBlocks.length === 0 ) {
@@ -35,7 +35,7 @@ function BlockNavigation( { rootBlock, rootBlocks, selectedBlockClientId, select
 		>
 			<p className="editor-block-navigation__label block-editor-block-navigation__label">{ __( 'Block navigation' ) }</p>
 			{ hasHierarchy && (
-				<BlockNavigationList
+				<__experimentalBlockNavigationList
 					blocks={ [ rootBlock ] }
 					selectedBlockClientId={ selectedBlockClientId }
 					selectBlock={ selectBlock }
@@ -43,7 +43,7 @@ function BlockNavigation( { rootBlock, rootBlocks, selectedBlockClientId, select
 				/>
 			) }
 			{ ! hasHierarchy && (
-				<BlockNavigationList
+				<__experimentalBlockNavigationList
 					blocks={ rootBlocks }
 					selectedBlockClientId={ selectedBlockClientId }
 					selectBlock={ selectBlock }
diff --git a/packages/block-editor/src/components/block-navigation/list.js b/packages/block-editor/src/components/block-navigation/list.js
index 0a34d24ff4e4b6..6a53c17981afc9 100644
--- a/packages/block-editor/src/components/block-navigation/list.js
+++ b/packages/block-editor/src/components/block-navigation/list.js
@@ -16,7 +16,7 @@ import { __ } from '@wordpress/i18n';
  */
 import BlockIcon from '../block-icon';
 
-export default function BlockNavigationList( {
+export default function __experimentalBlockNavigationList( {
 	blocks,
 	selectedBlockClientId,
 	selectBlock,
@@ -48,7 +48,7 @@ export default function BlockNavigationList( {
 							</Button>
 						</div>
 						{ showNestedBlocks && !! block.innerBlocks && !! block.innerBlocks.length && (
-							<BlockNavigationList
+							<__experimentalBlockNavigationList
 								blocks={ block.innerBlocks }
 								selectedBlockClientId={ selectedBlockClientId }
 								selectBlock={ selectBlock }
diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
index 65b10d6bfd17c1..84184ac70bd5bc 100644
--- a/packages/block-editor/src/components/index.js
+++ b/packages/block-editor/src/components/index.js
@@ -12,7 +12,7 @@ export { default as BlockEdit } from './block-edit';
 export { default as BlockFormatControls } from './block-format-controls';
 export { default as BlockIcon } from './block-icon';
 export { default as BlockNavigationDropdown } from './block-navigation/dropdown';
-export { default as BlockNavigationList } from './block-navigation/list';
+export { default as __experimentalBlockNavigationList } from './block-navigation/list';
 export { default as BlockVerticalAlignmentToolbar } from './block-vertical-alignment-toolbar';
 export { default as ButtonBlockerAppender } from './button-block-appender';
 export { default as ColorPalette } from './color-palette';
diff --git a/packages/block-library/src/navigation-menu/use-block-navigator.js b/packages/block-library/src/navigation-menu/use-block-navigator.js
index b63fa7a4343a69..dd924d3eb5f8b3 100644
--- a/packages/block-library/src/navigation-menu/use-block-navigator.js
+++ b/packages/block-library/src/navigation-menu/use-block-navigator.js
@@ -9,7 +9,7 @@ import {
 	useDispatch,
 } from '@wordpress/data';
 import {
-	BlockNavigationList,
+	__experimentalBlockNavigationList,
 } from '@wordpress/block-editor';
 import {
 	IconButton,
@@ -64,7 +64,7 @@ export default function useBlockNavigator( clientId ) {
 				setIsNavigationListOpen( false );
 			} }
 		>
-			<BlockNavigationList
+			<__experimentalBlockNavigationList
 				blocks={ [ block ] }
 				selectedBlockClientId={ selectedBlockClientId }
 				selectBlock={ selectBlock }

From 3367dd6cccbbd7a524276d5c6d4544eba454eec6 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Sun, 15 Sep 2019 13:59:40 -0400
Subject: [PATCH 2/2] Change only the exported component name to be
 experimental

---
 .../block-editor/src/components/block-navigation/index.js   | 6 +++---
 .../block-editor/src/components/block-navigation/list.js    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/block-editor/src/components/block-navigation/index.js b/packages/block-editor/src/components/block-navigation/index.js
index 16b36d356fdfbc..f6b82955cb2673 100644
--- a/packages/block-editor/src/components/block-navigation/index.js
+++ b/packages/block-editor/src/components/block-navigation/index.js
@@ -14,7 +14,7 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import __experimentalBlockNavigationList from './list';
+import BlockNavigationList from './list';
 
 function BlockNavigation( { rootBlock, rootBlocks, selectedBlockClientId, selectBlock } ) {
 	if ( ! rootBlocks || rootBlocks.length === 0 ) {
@@ -35,7 +35,7 @@ function BlockNavigation( { rootBlock, rootBlocks, selectedBlockClientId, select
 		>
 			<p className="editor-block-navigation__label block-editor-block-navigation__label">{ __( 'Block navigation' ) }</p>
 			{ hasHierarchy && (
-				<__experimentalBlockNavigationList
+				<BlockNavigationList
 					blocks={ [ rootBlock ] }
 					selectedBlockClientId={ selectedBlockClientId }
 					selectBlock={ selectBlock }
@@ -43,7 +43,7 @@ function BlockNavigation( { rootBlock, rootBlocks, selectedBlockClientId, select
 				/>
 			) }
 			{ ! hasHierarchy && (
-				<__experimentalBlockNavigationList
+				<BlockNavigationList
 					blocks={ rootBlocks }
 					selectedBlockClientId={ selectedBlockClientId }
 					selectBlock={ selectBlock }
diff --git a/packages/block-editor/src/components/block-navigation/list.js b/packages/block-editor/src/components/block-navigation/list.js
index 6a53c17981afc9..0a34d24ff4e4b6 100644
--- a/packages/block-editor/src/components/block-navigation/list.js
+++ b/packages/block-editor/src/components/block-navigation/list.js
@@ -16,7 +16,7 @@ import { __ } from '@wordpress/i18n';
  */
 import BlockIcon from '../block-icon';
 
-export default function __experimentalBlockNavigationList( {
+export default function BlockNavigationList( {
 	blocks,
 	selectedBlockClientId,
 	selectBlock,
@@ -48,7 +48,7 @@ export default function __experimentalBlockNavigationList( {
 							</Button>
 						</div>
 						{ showNestedBlocks && !! block.innerBlocks && !! block.innerBlocks.length && (
-							<__experimentalBlockNavigationList
+							<BlockNavigationList
 								blocks={ block.innerBlocks }
 								selectedBlockClientId={ selectedBlockClientId }
 								selectBlock={ selectBlock }