refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

Merged
alexcarpenter merged 10 commits into from
Mar 17, 2025
Merged

refactor(clerk-js): Introduce <Drawer.Confirmation /> component #5376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
75a1bda
refactor(clerk-js): Introduce `<Drawer.Confirmation />` component
alexcarpenter Mar 17, 2025
c9bd3c0
add descriptors
alexcarpenter Mar 17, 2025
22890f6
add changeset
alexcarpenter Mar 17, 2025
eb4f8a7
visuallyHiddenDismiss
alexcarpenter Mar 17, 2025
56902a4
alpha
alexcarpenter Mar 17, 2025
eaf0cdd
radii
alexcarpenter Mar 17, 2025
1a3ac7f
actionsSlot
alexcarpenter Mar 17, 2025
d44be2d
todos
alexcarpenter Mar 17, 2025
c5066bd
Update bundlewatch.config.json
alexcarpenter Mar 17, 2025
c362b57
fix row gap
alexcarpenter Mar 17, 2025
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
6 changes: 6 additions & 0 deletions .changeset/forty-ladybugs-tie.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "575kB" },
{ "path": "./dist/clerk.js", "maxSize": "576kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "93KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "94KB" },
{ "path": "./dist/vendors*.js", "maxSize": "30KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
165 changes: 83 additions & 82 deletions packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
planPeriod,
setPlanPeriod,
}: PlanDetailDrawerProps) {
const [showConfirmation, setShowConfirmation] = React.useState(false);
const [isSubmitting, setIsSubmitting] = React.useState(false);
const [hasError, setHasError] = React.useState(false);
if (!plan) {
return null;
}
const hasFeatures = plan.features.length > 0;
const cancelSubscription = async () => {
setHasError(false);
setIsSubmitting(true);

// TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
// but this method doesn't exist yet.
//
// await subscription.cancel().then(() => {
// setIsSubmitting(false);
// handleClose();
// }).catch(() => { setHasError(true); setIsSubmitting(false); });
};

return (
<Drawer.Root
open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
closeSlot={<Drawer.Close />}
/>
</Drawer.Header>

{hasFeatures ? (
<Drawer.Body>
<Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
</Box>
</Drawer.Body>
) : null}
<CancelFooter
plan={plan}
handleClose={() => setIsOpen(false)}
/>
</Drawer.Content>
</Drawer.Root>
);
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
// const { __experimental_commerce } = useClerk();
const [showConfirmation, setShowConfirmation] = React.useState(false);
const [isSubmitting, setIsSubmitting] = React.useState(false);
const [hasError, setHasError] = React.useState(false);

const cancelSubscription = async () => {
setHasError(false);
setIsSubmitting(true);

// TODO: we need to get a handle on the subscription object in order to cancel it,
// but this method doesn't exist yet.
//
// await subscription.cancel().then(() => {
// setIsSubmitting(false);
// handleClose();
// }).catch(() => { setHasError(true); setIsSubmitting(false); });
};

// TODO: remove when we can hook up cancel button
// return null;

return (
<Drawer.Footer>
{showConfirmation ? (
<Col gap={8}>
<Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
<Text colorScheme='secondary'>
You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
access.
</Text>
{hasError && (
<Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
)}
<Flex
gap={3}
justify='end'
<Drawer.Footer>
<Button
variant='bordered'
colorScheme='secondary'
size='sm'
textVariant='buttonLarge'
block
onClick={() => setShowConfirmation(true)}
>
{!isSubmitting && (
{/* TODO(@COMMERCE): needs localization */}
Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.
</Button>
</Drawer.Footer>

<Drawer.Confirmation
open={showConfirmation}
onOpenChange={setShowConfirmation}
actionsSlot={
<>
{!isSubmitting && (
<Button
variant='ghost'
size='sm'
textVariant='buttonLarge'
onClick={() => {
setHasError(false);
setShowConfirmation(false);
}}
>
{/* TODO(@COMMERCE): needs localization */}
Keep Subscription
</Button>
)}
<Button
variant='ghost'
variant='solid'
colorScheme='danger'
size='sm'
textVariant='buttonLarge'
onClick={() => {
setHasError(false);
setShowConfirmation(false);
}}
isLoading={isSubmitting}
onClick={cancelSubscription}
>
Keep Subscription
{/* TODO(@COMMERCE): needs localization */}
Cancel Subscription
</Button>
)}
<Button
variant='solid'
colorScheme='danger'
size='sm'
textVariant='buttonLarge'
isLoading={isSubmitting}
onClick={cancelSubscription}
>
Cancel Subscription
</Button>
</Flex>
</Col>
) : (
<Button
variant='bordered'
colorScheme='secondary'
size='sm'
textVariant='buttonLarge'
sx={{
width: '100%',
}}
onClick={() => setShowConfirmation(true)}
</>
}
>
Cancel Subscription
</Button>
)}
</Drawer.Footer>
<Heading
elementDescriptor={descriptors.drawerConfirmationTitle}
as='h2'
textVariant='h3'
>
{/* TODO(@COMMERCE): needs localization */}
Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.
</Heading>
<Text
elementDescriptor={descriptors.drawerConfirmationDescription}
colorScheme='secondary'
>
{/* TODO(@COMMERCE): needs localization */}
You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.
access.
</Text>
{hasError && (
// TODO(@COMMERCE): needs localization
<Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
)}
</Drawer.Confirmation>
</Drawer.Content>
</Drawer.Root>
);
};
}
5 changes: 5 additions & 0 deletions packages/clerk-js/src/ui/customizables/elementDescriptors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'drawerBody',
'drawerFooter',
'drawerClose',
'drawerConfirmationBackdrop',
'drawerConfirmationRoot',
'drawerConfirmationTitle',
'drawerConfirmationDescription',
'drawerConfirmationActions',

