Skip to content
This repository has been archived by the owner on Feb 23, 2024. It is now read-only.

Update Checkout to Checkout i2 #4745

Merged
merged 17 commits into from
Sep 16, 2021
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
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
32 changes: 13 additions & 19 deletions assets/js/atomic/utils/render-parent-block.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,13 @@ const renderInnerBlocks = ( {
const parsedElement = parse( element.outerHTML );

if ( isValidElement( parsedElement ) ) {
const elementChildren =
element.children && element.children.length
mikejolley marked this conversation as resolved.
Show resolved Hide resolved
? renderInnerBlocks( {
block,
blockMap,
children: element.children,
depth: depth + 1,
blockWrapper,
} )
: null;
const elementChildren = renderInnerBlocks( {
block,
blockMap,
children: element.children || [],
depth: depth + 1,
blockWrapper,
} );
return elementChildren
? cloneElement(
parsedElement,
Expand Down Expand Up @@ -243,15 +240,12 @@ export const renderParentBlock = ( {
* In addition to getProps, we need to render and return the children. This adds children to props.
*/
const getPropsWithChildren = ( element: Element, i: number ) => {
const children =
element.children && element.children.length
? renderInnerBlocks( {
block: blockName,
blockMap,
children: element.children,
blockWrapper,
} )
: null;
const children = renderInnerBlocks( {
block: blockName,
blockMap,
children: element.children || [],
blockWrapper,
} );
return { ...getProps( element, i ), children };
};
/**
Expand Down
8 changes: 8 additions & 0 deletions assets/js/base/components/cart-checkout/form-step/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,11 @@
}
}
}

.editor-styles-wrapper {
.wp-block h4.wc-block-components-checkout-step__title {
@include font-size(regular);
line-height: 24px;
margin: 0 $gap-small 0 0;
}
}
1 change: 1 addition & 0 deletions assets/js/base/components/checkbox-control/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
align-items: flex-start;
display: flex;
position: relative;
margin-top: em($gap-large);

.wc-block-components-checkbox__input[type="checkbox"] {
font-size: 1em;
Expand Down

This file was deleted.

This file was deleted.

37 changes: 0 additions & 37 deletions assets/js/blocks/cart-checkout/checkout-i2/empty-cart/index.js

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading