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.

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

feat(clerk-js): Add primary button variant with all states #2241

Merged
merged 1 commit into from
Dec 1, 2023
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
2 changes: 2 additions & 0 deletions .changeset/blue-garlics-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export const CreateOrganizationForm = (props: CreateOrganizationFormProps) => {
avatarPreviewPlaceholder={
<IconButton
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
aria-label='Upload organization logo'
icon={
<Icon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,8 @@ const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void
<Button
elementDescriptor={descriptors.button}
block
colorScheme='neutral'
// size='sm'
variant='outline'
variant='secondary'
colorScheme='secondary'
textVariant='buttonExtraSmallBold'
onClick={handleCreateOrganizationClicked}
localizationKey={localizationKeys('organizationList.action__createOrganization')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export const PreviewListItemButton = (props: Parameters<typeof Button>[0]) => {
elementDescriptor={descriptors.organizationListPreviewItemActionButton}
textVariant='buttonExtraSmallBold'
variant='outline'
colorScheme='neutral'
colorScheme='secondary'
size='sm'
{...props}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export const DomainList = withGate(
<ArrowBlockButton
key={d.id}
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
badge={!verificationStatus ? <EnrollmentBadge organizationDomain={d} /> : undefined}
sx={t => ({
padding: `${t.space.$3} ${t.space.$4}`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer(
<Button
elementDescriptor={descriptors.organizationSwitcherTrigger}
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
sx={[t => ({ minHeight: 0, padding: `0 ${t.space.$2} 0 0`, position: 'relative' }), sx]}
ref={ref}
aria-label={`${props.isOpen ? 'Close' : 'Open'} organization switcher`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ const AcceptRejectSuggestionButtons = (props: OrganizationSuggestionResource) =>
<Button
elementDescriptor={descriptors.organizationSwitcherInvitationAcceptButton}
textVariant='buttonExtraSmallBold'
variant='outline'
colorScheme='neutral'
variant='secondary'
colorScheme='secondary'
size='sm'
isLoading={card.isLoading}
onClick={handleAccept}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const UserButtonPopover = React.forwardRef<HTMLDivElement, UserButtonPopo
sx={t => ({
borderBottomLeftRadius: t.radii.$lg,
borderBottomRightRadius: t.radii.$lg,
backgroundColor: t.colors.$colorBackground,
})}
/>
);
Expand All @@ -67,20 +68,11 @@ export const UserButtonPopover = React.forwardRef<HTMLDivElement, UserButtonPopo
icon={SignOut}
label={localizationKeys('userButton.action__signOutAll')}
onClick={handleSignOutAllClicked}
colorScheme='danger'
sx={t => ({
padding: `${t.space.$2} ${t.space.$3}`,
backgroundColor: t.colors.$transparent,
borderBottom: 'none',
borderRadius: t.radii.$lg,
':hover': {
backgroundColor: t.colors.$danger50,
},
':hover .cl-userButtonPopoverActionButtonText__signOutAll': {
color: t.colors.$danger400,
},
':hover .cl-userButtonPopoverActionButtonIcon__signOutAll': {
color: t.colors.$danger400,
},
})}
/>
</Actions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export const MfaBackupCodeCreatePage = withCardStateProvider(() => {

<FormButtonContainer>
<NavigateToFlowStartButton
variant='solid'
autoFocus
localizationKey={localizationKeys('userProfile.formButtonPrimary__finish')}
elementDescriptor={descriptors.formButtonPrimary}
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui.retheme/elements/Accordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export const AccordionItem = (props: AccordionItemProps) => {
<ArrowBlockButton
elementDescriptor={descriptors.accordionTriggerButton}
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
textVariant='smallRegular'
leftIcon={icon}
rightIcon={Caret}
Expand Down
5 changes: 2 additions & 3 deletions packages/clerk-js/src/ui.retheme/elements/Actions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const Action = (props: ActionProps) => {
<Button
size='md'
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
textVariant='buttonSmallRegular'
focusRing={false}
hoverAsFocus
Expand All @@ -73,7 +73,6 @@ export const Action = (props: ActionProps) => {
gap: theme.space.$3,
padding: `${theme.space.$4} ${theme.space.$5}`,
justifyContent: 'flex-start',
backgroundColor: theme.colors.$white,
}),
sx,
]}
Expand Down Expand Up @@ -153,7 +152,7 @@ export const SmallAction = (props: ActionProps) => {
<Button
size='xs'
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
textVariant='buttonSmallRegular'
focusRing={false}
hoverAsFocus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export const ArrowBlockButton = (props: ArrowBlockButtonProps) => {

return (
<SimpleButton
variant='outline'
colorScheme='neutral'
variant='secondary'
colorScheme='secondary'
block
isLoading={isLoading}
{...rest}
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui.retheme/elements/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
<IconButton
elementDescriptor={descriptors.modalCloseButton}
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
aria-label='Close modal'
onClick={toggle}
icon={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const ClipboardInput = (props: PropsOfComponent<typeof Input>) => {

<Button
elementDescriptor={descriptors.formFieldInputCopyToClipboardButton}
variant='ghostIcon'
variant='secondary'
tabIndex={-1}
colorScheme={'primary'}
onClick={onCopy}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const IdentityPreview = (props: IdentityPreviewProps) => {
const edit = onClick && (
<Button
elementDescriptor={descriptors.identityPreviewEditButton}
variant='ghostIcon'
variant='secondary'
onClick={onClick}
aria-label={'Edit'}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui.retheme/elements/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ const NavButton = (props: NavButtonProps) => {
return (
<Button
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
textVariant='buttonRegularMedium'
isActive={isActive}
{...rest}
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui.retheme/elements/Pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const PageButton = (props: PropsOfComponent<typeof Button> & { isActive?: boolea
<Button
size='xs'
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
sx={t => [
{
color: t.colors.$colorText,
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui.retheme/elements/PasswordInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ export const PasswordInput = forwardRef<HTMLInputElement, PasswordInputProps>((p
elementDescriptor={descriptors.formFieldInputShowPasswordButton}
iconElementDescriptor={descriptors.formFieldInputShowPasswordIcon}
aria-label={`${hidden ? 'Show' : 'Hide'} password`}
variant='ghostIcon'
variant='secondary'
colorScheme={'secondary'}
tabIndex={-1}
colorScheme={'neutral'}
onClick={() => setHidden(s => !s)}
sx={theme => ({
position: 'absolute',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const PreviewButton = (props: PreviewButtonProps) => {
return (
<Button
variant='ghost'
colorScheme='neutral'
colorScheme='secondary'
focusRing={false}
block
hoverAsFocus
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui.retheme/elements/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ export const SelectButton = (props: PropsOfComponent<typeof Button>) => {
elementDescriptor={descriptors.selectButton}
elementId={descriptors.selectButton.setId(elementId)}
ref={reference}
colorScheme='neutral'
colorScheme='secondary'
variant='ghost'
textVariant='smallMedium'
onClick={onTriggerClick}
Expand Down
8 changes: 4 additions & 4 deletions packages/clerk-js/src/ui.retheme/elements/SocialButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ const SocialButtonIcon = forwardRef((props: SocialButtonProps, ref: Ref<HTMLButt
ref={ref}
elementDescriptor={descriptors.socialButtonsIconButton}
elementId={descriptors.socialButtonsIconButton.setId(id)}
variant='icon'
colorScheme='neutral'
variant='secondary'
colorScheme='secondary'
sx={t => ({
minHeight: t.sizes.$7x5,
width: '100%',
Expand All @@ -185,8 +185,8 @@ const SocialButtonBlock = (props: SocialButtonProps): JSX.Element => {
<SimpleButton
elementDescriptor={descriptors.socialButtonsBlockButton}
elementId={descriptors.socialButtonsBlockButton.setId(id)}
variant='outline'
colorScheme='neutral'
variant='secondary'
colorScheme='secondary'
block
isLoading={isLoading}
{...rest}
Expand Down
1 change: 0 additions & 1 deletion packages/clerk-js/src/ui.retheme/elements/SuccessPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export const SuccessPage = (props: SuccessPageProps) => {

<FormButtonContainer>
<NavigateToFlowStartButton
variant='solid'
autoFocus
//Do we need a separate key here?
localizationKey={finishLabel || localizationKeys('userProfile.formButtonPrimary__finish')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const ThreeDotsMenu = (props: ThreeDotsMenuProps) => {
opacity: 1,
},
})}
colorScheme='neutral'
colorScheme='secondary'
variant='ghost'
>
<Icon icon={ThreeDots} />
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui.retheme/elements/TileButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export const TileButton = (props: PropsOfComponent<typeof Button> & { icon: Reac

return (
<Button
colorScheme='neutral'
variant='outline'
variant='secondary'
colorScheme='secondary'
sx={[
t => ({
borderColor: t.colors.$blackAlpha200,
Expand Down
Loading
Loading