From 42f6a2c99b10f67107ddeab03ee8392036e2cca2 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 9 Nov 2022 11:25:55 -0700
Subject: [PATCH 01/25] Rebased: Initial work on nav edit button

It was easier to nuke the commit history than to manually sync a bunch of commits,
so this is all the commits in the branch squashed
---
 packages/block-editor/package.json            |  2 ++
 .../navigation-item-editor/index.js           | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index e90f7aaf4619f..e029304922902 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -39,6 +39,7 @@
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/components": "file:../components",
 		"@wordpress/compose": "file:../compose",
+		"@wordpress/core-data": "file:../core-data",
 		"@wordpress/data": "file:../data",
 		"@wordpress/date": "file:../date",
 		"@wordpress/deprecated": "file:../deprecated",
@@ -48,6 +49,7 @@
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
+		"@wordpress/interface": "file:../interface",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
 		"@wordpress/keycodes": "file:../keycodes",
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js b/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js
new file mode 100644
index 0000000000000..bb289e7b31983
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+import { FlexBlock, Flex } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { navigation } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import DefaultSidebar from '../default-sidebar';
+
+export default function NavigationItemSidebar() {
+	return (
+		<DefaultSidebar
+			className="edit-site-navigation-item-sidebar"
+			identifier="edit-site/navigation-item"
+			title={ __( 'Navigation Item' ) }
+			icon={ navigation }
+			closeLabel={ __( 'Close navigation menu sidebar' ) }
+			panelClassName="edit-site-navigation-menu-sidebar__panel"
+			header={
+				<Flex>
+					<FlexBlock>
+						<strong>{ __( 'Navigation Menus' ) }</strong>
+						<span className="edit-site-navigation-sidebar__beta">
+							{ __( 'Beta' ) }
+						</span>
+					</FlexBlock>
+				</Flex>
+			}
+		>
+			<p>Hello, world</p>
+		</DefaultSidebar>
+	);
+}

From 0a29db5e1eba1c6b18910c2a52d3952adc7a1f9f Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 9 Nov 2022 14:21:55 -0700
Subject: [PATCH 02/25] Lint

---
 package-lock.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index adb96b28da921..0841e48e22103 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17493,6 +17493,7 @@
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/compose": "file:packages/compose",
+				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",
@@ -17502,6 +17503,7 @@
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/icons": "file:packages/icons",
+				"@wordpress/interface": "file:packages/interface",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
 				"@wordpress/keycodes": "file:packages/keycodes",

From 6f9434d823140899b74527de821d1116e9f7b840 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Thu, 10 Nov 2022 09:31:32 -0700
Subject: [PATCH 03/25] Remove extra dependency

---
 packages/block-editor/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index e029304922902..b34862516cb9d 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -49,7 +49,6 @@
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
-		"@wordpress/interface": "file:../interface",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
 		"@wordpress/keycodes": "file:../keycodes",

From 430fe3e265284838caea7df1a98a08c14f183289 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Thu, 10 Nov 2022 10:26:17 -0700
Subject: [PATCH 04/25] Hide edit button from non-automenus

