Miscellaneous fixes

- Enable scrolling for expanded frames with special conditions for child.
- Fix ClipRect as SingleChildScrollView child not being merge swept.
- Don't use alignment on container from the child in codegen if it is scrollable.
- Fix image always using fixed sizes.
- Removed fixed width/height with a SizedBox around SingleChildScrollView.
- Don't wrap a stack child with Align widget if it is scrollable.
- Fix scrollable property enable/disable conditions to allow proper scrolling in some special cases.

Author: BirjuVachhani

lib/src/transformers/node_transformers/passive_rectangle_transformer.dart

@@ -223,19 +223,11 @@ List<Widget> wrapWithPaddingAndScroll(
         node: node,
         padding: applyPadding ? resolvedPadding : null,
         clipBehavior: defaultGetClipBehavior(node),
-        child: SizedBox(
-          width: node.scrollDirection.isHorizontal
-              ? node.outerBoxLocal.width
-              : null,
-          height: node.scrollDirection.isVertical
-              ? node.outerBoxLocal.height
-              : null,
-          child: Stack(
-            clipBehavior: Clip.none,
-            alignment: stackAlignment.flutterAlignment ??
-                AlignmentDirectional.topStart,
-            children: children,
-          ),
+        child: Stack(
+          clipBehavior: Clip.none,
+          alignment:
+              stackAlignment.flutterAlignment ?? AlignmentDirectional.topStart,
+          children: children,
         ),
       ),
     ];
