Skip to content
This repository was archived by the owner on Feb 17, 2025. It is now read-only.

Blockbase + children: remove __unstableLocation #6759

Merged
jffng merged 3 commits into from
Jan 9, 2023
Merged

Blockbase + children: remove __unstableLocation #6759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea5589d
Remove __unstableLocation
jffng Nov 28, 2022
50974bb
Remove __unstableLocation.
jffng Dec 2, 2022
2f2787d
Remove check for __unstableLocation.
jffng Dec 2, 2022
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
2 changes: 1 addition & 1 deletion antonia/parts/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- /wp:group --></div>
<!-- /wp:group -->

<!-- wp:navigation {"overlayMenu":"always","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- wp:navigation {"overlayMenu":"always","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal","flexWrap":"wrap"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->

Expand Down
2 changes: 1 addition & 1 deletion appleton/parts/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- /wp:group --></div>
<!-- /wp:group -->

<!-- wp:navigation {"overlayMenu":"always","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- wp:navigation {"overlayMenu":"always","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->

Expand Down
2 changes: 1 addition & 1 deletion blockbase/inc/patterns/footer-columns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<h3 style="font-size:14px;"><strong>' . esc_html__( 'More info', 'blockbase' ) . '</strong></h3>
<!-- /wp:heading -->

<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textDecoration":"underline"}},"fontSize":"small"} /--></div>
<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textDecoration":"underline"}},"fontSize":"small"} /--></div>
<!-- /wp:column -->

<!-- wp:column -->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/inc/patterns/footer-left.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'blockTypes' => array( 'core/template-part/footer' ),
'content' => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"30px"}}},"layout":{"inherit":true}} -->
<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:30px">
<!-- wp:navigation {"__unstableLocation":"primary","fontSize":"small"} /-->
<!-- wp:navigation {"fontSize":"small"} /-->

<!-- wp:group {"layout":{"type":"flex","allowOrientation":false}} -->
<div class="wp-block-group"><!-- wp:site-title {"fontSize":"small"} /-->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/inc/patterns/footer-primary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- /wp:paragraph --></div>
<!-- /wp:group -->

<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":"true","orientation":"horizontal"}} /--></div>
<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","setCascadingProperties":"true","orientation":"horizontal"}} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->',
);
5 changes: 0 additions & 5 deletions blockbase/inc/social-navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ function blockbase_condition_to_render_social_menu( $block_content, $block ) {
return false;
}

// The block should have an unstable location attribute.
Copy link
Contributor

@pbking pbking Dec 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there still value in including this now that the __unstableLocation is gone?
I don't see any themes that provide a custom.navigation/social-links value.

What other value does this provide? Can we get rid of it completely?

Copy link
Contributor Author

@jffng jffng Dec 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get rid of it completely?

I think so, but is there potential for it to break how social menus are displayed for some sites running Blockbase or its children? There are five header parts that would appear to use this filter:

https://github.com/Automattic/themes/blob/trunk/blockbase/parts/header-default.html#L19
https://github.com/Automattic/themes/blob/trunk/blockbase/parts/header-linear.html#L19
https://github.com/Automattic/themes/blob/trunk/blockbase/parts/header-minimal.html#L21
https://github.com/Automattic/themes/blob/trunk/blockbase/parts/header-rounded-logo.html#L19
https://github.com/Automattic/themes/blob/trunk/blockbase/parts/header-wide.html#L19

Copy link
Contributor

@pbking pbking Dec 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree that for that reason it should stay. The remainder of what's left is unconnected to __unstableLocation and removing it just removes functionality.

if ( empty( $block['attrs']['__unstableLocation'] ) ) {
return false;
}

// The block should be empty (no custom menu assigned)
if ( ! empty($block['attrs']['navigationMenuId']) || ! empty($block['attrs']['ref']) ) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion blockbase/parts/header-centered.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- wp:spacer {"height":20} -->
<div style="height:20px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->
<!-- wp:navigation {"__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"center","orientation":"horizontal"}} /-->
<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"center","orientation":"horizontal"}} /-->

