Multi sliver box children (#26)

* First part of accepting box children in multisliver

* Made box children work

* Made boxchild hittesting work correctly

* Fixed box children interfering with other hit testing

* Updated version and changelog

* Fixed minor analysis warnings

* Minor QA fixes

* Updated version

CHANGELOG.md

@@ -1,6 +1,10 @@
 # 0.2.1
 
-- Fixed floating point rounding error that happens in debug mode
+This version essentially makes the `SliverToBoxAdapter` widget obsolete.
+MultiSliver now accepts `RenderBox` children directly!🎉
+
+- Accept box children of MultiSliver.
+- Fixed floating point rounding error that happens in debug mode.
 
 # 0.2.0
 

lib/src/sliver_animated_paint_extent.dart

@@ -46,8 +46,8 @@ class _SliverAnimatedPaintExtentState extends State<SliverAnimatedPaintExtent>
     return _SliverAnimatedPaintExtent(
       controller: _controller,
       duration: widget.duration,
-      child: widget.child,
       curve: widget.curve,
+      child: widget.child,
     );
   }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: sliver_tools
 description: A set of useful sliver tools that are missing from the flutter framework
-version: 0.2.0
+version: 0.2.1
 homepage: https://github.com/Kavantix
 repository: https://github.com/Kavantix/sliver_tools
 issue_tracker: https://github.com/Kavantix/sliver_tools/issues

test/multi_sliver_test.dart

@@ -9,18 +9,18 @@ import 'helpers/unconstrained_scroll_physics.dart';
 
 void main() => multiSliverTests();
 
