we fully toasty now, user can enjoy the feedback!

This commit is contained in:
StefanWout 2024-12-04 11:17:47 +00:00
parent 7d7167f728
commit d1cbf076dd
6 changed files with 207 additions and 15 deletions

194
src/app/hooks/use-toast.ts Normal file
View file

@ -0,0 +1,194 @@
"use client"
// Inspired by react-hot-toast library
import * as React from "react"
import type {
ToastActionElement,
ToastProps,
} from "src/app/shadcn_components/ui/toast"
const TOAST_LIMIT = 1
const TOAST_REMOVE_DELAY = 1000000
type ToasterToast = ToastProps & {
id: string
title?: React.ReactNode
description?: React.ReactNode
action?: ToastActionElement
}
const actionTypes = {
ADD_TOAST: "ADD_TOAST",
UPDATE_TOAST: "UPDATE_TOAST",
DISMISS_TOAST: "DISMISS_TOAST",
REMOVE_TOAST: "REMOVE_TOAST",
} as const
let count = 0
function genId() {
count = (count + 1) % Number.MAX_SAFE_INTEGER
return count.toString()
}
type ActionType = typeof actionTypes
type Action =
| {
type: ActionType["ADD_TOAST"]
toast: ToasterToast
}
| {
type: ActionType["UPDATE_TOAST"]
toast: Partial<ToasterToast>
}
| {
type: ActionType["DISMISS_TOAST"]
toastId?: ToasterToast["id"]
}
| {
type: ActionType["REMOVE_TOAST"]
toastId?: ToasterToast["id"]
}
interface State {
toasts: ToasterToast[]
}
const toastTimeouts = new Map<string, ReturnType<typeof setTimeout>>()
const addToRemoveQueue = (toastId: string) => {
if (toastTimeouts.has(toastId)) {
return
}
const timeout = setTimeout(() => {
toastTimeouts.delete(toastId)
dispatch({
type: "REMOVE_TOAST",
toastId: toastId,
})
}, TOAST_REMOVE_DELAY)
toastTimeouts.set(toastId, timeout)
}
export const reducer = (state: State, action: Action): State => {
switch (action.type) {
case "ADD_TOAST":
return {
...state,
toasts: [action.toast, ...state.toasts].slice(0, TOAST_LIMIT),
}
case "UPDATE_TOAST":
return {
...state,
toasts: state.toasts.map((t) =>
t.id === action.toast.id ? { ...t, ...action.toast } : t
),
}
case "DISMISS_TOAST": {
const { toastId } = action
// ! Side effects ! - This could be extracted into a dismissToast() action,
// but I'll keep it here for simplicity
if (toastId) {
addToRemoveQueue(toastId)
} else {
state.toasts.forEach((toast) => {
addToRemoveQueue(toast.id)
})
}
return {
...state,
toasts: state.toasts.map((t) =>
t.id === toastId || toastId === undefined
? {
...t,
open: false,
}
: t
),
}
}
case "REMOVE_TOAST":
if (action.toastId === undefined) {
return {
...state,
toasts: [],
}
}
return {
...state,
toasts: state.toasts.filter((t) => t.id !== action.toastId),
}
}
}
const listeners: Array<(state: State) => void> = []
let memoryState: State = { toasts: [] }
function dispatch(action: Action) {
memoryState = reducer(memoryState, action)
listeners.forEach((listener) => {
listener(memoryState)
})
}
type Toast = Omit<ToasterToast, "id">
function toast({ ...props }: Toast) {
const id = genId()
const update = (props: ToasterToast) =>
dispatch({
type: "UPDATE_TOAST",
toast: { ...props, id },
})
const dismiss = () => dispatch({ type: "DISMISS_TOAST", toastId: id })
dispatch({
type: "ADD_TOAST",
toast: {
...props,
id,
open: true,
onOpenChange: (open) => {
if (!open) dismiss()
},
},
})
return {
id: id,
dismiss,
update,
}
}
function useToast() {
const [state, setState] = React.useState<State>(memoryState)
React.useEffect(() => {
listeners.push(setState)
return () => {
const index = listeners.indexOf(setState)
if (index > -1) {
listeners.splice(index, 1)
}
}
}, [state])
return {
...state,
toast,
dismiss: (toastId?: string) => dispatch({ type: "DISMISS_TOAST", toastId }),
}
}
export { useToast, toast }

