Skip to content
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

Navigation Sidebar: Change the logic about which navigation gets selected for the sidebar #48689

Merged
merged 8 commits into from
Mar 3, 2023
Merged

Navigation Sidebar: Change the logic about which navigation gets selected for the sidebar #48689

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
42470f5
Navigation Sidebar: Change the logic about which navigation gets sele…
scruffian Mar 2, 2023
2aeb896
Move the navigation sidebar appender into the actions area of the sid…
youknowriad Mar 2, 2023
a770ac5
Further simplification
youknowriad Mar 2, 2023
a0bd98b
Fixed allowed blocks and update appender label
youknowriad Mar 2, 2023
745a0a9
Fix inserter issue
youknowriad Mar 3, 2023
58b9a45
Delay the rendering of the navigation menus
youknowriad Mar 3, 2023
f0acb27
Remove useless code
youknowriad Mar 3, 2023
c5eb33d
update comment
scruffian Mar 3, 2023
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
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/inserter/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const defaultRenderToggle = ( {
label = _x( 'Add block', 'Generic label for block inserter button' );
}

const { onClick, ...rest } = toggleProps;
const { as: Wrapper = Button, onClick, ...rest } = toggleProps;

// Handle both onClick functions from the toggle and the parent component.
function handleClick( event ) {
Expand All @@ -57,7 +57,7 @@ const defaultRenderToggle = ( {
}

return (
<Button
<Wrapper
icon={ plus }
label={ label }
tooltipPosition="bottom"
Expand Down
4 changes: 3 additions & 1 deletion packages/block-editor/src/components/off-canvas-editor/branch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ function ListViewBranch( props ) {
isExpanded,
parentId,
shouldShowInnerBlocks = true,
showAppender: showAppenderProp = true,
} = props;

const isContentLocked = useSelect(
Expand All @@ -117,7 +118,7 @@ function ListViewBranch( props ) {
}

// Only show the appender at the first level.
const showAppender = level === 1;
const showAppender = showAppenderProp && level === 1;

const filteredBlocks = blocks.filter( Boolean );
const blockCount = filteredBlocks.length;
Expand Down Expand Up @@ -205,6 +206,7 @@ function ListViewBranch( props ) {
isBranchSelected={ isSelectedBranch }
selectedClientIds={ selectedClientIds }
isExpanded={ isExpanded }
showAppender={ showAppenderProp }
/>
) }
</AsyncModeProvider>
Expand Down
3 changes: 3 additions & 0 deletions packages/block-editor/src/components/off-canvas-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export const BLOCK_LIST_ITEM_HEIGHT = 36;
* @param {Object} props.LeafMoreMenu Optional more menu substitution.
* @param {string} props.description Optional accessible description for the tree grid component.
* @param {string} props.onSelect Optional callback to be invoked when a block is selected.
* @param {string} props.showAppender Flag to show or hide the block appender.
* @param {Object} ref Forwarded ref
*/
function OffCanvasEditor(
Expand All @@ -70,6 +71,7 @@ function OffCanvasEditor(
blocks,
showBlockMovers = false,
isExpanded = false,
showAppender = true,
LeafMoreMenu,
description = __( 'Block navigation structure' ),
onSelect,
Expand Down Expand Up @@ -240,6 +242,7 @@ function OffCanvasEditor(
selectedClientIds={ selectedClientIds }
isExpanded={ isExpanded }
shouldShowInnerBlocks={ shouldShowInnerBlocks }
showAppender={ showAppender }
/>
<TreeGridRow
level={ 1 }
Expand Down
191 changes: 0 additions & 191 deletions packages/edit-site/src/components/navigation-inspector/index.js
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions packages/edit-site/src/components/navigation-inspector/style.scss
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion packages/edit-site/src/components/sidebar-button/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
&:hover,
&:focus-visible,
&:focus,
&:not([aria-disabled="true"]):active {
&:not([aria-disabled="true"]):active,
&[aria-expanded="true"] {
color: $white;
}
}
20 changes: 0 additions & 20 deletions packages/edit-site/src/components/sidebar-navigation-item/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,6 @@
}
}

.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .components-button {
color: $gray-600;
&:hover,
&:focus,
&[aria-current] {
color: $white;
}
}

.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .offcanvas-editor-list-view-leaf {
&:hover,
&:focus,
&[aria-current] {
background: $gray-800;
}
.block-editor-list-view-block__menu {
margin-left: -$grid-unit-10;
}
}

.edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {
cursor: grab;
width: calc(100% - #{ $border-width-focus });
Expand Down
Loading