Revert list-view changes

WordPress · Apr 9, 2024 · 9e5640a · 9e5640a
1 parent 5d0a81a
commit 9e5640a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 44 deletions.
diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js
@@ -63,7 +63,6 @@ function ListViewBlock( {
 	isExpanded,
 	selectedClientIds,
 	isSyncedBranch,
-	hideInnerBlocks,
 } ) {
 	const cellRef = useRef( null );
 	const rowRef = useRef( null );
@@ -317,9 +316,7 @@ function ListViewBlock( {
 			path={ path }
 			id={ `list-view-${ listViewInstanceId }-block-${ clientId }` }
 			data-block={ clientId }
-			data-expanded={
-				canEdit && ! hideInnerBlocks ? isExpanded : undefined
-			}
+			data-expanded={ canEdit ? isExpanded : undefined }
 			ref={ rowRef }
 		>
 			<TreeGridCell

diff --git a/packages/block-editor/src/components/list-view/branch.js b/packages/block-editor/src/components/list-view/branch.js
@@ -96,6 +96,7 @@ function ListViewBranch( props ) {
 		fixedListWindow,
 		isExpanded,
 		parentId,
+		shouldShowInnerBlocks = true,
 		isSyncedBranch = false,
 		showAppender: showAppenderProp = true,
 	} = props;
@@ -113,17 +114,6 @@ function ListViewBranch( props ) {
 		[ parentId ]
 	);
 
-	const { getHasOverlay, isZoomOutMode } = useSelect( ( select ) => {
-		return {
-			getHasOverlay:
-				select( blockEditorStore )
-					.__unstableHasActiveBlockOverlayActive,
-			isZoomOutMode:
-				select( blockEditorStore ).__unstableGetEditorMode() ===
-				'zoom-out',
-		};
-	}, [] );
-
 	const {
 		blockDropPosition,
 		blockDropTargetIndex,
@@ -184,9 +174,10 @@ function ListViewBranch( props ) {
 						: `${ position }`;
 				const hasNestedBlocks = !! innerBlocks?.length;
 
-				const shouldExpand = hasNestedBlocks
-					? expandedState[ clientId ] ?? isExpanded
-					: undefined;
+				const shouldExpand =
+					hasNestedBlocks && shouldShowInnerBlocks
+						? expandedState[ clientId ] ?? isExpanded
+						: undefined;
 
 				// Make updates to the selected or dragged blocks synchronous,
 				// but asynchronous for any other block.
@@ -197,9 +188,6 @@ function ListViewBranch( props ) {
 				const isSelectedBranch =
 					isBranchSelected || ( isSelected && hasNestedBlocks );
 
-				const hideInnerBlocks =
-					isZoomOutMode && getHasOverlay( clientId );
-
 				// To avoid performance issues, we only render blocks that are in view,
 				// or blocks that are selected or dragged. If a block is selected,
 				// it is only counted if it is the first of the block selection.
@@ -232,33 +220,29 @@ function ListViewBranch( props ) {
 								displacement={ displacement }
 								isAfterDraggedBlocks={ isAfterDraggedBlocks }
 								isNesting={ isNesting }
-								hideInnerBlocks={ hideInnerBlocks }
 							/>
 						) }
 						{ ! showBlock && (
 							<tr>
 								<td className="block-editor-list-view-placeholder" />
 							</tr>
 						) }
-						{ hasNestedBlocks &&
-							shouldExpand &&
-							! hideInnerBlocks &&
-							! isDragged && (
-								<ListViewBranch
-									parentId={ clientId }
-									blocks={ innerBlocks }
-									selectBlock={ selectBlock }
-									showBlockMovers={ showBlockMovers }
-									level={ level + 1 }
-									path={ updatedPath }
-									listPosition={ nextPosition + 1 }
-									fixedListWindow={ fixedListWindow }
-									isBranchSelected={ isSelectedBranch }
-									selectedClientIds={ selectedClientIds }
-									isExpanded={ isExpanded }
-									isSyncedBranch={ syncedBranch }
-								/>
-							) }
+						{ hasNestedBlocks && shouldExpand && ! isDragged && (
+							<ListViewBranch
+								parentId={ clientId }
+								blocks={ innerBlocks }
+								selectBlock={ selectBlock }
+								showBlockMovers={ showBlockMovers }
+								level={ level + 1 }
+								path={ updatedPath }
+								listPosition={ nextPosition + 1 }
+								fixedListWindow={ fixedListWindow }
+								isBranchSelected={ isSelectedBranch }
+								selectedClientIds={ selectedClientIds }
+								isExpanded={ isExpanded }
+								isSyncedBranch={ syncedBranch }
+							/>
+						) }
 					</AsyncModeProvider>
 				);
 			} ) }

diff --git a/packages/block-editor/src/components/list-view/index.js b/packages/block-editor/src/components/list-view/index.js
@@ -119,16 +119,20 @@ function ListViewComponent(
 	const blockIndexes = useListViewBlockIndexes( clientIdsTree );
 
 	const { getBlock } = useSelect( blockEditorStore );
-	const { visibleBlockCount } = useSelect(
+	const { visibleBlockCount, shouldShowInnerBlocks } = useSelect(
 		( select ) => {
-			const { getGlobalBlockCount, getClientIdsOfDescendants } =
-				select( blockEditorStore );
+			const {
+				getGlobalBlockCount,
+				getClientIdsOfDescendants,
+				__unstableGetEditorMode,
+			} = select( blockEditorStore );
 			const draggedBlockCount =
 				draggedClientIds?.length > 0
 					? getClientIdsOfDescendants( draggedClientIds ).length + 1
 					: 0;
 			return {
 				visibleBlockCount: getGlobalBlockCount() - draggedBlockCount,
+				shouldShowInnerBlocks: __unstableGetEditorMode() !== 'zoom-out',
 			};
 		},
 		[ draggedClientIds ]
@@ -393,6 +397,7 @@ function ListViewComponent(
 						fixedListWindow={ fixedListWindow }
 						selectedClientIds={ selectedClientIds }
 						isExpanded={ isExpanded }
+						shouldShowInnerBlocks={ shouldShowInnerBlocks }
 						showAppender={ showAppender }
 					/>
 				</ListViewContext.Provider>