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

Nav Block: Show justification controls for vertical variant #30351

Merged
merged 6 commits into from
Apr 14, 2021
Merged

Nav Block: Show justification controls for vertical variant #30351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cff6793
Show justification controls for vertical variant
mkaz Mar 29, 2021
e842f83
Fix aligments.
jasmussen Mar 30, 2021
a3d2818
Add attribute so Nav Editor can hide justify
mkaz Apr 5, 2021
667ce84
Right align text.
jasmussen Apr 13, 2021
9ed9056
Use hasItemJustificationCOntrols prop instead of attribute
mkaz Apr 13, 2021
672f0af
Restore property.
jasmussen Apr 14, 2021
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
8 changes: 7 additions & 1 deletion packages/block-library/src/navigation/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function Navigation( {
updateInnerBlocks,
className,
hasSubmenuIndicatorSetting = true,
hasItemJustificationControls = attributes.orientation === 'horizontal',
hasItemJustificationControls = true,
} ) {
const [ isPlaceholderShown, setIsPlaceholderShown ] = useState(
! hasExistingNavItems
Expand Down Expand Up @@ -112,12 +112,18 @@ function Navigation( {
);
}

const justifyAllowedControls =
attributes.orientation === 'vertical'
? [ 'left', 'center', 'right' ]
: [ 'left', 'center', 'right', 'space-between' ];

return (
<>
<BlockControls>
{ hasItemJustificationControls && (
<JustifyToolbar
value={ attributes.itemsJustification }
allowedControls={ justifyAllowedControls }
onChange={ ( value ) =>
setAttributes( { itemsJustification: value } )
}
Expand Down
17 changes: 17 additions & 0 deletions packages/block-library/src/navigation/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
// Vertical layout
.is-vertical & {
display: block;
flex-direction: column;
align-items: flex-start;
}
}

Expand All @@ -41,3 +43,18 @@
.items-justified-space-between > ul {
justify-content: space-between;
}

// Vertical justification.
.is-vertical.items-justified-center > ul {
align-items: center;
}

.is-vertical.items-justified-right > ul {
align-items: flex-end;

.wp-block-navigation-link,
.wp-block-pages-list__item {
margin-right: 0;
justify-content: flex-end;
}
}