Merge pull request #60 from rafaldziuryk/master

Fix PageView horizontal scroll

@@ -13,6 +13,7 @@ import 'modals/modal_will_scope.dart';
 import 'modals/modal_with_navigator.dart';
 import 'modals/modal_with_nested_scroll.dart';
 import 'modals/modal_with_scroll.dart';
+import 'modals/modal_with_page_view.dart';
 
 import 'examples/cupertino_share.dart';
 
@@ -240,6 +241,15 @@ class _MyHomePageState extends State<MyHomePage> {
                                   NestedScrollModal(
                                       scrollController: scrollController),
                             )),
+                    ListTile(
+                        title: Text('Modal with PageView'),
+                        onTap: () => showBarModalBottomSheet(
+                          expand: true,
+                          context: context,
+                          builder: (context, scrollController) =>
+                              ModalWithPageView(
+                                  scrollController: scrollController),
+                        )),
                     SizedBox(
                       height: 60,
                     )

+import 'package:flutter/material.dart';
+
+class ModalWithPageView extends StatelessWidget {
+  final ScrollController scrollController;
+
+  const ModalWithPageView({Key key, this.scrollController}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      child: Scaffold(
+        appBar: AppBar(
+            leading: Container(), title: Text('Modal With Page View')),
+        body: SafeArea(
+          bottom: false,
+          child: PageView(
+            children: List.generate(2, (index) => ListView(
+              shrinkWrap: true,
+              controller: scrollController,
+              children: ListTile.divideTiles(
+                context: context,
+                tiles: List.generate(
+                    100,
+                        (index) => ListTile(
+                      title: Text('Item'),
+                    )),
+              ).toList(),
+            )),
+          ),
+        ),
+      ),
+    );
+  }
+}

@@ -259,6 +259,8 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
   void _handleScrollUpdate(ScrollNotification notification) {
     //Check if scrollController is used
     if (!_scrollController.hasClients) return;
+    //Check if there is more than 1 attached ScrollController e.g. swiping page in PageView
+    if (_scrollController.positions.length > 1) return;
 
     final scrollPosition = _scrollController.position;
 
@@ -305,7 +307,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
       if (dragDetails != null) {
         final duration = _startTime.difference(DateTime.now());
         _velocityTracker.addPosition(duration, Offset(0, offset));
-        _handleDragUpdate(dragDetails.primaryDelta);
+        _handleDragUpdate(dragDetails.delta.dy);
       } else if (isDragging) {
         final velocity = _velocityTracker.getVelocity().pixelsPerSecond.dy;
         _velocityTracker = null;
@@ -365,7 +367,7 @@ class _ModalBottomSheetState extends State<ModalBottomSheet>
                     delegate: _CustomBottomSheetLayout(bounceAnimation.value),
                     child: GestureDetector(
                       onVerticalDragUpdate: (details) {
-                        _handleDragUpdate(details.primaryDelta);
+                        _handleDragUpdate(details.delta.dy);
                       },
                       onVerticalDragEnd: (details) {
                         _handleDragEnd(details.primaryVelocity);