Skip to content

Fix ThemeProvider context mismatch in shadow-root modal providers #587

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

Open
bunnybones1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix ThemeProvider context mismatch in shadow-root modal providers #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
216 changes: 110 additions & 106 deletions packages/checkout/src/components/SequenceCheckoutProvider/SequenceCheckoutProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { getModalPositionCss, ShadowRoot, useConnectConfigContext, useTheme } from '@0xsequence/connect'
import { Modal } from '@0xsequence/design-system'
import { Modal, ThemeProvider } from '@0xsequence/design-system'
import { AnimatePresence } from 'motion/react'
import { useEffect, useState, type ReactNode } from 'react'

Expand Down Expand Up @@ -303,111 +303,115 @@ export const SequenceCheckoutProvider = ({ children, config }: SequenceCheckoutP
defaultLocation: getDefaultLocationCheckout()
}}
>
<ShadowRoot theme={theme} customCSS={customCSS}>
<AnimatePresence>
{openCheckoutModal && (
<Modal
contentProps={{
style: {
maxWidth: '540px',
height: 'auto',
...getModalPositionCss(position)
}
}}
scroll={false}
onClose={() => setOpenCheckoutModal(false)}
>
<div id="sequence-kit-checkout-content">
{getCheckoutHeader()}
{getCheckoutContent()}
</div>
</Modal>
)}
{openAddFundsModal && (
<Modal
contentProps={{
style: {
maxWidth: '540px',
height: 'auto',
...getModalPositionCss(position)
}
}}
scroll={false}
onClose={closeAddFunds}
>
<div id="sequence-kit-add-funds-content">
{getAddFundsHeader()}
{getAddFundsContent()}
</div>
</Modal>
)}
{openPaymentSelectionModal && (
<Modal
contentProps={{
style: {
maxWidth: '320px',
height: 'auto',
...getModalPositionCss(position)
}
}}
scroll={false}
onClose={() => setOpenPaymentSelectionModal(false)}
>
<div id="sequence-web-sdk-payment-selection-content">
{getCheckoutFlowHeader()}
{getCheckoutFlowContent()}
</div>
</Modal>
)}
{openTransferFundsModal && (
<Modal
contentProps={{
style: {
height: 'auto',
...getModalPositionCss(position)
}
}}
onClose={closeTransferFunds}
>
<div id="sequence-kit-transfer-funds-modal">
<NavigationHeader primaryText="Receive" />
<TransferToWallet />
</div>
</Modal>
)}
{openTransactionStatusModal && (
<Modal
contentProps={{
style: {
height: 'auto',
...getModalPositionCss(position)
}
}}
onClose={closeTransactionStatusModal}
>
<div id="sequence-kit-transaction-status-modal">
<TransactionStatus />
</div>
</Modal>
)}
{isOpenSwapModal && (
<Modal
contentProps={{
style: {
maxWidth: '450px',
height: 'auto',
...getModalPositionCss(position)
}
}}
onClose={closeSwapModal}
>
<div id="sequence-kit-swap-modal">
<NavigationHeader primaryText={swapModalSettings?.title || 'Swap'} />
<Swap />
</div>
</Modal>
)}
</AnimatePresence>
<ShadowRoot customCSS={customCSS}>
{(container: HTMLDivElement) => (
<ThemeProvider theme={theme} root={container}>
<AnimatePresence>
{openCheckoutModal && (
<Modal
contentProps={{
style: {
maxWidth: '540px',
height: 'auto',
...getModalPositionCss(position)
}
}}
scroll={false}
onClose={() => setOpenCheckoutModal(false)}
>
<div id="sequence-kit-checkout-content">
{getCheckoutHeader()}
{getCheckoutContent()}
</div>
</Modal>
)}
{openAddFundsModal && (
<Modal
contentProps={{
style: {
maxWidth: '540px',
height: 'auto',
...getModalPositionCss(position)
}
}}
scroll={false}
onClose={closeAddFunds}
>
<div id="sequence-kit-add-funds-content">
{getAddFundsHeader()}
{getAddFundsContent()}
</div>
</Modal>
)}
{openPaymentSelectionModal && (
<Modal
contentProps={{
style: {
maxWidth: '320px',
height: 'auto',
...getModalPositionCss(position)
}
}}
scroll={false}
onClose={() => setOpenPaymentSelectionModal(false)}
>
<div id="sequence-web-sdk-payment-selection-content">
{getCheckoutFlowHeader()}
{getCheckoutFlowContent()}
</div>
</Modal>
)}
{openTransferFundsModal && (
<Modal
contentProps={{
style: {
height: 'auto',
...getModalPositionCss(position)
}
}}
onClose={closeTransferFunds}
>
<div id="sequence-kit-transfer-funds-modal">
<NavigationHeader primaryText="Receive" />
<TransferToWallet />
</div>
</Modal>
)}
{openTransactionStatusModal && (
<Modal
contentProps={{
style: {
height: 'auto',
...getModalPositionCss(position)
}
}}
onClose={closeTransactionStatusModal}
>
<div id="sequence-kit-transaction-status-modal">
<TransactionStatus />
</div>
</Modal>
)}
{isOpenSwapModal && (
<Modal
contentProps={{
style: {
maxWidth: '450px',
height: 'auto',
...getModalPositionCss(position)
}
}}
onClose={closeSwapModal}
>
<div id="sequence-kit-swap-modal">
<NavigationHeader primaryText={swapModalSettings?.title || 'Swap'} />
<Swap />
</div>
</Modal>
)}
</AnimatePresence>
</ThemeProvider>
)}
</ShadowRoot>
{children}
</NavigationCheckoutContextProvider>
Expand Down
Loading