Creator: Update with latest changes from GB 14.9

This removes the `AsyncModeProvider` wrapper on ListViewSidebar, which was causing a disconnect between the main editor and the list view controls. Fixes #546
WordPress · Jan 6, 2023 · d18e3e2 · d18e3e2
1 parent 2e8ba6e
commit d18e3e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/public_html/wp-content/plugins/pattern-creator/src/components/editor/index.js b/public_html/wp-content/plugins/pattern-creator/src/components/editor/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { AsyncModeProvider, useDispatch, useSelect } from '@wordpress/data';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { BlockBreadcrumb } from '@wordpress/block-editor';
 import { useCallback, useEffect, useState } from '@wordpress/element';
 import {
@@ -84,11 +84,7 @@ function Editor( { onError, postId } ) {
 			return <InserterSidebar />;
 		}
 		if ( isListViewOpen ) {
-			return (
-				<AsyncModeProvider value="true">
-					<ListViewSidebar />
-				</AsyncModeProvider>
-			);
+			return <ListViewSidebar />;
 		}
 		return null;
 	};

diff --git a/.../wp-content/plugins/pattern-creator/src/components/secondary-sidebar/list-view-sidebar.js b/.../wp-content/plugins/pattern-creator/src/components/secondary-sidebar/list-view-sidebar.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 /* eslint-disable-next-line @wordpress/no-unsafe-wp-apis -- Experimental is OK. */
-import { __experimentalListView as ListView, store as blockEditorStore } from '@wordpress/block-editor';
+import { __experimentalListView as ListView } from '@wordpress/block-editor';
 import { Button } from '@wordpress/components';
 import { useFocusOnMount, useFocusReturn, useInstanceId, useMergeRefs } from '@wordpress/compose';
 import { useDispatch } from '@wordpress/data';
@@ -15,17 +15,14 @@ import { ESCAPE } from '@wordpress/keycodes';
  */
 import { store as patternStore } from '../../store';
 
+// Forked from https://raw.githubusercontent.com/WordPress/gutenberg/1b9157577fce4133e9be89c1d89cdd02918f6ba3/packages/edit-site/src/components/secondary-sidebar/list-view-sidebar.js
+
 export default function ListViewSidebar() {
 	const { setIsListViewOpened } = useDispatch( patternStore );
 
-	const { clearSelectedBlock, selectBlock } = useDispatch( blockEditorStore );
-	async function selectEditorBlock( clientId ) {
-		await clearSelectedBlock();
-		selectBlock( clientId, -1 );
-	}
-
 	const focusOnMountRef = useFocusOnMount( 'firstElement' );
-	const focusReturnRef = useFocusReturn();
+	const headerFocusReturnRef = useFocusReturn();
+	const contentFocusReturnRef = useFocusReturn();
 	function closeOnEscape( event ) {
 		if ( event.keyCode === ESCAPE && ! event.defaultPrevented ) {
 			setIsListViewOpened( false );
@@ -38,23 +35,19 @@ export default function ListViewSidebar() {
 	return (
 		// eslint-disable-next-line jsx-a11y/no-static-element-interactions
 		<div aria-labelledby={ labelId } className="pattern__list-view-panel" onKeyDown={ closeOnEscape }>
-			<div className="pattern__list-view-panel-header">
-				<strong id={ labelId }>{ __( 'List view', 'wporg-patterns' ) }</strong>
+			<div className="pattern__list-view-panel-header" ref={ headerFocusReturnRef }>
+				<strong id={ labelId }>{ __( 'List View', 'wporg-patterns' ) }</strong>
 				<Button
 					icon={ closeSmall }
-					label={ __( 'Close list view sidebar', 'wporg-patterns' ) }
+					label={ __( 'Close List View Sidebar', 'wporg-patterns' ) }
 					onClick={ () => setIsListViewOpened( false ) }
 				/>
 			</div>
 			<div
 				className="pattern__list-view-panel-content"
-				ref={ useMergeRefs( [ focusReturnRef, focusOnMountRef ] ) }
+				ref={ useMergeRefs( [ contentFocusReturnRef, focusOnMountRef ] ) }
 			>
-				<ListView
-					onSelect={ selectEditorBlock }
-					showNestedBlocks
-					__experimentalPersistentListViewFeatures
-				/>
+				<ListView />
 			</div>
 		</div>
 	);