mirror of
https://github.com/supabase/supabase.git
synced 2026-10-10 03:45:06 +03:00
## Problem Primary colour serves readable text and selected controls, but those uses need different shades. Light mode needs darker text, while dark mode needs a deeper button fill. Fixed brand green on interactive chrome also prevents a custom primary hue from carrying through the interface. Some slider tracks and selected text are hard to read. ## Solution - Keep `--primary` for accessible text and small selected indicators. Use `--primary-solid` for button fills, which need a deeper shade in dark mode. - Add `--primary-bright` for focus rings, selected control chrome, chart accents, and other interactive highlights. It follows `--primary-hue`; `brand-*` stays fixed for Supabase identity. - Make slider troughs clearer and text selection translucent with theme foreground text. - Document the split in the design-system colour guide. | Before | After | | --- | --- | | <img width="980" height="244" alt="Before: light mode primary controls" src="https://github.com/user-attachments/assets/dfae325d-0dfe-4231-8bcd-3f89c4b9d793" /> | <img width="982" height="204" alt="After: light mode primary controls" src="https://github.com/user-attachments/assets/5fdcb531-a6e3-4549-8a13-9d9a5ebe6e20" /> | | <img width="610" height="120" alt="Before: slider track" src="https://github.com/user-attachments/assets/04f768e0-51e8-4d06-9b97-c52f4a34f122" /> | <img width="622" height="126" alt="After: slider track" src="https://github.com/user-attachments/assets/95127f4e-13dc-4f0f-b63c-cf5d70a28b42" /> | | <img width="652" height="512" alt="Before: dark mode controls" src="https://github.com/user-attachments/assets/3f88de66-90cc-40ee-8cf1-b5f4eb87b09a" /> | <img width="658" height="498" alt="After: dark mode controls" src="https://github.com/user-attachments/assets/906bec30-6ca1-4614-9fb3-6cf5e5feec22" /> | ## Review instructions 1. Compare light and dark mode in the [colour usage guide](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/color-usage#primary-and-brand-colors). Check primary ink, primary-solid, primary-bright, and fixed brand swatches. 2. In Studio, open the ‘new table’ sheet in [Table Editor](https://studio-staging-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/dashboard/project/_/editor). Tab through the new table sheet's fields and toggles. Check the focus rings, selected controls, and the sheet's edges in both themes. You do not need to save a table. 3. Select text in Studio in both themes, including a link or primary-coloured label. The selection and text should remain legible. 4. Check the [Field](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/field) Price Range slider: the unused track should remain visible in both themes. The selected field card border should follow primary-bright. 5. Check the [Button](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/button) and [Radio Group](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/components/radio-group) previews. In dark mode, `primary` button fill should be deeper than primary [text](https://design-system-git-dnywh-fix-bright-brand-chrome-supabase.vercel.app/design-system/docs/color-usage#text); selected radios should remain readable.
394 lines
12 KiB
TypeScript
394 lines
12 KiB
TypeScript
import { motion, type Variants } from 'framer-motion'
|
|
import { isArray } from 'lodash'
|
|
import { Check, X } from 'lucide-react'
|
|
import type { PricingInformation } from 'shared-data'
|
|
import { Button, cn } from 'ui'
|
|
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
|
|
|
|
import type { GapFeature, PlanPresentationVariant } from './plan-presentation'
|
|
import {
|
|
FREE_PLAN_GAPS,
|
|
hasPlanGaps,
|
|
isParityPresentation,
|
|
PRO_PLAN_GAPS,
|
|
} from './plan-presentation'
|
|
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
|
|
import { RequestUpgradeToBillingOwners } from '@/components/ui/RequestUpgradeToBillingOwners'
|
|
import { MANAGED_BY } from '@/lib/constants/infrastructure'
|
|
import { formatCurrency } from '@/lib/helpers'
|
|
|
|
const GAPS_BY_PLAN_ID: Record<string, GapFeature[]> = {
|
|
tier_free: FREE_PLAN_GAPS,
|
|
tier_pro: PRO_PLAN_GAPS,
|
|
}
|
|
|
|
export interface PlanCardProps {
|
|
plan: PricingInformation
|
|
price: number
|
|
isCurrentPlan: boolean
|
|
isDowngradeOption: boolean
|
|
isLoadingPlans: boolean
|
|
canUpdateSubscription: boolean
|
|
isPartnerBilledOrganization: boolean
|
|
hasOrioleProjects: boolean
|
|
currentSubscriptionPlanId: string | undefined
|
|
managedBy: string | undefined
|
|
shouldHighlight: boolean
|
|
variant: PlanPresentationVariant
|
|
variants?: Variants
|
|
onSelectTier: () => void
|
|
onTrackCtaClick: () => void
|
|
}
|
|
|
|
export function PlanCard({
|
|
plan,
|
|
price,
|
|
isCurrentPlan,
|
|
isDowngradeOption,
|
|
isLoadingPlans,
|
|
canUpdateSubscription,
|
|
isPartnerBilledOrganization,
|
|
hasOrioleProjects,
|
|
currentSubscriptionPlanId,
|
|
managedBy,
|
|
shouldHighlight,
|
|
variant,
|
|
variants,
|
|
onSelectTier,
|
|
onTrackCtaClick,
|
|
}: PlanCardProps) {
|
|
const isParity = isParityPresentation(variant)
|
|
const features = plan.features
|
|
const footer = plan.footer
|
|
|
|
const gaps: GapFeature[] = hasPlanGaps(variant) ? (GAPS_BY_PLAN_ID[plan.id] ?? []) : []
|
|
|
|
const ctaButton = isCurrentPlan ? (
|
|
<Button block disabled>
|
|
Current plan
|
|
</Button>
|
|
) : !canUpdateSubscription &&
|
|
!isDowngradeOption &&
|
|
(plan.name === 'Pro' || plan.name === 'Team') ? (
|
|
<RequestUpgradeToBillingOwners block plan={plan.name} />
|
|
) : (
|
|
<ButtonTooltip
|
|
block
|
|
variant={isDowngradeOption ? 'default' : 'primary'}
|
|
disabled={
|
|
(!canUpdateSubscription && isDowngradeOption) ||
|
|
currentSubscriptionPlanId === 'enterprise' ||
|
|
currentSubscriptionPlanId === 'platform' ||
|
|
(isPartnerBilledOrganization && plan.id !== 'tier_free') ||
|
|
managedBy === MANAGED_BY.AWS_MARKETPLACE ||
|
|
hasOrioleProjects
|
|
}
|
|
onClick={() => {
|
|
onSelectTier()
|
|
onTrackCtaClick()
|
|
}}
|
|
tooltip={{
|
|
content: {
|
|
side: 'bottom' as const,
|
|
className: hasOrioleProjects ? 'w-96 text-center' : '',
|
|
text:
|
|
!canUpdateSubscription && isDowngradeOption
|
|
? "You need additional permissions to change your organization's plan"
|
|
: currentSubscriptionPlanId === 'enterprise' ||
|
|
currentSubscriptionPlanId === 'platform'
|
|
? 'Reach out to us via support to update your plan'
|
|
: hasOrioleProjects
|
|
? 'Your organization has projects that are using the OrioleDB extension which is only available on the Free plan. Remove all OrioleDB projects before changing your plan.'
|
|
: managedBy === MANAGED_BY.AWS_MARKETPLACE
|
|
? 'You cannot change the plan for an organization managed by AWS Marketplace'
|
|
: undefined,
|
|
},
|
|
}}
|
|
>
|
|
{isDowngradeOption ? 'Downgrade' : 'Upgrade'} to {plan.name}
|
|
</ButtonTooltip>
|
|
)
|
|
|
|
if (!isParity) {
|
|
return (
|
|
<ControlCard
|
|
plan={plan}
|
|
price={price}
|
|
isCurrentPlan={isCurrentPlan}
|
|
isLoadingPlans={isLoadingPlans}
|
|
shouldHighlight={shouldHighlight}
|
|
features={features}
|
|
footer={footer}
|
|
ctaButton={ctaButton}
|
|
variants={variants}
|
|
/>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<ParityCard
|
|
plan={plan}
|
|
price={price}
|
|
isCurrentPlan={isCurrentPlan}
|
|
isLoadingPlans={isLoadingPlans}
|
|
shouldHighlight={shouldHighlight}
|
|
features={features}
|
|
footer={footer}
|
|
gaps={gaps}
|
|
ctaButton={ctaButton}
|
|
variants={variants}
|
|
/>
|
|
)
|
|
}
|
|
|
|
function ControlCard({
|
|
plan,
|
|
price,
|
|
isCurrentPlan,
|
|
isLoadingPlans,
|
|
shouldHighlight,
|
|
features,
|
|
footer,
|
|
ctaButton,
|
|
variants,
|
|
}: {
|
|
plan: PricingInformation
|
|
price: number
|
|
isCurrentPlan: boolean
|
|
isLoadingPlans: boolean
|
|
shouldHighlight: boolean
|
|
features: (string | string[])[]
|
|
footer: string | undefined
|
|
ctaButton: React.ReactNode
|
|
variants?: Variants
|
|
}) {
|
|
return (
|
|
<motion.div
|
|
variants={variants}
|
|
className={cn(
|
|
'px-4 py-4 flex flex-col items-start justify-between',
|
|
'border rounded-md col-span-12 md:col-span-4 bg-surface-200',
|
|
shouldHighlight &&
|
|
'ring-4 ring-primary-bright animate-[pulse_1.5s_ease-in-out_1] motion-reduce:animate-none shadow-md shadow-primary-bright/40'
|
|
)}
|
|
>
|
|
<div className="w-full">
|
|
<div className="flex items-center space-x-2">
|
|
<p className="text-primary text-sm uppercase">{plan.name}</p>
|
|
{isCurrentPlan ? (
|
|
<div className="text-xs bg-surface-300 text-foreground-light rounded-sm px-2 py-0.5">
|
|
Current plan
|
|
</div>
|
|
) : plan.nameBadge ? (
|
|
<div className="text-xs bg-brand-300 dark:bg-brand-400 text-brand-600 rounded-sm px-2 py-0.5">
|
|
{plan.nameBadge}
|
|
</div>
|
|
) : null}
|
|
</div>
|
|
<div className="mt-4 flex items-center space-x-1 mb-4">
|
|
{(price ?? 0) > 0 && <p className="text-foreground-light text-sm">From</p>}
|
|
{isLoadingPlans ? (
|
|
<div className="h-[28px] flex items-center justify-center">
|
|
<ShimmeringLoader className="w-[30px] h-[24px]" />
|
|
</div>
|
|
) : (
|
|
<p className="text-foreground text-lg" translate="no">
|
|
{formatCurrency(price)}
|
|
</p>
|
|
)}
|
|
<p className="text-foreground-light text-sm">{plan.costUnit}</p>
|
|
</div>
|
|
{ctaButton}
|
|
|
|
<div className="border-t my-4" />
|
|
|
|
<ul role="list">
|
|
{features.map((feature) => (
|
|
<li key={typeof feature === 'string' ? feature : feature[0]} className="flex py-2">
|
|
<div className="w-[12px]">
|
|
<Check
|
|
className="h-3 w-3 text-primary translate-y-[2.5px]"
|
|
aria-hidden="true"
|
|
strokeWidth={3}
|
|
/>
|
|
</div>
|
|
<div>
|
|
<p className="ml-3 text-xs text-foreground-light">
|
|
{typeof feature === 'string' ? feature : feature[0]}
|
|
</p>
|
|
{isArray(feature) && (
|
|
<p className="ml-3 text-xs text-foreground-lighter">{feature[1]}</p>
|
|
)}
|
|
</div>
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</div>
|
|
|
|
{footer && (
|
|
<div className="border-t pt-4 mt-4">
|
|
<p className="text-foreground-light text-xs">{footer}</p>
|
|
</div>
|
|
)}
|
|
</motion.div>
|
|
)
|
|
}
|
|
|
|
function ParityCard({
|
|
plan,
|
|
price,
|
|
isCurrentPlan,
|
|
isLoadingPlans,
|
|
shouldHighlight,
|
|
features,
|
|
footer,
|
|
gaps,
|
|
ctaButton,
|
|
variants,
|
|
}: {
|
|
plan: PricingInformation
|
|
price: number
|
|
isCurrentPlan: boolean
|
|
isLoadingPlans: boolean
|
|
shouldHighlight: boolean
|
|
features: (string | string[])[]
|
|
footer: string | undefined
|
|
gaps: GapFeature[]
|
|
ctaButton: React.ReactNode
|
|
variants?: Variants
|
|
}) {
|
|
return (
|
|
<motion.div
|
|
variants={variants}
|
|
className={cn(
|
|
'flex flex-col items-start justify-between',
|
|
'border rounded-md col-span-12 md:col-span-4 bg-surface-200',
|
|
shouldHighlight &&
|
|
'ring-4 ring-primary-bright animate-[pulse_1.5s_ease-in-out_1] motion-reduce:animate-none shadow-md shadow-primary-bright/40'
|
|
)}
|
|
>
|
|
<div className="w-full px-4 pt-4">
|
|
<div className="flex items-center gap-2">
|
|
<div className="flex items-center gap-2 pb-2">
|
|
<h3 className="text-foreground text-xl font-normal uppercase font-mono">{plan.name}</h3>
|
|
{isCurrentPlan ? (
|
|
<span className="text-xs bg-surface-300 text-foreground-light rounded-sm px-2 py-0.5">
|
|
Current plan
|
|
</span>
|
|
) : plan.nameBadge ? (
|
|
<span className="bg-foreground-light text-background rounded-md py-0.5 px-2 text-[13px] leading-4">
|
|
{plan.nameBadge}
|
|
</span>
|
|
) : null}
|
|
</div>
|
|
</div>
|
|
|
|
<p className="text-foreground-light text-[13px] leading-4 mb-4 min-h-12 line-clamp-3">
|
|
{plan.description}
|
|
</p>
|
|
|
|
{ctaButton}
|
|
|
|
<div className="border-t my-4" />
|
|
|
|
<div className="flex items-end gap-1 pb-4">
|
|
<div>
|
|
<p
|
|
className={cn(
|
|
'text-foreground-lighter text-[13px] leading-4',
|
|
(price ?? 0) <= 0 && 'invisible'
|
|
)}
|
|
>
|
|
From
|
|
</p>
|
|
<div className="flex items-end">
|
|
{isLoadingPlans ? (
|
|
<div className="h-[40px] flex items-center justify-center">
|
|
<ShimmeringLoader className="w-[60px] h-[32px]" />
|
|
</div>
|
|
) : (
|
|
<p className="text-foreground text-3xl font-mono" translate="no">
|
|
{formatCurrency(price)}
|
|
</p>
|
|
)}
|
|
<p className="text-foreground-lighter mb-0.5 ml-1 text-[13px] leading-4">
|
|
{plan.costUnit}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div className="w-full flex-1 flex flex-col px-4 pb-4">
|
|
{plan.preface && (
|
|
<p className="text-foreground-lighter text-[13px] mt-2 mb-4">{plan.preface}</p>
|
|
)}
|
|
<ul className="text-[13px] flex-1">
|
|
{features.map((feature) => (
|
|
<li
|
|
key={typeof feature === 'string' ? feature : feature[0]}
|
|
className="flex flex-col py-2 first:mt-0"
|
|
>
|
|
<div className="flex items-center">
|
|
<div className="flex w-5">
|
|
<Check className="h-4 w-4 text-primary" aria-hidden="true" strokeWidth={3} />
|
|
</div>
|
|
<span className="text-foreground">
|
|
{typeof feature === 'string' ? feature : feature[0]}
|
|
</span>
|
|
</div>
|
|
{typeof feature !== 'string' && isArray(feature) && (
|
|
<p className="ml-5 text-foreground-lighter">{feature[1]}</p>
|
|
)}
|
|
</li>
|
|
))}
|
|
</ul>
|
|
|
|
{gaps.length > 0 && (
|
|
<>
|
|
<div className="border-t my-3" />
|
|
<p className="text-foreground-muted text-[13px] mb-3">
|
|
{gaps.some((g) => g.type === 'lesser') ? 'Plan limits' : 'Not included'}
|
|
</p>
|
|
<ul className="text-[13px]">
|
|
{gaps.map((gap) => (
|
|
<li key={gap.label} className="flex items-center py-1.5">
|
|
{gap.type === 'missing' ? (
|
|
<>
|
|
<div className="flex w-5">
|
|
<X
|
|
className="h-4 w-4 text-foreground-muted"
|
|
aria-hidden="true"
|
|
strokeWidth={2}
|
|
/>
|
|
</div>
|
|
<span className="text-foreground-muted">{gap.label}</span>
|
|
</>
|
|
) : (
|
|
<>
|
|
<div className="flex w-5">
|
|
<Check
|
|
className="h-4 w-4 text-foreground-muted"
|
|
aria-hidden="true"
|
|
strokeWidth={2}
|
|
/>
|
|
</div>
|
|
<span className="text-foreground-muted">{gap.label}</span>
|
|
</>
|
|
)}
|
|
</li>
|
|
))}
|
|
</ul>
|
|
</>
|
|
)}
|
|
|
|
{footer && (
|
|
<div className="border-t pt-4 mt-auto">
|
|
<p className="text-foreground-lighter text-[13px] whitespace-pre-wrap">{footer}</p>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</motion.div>
|
|
)
|
|
}
|