Fix #77

Author: xdd666t

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Add SmartMaskTriggerType ([#71](https://github.com/fluttercandies/flutter_smart_dialog/issues/71))
 - Fix [#72](https://github.com/fluttercandies/flutter_smart_dialog/issues/72)
 - Complete [#75](https://github.com/fluttercandies/flutter_smart_dialog/issues/75): add animationBuilder(Support highly custom animation)
+- Fix [#77](https://github.com/fluttercandies/flutter_smart_dialog/issues/77)
 
 
 # [4.3.x]

lib/flutter_smart_dialog.dart

@@ -6,9 +6,9 @@ export 'src/config/smart_config_attach.dart';
 export 'src/config/smart_config_custom.dart';
 export 'src/config/smart_config_loading.dart';
 export 'src/config/smart_config_toast.dart';
+export 'src/data/animation_param.dart' show AnimationParam;
 
 /// dialog
 export 'src/init_dialog.dart';
 export 'src/smart_dialog.dart';
 export 'src/widget/helper/dialog_scope.dart' show SmartDialogController;
-export 'src/data/animation_param.dart' show AnimationParam;

lib/src/widget/attach_dialog_widget.dart

@@ -3,8 +3,8 @@ import 'package:flutter_smart_dialog/src/data/base_controller.dart';
 import 'package:flutter_smart_dialog/src/util/view_utils.dart';
 import 'package:flutter_smart_dialog/src/widget/animation/highlight_mask_animation.dart';
 import 'package:flutter_smart_dialog/src/widget/animation/scale_animation.dart';
-import 'package:flutter_smart_dialog/src/widget/helper/dialog_scope.dart';
 import 'package:flutter_smart_dialog/src/widget/helper/attach_widget.dart';
+import 'package:flutter_smart_dialog/src/widget/helper/dialog_scope.dart';
 import 'package:flutter_smart_dialog/src/widget/helper/mask_event.dart';
 
 import '../config/enum_config.dart';

lib/src/widget/helper/attach_widget.dart

@@ -6,16 +6,16 @@ import '../attach_dialog_widget.dart';
 typedef AttachBuilder = Widget Function(Widget child);
 
 typedef BeforeBuilder = void Function(
-    Offset targetOffset,
-    Size targetSize,
-    Offset selfOffset,
-    Size selfSize,
-    );
+  Offset targetOffset,
+  Size targetSize,
+  Offset selfOffset,
+  Size selfSize,
+);
 
 typedef CoverBuilder = List<Widget> Function(
-    Offset targetOffset,
-    Size targetSize,
-    );
+  Offset targetOffset,
+  Size targetSize,
+);
 
 class AttachWidget extends StatefulWidget {
   const AttachWidget({
@@ -115,9 +115,9 @@ class _AttachWidgetState extends State<AttachWidget> {
     if (widget.targetBuilder != null) {
       targetOffset = widget.targetContext != null
           ? widget.targetBuilder!(
-        targetOffset,
-        Size(targetSize.width, targetSize.height),
-      )
+              targetOffset,
+              Size(targetSize.width, targetSize.height),
+            )
           : widget.targetBuilder!(Offset.zero, Size.zero);
       targetSize = widget.targetContext != null ? targetSize : Size.zero;
     }
@@ -130,9 +130,7 @@ class _AttachWidgetState extends State<AttachWidget> {
   /// 处理: 方向及其位置
   void _handleLocation() {
     final selfSize = (_childContext!.findRenderObject() as RenderBox).size;
-    final screen = MediaQuery
-        .of(context)
-        .size;
+    final screen = MediaQuery.of(context).size;
 
     //动画方向及其位置
     final alignment = widget.alignment;
@@ -221,9 +219,7 @@ class _AttachWidgetState extends State<AttachWidget> {
     bool fixedVertical = false,
   }) {
     final childSize = (_childContext!.findRenderObject() as RenderBox).size;
-    final screen = MediaQuery
-        .of(context)
-        .size;
+    final screen = MediaQuery.of(context).size;
     var rectInfo = RectInfo(left: left, right: right, top: top, bottom: bottom);
 
     //处理左右边界问题
@@ -268,9 +264,7 @@ class AdaptBuilder extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final size = MediaQuery
-        .of(context)
-        .size;
+    final size = MediaQuery.of(context).size;
     return Row(mainAxisSize: MainAxisSize.min, children: [
       Column(mainAxisSize: MainAxisSize.min, children: [
         Container(

lib/src/widget/helper/toast_helper.dart

@@ -19,21 +19,41 @@ class ToastHelper extends StatefulWidget {
 class _ToastHelperState extends State<ToastHelper> with WidgetsBindingObserver {
   //solve problem of keyboard shelter toast
   double _keyboardHeight = 0;
+  late double _postFrameOpacity;
+  BuildContext? _childContext;
+
+  //offset size
+  Offset? selfOffset;
+  Size? selfSize;
 
   @override
   void initState() {
-    super.initState();
     widgetsBinding.addObserver(this);
     _dealKeyboard();
+
+    _postFrameOpacity = 0;
+    ViewUtils.addSafeUse(() {
+      if (!mounted) return;
+
+      final renderBox = _childContext!.findRenderObject() as RenderBox;
+      selfOffset = renderBox.localToGlobal(Offset.zero);
+      selfSize = renderBox.size;
+      _postFrameOpacity = 1;
+      setState(() {});
+    });
+    super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
+    var child = Builder(builder: (context) {
+      _childContext = context;
+      return Opacity(opacity: _postFrameOpacity, child: widget.child);
+    });
+
     return Container(
       margin: EdgeInsets.only(bottom: _keyboardHeight),
-      child: widget.consumeEvent
-          ? widget.child
-          : IgnorePointer(child: widget.child),
+      child: widget.consumeEvent ? child : IgnorePointer(child: child),
     );
   }
 
@@ -50,9 +70,21 @@ class _ToastHelperState extends State<ToastHelper> with WidgetsBindingObserver {
   }
 
   void _dealKeyboard() {
-    ViewUtils.addSafeUse((){
-      if (!mounted) return;
-      _keyboardHeight = MediaQuery.of(context).viewInsets.bottom;
+    ViewUtils.addSafeUse(() {
+      if (!mounted || selfOffset == null || selfSize == null) return;
+
+      var screen = MediaQuery.of(context).size;
+      var childToBottom = screen.height - (selfOffset!.dy + selfSize!.height);
+      var keyboardHeight = MediaQuery.of(context).viewInsets.bottom;
+      if (childToBottom < 0) {
+        _keyboardHeight = keyboardHeight;
+        setState(() {});
+        return;
+      }
+      if (childToBottom - keyboardHeight > -30) {
+        return;
+      }
+      _keyboardHeight = keyboardHeight - childToBottom;
       setState(() {});
     });
   }

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: 4.5.5
+version: 4.5.5+1
 homepage: https://github.com/fluttercandies/flutter_smart_dialog
 # flutter pub publish --server=https://pub.dartlang.org