Skip to content

chore(clerk-js): Sort <PricingTable /> features #5528

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

Closed
alexcarpenter wants to merge 2 commits into from
Closed

chore(clerk-js): Sort <PricingTable /> features #5528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab34f94
chore(clerk-js): Sort `<PricingTable />` features
alexcarpenter Apr 3, 2025
07dd36f
sort
alexcarpenter Apr 3, 2025
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
89 changes: 55 additions & 34 deletions packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,14 +412,62 @@ interface CardFeaturesListProps {
isCompact?: boolean;
}

const INITIAL_FEATURES_COUNT = 3;

interface FeatureListItemProps {
feature: __experimental_CommercePlanResource['features'][number];
}

const FeatureListItem = React.memo(({ feature }: FeatureListItemProps) => (
<Box
elementDescriptor={descriptors.pricingTableCardFeaturesListItem}
elementId={descriptors.pricingTableCardFeaturesListItem.setId(feature.slug)}
key={feature.id}
as='li'
sx={t => ({
display: 'flex',
alignItems: 'baseline',
gap: t.space.$2,
})}
>
<Icon
icon={Check}
colorScheme='neutral'
size='sm'
aria-hidden
sx={t => ({
transform: `translateY(${t.space.$0x25})`,
})}
/>
<Span elementDescriptor={descriptors.pricingTableCardFeaturesListItemContent}>
<Text
elementDescriptor={descriptors.pricingTableCardFeaturesListItemTitle}
colorScheme='body'
sx={t => ({
fontWeight: t.fontWeights.$normal,
})}
>
{feature.name}
</Text>
</Span>
</Box>
));

const CardFeaturesList = React.forwardRef<HTMLDivElement, CardFeaturesListProps>((props, ref) => {
const { plan, isCompact } = props;
const totalFeatures = plan.features.length;
const [showAllFeatures, setShowAllFeatures] = React.useState(false);
const canToggleFeatures = isCompact && totalFeatures > 3;
const canToggleFeatures = isCompact && totalFeatures > INITIAL_FEATURES_COUNT;

const displayedFeatures = React.useMemo(
() => plan.features.slice(0, showAllFeatures || !canToggleFeatures ? totalFeatures : INITIAL_FEATURES_COUNT),
[plan.features, showAllFeatures, canToggleFeatures, totalFeatures],
);

const toggleFeatures = () => {
setShowAllFeatures(prev => !prev);
};

return (
<Box
ref={ref}
Expand All @@ -435,51 +483,25 @@ const CardFeaturesList = React.forwardRef<HTMLDivElement, CardFeaturesListProps>
data-variant={isCompact ? 'compact' : 'default'}
as='ul'
role='list'
aria-label='Features list'
sx={t => ({
display: 'grid',
flex: '1',
rowGap: isCompact ? t.space.$2 : t.space.$3,
})}
>
{plan.features.slice(0, showAllFeatures || !canToggleFeatures ? totalFeatures : 3).map(feature => (
<Box
elementDescriptor={descriptors.pricingTableCardFeaturesListItem}
elementId={descriptors.pricingTableCardFeaturesListItem.setId(feature.slug)}
{displayedFeatures.map(feature => (
<FeatureListItem
key={feature.id}
as='li'
sx={t => ({
display: 'flex',
alignItems: 'baseline',
gap: t.space.$2,
})}
>
<Icon
icon={Check}
colorScheme='neutral'
size='sm'
aria-hidden
sx={t => ({
transform: `translateY(${t.space.$0x25})`,
})}
/>
<Span elementDescriptor={descriptors.pricingTableCardFeaturesListItemContent}>
<Text
elementDescriptor={descriptors.pricingTableCardFeaturesListItemTitle}
colorScheme='body'
sx={t => ({
fontWeight: t.fontWeights.$normal,
})}
>
{feature.name}
</Text>
</Span>
</Box>
feature={feature}
/>
))}
</Box>
{canToggleFeatures && (
<SimpleButton
onClick={toggleFeatures}
variant='link'
aria-expanded={showAllFeatures}
sx={t => ({
marginBlockStart: t.space.$2,
gap: t.space.$1,
Expand All @@ -491,7 +513,6 @@ const CardFeaturesList = React.forwardRef<HTMLDivElement, CardFeaturesListProps>
size='md'
aria-hidden
/>
{/* TODO(@Commerce): needs localization */}
{showAllFeatures ? 'Hide features' : 'See all features'}
</SimpleButton>
)}
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/PricingTable/PricingTableMatrix.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export function PricingTableMatrix({
plans.forEach(({ features }) => {
features.forEach(({ name }) => featuresSet.add(name));
});
return Array.from(featuresSet);
return Array.from(featuresSet).sort((a, b) => a.localeCompare(b));
Copy link
Copy Markdown
Contributor

@panteliselef panteliselef Apr 4, 2025

Choose a reason for hiding this comment

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

I'd argue fapi should allow for sorting by name. But ignore my comment if you've already discussed this.

Copy link
Copy Markdown
Member Author

@alexcarpenter alexcarpenter Apr 4, 2025

Choose a reason for hiding this comment

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

you are correct

}, [plans]);

if (!plans.length) {
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/PricingTable/SubscriptionDetailDrawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function SubscriptionDetailDrawer({
if (!subscription) {
return null;
}
const features = subscription.plan.features;
const features = subscription.plan.features.sort((a, b) => a.name.localeCompare(b.name));
const hasFeatures = features.length > 0;
const cancelSubscription = async () => {
setCancelError(undefined);
Expand Down
Loading