Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(clerk-js): Align some sections in User Profile with the designs #2814

Merged
merged 6 commits into from
Feb 16, 2024
Merged

fix(clerk-js): Align some sections in User Profile with the designs #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8ae70b
fix(clerk-js): Align some sections in User Profile with the designs
octoper Feb 16, 2024
423ae22
chore(repo): Add Changeset
octoper Feb 16, 2024
1647a19
fix(clerk-js): Align some sections in User Profile with the designs
octoper Feb 16, 2024
7d56bf4
fix(clerk-js): Fix spacing issues to mach the designs
octoper Feb 16, 2024
dbd22be
chore(clerk-js): Revert accidental change
octoper Feb 16, 2024
cf24ec6
fix(clerk-js): Fix spacing for MFA section
octoper Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/nine-mangos-look.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 4 additions & 1 deletion packages/clerk-js/src/ui/components/OrganizationProfile/DomainList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,10 @@ export const DomainList = withProtect(
{domainList.map(domain => {
return (
<Action.Root key={domain.id}>
<ProfileSection.Item id='organizationDomains'>
<ProfileSection.Item
id='organizationDomains'
hoverable
>
<Flex sx={t => ({ gap: t.space.$1 })}>
<Text>{domain.name}</Text>
<EnrollmentBadge organizationDomain={domain} />
Expand Down
8 changes: 3 additions & 5 deletions packages/clerk-js/src/ui/components/UserProfile/ActiveDevicesSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,10 @@ const DeviceItem = ({ session }: { session: SessionWithActivitiesResource }) =>
id='activeDevices'
elementDescriptor={descriptors.activeDeviceListItem}
elementId={isCurrent ? descriptors.activeDeviceListItem.setId('current') : undefined}
sx={t => ({
hoverable
sx={{
alignItems: 'flex-start',
padding: `${t.space.$1x5} ${t.space.$1x5} ${t.space.$1x5} ${t.space.$3}`,
borderRadius: t.radii.$lg,
':hover': { backgroundColor: t.colors.$neutralAlpha50 },
})}
}}
>
{status.isLoading && <FullHeightLoader />}
{!status.isLoading && (
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ export const ConnectedAccountsSection = withCardStateProvider(() => {

return (
<Action.Root key={account.id}>
<ProfileSection.Item id='connectedAccounts'>
<ProfileSection.Item
id='connectedAccounts'
hoverable
>
<Flex sx={t => ({ overflow: 'hidden', gap: t.space.$2 })}>
<Image
elementDescriptor={[descriptors.providerIcon]}
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ export const EmailsSection = () => {
<ProfileSection.ItemList id='emailAddresses'>
{user?.emailAddresses.sort(primaryIdentificationFirst(user.primaryEmailAddressId)).map(email => (
<Action.Root key={email.emailAddress}>
<ProfileSection.Item id='emailAddresses'>
<ProfileSection.Item
id='emailAddresses'
hoverable
>
<Flex
as='span'
sx={t => ({ overflow: 'hidden', gap: t.space.$1 })}
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/components/UserProfile/EnterpriseAccountsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const EnterpriseAccountsSection = () => {
gap: t.space.$2,
justifyContent: 'start',
})}
hoverable
key={account.id}
>
<Image
Expand Down
15 changes: 12 additions & 3 deletions packages/clerk-js/src/ui/components/UserProfile/MfaSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ export const MfaSection = () => {
<ProfileSection.ItemList id='mfa'>
{showTOTP && (
<Action.Root>
<ProfileSection.Item id='mfa'>
<ProfileSection.Item
id='mfa'
hoverable
>
<Flex sx={t => ({ gap: t.space.$2, alignItems: 'center' })}>
<Icon
icon={AuthApp}
Expand Down Expand Up @@ -73,7 +76,10 @@ export const MfaSection = () => {
const isDefault = !showTOTP && phone.defaultSecondFactor;
return (
<Action.Root key={phone.id}>
<ProfileSection.Item id='mfa'>
<ProfileSection.Item
id='mfa'
hoverable
>
<Flex sx={t => ({ gap: t.space.$2, alignItems: 'center' })}>
<Icon
icon={Mobile}
Expand Down Expand Up @@ -102,7 +108,10 @@ export const MfaSection = () => {

{showBackupCode && (
<Action.Root>
<ProfileSection.Item id='mfa'>
<ProfileSection.Item
id='mfa'
hoverable
>
<Flex sx={t => ({ gap: t.space.$2, alignItems: 'center' })}>
<Icon
icon={DotCircle}
Expand Down
5 changes: 4 additions & 1 deletion packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ export const PhoneSection = () => {
{user?.phoneNumbers.sort(primaryIdentificationFirst(user.primaryPhoneNumberId)).map(phone => (
<Action.Root key={phone.id}>
<Action.Closed value=''>
<ProfileSection.Item id='phoneNumbers'>
<ProfileSection.Item
id='phoneNumbers'
hoverable
>
<Box sx={{ whiteSpace: 'nowrap', overflow: 'hidden' }}>
<Flex
gap={2}
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/components/UserProfile/Web3Section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const Web3Section = withCardStateProvider(() => {
key={wallet.id}
id='web3Wallets'
align='start'
hoverable
>
<Flex sx={t => ({ alignItems: 'center', gap: t.space.$2, width: '100%' })}>
{strategyToDisplayData[strategy].iconUrl && (
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/elements/ArrowBlockButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export const ArrowBlockButton = React.forwardRef<HTMLButtonElement, ArrowBlockBu
justifyContent: 'center',
borderColor: theme.colors.$neutralAlpha100,
alignItems: 'center',
padding: `${theme.space.$1x5} ${theme.space.$3} ${theme.space.$1x5} ${theme.space.$2x5}`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this necessary? Isn't it going to make most screens deviate from designs now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the padding that the designs have.

'--arrow-opacity': '0',
'--arrow-transform': `translateX(-${theme.space.$2});`,
'&:hover,&:focus ': {
Expand Down
14 changes: 11 additions & 3 deletions packages/clerk-js/src/ui/elements/Section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,13 @@ const ProfileSectionItemList = (props: ProfileSectionItemListProps) => {
);
};

type ProfileSectionItemProps = Omit<PropsOfComponent<typeof Flex>, 'id'> & { id: ProfileSectionId };
type ProfileSectionItemProps = Omit<PropsOfComponent<typeof Flex>, 'id'> & {
id: ProfileSectionId;
hoverable?: boolean;
};

const ProfileSectionItem = (props: ProfileSectionItemProps) => {
const { children, id, sx, ...rest } = props;
const { children, id, sx, hoverable, ...rest } = props;

return (
<Flex
Expand All @@ -128,8 +131,13 @@ const ProfileSectionItem = (props: ProfileSectionItemProps) => {
justifyContent: 'space-between',
width: '100%',
alignItems: 'center',
padding: `${t.space.$1x5} ${t.space.$none} ${t.space.$1x5} ${t.space.$4}`,
padding: `${t.space.$2} ${t.space.$3} ${t.space.$1x5} ${t.space.$2x5}`,
gap: t.space.$2,
...(hoverable && {
padding: `${t.space.$1} ${t.space.$1} ${t.space.$1} ${t.space.$2x5}`,
borderRadius: t.radii.$lg,
':hover': { backgroundColor: t.colors.$neutralAlpha50 },
}),
}),
sx,
]}
Expand Down
5 changes: 3 additions & 2 deletions packages/clerk-js/src/ui/elements/ThreeDotsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export const ThreeDotsMenu = (props: ThreeDotsMenuProps) => {
<MenuTrigger>
<Button
sx={t => ({
padding: t.space.$0x25,
padding: t.space.$0x5,
boxSizing: 'content-box',
opacity: t.opacity.$inactive,
':hover': {
opacity: 1,
Expand All @@ -35,7 +36,7 @@ export const ThreeDotsMenu = (props: ThreeDotsMenuProps) => {
>
<Icon
icon={ThreeDots}
sx={t => ({ width: 'auto', height: t.sizes.$4 })}
sx={t => ({ width: 'auto', height: t.sizes.$5 })}
/>
</Button>
</MenuTrigger>
Expand Down
Loading