Add custom fixtures for optional control props in order to test the p…

…anel header icon toggle in isolation from the other tests.

packages/components/src/tools-panel/test/index.js

@@ -518,11 +518,22 @@ describe( 'ToolsPanel', () => {
 	} );
 
 	describe( 'panel header icon toggle', () => {
+		const optionalControls = {
+			attributes: { value: false },
+			hasValue: jest.fn().mockImplementation( () => {
+				return !! optionalControls.attributes.value;
+			} ),
+			label: 'Optional',
+			onDeselect: jest.fn(),
+			onSelect: jest.fn(),
+			isShownByDefault: false,
+		};
+
 		it( 'should render appropriate icons for the dropdown menu', async () => {
 			render(
 				<ToolsPanel { ...defaultProps }>
-					<ToolsPanelItem { ...controlProps }>
-						<div>Default control</div>
+					<ToolsPanelItem { ...optionalControls }>
+						<div>Optional control</div>
 					</ToolsPanelItem>
 				</ToolsPanel>
 			);
@@ -534,7 +545,7 @@ describe( 'ToolsPanel', () => {
 
 			expect( optionsHiddenIcon ).toBeInTheDocument();
 
-			await selectMenuItem( controlProps.label );
+			await selectMenuItem( optionalControls.label );
 
 			// There are now NO unactivated, optional menu items in the Tools Panel dropdown.
 			expect(

packages/components/src/tools-panel/tools-panel/hook.ts

@@ -130,27 +130,6 @@ export function useToolsPanel(
 		} );
 	};
 
-	// Track whether all optional controls are displayed or not.
-	// If no optional controls are present, then none are hidden and this will
-	// be `false`.
-	const [
-		areAllOptionalControlsHidden,
-		setAreAllOptionalControlsHidden,
-	] = useState( false );
-
-	// We need to track whether any optional menu items are active to later
-	// determine whether the panel is currently empty and any inner wrapper
-	// should be hidden.
-	useEffect( () => {
-		if ( menuItems.optional ) {
-			const optionalItems = Object.entries( menuItems.optional );
-			const allControlsHidden =
-				optionalItems.length > 0 &&
-				! optionalItems.some( ( [ , isSelected ] ) => isSelected );
-			setAreAllOptionalControlsHidden( allControlsHidden );
-		}
-	}, [ menuItems.optional ] );
-
 	const cx = useCx();
 	const classes = useMemo( () => {
 		const hasDefaultMenuItems =