-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: add support toast * style: adjust toast action styling * fix: remove always show toast
- Loading branch information
1 parent
5a21a91
commit 05e2b2c
Showing
11 changed files
with
990 additions
and
133 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,76 @@ | ||
@tailwind base; | ||
@tailwind components; | ||
@tailwind utilities; | ||
|
||
@layer base { | ||
:root { | ||
--background: 0 0% 100%; | ||
--foreground: 222.2 84% 4.9%; | ||
|
||
--card: 0 0% 100%; | ||
--card-foreground: 222.2 84% 4.9%; | ||
|
||
--popover: 0 0% 100%; | ||
--popover-foreground: 222.2 84% 4.9%; | ||
|
||
--primary: 222.2 47.4% 11.2%; | ||
--primary-foreground: 210 40% 98%; | ||
|
||
--secondary: 210 40% 96.1%; | ||
--secondary-foreground: 222.2 47.4% 11.2%; | ||
|
||
--muted: 210 40% 96.1%; | ||
--muted-foreground: 215.4 16.3% 46.9%; | ||
|
||
--accent: 210 40% 96.1%; | ||
--accent-foreground: 222.2 47.4% 11.2%; | ||
|
||
--destructive: 0 84.2% 60.2%; | ||
--destructive-foreground: 210 40% 98%; | ||
|
||
--border: 214.3 31.8% 91.4%; | ||
--input: 214.3 31.8% 91.4%; | ||
--ring: 222.2 84% 4.9%; | ||
|
||
--radius: 0.5rem; | ||
} | ||
|
||
.dark { | ||
--background: 222.2 84% 4.9%; | ||
--foreground: 210 40% 98%; | ||
|
||
--card: 222.2 84% 4.9%; | ||
--card-foreground: 210 40% 98%; | ||
|
||
--popover: 222.2 84% 4.9%; | ||
--popover-foreground: 210 40% 98%; | ||
|
||
--primary: 210 40% 98%; | ||
--primary-foreground: 222.2 47.4% 11.2%; | ||
|
||
--secondary: 217.2 32.6% 17.5%; | ||
--secondary-foreground: 210 40% 98%; | ||
|
||
--muted: 217.2 32.6% 17.5%; | ||
--muted-foreground: 215 20.2% 65.1%; | ||
|
||
--accent: 217.2 32.6% 17.5%; | ||
--accent-foreground: 210 40% 98%; | ||
|
||
--destructive: 0 62.8% 30.6%; | ||
--destructive-foreground: 210 40% 98%; | ||
|
||
--border: 217.2 32.6% 17.5%; | ||
--input: 217.2 32.6% 17.5%; | ||
--ring: 212.7 26.8% 83.9%; | ||
} | ||
} | ||
|
||
@layer base { | ||
* { | ||
@apply border-border; | ||
} | ||
body { | ||
@apply bg-background text-foreground; | ||
} | ||
} |
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 |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{ | ||
"$schema": "https://ui.shadcn.com/schema.json", | ||
"style": "default", | ||
"rsc": true, | ||
"tsx": true, | ||
"tailwind": { | ||
"config": "tailwind.config.ts", | ||
"css": "app/globals.css", | ||
"baseColor": "slate", | ||
"cssVariables": true, | ||
"prefix": "" | ||
}, | ||
"aliases": { | ||
"components": "@/components", | ||
"utils": "@/lib/utils" | ||
} | ||
} |
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 |
---|---|---|
@@ -0,0 +1,127 @@ | ||
import * as React from "react" | ||
import * as ToastPrimitives from "@radix-ui/react-toast" | ||
import { cva, type VariantProps } from "class-variance-authority" | ||
import { X } from "lucide-react" | ||
|
||
import { cn } from "@/lib/utils" | ||
|
||
const ToastProvider = ToastPrimitives.Provider | ||
|
||
const ToastViewport = React.forwardRef< | ||
React.ElementRef<typeof ToastPrimitives.Viewport>, | ||
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport> | ||
>(({ className, ...props }, ref) => ( | ||
<ToastPrimitives.Viewport | ||
ref={ref} | ||
className={cn( | ||
"fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]", | ||
className | ||
)} | ||
{...props} | ||
/> | ||
)) | ||
ToastViewport.displayName = ToastPrimitives.Viewport.displayName | ||
|
||
const toastVariants = cva( | ||
"group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full", | ||
{ | ||
variants: { | ||
variant: { | ||
default: "border bg-background text-foreground", | ||
destructive: | ||
"destructive group border-destructive bg-destructive text-destructive-foreground", | ||
}, | ||
}, | ||
defaultVariants: { | ||
variant: "default", | ||
}, | ||
} | ||
) | ||
|
||
const Toast = React.forwardRef< | ||
React.ElementRef<typeof ToastPrimitives.Root>, | ||
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> & | ||
VariantProps<typeof toastVariants> | ||
>(({ className, variant, ...props }, ref) => { | ||
return ( | ||
<ToastPrimitives.Root | ||
ref={ref} | ||
className={cn(toastVariants({ variant }), className)} | ||
{...props} | ||
/> | ||
) | ||
}) | ||
Toast.displayName = ToastPrimitives.Root.displayName | ||
|
||
const ToastAction = React.forwardRef< | ||
React.ElementRef<typeof ToastPrimitives.Action>, | ||
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action> | ||
>(({ className, ...props }, ref) => ( | ||
<ToastPrimitives.Action | ||
ref={ref} | ||
className={cn( | ||
"inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive", | ||
className | ||
)} | ||
{...props} | ||
/> | ||
)) | ||
ToastAction.displayName = ToastPrimitives.Action.displayName | ||
|
||
const ToastClose = React.forwardRef< | ||
React.ElementRef<typeof ToastPrimitives.Close>, | ||
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close> | ||
>(({ className, ...props }, ref) => ( | ||
<ToastPrimitives.Close | ||
ref={ref} | ||
className={cn( | ||
"absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600", | ||
className | ||
)} | ||
toast-close="" | ||
{...props} | ||
> | ||
<X className="h-4 w-4" /> | ||
</ToastPrimitives.Close> | ||
)) | ||
ToastClose.displayName = ToastPrimitives.Close.displayName | ||
|
||
const ToastTitle = React.forwardRef< | ||
React.ElementRef<typeof ToastPrimitives.Title>, | ||
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title> | ||
>(({ className, ...props }, ref) => ( | ||
<ToastPrimitives.Title | ||
ref={ref} | ||
className={cn("text-sm font-semibold", className)} | ||
{...props} | ||
/> | ||
)) | ||
ToastTitle.displayName = ToastPrimitives.Title.displayName | ||
|
||
const ToastDescription = React.forwardRef< | ||
React.ElementRef<typeof ToastPrimitives.Description>, | ||
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description> | ||
>(({ className, ...props }, ref) => ( | ||
<ToastPrimitives.Description | ||
ref={ref} | ||
className={cn("text-sm opacity-90", className)} | ||
{...props} | ||
/> | ||
)) | ||
ToastDescription.displayName = ToastPrimitives.Description.displayName | ||
|
||
type ToastProps = React.ComponentPropsWithoutRef<typeof Toast> | ||
|
||
type ToastActionElement = React.ReactElement<typeof ToastAction> | ||
|
||
export { | ||
type ToastProps, | ||
type ToastActionElement, | ||
ToastProvider, | ||
ToastViewport, | ||
Toast, | ||
ToastTitle, | ||
ToastDescription, | ||
ToastClose, | ||
ToastAction, | ||
} |
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 |
---|---|---|
@@ -0,0 +1,35 @@ | ||
"use client" | ||
|
||
import { | ||
Toast, | ||
ToastClose, | ||
ToastDescription, | ||
ToastProvider, | ||
ToastTitle, | ||
ToastViewport, | ||
} from "@/components/ui/toast" | ||
import { useToast } from "@/components/ui/use-toast" | ||
|
||
export function Toaster() { | ||
const { toasts } = useToast() | ||
|
||
return ( | ||
<ToastProvider> | ||
{toasts.map(function ({ id, title, description, action, ...props }) { | ||
return ( | ||
<Toast key={id} {...props}> | ||
<div className="grid gap-1"> | ||
{title && <ToastTitle>{title}</ToastTitle>} | ||
{description && ( | ||
<ToastDescription>{description}</ToastDescription> | ||
)} | ||
</div> | ||
{action} | ||
<ToastClose /> | ||
</Toast> | ||
) | ||
})} | ||
<ToastViewport /> | ||
</ToastProvider> | ||
) | ||
} |
Oops, something went wrong.