Fix resolvedConstraints where not properly calculated for images.

Author: SaadArdati

lib/src/api/mixins.dart

@@ -591,39 +591,34 @@ mixin GeometryMixin on BaseNode {
       if (fill.type != PaintType.image) continue;
       if ((fill.sourceWidth != null && fill.sourceHeight != null) ||
           (fill.cropData != null)) {
-        final SizeC currentSize = SizeC(
-          fill.cropData?.width ?? fill.sourceWidth ?? 0,
-          fill.cropData?.height ?? fill.sourceHeight ?? 0,
-        );
-        SizeC size = SizeC.zero;
+        final double? imgWidth =
+            (fill.cropData?.width ?? fill.sourceWidth)?.roundToDouble();
+        final double? imgHeight =
+            (fill.cropData?.height ?? fill.sourceHeight)?.roundToDouble();
+
+        double? width, height;
         if (horizontalFit == SizeFit.shrinkWrap &&
             verticalFit == SizeFit.shrinkWrap) {
-          size = SizeC(currentSize.width.roundToDouble(),
-              currentSize.height.roundToDouble());
-        } else {
+          width = imgWidth;
+          height = imgHeight;
+        } else if (imgWidth != null && imgHeight != null) {
           // If this image vertically shrinkwraps, then we want to set the
           // minimum height to be equal to or less than the source height,
           // preserving aspect ratio with respect to the current node width.
           if (verticalFit == SizeFit.shrinkWrap) {
-            size = SizeC(
-              size.width,
-              (currentSize.height * (basicBoxLocal.width / currentSize.width))
-                  .roundToDouble(),
-            );
+            height =
+                (imgHeight * (basicBoxLocal.width / imgWidth)).roundToDouble();
           }
           if (horizontalFit == SizeFit.shrinkWrap) {
-            size = SizeC(
-              (currentSize.width * (basicBoxLocal.height / currentSize.height))
-                  .roundToDouble(),
-              size.height,
-            );
+            width =
+                (imgWidth * (basicBoxLocal.height / imgHeight)).roundToDouble();
           }
         }
 
-        resultSize = resultSize.enforce(
+        resultSize = resultSize.union(
           BoxConstraintsModel(
-            minWidth: size.width,
-            minHeight: size.height,
+            minWidth: width,
+            minHeight: height,
           ),
         );
       }

lib/src/api/models/box_constraints.dart

@@ -194,9 +194,13 @@ class BoxConstraintsModel with EquatableMixin, SerializableMixin {
   /// Creates a union [BoxConstraintsModel] from the current
   /// [BoxConstraintsModel] and the provided [constraints].
   ///
-  /// The resulting [BoxConstraintsModel] will have the minimum with and height
-  /// that's the biggest of the two, and the maximum width and height that's
-  /// the smallest of the two.
+  /// The resulting [BoxConstraintsModel] will have:
+  /// - The maximum of the two minimum widths.
+  /// - The maximum of the two minimum heights.
+  /// - The minimum of the two maximum widths.
+  /// - The minimum of the two maximum heights.
+  ///
+  /// [returns] a [BoxConstraintsModel] that has overlapping constraints.
   BoxConstraintsModel union(BoxConstraintsModel constraints) {
     return BoxConstraintsModel(
       minWidth: (minWidth == null)
@@ -222,35 +226,6 @@ class BoxConstraintsModel with EquatableMixin, SerializableMixin {
     );
   }
 
-  /// Similar to [union], but will only clamp the minimums and maximums
-  /// if the passed [constraints] of the relevant parameter is not null.
-  ///
-  /// So for example, if the passed [constraints] has a null min width,
-  /// instead of returning a [BoxConstraintsModel] with a null min width,
-  /// it just returns its own if available.
-  /// Otherwise, it takes the biggest of the two min widths.
-  ///
-  /// Another example, if the passed [constraints] has a null max width,
-  /// instead of returning a [BoxConstraintsModel] with a null max width,
-  /// it just returns its own if available.
-  /// Otherwise, it takes the smallest of the two max widths.
-  BoxConstraintsModel unionNonNull(BoxConstraintsModel constraints) {
-    return BoxConstraintsModel(
-      minWidth: constraints.minWidth == null
-          ? minWidth
-          : max(minWidth ?? 0, constraints.minWidth!),
-      maxWidth: constraints.maxWidth == null
-          ? maxWidth
-          : min(maxWidth ?? double.infinity, constraints.maxWidth!),
-      minHeight: constraints.minHeight == null
-          ? minHeight
-          : max(minHeight ?? 0, constraints.minHeight!),
-      maxHeight: constraints.maxHeight == null
-          ? maxHeight
-          : min(maxHeight ?? double.infinity, constraints.maxHeight!),
-    );
-  }
-
   /// Whether this constraints is the same as no constraints which is the
   /// default value.
   bool get isDefault =>

lib/src/api/node_processor.dart

@@ -192,12 +192,12 @@ class NodeProcessor {
           parent.relegatedConstraintsToChildren(node);
       if (relegatedConstraints != null) {
         final parentResolved =
-            relegatedConstraints.unionNonNull(resolveConstraints(parent));
-        resolved = resolved.unionNonNull(parentResolved);
+            relegatedConstraints.union(resolveConstraints(parent));
+        resolved = resolved.union(parentResolved);
       }
     }
 
-    return node.constraints.unionNonNull(resolved);
+    return node.constraints.union(resolved);
   }
 
   /// Update the global rotation for given [node] with [newRotationDegrees].

lib/src/api/nodes/app_bar_node.dart

@@ -81,7 +81,7 @@ class AppBarNode extends SceneNode
     return super
         .internalConstraints(
             horizontalFit: horizontalFit, verticalFit: verticalFit)
-        .unionNonNull(
+        .union(
           BoxConstraintsModel(minHeight: minHeight),
         );
   }

lib/src/api/nodes/button_node.dart

@@ -154,7 +154,7 @@ class ButtonNode extends SceneNode
           horizontalFit: horizontalFit,
           verticalFit: verticalFit,
         )
-        .unionNonNull(
+        .union(
           BoxConstraintsModel(
             minWidth: minSize.width,
             minHeight: minSize.height,

lib/src/api/nodes/divider_node.dart

@@ -109,7 +109,7 @@ class DividerNode extends SceneNode with CustomPropertiesMixin {
           horizontalFit: horizontalFit,
           verticalFit: verticalFit,
         )
-        .unionNonNull(
+        .union(
           BoxConstraintsModel(
             minWidth: width,
             minHeight: height,

lib/src/api/nodes/dropdown_node.dart

@@ -62,7 +62,7 @@ class DropdownNode extends SceneNode with CustomPropertiesMixin {
           horizontalFit: horizontalFit,
           verticalFit: verticalFit,
         )
-        .unionNonNull(BoxConstraintsModel(minWidth: iconSize));
+        .union(BoxConstraintsModel(minWidth: iconSize));
   }
 
   /// Creates a [DropdownNode] from a JSON object.

lib/src/api/nodes/loading_indicator_node.dart

@@ -81,7 +81,7 @@ class LoadingIndicatorNode extends SceneNode
     return super
         .internalConstraints(
             horizontalFit: horizontalFit, verticalFit: verticalFit)
-        .unionNonNull(const BoxConstraintsModel(minWidth: 2, minHeight: 2));
+        .union(const BoxConstraintsModel(minWidth: 2, minHeight: 2));
   }
 
   @override

lib/src/api/nodes/navigation_bar_node.dart

@@ -248,7 +248,7 @@ class NavigationBarNode extends SceneNode
               horizontalFit: horizontalFit,
               verticalFit: verticalFit,
             )
-            .unionNonNull(
+            .union(
               BoxConstraintsModel(
                 minHeight:
                     max(minHeight, kDefaultBottomNavigationBarHeight) + 1,
@@ -271,7 +271,7 @@ class NavigationBarNode extends SceneNode
               horizontalFit: horizontalFit,
               verticalFit: verticalFit,
             )
-            .unionNonNull(
+            .union(
               BoxConstraintsModel(minHeight: minHeight),
             );
     }

lib/src/api/nodes/single_placeholder_node.dart

@@ -26,7 +26,7 @@ class SinglePlaceholderNode extends SceneNode
     final superRelegated = super.relegatedConstraintsToChildren(child);
     return superRelegated == null
         ? constraints
-        : superRelegated.unionNonNull(constraints);
+        : superRelegated.union(constraints);
   }
 
   /// The node types that are allowed to be inside this [SinglePlaceholderNode].