From 18c86c7867e8193ef058224e711fa1f812d5f41c Mon Sep 17 00:00:00 2001
From: "Randal L. Schwartz" <merlyn@stonehenge.com>
Date: Sat, 14 Mar 2026 12:29:15 -0700
Subject: [PATCH] Fixes issues #45, #46, and #48: Unbounded stretch crash,
 accessibility order, and doc typo

---
 boxy/lib/src/boxy/custom_boxy_base.dart | 25 +++++++++++---
 boxy/lib/src/boxy_flex.dart             | 45 +++++++++++++++++++++----
 website/docs/custom-boxy/boxy-id.md     |  2 +-
 3 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/boxy/lib/src/boxy/custom_boxy_base.dart b/boxy/lib/src/boxy/custom_boxy_base.dart
index b1c630a..b29e9db 100644
--- a/boxy/lib/src/boxy/custom_boxy_base.dart
+++ b/boxy/lib/src/boxy/custom_boxy_base.dart
@@ -236,11 +236,9 @@ mixin RenderBoxyMixin<
 
   @override
   void visitChildrenForSemantics(RenderObjectVisitor visitor) {
-    for (final child in childHandleMap.values) {
-      if (!child._ignore) {
-        visitor(child.render);
-      }
-    }
+    wrapPhase(BoxyDelegatePhase.semantics, () {
+      delegate.visitChildrenForSemantics(visitor);
+    });
   }
 
   @override
@@ -293,6 +291,9 @@ enum BoxyDelegatePhase {
 
   /// The boxy is currently being hit test.
   hitTest,
+
+  /// Semantics are being visited.
+  semantics,
 }
 
 /// Cache for [Layer] objects, used by [BoxyLayerContext] methods.
@@ -913,6 +914,20 @@ abstract class BaseBoxyDelegate<LayoutData extends Object,
   })  : _relayout = relayout,
         _repaint = repaint;
 
+  /// Visits each child that should be included in the semantics tree.
+  ///
+  /// The default behavior is to visit each child that is not [BaseBoxyChild.isIgnored].
+  ///
+  /// This can be overridden to change the order in which children are visited
+  /// for accessibility purposes.
+  void visitChildrenForSemantics(RenderObjectVisitor visitor) {
+    for (final child in render.childHandleMap.values) {
+      if (!child.isIgnored) {
+        visitor(child.render);
+      }
+    }
+  }
+
   final Listenable? _relayout;
   final Listenable? _repaint;
 
diff --git a/boxy/lib/src/boxy_flex.dart b/boxy/lib/src/boxy_flex.dart
index 5fa359a..4675248 100644
--- a/boxy/lib/src/boxy_flex.dart
+++ b/boxy/lib/src/boxy_flex.dart
@@ -1296,7 +1296,8 @@ class RenderBoxyFlex extends RenderBox
           final childConstraints = BoxConstraintsAxisUtil.create(
             _direction,
             minCross:
-                _getCrossAxisAlignment(child) == CrossAxisAlignment.stretch
+                (_getCrossAxisAlignment(child) == CrossAxisAlignment.stretch &&
+                    maxCrossSize.isFinite)
                     ? maxCrossSize
                     : 0.0,
             maxCross: maxCrossSize,
@@ -1343,7 +1344,7 @@ class RenderBoxyFlex extends RenderBox
             if (child == dominantChild) {
               flexConstraints = BoxConstraintsAxisUtil.create(
                 _direction,
-                minCross: maxCrossSize,
+                minCross: maxCrossSize.isFinite ? maxCrossSize : 0.0,
                 maxCross: maxCrossSize,
                 minMain: minChildExtent,
                 maxMain: maxChildExtent,
@@ -1352,7 +1353,8 @@ class RenderBoxyFlex extends RenderBox
               flexConstraints = BoxConstraintsAxisUtil.create(
                 _direction,
                 minCross:
-                    _getCrossAxisAlignment(child) == CrossAxisAlignment.stretch
+                    (_getCrossAxisAlignment(child) == CrossAxisAlignment.stretch &&
+                        maxCrossSize.isFinite)
                         ? maxCrossSize
                         : 0.0,
                 maxCross: maxCrossSize,
@@ -1385,9 +1387,10 @@ class RenderBoxyFlex extends RenderBox
               BoxConstraintsAxisUtil.create(
                 _direction,
                 minCross:
-                    _getCrossAxisAlignment(child) == CrossAxisAlignment.stretch
-                        ? maxCrossSize
-                        : 0.0,
+                    (_getCrossAxisAlignment(child) == CrossAxisAlignment.stretch &&
+                    maxCrossSize.isFinite)
+                    ? maxCrossSize
+                    : 0.0,
                 maxCross: maxCrossSize,
                 minMain: mainSize,
                 maxMain: mainSize,
@@ -1626,6 +1629,36 @@ class RenderBoxyFlex extends RenderBox
     }());
   }
 
+  @override
+  void visitChildrenForSemantics(RenderObjectVisitor visitor) {
+    _forEachChildWithOrder(visitor);
+  }
+
+  void _forEachChildWithOrder(RenderObjectVisitor visitor) {
+    if (textDirection == null && direction == Axis.horizontal) {
+      return;
+    }
+    final bool flipMainAxis =
+        !(_startIsTopLeft(direction, textDirection, verticalDirection) ?? true);
+    if (flipMainAxis) {
+      RenderBox? child = lastChild;
+      while (child != null) {
+        final FlexParentData childParentData =
+            child.parentData! as FlexParentData;
+        visitor(child);
+        child = childParentData.previousSibling;
+      }
+    } else {
+      RenderBox? child = firstChild;
+      while (child != null) {
+        final FlexParentData childParentData =
+            child.parentData! as FlexParentData;
+        visitor(child);
+        child = childParentData.nextSibling;
+      }
+    }
+  }
+
   @override
   Rect? describeApproximatePaintClip(RenderObject child) =>
       _hasOverflow ? Offset.zero & size : null;
diff --git a/website/docs/custom-boxy/boxy-id.md b/website/docs/custom-boxy/boxy-id.md
index 87964c1..5d54dde 100644
--- a/website/docs/custom-boxy/boxy-id.md
+++ b/website/docs/custom-boxy/boxy-id.md
@@ -48,7 +48,7 @@ class MyBoxyDelegate extends BoxyDelegate {
 
     // Return the size of our little column.
     return Size(
-      max(helloSize.width, worldSize.height),
+      max(helloSize.width, worldSize.width),
       helloSize.height + worldSize.height,
     );
   }