+Widget box(Key? key, String title, {required double height}) {
+  return Container(
+    key: key,
+    alignment: Alignment.center,
+    height: height,
+    width: double.infinity,
+    child: Text(title),
+  );
+}
+
 void multiSliverTests() {
   group('MultiSliver', () {
-    Widget box(Key? key, String title, {required double height}) {
-      return Container(
-        key: key,
-        alignment: Alignment.center,
-        height: height,
-        width: double.infinity,
-        child: Text(title),
-      );
-    }
-
     const box1Key = ValueKey('1');
     const box2Key = ValueKey('2');
     const groupKey = ValueKey('group');
@@ -50,9 +50,7 @@ void multiSliverTests() {
                       size: pinnedSize,
                       boxKey: pinnedKey,
                     ),
-                  SliverToBoxAdapter(
-                    child: box(box1Key, '1', height: 150),
-                  ),
+                  box(box1Key, '1', height: 150),
                   SliverList(
                     key: listKey,
                     delegate: SliverChildBuilderDelegate(
@@ -210,5 +208,206 @@ void multiSliverTests() {
       await tester.pump();
       expect(tester.takeException(), isNull);
     });
+
+    testWidgets('accepts RenderBox children', (tester) async {
+      const boxKey = Key('box');
+      await tester.pumpWidget(Directionality(
+        textDirection: TextDirection.ltr,
+        child: CustomScrollView(
+          slivers: [
+            MultiSliver(
+              children: [
+                box(boxKey, 'Title', height: 200),
+              ],
+            ),
+          ],
+        ),
+      ));
+      expect(find.byKey(boxKey), findsOneWidget);
+      expect(find.text('Title'), findsOneWidget);
+    });
+
+    testWidgets('correctly draws boxChild when scrolled off screen',
+        (tester) async {
+      const boxKey = Key('box');
+      final controller = ScrollController();
+      await tester.pumpWidget(Directionality(
+        textDirection: TextDirection.ltr,
+        child: CustomScrollView(
+          controller: controller,
+          physics: const UnconstrainedScollPhysics(),
+          slivers: [
+            MultiSliver(
+              children: [
+                box(boxKey, 'Title', height: 200),
+              ],
+            ),
+          ],
+        ),
+      ));
+      expect(find.byKey(boxKey), findsOneWidget);
+      expect(find.text('Title'), findsOneWidget);
+      Rect boxRect() => tester.getRect(find.byKey(boxKey));
+      final boxWidth = boxRect().width;
+      expect(boxRect(), Rect.fromLTWH(0, 0, boxWidth, 200));
+      controller.jumpTo(100);
+      await tester.pump();
+      expect(boxRect(), Rect.fromLTWH(0, -100, boxWidth, 200));
+      controller.jumpTo(199);
+      await tester.pump();
+      expect(boxRect(), Rect.fromLTWH(0, -199, boxWidth, 200));
+      controller.jumpTo(300);
+      await tester.pump();
+      expect(find.byKey(boxKey), findsNothing);
+    });
+
+    testWidgets(
+        'correctly sets hasVisualOverflow of boxChild when scrolled off screen',
+        (tester) async {
+      const boxKey = Key('box');
+      final controller = ScrollController();
+      await tester.pumpWidget(Directionality(
+        textDirection: TextDirection.ltr,
+        child: CustomScrollView(
+          controller: controller,
+          physics: const UnconstrainedScollPhysics(),
+          slivers: [
+            MultiSliver(
+              children: [
+                box(boxKey, 'Title', height: 200),
+              ],
+            ),
+          ],
+        ),
+      ));
+      expect(find.byKey(boxKey), findsOneWidget);
+      expect(find.text('Title'), findsOneWidget);
+      final boxRenderObject = tester.renderObject(find.byKey(boxKey));
+      Rect boxRect() => tester.getRect(find.byKey(boxKey));
+      SliverGeometry boxGeometry() =>
+          (boxRenderObject.parentData as MultiSliverParentData).geometry;
+      final boxWidth = boxRect().width;
+      expect(boxRect(), Rect.fromLTWH(0, 0, boxWidth, 200));
+      expect(boxGeometry().hasVisualOverflow, false);
+      controller.jumpTo(100);
+      await tester.pump();
+      expect(boxRect(), Rect.fromLTWH(0, -100, boxWidth, 200));
+      expect(boxGeometry().hasVisualOverflow, true);
+      controller.jumpTo(199);
+      await tester.pump();
+      expect(boxRect(), Rect.fromLTWH(0, -199, boxWidth, 200));
+      expect(boxGeometry().hasVisualOverflow, true);
+      controller.jumpTo(300);
+      await tester.pump();
+      expect(find.byKey(boxKey), findsNothing);
+      expect(boxGeometry().hasVisualOverflow, false);
+    });
+
+    testWidgets('can hit sliver child', (tester) async {
+      const boxKey = Key('box');
+      final controller = ScrollController();
+      var taps = 0;
+      await tester.pumpWidget(Directionality(
+        textDirection: TextDirection.ltr,
+        child: CustomScrollView(
+          controller: controller,
+          physics: const UnconstrainedScollPhysics(),
+          slivers: [
+            MultiSliver(
+              children: [
+                box(UniqueKey(), 'Title', height: 100),
+                SliverList(
+                  delegate: SliverChildListDelegate(
+                    [
+                      const SizedBox(height: 100),
+                      GestureDetector(
+                        behavior: HitTestBehavior.opaque,
+                        onTap: () => taps++,
+                        child: const SizedBox(
+                          key: boxKey,
+                          height: 1,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ));
+      expect(taps, 0);
+      final thebox = find.byKey(boxKey);
+      await tester.tap(thebox);
+      expect(taps, 1);
+      controller.jumpTo(100);
+      await tester.pump();
+      await tester.tap(thebox);
+      expect(taps, 2);
+    });
+
+    testWidgets('can hit box child', (tester) async {
+      const boxKey = Key('box');
+      final controller = ScrollController();
+      var taps = 0;
+      await tester.pumpWidget(Directionality(
+        textDirection: TextDirection.ltr,
+        child: CustomScrollView(
+          controller: controller,
+          physics: const UnconstrainedScollPhysics(),
+          slivers: [
+            MultiSliver(
+              children: [
+                const SliverToBoxAdapter(child: SizedBox(height: 400)),
+                GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onTap: () => taps++,
+                  child: box(boxKey, 'Title', height: 1),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ));
+      expect(taps, 0);
+      final thebox = find.byKey(boxKey);
+      await tester.tap(thebox);
+      expect(taps, 1);
+    });
+
+    testWidgets('box child does not get hit when tapping outside',
+        (tester) async {
+      const boxKey = Key('box');
+      final controller = ScrollController();
+      var taps = 0;
+      await tester.pumpWidget(Directionality(
+        textDirection: TextDirection.ltr,
+        child: CustomScrollView(
+          controller: controller,
+          physics: const UnconstrainedScollPhysics(),
+          slivers: [
+            MultiSliver(
+              children: [
+                GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onTap: () => taps++,
+                  child: box(UniqueKey(), 'Title', height: 200),
+                ),
+                const SliverToBoxAdapter(
+                  child: SizedBox(
+                    key: boxKey,
+                    height: 1,
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ));
+      expect(taps, 0);
+      final thebox = find.byKey(boxKey);
+      await tester.tap(thebox);
+      expect(taps, 0);
+    });
   });
 }

test/sliver_cross_axis_constrained_test.dart

@@ -45,7 +45,7 @@ void crossAxisConstrainedTests() {
         await tester.pumpWidget(sut);
         await tester.pumpAndSettle();
 
-        final width = await tester
+        final width = tester
             .renderObject(find.byType(SliverToBoxAdapter))
             .paintBounds
             .width;
@@ -65,7 +65,7 @@ void crossAxisConstrainedTests() {
         await tester.pumpAndSettle();
 
         final renderObject =
-            await tester.renderObject(find.byType(SliverToBoxAdapter));
+            tester.renderObject(find.byType(SliverToBoxAdapter));
 
         expect(renderObject.paintBounds.width, maxCrossAxisExtent);
       });

test/sliver_cross_axis_padded_test.dart

@@ -34,10 +34,10 @@ void crossAxisPaddedTests() {
         TextDirection textDirection = TextDirection.ltr,
       }) {
         return SliverCrossAxisPadded(
-          child: const SizedBox.shrink(),
           textDirection: textDirection,
           paddingStart: paddingStart,
           paddingEnd: paddingEnd,
+          child: const SizedBox.shrink(),
         );
       }
 

test/sliver_stack_test.dart

@@ -324,15 +324,15 @@ void sliverStackTests() {
             ignoreOverlap: ignoreOverlap,
             topPositionedBuilder: (child) => SliverPositioned(
               key: key,
+              left: left,
+              top: top,
+              right: right,
+              bottom: bottom,
               child: GestureDetector(
                 behavior: HitTestBehavior.opaque,
                 onTap: () => tapped++,
                 child: child,
               ),
-              left: left,
-              top: top,
-              right: right,
-              bottom: bottom,
             ),
           );
           final renderStack =