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

Fix React error when the Express Checkout's container element is not found. #9420

Merged
merged 7 commits into from
Sep 12, 2024
+14 −34
Merged

Fix React error when the Express Checkout's container element is not found. #9420

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a3024b9
Create div container element with JS dynamically
asumaran Sep 11, 2024
203d705
Add changelog entry
asumaran Sep 11, 2024
16fc417
Remove element after unmounting the button
asumaran Sep 12, 2024
f62431b
Apply styles to the element to ensure the element is hidden.
asumaran Sep 12, 2024
c564b30
Typo
asumaran Sep 12, 2024
70191f7
Simplify hiding the element
asumaran Sep 12, 2024
b158cc5
Merge branch 'develop' into as-fix-react-error-container-not-found
asumaran Sep 12, 2024
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
4 changes: 4 additions & 0 deletions changelog/as-fix-react-error-container-not-found
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Create div container element with JS dynamically.
15 changes: 10 additions & 5 deletions client/express-checkout/utils/checkPaymentMethodIsAvailable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ import { getUPEConfig } from 'wcpay/utils/checkout';

export const checkPaymentMethodIsAvailable = memoize(
( paymentMethod, cart, resolve ) => {
const root = ReactDOM.createRoot(
document.getElementById(
`express-checkout-check-availability-container-${ paymentMethod }`
)
);
// Create the DIV container on the fly
const containerEl = document.createElement( 'div' );

// Ensure the element is hidden and doesn’t interfere with the page layout.
containerEl.style.display = 'none';

document.querySelector( 'body' ).appendChild( containerEl );

const root = ReactDOM.createRoot( containerEl );

const api = new WCPayAPI(
{
Expand Down Expand Up @@ -71,6 +75,7 @@ export const checkPaymentMethodIsAvailable = memoize(
}
resolve( canMakePayment );
root.unmount();
containerEl.remove();
} }
/>
</Elements>
Expand Down
29 changes: 0 additions & 29 deletions includes/express-checkout/class-wc-payments-express-checkout-button-display-handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ public function init() {
$is_woopay_enabled = WC_Payments_Features::is_woopay_enabled();
$is_payment_request_enabled = 'yes' === $this->gateway->get_option( 'payment_request' );

if ( $is_payment_request_enabled ) {
$this->add_html_container_for_test_express_checkout_buttons();
}

if ( $is_woopay_enabled || $is_payment_request_enabled ) {
add_action( 'wc_ajax_wcpay_add_to_cart', [ $this->express_checkout_ajax_handler, 'ajax_add_to_cart' ] );
add_action( 'wc_ajax_wcpay_empty_cart', [ $this->express_checkout_ajax_handler, 'ajax_empty_cart' ] );
Expand Down Expand Up @@ -178,31 +174,6 @@ public function add_order_attribution_inputs() {
echo '<wc-order-attribution-inputs id="wcpay-express-checkout__order-attribution-inputs"></wc-order-attribution-inputs>';
}


/**
* Add HTML containers to be used by the Express Checkout buttons that check if the payment method is available.
*
* @return void
*/
private function add_html_container_for_test_express_checkout_buttons() {
add_filter(
'the_content',
function ( $content ) {
$supported_payment_methods = [ 'applePay' , 'googlePay' ];
// Restrict adding these HTML containers to only the necessary pages.
if ( $this->express_checkout_helper->is_checkout() || $this->express_checkout_helper->is_cart() ) {
foreach ( $supported_payment_methods as $value ) {
// The inline styles ensure that the HTML elements don't occupy space on the page.
$content = '<div id="express-checkout-check-availability-container-' . $value . '" style="height: 0; float:left; opacity: 0; pointer-events: none;"></div>' . $content;
}
}
return $content;
},
10,
1
);
}

/**
* Check if the pay-for-order flow is supported.
*
Expand Down
Loading