@@ -565,8 +557,16 @@ List<Widget> buildFills(
             } else {
               child = UltimateImageBuilder(
                 url: imageURL,
-                width: node.basicBoxLocal.width,
-                height: node.basicBoxLocal.height,
+                width: (node.horizontalFit == SizeFit.shrinkWrap)
+                    ? null
+                    : (node.horizontalFit == SizeFit.expanded)
+                        ? double.infinity
+                        : node.basicBoxLocal.width,
+                height: (node.verticalFit == SizeFit.shrinkWrap)
+                    ? null
+                    : (node.verticalFit == SizeFit.expanded)
+                        ? double.infinity
+                        : node.basicBoxLocal.height,
                 paint: paint,
                 node: node,
                 bytes: bytes,

lib/src/transformers/node_transformers/passive_stack_transformer.dart

@@ -32,7 +32,8 @@ class PassiveStackTransformer extends NodeWidgetTransformer<BaseNode> {
         isTallest: tallestChild?.id == node.id,
       );
     } else {
-      if (node.alignment != commonAlignment) {
+      if (node.alignment != commonAlignment &&
+          (node is! ScrollableMixin || !node.isScrollable)) {
         child = Align(
           alignment: node.alignment.flutterAlignment!,
           child: child,

lib/src/utils/extensions.dart

@@ -470,7 +470,7 @@ extension CCrossAxisAlignmentHelper on CrossAxisAlignmentC {
   }
 }
 
-extension CAxisHelper on AxisC {
+extension AxisHelperExt on AxisC {
   flutter.Axis get flutterAxis => this == AxisC.horizontal
       ? flutter.Axis.horizontal
       : flutter.Axis.vertical;

lib/src/utils/image_builder.dart

@@ -1,5 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:codelessly_api/codelessly_api.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:google_fonts/google_fonts.dart';
@@ -43,14 +44,39 @@ class UltimateImageBuilder extends StatefulWidget {
     this.node,
     this.blendMode,
     this.useInk = false,
-  })  : assert(url != null || bytes != null || paint != null,
-            'url or bytes or paint must be provided'),
-        assert(
+  }) : assert(url != null || bytes != null || paint != null,
+            'url or bytes or paint must be provided')
+  /*assert(
             paint == null || (width != null && height != null && node != null),
-            'width, height and node must be provided when paint is provided');
+            'width, height and node must be provided when paint is provided')*/
+  ;
 
   @override
   State<UltimateImageBuilder> createState() => _UltimateImageBuilderState();
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    properties.add(StringProperty('url', url));
+    properties.add(DiagnosticsProperty<TypedBytes>('bytes', bytes));
+    properties.add(EnumProperty<BoxFit>('fit', fit));
+    properties.add(DiagnosticsProperty<Alignment>('alignment', alignment));
+    properties.add(DoubleProperty('scale', scale));
+    properties.add(DoubleProperty('width', width));
+    properties.add(DoubleProperty('height', height));
+    properties.add(EnumProperty<ImageRepeat>('repeat', repeat));
+    properties.add(ColorProperty('color', color));
+    properties.add(
+        ObjectFlagProperty<WidgetBuilder>.has('errorBuilder', errorBuilder));
+    properties.add(ObjectFlagProperty<
+        Widget Function(BuildContext context,
+            DownloadProgress? progress)>.has('loadingBuilder', loadingBuilder));
+    properties.add(DiagnosticsProperty<PaintModel>('paint', paint));
+    properties.add(DiagnosticsProperty<BaseNode>('node', node));
+    properties.add(EnumProperty<BlendMode>('blendMode', blendMode));
+    properties.add(DiagnosticsProperty<bool>('useInk', useInk));
+
+    super.debugFillProperties(properties);
+  }
 }
 
 class _UltimateImageBuilderState extends State<UltimateImageBuilder> {
@@ -82,9 +108,27 @@ class _UltimateImageBuilderState extends State<UltimateImageBuilder> {
               BlendMode.srcIn)
       : null;
 
-  double? get width => widget.width ?? widget.node?.basicBoxLocal.width;
+  double? get width {
+    if (widget.width case var width?) return width;
+
+    if (widget.node case var node?) {
+      if (node.isHorizontalExpanded) return double.infinity;
+      return node.basicBoxLocal.width;
+    }
+
+    return null;
+  }
+
+  double? get height {
+    if (widget.height case var height?) return height;
 
-  double? get height => widget.height ?? widget.node?.basicBoxLocal.height;
+    if (widget.node case var node?) {
+      if (node.isVerticalExpanded) return null;
+      return node.basicBoxLocal.height;
+    }
+
+    return null;
+  }
 
   @override
   void initState() {

lib/src/utils/utils.dart

@@ -229,39 +229,72 @@ final RegExp staticImageTypesRegex =
     return (horizontal: true, vertical: true);
   }
 
-  final bool hasChildren = delegatedNode.childrenOrEmpty.isNotEmpty;
+  if (delegatedNode is RowColumnMixin) {
+    final bool hasChildren = delegatedNode.childrenOrEmpty.isNotEmpty;
 
-  if (!hasChildren) {
+    if (!hasChildren) {
+      return (horizontal: false, vertical: false);
+    }
+
+    for (final id in delegatedNode.childrenOrEmpty) {
+      final child = getNode(id);
+      isAnyExpandingHorizontally =
+          isAnyExpandingHorizontally || child.horizontalFit.isFlex;
+      isAnyExpandingVertically =
+          isAnyExpandingVertically || child.verticalFit.isFlex;
+    }
+    return (
+      horizontal: !isAnyExpandingHorizontally,
+      vertical: !isAnyExpandingVertically,
+    );
+  }
+
+  if (delegatedNode.childrenOrEmpty.length != 1) {
     return (horizontal: false, vertical: false);
   }
 
-  for (final id in delegatedNode.childrenOrEmpty) {
-    final child = getNode(id);
-    isAnyExpandingHorizontally =
-        isAnyExpandingHorizontally || child.horizontalFit.isFlex;
-    isAnyExpandingVertically =
-        isAnyExpandingVertically || child.verticalFit.isFlex;
+  if (node is! ScrollableMixin) return (horizontal: false, vertical: false);
+
+  final child = getNode(delegatedNode.childrenOrEmpty.first);
+
+  bool allowHorizontal = true;
+  bool allowVertical = true;
+  if (child.isHorizontalExpanded) allowHorizontal = false;
+  if (child.alignment.data == null || child.alignment.data!.x != -1) {
+    allowHorizontal = false;
+  }
+  if (child.alignment.data == null &&
+      child.outerBoxLocal.left.roundToPrecision(3) != 0) {
+    allowHorizontal = false;
   }
 
-  return (
-    horizontal: !isAnyExpandingHorizontally,
-    vertical: !isAnyExpandingVertically,
-  );
+  if (child.isVerticalExpanded) allowVertical = false;
+  if (child.alignment.data != null && child.alignment.data!.y != -1) {
+    allowVertical = false;
+  }
+  if (child.alignment.data == null &&
+      child.outerBoxLocal.top.roundToPrecision(3) != 0) {
+    allowVertical = false;
+  }
+
+  return (horizontal: allowHorizontal, vertical: allowVertical);
 }
 
 ({bool horizontal, bool vertical}) checkSelfForLegalScrollableAxes(
     {required BaseNode node}) {
-  if (node is CanvasNode) {
-    return (
-      horizontal: true,
-      vertical: true,
-    );
-  }
-
-  return (
-    horizontal: node.isHorizontalWrap,
-    vertical: node.isVerticalWrap,
-  );
+  return (horizontal: true, vertical: true);
+
+  // if (node is CanvasNode) {
+  //   return (
+  //     horizontal: true,
+  //     vertical: true,
+  //   );
+  // }
+  //
+  // return (
+  //   horizontal: node.isHorizontalWrap,
+  //   vertical: node.isVerticalWrap,
+  // );
 }
 
 ({bool horizontal, bool vertical}) checkParentForLegalScrollableAxes({
@@ -412,6 +445,12 @@ AlignmentModel retrieveCommonStackAlignment(
 ) {
   final List<AlignmentModel> alignments = [];
 
+  if (nodes.length == 1 &&
+      nodes.first is ScrollableMixin &&
+      (nodes.first as ScrollableMixin).isScrollable) {
+    return AlignmentModel.none;
+  }
+
   for (final BaseNode node in nodes) {
     final AlignmentModel alignment = node.alignment;
     if (alignment.data == null) continue;