From 89ee66f25113dac0f8f06e734c6453323b508297 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Sun, 22 Feb 2026 22:47:28 -0500
Subject: [PATCH] fix: menu bar and flex row event handling

---
 src/widget/flex_row/widget.rs | 27 ++++++++++++++-------------
 src/widget/menu/menu_bar.rs   | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/widget/flex_row/widget.rs b/src/widget/flex_row/widget.rs
index f7b90f6..b891c17 100644
--- a/src/widget/flex_row/widget.rs
+++ b/src/widget/flex_row/widget.rs
@@ -160,22 +160,23 @@ impl<Message: 'static + Clone> Widget<Message, crate::Theme, Renderer> for FlexR
         shell: &mut Shell<'_, Message>,
         viewport: &Rectangle,
     ) {
-        self.children
+        for ((child, state), c_layout) in self
+            .children
             .iter_mut()
             .zip(&mut tree.children)
             .zip(layout.children())
-            .map(|((child, state), c_layout)| {
-                child.as_widget_mut().update(
-                    state,
-                    event,
-                    c_layout.with_virtual_offset(layout.virtual_offset()),
-                    cursor,
-                    renderer,
-                    clipboard,
-                    shell,
-                    viewport,
-                )
-            });
+        {
+            child.as_widget_mut().update(
+                state,
+                event,
+                c_layout.with_virtual_offset(layout.virtual_offset()),
+                cursor,
+                renderer,
+                clipboard,
+                shell,
+                viewport,
+            );
+        }
     }
 
     fn mouse_interaction(
diff --git a/src/widget/menu/menu_bar.rs b/src/widget/menu/menu_bar.rs
index 9d4b09b..7007bef 100644
--- a/src/widget/menu/menu_bar.rs
+++ b/src/widget/menu/menu_bar.rs
@@ -810,21 +810,21 @@ fn process_root_events<Message>(
     shell: &mut Shell<'_, Message>,
     viewport: &Rectangle,
 ) {
-    menu_roots
+    for ((root, t), lo) in menu_roots
         .iter_mut()
         .zip(&mut tree.children)
         .zip(layout.children())
-        .map(|((root, t), lo)| {
-            // assert!(t.tag == tree::Tag::stateless());
-            root.item.update(
-                &mut t.children[root.index],
-                event,
-                lo,
-                view_cursor,
-                renderer,
-                clipboard,
-                shell,
-                viewport,
-            )
-        });
+    {
+        // assert!(t.tag == tree::Tag::stateless());
+        root.item.update(
+            &mut t.children[root.index],
+            event,
+            lo,
+            view_cursor,
+            renderer,
+            clipboard,
+            shell,
+            viewport,
+        );
+    }
 }