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

Try cascading nav styles through classnames #37473

Merged
merged 6 commits into from
Dec 20, 2021
Merged

Try cascading nav styles through classnames #37473

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
fef362b
Move layout custom properties to filter.
tellthemachines Dec 16, 2021
28d0f40
Try cascading nav styles through classnames
tellthemachines Dec 17, 2021
ce17d66
Improve formatting.
tellthemachines Dec 17, 2021
0e203d3
Remove hook
tellthemachines Dec 17, 2021
e235309
Fix PHP lint errors.
tellthemachines Dec 17, 2021
87f4d1a
More specific variable names
tellthemachines Dec 20, 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
19 changes: 0 additions & 19 deletions lib/block-supports/layout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,37 +96,18 @@ function gutenberg_get_layout_style( $selector, $layout, $has_block_gap_support
$style .= "flex-wrap: $flex_wrap;";
if ( 'horizontal' === $layout_orientation ) {
$style .= 'align-items: center;';
if ( ! empty( $layout['setCascadingProperties'] ) && $layout['setCascadingProperties'] ) {
$style .= '--layout-direction: row;';
}
/**
* Add this style only if is not empty for backwards compatibility,
* since we intend to convert blocks that had flex layout implemented
* by custom css.
*/
if ( ! empty( $layout['justifyContent'] ) && array_key_exists( $layout['justifyContent'], $justify_content_options ) ) {
$style .= "justify-content: {$justify_content_options[ $layout['justifyContent'] ]};";
if ( ! empty( $layout['setCascadingProperties'] ) && $layout['setCascadingProperties'] ) {
// --layout-justification-setting allows children to inherit the value regardless or row or column direction.
$style .= "--layout-justification-setting: {$justify_content_options[ $layout['justifyContent'] ]};";
$style .= "--layout-wrap: $flex_wrap;";
$style .= "--layout-justify: {$justify_content_options[ $layout['justifyContent'] ]};";
$style .= '--layout-align: center;';
}
}
} else {
$style .= 'flex-direction: column;';
if ( ! empty( $layout['setCascadingProperties'] ) && $layout['setCascadingProperties'] ) {
$style .= '--layout-direction: column;';
}
if ( ! empty( $layout['justifyContent'] ) && array_key_exists( $layout['justifyContent'], $justify_content_options ) ) {
$style .= "align-items: {$justify_content_options[ $layout['justifyContent'] ]};";
if ( ! empty( $layout['setCascadingProperties'] ) && $layout['setCascadingProperties'] ) {
// --layout-justification-setting allows children to inherit the value regardless or row or column direction.
$style .= "--layout-justification-setting: {$justify_content_options[ $layout['justifyContent'] ]};";
$style .= '--layout-justify: initial;';
$style .= "--layout-align: {$justify_content_options[ $layout['justifyContent'] ]};";
}
}
}
$style .= '}';
Expand Down
29 changes: 4 additions & 25 deletions packages/block-editor/src/layouts/flex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@ export default {
);
},
save: function FlexLayoutStyle( { selector, layout } ) {
const {
orientation = 'horizontal',
setCascadingProperties = false,
} = layout;
const { orientation = 'horizontal' } = layout;
const blockGapSupport = useSetting( 'spacing.blockGap' );
const hasBlockGapStylesSupport = blockGapSupport !== null;
const justifyContent =
Expand All @@ -97,36 +94,18 @@ export default {
const flexWrap = flexWrapOptions.includes( layout.flexWrap )
? layout.flexWrap
: 'wrap';
let rowOrientation = `
const rowOrientation = `
flex-direction: row;
align-items: center;
justify-content: ${ justifyContent };
`;
if ( setCascadingProperties ) {
// --layout-justification-setting allows children to inherit the value
// regardless or row or column direction.
rowOrientation += `
--layout-justification-setting: ${ justifyContent };
--layout-direction: row;
--layout-wrap: ${ flexWrap };
--layout-justify: ${ justifyContent };
--layout-align: center;
`;
}
const alignItems =
alignItemsMap[ layout.justifyContent ] || alignItemsMap.left;
let columnOrientation = `
const columnOrientation = `
flex-direction: column;
align-items: ${ alignItems };
`;
if ( setCascadingProperties ) {
columnOrientation += `
--layout-justification-setting: ${ alignItems };
--layout-direction: column;
--layout-justify: initial;
--layout-align: ${ alignItems };
`;
}

return (
<style>{ `
${ appendSelectors( selector ) } {
Expand Down
3 changes: 1 addition & 2 deletions packages/block-library/src/navigation/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@
"allowSwitching": false,
"allowInheriting": false,
"default": {
"type": "flex",
"setCascadingProperties": true
"type": "flex"
}
}
},
Expand Down
2 changes: 0 additions & 2 deletions packages/block-library/src/navigation/deprecated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const migrateWithLayout = ( attributes ) => {
Object.assign( updatedAttributes, {
layout: {
type: 'flex',
setCascadingProperties: 'true',
...( itemsJustification && {
justifyContent: itemsJustification,
} ),
Expand Down Expand Up @@ -135,7 +134,6 @@ const v6 = {
allowInheriting: false,
default: {
type: 'flex',
setCascadingProperties: true,
},
},
},
Expand Down
10 changes: 9 additions & 1 deletion 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 @@ -107,7 +107,11 @@ function Navigation( {
openSubmenusOnClick,
overlayMenu,
showSubmenuIcon,
layout: { justifyContent, orientation = 'horizontal' } = {},
layout: {
justifyContent,
orientation = 'horizontal',
flexWrap = 'wrap',
} = {},
} = attributes;

let areaMenu,
Expand Down Expand Up @@ -206,6 +210,10 @@ function Navigation( {
className: classnames( className, {
'items-justified-right': justifyContent === 'right',
'items-justified-space-between': justifyContent === 'space-between',
'items-justified-left': justifyContent === 'left',
'items-justified-center': justifyContent === 'center',
'is-vertical': orientation === 'vertical',
'no-wrap': flexWrap === 'nowrap',
'is-responsive': 'never' !== overlayMenu,
'has-text-color': !! textColor.color || !! textColor?.class,
[ getColorClassName(
Expand Down
20 changes: 15 additions & 5 deletions packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,14 +452,24 @@ function render_block_core_navigation( $attributes, $content, $block ) {

}

$layout_justification = array(
'left' => 'items-justified-left',
'right' => 'items-justified-right',
'center' => 'items-justified-center',
'space-between' => 'items-justified-space-between',
);

// Restore legacy classnames for submenu positioning.
$layout_class = '';
if ( isset( $attributes['layout']['justifyContent'] ) ) {
if ( 'right' === $attributes['layout']['justifyContent'] ) {
$layout_class .= 'items-justified-right';
} elseif ( 'space-between' === $attributes['layout']['justifyContent'] ) {
$layout_class .= 'items-justified-space-between';
}
$layout_class .= $layout_justification[ $attributes['layout']['justifyContent'] ];
}
if ( isset( $attributes['layout']['orientation'] ) && 'vertical' === $attributes['layout']['orientation'] ) {
$layout_class .= ' is-vertical';
}

if ( isset( $attributes['layout']['flexWrap'] ) && 'nowrap' === $attributes['layout']['flexWrap'] ) {
$layout_class .= ' no-wrap';
}

$colors = block_core_navigation_build_css_colors( $attributes );
Expand Down
59 changes: 49 additions & 10 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 @@ -106,6 +106,45 @@ $navigation-icon-size: 24px;
height: inherit;
}
}

// Custom properties for layout style cascade: default values.
--navigation-layout-justification-setting: flex-start;
--navigation-layout-direction: row;
--navigation-layout-wrap: wrap;
--navigation-layout-justify: flex-start;
--navigation-layout-align: center;

&.is-vertical {
--navigation-layout-direction: column;
--navigation-layout-justify: initial;
}

&.no-wrap {
--navigation-layout-wrap: nowrap;
}

&.items-justified-center {
--navigation-layout-justification-setting: center;
--navigation-layout-justify: center;

&.is-vertical {
--navigation-layout-align: center;
}
}

&.items-justified-right {
--navigation-layout-justification-setting: flex-end;
--navigation-layout-justify: flex-end;

&.is-vertical {
--navigation-layout-align: flex-end;
}
}

&.items-justified-space-between {
--navigation-layout-justification-setting: space-between;
--navigation-layout-justify: space-between;
}
}

// Styles for submenu flyout.
Expand Down Expand Up @@ -351,10 +390,10 @@ button.wp-block-navigation-item__content {
// Navigation block inner container.
.wp-block-navigation__container {
display: flex;
flex-wrap: var(--layout-wrap, wrap);
flex-direction: var(--layout-direction, initial);
justify-content: var(--layout-justify, initial);
align-items: var(--layout-align, initial);
flex-wrap: var(--navigation-layout-wrap, wrap);
flex-direction: var(--navigation-layout-direction, initial);
justify-content: var(--navigation-layout-justify, initial);
align-items: var(--navigation-layout-align, initial);

// Reset the default list styles
list-style: none;
Expand Down Expand Up @@ -388,10 +427,10 @@ button.wp-block-navigation-item__content {

.wp-block-navigation__responsive-container-content {
display: flex;
flex-wrap: var(--layout-wrap, wrap);
flex-direction: var(--layout-direction, initial);
justify-content: var(--layout-justify, initial);
align-items: var(--layout-align, initial);
flex-wrap: var(--navigation-layout-wrap, wrap);
flex-direction: var(--navigation-layout-direction, initial);
justify-content: var(--navigation-layout-justify, initial);
align-items: var(--navigation-layout-align, initial);
}

// If the responsive wrapper is present but overlay is not open,
Expand Down Expand Up @@ -433,7 +472,7 @@ button.wp-block-navigation-item__content {
display: flex;
flex-direction: column;
// Inherit alignment settings from container.
align-items: var(--layout-justification-setting, inherit);
align-items: var(--navigation-layout-justification-setting, inherit);

// Always align the contents of the menu to the top.
&,
Expand Down Expand Up @@ -488,7 +527,7 @@ button.wp-block-navigation-item__content {
display: flex;
flex-direction: column;
// Inherit alignment settings from container.
align-items: var(--layout-justification-setting, initial);
align-items: var(--navigation-layout-justification-setting, initial);
}
}

Expand Down
1 change: 0 additions & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"overlayMenu": "mobile",
"layout": {
"type": "flex",
"setCascadingProperties": "true",
"orientation": "horizontal"
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated-1.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":"true","orientation":"horizontal"}} -->
<!-- wp:navigation {"layout":{"type":"flex","orientation":"horizontal"}} -->
<!-- wp:navigation-link {"label":"WordPress","url":"https://www.wordpress.org/"} /-->
<!-- /wp:navigation -->
1 change: 0 additions & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated-v4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"fontFamily": "cambria-georgia",
"layout": {
"type": "flex",
"setCascadingProperties": "true",
"orientation": "horizontal"
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated-v4.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!-- wp:navigation {"overlayMenu":"never","fontFamily":"cambria-georgia","layout":{"type":"flex","setCascadingProperties":"true","orientation":"horizontal"}} /-->
<!-- wp:navigation {"overlayMenu":"never","fontFamily":"cambria-georgia","layout":{"type":"flex","orientation":"horizontal"}} /-->
1 change: 0 additions & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated-v5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"overlayMenu": "never",
"layout": {
"type": "flex",
"setCascadingProperties": "true",
"justifyContent": "center",
"orientation": "vertical"
}
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated-v5.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","setCascadingProperties":"true","justifyContent":"center","orientation":"vertical"}} /-->
<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"center","orientation":"vertical"}} /-->
1 change: 0 additions & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
},
"layout": {
"type": "flex",
"setCascadingProperties": "true",
"orientation": "horizontal"
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fixtures/blocks/core__navigation__deprecated.serialized.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!-- wp:navigation {"style":{"typography":{"textTransform":"lowercase","textDecoration":"line-through","fontStyle":"italic","fontWeight":"100"}},"layout":{"type":"flex","setCascadingProperties":"true","orientation":"horizontal"}} -->
<!-- wp:navigation {"style":{"typography":{"textTransform":"lowercase","textDecoration":"line-through","fontStyle":"italic","fontWeight":"100"}},"layout":{"type":"flex","orientation":"horizontal"}} -->
<!-- wp:navigation-link {"label":"WordPress","url":"https://www.wordpress.org/"} /-->
<!-- /wp:navigation -->