</div>
<!-- /wp:group -->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/parts/header-default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<!-- /wp:group -->

<!-- wp:navigation {"__unstableLocation":"primary","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
<!-- wp:navigation {"className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->

</div>
<!-- /wp:group -->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/parts/header-linear.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<!-- /wp:group -->

<!-- wp:navigation {"className":"blockbase-responsive-navigation-linear","__unstableLocation":"primary","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
<!-- wp:navigation {"className":"blockbase-responsive-navigation-linear","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->

</div>
<!-- /wp:group -->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/parts/header-minimal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</div>
<!-- /wp:group -->

<!-- wp:navigation {"className":"blockbase-responsive-navigation-minimal","overlayMenu":"always","__unstableLocation":"primary","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->
<!-- wp:navigation {"className":"blockbase-responsive-navigation-minimal","overlayMenu":"always","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /-->

</div>
<!-- /wp:group -->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/parts/header-rounded-logo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<!-- /wp:group -->

<!-- wp:navigation {"__unstableLocation":"primary","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->
<!-- wp:navigation {"className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->

</div>
<!-- /wp:group -->
Expand Down
2 changes: 1 addition & 1 deletion blockbase/parts/header-wide.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
<!-- /wp:group -->

<!-- wp:navigation {"__unstableLocation":"primary","className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"1.5em"}}} /-->
<!-- wp:navigation {"className":"social-links","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"1.5em"}}} /-->

</div>
<!-- /wp:group -->
Expand Down
2 changes: 1 addition & 1 deletion geologist/inc/patterns/header-with-rounded-site-logo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<header class="wp-block-group site-header" style="padding-bottom:90px">
<!-- wp:site-logo {"className":"is-style-rounded"} /-->
<!-- wp:site-title /-->
<!-- wp:navigation {"__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->
<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"}} /-->
</header>
<!-- /wp:group -->',
);
2 changes: 1 addition & 1 deletion heiwa/parts/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<!-- wp:site-title /--></div>
<!-- /wp:group -->

<!-- wp:navigation {"overlayMenu":"always","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}},"fontSize":"huge"} /--></div>
<!-- wp:navigation {"overlayMenu":"always","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}},"fontSize":"huge"} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion meraki/parts/header-minimal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<!-- /wp:group --></div>
<!-- /wp:group -->

<!-- wp:navigation {"__unstableLocation":"primary","className":"blockbase-responsive-navigation-linear","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- wp:navigation {"className":"blockbase-responsive-navigation-linear","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
2 changes: 1 addition & 1 deletion videomaker/inc/patterns/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<!-- wp:group {"align":"wide","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"space-between"},"style":{"spacing":{"padding":{"top":"30px","bottom":"min(30px, 5vw)"}}}} -->
<div class="wp-block-group alignwide" style="padding-top: 30px;padding-bottom: min(30px, 5vw)"> <!-- wp:group -->
<div class="wp-block-group">
<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"footer","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"},"spacing":{"blockGap":"0px"}}} /-->
</div>
<!-- /wp:group -->
<!-- wp:group {"className":"footer-credit"} -->
Expand Down
2 changes: 1 addition & 1 deletion videomaker/inc/patterns/full-width-homepage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- /wp:column -->

<!-- wp:column {"verticalAlignment":"center"} -->
<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
<div class="wp-block-column is-vertically-aligned-center"><!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
<!-- /wp:column --></div>
<!-- /wp:columns -->

Expand Down
2 changes: 1 addition & 1 deletion videomaker/inc/patterns/header-description-and-grid-of-projects.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<h3 style="font-weight:300">' . esc_html__( 'Jonah is Creative Director of Hano, a production studio that specializes in combining storytelling with visual design.', 'videomaker' ) . '</h3>
<!-- /wp:heading -->

<!-- wp:navigation {"overlayMenu":"never","__unstableLocation":"primary","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"}}} /-->
<!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"vertical"},"style":{"typography":{"textTransform":"uppercase"}}} /-->

</div>
<!-- /wp:column -->
Expand Down