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
6 changes: 6 additions & 0 deletions .changeset/polite-beds-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': minor
'@clerk/types': minor
---

Remove the unused appearance keys for accordion and breadcrumb elements.
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/common/CalloutWithAction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const CalloutWithAction = (props: PropsWithChildren<CalloutWithActionProp
/>
<Col gap={4}>
<Text
colorScheme='neutral'
colorScheme='secondary'
sx={textSx}
localizationKey={text}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/common/EmailLinkStatusCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const StatusRow = (props: { status: VerificationStatus }) => {
<StatusIcon status={props.status} />
<Text
elementDescriptor={descriptors.verificationLinkStatusText}
colorScheme='neutral'
colorScheme='secondary'
localizationKey={localizationKeys('signIn.emailLink.unusedTab.title')}
/>
</>
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/common/RemoveResourceForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const RemoveResourceForm = withCardStateProvider((props: RemoveFormProps)
<Form.Root onSubmit={handleSubmit}>
{messageLine2 ? (
<Text
colorScheme='neutral'
colorScheme='secondary'
localizationKey={messageLine2}
/>
) : null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const FabContent = ({ title, signOutText }: FabContentProps) => {
})}
>
<Text
colorScheme='neutral'
colorScheme='secondary'
elementDescriptor={descriptors.impersonationFabTitle}
variant='buttonLarge'
truncate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const AcceptRejectInvitationButtons = (props: OrganizationSuggestionResou
if (props.status === 'accepted') {
return (
<Text
colorScheme='neutral'
colorScheme='secondary'
localizationKey={localizationKeys('organizationList.suggestionsAcceptedLabel')}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const ActionConfirmationPage = withCardStateProvider((props: ActionConfirmationP
<Col>
<Text
localizationKey={messageLine1}
colorScheme='neutral'
colorScheme='secondary'
/>
<Text
localizationKey={messageLine2}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const InvitationRow = (props: {
<Td>{invitation.createdAt.toLocaleDateString()}</Td>
<Td>
<Text
colorScheme={'neutral'}
colorScheme='secondary'
localizationKey={localizeCustomRole(invitation.role) || unlocalizedRoleLabel}
/>
</Td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const RoleSelect = (props: {
{prefixLocalizationKey && (
<Text
as='span'
colorScheme='neutral'
colorScheme='secondary'
localizationKey={prefixLocalizationKey}
/>
)}
Expand Down Expand Up @@ -245,7 +245,7 @@ const RolesListItem = memo((props: RolesListItemProps) => {
]}
{...rest}
>
<Text colorScheme='neutral'>{option?.label}</Text>
<Text colorScheme='secondary'>{option?.label}</Text>
</Flex>
);
});
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const OrganizationDomainsSection = () => {
sx={t => ({
paddingLeft: t.space.$9,
})}
colorScheme='neutral'
colorScheme='secondary'
/>
</Col>
</Action.Trigger>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';
import { useProtect } from '../../common';
import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID } from '../../constants';
import { useOrganizationProfileContext } from '../../contexts';
import { Breadcrumbs, NavBar, NavbarContextProvider } from '../../elements';
import { NavBar, NavbarContextProvider } from '../../elements';
import { localizationKeys } from '../../localization';
import type { PropsOfComponent } from '../../styledSystem';

Expand Down Expand Up @@ -41,13 +41,3 @@ export const OrganizationProfileNavbar = (
</NavbarContextProvider>
);
};

export const OrganizationProfileBreadcrumbs = (props: Pick<PropsOfComponent<typeof Breadcrumbs>, 'title'>) => {
const { pages } = useOrganizationProfileContext();
return (
<Breadcrumbs
{...props}
pageToRootNavbarRoute={pages.pageToRootNavbarRouteMap}
/>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const AcceptRejectSuggestionButtons = (props: OrganizationSuggestionResource) =>
if (props.status === 'accepted') {
return (
<Text
colorScheme='neutral'
colorScheme='secondary'
localizationKey={localizationKeys('organizationSwitcher.suggestionsAcceptedLabel')}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const SignInFactorTwoCodeForm = (props: SignInFactorTwoCodeFormProps) =>
{isResettingPassword(signIn) && (
<Text
localizationKey={localizationKeys('signIn.resetPasswordMfa.detailsLabel')}
colorScheme='neutral'
colorScheme='secondary'
/>
)}
</VerificationCodeCard>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ const DeviceInfo = (props: { session: SessionWithActivitiesResource }) => {
/>
)}
</Flex>
<Text colorScheme='neutral'>{browser}</Text>
<Text colorScheme='neutral'>
<Text colorScheme='secondary'>{browser}</Text>
<Text colorScheme='secondary'>
{ipAddress} ({location})
</Text>
<Text colorScheme='neutral'>{t(getRelativeToNowDateKey(props.session.lastActiveAt))}</Text>
<Text colorScheme='secondary'>{t(getRelativeToNowDateKey(props.session.lastActiveAt))}</Text>
</Col>
</Flex>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const AddAuthenticatorApp = withCardStateProvider((props: AddAuthenticato
{displayFormat == 'uri' && (
<>
<Text
colorScheme='neutral'
colorScheme='secondary'
localizationKey={localizationKeys(
'userProfile.mfaTOTPPage.authenticatorApp.inputLabel__unableToScan1',
)}
Expand All @@ -75,7 +75,7 @@ export const AddAuthenticatorApp = withCardStateProvider((props: AddAuthenticato
<ClipboardInput value={totp.secret} />

<Text
colorScheme='neutral'
colorScheme='secondary'
localizationKey={localizationKeys(
'userProfile.mfaTOTPPage.authenticatorApp.inputLabel__unableToScan2',
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const ConnectedAccountsSection = withCardStateProvider(() => {
<Text
truncate
as='span'
colorScheme='neutral'
colorScheme='secondary'
>
{label ? `• ${label}` : ''}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const DeleteUserForm = withCardStateProvider((props: DeleteUserFormProps)
<Form.Root onSubmit={deleteUser}>
<Col gap={1}>
<Text
colorScheme='neutral'
colorScheme='secondary'
localizationKey={localizationKeys('userProfile.deletePage.messageLine1')}
/>
<Text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ export const EnterpriseAccountsSection = () => {
>
<Text
truncate
colorScheme='primary'
colorScheme='body'
>
{providerName}
</Text>
<Text
truncate
as='span'
colorScheme='neutral'
colorScheme='secondary'
>
{label ? `• ${label}` : ''}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const LinkButtonWithDescription = (props: LinkButtonWithTextDescriptionPr
<Text
localizationKey={subtitle}
variant='caption'
colorScheme='neutral'
colorScheme='secondary'
/>
</Col>
{actionLabel && (
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const MfaBackupCodeList = (props: MfaBackupCodeListProps) => {
<Text
localizationKey={subtitle}
variant='caption'
colorScheme='neutral'
colorScheme='secondary'
/>
</Col>
<Box
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const AddMfa = (props: AddMfaProps) => {
? 'userProfile.mfaPhoneCodePage.subtitle__availablePhoneNumbers'
: 'userProfile.mfaPhoneCodePage.subtitle__unavailablePhoneNumbers',
)}
colorScheme='neutral'
colorScheme='secondary'
/>
{availableMethods.length > 0 && (
<Col gap={2}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const AddPhone = (props: AddPhoneProps) => {
>
<Text
localizationKey={localizationKeys('userProfile.phoneNumberPage.infoText')}
colorScheme='neutral'
colorScheme='secondary'
/>
<Form.ControlRow elementId={phoneField.id}>
<Form.PhoneInput
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import { useUserProfileContext } from '../../contexts';
import { Breadcrumbs, NavBar, NavbarContextProvider } from '../../elements';
import { NavBar, NavbarContextProvider } from '../../elements';
import { localizationKeys } from '../../localization';
import type { PropsOfComponent } from '../../styledSystem';

Expand All @@ -22,13 +22,3 @@ export const UserProfileNavbar = (
</NavbarContextProvider>
);
};

export const UserProfileBreadcrumbs = (props: Pick<PropsOfComponent<typeof Breadcrumbs>, 'title'>) => {
const { pages } = useUserProfileContext();
return (
<Breadcrumbs
{...props}
pageToRootNavbarRoute={pages.pageToRootNavbarRouteMap}
/>
);
};
12 changes: 0 additions & 12 deletions packages/clerk-js/src/ui/customizables/elementDescriptors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,6 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'formattedPhoneNumberFlag',
'formattedPhoneNumberText',

'breadcrumbs',
'breadcrumbsItems',
'breadcrumbsItemBox',
'breadcrumbsItem',
'breadcrumbsItemIcon',
'breadcrumbsItemDivider',

'scrollBox',

'navbar',
Expand All @@ -258,9 +251,6 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'invitationsSentIconBox',
'invitationsSentIcon',

'accordionTriggerButton',
'accordionContent',

'qrCodeRow',
'qrCodeContainer',

Expand All @@ -269,8 +259,6 @@ export const APPEARANCE_KEYS = containsAllElementsConfigKeys([
'buttonArrowIcon',
'providerIcon',
'spinner',
// Decide if we want to keep the keys as camel cased in HTML as well,
// if yes, refactor and remove the .map(camelize) method
] as const).map(camelize) as (keyof ElementsConfig)[];

type TargettableClassname<K extends keyof ElementsConfig> = `${typeof CLASS_PREFIX}${K}`;
Expand Down
Loading