View file

@ -6,6 +6,7 @@ import { AuthOptions } from "@/app/api/auth/[...nextauth]/route";
import { getServerSession } from "next-auth/next";
import { cache } from "react";
import { Inter } from "next/font/google";
import { Toaster } from "@/app/shadcn_components/ui/toaster";
// If loading a variable font, you don't need to specify the font weight
const inter = Inter({
@ -51,6 +52,7 @@ export default async function RootLayout({
<ReactQueryProvider>
<Nav userImage={userImage} />
<main className="flex-grow">{children}</main>
<Toaster />
<Footer />
</ReactQueryProvider>
</Provider>

View file

@ -1,14 +1,14 @@
"use client";
import { Dialog, Transition, Menu } from "@headlessui/react";
import { useState, Fragment, useMemo, useRef } from "react";
import { Fragment, useMemo } from "react";
import { Input } from "@/app/shadcn_components/ui/input";
import { Button } from "@/app/shadcn_components/ui/button";
import { Float } from "@headlessui-float/react";
import { ChevronDownIcon } from "@heroicons/react/20/solid";
import { useMutation } from "@tanstack/react-query";
import { useSession } from "next-auth/react";
import { Form, useForm, FormProvider } from "react-hook-form";
import { useForm, FormProvider } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import * as z from "zod";
import {
@ -18,11 +18,7 @@ import {
FormControl,
FormMessage,
} from "@/app/shadcn_components/ui/form";
import { Toast } from "@/app/shadcn_components/ui/toast";
import { Toaster } from "@/app/shadcn_components/ui/toaster"
import { useToast } from "@/app/shadcn_components/hooks/use-toast";
import { FileKey } from "lucide-react";
import { use } from "chai";
import { useToast } from "@/app/hooks/use-toast";
type Option = {
label: string;
@ -420,8 +416,8 @@ export default function RemoteAssessmentModal({
},
});
const [toastState, setToastState] = useState<any>([]);
const { toast } = useToast(toastState, setToastState);
// const [toastState, setToastState] = useState<any>([]);
const { toast } = useToast();
const onSubmit = async (data: FormValues) => {
try {
@ -429,8 +425,8 @@ export default function RemoteAssessmentModal({
form.reset();
setIsOpen(false);
toast({
title: "Success",
description: "Your remote assessment request has been sent.",
title: "The Remote Assesment has been sent",
description: "",
});
} catch (error) {
console.error("Error submitting form:", error);

View file

@ -5,7 +5,7 @@ import * as ToastPrimitives from "@radix-ui/react-toast"
import { cva, type VariantProps } from "class-variance-authority"
import { X } from "lucide-react"
import { cn } from "s/lib/utils"
import { cn } from "@/lib/utils"
const ToastProvider = ToastPrimitives.Provider

View file

@ -1,6 +1,6 @@
"use client"
import { useToast } from "../hooks/use-toast";
import { useToast } from "@/app/hooks/use-toast"
import {
Toast,
ToastClose,
@ -8,7 +8,7 @@ import {
ToastProvider,
ToastTitle,
ToastViewport,
} from "../ui/toast"
} from "@/app/shadcn_components/ui/toast"
export function Toaster() {
const { toasts } = useToast()

View file

@ -1,6 +1,6 @@
import { type ClassValue, clsx } from "clsx"
import { twMerge } from "tailwind-merge"
export function cn(...inputs: ClassValue[]) {
export function cn (...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}