mirror of
https://github.com/supabase/supabase.git
synced 2026-10-08 02:45:07 +03:00
## What kind of change does this PR introduce? Bug fix / design-system alignment for the legacy `Button` from `ui`. ## What is the current behavior? Omitting `variant` on the legacy `Button` falls back to brand-green `primary`. That makes accidental greens easy, and it is hard to spot the real main action on busy pages. ## What is the new behavior? - Legacy `Button` now defaults to neutral `default` - Intentional primary CTAs (create, save, submit, marketing CTAs, and matching `ButtonTooltip` usages) now set `variant="primary"` so their appearance is unchanged - Neutral actions that previously relied on the old fallback (cancel, close, back, dashboard nav, and similar) become grey/white - Design-system docs updated; regression tests cover the new default `Button_Shadcn_` is unchanged. It already uses its own CVA default. This is PR 1 of 2 in a stack. PR 2 drops now-redundant `variant="default"` props. ## To test Studio (http://localhost:8082): - `/sign-in`: Sign in stays green - Open a project → Database → Tables: New table stays green - Auth → Users → Invite: Invite user stays green; Cancel / dismiss controls stay neutral - Project Settings → General: edit a field so Cancel and Save appear. Cancel is neutral, Save is green Design system (http://localhost:3003): - Components → Button: default demo is neutral; primary demo is green; featured preview is the default variant Marketing (optional): - www header: Start your project stays green; logged-in Dashboard is neutral <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Style** - Buttons now default to a neutral style, while primary actions across Studio, documentation, marketing pages, forms, dialogs, and error states use prominent primary styling. - Updated button examples and previews clarify the distinction between default and primary variants. - Event registration now includes a directional arrow icon. - **Tests** - Added coverage confirming default button styling and explicit primary styling behave as expected. - Updated related test fixtures to use primary styling where appropriate. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
129 lines
3.9 KiB
TypeScript
129 lines
3.9 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { SubmitHandler, useForm } from 'react-hook-form'
|
|
import {
|
|
Button,
|
|
Dialog,
|
|
DialogContent,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogSection,
|
|
DialogSectionSeparator,
|
|
DialogTitle,
|
|
Form,
|
|
FormControl,
|
|
FormField,
|
|
Input,
|
|
Textarea,
|
|
} from 'ui'
|
|
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
|
|
import * as z from 'zod'
|
|
|
|
const formSchema = z.object({
|
|
page: z.string(),
|
|
title: z.string().min(1, 'Required'),
|
|
comment: z.string().min(1, 'Required'),
|
|
})
|
|
|
|
export type FeedbackFields = z.infer<typeof formSchema>
|
|
|
|
type FeedbackModalProps = {
|
|
visible: boolean
|
|
page: string
|
|
onCancel: () => void
|
|
onSubmit: (values: FeedbackFields) => void
|
|
}
|
|
|
|
function FeedbackModal({ visible, page, onCancel, onSubmit }: FeedbackModalProps) {
|
|
const form = useForm<FeedbackFields>({
|
|
defaultValues: { page, title: '', comment: '' },
|
|
resolver: zodResolver(formSchema),
|
|
})
|
|
const formId = 'feedback-form'
|
|
const { reset } = form
|
|
const { isSubmitting } = form.formState
|
|
|
|
const handleCancel = () => {
|
|
reset()
|
|
onCancel()
|
|
}
|
|
|
|
const handleSubmit: SubmitHandler<FeedbackFields> = (values) => {
|
|
onSubmit(values)
|
|
reset()
|
|
}
|
|
|
|
return (
|
|
<Dialog open={visible} onOpenChange={() => onCancel()}>
|
|
<DialogContent>
|
|
<DialogHeader>
|
|
<DialogTitle>Leave a comment</DialogTitle>
|
|
</DialogHeader>
|
|
<DialogSectionSeparator />
|
|
<Form {...form}>
|
|
<form id={formId} onSubmit={form.handleSubmit(handleSubmit)}>
|
|
<DialogSection className="space-y-4">
|
|
<input type="hidden" id="page" {...form.register('page')} />
|
|
<FormField
|
|
control={form.control}
|
|
name="title"
|
|
render={({ field }) => (
|
|
<FormItemLayout layout="vertical" label="Title">
|
|
<FormControl className="col-span-6">
|
|
<Input {...field} />
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
<FormField
|
|
control={form.control}
|
|
name="comment"
|
|
render={({ field }) => (
|
|
<FormItemLayout layout="vertical" label="Comment" afterLabel="(not anonymous)">
|
|
<FormControl className="col-span-6">
|
|
<Textarea {...field} rows={4} className="resize-none" />
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
<div className="flex gap-2 text-xs text-foreground-light leading-relaxed">
|
|
<span className="shrink-0 mt-0.5">💡</span>
|
|
<div>
|
|
<strong>Need help or support?</strong> This feedback form is for documentation
|
|
improvements only. For technical support, please submit a{' '}
|
|
<a
|
|
href="https://supabase.com/dashboard/support/new"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
className="text-brand-link hover:underline"
|
|
>
|
|
support request
|
|
</a>
|
|
.
|
|
</div>
|
|
</div>
|
|
</DialogSection>
|
|
</form>
|
|
</Form>
|
|
<DialogFooter>
|
|
<div className="flex items-center justify-end gap-2">
|
|
<Button type="reset" variant="default" onClick={handleCancel} disabled={isSubmitting}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
variant="primary"
|
|
type="submit"
|
|
form={formId}
|
|
loading={isSubmitting}
|
|
disabled={isSubmitting}
|
|
>
|
|
Submit feedback
|
|
</Button>
|
|
</div>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|
|
|
|
export { FeedbackModal }
|