Skip to content

Commit 958d2c0

Browse files
committed
feat: replace react-hot-toast with sonner for themed toasts
- Add sonner toast library with custom themed Toaster component - Update all 15 files to use new toast import from sonner - Remove position overrides to ensure consistent bottom-right placement - Remove react-hot-toast dependency - Fix TypeScript errors in UpdateContext simulation helpers
1 parent 50766d5 commit 958d2c0

21 files changed

Lines changed: 116 additions & 74 deletions

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
"lucide-react": "^0.469.0",
7676
"react-day-picker": "^9.4.4",
7777
"react-hook-form": "^7.54.2",
78-
"react-hot-toast": "^2.4.1",
7978
"react-router-dom": "^7.1.1",
79+
"sonner": "^2.0.7",
8080
"tailwind-merge": "^2.6.0",
8181
"zod": "^3.24.1"
8282
},

pnpm-lock.yaml

Lines changed: 14 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/src/components/doctor/AddOrEditDoctor.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { Input } from '../ui/input'
1414
import { Card, CardContent, CardHeader, CardTitle } from '../ui/card'
1515

1616
import { forwardRef, useImperativeHandle } from 'react'
17-
import toast from 'react-hot-toast'
17+
import { toast } from '@renderer/components/ui/sonner'
1818
import { unwrapResult } from '@renderer/lib/utils'
1919
import { DoctorModel } from '@shared/models/DoctorModel'
2020
import { User, Briefcase, Award, Stethoscope } from 'lucide-react'
@@ -57,9 +57,7 @@ export const AddOrEditDoctor = forwardRef<AddOrEditDoctorRef, AddOrEditDoctorPro
5757
try {
5858
const result = await unwrapResult(window.api.invoke('createNewDoctor', data))
5959

60-
toast.success('Doctor added successfully', {
61-
position: 'bottom-center'
62-
})
60+
toast.success('Doctor added successfully')
6361

6462
if (result) {
6563
onUpdated?.(new DoctorModel(result))
@@ -76,9 +74,7 @@ export const AddOrEditDoctor = forwardRef<AddOrEditDoctorRef, AddOrEditDoctorPro
7674

7775
const result = await unwrapResult(window.api.invoke('updateDoctorById', doctor.id, data))
7876

79-
toast.success('Doctor updated successfully', {
80-
position: 'bottom-center'
81-
})
77+
toast.success('Doctor updated successfully')
8278

8379
if (result) {
8480
onUpdated?.(new DoctorModel(result))

src/renderer/src/components/patient/NewPatientForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
FormLabel,
2222
FormMessage
2323
} from '../ui/form'
24-
import toast from 'react-hot-toast'
24+
import { toast } from '@renderer/components/ui/sonner'
2525
import { RichTextEditor } from '../common/RichTextEditor'
2626
import { Card, CardContent, CardHeader, CardTitle } from '../ui/card'
2727
import { cn } from '@renderer/lib/utils'

src/renderer/src/components/settings/BackupSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
History,
1515
FileArchive
1616
} from 'lucide-react'
17-
import toast from 'react-hot-toast'
17+
import { toast } from '@renderer/components/ui/sonner'
1818
import { Button } from '@renderer/components/ui/button'
1919
import { Input } from '@renderer/components/ui/input'
2020
import { Card, CardContent, CardHeader, CardTitle } from '@renderer/components/ui/card'

src/renderer/src/components/settings/GeneralSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'
1818
import { useSettings } from '@renderer/contexts/SettingsContext'
1919
import { queries } from '@renderer/lib/queries'
2020
import { useEffect } from 'react'
21-
import toast from 'react-hot-toast'
21+
import { toast } from '@renderer/components/ui/sonner'
2222

2323
const formSchema = z.object({
2424
hospital: z.string(),

src/renderer/src/components/settings/TemplateForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { useForm, Controller } from 'react-hook-form'
33
import { z } from 'zod'
44
import { zodResolver } from '@hookform/resolvers/zod'
55
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
6-
import toast from 'react-hot-toast'
6+
import { toast } from '@renderer/components/ui/sonner'
77
import {
88
Type,
99
Layers,

src/renderer/src/components/settings/TemplatesSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useState, useMemo } from 'react'
22
import { useNavigate } from 'react-router-dom'
33
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query'
44
import { Plus, Search, Pencil, Trash2, Globe, User, FileText, Layers } from 'lucide-react'
5-
import toast from 'react-hot-toast'
5+
import { toast } from '@renderer/components/ui/sonner'
66
import { Button } from '@renderer/components/ui/button'
77
import { Input } from '@renderer/components/ui/input'
88
import { Card, CardContent, CardHeader, CardTitle } from '@renderer/components/ui/card'

src/renderer/src/components/surgery/AddOrEditFollowup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { RichTextEditor } from '../common/RichTextEditor'
1414
import { Button } from '../ui/button'
1515
import { useState } from 'react'
1616
import { unwrapResult } from '@renderer/lib/utils'
17-
import toast from 'react-hot-toast'
17+
import { toast } from '@renderer/components/ui/sonner'
1818
import { useMutation, useQueryClient } from '@tanstack/react-query'
1919
import { queries } from '@renderer/lib/queries'
2020
import { ChevronRight, Save } from 'lucide-react'

src/renderer/src/components/surgery/AddOrEditSurgery.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { RichTextEditor } from '../common/RichTextEditor'
1616

1717
import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from 'react'
1818
import { DoctorAutoComplete } from '../doctor/DoctorAutoComplete'
19-
import toast from 'react-hot-toast'
19+
import { toast } from '@renderer/components/ui/sonner'
2020
import { SurgeryModel } from '../../../../shared/models/SurgeryModel'
2121
import { unwrapResult } from '@renderer/lib/utils'
2222
import { Card, CardContent, CardHeader, CardTitle } from '../ui/card'
@@ -105,9 +105,7 @@ export const AddOrEditSurgery = forwardRef<AddOrEditSurgeryRef, AddOrEditSurgery
105105
)
106106
await unwrapResult(window.api.invoke('updateSurgeryDoctorsDoneBy', result.id, doneBy))
107107

108-
toast.success('Surgery created successfully', {
109-
position: 'bottom-center'
110-
})
108+
toast.success('Surgery created successfully')
111109

112110
if (onUpdated) {
113111
onUpdated(new SurgeryModel(result))
@@ -140,9 +138,7 @@ export const AddOrEditSurgery = forwardRef<AddOrEditSurgeryRef, AddOrEditSurgery
140138
)
141139
await unwrapResult(window.api.invoke('updateSurgeryDoctorsDoneBy', surgery.id, doneBy))
142140

143-
toast.success('Surgery updated successfully', {
144-
position: 'bottom-center'
145-
})
141+
toast.success('Surgery updated successfully')
146142

147143
if (onUpdated) {
148144
onUpdated(new SurgeryModel(result))

0 commit comments

Comments
 (0)