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

Jump to bottom

Fix navigation block menu alignment #17630

Merged
merged 5 commits into from Oct 1, 2019
Merged

Fix navigation block menu alignment #17630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e167ae7
align items
draganescu Sep 27, 2019
38c4aa9
hiding all those appenders
draganescu Sep 27, 2019
56b751b
hiding the child items until selection but tricky to reselect them
draganescu Sep 27, 2019
fb1796a
we require more props down here
draganescu Sep 27, 2019
55cab82
reafactored to not expose a new public API
draganescu Sep 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 15 additions & 5 deletions packages/block-library/src/navigation-menu-item/edit.js
View file
Open in desktop
Expand Up @@ -6,6 +6,7 @@ import { invoke } from 'lodash';
/**
* WordPress dependencies
*/
import { withSelect } from '@wordpress/data';
import {
Dropdown,
ExternalLink,
Expand Down Expand Up @@ -37,6 +38,7 @@ function NavigationMenuItemEdit( {
attributes,
clientId,
isSelected,
isParentOfSelectedBlock,
setAttributes,
} ) {
const plainTextRef = useRef( null );
Expand Down Expand Up @@ -138,13 +140,21 @@ function NavigationMenuItemEdit( {
</InspectorControls>
<div className="wp-block-navigation-menu-item">
{ content }
<InnerBlocks
allowedBlocks={ [ 'core/navigation-menu-item' ] }
renderAppender={ InnerBlocks.ButtonBlockAppender }
/>
{ ( isSelected || isParentOfSelectedBlock ) &&
<InnerBlocks
allowedBlocks={ [ 'core/navigation-menu-item' ] }
/>
}
</div>
</Fragment>
);
}

export default NavigationMenuItemEdit;
export default withSelect( ( select, ownProps ) => {
const { hasSelectedInnerBlock } = select( 'core/block-editor' );
const { clientId } = ownProps;

return {
isParentOfSelectedBlock: hasSelectedInnerBlock( clientId, true ),
};
} )( NavigationMenuItemEdit );
6 changes: 2 additions & 4 deletions packages/block-library/src/navigation-menu-item/editor.scss
View file
Open in desktop
@@ -1,13 +1,11 @@
$menu-label-field-width: 140px;

.wp-block-navigation-menu-item__edit-container {
display: grid;
grid-auto-columns: min-content;
grid-auto-flow: column;
align-items: center;
white-space: nowrap;
}

$menu-label-field-width: 140px;
.wp-block-navigation-menu-item__edit-container {
border: 1px solid $light-gray-500;
// two pixes comes from two times one pixel border
width: $menu-label-field-width + $icon-button-size + 2px;
Expand Down
1 change: 0 additions & 1 deletion packages/block-library/src/navigation-menu/edit.js
View file
Open in desktop
Expand Up @@ -53,7 +53,6 @@ function NavigationMenu( {
<div className="wp-block-navigation-menu">
<InnerBlocks
allowedBlocks={ [ 'core/navigation-menu-item' ] }
renderAppender={ InnerBlocks.ButtonBlockAppender }
/>
</div>
</Fragment>
Expand Down
11 changes: 8 additions & 3 deletions packages/block-library/src/navigation-menu/editor.scss
View file
Open in desktop
@@ -1,13 +1,18 @@
.wp-block-navigation-menu .block-editor-block-list__layout,
.wp-block-navigation-menu {
display: grid;
display: flex;
grid-auto-columns: min-content;
grid-auto-flow: column;
align-items: center;
align-items: top;
white-space: nowrap;
}

.wp-block-navigation-menu__inserter-content {
width: 350px;
padding: $grid-size-large;
}

.wp-block-navigation-menu-item {
.wp-block-navigation-menu-item {
margin-left: $grid-size-large;
}
}