-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(layout): resolve duplicated layout issue and remove redundant wra…
…pper
- Loading branch information
Showing
16 changed files
with
420 additions
and
259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,147 +1,147 @@ | ||
| "use client"; | ||
| 'use client' | ||
|
|
||
| import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"; | ||
| import * as React from "react"; | ||
| import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog' | ||
| import * as React from 'react' | ||
|
|
||
| import { buttonVariants } from "~/components/base/button"; | ||
| import { cn } from "~/lib/utils"; | ||
| import { buttonVariants } from '~/components/base/button' | ||
| import { cn } from '~/lib/utils' | ||
|
|
||
| const AlertDialog = AlertDialogPrimitive.Root; | ||
| const AlertDialog = AlertDialogPrimitive.Root | ||
|
|
||
| const AlertDialogTrigger = AlertDialogPrimitive.Trigger; | ||
| const AlertDialogTrigger = AlertDialogPrimitive.Trigger | ||
|
|
||
| const AlertDialogPortal = AlertDialogPrimitive.Portal; | ||
| const AlertDialogPortal = AlertDialogPrimitive.Portal | ||
|
|
||
| const AlertDialogOverlay = React.forwardRef< | ||
| React.ElementRef<typeof AlertDialogPrimitive.Overlay>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay> | ||
| React.ElementRef<typeof AlertDialogPrimitive.Overlay>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay> | ||
| >(({ className, ...props }, ref) => ( | ||
| <AlertDialogPrimitive.Overlay | ||
| className={cn( | ||
| "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0", | ||
| className | ||
| )} | ||
| {...props} | ||
| ref={ref} | ||
| /> | ||
| )); | ||
| AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName; | ||
| <AlertDialogPrimitive.Overlay | ||
| className={cn( | ||
| 'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0', | ||
| className, | ||
| )} | ||
| {...props} | ||
| ref={ref} | ||
| /> | ||
| )) | ||
| AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName | ||
|
|
||
| const AlertDialogContent = React.forwardRef< | ||
| React.ElementRef<typeof AlertDialogPrimitive.Content>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content> | ||
| React.ElementRef<typeof AlertDialogPrimitive.Content>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content> | ||
| >(({ className, ...props }, ref) => ( | ||
| <AlertDialogPortal> | ||
| <AlertDialogOverlay /> | ||
| <AlertDialogPrimitive.Content | ||
| ref={ref} | ||
| aria-live="assertive" | ||
| aria-atomic="true" | ||
| role="alertdialog" | ||
| aria-modal="true" | ||
| aria-describedby={props["aria-describedby"] || "alert-dialog-desc"} | ||
| className={cn( | ||
| "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg", | ||
| className | ||
| )} | ||
| {...props} | ||
| /> | ||
| </AlertDialogPortal> | ||
| )); | ||
| AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName; | ||
| <AlertDialogPortal> | ||
| <AlertDialogOverlay /> | ||
| <AlertDialogPrimitive.Content | ||
| ref={ref} | ||
| aria-live="assertive" | ||
| aria-atomic="true" | ||
| role="alertdialog" | ||
| aria-modal="true" | ||
| aria-describedby={props['aria-describedby'] || 'alert-dialog-desc'} | ||
| className={cn( | ||
| 'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg', | ||
| className, | ||
| )} | ||
| {...props} | ||
| /> | ||
| </AlertDialogPortal> | ||
| )) | ||
| AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName | ||
|
|
||
| const AlertDialogHeader = ({ | ||
| className, | ||
| ...props | ||
| className, | ||
| ...props | ||
| }: React.HTMLAttributes<HTMLDivElement>) => ( | ||
| <div | ||
| className={cn( | ||
| "flex flex-col space-y-2 text-center sm:text-left", | ||
| className | ||
| )} | ||
| {...props} | ||
| /> | ||
| ); | ||
| AlertDialogHeader.displayName = "AlertDialogHeader"; | ||
| <div | ||
| className={cn( | ||
| 'flex flex-col space-y-2 text-center sm:text-left', | ||
| className, | ||
| )} | ||
| {...props} | ||
| /> | ||
| ) | ||
| AlertDialogHeader.displayName = 'AlertDialogHeader' | ||
|
|
||
| const AlertDialogFooter = ({ | ||
| className, | ||
| ...props | ||
| className, | ||
| ...props | ||
| }: React.HTMLAttributes<HTMLDivElement>) => ( | ||
| <div | ||
| className={cn( | ||
| "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", | ||
| className | ||
| )} | ||
| {...props} | ||
| /> | ||
| ); | ||
| AlertDialogFooter.displayName = "AlertDialogFooter"; | ||
| <div | ||
| className={cn( | ||
| 'flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', | ||
| className, | ||
| )} | ||
| {...props} | ||
| /> | ||
| ) | ||
| AlertDialogFooter.displayName = 'AlertDialogFooter' | ||
|
|
||
| const AlertDialogTitle = React.forwardRef< | ||
| React.ElementRef<typeof AlertDialogPrimitive.Title>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title> | ||
| React.ElementRef<typeof AlertDialogPrimitive.Title>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title> | ||
| >(({ className, ...props }, ref) => ( | ||
| <AlertDialogPrimitive.Title | ||
| ref={ref} | ||
| className={cn("text-lg font-semibold", className)} | ||
| {...props} | ||
| /> | ||
| )); | ||
| AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName; | ||
| <AlertDialogPrimitive.Title | ||
| ref={ref} | ||
| className={cn('text-lg font-semibold', className)} | ||
| {...props} | ||
| /> | ||
| )) | ||
| AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName | ||
|
|
||
| const AlertDialogDescription = React.forwardRef< | ||
| React.ElementRef<typeof AlertDialogPrimitive.Description>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description> | ||
| React.ElementRef<typeof AlertDialogPrimitive.Description>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description> | ||
| >(({ className, ...props }, ref) => ( | ||
| <AlertDialogPrimitive.Description | ||
| ref={ref} | ||
| id={props.id || "alert-dialog-desc"} | ||
| className={cn("text-sm text-muted-foreground", className)} | ||
| {...props} | ||
| /> | ||
| )); | ||
| <AlertDialogPrimitive.Description | ||
| ref={ref} | ||
| id={props.id || 'alert-dialog-desc'} | ||
| className={cn('text-sm text-muted-foreground', className)} | ||
| {...props} | ||
| /> | ||
| )) | ||
| AlertDialogDescription.displayName = | ||
| AlertDialogPrimitive.Description.displayName; | ||
| AlertDialogPrimitive.Description.displayName | ||
|
|
||
| const AlertDialogAction = React.forwardRef< | ||
| React.ElementRef<typeof AlertDialogPrimitive.Action>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action> | ||
| React.ElementRef<typeof AlertDialogPrimitive.Action>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action> | ||
| >(({ className, ...props }, ref) => ( | ||
| <AlertDialogPrimitive.Action | ||
| ref={ref} | ||
| className={cn(buttonVariants(), className)} | ||
| {...props} | ||
| /> | ||
| )); | ||
| AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName; | ||
| <AlertDialogPrimitive.Action | ||
| ref={ref} | ||
| className={cn(buttonVariants(), className)} | ||
| {...props} | ||
| /> | ||
| )) | ||
| AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName | ||
|
|
||
| const AlertDialogCancel = React.forwardRef< | ||
| React.ElementRef<typeof AlertDialogPrimitive.Cancel>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel> | ||
| React.ElementRef<typeof AlertDialogPrimitive.Cancel>, | ||
| React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel> | ||
| >(({ className, ...props }, ref) => ( | ||
| <AlertDialogPrimitive.Cancel | ||
| ref={ref} | ||
| className={cn( | ||
| buttonVariants({ variant: "outline" }), | ||
| "mt-2 sm:mt-0", | ||
| className | ||
| )} | ||
| {...props} | ||
| /> | ||
| )); | ||
| AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName; | ||
| <AlertDialogPrimitive.Cancel | ||
| ref={ref} | ||
| className={cn( | ||
| buttonVariants({ variant: 'outline' }), | ||
| 'mt-2 sm:mt-0', | ||
| className, | ||
| )} | ||
| {...props} | ||
| /> | ||
| )) | ||
| AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName | ||
|
|
||
| export { | ||
| AlertDialog, | ||
| AlertDialogPortal, | ||
| AlertDialogOverlay, | ||
| AlertDialogTrigger, | ||
| AlertDialogContent, | ||
| AlertDialogHeader, | ||
| AlertDialogFooter, | ||
| AlertDialogTitle, | ||
| AlertDialogDescription, | ||
| AlertDialogAction, | ||
| AlertDialogCancel, | ||
| }; | ||
| AlertDialog, | ||
| AlertDialogPortal, | ||
| AlertDialogOverlay, | ||
| AlertDialogTrigger, | ||
| AlertDialogContent, | ||
| AlertDialogHeader, | ||
| AlertDialogFooter, | ||
| AlertDialogTitle, | ||
| AlertDialogDescription, | ||
| AlertDialogAction, | ||
| AlertDialogCancel, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.