Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .changeset/mean-houses-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@clerk/clerk-js': patch
'@clerk/types': patch
---

Introduces new element appearance descriptors:

- `activeDeviceListItem` allows you to customize the appearance of the active device list (accordion) item
- `activeDeviceListItem__current` allows you to customize the appearance of the _current_ active device list (accordion) item
- `activeDevice` allows you to customize the appearance of the active device item
- `activeDevice__current` allows you to customize the appearance of the _current_ active device item
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,25 @@ const DeviceAccordion = (props: { session: SessionWithActivitiesResource }) => {
};

return (
<UserProfileAccordion title={<DeviceInfo session={props.session} />}>
<UserProfileAccordion
elementDescriptor={descriptors.activeDeviceListItem}
elementId={isCurrent ? descriptors.activeDeviceListItem.setId('current') : undefined}
title={<DeviceInfo session={props.session} />}
>
<Col gap={4}>
{isCurrent && (
<LinkButtonWithDescription
title={localizationKeys('userProfile.start.activeDevicesSection.detailsTitle')}
subtitle={localizationKeys('userProfile.start.activeDevicesSection.detailsSubtitle')}
title={localizationKeys('userProfile.start.activeDevicesSection.detailsTitle')}
/>
)}
{!isCurrent && (
<LinkButtonWithDescription
title={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionTitle')}
subtitle={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionSubtitle')}
actionLabel={localizationKeys('userProfile.start.activeDevicesSection.destructiveAction')}
colorScheme='danger'
onClick={revoke}
subtitle={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionSubtitle')}
title={localizationKeys('userProfile.start.activeDevicesSection.destructiveActionTitle')}
/>
)}
</Col>
Expand All @@ -82,6 +86,8 @@ const DeviceInfo = (props: { session: SessionWithActivitiesResource }) => {

return (
<Flex
elementDescriptor={descriptors.activeDevice}
elementId={isCurrent ? descriptors.activeDevice.setId('current') : undefined}
align='center'
sx={t => ({
gap: t.space.$8,
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/ui/customizables/elementDescriptors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'page',
'pageHeader',

'activeDevice',
'activeDeviceListItem',
'activeDeviceIcon',

'impersonationFab',
Expand Down
25 changes: 14 additions & 11 deletions packages/clerk-js/src/ui/elements/Accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ import React from 'react';

import { Col, descriptors } from '../customizables';
import { Caret } from '../icons';
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { ArrowBlockButton } from './ArrowBlockButton';

type AccordionItemProps = React.PropsWithChildren<{
title: React.ReactElement | string;
icon?: React.ReactElement;
badge?: React.ReactElement;
defaultOpen?: boolean;
toggleable?: boolean;
scrollOnOpen?: boolean;
onCloseCallback?: () => void;
}>;
type AccordionItemProps = Omit<PropsOfComponent<typeof Col>, 'title'> &
React.PropsWithChildren<{
title: React.ReactElement | string;
icon?: React.ReactElement;
badge?: React.ReactElement;
defaultOpen?: boolean;
toggleable?: boolean;
scrollOnOpen?: boolean;
onCloseCallback?: () => void;
}>;

export const AccordionItem = (props: AccordionItemProps) => {
const {
Expand All @@ -25,6 +27,7 @@ export const AccordionItem = (props: AccordionItemProps) => {
scrollOnOpen = false,
badge,
onCloseCallback = null,
...rest
} = props;
const [isOpen, setIsOpen] = React.useState(defaultOpen);
const contentRef = React.useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -52,10 +55,10 @@ export const AccordionItem = (props: AccordionItemProps) => {
}

return () => cancelAnimationFrame(requestRef);
}, [isOpen]);
}, [isOpen, scrollOnOpen]);

return (
<Col>
<Col {...rest}>
<ArrowBlockButton
elementDescriptor={descriptors.accordionTriggerButton}
variant='ghost'
Expand Down
2 changes: 2 additions & 0 deletions packages/types/src/appearance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ export type ElementsConfig = {
page: WithOptions;
pageHeader: WithOptions;

activeDevice: WithOptions<'current'>;
activeDeviceListItem: WithOptions<'current'>;
activeDeviceIcon: WithOptions<'mobile' | 'desktop'>;

impersonationFab: WithOptions;
Expand Down