'formHeader',
'formHeaderTitle',
Expand Down
117 changes: 116 additions & 1 deletion packages/clerk-js/src/ui/elements/Drawer.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
* Drawer.Confirmation
* -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
open: boolean;
onOpenChange: (open: boolean) => void;
children: React.ReactNode;
actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
({ open, onOpenChange, children, actionsSlot }, ref) => {
const prefersReducedMotion = usePrefersReducedMotion();
const { animations: layoutAnimations } = useAppearance().parsedLayout;
const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

const { refs, context } = useFloating({
open,
onOpenChange,
transform: false,
strategy: 'absolute',
});

const mergedRefs = useMergeRefs([ref, refs.setFloating]);

const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
initial: { opacity: 0 },
open: { opacity: 1 },
close: { opacity: 0 },
common: {
transitionProperty: 'opacity',
transitionTimingFunction: transitionTiming.bezier,
},
duration: transitionDurationValues.drawer,
});

const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
initial: { transform: 'translate3D(0, 100%, 0)' },
open: { transform: 'translate3D(0, 0, 0)' },
close: { transform: 'translate3D(0, 100%, 0)' },
common: {
transitionProperty: 'transform',
transitionTimingFunction: transitionTiming.bezier,
},
duration: isMotionSafe ? transitionDurationValues.drawer : 0,
});

const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

if (!isMounted) return null;

return (
<>
<Span
elementDescriptor={descriptors.drawerConfirmationBackdrop}
style={overlayTransitionStyles}
sx={t => ({
position: 'absolute',
inset: 0,
backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
})}
/>

<FloatingFocusManager
context={context}
modal
outsideElementsInert
initialFocus={refs.floating}
visuallyHiddenDismiss
>
<Box
ref={mergedRefs}
elementDescriptor={descriptors.drawerConfirmationRoot}
style={modalTransitionStyles}
{...getFloatingProps()}
sx={t => ({
display: 'flex',
flexDirection: 'column',
rowGap: t.space.$6,
outline: 'none',
willChange: 'transform',
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
background: common.mergedColorsBackground(
colors.setAlpha(t.colors.$colorBackground, 1),
t.colors.$neutralAlpha50,
),
padding: t.space.$4,
borderStartStartRadius: t.radii.$md,
borderStartEndRadius: t.radii.$md,
boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
})}
>
{children}

<Flex
elementDescriptor={descriptors.drawerConfirmationActions}
gap={3}
justify='end'
>
{actionsSlot}
</Flex>
</Box>
</FloatingFocusManager>
</>
);
},
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
Root,
Overlay,
Content,
Header,
Body,
Footer,
Confirmation,
Close,
};
5 changes: 5 additions & 0 deletions packages/types/src/appearance.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
drawerBody: WithOptions;
drawerFooter: WithOptions;
drawerClose: WithOptions;
drawerConfirmationBackdrop: WithOptions;
drawerConfirmationRoot: WithOptions;
drawerConfirmationTitle: WithOptions;
drawerConfirmationDescription: WithOptions;
drawerConfirmationActions: WithOptions;

