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.

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

Add skeleton loading element to cart page page BNPL messaging #8607

Merged
merged 3 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 5 additions & 0 deletions changelog/cart-pmme-total-updates
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: add
Comment: Adding skeleton component to BNPL messaging on cart page which has not yet been deployed.


52 changes: 52 additions & 0 deletions client/product-details/bnpl-site-messaging/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,58 @@ export const initializeBnplSiteMessaging = async () => {
document
.getElementById( 'payment-method-message' )
.classList.add( 'ready' );

// On the cart page, get the height of the PMME after it's rendered and store it in a CSS variable. This helps
// prevent layout shifts when the PMME is loaded asynchronously upon cart total update.
if ( isCart ) {
// An element that won't be removed with the cart total update.
const cartCollaterals = document.querySelector(
'.cart-collaterals'
);
const wcBnplHeight = getComputedStyle( cartCollaterals )
.getPropertyValue( '--wc-bnpl-height' )
.trim();

if ( wcBnplHeight ) {
return;
}

const pmme = document.getElementById(
'payment-method-message'
);
const pmmeContainer = document.querySelector(
'.cart_totals .__PrivateStripeElement'
);
setTimeout( () => {
const pmmeComputedStyle = window.getComputedStyle( pmme );
const pmmeHeight = parseFloat( pmmeComputedStyle.height );
const pmmeMarginBottom = parseFloat( bottomMargin );
const pmmeTotalHeight = pmmeHeight + pmmeMarginBottom;

const pmmeContainerComputedStyle = window.getComputedStyle(
pmmeContainer
);
const pmmeContainerHeight = parseFloat(
pmmeContainerComputedStyle.height
);

cartCollaterals.style.setProperty(
'--wc-bnpl-height',
pmmeTotalHeight + 'px'
);
cartCollaterals.style.setProperty(
'--wc-bnpl-container-height',
pmmeContainerHeight - 12 + 'px'
);

cartCollaterals.style.setProperty(
'--wc-bnpl-loader-margin',
pmmeMarginBottom + 2 + 'px'
);

pmme.style.setProperty( '--wc-bnpl-margin-bottom', '-4px' );
}, 2000 );
}
} );
}

Expand Down
34 changes: 29 additions & 5 deletions client/product-details/bnpl-site-messaging/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,37 @@
}

.cart_totals {
&:has( + #payment-method-message.ready ) {
margin-bottom: 0;
#payment-method-message {
margin: -8px 0 4px;
height: var( --wc-bnpl-height );
padding: 2px 1em 0;
margin-bottom: var( --wc-bnpl-margin-bottom );

&.pmme-updated {
margin: -12px 0 0;
padding: 0 1em;
}

&.skeleton {
margin-bottom: 4px;
background: #afafaf;
}
}

#payment-method-message.ready {
margin-bottom: var( --wc-bnpl-margin-bottom );
padding: 0 1em;
.pmme-loading {
animation: pmme-loading 1s linear infinite alternate;
background: #afafaf;
height: var( --wc-bnpl-container-height );
margin: -4px 1em var( --wc-bnpl-loader-margin ) 1em;
}
}

@keyframes pmme-loading {
0% {
background-color: hsl( 204, 10%, 90% );
}
100% {
background-color: hsl( 200, 20%, 95% );
}
}

Expand Down
12 changes: 11 additions & 1 deletion client/product-details/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,19 @@ jQuery( async function ( $ ) {
} );

$( document.body ).on( 'updated_cart_totals', () => {
$( '#payment-method-message' ).before(
'<div class="pmme-loading"></div>'
);
$( '#payment-method-message' ).hide();
bnplGetCartTotal().then( ( response ) => {
window.wcpayStripeSiteMessaging.cartTotal = response.total;
initializeBnplSiteMessaging();
initializeBnplSiteMessaging().then( () => {
setTimeout( () => {
$( '.pmme-loading' ).remove();
$( '#payment-method-message' ).show();
$( '#payment-method-message' ).addClass( 'pmme-updated' );
}, 1000 );
} );
} );
} );

Expand Down
Loading