The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: redesign api tokens settings page (#3076)
Ephraim Duncan3ff7f70a7ddd
diff --git a/apps/remix/app/components/dialogs/token-create-dialog.tsx b/apps/remix/app/components/dialogs/token-create-dialog.tsxnew file mode 100644index 000000000..0131638e2--- /dev/null+++ b/apps/remix/app/components/dialogs/token-create-dialog.tsx@@ -0,0 +1,250 @@+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';+import { trpc } from '@documenso/trpc/react';+import { ZCreateApiTokenRequestSchema } from '@documenso/trpc/server/api-token-router/create-api-token.types';+import { CopyTextButton } from '@documenso/ui/components/common/copy-text-button';+import { Button } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from '@documenso/ui/primitives/dialog';+import {+ Form,+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { Input } from '@documenso/ui/primitives/input';+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';+import { useToast } from '@documenso/ui/primitives/use-toast';+import { zodResolver } from '@hookform/resolvers/zod';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';+import { Trans } from '@lingui/react/macro';+import type * as DialogPrimitive from '@radix-ui/react-dialog';+import { useEffect, useState } from 'react';+import { useForm } from 'react-hook-form';+import { match } from 'ts-pattern';+import type { z } from 'zod';++import { useCurrentTeam } from '~/providers/team';++const NEVER_EXPIRE = 'NEVER' as const;++export const EXPIRATION_DATES = {+ ONE_WEEK: msg`7 days`,+ ONE_MONTH: msg`1 month`,+ THREE_MONTHS: msg`3 months`,+ SIX_MONTHS: msg`6 months`,+ ONE_YEAR: msg`12 months`,+ [NEVER_EXPIRE]: msg`Never`,+} as const;++const ZCreateTokenFormSchema = ZCreateApiTokenRequestSchema.pick({+ tokenName: true,+ expirationDate: true,+});++type TCreateTokenFormSchema = z.infer<typeof ZCreateTokenFormSchema>;++export type TokenCreateDialogProps = {+ trigger?: React.ReactNode;+} & Omit<DialogPrimitive.DialogProps, 'children'>;++export const TokenCreateDialog = ({ trigger, ...props }: TokenCreateDialogProps) => {+ const { _ } = useLingui();+ const { toast } = useToast();++ const team = useCurrentTeam();++ const [open, setOpen] = useState(false);+ const [createdToken, setCreatedToken] = useState<string | null>(null);++ const form = useForm<TCreateTokenFormSchema>({+ resolver: zodResolver(ZCreateTokenFormSchema),+ defaultValues: {+ tokenName: '',+ expirationDate: 'THREE_MONTHS',+ },+ });++ const { mutateAsync: createToken } = trpc.apiToken.create.useMutation();++ const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenFormSchema) => {+ try {+ const { token } = await createToken({+ teamId: team.id,+ tokenName,+ expirationDate: expirationDate === NEVER_EXPIRE ? null : expirationDate,+ });++ setCreatedToken(token);+ } catch (err) {+ const error = AppError.parseError(err);++ const errorMessage = match(error.code)+ .with(AppErrorCode.UNAUTHORIZED, () => msg`You do not have permission to create a token for this team.`)+ .otherwise(() => msg`Something went wrong. Please try again later.`);++ toast({+ title: _(msg`An error occurred`),+ description: _(errorMessage),+ variant: 'destructive',+ duration: 5000,+ });+ }+ };++ useEffect(() => {+ if (open) {+ form.reset();+ setCreatedToken(null);+ }+ }, [open, form]);++ return (+ <Dialog open={open} onOpenChange={(value) => !form.formState.isSubmitting && setOpen(value)} {...props}>+ <DialogTrigger onClick={(e) => e.stopPropagation()} asChild>+ {trigger ?? (+ <Button className="flex-shrink-0">+ <Trans>Create token</Trans>+ </Button>+ )}+ </DialogTrigger>++ <DialogContent+ className="max-w-lg"+ position="center"+ onInteractOutside={(event) => {+ // Prevent losing the created token by accidentally clicking outside the dialog.+ if (createdToken) {+ event.preventDefault();+ }+ }}+ >+ {createdToken ? (+ <>+ <DialogHeader>+ <DialogTitle>+ <Trans>Token created</Trans>+ </DialogTitle>++ <DialogDescription>+ <Trans>Copy your token now. For security reasons you will not be able to see it again.</Trans>+ </DialogDescription>+ </DialogHeader>++ <div className="relative">+ <Input+ className="pr-12 font-mono text-sm"+ aria-label={_(msg`Your new API token`)}+ name="createdToken"+ readOnly+ value={createdToken}+ />+ <div className="absolute top-0 right-2 bottom-0 flex items-center justify-center">+ <CopyTextButton+ value={createdToken}+ onCopySuccess={() => toast({ title: _(msg`Token copied to clipboard`) })}+ />+ </div>+ </div>++ <DialogFooter>+ <Button type="button" onClick={() => setOpen(false)}>+ <Trans>Done</Trans>+ </Button>+ </DialogFooter>+ </>+ ) : (+ <>+ <DialogHeader>+ <DialogTitle>+ <Trans>Create API token</Trans>+ </DialogTitle>++ <DialogDescription>+ <Trans>Use API tokens to authenticate with the Documenso API.</Trans>+ </DialogDescription>+ </DialogHeader>++ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)}>+ <fieldset className="flex h-full flex-col space-y-4" disabled={form.formState.isSubmitting}>+ <FormField+ control={form.control}+ name="tokenName"+ render={({ field }) => (+ <FormItem>+ <FormLabel required>+ <Trans>Name</Trans>+ </FormLabel>++ <FormControl>+ <Input className="bg-background" {...field} />+ </FormControl>++ <FormDescription>+ <Trans>A name to help you identify this token later.</Trans>+ </FormDescription>++ <FormMessage />+ </FormItem>+ )}+ />++ <FormField+ control={form.control}+ name="expirationDate"+ render={({ field }) => (+ <FormItem>+ <FormLabel>+ <Trans>Expires in</Trans>+ </FormLabel>++ <FormControl>+ <Select value={field.value ?? NEVER_EXPIRE} onValueChange={field.onChange}>+ <SelectTrigger className="bg-background">+ <SelectValue />+ </SelectTrigger>++ <SelectContent>+ {Object.entries(EXPIRATION_DATES).map(([key, date]) => (+ <SelectItem key={key} value={key}>+ {_(date)}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </FormControl>++ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter>+ <Button type="button" variant="secondary" onClick={() => setOpen(false)}>+ <Trans>Cancel</Trans>+ </Button>++ <Button type="submit" loading={form.formState.isSubmitting}>+ <Trans>Create token</Trans>+ </Button>+ </DialogFooter>+ </fieldset>+ </form>+ </Form>+ </>+ )}+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/remix/app/components/dialogs/token-delete-dialog.tsx b/apps/remix/app/components/dialogs/token-delete-dialog.tsxindex b4378ceee..0e3553a4d 100644--- a/apps/remix/app/components/dialogs/token-delete-dialog.tsx+++ b/apps/remix/app/components/dialogs/token-delete-dialog.tsx@@ -105,7 +105,7 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe<DialogContent><DialogHeader><DialogTitle>- <Trans>Are you sure you want to delete this token?</Trans>+ <Trans>Delete token</Trans></DialogTitle><DialogDescription>@@ -139,21 +139,18 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe/><DialogFooter>- <div className="flex w-full flex-nowrap gap-4">- <Button type="button" variant="secondary" className="flex-1" onClick={() => setIsOpen(false)}>- <Trans>Cancel</Trans>- </Button>-- <Button- type="submit"- variant="destructive"- className="flex-1"- disabled={!form.formState.isValid}- loading={form.formState.isSubmitting}- >- <Trans>I'm sure! Delete it</Trans>- </Button>- </div>+ <Button type="button" variant="secondary" onClick={() => setIsOpen(false)}>+ <Trans>Cancel</Trans>+ </Button>++ <Button+ type="submit"+ variant="destructive"+ disabled={!form.formState.isValid}+ loading={form.formState.isSubmitting}+ >+ <Trans>Delete</Trans>+ </Button></DialogFooter></fieldset></form>diff --git a/apps/remix/app/components/forms/token.tsx b/apps/remix/app/components/forms/token.tsxdeleted file mode 100644index 4239b0c76..000000000--- a/apps/remix/app/components/forms/token.tsx+++ /dev/null@@ -1,254 +0,0 @@-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';-import { trpc } from '@documenso/trpc/react';-import { ZCreateApiTokenRequestSchema } from '@documenso/trpc/server/api-token-router/create-api-token.types';-import { cn } from '@documenso/ui/lib/utils';-import { Button } from '@documenso/ui/primitives/button';-import { Card, CardContent } from '@documenso/ui/primitives/card';-import {- Form,- FormControl,- FormDescription,- FormField,- FormItem,- FormLabel,- FormMessage,-} from '@documenso/ui/primitives/form/form';-import { Input } from '@documenso/ui/primitives/input';-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@documenso/ui/primitives/select';-import { Switch } from '@documenso/ui/primitives/switch';-import { useToast } from '@documenso/ui/primitives/use-toast';-import { zodResolver } from '@hookform/resolvers/zod';-import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';-import type { ApiToken } from '@prisma/client';-import { AnimatePresence, motion } from 'framer-motion';-import { useState } from 'react';-import { useForm } from 'react-hook-form';-import { match } from 'ts-pattern';-import type { z } from 'zod';--import { useCurrentTeam } from '~/providers/team';--export const EXPIRATION_DATES = {- ONE_WEEK: msg`7 days`,- ONE_MONTH: msg`1 month`,- THREE_MONTHS: msg`3 months`,- SIX_MONTHS: msg`6 months`,- ONE_YEAR: msg`12 months`,-} as const;--const ZCreateTokenFormSchema = ZCreateApiTokenRequestSchema.pick({- tokenName: true,- expirationDate: true,-});--type TCreateTokenFormSchema = z.infer<typeof ZCreateTokenFormSchema>;--type NewlyCreatedToken = {- id: number;- token: string;-};--export type ApiTokenFormProps = {- className?: string;- tokens?: Pick<ApiToken, 'id'>[];-};--export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {- const [, copy] = useCopyToClipboard();-- const team = useCurrentTeam();-- const { _ } = useLingui();- const { toast } = useToast();-- const [newlyCreatedToken, setNewlyCreatedToken] = useState<NewlyCreatedToken | null>();- const [noExpirationDate, setNoExpirationDate] = useState(false);-- const { mutateAsync: createTokenMutation } = trpc.apiToken.create.useMutation({- onSuccess(data) {- setNewlyCreatedToken(data);- },- });-- const form = useForm<TCreateTokenFormSchema>({- resolver: zodResolver(ZCreateTokenFormSchema),- defaultValues: {- tokenName: '',- expirationDate: '',- },- });-- const copyToken = async (token: string) => {- try {- const copied = await copy(token);-- if (!copied) {- throw new Error('Unable to copy the token');- }-- toast({- title: _(msg`Token copied to clipboard`),- description: _(msg`The token was copied to your clipboard.`),- });- } catch (error) {- toast({- title: _(msg`Unable to copy token`),- description: _(msg`We were unable to copy the token to your clipboard. Please try again.`),- variant: 'destructive',- });- }- };-- const onSubmit = async ({ tokenName, expirationDate }: TCreateTokenFormSchema) => {- try {- await createTokenMutation({- teamId: team.id,- tokenName,- expirationDate: noExpirationDate ? null : expirationDate,- });-- toast({- title: _(msg`Token created`),- description: _(msg`A new token was created successfully.`),- duration: 5000,- });-- form.reset();- } catch (err) {- const error = AppError.parseError(err);-- const errorMessage = match(error.code)- .with(AppErrorCode.UNAUTHORIZED, () => msg`You do not have permission to create a token for this team.`)- .otherwise(() => msg`Something went wrong. Please try again later.`);-- toast({- title: _(msg`An error occurred`),- description: _(errorMessage),- variant: 'destructive',- duration: 5000,- });- }- };-- return (- <div className={cn(className)}>- <Form {...form}>- <form onSubmit={form.handleSubmit(onSubmit)}>- <fieldset className="mt-6 flex w-full flex-col gap-4" disabled={form.formState.isSubmitting}>- <FormField- control={form.control}- name="tokenName"- render={({ field }) => (- <FormItem className="flex-1">- <FormLabel className="text-muted-foreground">- <Trans>Token name</Trans>- </FormLabel>-- <div className="flex items-center gap-x-4">- <FormControl className="flex-1">- <Input type="text" {...field} />- </FormControl>- </div>-- <FormDescription className="text-xs italic">- <Trans>Please enter a meaningful name for your token. This will help you identify it later.</Trans>- </FormDescription>-- <FormMessage />- </FormItem>- )}- />-- <div className="flex flex-col gap-4 md:flex-row">- <FormField- control={form.control}- name="expirationDate"- render={({ field }) => (- <FormItem className="flex-1">- <FormLabel className="text-muted-foreground">- <Trans>Token expiration date</Trans>- </FormLabel>-- <div className="flex items-center gap-x-4">- <FormControl className="flex-1">- <Select onValueChange={field.onChange} disabled={noExpirationDate}>- <SelectTrigger className="w-full">- <SelectValue placeholder={_(msg`Choose...`)} />- </SelectTrigger>- <SelectContent>- {Object.entries(EXPIRATION_DATES).map(([key, date]) => (- <SelectItem key={key} value={key}>- {_(date)}- </SelectItem>- ))}- </SelectContent>- </Select>- </FormControl>- </div>-- <FormMessage />- </FormItem>- )}- />-- <div>- <FormLabel className="mt-2 text-muted-foreground">- <Trans>Never expire</Trans>- </FormLabel>- <div className="block md:py-1.5">- <Switch- className="mt-2 bg-background"- checked={noExpirationDate}- onCheckedChange={setNoExpirationDate}- />- </div>- </div>- </div>-- <Button type="submit" className="hidden md:inline-flex" loading={form.formState.isSubmitting}>- <Trans>Create token</Trans>- </Button>-- <div className="md:hidden">- <Button type="submit" loading={form.formState.isSubmitting}>- <Trans>Create token</Trans>- </Button>- </div>- </fieldset>- </form>- </Form>-- <AnimatePresence>- {newlyCreatedToken && tokens && tokens.find((token) => token.id === newlyCreatedToken.id) && (- <motion.div- className="mt-8"- initial={{ opacity: 0, y: -40 }}- animate={{ opacity: 1, y: 0 }}- exit={{ opacity: 0, y: 40 }}- >- <Card gradient>- <CardContent className="p-4">- <p className="mt-2 text-muted-foreground text-sm">- <Trans>- Your token was created successfully! Make sure to copy it because you won't be able to see it again!- </Trans>- </p>-- <p className="my-4 rounded-md bg-muted-foreground/10 px-2.5 py-1 font-mono text-sm">- {newlyCreatedToken.token}- </p>-- <Button variant="outline" onClick={() => void copyToken(newlyCreatedToken.token)}>- <Trans>Copy token</Trans>- </Button>- </CardContent>- </Card>- </motion.div>- )}- </AnimatePresence>- </div>- );-};diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsxindex 40ac2aac5..f3f5bb897 100644--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx@@ -1,14 +1,18 @@import { trpc } from '@documenso/trpc/react';+import type { TGetApiTokensResponse } from '@documenso/trpc/server/api-token-router/get-api-tokens.types';import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';+import { Badge } from '@documenso/ui/primitives/badge';import { Button } from '@documenso/ui/primitives/button';+import { DataTable, type DataTableColumnDef } from '@documenso/ui/primitives/data-table';+import { Skeleton } from '@documenso/ui/primitives/skeleton';+import { TableCell } from '@documenso/ui/primitives/table';import { msg } from '@lingui/core/macro';-import { useLingui } from '@lingui/react';-import { Trans } from '@lingui/react/macro';+import { Trans, useLingui } from '@lingui/react/macro';import { TeamMemberRole } from '@prisma/client';-import { DateTime } from 'luxon';+import { useMemo } from 'react';+import { TokenCreateDialog } from '~/components/dialogs/token-create-dialog';import TokenDeleteDialog from '~/components/dialogs/token-delete-dialog';-import { ApiTokenForm } from '~/components/forms/token';import { SettingsHeader } from '~/components/general/settings-header';import { useOptionalCurrentTeam } from '~/providers/team';import { appMetaTags } from '~/utils/meta';@@ -18,33 +22,88 @@ export function meta() {}export default function ApiTokensPage() {- const { i18n } = useLingui();-- const { data: tokens } = trpc.apiToken.getMany.useQuery();+ const { t, i18n } = useLingui();const team = useOptionalCurrentTeam();+ const isUnauthorized = !!team && team.currentTeamRole !== TeamMemberRole.ADMIN;++ const {+ data: tokens,+ isLoading,+ isError,+ } = trpc.apiToken.getMany.useQuery(undefined, {+ enabled: !isUnauthorized,+ });++ const columns = useMemo(() => {+ return [+ {+ header: t`Name`,+ cell: ({ row }) => <span className="font-medium text-foreground">{row.original.name}</span>,+ },+ {+ header: t`Created`,+ cell: ({ row }) => i18n.date(row.original.createdAt),+ },+ {+ header: t`Expires`,+ cell: ({ row }) => {+ if (!row.original.expires) {+ return (+ <span className="text-muted-foreground">+ <Trans>Never</Trans>+ </span>+ );+ }++ if (row.original.expires < new Date()) {+ return (+ <Badge variant="destructive" size="small">+ <Trans>Expired</Trans>+ </Badge>+ );+ }++ return i18n.date(row.original.expires);+ },+ },+ {+ header: t`Actions`,+ cell: ({ row }) => (+ <TokenDeleteDialog token={row.original}>+ <Button variant="destructive">+ <Trans>Delete</Trans>+ </Button>+ </TokenDeleteDialog>+ ),+ },+ ] satisfies DataTableColumnDef<TGetApiTokensResponse[number]>[];+ }, []);+return (<div><SettingsHeadertitle={<Trans>API Tokens</Trans>}subtitle={<Trans>- On this page, you can create and manage API tokens. See our{' '}+ Create and manage API tokens. See our{' '}<aclassName="text-primary underline"href={'https://docs.documenso.com/developers/public-api'}target="_blank"rel="noopener">- Documentation+ documentation</a>{' '}for more information.</Trans>}- />+ >+ {!isUnauthorized && <TokenCreateDialog />}+ </SettingsHeader>- {team && team?.currentTeamRole !== TeamMemberRole.ADMIN ? (+ {isUnauthorized ? (<Alert className="flex flex-col items-center justify-between gap-4 p-6 md:flex-row" variant="warning"><div><AlertTitle>@@ -56,58 +115,43 @@ export default function ApiTokensPage() {</div></Alert>) : (- <>- <ApiTokenForm className="max-w-xl" tokens={tokens} />-- <hr className="mt-8 mb-4" />-- <h4 className="font-medium text-xl">- <Trans>Your existing tokens</Trans>- </h4>-- {tokens && tokens.length === 0 && (- <div className="mb-4">- <p className="mt-2 text-muted-foreground text-sm italic">- <Trans>Your tokens will be shown here once you create them.</Trans>+ <DataTable+ columns={columns}+ data={tokens ?? []}+ perPage={0}+ currentPage={0}+ totalPages={0}+ error={{+ enable: isError,+ }}+ emptyState={+ <div className="flex h-60 flex-col items-center justify-center gap-y-4 text-muted-foreground/60">+ <p>+ <Trans>You have no API tokens yet. Your tokens will be shown here once you create them.</Trans></p></div>- )}-- {tokens && tokens.length > 0 && (- <div className="mt-4 flex max-w-xl flex-col gap-y-4">- {tokens.map((token) => (- <div key={token.id} className="rounded-lg border border-border p-4">- <div className="flex items-center justify-between gap-x-4">- <div>- <h5 className="text-base">{token.name}</h5>-- <p className="mt-2 text-muted-foreground text-xs">- <Trans>Created on {i18n.date(token.createdAt, DateTime.DATETIME_FULL)}</Trans>- </p>- {token.expires ? (- <p className="mt-1 text-muted-foreground text-xs">- <Trans>Expires on {i18n.date(token.expires, DateTime.DATETIME_FULL)}</Trans>- </p>- ) : (- <p className="mt-1 text-muted-foreground text-xs">- <Trans>Token doesn't have an expiration date</Trans>- </p>- )}- </div>-- <div>- <TokenDeleteDialog token={token}>- <Button variant="destructive">- <Trans>Delete</Trans>- </Button>- </TokenDeleteDialog>- </div>- </div>- </div>- ))}- </div>- )}- </>+ }+ skeleton={{+ enable: isLoading,+ rows: 3,+ component: (+ <>+ <TableCell>+ <Skeleton className="h-4 w-24 rounded-full" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-4 w-16 rounded-full" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-4 w-16 rounded-full" />+ </TableCell>+ <TableCell>+ <Skeleton className="h-4 w-12 rounded-full" />+ </TableCell>+ </>+ ),+ }}+ />)}</div>);diff --git a/packages/ui/primitives/alert-dialog.tsx b/packages/ui/primitives/alert-dialog.tsxindex 0bd424445..77c1cfaa2 100644--- a/packages/ui/primitives/alert-dialog.tsx+++ b/packages/ui/primitives/alert-dialog.tsx@@ -41,7 +41,7 @@ const AlertDialogContent = React.forwardRef<<AlertDialogPrimitive.Contentref={ref}className={cn(- 'fade-in-90 slide-in-from-bottom-10 sm:zoom-in-90 sm:slide-in-from-bottom-0 fixed z-50 grid w-full max-w-lg scale-100 animate-in gap-4 border bg-background p-6 opacity-100 shadow-lg sm:rounded-lg md:w-full',+ 'fade-in-90 slide-in-from-bottom-10 sm:zoom-in-90 sm:slide-in-from-bottom-0 fixed z-50 grid w-full max-w-lg scale-100 animate-in gap-4 border bg-background p-6 opacity-100 shadow-lg focus:outline-none sm:rounded-lg md:w-full',className,)}{...props}diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsxindex 4a2dee857..c346dcff4 100644--- a/packages/ui/primitives/dialog.tsx+++ b/packages/ui/primitives/dialog.tsx@@ -61,7 +61,7 @@ const DialogContent = React.forwardRef<<DialogPrimitive.Contentref={ref}className={cn(- 'data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full animate-in gap-4 border bg-background p-6 shadow-lg sm:max-w-lg sm:rounded-lg',+ 'data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full animate-in gap-4 border bg-background p-6 shadow-lg focus:outline-none sm:max-w-lg sm:rounded-lg',{'rounded-b-xl': position === 'start','rounded-t-xl': position === 'end',diff --git a/packages/ui/primitives/sheet.tsx b/packages/ui/primitives/sheet.tsxindex 338edf09f..2cb3a8590 100644--- a/packages/ui/primitives/sheet.tsx+++ b/packages/ui/primitives/sheet.tsx@@ -49,90 +49,93 @@ const SheetOverlay = React.forwardRef<SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;-const sheetVariants = cva('fixed z-[61] scale-100 gap-4 bg-background p-6 opacity-100 shadow-lg border', {- variants: {- position: {- top: 'animate-in slide-in-from-top w-full duration-300',- bottom: 'animate-in slide-in-from-bottom w-full duration-300',- left: 'animate-in slide-in-from-left h-full duration-300',- right: 'animate-in slide-in-from-right h-full duration-300',- },- size: {- content: '',- default: '',- sm: '',- lg: '',- xl: '',- full: '',- },- },- compoundVariants: [- {- position: ['top', 'bottom'],- size: 'content',- class: 'max-h-screen',- },- {- position: ['top', 'bottom'],- size: 'default',- class: 'h-1/3',- },- {- position: ['top', 'bottom'],- size: 'sm',- class: 'h-1/4',- },- {- position: ['top', 'bottom'],- size: 'lg',- class: 'h-1/2',+const sheetVariants = cva(+ 'fixed z-[61] scale-100 gap-4 border bg-background p-6 opacity-100 shadow-lg focus:outline-none',+ {+ variants: {+ position: {+ top: 'animate-in slide-in-from-top w-full duration-300',+ bottom: 'animate-in slide-in-from-bottom w-full duration-300',+ left: 'animate-in slide-in-from-left h-full duration-300',+ right: 'animate-in slide-in-from-right h-full duration-300',+ },+ size: {+ content: '',+ default: '',+ sm: '',+ lg: '',+ xl: '',+ full: '',+ },},- {- position: ['top', 'bottom'],- size: 'xl',- class: 'h-5/6',- },- {- position: ['top', 'bottom'],- size: 'full',- class: 'h-screen',- },- {- position: ['right', 'left'],- size: 'content',- class: 'max-w-screen',- },- {- position: ['right', 'left'],+ compoundVariants: [+ {+ position: ['top', 'bottom'],+ size: 'content',+ class: 'max-h-screen',+ },+ {+ position: ['top', 'bottom'],+ size: 'default',+ class: 'h-1/3',+ },+ {+ position: ['top', 'bottom'],+ size: 'sm',+ class: 'h-1/4',+ },+ {+ position: ['top', 'bottom'],+ size: 'lg',+ class: 'h-1/2',+ },+ {+ position: ['top', 'bottom'],+ size: 'xl',+ class: 'h-5/6',+ },+ {+ position: ['top', 'bottom'],+ size: 'full',+ class: 'h-screen',+ },+ {+ position: ['right', 'left'],+ size: 'content',+ class: 'max-w-screen',+ },+ {+ position: ['right', 'left'],+ size: 'default',+ class: 'w-1/3',+ },+ {+ position: ['right', 'left'],+ size: 'sm',+ class: 'w-1/4',+ },+ {+ position: ['right', 'left'],+ size: 'lg',+ class: 'w-1/2',+ },+ {+ position: ['right', 'left'],+ size: 'xl',+ class: 'w-5/6',+ },+ {+ position: ['right', 'left'],+ size: 'full',+ class: 'w-screen',+ },+ ],+ defaultVariants: {+ position: 'right',size: 'default',- class: 'w-1/3',- },- {- position: ['right', 'left'],- size: 'sm',- class: 'w-1/4',- },- {- position: ['right', 'left'],- size: 'lg',- class: 'w-1/2',},- {- position: ['right', 'left'],- size: 'xl',- class: 'w-5/6',- },- {- position: ['right', 'left'],- size: 'full',- class: 'w-screen',- },- ],- defaultVariants: {- position: 'right',- size: 'default',},-});+);export interface DialogContentPropsextends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,