formHeader: WithOptions<never, ErrorState>;
formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor(clerk-js): Introduce <Drawer.Confirmation /> component#5376

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

 Merged

alexcarpenter
merged 10 commits into

from

Mar 17, 2025
 Merged


refactor(clerk-js): Introduce <Drawer.Confirmation /> component
#5376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
75a1bda

refactor(clerk-js): Introduce `<Drawer.Confirmation />` component


alexcarpenter Mar 17, 2025
c9bd3c0

add descriptors


alexcarpenter Mar 17, 2025
22890f6

add changeset


alexcarpenter Mar 17, 2025
eb4f8a7

visuallyHiddenDismiss


alexcarpenter Mar 17, 2025
56902a4

alpha


alexcarpenter Mar 17, 2025
eaf0cdd

radii


alexcarpenter Mar 17, 2025
1a3ac7f

actionsSlot


alexcarpenter Mar 17, 2025
d44be2d

todos


alexcarpenter Mar 17, 2025
c5066bd

Update bundlewatch.config.json


alexcarpenter Mar 17, 2025
c362b57

fix row gap


alexcarpenter Mar 17, 2025

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


6 changes: 6 additions & 0 deletions
.changeset/forty-ladybugs-tie.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduce `<Drawer.Confirmation />` component to be used within Commerce cancel subscription flow.

