v1 fix: Update properties or actions of opened AlertDialog (#5547)

* Refactor dialog management in BasePage

Removed deprecated 'open' and 'close' methods in favor of 'show_dialog' and 'pop_dialog'. Enhanced 'show_dialog' to better manage dialog lifecycle and dismissal, including improved event handling and error checking. Updated docstrings for clarity and maintainability.

Fix #5439

* Refactor alert dialogs to use ControlInheritedNotifier

Replaces direct widget construction with ControlInheritedNotifier in both AlertDialogControl and CupertinoAlertDialogControl for improved state management. Error handling is now managed via a string error message instead of an ErrorControl widget instance.

* Refactor Banner dart widget

* Added alert_dialog test

* Added CupertinoAlertDialog for body update

* Fix BasePage comments

* Split alert dialog tests

Author: FeodorFitsner

packages/flet/lib/src/controls/alert_dialog.dart

@@ -9,6 +9,7 @@ import '../utils/edge_insets.dart';
 import '../utils/misc.dart';
 import '../utils/numbers.dart';
 import '../utils/text.dart';
+import '../widgets/control_inherited_notifier.dart';
 import '../widgets/error.dart';
 import 'control_widget.dart';
 
@@ -23,9 +24,9 @@ class AlertDialogControl extends StatefulWidget {
 }
 
 class _AlertDialogControlState extends State<AlertDialogControl> {
-  Widget? _dialog;
   bool _open = false;
   NavigatorState? _navigatorState;
+  String? _error;
 
   @override
   void didChangeDependencies() {
@@ -48,50 +49,50 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
   }
 
   Widget _createAlertDialog() {
-    var title = widget.control.get("title");
-    var content = widget.control.buildWidget("content");
-    var actions = widget.control.buildWidgets("actions");
-    if (title == null && content == null && actions.isEmpty) {
-      return const ErrorControl(
-          "AlertDialog has nothing to display. Provide at minimum one of the following: title, content, actions");
-    }
-
-    return AlertDialog(
-      title: title is Control
-          ? ControlWidget(control: title)
-          : title is String
-              ? Text(title)
-              : null,
-      titlePadding: widget.control.getPadding("title_padding"),
-      content: content,
-      contentPadding: widget.control.getPadding("content_padding",
-          const EdgeInsets.fromLTRB(24.0, 20.0, 24.0, 24.0))!,
-      actions: actions,
-      actionsPadding: widget.control.getPadding("actions_padding"),
-      actionsAlignment:
-          widget.control.getMainAxisAlignment("actions_alignment"),
-      shape: widget.control.getShape("shape", Theme.of(context)),
-      semanticLabel: widget.control.getString("semantics_label"),
-      insetPadding: widget.control.getPadding("inset_padding",
-          const EdgeInsets.symmetric(horizontal: 40.0, vertical: 24.0))!,
-      iconPadding: widget.control.getPadding("icon_padding"),
-      backgroundColor: widget.control.getColor("bgcolor", context),
-      buttonPadding: widget.control.getPadding("action_button_padding"),
-      surfaceTintColor: widget.control.getColor("surface_tint_color", context),
-      shadowColor: widget.control.getColor("shadow_color", context),
-      elevation: widget.control.getDouble("elevation"),
-      clipBehavior:
-          parseClip(widget.control.getString("clip_behavior"), Clip.none)!,
-      icon: widget.control.buildIconOrWidget("icon"),
-      iconColor: widget.control.getColor("icon_color", context),
-      scrollable: widget.control.getBool("scrollable", false)!,
-      actionsOverflowButtonSpacing:
-          widget.control.getDouble("actions_overflow_button_spacing"),
-      alignment: widget.control.getAlignment("alignment"),
-      contentTextStyle:
-          widget.control.getTextStyle("content_text_style", Theme.of(context)),
-      titleTextStyle:
-          widget.control.getTextStyle("title_text_style", Theme.of(context)),
+    return ControlInheritedNotifier(
+      notifier: widget.control,
+      child: Builder(builder: (context) {
+        ControlInheritedNotifier.of(context);
+        var title = widget.control.get("title");
+        return AlertDialog(
+          title: title is Control
+              ? ControlWidget(control: title)
+              : title is String
+                  ? Text(title)
+                  : null,
+          titlePadding: widget.control.getPadding("title_padding"),
+          content: widget.control.buildWidget("content"),
+          contentPadding: widget.control.getPadding("content_padding",
+              const EdgeInsets.fromLTRB(24.0, 20.0, 24.0, 24.0))!,
+          actions: widget.control.buildWidgets("actions"),
+          actionsPadding: widget.control.getPadding("actions_padding"),
+          actionsAlignment:
+              widget.control.getMainAxisAlignment("actions_alignment"),
+          shape: widget.control.getShape("shape", Theme.of(context)),
+          semanticLabel: widget.control.getString("semantics_label"),
+          insetPadding: widget.control.getPadding("inset_padding",
+              const EdgeInsets.symmetric(horizontal: 40.0, vertical: 24.0))!,
+          iconPadding: widget.control.getPadding("icon_padding"),
+          backgroundColor: widget.control.getColor("bgcolor", context),
+          buttonPadding: widget.control.getPadding("action_button_padding"),
+          surfaceTintColor:
+              widget.control.getColor("surface_tint_color", context),
+          shadowColor: widget.control.getColor("shadow_color", context),
+          elevation: widget.control.getDouble("elevation"),
+          clipBehavior:
+              parseClip(widget.control.getString("clip_behavior"), Clip.none)!,
+          icon: widget.control.buildIconOrWidget("icon"),
+          iconColor: widget.control.getColor("icon_color", context),
+          scrollable: widget.control.getBool("scrollable", false)!,
+          actionsOverflowButtonSpacing:
+              widget.control.getDouble("actions_overflow_button_spacing"),
+          alignment: widget.control.getAlignment("alignment"),
+          contentTextStyle: widget.control
+              .getTextStyle("content_text_style", Theme.of(context)),
+          titleTextStyle: widget.control
+              .getTextStyle("title_text_style", Theme.of(context)),
+        );
+      }),
     );
   }
 
@@ -102,11 +103,11 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
     var modal = widget.control.getBool("modal", false)!;
 
     if (open && (open != _open)) {
-      _dialog = _createAlertDialog();
-
-      if (_dialog is ErrorControl) {
-        debugPrint(
-            "AlertDialog: ErrorControl, not showing dialog: ${(_dialog as ErrorControl).message}");
+      if (widget.control.get("title") == null &&
+          widget.control.get("content") == null &&
+          widget.control.children("actions").isEmpty) {
+        _error =
+            "AlertDialog has nothing to display. Provide at minimum one of the following: title, content, actions.";
         return;
       }
 
@@ -118,7 +119,7 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
             barrierColor: widget.control.getColor("barrier_color", context),
             useRootNavigator: false,
             context: context,
-            builder: (context) => _dialog!).then((value) {
+            builder: (context) => _createAlertDialog()).then((value) {
           debugPrint("Dismissing AlertDialog(${widget.control.id})");
           _open = false;
           widget.control.updateProperties({"open": false});
@@ -132,7 +133,7 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
 
   @override
   Widget build(BuildContext context) {
-    return _dialog is ErrorControl ? _dialog! : const SizedBox.shrink();
+    return _error != null ? ErrorControl(_error!) : const SizedBox.shrink();
   }
 
   void _closeDialog() {
@@ -142,7 +143,7 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
             "AlertDialog(${widget.control.id}): Closing dialog managed by this widget.");
         _navigatorState?.pop();
         _open = false;
-        _dialog = null;
+        _error = null;
       } else {
         debugPrint(
             "AlertDialog(${widget.control.id}): Dialog was not opened by this widget, skipping pop.");

packages/flet/lib/src/controls/banner.dart

@@ -19,7 +19,7 @@ class BannerControl extends StatefulWidget {
 }
 
 class _BannerControlState extends State<BannerControl> {
-  Widget? _dialog;
+  String? _error;
 
   @override
   void initState() {
@@ -41,24 +41,13 @@ class _BannerControlState extends State<BannerControl> {
     _toggleBanner();
   }
 
-  Widget _createBanner() {
-    var leading = widget.control.buildIconOrWidget("leading");
-    var content = widget.control.buildTextOrWidget("content");
-    var actions = widget.control.buildWidgets("actions");
-
-    if (content == null) {
-      return const ErrorControl("Banner.content must be provided and visible");
-    } else if (actions.isEmpty) {
-      return const ErrorControl(
-          "Banner.actions must be provided and at least one action should be visible");
-    }
-
+  MaterialBanner _createBanner() {
     return MaterialBanner(
-      leading: leading,
+      leading: widget.control.buildIconOrWidget("leading"),
       leadingPadding: widget.control.getPadding("leading_padding"),
-      content: content,
+      content: widget.control.buildTextOrWidget("content")!,
       padding: widget.control.getPadding("content_padding"),
-      actions: actions,
+      actions: widget.control.buildWidgets("actions"),
       forceActionsBelow: widget.control.getBool("force_actions_below", false)!,
       backgroundColor: widget.control.getColor("bgcolor", context),
       contentTextStyle:
@@ -87,11 +76,12 @@ class _BannerControlState extends State<BannerControl> {
     var open = widget.control.getBool("open", false)!;
 
     if (open && (open != lastOpen)) {
-      _dialog = _createBanner();
-
-      if (_dialog is ErrorControl) {
-        debugPrint(
-            "Banner: ErrorControl, not showing dialog: ${(_dialog as ErrorControl).message}");
+      if (widget.control.get("content") == null) {
+        _error = "Banner.content must be provided and visible";
+        return;
+      } else if (widget.control.children("actions").isEmpty) {
+        _error =
+            "Banner.actions must be provided and at least one action should be visible";
         return;
       }
 
@@ -100,7 +90,7 @@ class _BannerControlState extends State<BannerControl> {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         ScaffoldMessenger.of(context).removeCurrentMaterialBanner();
         ScaffoldMessenger.of(context)
-            .showMaterialBanner(_dialog as MaterialBanner)
+            .showMaterialBanner(_createBanner())
             .closed
             .then((reason) {
           debugPrint(
@@ -127,6 +117,6 @@ class _BannerControlState extends State<BannerControl> {
 
   @override
   Widget build(BuildContext context) {
-    return _dialog is ErrorControl ? _dialog! : const SizedBox.shrink();
+    return _error != null ? ErrorControl(_error!) : const SizedBox.shrink();
   }
 }

packages/flet/lib/src/controls/cupertino_alert_dialog.dart

@@ -6,6 +6,7 @@ import '../models/control.dart';
 import '../utils/animations.dart';
 import '../utils/colors.dart';
 import '../utils/numbers.dart';
+import '../widgets/control_inherited_notifier.dart';
 import '../widgets/error.dart';
 
 class CupertinoAlertDialogControl extends StatefulWidget {
@@ -21,9 +22,9 @@ class CupertinoAlertDialogControl extends StatefulWidget {
 
 class _CupertinoAlertDialogControlState
     extends State<CupertinoAlertDialogControl> {
-  Widget? _dialog;
   bool _open = false;
   NavigatorState? _navigatorState;
+  String? _error;
 
   @override
   void didChangeDependencies() {
@@ -49,25 +50,24 @@ class _CupertinoAlertDialogControlState
   }
 
   Widget _createCupertinoAlertDialog() {
-    var title = widget.control.buildTextOrWidget("title");
-    var content = widget.control.buildWidget("content");
-    var actions = widget.control.buildWidgets("actions");
-    if (title == null && content == null && actions.isEmpty) {
-      return const ErrorControl(
-          "CupertinoAlertDialog has nothing to display. Provide at minimum one of the following: title, content, actions");
-    }
-    var insetAnimation = parseAnimation(
-        widget.control.get("inset_animation"),
-        ImplicitAnimationDetails(
-            duration: const Duration(milliseconds: 100),
-            curve: Curves.decelerate))!;
-
-    return CupertinoAlertDialog(
-      insetAnimationCurve: insetAnimation.curve,
-      insetAnimationDuration: insetAnimation.duration,
-      title: title,
-      content: content,
-      actions: actions,
+    return ControlInheritedNotifier(
+      notifier: widget.control,
+      child: Builder(builder: (context) {
+        ControlInheritedNotifier.of(context);
+        var insetAnimation = parseAnimation(
+            widget.control.get("inset_animation"),
+            ImplicitAnimationDetails(
+                duration: const Duration(milliseconds: 100),
+                curve: Curves.decelerate))!;
+
+        return CupertinoAlertDialog(
+          insetAnimationCurve: insetAnimation.curve,
+          insetAnimationDuration: insetAnimation.duration,
+          title: widget.control.buildTextOrWidget("title"),
+          content: widget.control.buildWidget("content"),
+          actions: widget.control.buildWidgets("actions"),
+        );
+      }),
     );
   }
 
@@ -78,11 +78,11 @@ class _CupertinoAlertDialogControlState
     var modal = widget.control.getBool("modal", false)!;
 
     if (open && (open != _open)) {
-      _dialog = _createCupertinoAlertDialog();
-
-      if (_dialog is ErrorControl) {
-        debugPrint(
-            "CupertinoAlertDialog: ErrorControl, not showing dialog: ${(_dialog as ErrorControl).message}");
+      if (widget.control.get("title") == null &&
+          widget.control.get("content") == null &&
+          widget.control.children("actions").isEmpty) {
+        _error =
+            "CupertinoAlertDialog has nothing to display. Provide at minimum one of the following: title, content, actions.";
         return;
       }
 
@@ -94,7 +94,7 @@ class _CupertinoAlertDialogControlState
             barrierColor: widget.control.getColor("barrier_color", context),
             useRootNavigator: false,
             context: context,
-            builder: (context) => _dialog!).then((value) {
+            builder: (context) => _createCupertinoAlertDialog()).then((value) {
           debugPrint("Dismissing CupertinoAlertDialog(${widget.control.id})");
           _open = false;
           widget.control.updateProperties({"open": false});
@@ -113,7 +113,7 @@ class _CupertinoAlertDialogControlState
             "CupertinoAlertDialog(${widget.control.id}): Closing dialog managed by this widget.");
         _navigatorState?.pop();
         _open = false;
-        _dialog = null;
+        _error = null;
       } else {
         debugPrint(
             "CupertinoAlertDialog(${widget.control.id}): Dialog was not opened by this widget, skipping pop.");
@@ -123,6 +123,6 @@ class _CupertinoAlertDialogControlState
 
   @override
   Widget build(BuildContext context) {
-    return _dialog is ErrorControl ? _dialog! : const SizedBox.shrink();
+    return _error != null ? ErrorControl(_error!) : const SizedBox.shrink();
   }
 }

sdk/python/packages/flet/integration_tests/controls/golden/macos/alert_dialog_body/update_body_1.png

@@ -1,6 +1,7 @@
+import pytest
+
 import flet as ft
 import flet.testing as ftt
-import pytest
 
 
 @pytest.mark.asyncio(loop_scope="module")