fix: toast message handling on android (#3604)

lawvs · web-flow · commit 1fad306f672a · 2025-04-27T15:17:50.000+08:00
* fix(toast): ensure default duration is applied when showing toast messages

* fix: handle potential undefined toastRefs and improve conflict warning

* chore: correct spelling of 'dismiss' in ToastRef and related usages
diff --git a/apps/mobile/src/components/ui/toast/CenteredToast.tsx b/apps/mobile/src/components/ui/toast/CenteredToast.tsx
@@ -14,7 +14,7 @@ export const CenteredToast = (props: ToastProps) => {
   const { register } = useContext(ToastActionContext)
   useEffect(() => {
     const disposer = register(props.currentIndex, {
-      dimiss: async () => {},
+      dismiss: async () => {},
     })
     return () => {
       disposer()
diff --git a/apps/mobile/src/components/ui/toast/manager.tsx b/apps/mobile/src/components/ui/toast/manager.tsx
@@ -28,6 +28,9 @@ export class ToastManager {
   private toastRefs = {} as Record<number, ToastRef>
 
   private register(currentIndex: number, ref: ToastRef) {
+    if (currentIndex in this.toastRefs) {
+      console.warn("Conflict toast ref", currentIndex, this.toastRefs[currentIndex], ref)
+    }
     this.toastRefs[currentIndex] = ref
     return () => {
       delete this.toastRefs[currentIndex]
@@ -71,7 +74,7 @@ export class ToastManager {
     }
 
     setTimeout(async () => {
-      await this.toastRefs[index]!.dimiss()
+      await this.toastRefs[index]?.dismiss()
       this.remove(index)
     }, props.duration)
   }
diff --git a/apps/mobile/src/components/ui/toast/types.ts b/apps/mobile/src/components/ui/toast/types.ts
@@ -29,5 +29,5 @@ export type BottomToastProps = Partial<ToastProps> & {
 }
 
 export interface ToastRef {
-  dimiss: () => Promise<void>
+  dismiss: () => Promise<void>
 }
diff --git a/apps/mobile/src/lib/toast.tsx b/apps/mobile/src/lib/toast.tsx
@@ -48,6 +48,7 @@ export const toast = {
       type,
       message,
       variant: "center-replace",
+      duration: options.duration ?? 1500,
       ...options,
     })
   }

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ export type BottomToastProps = Partial<ToastProps> & {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`export interface ToastRef {`
`32`		`- dimiss: () => Promise<void>`
	`32`	`+ dismiss: () => Promise<void>`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ export const toast = {`
`48`	`48`	`type,`
`49`	`49`	`message,`
`50`	`50`	`variant: "center-replace",`
	`51`	`+ duration: options.duration ?? 1500,`
`51`	`52`	`...options,`
`52`	`53`	`})`
`53`	`54`	`}`