Skip to content

fix(clerk-js): Ensure social buttons always contain the same label format #7114

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(clerk-js): Ensure social buttons always contain the same label format #7114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 8 additions & 12 deletions packages/clerk-js/src/ui/elements/SocialButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,15 @@ export const SocialButtons = React.memo((props: SocialButtonsRootProps) => {
);
const strategyRowOneLength = strategyRows.at(lastAuthenticationStrategyPresent ? 1 : 0)?.length ?? 0;

// When last auth strategy is present, check remaining strategies count for button type
const remainingStrategiesCount = lastAuthenticationStrategyPresent ? strategies.length - 1 : strategies.length;

const preferBlockButtons =
socialButtonsVariant === 'blockButton'
? true
: socialButtonsVariant === 'iconButton'
? false
: strategies.length <= SOCIAL_BUTTON_BLOCK_THRESHOLD;
: remainingStrategiesCount <= SOCIAL_BUTTON_BLOCK_THRESHOLD;

const startOauth = async (strategy: OAuthStrategy | Web3Strategy) => {
card.setLoading(strategy);
Expand Down Expand Up @@ -161,12 +164,12 @@ export const SocialButtons = React.memo((props: SocialButtonsRootProps) => {
>
{row.map(strategy => {
const label =
strategies.length === SOCIAL_BUTTON_PRE_TEXT_THRESHOLD
remainingStrategiesCount <= SOCIAL_BUTTON_PRE_TEXT_THRESHOLD
? `Continue with ${strategyToDisplayData[strategy].name}`
: strategyToDisplayData[strategy].name;

const localizedText =
strategies.length === SOCIAL_BUTTON_PRE_TEXT_THRESHOLD
remainingStrategiesCount <= SOCIAL_BUTTON_PRE_TEXT_THRESHOLD
? localizationKeys('socialButtonsBlockButton', {
provider: strategyToDisplayData[strategy].name,
})
Expand Down Expand Up @@ -224,15 +227,6 @@ type SocialButtonProps = PropsOfComponent<typeof Button> & {
const SocialButtonIcon = forwardRef((props: SocialButtonProps, ref: Ref<HTMLButtonElement> | null): JSX.Element => {
const { icon, label, id, textLocalizationKey, lastAuthenticationStrategy, ...rest } = props;

if (lastAuthenticationStrategy) {
return (
<SocialButtonBlock
{...props}
ref={ref}
/>
);
}

return (
<Button
ref={ref}
Expand All @@ -245,9 +239,11 @@ const SocialButtonIcon = forwardRef((props: SocialButtonProps, ref: Ref<HTMLButt
sx={t => ({
minHeight: t.sizes.$8,
width: '100%',
position: 'relative',
})}
{...rest}
>
{lastAuthenticationStrategy && <LastAuthenticationStrategyBadge overlay />}
{icon}
</Button>
);
Expand Down