4 changes: 2 additions & 2 deletions
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
 "files": [
 { "path": "./dist/clerk.js", "maxSize": "575kB" },
 { "path": "./dist/clerk.js", "maxSize": "576kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "78kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "50KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "93KB" },
 { "path": "./dist/ui-common*.js", "maxSize": "94KB" },
 { "path": "./dist/vendors*.js", "maxSize": "30KB" },
 { "path": "./dist/coinbase*.js", "maxSize": "35.5KB" },
 { "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down

165 changes: 83 additions & 82 deletions
packages/clerk-js/src/ui/components/PricingTable/PlanDetailDrawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
import type { __experimental_CommercePlanResource } from '@clerk/types';
import * as React from 'react';

import { Alert, Box, Button, Col, Flex, Heading, Text } from '../../customizables';
import { Drawer } from '../../elements';
import { Box, Button, descriptors, Heading, Text } from '../../customizables';
import { Alert, Drawer } from '../../elements';
import type { PlanPeriod } from './PlanCard';
import { PlanCardFeaturesList, PlanCardHeader } from './PlanCard';

Expand All@@ -27,10 +27,26 @@ export function PlanDetailDrawer({
 planPeriod,
 setPlanPeriod,
}: PlanDetailDrawerProps) {
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);
 if (!plan) {
 return null;
 }
 const hasFeatures = plan.features.length > 0;
 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO(@COMMERCE): we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 return (
 <Drawer.Root
 open={isOpen}
Expand DownExpand Up@@ -58,6 +74,7 @@ export function PlanDetailDrawer({
 closeSlot={<Drawer.Close />}
 />
 </Drawer.Header>

 {hasFeatures ? (
 <Drawer.Body>
 <Box
Expand All@@ -69,92 +86,76 @@ export function PlanDetailDrawer({
 </Box>
 </Drawer.Body>
 ) : null}
 <CancelFooter
 plan={plan}
 handleClose={() => setIsOpen(false)}
 />
 </Drawer.Content>
 </Drawer.Root>
 );
}

const CancelFooter = ({ plan }: { plan: __experimental_CommercePlanResource; handleClose: () => void }) => {
 // const { __experimental_commerce } = useClerk();
 const [showConfirmation, setShowConfirmation] = React.useState(false);
 const [isSubmitting, setIsSubmitting] = React.useState(false);
 const [hasError, setHasError] = React.useState(false);

 const cancelSubscription = async () => {
 setHasError(false);
 setIsSubmitting(true);

 // TODO: we need to get a handle on the subscription object in order to cancel it,
 // but this method doesn't exist yet.
 //
 // await subscription.cancel().then(() => {
 // setIsSubmitting(false);
 // handleClose();
 // }).catch(() => { setHasError(true); setIsSubmitting(false); });
 };

 // TODO: remove when we can hook up cancel button
 // return null;

 return (
 <Drawer.Footer>
 {showConfirmation ? (
 <Col gap={8}>
 <Heading textVariant='h3'>Cancel {plan.name} Subscription?</Heading>
 <Text colorScheme='secondary'>
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
 access.
 </Text>
 {hasError && (
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 <Flex
 gap={3}
 justify='end'
 <Drawer.Footer>
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 block
 onClick={() => setShowConfirmation(true)}
 >
 {!isSubmitting && (
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
Comment thread
alexcarpenter marked this conversation as resolved.

 </Button>
 </Drawer.Footer>

 <Drawer.Confirmation
 open={showConfirmation}
 onOpenChange={setShowConfirmation}
 actionsSlot={
 <>
 {!isSubmitting && (
 <Button
 variant='ghost'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 >
 {/* TODO(@COMMERCE): needs localization */}
 Keep Subscription
 </Button>
 )}
 <Button
 variant='ghost'
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 onClick={() => {
 setHasError(false);
 setShowConfirmation(false);
 }}
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Keep Subscription
 {/* TODO(@COMMERCE): needs localization */}
 Cancel Subscription
 </Button>
 )}
 <Button
 variant='solid'
 colorScheme='danger'
 size='sm'
 textVariant='buttonLarge'
 isLoading={isSubmitting}
 onClick={cancelSubscription}
 >
 Cancel Subscription
 </Button>
 </Flex>
 </Col>
 ) : (
 <Button
 variant='bordered'
 colorScheme='secondary'
 size='sm'
 textVariant='buttonLarge'
 sx={{
 width: '100%',
 }}
 onClick={() => setShowConfirmation(true)}
 </>
 }
 >
 Cancel Subscription
 </Button>
 )}
 </Drawer.Footer>
 <Heading
 elementDescriptor={descriptors.drawerConfirmationTitle}
 as='h2'
 textVariant='h3'
 >
 {/* TODO(@COMMERCE): needs localization */}
 Cancel {plan.name} Subscription?
Comment thread
alexcarpenter marked this conversation as resolved.

 </Heading>
 <Text
 elementDescriptor={descriptors.drawerConfirmationDescription}
 colorScheme='secondary'
 >
 {/* TODO(@COMMERCE): needs localization */}
 You can keep using &ldquo;{plan.name}&rdquo; features until [DATE], after which you will no longer have
Comment thread
alexcarpenter marked this conversation as resolved.

 access.
 </Text>
 {hasError && (
 // TODO(@COMMERCE): needs localization
 <Alert colorScheme='danger'>There was a problem canceling your subscription, please try again.</Alert>
 )}
 </Drawer.Confirmation>
 </Drawer.Content>
 </Drawer.Root>
 );
};
}

5 changes: 5 additions & 0 deletions
packages/clerk-js/src/ui/customizables/elementDescriptors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,11 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
 'drawerBody',
 'drawerFooter',
 'drawerClose',
 'drawerConfirmationBackdrop',
 'drawerConfirmationRoot',
 'drawerConfirmationTitle',
 'drawerConfirmationDescription',
 'drawerConfirmationActions',

 'formHeader',
 'formHeaderTitle',
Expand Down

117 changes: 116 additions & 1 deletion
packages/clerk-js/src/ui/elements/Drawer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import {
import * as React from 'react';

import { transitionDurationValues, transitionTiming } from '../../ui/foundations/transitions';
import { Box, descriptors, Flex, Heading, Icon, useAppearance } from '../customizables';
import { Box, descriptors, Flex, Heading, Icon, Span, useAppearance } from '../customizables';
import { usePrefersReducedMotion } from '../hooks';
import { useScrollLock } from '../hooks/useScrollLock';
import { Close as CloseIcon } from '../icons';
Expand DownExpand Up@@ -402,12 +402,127 @@ const Close = React.forwardRef<HTMLButtonElement>((_, ref) => {

Close.displayName = 'Drawer.Close';

/* -------------------------------------------------------------------------------------------------
 * Drawer.Confirmation
 * -----------------------------------------------------------------------------------------------*/

interface ConfirmationProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 children: React.ReactNode;
 actionsSlot: React.ReactNode;
}

const Confirmation = React.forwardRef<HTMLDivElement, ConfirmationProps>(
 ({ open, onOpenChange, children, actionsSlot }, ref) => {
 const prefersReducedMotion = usePrefersReducedMotion();
 const { animations: layoutAnimations } = useAppearance().parsedLayout;
 const isMotionSafe = !prefersReducedMotion && layoutAnimations === true;

 const { refs, context } = useFloating({
 open,
 onOpenChange,
 transform: false,
 strategy: 'absolute',
 });

 const mergedRefs = useMergeRefs([ref, refs.setFloating]);

 const { styles: overlayTransitionStyles } = useTransitionStyles(context, {
 initial: { opacity: 0 },
 open: { opacity: 1 },
 close: { opacity: 0 },
 common: {
 transitionProperty: 'opacity',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: transitionDurationValues.drawer,
 });

 const { isMounted, styles: modalTransitionStyles } = useTransitionStyles(context, {
 initial: { transform: 'translate3D(0, 100%, 0)' },
 open: { transform: 'translate3D(0, 0, 0)' },
 close: { transform: 'translate3D(0, 100%, 0)' },
 common: {
 transitionProperty: 'transform',
 transitionTimingFunction: transitionTiming.bezier,
 },
 duration: isMotionSafe ? transitionDurationValues.drawer : 0,
 });

 const { getFloatingProps } = useInteractions([useClick(context), useDismiss(context), useRole(context)]);

 if (!isMounted) return null;

 return (
 <>
 <Span
 elementDescriptor={descriptors.drawerConfirmationBackdrop}
 style={overlayTransitionStyles}
 sx={t => ({
 position: 'absolute',
 inset: 0,
 backgroundImage: `linear-gradient(to bottom, ${colors.setAlpha(t.colors.$colorBackground, 0.28)}, ${t.colors.$colorBackground})`,
 })}
 />

 <FloatingFocusManager
 context={context}
 modal
 outsideElementsInert
 initialFocus={refs.floating}
 visuallyHiddenDismiss
 >
 <Box
 ref={mergedRefs}
 elementDescriptor={descriptors.drawerConfirmationRoot}
 style={modalTransitionStyles}
 {...getFloatingProps()}
 sx={t => ({
 display: 'flex',
 flexDirection: 'column',
 rowGap: t.space.$6,
 outline: 'none',
 willChange: 'transform',
 position: 'absolute',
 bottom: 0,
 left: 0,
 right: 0,
 background: common.mergedColorsBackground(
 colors.setAlpha(t.colors.$colorBackground, 1),
 t.colors.$neutralAlpha50,
 ),
 padding: t.space.$4,
 borderStartStartRadius: t.radii.$md,
 borderStartEndRadius: t.radii.$md,
 boxShadow: `0 0 0 1px ${t.colors.$neutralAlpha100}`,
 })}
 >
 {children}

 <Flex
 elementDescriptor={descriptors.drawerConfirmationActions}
 gap={3}
 justify='end'
 >
 {actionsSlot}
 </Flex>
 </Box>
 </FloatingFocusManager>
 </>
 );
 },
);

Confirmation.displayName = 'Drawer.Confirmation';

export const Drawer = {
 Root,
 Overlay,
 Content,
 Header,
 Body,
 Footer,
 Confirmation,
 Close,
};

5 changes: 5 additions & 0 deletions
packages/types/src/appearance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,11 @@ export type ElementsConfig = {
 drawerBody: WithOptions;
 drawerFooter: WithOptions;
 drawerClose: WithOptions;
 drawerConfirmationBackdrop: WithOptions;
 drawerConfirmationRoot: WithOptions;
 drawerConfirmationTitle: WithOptions;
 drawerConfirmationDescription: WithOptions;
 drawerConfirmationActions: WithOptions;

 formHeader: WithOptions<never, ErrorState>;
 formHeaderTitle: WithOptions<never, ErrorState>;
Expand Down