@capgo/capacitor-pretty-toast 8.1.18 → 8.1.20

package/README.md

@@ -1,13 +1,28 @@
 # @capgo/capacitor-pretty-toast
 
-Native-first pretty toast notifications for Capacitor and the web.
+Show beautiful toast notifications in your Capacitor app with native overlays on iOS and Android and a DOM renderer on web. Same `toast.*` API as react-native-pretty-toast.
 
-## Demo
+<a href="https://capgo.app/?ref=plugin_pretty_toast"><img src="https://capgo.app/readme-banner.svg?repo=Cap-go/capacitor-pretty-toast" alt="Capgo - Instant updates for Capacitor" /></a>
 
-<img
-  src="./media/pretty-toast-external-device.webp"
-  alt="Animated Pretty Toast demo on an external device"
-/>
+<div align="center">
+  <p><b>Capgo</b>: open-source live updates for Ionic and Capacitor apps. Ship OTA fixes and features instantly, without waiting for app store review.</p>
+  <h2><a href="https://capgo.app/register/?ref=plugin_pretty_toast">➡️ Get started for free</a></h2>
+  <p>14-day unlimited free trial. No credit card required</p>
+  <p><a href="https://capgo.app/consulting/?ref=plugin_pretty_toast">Missing a feature? We'll build the plugin for you 💪</a></p>
+</div>
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/Cap-go/capacitor-pretty-toast/main/.github/assets/readme-demo.webp" alt="Animated Pretty Toast demo on an external device" width="300" />
+</p>
+
+## Key features
+
+- **Variants**: `success()`, `error()`, `info()`, `warning()`, `loading()` and fully custom `show()`.
+- **Promise toasts**: `promise()` shows loading, then success or error when your promise settles.
+- **Live updates**: `update()` changes a toast in place, `dismiss()` and `dismissAll()` close them.
+- **Queueing**: toasts queue by default, and `force` shows one right away.
+- **Icons**: symbol icons, raw SVG and image URIs through `iconSource`.
+- **Platforms**: iOS, Android and Web.
 
 This package keeps the familiar `toast.*` surface from `react-native-pretty-toast`, but ships as a Capacitor plugin with:
 

package/android/src/main/java/com/toast/ToastOverlay.kt

