Skip to content

Navigation: Refactor display panel to use ToolsPanel #68011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 3, 2025
Merged

Navigation: Refactor display panel to use ToolsPanel #68011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45356c5
Navigation: Refactor display panel to use ToolsPanel
SainathPoojary Dec 16, 2024
a3f2d19
Merge branch 'trunk' into refactor-navigation-block-display-panel
SainathPoojary Dec 18, 2024
286c74f
Navigation: Add ToolsPanelItem in overlay-menu-preview
SainathPoojary Dec 18, 2024
f262242
Navigation: Improve Layout and Styling for Overlay Menu and Submenus
SainathPoojary Dec 20, 2024
785bb92
Navigation: Refactor overlay menu preview controls
SainathPoojary Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Navigation: Refactor overlay menu preview controls
  • Loading branch information
@SainathPoojary
SainathPoojary committed Jun 2, 2025
commit 785bb92cb5de37aa8e4f2163febc4570cff713f4
29 changes: 16 additions & 13 deletions packages/block-library/src/navigation/edit/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ import { useDispatch, useSelect } from '@wordpress/data';
import {
__experimentalToolsPanel as ToolsPanel,
__experimentalToolsPanelItem as ToolsPanelItem,
ToggleControl,
__experimentalToggleGroupControl as ToggleGroupControl,
__experimentalToggleGroupControlOption as ToggleGroupControlOption,
__experimentalVStack as VStack,
ToggleControl,
Button,
Spinner,
Notice,
Expand Down Expand Up @@ -632,17 +633,20 @@ function Navigation( {
) }
</Button>
{ overlayMenuPreview && (
<div
<VStack
id={ overlayMenuPreviewId }
className="wp-block-navigation__overlay-menu-preview-controls"
spacing={ 4 }
style={ {
gridColumn: 'span 2',
} }
>
<OverlayMenuPreview
setAttributes={ setAttributes }
hasIcon={ hasIcon }
icon={ icon }
hidden={ ! overlayMenuPreview }
/>
</div>
</VStack>
) }
</>
) }
Expand Down Expand Up @@ -744,15 +748,14 @@ function Navigation( {
</ToolsPanelItem>

{ submenuAccessibilityNotice && (
<div className="wp-block-navigation__submenu-accessibility-notice">
<Notice
spokenMessage={ null }
status="warning"
isDismissible={ false }
>
{ submenuAccessibilityNotice }
</Notice>
</div>
<Notice
spokenMessage={ null }
status="warning"
isDismissible={ false }
className="wp-block-navigation__submenu-accessibility-notice"
>
{ submenuAccessibilityNotice }
</Notice>
) }
</>
) }
Expand Down
8 changes: 0 additions & 8 deletions packages/block-library/src/navigation/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,14 +642,6 @@ body.editor-styles-wrapper .wp-block-navigation__responsive-container.is-menu-op
margin-bottom: 0;
}

.wp-block-navigation__overlay-menu-preview-controls {
grid-column: span 2;

.components-tools-panel-item:first-child {
margin-bottom: 16px;
}
}

.wp-block-navigation__submenu-accessibility-notice {
grid-column: span 2;
}
Loading