Skip to content

Commit

Permalink
[CYS] Fix the selected pattern in footer, header and homepage (#45240)
Browse files Browse the repository at this point in the history 
* Check also the number of inner blocks before checking the attributes

* Add classes to assembler footer patterns

* Add classes to assembler header patterns

* Add changefile(s) from automation for the following project(s): woocommerce

* Mark the current homepage template as selected

* Remove unused import

---------

Co-authored-by: github-actions <github-actions@github.com>
  • Loading branch information
@albarin
albarin and github-actions committed Mar 5, 2024
1 parent e549712 commit 1c68e2d
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 11 deletions.
17 changes: 16 additions & 1 deletion ...admin/client/customize-store/assembler-hub/sidebar/sidebar-navigation-screen-homepage.tsx
View file
Expand Up @@ -92,8 +92,23 @@ export const SidebarNavigationScreenHomepage = () => {
return;
}

setSelectedPattern( selectedPattern );
const currentSelectedPattern = homePatterns.find( ( patterns ) => {
//'blocks' contains all blocks in the template, including the
// header and footer blocks, while the 'patterns.blocks' does
// not. For that reason we are removing the first and last
// blocks from the 'blocks' to be able to compare then
const homeBlocks = blocks.slice( 1, blocks.length - 1 );

if ( patterns.blocks.length !== homeBlocks.length ) {
return false;
}

return homeBlocks.every(
( block, i ) => block.name === patterns.blocks[ i ].name
);
} );

setSelectedPattern( currentSelectedPattern );
// eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to re-run this effect when currentSelectedPattern changes
}, [ blocks, homePatterns ] );

Expand Down
10 changes: 7 additions & 3 deletions plugins/woocommerce-admin/client/customize-store/assembler-hub/sidebar/utils.ts
View file
Expand Up @@ -24,8 +24,12 @@ export const findPatternByBlock = (
''
);
}
return patterns.find( ( pattern ) => {
const patternBlocks = pattern.blocks[ 0 ];
if ( patternBlocks.innerBlocks.length !== block.innerBlocks.length ) {
return false;
}

return patterns.find( ( pattern ) =>
isEqual( pattern.blocks[ 0 ].attributes, blockAttributes )
);
return isEqual( patternBlocks.attributes, blockAttributes );
} );
};
4 changes: 4 additions & 0 deletions plugins/woocommerce/changelog/45240-45215-fix-selected-footer
View file
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

CYS - Fix the selected pattern in footer in the assembler.
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/footer-large.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"className":"wc-blocks-footer-pattern","align":"full","style":{"spacing":{"padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"},"blockGap":"40px"}}} -->
<div class="wc-blocks-footer-pattern wp-block-group alignfull" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<div class="wc-blocks-pattern-footer-large wc-blocks-footer-pattern wp-block-group alignfull" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<!-- wp:columns {"align":"wide","style":{"spacing":{"blockGap":"32px","padding":{"right":"0px","left":"0px"}}}} -->
<div class="wp-block-columns alignwide" style="padding-right:0px;padding-left:0px">
<!-- wp:column {"width":"60%","style":{"spacing":{"padding":{"right":"50px"}}}} -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/footer-simple-menu.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"40px","bottom":"40px","left":"40px","right":"40px"}}},"className":"wc-blocks-footer-pattern"} -->
<div class="wp-block-group alignfull wc-blocks-footer-pattern" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<div class="wc-blocks-pattern-footer-simple-menu wp-block-group alignfull wc-blocks-footer-pattern" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"0","left":"0"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull" style="padding-right:0;padding-left:0">
<!-- wp:group {"style":{"spacing":{"blockGap":"24px"}},"layout":{"type":"flex","flexWrap":"wrap"}} -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/footer-with-3-menus.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":"40px","padding":{"top":"40px","right":"40px","bottom":"40px","left":"40px"}}},"className":"wc-blocks-footer-pattern"} -->
<div class="wp-block-group alignfull wc-blocks-footer-pattern" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<div class="wc-blocks-pattern-footer-with-3-menus wp-block-group alignfull wc-blocks-footer-pattern" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<!-- wp:columns {"style":{"spacing":{"padding":{"right":"0","left":"0"}}},"className":"are-vertically-aligned-top"} -->
<div class="wp-block-columns are-vertically-aligned-top" style="padding-right:0;padding-left:0">
<!-- wp:column {"verticalAlignment":"top","width":"60%"} -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/header-centered-pattern.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"className":"wc-blocks-header-pattern","align":"full","layout":{"type":"constrained"}} -->
<div class="wc-blocks-header-pattern wp-block-group alignfull">
<div class="wc-blocks-pattern-header-centered-menu wc-blocks-header-pattern wp-block-group alignfull">
<!-- wp:columns {"verticalAlignment":"center","isStackedOnMobile":false,"align":"full","style":{"spacing":{"padding":{"top":"24px","bottom":"24px","left":"40px","right":"40px"}}}} -->
<div class="wp-block-columns alignfull are-vertically-aligned-center is-not-stacked-on-mobile" style="padding-top:24px;padding-right:40px;padding-bottom:24px;padding-left:40px">
<!-- wp:column {"verticalAlignment":"center","width":"70%","layout":{"type":"default"}} -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/header-essential.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"40px","bottom":"40px","left":"40px","right":"40px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<div class="wc-blocks-pattern-header-essential wp-block-group alignfull" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px">
<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
<div class="wp-block-group">
<!-- wp:site-logo /-->
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/header-large.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"right":"40px","left":"40px","top":"24px","bottom":"24px"}}},"layout":{"type":"default"}} -->
<div class="wp-block-group alignfull" style="padding-right: 40px; padding-left: 40px; padding-top: 24px; padding-bottom: 24px">
<div class="wc-blocks-pattern-header-large wp-block-group alignfull" style="padding-right: 40px; padding-left: 40px; padding-top: 24px; padding-bottom: 24px">
<!-- wp:group {"align":"full","layout":{"type":"default"}} -->
<div class="wp-block-group alignfull">
<!-- wp:columns {"verticalAlignment":"center","isStackedOnMobile":false,"align":"full"} -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/woocommerce/patterns/header-minimal.php
View file
Expand Up @@ -8,7 +8,7 @@
?>

<!-- wp:group {"className":"wc-blocks-header-pattern","align":"full","style":{"spacing":{"padding":{"right":"40px","bottom":"24px","left":"40px","top":"24px"},"margin":{"top":"0px","bottom":"0px"}}},"className":"sticky-header","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wc-blocks-header-pattern wp-block-group alignfull sticky-header" style="margin-top:0px;margin-bottom:0px;padding-top:24px;padding-right:40px;padding-bottom:24px;padding-left:40px">
<div class="wc-blocks-pattern-header-minimal wc-blocks-header-pattern wp-block-group alignfull sticky-header" style="margin-top:0px;margin-bottom:0px;padding-top:24px;padding-right:40px;padding-bottom:24px;padding-left:40px">
<!-- wp:group {"style":{"spacing":{"blockGap":"20px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
<div class="wp-block-group">
<!-- wp:site-logo {"shouldSyncIcon":false,"className":"is-style-default"} /-->
Expand Down

0 comments on commit 1c68e2d

Please sign in to comment.