@@ -66,7 +66,13 @@ class ToastOverlay(activity: Activity) {
     var onPress: (() -> Unit)? = null
     var onActionPress: (() -> Unit)? = null
 
-    private val imageLoader: ExecutorService = Executors.newSingleThreadExecutor { r ->
+    // A `var`, not a `val`: show() calls destroy() on this same instance (not
+    // a fresh one) whenever useDynamicIsland changes, which shuts this down.
+    // loadIcon() rebuilds it on demand so a later custom-icon toast on the
+    // same overlay doesn't hit a RejectedExecutionException on a dead pool.
+    private var imageLoader: ExecutorService = newImageLoader()
+
+    private fun newImageLoader(): ExecutorService = Executors.newSingleThreadExecutor { r ->
         Thread(r, "ToastIconLoader").apply { isDaemon = true }
     }
     // Bitmaps keyed by URI so a repeat show of the same custom icon paints
@@ -379,6 +385,9 @@ class ToastOverlay(activity: Activity) {
     private fun loadIcon(built: ToastViewFactory.Built, uri: String) {
         val targetW = built.icon.layoutParams.width.takeIf { it > 0 } ?: DEFAULT_ICON_TARGET_PX
         val targetH = built.icon.layoutParams.height.takeIf { it > 0 } ?: DEFAULT_ICON_TARGET_PX
+        if (imageLoader.isShutdown) {
+            imageLoader = newImageLoader()
+        }
         imageLoader.execute {
             val bitmap = try {
                 when {

package/android/src/main/java/com/toast/anim/CutoutMorphAnimator.kt

@@ -28,6 +28,17 @@ class CutoutMorphAnimator(
     private var cornerAnimator: ValueAnimator? = null
     private val cornerRadiiBuf = FloatArray(8)
 
+    /**
+     * Set for the duration of dismiss()'s own pill.animate() run. A tap or
+     * release arriving in that window would otherwise reach snapBack(),
+     * which cancels the very same ViewPropertyAnimator instance (Android
+     * caches one per view) — cancel() never runs withEndAction, so the
+     * dismiss's own state reset and onEnd() callback would be lost forever,
+     * leaving the toast overlay's isDismissing flag stuck and every later
+     * toast permanently queued behind it.
+     */
+    private var isDismissingAnim = false
+
     /**
      * Lower bound for the measured pill height — guards against racing
      * the layout pass, where `pill.height` can briefly read as 0.
@@ -76,6 +87,7 @@ class CutoutMorphAnimator(
     }
 
     override fun dismiss(onEnd: () -> Unit) {
+        isDismissingAnim = true
         onBeforeDismiss()
 
         val expandedWidth = pill.width.toFloat().coerceAtLeast(1f)
@@ -110,6 +122,7 @@ class CutoutMorphAnimator(
             .setDuration(MORPH_DURATION_MS)
             .setInterpolator(MORPH_EASING)
             .withEndAction {
+                isDismissingAnim = false
                 resetPillToExpandedResting()
                 onEnd()
             }
@@ -123,6 +136,11 @@ class CutoutMorphAnimator(
     }
 
     override fun snapBack() {
+        // A dismiss already in flight owns this animator; cancelling it here
+        // would strand it (see isDismissingAnim above) instead of letting it
+        // finish and report back to ToastOverlay.
+        if (isDismissingAnim) return
+
         // Release-without-dismiss during a morph drag: spring back to full
         // size and restore content opacity.
         pill.animate().cancel()

package/ios/Sources/PrettyToastPlugin/PrettyToastView.swift

@@ -17,55 +17,56 @@ struct PrettyToastView: View {
             let scaleX: CGFloat = isExpanded ? 1 : (layout.compactWidth / layout.expandedWidth)
             let scaleY: CGFloat = isExpanded ? 1 : (layout.compactHeight / layout.expandedHeight)
 
-            let swipeGesture = DragGesture(minimumDistance: 2).onEnded { value in
-                if value.translation.height < -8 || value.predictedEndTranslation.height < -40 {
+            // A separate `.onTapGesture` alongside a low-threshold
+            // `.gesture(DragGesture())` on the same view is a classic SwiftUI
+            // trap: `minimumDistance: 2` makes the drag start recognizing on
+            // almost any real touch, taps included, and once it does, it took
+            // exclusive priority over the sibling tap gesture — so a plain
+            // tap never reached `wasTapped` and the toast could never be
+            // dismissed by tapping it. One gesture, one decision on release,
+            // fixes that: a short release is always a tap regardless of
+            // whether swipe-dismiss is enabled.
+            let dismissGesture = DragGesture(minimumDistance: 0).onEnded { value in
+                if window.enableSwipeDismiss && (value.translation.height < -8 || value.predictedEndTranslation.height < -40) {
                     window.swipeDismissRequested = true
+                } else {
+                    window.wasTapped = true
                 }
             }
 
             ZStack {
-                Group {
-                    let pill = toastBackground()
-                        .overlay {
-                            toastContent(layout)
-                                .frame(width: layout.expandedWidth, height: layout.expandedHeight)
-                                .scaleEffect(x: scaleX, y: scaleY)
-                        }
-                        .frame(
-                            width: isExpanded ? layout.expandedWidth : layout.compactWidth,
-                            height: isExpanded ? layout.expandedHeight : layout.compactHeight
-                        )
-                        .opacity(layout.hasDynamicIsland ? 1 : (isExpanded ? 1 : 0))
-                        .modifier(CapsuleOpacityModifier(
-                            haveDynamicIsland: layout.hasDynamicIsland,
-                            isExpanded: isExpanded
-                        ))
-                        .modifier(GeometryGroupModifier())
-                        .contentShape(Rectangle())
-                        .onTapGesture {
-                            window.wasTapped = true
+                toastBackground()
+                    .overlay {
+                        toastContent(layout)
+                            .frame(width: layout.expandedWidth, height: layout.expandedHeight)
+                            .scaleEffect(x: scaleX, y: scaleY)
+                    }
+                    .frame(
+                        width: isExpanded ? layout.expandedWidth : layout.compactWidth,
+                        height: isExpanded ? layout.expandedHeight : layout.compactHeight
+                    )
+                    .opacity(layout.hasDynamicIsland ? 1 : (isExpanded ? 1 : 0))
+                    .modifier(CapsuleOpacityModifier(
+                        haveDynamicIsland: layout.hasDynamicIsland,
+                        isExpanded: isExpanded
+                    ))
+                    .modifier(GeometryGroupModifier())
+                    .contentShape(Rectangle())
+                    .gesture(dismissGesture)
+                    .background(
+                        GeometryReader { geo in
+                            Color.clear.preference(
+                                key: ToastFrameKey.self,
+                                value: geo.frame(in: .named("overlayWindow"))
+                            )
                         }
-                        .background(
-                            GeometryReader { geo in
-                                Color.clear.preference(
-                                    key: ToastFrameKey.self,
-                                    value: geo.frame(in: .named("overlayWindow"))
-                                )
-                            }
-                        )
-                        .onPreferenceChange(ToastFrameKey.self) { frame in
-                            if window.toastHitFrame != frame {
-                                window.toastHitFrame = frame
-                            }
+                    )
+                    .onPreferenceChange(ToastFrameKey.self) { frame in
+                        if window.toastHitFrame != frame {
+                            window.toastHitFrame = frame
                         }
-
-                    if window.enableSwipeDismiss {
-                        pill.gesture(swipeGesture)
-                    } else {
-                        pill
                     }
-                }
-                .offset(y: layout.hasDynamicIsland ? (isExpanded ? layout.expandedTopOffset : layout.topOffset) : 0)
+                    .offset(y: layout.hasDynamicIsland ? (isExpanded ? layout.expandedTopOffset : layout.topOffset) : 0)
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             .padding(.top, layout.hasDynamicIsland ? 0 : (isExpanded ? max(safeArea.top, 10) : 0))

package/ios/Sources/PrettyToastPlugin/ToastManager.swift

@@ -84,11 +84,18 @@ import UIKit
             self.cancelTimer()
             if autoDismiss && duration > 0 {
                 let interval = TimeInterval(duration) / 1000.0
-                self.autoDismissTimer = Timer.scheduledTimer(withTimeInterval: interval, repeats: false) { [weak self] _ in
+                // `.common` mode, like the backdrop sampler below: `.default`-mode
+                // timers are suspended for as long as the run loop is in `.tracking`
+                // mode, which UIKit enters for any active touch/scroll — so a toast
+                // triggered while (or dismissed while) the user is scrolling would
+                // never time out, jamming every later toast behind it in the queue.
+                let timer = Timer(timeInterval: interval, repeats: false) { [weak self] _ in
                     DispatchQueue.main.async {
                         self?.dismiss()
                     }
                 }
+                RunLoop.main.add(timer, forMode: .common)
+                self.autoDismissTimer = timer
             }
 
             if !accessibilityAnnouncement.isEmpty {
@@ -148,11 +155,15 @@ import UIKit
         cancelTimer()
         if autoDismiss && duration > 0 {
             let interval = TimeInterval(duration) / 1000.0
-            autoDismissTimer = Timer.scheduledTimer(withTimeInterval: interval, repeats: false) { [weak self] _ in
+            // See the matching comment in show(): `.common` mode so scrolling
+            // doesn't suspend the countdown.
+            let timer = Timer(timeInterval: interval, repeats: false) { [weak self] _ in
                 DispatchQueue.main.async {
                     self?.dismiss()
                 }
             }
+            RunLoop.main.add(timer, forMode: .common)
+            autoDismissTimer = timer
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-pretty-toast",
-  "version": "8.1.18",
+  "version": "8.1.20",
   "description": "Native-first pretty toast notifications for Capacitor and the web",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",