---
 .../off-canvas-editor/block-edit-button.js    | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 15ae423ad5ddb..4ed5bed44bbd5 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -11,13 +11,39 @@ import { useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '../../store';
 
 const BlockEditButton = ( { label, clientId } ) => {
-	const { selectBlock } = useDispatch( blockEditorStore );
+	const { toggleBlockHighlight } = useDispatch( blockEditorStore );
+	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
+	const { totalPages } = usePageData();
+	const MAX_PAGE_COUNT = 100;
+
+	const block = useSelect(
+		( select ) => {
+			return select( blockEditorStore ).getBlock( clientId );
+		},
+		[ clientId ]
+	);
 
 	const onClick = () => {
-		selectBlock( clientId );
+		toggleBlockHighlight( clientId, true );
+		setConvertModalOpen( ! convertModalOpen );
 	};
 
-	return <Button icon={ edit } label={ label } onClick={ onClick } />;
+	const allowConvertToLinks =
+		'core/page-list' === block.name && totalPages <= MAX_PAGE_COUNT;
+
+	return (
+		<>
+			{ convertModalOpen && (
+				<ConvertToLinksModal
+					onClose={ () => setConvertModalOpen( false ) }
+					clientId={ clientId }
+				/>
+			) }
+			{ allowConvertToLinks && (
+				<Button icon={ edit } label={ label } onClick={ onClick } />
+			) }
+		</>
+	);
 };
 
 export default BlockEditButton;

From d3db5d3a5dd82a196b6873838bb2b70e3cd46b16 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Thu, 10 Nov 2022 10:54:24 -0700
Subject: [PATCH 05/25] Lint

---
 package-lock.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 0841e48e22103..7b188da5250a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17503,7 +17503,6 @@
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/icons": "file:packages/icons",
-				"@wordpress/interface": "file:packages/interface",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
 				"@wordpress/keycodes": "file:packages/keycodes",

From 2560b0de3d6dcd94492a0004fb7fd2a7f03c1ca7 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 14:07:14 +0000
Subject: [PATCH 06/25] Ongoing work to decouple core-data

---
 .../off-canvas-editor/block-edit-button.js    | 194 +++++++++++++++++-
 .../src/components/block-editor/index.js      |  25 ++-
 2 files changed, 214 insertions(+), 5 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 4ed5bed44bbd5..5b3956c8d7ac6 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -2,19 +2,204 @@
  * WordPress dependencies
  */
 import { edit } from '@wordpress/icons';
-import { Button } from '@wordpress/components';
-import { useDispatch } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { useRef, useMemo, useState, useEffect } from '@wordpress/element';
+import { Button, Modal } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { createBlock as create } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
+/**
+ * External dependencies
+ */
+// import InspectorControls from '../../components/inspector-controls';
+
+// copied from packages/block-library/src/page-list/edit.js
+
+// We only show the edit option when page count is <= MAX_PAGE_COUNT
+// Performance of Navigation Links is not good past this value.
+const MAX_PAGE_COUNT = 100;
+
+const usePageData = () => {
+	const isMounted = useRef();
+	const [ pages, setPages ] = useState();
+
+	useEffect( () => {
+		isMounted.current = true;
+
+		return () => ( isMounted.current = false );
+	}, [] );
+
+	// 1. Grab editor settings
+	// 2. Call the selector when we need it
+	const { fetchPages } = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+
+		return {
+			fetchPages: getSettings().__experimentalFetchPageEntities,
+		};
+	}, [] ); // empty array is required to avoid invalidating fetchPages
+
+	useEffect( () => {
+		( async () => {
+			// If `__experimentalFetchPageEntities` is not defined in block editor settings,
+			// do not attempt to fetch Pages.
+			if ( ! fetchPages || ! isMounted.current ) {
+				return;
+			}
+
+			debugger;
+
+			const pagesResult = await fetchPages();
+			setPages( pagesResult );
+			// Todo: handle errors with catch
+		} )();
+	}, [ fetchPages ] );
+
+	return useMemo( () => {
+		// TODO: Once the REST API supports passing multiple values to
+		// 'orderby', this can be removed.
+		// https://core.trac.wordpress.org/ticket/39037
+		const sortedPages = [ ...( pages ?? [] ) ].sort( ( a, b ) => {
+			if ( a.menu_order === b.menu_order ) {
+				return a.title.rendered.localeCompare( b.title.rendered );
+			}
+			return a.menu_order - b.menu_order;
+		} );
+		const pagesByParentId = sortedPages.reduce( ( accumulator, page ) => {
+			const { parent } = page;
+			if ( accumulator.has( parent ) ) {
+				accumulator.get( parent ).push( page );
+			} else {
+				accumulator.set( parent, [ page ] );
+			}
+			return accumulator;
+		}, new Map() );
+
+		return {
+			pages, // necessary for access outside the hook
+			pagesByParentId,
+			totalPages: pages?.length ?? null,
+		};
+	}, [ pages ] );
+};
+
+// copied from convert-to-links-modal.js
+/**
+ * WordPress dependencies
+ */
+const PAGE_FIELDS = [ 'id', 'title', 'link', 'type', 'parent' ];
+
+const convertSelectedBlockToNavigationLinks =
+	( { pages, clientId, replaceBlock, createBlock } ) =>
+	() => {
+		if ( ! pages ) {
+			return;
+		}
+
+		const linkMap = {};
+		const navigationLinks = [];
+		pages.forEach( ( { id, title, link: url, type, parent } ) => {
+			// See if a placeholder exists. This is created if children appear before parents in list.
+			const innerBlocks = linkMap[ id ]?.innerBlocks ?? [];
+			linkMap[ id ] = createBlock(
+				'core/navigation-link',
+				{
+					id,
+					label: title.rendered,
+					url,
+					type,
+					kind: 'post-type',
+				},
+				innerBlocks
+			);
+
+			if ( ! parent ) {
+				navigationLinks.push( linkMap[ id ] );
+			} else {
+				if ( ! linkMap[ parent ] ) {
+					// Use a placeholder if the child appears before parent in list.
+					linkMap[ parent ] = { innerBlocks: [] };
+				}
+				const parentLinkInnerBlocks = linkMap[ parent ].innerBlocks;
+				parentLinkInnerBlocks.push( linkMap[ id ] );
+			}
+		} );
+
+		// Transform all links with innerBlocks into Submenus. This can't be done
+		// sooner because page objects have no information on their children.
+
+		const transformSubmenus = ( listOfLinks ) => {
+			listOfLinks.forEach( ( block, index, listOfLinksArray ) => {
+				const { attributes, innerBlocks } = block;
+				if ( innerBlocks.length !== 0 ) {
+					transformSubmenus( innerBlocks );
+					const transformedBlock = createBlock(
+						'core/navigation-submenu',
+						attributes,
+						innerBlocks
+					);
+					listOfLinksArray[ index ] = transformedBlock;
+				}
+			} );
+		};
+
+		transformSubmenus( navigationLinks );
+
+		replaceBlock( clientId, navigationLinks );
+	};
+
+const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
+	const hasPages = !! pages?.length;
+
+	const { replaceBlock } = useDispatch( blockEditorStore );
+
+	return (
+		<Modal
+			closeLabel={ __( 'Close' ) }
+			onRequestClose={ onClose }
+			title={ __( 'Convert to links' ) }
+			className={ 'wp-block-page-list-modal' }
+			aria={ { describedby: 'wp-block-page-list-modal__description' } }
+		>
+			<p id={ 'wp-block-page-list-modal__description' }>
+				{ __(
+					'To edit this navigation menu, convert it to single page links. This allows you to add, re-order, remove items, or edit their labels.'
+				) }
+			</p>
+			<p>
+				{ __(
+					"Note: if you add new pages to your site, you'll need to add them to your navigation menu."
+				) }
+			</p>
+			<div className="wp-block-page-list-modal-buttons">
+				<Button variant="tertiary" onClick={ onClose }>
+					{ __( 'Cancel' ) }
+				</Button>
+				<Button
+					variant="primary"
+					disabled={ ! hasPages }
+					onClick={ convertSelectedBlockToNavigationLinks( {
+						pages,
+						replaceBlock,
+						clientId,
+						createBlock: create,
+					} ) }
+				>
+					{ __( 'Convert' ) }
+				</Button>
+			</div>
+		</Modal>
+	);
+};
 
 const BlockEditButton = ( { label, clientId } ) => {
 	const { toggleBlockHighlight } = useDispatch( blockEditorStore );
 	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
-	const { totalPages } = usePageData();
-	const MAX_PAGE_COUNT = 100;
+	const { pages, totalPages } = usePageData();
 
 	const block = useSelect(
 		( select ) => {
@@ -37,6 +222,7 @@ const BlockEditButton = ( { label, clientId } ) => {
 				<ConvertToLinksModal
 					onClose={ () => setConvertModalOpen( false ) }
 					clientId={ clientId }
+					pages={ pages }
 				/>
 			) }
 			{ allowConvertToLinks && (
diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
index 0f42214b45442..4e5c9d094bd57 100644
--- a/packages/edit-site/src/components/block-editor/index.js
+++ b/packages/edit-site/src/components/block-editor/index.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, resolveSelect } from '@wordpress/data';
 import { useCallback, useMemo, useRef, Fragment } from '@wordpress/element';
 import { useEntityBlockEditor, store as coreStore } from '@wordpress/core-data';
 import {
@@ -122,6 +122,28 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 		[ settingsBlockPatternCategories, restBlockPatternCategories ]
 	);
 
+	const fetchPagesEntities = async ( options = {} ) =>
+		resolveSelect( coreStore ).getEntityRecords(
+			'postType',
+			'page',
+			options
+		);
+	// const { fetchPagesEntities } = useSelect( ( select ) => {
+	// 	const { getEntityRecords } = select( coreStore );
+
+	// 	return {
+	// 		fetchPagesEntities: ( options = {} ) => {
+	// 			return getEntityRecords( 'postType', 'page', {
+	// 				orderby: 'menu_order',
+	// 				order: 'asc',
+	// 				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
+	// 				per_page: -1,
+	// 				context: 'view',
+	// 			} );
+	// 		},
+	// 	};
+	// } );
+
 	const settings = useMemo( () => {
 		const {
 			__experimentalAdditionalBlockPatterns,
@@ -133,6 +155,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 			...restStoredSettings,
 			__experimentalBlockPatterns: blockPatterns,
 			__experimentalBlockPatternCategories: blockPatternCategories,
+			__experimentalFetchPageEntities: fetchPagesEntities,
 		};
 	}, [ storedSettings, blockPatterns, blockPatternCategories ] );
 

From 29331c449ff4cfc837760777c18be0ff92f2b255 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 15:35:22 +0000
Subject: [PATCH 07/25] Fetch pages via block editor settings

---
 .../off-canvas-editor/block-edit-button.js    | 42 +++++--------------
 .../src/components/block-editor/index.js      | 30 ++++---------
 2 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 5b3956c8d7ac6..4d44bc658c74d 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -3,7 +3,7 @@
  */
 import { edit } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
-import { useRef, useMemo, useState, useEffect } from '@wordpress/element';
+import { useMemo, useState } from '@wordpress/element';
 import { Button, Modal } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { createBlock as create } from '@wordpress/blocks';
@@ -24,40 +24,21 @@ import { store as blockEditorStore } from '../../store';
 const MAX_PAGE_COUNT = 100;
 
 const usePageData = () => {
-	const isMounted = useRef();
-	const [ pages, setPages ] = useState();
-
-	useEffect( () => {
-		isMounted.current = true;
-
-		return () => ( isMounted.current = false );
-	}, [] );
-
 	// 1. Grab editor settings
 	// 2. Call the selector when we need it
-	const { fetchPages } = useSelect( ( select ) => {
+	const { pages } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
 
 		return {
-			fetchPages: getSettings().__experimentalFetchPageEntities,
+			pages: getSettings().__experimentalFetchPageEntities( {
+				orderby: 'menu_order',
+				order: 'asc',
+				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
+				per_page: -1,
+				context: 'view',
+			} ),
 		};
-	}, [] ); // empty array is required to avoid invalidating fetchPages
-
-	useEffect( () => {
-		( async () => {
-			// If `__experimentalFetchPageEntities` is not defined in block editor settings,
-			// do not attempt to fetch Pages.
-			if ( ! fetchPages || ! isMounted.current ) {
-				return;
-			}
-
-			debugger;
-
-			const pagesResult = await fetchPages();
-			setPages( pagesResult );
-			// Todo: handle errors with catch
-		} )();
-	}, [ fetchPages ] );
+	}, [] );
 
 	return useMemo( () => {
 		// TODO: Once the REST API supports passing multiple values to
@@ -91,12 +72,11 @@ const usePageData = () => {
 /**
  * WordPress dependencies
  */
-const PAGE_FIELDS = [ 'id', 'title', 'link', 'type', 'parent' ];
 
 const convertSelectedBlockToNavigationLinks =
 	( { pages, clientId, replaceBlock, createBlock } ) =>
 	() => {
-		if ( ! pages ) {
+		if ( ! pages?.length ) {
 			return;
 		}
 
diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
index 4e5c9d094bd57..62e79ac14cefa 100644
--- a/packages/edit-site/src/components/block-editor/index.js
+++ b/packages/edit-site/src/components/block-editor/index.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch, resolveSelect } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { useCallback, useMemo, useRef, Fragment } from '@wordpress/element';
 import { useEntityBlockEditor, store as coreStore } from '@wordpress/core-data';
 import {
@@ -122,27 +122,15 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 		[ settingsBlockPatternCategories, restBlockPatternCategories ]
 	);
 
-	const fetchPagesEntities = async ( options = {} ) =>
-		resolveSelect( coreStore ).getEntityRecords(
-			'postType',
-			'page',
-			options
-		);
-	// const { fetchPagesEntities } = useSelect( ( select ) => {
-	// 	const { getEntityRecords } = select( coreStore );
+	const { fetchPagesEntities } = useSelect( ( select ) => {
+		const { getEntityRecords } = select( coreStore );
 
-	// 	return {
-	// 		fetchPagesEntities: ( options = {} ) => {
-	// 			return getEntityRecords( 'postType', 'page', {
-	// 				orderby: 'menu_order',
-	// 				order: 'asc',
-	// 				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
-	// 				per_page: -1,
-	// 				context: 'view',
-	// 			} );
-	// 		},
-	// 	};
-	// } );
+		return {
+			fetchPagesEntities: ( options = {} ) => {
+				return getEntityRecords( 'postType', 'page', options );
+			},
+		};
+	}, [] );
 
 	const settings = useMemo( () => {
 		const {

From 865b4faf7c9fe562b90b6ae50ac4f28fdbb9d979 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 15:40:41 +0000
Subject: [PATCH 08/25] Revert additional of core-data dependency

---
 package-lock.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 7b188da5250a6..adb96b28da921 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17493,7 +17493,6 @@
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/compose": "file:packages/compose",
-				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",

From 076e9e7976b90b310868a39cf2adfb98c1fd0cc2 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 15:41:31 +0000
Subject: [PATCH 09/25] Revert core data dep in block editor package

---
 packages/block-editor/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index b34862516cb9d..e90f7aaf4619f 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -39,7 +39,6 @@
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/components": "file:../components",
 		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
 		"@wordpress/data": "file:../data",
 		"@wordpress/date": "file:../date",
 		"@wordpress/deprecated": "file:../deprecated",

From 47d738117c4cb26479f56d1cc88f9e2113ff7afe Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Tue, 22 Nov 2022 11:21:11 -0500
Subject: [PATCH 10/25] Update Convert Modal

---
 .../off-canvas-editor/block-edit-button.js      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 4d44bc658c74d..5e34c0a83c773 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -15,8 +15,6 @@ import { store as blockEditorStore } from '../../store';
 /**
  * External dependencies
  */
-// import InspectorControls from '../../components/inspector-controls';
-
 // copied from packages/block-library/src/page-list/edit.js
 
 // We only show the edit option when page count is <= MAX_PAGE_COUNT
@@ -69,10 +67,6 @@ const usePageData = () => {
 };
 
 // copied from convert-to-links-modal.js
-/**
- * WordPress dependencies
- */
-
 const convertSelectedBlockToNavigationLinks =
 	( { pages, clientId, replaceBlock, createBlock } ) =>
 	() => {
@@ -141,18 +135,13 @@ const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 		<Modal
 			closeLabel={ __( 'Close' ) }
 			onRequestClose={ onClose }
-			title={ __( 'Convert to links' ) }
+			title={ __( 'Customize this menu' ) }
 			className={ 'wp-block-page-list-modal' }
 			aria={ { describedby: 'wp-block-page-list-modal__description' } }
 		>
 			<p id={ 'wp-block-page-list-modal__description' }>
 				{ __(
-					'To edit this navigation menu, convert it to single page links. This allows you to add, re-order, remove items, or edit their labels.'
-				) }
-			</p>
-			<p>
-				{ __(
-					"Note: if you add new pages to your site, you'll need to add them to your navigation menu."
+					'This menu is automatically kept in sync with pages on your site. You can manage the menu yourself by clicking customize below.'
 				) }
 			</p>
 			<div className="wp-block-page-list-modal-buttons">
@@ -169,7 +158,7 @@ const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 						createBlock: create,
 					} ) }
 				>
-					{ __( 'Convert' ) }
+					{ __( 'Customize' ) }
 				</Button>
 			</div>
 		</Modal>

From 23f61bed2039043396752f61839d19750357237f Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 9 Nov 2022 11:25:55 -0700
Subject: [PATCH 11/25] Rebased: Initial work on nav edit button

It was easier to nuke the commit history than to manually sync a bunch of commits,
so this is all the commits in the branch squashed
---
 packages/block-editor/package.json            |  2 ++
 .../navigation-item-editor/index.js           | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index e90f7aaf4619f..e029304922902 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -39,6 +39,7 @@
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/components": "file:../components",
 		"@wordpress/compose": "file:../compose",
+		"@wordpress/core-data": "file:../core-data",
 		"@wordpress/data": "file:../data",
 		"@wordpress/date": "file:../date",
 		"@wordpress/deprecated": "file:../deprecated",
@@ -48,6 +49,7 @@
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
+		"@wordpress/interface": "file:../interface",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
 		"@wordpress/keycodes": "file:../keycodes",
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js b/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js
new file mode 100644
index 0000000000000..bb289e7b31983
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+import { FlexBlock, Flex } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { navigation } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import DefaultSidebar from '../default-sidebar';
+
+export default function NavigationItemSidebar() {
+	return (
+		<DefaultSidebar
+			className="edit-site-navigation-item-sidebar"
+			identifier="edit-site/navigation-item"
+			title={ __( 'Navigation Item' ) }
+			icon={ navigation }
+			closeLabel={ __( 'Close navigation menu sidebar' ) }
+			panelClassName="edit-site-navigation-menu-sidebar__panel"
+			header={
+				<Flex>
+					<FlexBlock>
+						<strong>{ __( 'Navigation Menus' ) }</strong>
+						<span className="edit-site-navigation-sidebar__beta">
+							{ __( 'Beta' ) }
+						</span>
+					</FlexBlock>
+				</Flex>
+			}
+		>
+			<p>Hello, world</p>
+		</DefaultSidebar>
+	);
+}

From 3061b4377c86cdd7e23907134428fb230dfe05d0 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 9 Nov 2022 14:21:55 -0700
Subject: [PATCH 12/25] Lint

---
 package-lock.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index adb96b28da921..0841e48e22103 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17493,6 +17493,7 @@
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/compose": "file:packages/compose",
+				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",
@@ -17502,6 +17503,7 @@
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/icons": "file:packages/icons",
+				"@wordpress/interface": "file:packages/interface",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
 				"@wordpress/keycodes": "file:packages/keycodes",

From a8e93cc0b794c82fbabf784026f59ea720dd847a Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Thu, 10 Nov 2022 09:31:32 -0700
Subject: [PATCH 13/25] Remove extra dependency

---
 packages/block-editor/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index e029304922902..b34862516cb9d 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -49,7 +49,6 @@
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
-		"@wordpress/interface": "file:../interface",
 		"@wordpress/is-shallow-equal": "file:../is-shallow-equal",
 		"@wordpress/keyboard-shortcuts": "file:../keyboard-shortcuts",
 		"@wordpress/keycodes": "file:../keycodes",

From 6aebd4c13fcc7539e9023200230b463aac1ae3be Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Thu, 10 Nov 2022 10:26:17 -0700
Subject: [PATCH 14/25] Hide edit button from non-automenus

---
 .../off-canvas-editor/block-edit-button.js    | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 15ae423ad5ddb..4ed5bed44bbd5 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -11,13 +11,39 @@ import { useDispatch } from '@wordpress/data';
 import { store as blockEditorStore } from '../../store';
 
 const BlockEditButton = ( { label, clientId } ) => {
-	const { selectBlock } = useDispatch( blockEditorStore );
+	const { toggleBlockHighlight } = useDispatch( blockEditorStore );
+	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
+	const { totalPages } = usePageData();
+	const MAX_PAGE_COUNT = 100;
+
+	const block = useSelect(
+		( select ) => {
+			return select( blockEditorStore ).getBlock( clientId );
+		},
+		[ clientId ]
+	);
 
 	const onClick = () => {
-		selectBlock( clientId );
+		toggleBlockHighlight( clientId, true );
+		setConvertModalOpen( ! convertModalOpen );
 	};
 
-	return <Button icon={ edit } label={ label } onClick={ onClick } />;
+	const allowConvertToLinks =
+		'core/page-list' === block.name && totalPages <= MAX_PAGE_COUNT;
+
+	return (
+		<>
+			{ convertModalOpen && (
+				<ConvertToLinksModal
+					onClose={ () => setConvertModalOpen( false ) }
+					clientId={ clientId }
+				/>
+			) }
+			{ allowConvertToLinks && (
+				<Button icon={ edit } label={ label } onClick={ onClick } />
+			) }
+		</>
+	);
 };
 
 export default BlockEditButton;

From d9ff62e499528860e93e280ba0c96197a2f93af3 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Thu, 10 Nov 2022 10:54:24 -0700
Subject: [PATCH 15/25] Lint

---
 package-lock.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 0841e48e22103..7b188da5250a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17503,7 +17503,6 @@
 				"@wordpress/html-entities": "file:packages/html-entities",
 				"@wordpress/i18n": "file:packages/i18n",
 				"@wordpress/icons": "file:packages/icons",
-				"@wordpress/interface": "file:packages/interface",
 				"@wordpress/is-shallow-equal": "file:packages/is-shallow-equal",
 				"@wordpress/keyboard-shortcuts": "file:packages/keyboard-shortcuts",
 				"@wordpress/keycodes": "file:packages/keycodes",

From 77f16431096bd4ab25f56255e4d96dfb2214e6b8 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 14:07:14 +0000
Subject: [PATCH 16/25] Ongoing work to decouple core-data

---
 .../off-canvas-editor/block-edit-button.js    | 194 +++++++++++++++++-
 .../src/components/block-editor/index.js      |  25 ++-
 2 files changed, 214 insertions(+), 5 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 4ed5bed44bbd5..5b3956c8d7ac6 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -2,19 +2,204 @@
  * WordPress dependencies
  */
 import { edit } from '@wordpress/icons';
-import { Button } from '@wordpress/components';
-import { useDispatch } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { useRef, useMemo, useState, useEffect } from '@wordpress/element';
+import { Button, Modal } from '@wordpress/components';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { createBlock as create } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
+/**
+ * External dependencies
+ */
+// import InspectorControls from '../../components/inspector-controls';
+
+// copied from packages/block-library/src/page-list/edit.js
+
+// We only show the edit option when page count is <= MAX_PAGE_COUNT
+// Performance of Navigation Links is not good past this value.
+const MAX_PAGE_COUNT = 100;
+
+const usePageData = () => {
+	const isMounted = useRef();
+	const [ pages, setPages ] = useState();
+
+	useEffect( () => {
+		isMounted.current = true;
+
+		return () => ( isMounted.current = false );
+	}, [] );
+
+	// 1. Grab editor settings
+	// 2. Call the selector when we need it
+	const { fetchPages } = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+
+		return {
+			fetchPages: getSettings().__experimentalFetchPageEntities,
+		};
+	}, [] ); // empty array is required to avoid invalidating fetchPages
+
+	useEffect( () => {
+		( async () => {
+			// If `__experimentalFetchPageEntities` is not defined in block editor settings,
+			// do not attempt to fetch Pages.
+			if ( ! fetchPages || ! isMounted.current ) {
+				return;
+			}
+
+			debugger;
+
+			const pagesResult = await fetchPages();
+			setPages( pagesResult );
+			// Todo: handle errors with catch
+		} )();
+	}, [ fetchPages ] );
+
+	return useMemo( () => {
+		// TODO: Once the REST API supports passing multiple values to
+		// 'orderby', this can be removed.
+		// https://core.trac.wordpress.org/ticket/39037
+		const sortedPages = [ ...( pages ?? [] ) ].sort( ( a, b ) => {
+			if ( a.menu_order === b.menu_order ) {
+				return a.title.rendered.localeCompare( b.title.rendered );
+			}
+			return a.menu_order - b.menu_order;
+		} );
+		const pagesByParentId = sortedPages.reduce( ( accumulator, page ) => {
+			const { parent } = page;
+			if ( accumulator.has( parent ) ) {
+				accumulator.get( parent ).push( page );
+			} else {
+				accumulator.set( parent, [ page ] );
+			}
+			return accumulator;
+		}, new Map() );
+
+		return {
+			pages, // necessary for access outside the hook
+			pagesByParentId,
+			totalPages: pages?.length ?? null,
+		};
+	}, [ pages ] );
+};
+
+// copied from convert-to-links-modal.js
+/**
+ * WordPress dependencies
+ */
+const PAGE_FIELDS = [ 'id', 'title', 'link', 'type', 'parent' ];
+
+const convertSelectedBlockToNavigationLinks =
+	( { pages, clientId, replaceBlock, createBlock } ) =>
+	() => {
+		if ( ! pages ) {
+			return;
+		}
+
+		const linkMap = {};
+		const navigationLinks = [];
+		pages.forEach( ( { id, title, link: url, type, parent } ) => {
+			// See if a placeholder exists. This is created if children appear before parents in list.
+			const innerBlocks = linkMap[ id ]?.innerBlocks ?? [];
+			linkMap[ id ] = createBlock(
+				'core/navigation-link',
+				{
+					id,
+					label: title.rendered,
+					url,
+					type,
+					kind: 'post-type',
+				},
+				innerBlocks
+			);
+
+			if ( ! parent ) {
+				navigationLinks.push( linkMap[ id ] );
+			} else {
+				if ( ! linkMap[ parent ] ) {
+					// Use a placeholder if the child appears before parent in list.
+					linkMap[ parent ] = { innerBlocks: [] };
+				}
+				const parentLinkInnerBlocks = linkMap[ parent ].innerBlocks;
+				parentLinkInnerBlocks.push( linkMap[ id ] );
+			}
+		} );
+
+		// Transform all links with innerBlocks into Submenus. This can't be done
+		// sooner because page objects have no information on their children.
+
+		const transformSubmenus = ( listOfLinks ) => {
+			listOfLinks.forEach( ( block, index, listOfLinksArray ) => {
+				const { attributes, innerBlocks } = block;
+				if ( innerBlocks.length !== 0 ) {
+					transformSubmenus( innerBlocks );
+					const transformedBlock = createBlock(
+						'core/navigation-submenu',
+						attributes,
+						innerBlocks
+					);
+					listOfLinksArray[ index ] = transformedBlock;
+				}
+			} );
+		};
+
+		transformSubmenus( navigationLinks );
+
+		replaceBlock( clientId, navigationLinks );
+	};
+
+const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
+	const hasPages = !! pages?.length;
+
+	const { replaceBlock } = useDispatch( blockEditorStore );
+
+	return (
+		<Modal
+			closeLabel={ __( 'Close' ) }
+			onRequestClose={ onClose }
+			title={ __( 'Convert to links' ) }
+			className={ 'wp-block-page-list-modal' }
+			aria={ { describedby: 'wp-block-page-list-modal__description' } }
+		>
+			<p id={ 'wp-block-page-list-modal__description' }>
+				{ __(
+					'To edit this navigation menu, convert it to single page links. This allows you to add, re-order, remove items, or edit their labels.'
+				) }
+			</p>
+			<p>
+				{ __(
+					"Note: if you add new pages to your site, you'll need to add them to your navigation menu."
+				) }
+			</p>
+			<div className="wp-block-page-list-modal-buttons">
+				<Button variant="tertiary" onClick={ onClose }>
+					{ __( 'Cancel' ) }
+				</Button>
+				<Button
+					variant="primary"
+					disabled={ ! hasPages }
+					onClick={ convertSelectedBlockToNavigationLinks( {
+						pages,
+						replaceBlock,
+						clientId,
+						createBlock: create,
+					} ) }
+				>
+					{ __( 'Convert' ) }
+				</Button>
+			</div>
+		</Modal>
+	);
+};
 
 const BlockEditButton = ( { label, clientId } ) => {
 	const { toggleBlockHighlight } = useDispatch( blockEditorStore );
 	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
-	const { totalPages } = usePageData();
-	const MAX_PAGE_COUNT = 100;
+	const { pages, totalPages } = usePageData();
 
 	const block = useSelect(
 		( select ) => {
@@ -37,6 +222,7 @@ const BlockEditButton = ( { label, clientId } ) => {
 				<ConvertToLinksModal
 					onClose={ () => setConvertModalOpen( false ) }
 					clientId={ clientId }
+					pages={ pages }
 				/>
 			) }
 			{ allowConvertToLinks && (
diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
index 0f42214b45442..4e5c9d094bd57 100644
--- a/packages/edit-site/src/components/block-editor/index.js
+++ b/packages/edit-site/src/components/block-editor/index.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useSelect, useDispatch, resolveSelect } from '@wordpress/data';
 import { useCallback, useMemo, useRef, Fragment } from '@wordpress/element';
 import { useEntityBlockEditor, store as coreStore } from '@wordpress/core-data';
 import {
@@ -122,6 +122,28 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 		[ settingsBlockPatternCategories, restBlockPatternCategories ]
 	);
 
+	const fetchPagesEntities = async ( options = {} ) =>
+		resolveSelect( coreStore ).getEntityRecords(
+			'postType',
+			'page',
+			options
+		);
+	// const { fetchPagesEntities } = useSelect( ( select ) => {
+	// 	const { getEntityRecords } = select( coreStore );
+
+	// 	return {
+	// 		fetchPagesEntities: ( options = {} ) => {
+	// 			return getEntityRecords( 'postType', 'page', {
+	// 				orderby: 'menu_order',
+	// 				order: 'asc',
+	// 				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
+	// 				per_page: -1,
+	// 				context: 'view',
+	// 			} );
+	// 		},
+	// 	};
+	// } );
+
 	const settings = useMemo( () => {
 		const {
 			__experimentalAdditionalBlockPatterns,
@@ -133,6 +155,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 			...restStoredSettings,
 			__experimentalBlockPatterns: blockPatterns,
 			__experimentalBlockPatternCategories: blockPatternCategories,
+			__experimentalFetchPageEntities: fetchPagesEntities,
 		};
 	}, [ storedSettings, blockPatterns, blockPatternCategories ] );
 

From 1c60ea0b81ae211ad173ed2659d134e32d0d58af Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 15:35:22 +0000
Subject: [PATCH 17/25] Fetch pages via block editor settings

---
 .../off-canvas-editor/block-edit-button.js    | 42 +++++--------------
 .../src/components/block-editor/index.js      | 30 ++++---------
 2 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 5b3956c8d7ac6..4d44bc658c74d 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -3,7 +3,7 @@
  */
 import { edit } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
-import { useRef, useMemo, useState, useEffect } from '@wordpress/element';
+import { useMemo, useState } from '@wordpress/element';
 import { Button, Modal } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { createBlock as create } from '@wordpress/blocks';
@@ -24,40 +24,21 @@ import { store as blockEditorStore } from '../../store';
 const MAX_PAGE_COUNT = 100;
 
 const usePageData = () => {
-	const isMounted = useRef();
-	const [ pages, setPages ] = useState();
-
-	useEffect( () => {
-		isMounted.current = true;
-
-		return () => ( isMounted.current = false );
-	}, [] );
-
 	// 1. Grab editor settings
 	// 2. Call the selector when we need it
-	const { fetchPages } = useSelect( ( select ) => {
+	const { pages } = useSelect( ( select ) => {
 		const { getSettings } = select( blockEditorStore );
 
 		return {
-			fetchPages: getSettings().__experimentalFetchPageEntities,
+			pages: getSettings().__experimentalFetchPageEntities( {
+				orderby: 'menu_order',
+				order: 'asc',
+				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
+				per_page: -1,
+				context: 'view',
+			} ),
 		};
-	}, [] ); // empty array is required to avoid invalidating fetchPages
-
-	useEffect( () => {
-		( async () => {
-			// If `__experimentalFetchPageEntities` is not defined in block editor settings,
-			// do not attempt to fetch Pages.
-			if ( ! fetchPages || ! isMounted.current ) {
-				return;
-			}
-
-			debugger;
-
-			const pagesResult = await fetchPages();
-			setPages( pagesResult );
-			// Todo: handle errors with catch
-		} )();
-	}, [ fetchPages ] );
+	}, [] );
 
 	return useMemo( () => {
 		// TODO: Once the REST API supports passing multiple values to
@@ -91,12 +72,11 @@ const usePageData = () => {
 /**
  * WordPress dependencies
  */
-const PAGE_FIELDS = [ 'id', 'title', 'link', 'type', 'parent' ];
 
 const convertSelectedBlockToNavigationLinks =
 	( { pages, clientId, replaceBlock, createBlock } ) =>
 	() => {
-		if ( ! pages ) {
+		if ( ! pages?.length ) {
 			return;
 		}
 
diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
index 4e5c9d094bd57..62e79ac14cefa 100644
--- a/packages/edit-site/src/components/block-editor/index.js
+++ b/packages/edit-site/src/components/block-editor/index.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useSelect, useDispatch, resolveSelect } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { useCallback, useMemo, useRef, Fragment } from '@wordpress/element';
 import { useEntityBlockEditor, store as coreStore } from '@wordpress/core-data';
 import {
@@ -122,27 +122,15 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 		[ settingsBlockPatternCategories, restBlockPatternCategories ]
 	);
 
-	const fetchPagesEntities = async ( options = {} ) =>
-		resolveSelect( coreStore ).getEntityRecords(
-			'postType',
-			'page',
-			options
-		);
-	// const { fetchPagesEntities } = useSelect( ( select ) => {
-	// 	const { getEntityRecords } = select( coreStore );
+	const { fetchPagesEntities } = useSelect( ( select ) => {
+		const { getEntityRecords } = select( coreStore );
 
-	// 	return {
-	// 		fetchPagesEntities: ( options = {} ) => {
-	// 			return getEntityRecords( 'postType', 'page', {
-	// 				orderby: 'menu_order',
-	// 				order: 'asc',
-	// 				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
-	// 				per_page: -1,
-	// 				context: 'view',
-	// 			} );
-	// 		},
-	// 	};
-	// } );
+		return {
+			fetchPagesEntities: ( options = {} ) => {
+				return getEntityRecords( 'postType', 'page', options );
+			},
+		};
+	}, [] );
 
 	const settings = useMemo( () => {
 		const {

From 0136c51c6b89ddbb8d9a9f52551ad33901b7cccf Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 15:40:41 +0000
Subject: [PATCH 18/25] Revert additional of core-data dependency

---
 package-lock.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 7b188da5250a6..adb96b28da921 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17493,7 +17493,6 @@
 				"@wordpress/blocks": "file:packages/blocks",
 				"@wordpress/components": "file:packages/components",
 				"@wordpress/compose": "file:packages/compose",
-				"@wordpress/core-data": "file:packages/core-data",
 				"@wordpress/data": "file:packages/data",
 				"@wordpress/date": "file:packages/date",
 				"@wordpress/deprecated": "file:packages/deprecated",

From c8efdb339a3a83977ff8872cc2cf84f031e3ed09 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 16 Nov 2022 15:41:31 +0000
Subject: [PATCH 19/25] Revert core data dep in block editor package

---
 packages/block-editor/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index b34862516cb9d..e90f7aaf4619f 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -39,7 +39,6 @@
 		"@wordpress/blocks": "file:../blocks",
 		"@wordpress/components": "file:../components",
 		"@wordpress/compose": "file:../compose",
-		"@wordpress/core-data": "file:../core-data",
 		"@wordpress/data": "file:../data",
 		"@wordpress/date": "file:../date",
 		"@wordpress/deprecated": "file:../deprecated",

From 5bd0cfc45a7837d85712b43dfb82f3fe615fc7f9 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Tue, 22 Nov 2022 11:21:11 -0500
Subject: [PATCH 20/25] Update Convert Modal

---
 .../off-canvas-editor/block-edit-button.js      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 4d44bc658c74d..5e34c0a83c773 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -15,8 +15,6 @@ import { store as blockEditorStore } from '../../store';
 /**
  * External dependencies
  */
-// import InspectorControls from '../../components/inspector-controls';
-
 // copied from packages/block-library/src/page-list/edit.js
 
 // We only show the edit option when page count is <= MAX_PAGE_COUNT
@@ -69,10 +67,6 @@ const usePageData = () => {
 };
 
 // copied from convert-to-links-modal.js
-/**
- * WordPress dependencies
- */
-
 const convertSelectedBlockToNavigationLinks =
 	( { pages, clientId, replaceBlock, createBlock } ) =>
 	() => {
@@ -141,18 +135,13 @@ const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 		<Modal
 			closeLabel={ __( 'Close' ) }
 			onRequestClose={ onClose }
-			title={ __( 'Convert to links' ) }
+			title={ __( 'Customize this menu' ) }
 			className={ 'wp-block-page-list-modal' }
 			aria={ { describedby: 'wp-block-page-list-modal__description' } }
 		>
 			<p id={ 'wp-block-page-list-modal__description' }>
 				{ __(
-					'To edit this navigation menu, convert it to single page links. This allows you to add, re-order, remove items, or edit their labels.'
-				) }
-			</p>
-			<p>
-				{ __(
-					"Note: if you add new pages to your site, you'll need to add them to your navigation menu."
+					'This menu is automatically kept in sync with pages on your site. You can manage the menu yourself by clicking customize below.'
 				) }
 			</p>
 			<div className="wp-block-page-list-modal-buttons">
@@ -169,7 +158,7 @@ const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 						createBlock: create,
 					} ) }
 				>
-					{ __( 'Convert' ) }
+					{ __( 'Customize' ) }
 				</Button>
 			</div>
 		</Modal>

From 411a9619efa9759facd631ab86b8fd3a0c8d081b Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 23 Nov 2022 14:01:46 -0500
Subject: [PATCH 21/25] Partial fix for post-convert edit button

---
 .../off-canvas-editor/block-edit-button.js           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index 5e34c0a83c773..d4d4e1dfbb5f0 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -177,14 +177,14 @@ const BlockEditButton = ( { label, clientId } ) => {
 		[ clientId ]
 	);
 
+	const allowConvertToLinks =
+		'core/page-list' === block.name && totalPages <= MAX_PAGE_COUNT;
+
 	const onClick = () => {
 		toggleBlockHighlight( clientId, true );
-		setConvertModalOpen( ! convertModalOpen );
+		if ( allowConvertToLinks ) setConvertModalOpen( ! convertModalOpen );
 	};
 
-	const allowConvertToLinks =
-		'core/page-list' === block.name && totalPages <= MAX_PAGE_COUNT;
-
 	return (
 		<>
 			{ convertModalOpen && (
@@ -194,9 +194,7 @@ const BlockEditButton = ( { label, clientId } ) => {
 					pages={ pages }
 				/>
 			) }
-			{ allowConvertToLinks && (
-				<Button icon={ edit } label={ label } onClick={ onClick } />
-			) }
+			<Button icon={ edit } label={ label } onClick={ onClick } />
 		</>
 	);
 };

From a7410e0168204eef93a94d2ed17f14d19fba16cf Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Tue, 29 Nov 2022 15:26:06 -0500
Subject: [PATCH 22/25] Cleanup

---
 .../src/components/block-editor/index.js      |  7 +++-
 .../navigation-item-editor/index.js           | 36 -------------------
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js

diff --git a/packages/edit-site/src/components/block-editor/index.js b/packages/edit-site/src/components/block-editor/index.js
index 62e79ac14cefa..5991fef17ad18 100644
--- a/packages/edit-site/src/components/block-editor/index.js
+++ b/packages/edit-site/src/components/block-editor/index.js
@@ -145,7 +145,12 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 			__experimentalBlockPatternCategories: blockPatternCategories,
 			__experimentalFetchPageEntities: fetchPagesEntities,
 		};
-	}, [ storedSettings, blockPatterns, blockPatternCategories ] );
+	}, [
+		storedSettings,
+		blockPatterns,
+		blockPatternCategories,
+		fetchPagesEntities,
+	] );
 
 	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
 		'postType',
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js b/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js
deleted file mode 100644
index bb289e7b31983..0000000000000
--- a/packages/edit-site/src/components/sidebar-edit-mode/navigation-item-editor/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { FlexBlock, Flex } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { navigation } from '@wordpress/icons';
-
-/**
- * Internal dependencies
- */
-import DefaultSidebar from '../default-sidebar';
-
-export default function NavigationItemSidebar() {
-	return (
-		<DefaultSidebar
-			className="edit-site-navigation-item-sidebar"
-			identifier="edit-site/navigation-item"
-			title={ __( 'Navigation Item' ) }
-			icon={ navigation }
-			closeLabel={ __( 'Close navigation menu sidebar' ) }
-			panelClassName="edit-site-navigation-menu-sidebar__panel"
-			header={
-				<Flex>
-					<FlexBlock>
-						<strong>{ __( 'Navigation Menus' ) }</strong>
-						<span className="edit-site-navigation-sidebar__beta">
-							{ __( 'Beta' ) }
-						</span>
-					</FlexBlock>
-				</Flex>
-			}
-		>
-			<p>Hello, world</p>
-		</DefaultSidebar>
-	);
-}

From d970deb0b5691015082227e1bd40c510244f43ad Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Tue, 29 Nov 2022 15:35:19 -0500
Subject: [PATCH 23/25] Fix block selection

---
 .../off-canvas-editor/block-edit-button.js          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
index d4d4e1dfbb5f0..dc5c1af6810da 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
@@ -12,9 +12,7 @@ import { createBlock as create } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-/**
- * External dependencies
- */
+
 // copied from packages/block-library/src/page-list/edit.js
 
 // We only show the edit option when page count is <= MAX_PAGE_COUNT
@@ -166,7 +164,7 @@ const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 };
 
 const BlockEditButton = ( { label, clientId } ) => {
-	const { toggleBlockHighlight } = useDispatch( blockEditorStore );
+	const { selectBlock } = useDispatch( blockEditorStore );
 	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
 	const { pages, totalPages } = usePageData();
 
@@ -181,8 +179,11 @@ const BlockEditButton = ( { label, clientId } ) => {
 		'core/page-list' === block.name && totalPages <= MAX_PAGE_COUNT;
 
 	const onClick = () => {
-		toggleBlockHighlight( clientId, true );
-		if ( allowConvertToLinks ) setConvertModalOpen( ! convertModalOpen );
+		if ( allowConvertToLinks ) {
+			setConvertModalOpen( ! convertModalOpen );
+		} else {
+			selectBlock( clientId );
+		}
 	};
 
 	return (

From ba002685d5ec9a54e64fe5820e53fc85930f1e74 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 7 Dec 2022 15:07:35 -0500
Subject: [PATCH 24/25] Refactor

---
 .../src/components/off-canvas-editor/block.js |  43 +++++--
 ...it-button.js => convert-to-links-modal.js} | 105 +-----------------
 .../off-canvas-editor/use-page-data.js        |  57 ++++++++++
 3 files changed, 96 insertions(+), 109 deletions(-)
 rename packages/block-editor/src/components/off-canvas-editor/{block-edit-button.js => convert-to-links-modal.js} (51%)
 create mode 100644 packages/block-editor/src/components/off-canvas-editor/use-page-data.js

diff --git a/packages/block-editor/src/components/off-canvas-editor/block.js b/packages/block-editor/src/components/off-canvas-editor/block.js
index c88f5ed0f7bbf..df9534a7c3b76 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block.js
+++ b/packages/block-editor/src/components/off-canvas-editor/block.js
@@ -11,9 +11,10 @@ import {
 	__experimentalTreeGridCell as TreeGridCell,
 	__experimentalTreeGridItem as TreeGridItem,
 	MenuItem,
+	Button,
 } from '@wordpress/components';
 import { useInstanceId } from '@wordpress/compose';
-import { moreVertical } from '@wordpress/icons';
+import { moreVertical, edit } from '@wordpress/icons';
 import {
 	useState,
 	useRef,
@@ -34,12 +35,14 @@ import {
 } from '../block-mover/button';
 import ListViewBlockContents from './block-contents';
 import BlockSettingsDropdown from '../block-settings-menu/block-settings-dropdown';
-import BlockEditButton from './block-edit-button';
+// import BlockEditButton from './block-edit-button';
 import { useListViewContext } from './context';
 import { getBlockPositionDescription } from './utils';
 import { store as blockEditorStore } from '../../store';
 import useBlockDisplayInformation from '../use-block-display-information';
 import { useBlockLock } from '../block-lock';
+import usePageData from './use-page-data';
+import { ConvertToLinksModal } from './convert-to-links-modal';
 
 function ListViewBlock( {
 	block,
@@ -60,7 +63,8 @@ function ListViewBlock( {
 } ) {
 	const cellRef = useRef( null );
 	const [ isHovered, setIsHovered ] = useState( false );
-	const { clientId, attributes } = block;
+	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
+	const { clientId, attributes, name } = block;
 
 	const { isLocked, isContentLocked } = useBlockLock( clientId );
 	const forceSelectionContentLock = useSelect(
@@ -210,6 +214,22 @@ function ListViewBlock( {
 		[ clientId, expand, collapse, isExpanded ]
 	);
 
+	// We only show the edit option when page count is <= MAX_PAGE_COUNT
+	// Performance of Navigation Links is not good past this value.
+	const MAX_PAGE_COUNT = 100;
+	const { pages, totalPages } = usePageData();
+
+	const allowConvertToLinks =
+		'core/page-list' === name && totalPages <= MAX_PAGE_COUNT;
+
+	const blockEditOnClick = () => {
+		if ( allowConvertToLinks ) {
+			setConvertModalOpen( ! convertModalOpen );
+		} else {
+			selectBlock( clientId );
+		}
+	};
+
 	let colSpan;
 	if ( hasRenderedMovers ) {
 		colSpan = 2;
@@ -331,12 +351,14 @@ function ListViewBlock( {
 							!! isSelected || forceSelectionContentLock
 						}
 					>
-						{ ( props ) =>
+						{ ( { ref, tabIndex } ) =>
 							isEditable && (
-								<BlockEditButton
-									{ ...props }
+								<Button
+									icon={ edit }
 									label={ editAriaLabel }
-									clientId={ clientId }
+									ref={ ref }
+									tabIndex={ tabIndex }
+									onClick={ blockEditOnClick }
 								/>
 							)
 						}
@@ -393,6 +415,13 @@ function ListViewBlock( {
 					</TreeGridCell>
 				</>
 			) }
+			{ convertModalOpen && (
+				<ConvertToLinksModal
+					onClose={ () => setConvertModalOpen( false ) }
+					clientId={ clientId }
+					pages={ pages }
+				/>
+			) }
 		</ListViewLeaf>
 	);
 }
diff --git a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js b/packages/block-editor/src/components/off-canvas-editor/convert-to-links-modal.js
similarity index 51%
rename from packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
rename to packages/block-editor/src/components/off-canvas-editor/convert-to-links-modal.js
index 1e5ab79d3bcaf..82c2cfac64cbd 100644
--- a/packages/block-editor/src/components/off-canvas-editor/block-edit-button.js
+++ b/packages/block-editor/src/components/off-canvas-editor/convert-to-links-modal.js
@@ -1,11 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { edit } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
-import { forwardRef, useMemo, useState } from '@wordpress/element';
 import { Button, Modal } from '@wordpress/components';
-import { useSelect, useDispatch } from '@wordpress/data';
+import { useDispatch } from '@wordpress/data';
 import { createBlock as create } from '@wordpress/blocks';
 
 /**
@@ -13,58 +11,7 @@ import { createBlock as create } from '@wordpress/blocks';
  */
 import { store as blockEditorStore } from '../../store';
 
-// copied from packages/block-library/src/page-list/edit.js
-
-// We only show the edit option when page count is <= MAX_PAGE_COUNT
-// Performance of Navigation Links is not good past this value.
-const MAX_PAGE_COUNT = 100;
-
-const usePageData = () => {
-	// 1. Grab editor settings
-	// 2. Call the selector when we need it
-	const { pages } = useSelect( ( select ) => {
-		const { getSettings } = select( blockEditorStore );
-
-		return {
-			pages: getSettings().__experimentalFetchPageEntities( {
-				orderby: 'menu_order',
-				order: 'asc',
-				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
-				per_page: -1,
-				context: 'view',
-			} ),
-		};
-	}, [] );
-
-	return useMemo( () => {
-		// TODO: Once the REST API supports passing multiple values to
-		// 'orderby', this can be removed.
-		// https://core.trac.wordpress.org/ticket/39037
-		const sortedPages = [ ...( pages ?? [] ) ].sort( ( a, b ) => {
-			if ( a.menu_order === b.menu_order ) {
-				return a.title.rendered.localeCompare( b.title.rendered );
-			}
-			return a.menu_order - b.menu_order;
-		} );
-		const pagesByParentId = sortedPages.reduce( ( accumulator, page ) => {
-			const { parent } = page;
-			if ( accumulator.has( parent ) ) {
-				accumulator.get( parent ).push( page );
-			} else {
-				accumulator.set( parent, [ page ] );
-			}
-			return accumulator;
-		}, new Map() );
-
-		return {
-			pages, // necessary for access outside the hook
-			pagesByParentId,
-			totalPages: pages?.length ?? null,
-		};
-	}, [ pages ] );
-};
-
-// copied from convert-to-links-modal.js
+// copied from packages/block-library/src/page-list/convert-to-links-modal.js
 const convertSelectedBlockToNavigationLinks =
 	( { pages, clientId, replaceBlock, createBlock } ) =>
 	() => {
@@ -103,7 +50,6 @@ const convertSelectedBlockToNavigationLinks =
 
 		// Transform all links with innerBlocks into Submenus. This can't be done
 		// sooner because page objects have no information on their children.
-
 		const transformSubmenus = ( listOfLinks ) => {
 			listOfLinks.forEach( ( block, index, listOfLinksArray ) => {
 				const { attributes, innerBlocks } = block;
@@ -124,7 +70,7 @@ const convertSelectedBlockToNavigationLinks =
 		replaceBlock( clientId, navigationLinks );
 	};
 
-const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
+export const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 	const hasPages = !! pages?.length;
 
 	const { replaceBlock } = useDispatch( blockEditorStore );
@@ -162,48 +108,3 @@ const ConvertToLinksModal = ( { onClose, clientId, pages } ) => {
 		</Modal>
 	);
 };
-
-export default forwardRef( function BlockEditButton(
-	{ clientId, ...props },
-	ref
-) {
-	const { selectBlock } = useDispatch( blockEditorStore );
-	const [ convertModalOpen, setConvertModalOpen ] = useState( false );
-	const { pages, totalPages } = usePageData();
-
-	const block = useSelect(
-		( select ) => {
-			return select( blockEditorStore ).getBlock( clientId );
-		},
-		[ clientId ]
-	);
-
-	const allowConvertToLinks =
-		'core/page-list' === block.name && totalPages <= MAX_PAGE_COUNT;
-
-	const onClick = () => {
-		if ( allowConvertToLinks ) {
-			setConvertModalOpen( ! convertModalOpen );
-		} else {
-			selectBlock( clientId );
-		}
-	};
-
-	return (
-		<>
-			{ convertModalOpen && (
-				<ConvertToLinksModal
-					onClose={ () => setConvertModalOpen( false ) }
-					clientId={ clientId }
-					pages={ pages }
-				/>
-			) }
-			<Button
-				{ ...props }
-				ref={ ref }
-				icon={ edit }
-				onClick={ onClick }
-			/>
-		</>
-	);
-} );
diff --git a/packages/block-editor/src/components/off-canvas-editor/use-page-data.js b/packages/block-editor/src/components/off-canvas-editor/use-page-data.js
new file mode 100644
index 0000000000000..df868cd6d212d
--- /dev/null
+++ b/packages/block-editor/src/components/off-canvas-editor/use-page-data.js
@@ -0,0 +1,57 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+
+// copied from packages/block-library/src/page-list/edit.js
+
+export default () => {
+	// 1. Grab editor settings
+	// 2. Call the selector when we need it
+	const { pages } = useSelect( ( select ) => {
+		const { getSettings } = select( blockEditorStore );
+
+		return {
+			pages: getSettings().__experimentalFetchPageEntities( {
+				orderby: 'menu_order',
+				order: 'asc',
+				_fields: [ 'id', 'link', 'parent', 'title', 'menu_order' ],
+				per_page: -1,
+				context: 'view',
+			} ),
+		};
+	}, [] );
+
+	return useMemo( () => {
+		// TODO: Once the REST API supports passing multiple values to
+		// 'orderby', this can be removed.
+		// https://core.trac.wordpress.org/ticket/39037
+		const sortedPages = [ ...( pages ?? [] ) ].sort( ( a, b ) => {
+			if ( a.menu_order === b.menu_order ) {
+				return a.title.rendered.localeCompare( b.title.rendered );
+			}
+			return a.menu_order - b.menu_order;
+		} );
+		const pagesByParentId = sortedPages.reduce( ( accumulator, page ) => {
+			const { parent } = page;
+			if ( accumulator.has( parent ) ) {
+				accumulator.get( parent ).push( page );
+			} else {
+				accumulator.set( parent, [ page ] );
+			}
+			return accumulator;
+		}, new Map() );
+
+		return {
+			pages, // necessary for access outside the hook
+			pagesByParentId,
+			totalPages: pages?.length ?? null,
+		};
+	}, [ pages ] );
+};

From 997186fcc82a618ff3b01e06a88d844fc6d10961 Mon Sep 17 00:00:00 2001
From: George Hotelling <george.hotelling@automattic.com>
Date: Wed, 7 Dec 2022 15:21:49 -0500
Subject: [PATCH 25/25] Fix Convert Modal in Post Editor

---
 .../provider/use-block-editor-settings.js           | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index 3f4ed5a15fe37..b77bf34c3e119 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -113,6 +113,16 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 
 	const { saveEntityRecord } = useDispatch( coreStore );
 
+	const { fetchPagesEntities } = useSelect( ( select ) => {
+		const { getEntityRecords } = select( coreStore );
+
+		return {
+			fetchPagesEntities: ( options = {} ) => {
+				return getEntityRecords( 'postType', 'page', options );
+			},
+		};
+	}, [] );
+
 	/**
 	 * Creates a Post entity.
 	 * This is utilised by the Link UI to allow for on-the-fly creation of Posts/Pages.
@@ -176,6 +186,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 						'supportsLayout',
 						'widgetTypesToHideFromLegacyWidgetBlock',
 						'__unstableResolvedAssets',
+						'__experimentalFetchPageEntities',
 					].includes( key )
 				)
 			),
@@ -196,6 +207,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			__experimentalUserCanCreatePages: userCanCreatePages,
 			pageOnFront,
 			__experimentalPreferPatternsOnRoot: hasTemplate,
+			__experimentalFetchPageEntities: fetchPagesEntities,
 		} ),
 		[
 			settings,
@@ -208,6 +220,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			hasTemplate,
 			userCanCreatePages,
 			pageOnFront,
+			fetchPagesEntities,
 		]
 	);
 }