toast add consumeEvent param；dismiss can close dialogs with duplicate tags

Author: xdd666t

CHANGELOG.md

@@ -1,3 +1,8 @@
+# [3.4.x]
+
+- 'showToast' add 'consumeEvent' param
+- 'dismiss' can close dialogs with duplicate tags
+
 # [3.3.x]
 
 - Notice: 'antiShake' renamed 'debounce'

lib/src/custom/custom_dialog.dart

@@ -280,17 +280,19 @@ class CustomDialog extends BaseDialog {
     DialogInfo? info;
     var dialogQueue = proxy.dialogQueue;
     var list = dialogQueue.toList();
+
     for (var i = dialogQueue.length - 1; i >= 0; i--) {
       if (dialogQueue.isEmpty) break;
       var item = list[i];
-      if (type == DialogType.dialog || item.type == type) {
+      if (tag != null && item.tag == tag) {
+        info = item;
+        break;
+      }else if (type == DialogType.dialog || item.type == type) {
         info = item;
         break;
       }
     }
 
-    DialogInfo? infoMap = tag != null ? proxy.dialogMap[tag] : null;
-    info = tag != null ? infoMap : info;
     //handle prohibiting back event
     if (info != null && (!info.backDismiss && back)) return null;
 

lib/src/helper/dialog_proxy.dart

@@ -179,6 +179,7 @@ class DialogProxy {
     required Duration animationDuration,
     required Color maskColor,
     required Widget? maskWidget,
+    required bool consumeEvent,
     required Duration time,
     required bool debounce,
     required SmartToastType type,
@@ -195,7 +196,7 @@ class DialogProxy {
       time: time,
       debounce: debounce,
       type: type,
-      widget: ToastHelper(child: widget),
+      widget: ToastHelper(consumeEvent: consumeEvent, child: widget),
     );
   }
 

lib/src/smart_dialog.dart

@@ -447,6 +447,9 @@ class SmartDialog {
   ///
   /// [alignment]：control the location of toast on the screen
   ///
+  /// [consumeEvent]： default (false), true (toast will consume touch events),
+  /// false (toast no longer consumes events, touch events can penetrate toast)
+  ///
   /// [time]：toast display time on the screen(Use the 'widget' param, this param will be invalid)
   ///
   /// [debounceTemp]：debounce feature
@@ -478,6 +481,8 @@ class SmartDialog {
   ///
   /// [alignment]：控制toast在屏幕上的显示位置（使用 'widget' 参数，该参数将失效）
   ///
+  /// [consumeEvent]：默认（false），true（toast会消耗触摸事件），false（toast不再消耗事件，触摸事件能穿透toast）
+  ///
   /// [time]：toast在屏幕上的显示时间
   ///
   /// [debounceTemp]：防抖功能（debounce）
@@ -495,6 +500,7 @@ class SmartDialog {
     Color? maskColorTemp,
     Widget? maskWidgetTemp,
     AlignmentGeometry alignment = Alignment.bottomCenter,
+    bool? consumeEvent,
     Duration? time,
     bool? debounceTemp,
     SmartToastType? type,
@@ -508,6 +514,7 @@ class SmartDialog {
       animationDuration: animationDurationTemp ?? Duration(milliseconds: 200),
       maskColor: maskColorTemp ?? config.maskColor,
       maskWidget: maskWidgetTemp ?? config.maskWidget,
+      consumeEvent: consumeEvent ?? false,
       time: time ?? Duration(milliseconds: 2000),
       debounce: debounceTemp ?? config.debounce,
       type: type ?? SmartToastType.normal,

lib/src/widget/toast_helper.dart

@@ -1,7 +1,13 @@
 import 'package:flutter/material.dart';
 
 class ToastHelper extends StatefulWidget {
-  ToastHelper({Key? key, required this.child}) : super(key: key);
+  ToastHelper({
+    Key? key,
+    required this.consumeEvent,
+    required this.child,
+  }) : super(key: key);
+
+  final bool consumeEvent;
 
   final Widget child;
 
@@ -24,7 +30,9 @@ class _ToastHelperState extends State<ToastHelper> with WidgetsBindingObserver {
   Widget build(BuildContext context) {
     return Container(
       margin: EdgeInsets.only(bottom: _keyboardHeight),
-      child: IgnorePointer(child: widget.child),
+      child: widget.consumeEvent
+          ? widget.child
+          : IgnorePointer(child: widget.child),
     );
   }
 

pubspec.yaml

@@ -3,7 +3,7 @@ description:
   An elegant Flutter Dialog solution,
   Easily implement Toast, Loading and custom Dialog,
   Make the use of the dialog easier!
-version: 3.3.9
+version: 3.4.0
 homepage: https://github.com/fluttercandies/flutter_smart_dialog
 
 environment: