Merge branch 'develop'

edityodtlk · Nov 29, 2022 · 52fd10a · 52fd10a
2 parents 0e50ffd + badbf6a
commit 52fd10a
Show file tree

Hide file tree

Showing 8 changed files with 395 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [5.4.4] - 2022. 11. 29
+
+* Add hovered scrollbar.
+  https://pluto.weblaze.dev/scrollbar-and-scroll-behavior
+
 ## [5.4.3] - 2022. 11. 21
 
 * Add iterateRowType to PlutoAggregateColumnFooter.

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## PlutoGrid for flutter - v5.4.3
+## PlutoGrid for flutter - v5.4.4
 
 [![Awesome Flutter](https://img.shields.io/badge/Awesome-Flutter-blue.svg)](https://github.com/Solido/awesome-flutter)
 [![codecov](https://codecov.io/gh/bosskmk/pluto_grid/branch/master/graph/badge.svg)](https://codecov.io/gh/bosskmk/pluto_grid)

diff --git a/lib/src/pluto_grid.dart b/lib/src/pluto_grid.dart
@@ -5,6 +5,7 @@ import 'package:intl/date_symbol_data_local.dart';
 import 'package:intl/intl.dart' show Intl;
 import 'package:pluto_grid/pluto_grid.dart';
 
+import 'helper/platform_helper.dart';
 import 'ui/ui.dart';
 
 typedef PlutoOnLoadedEventCallback = void Function(
@@ -1211,8 +1212,9 @@ class _GridContainer extends StatelessWidget {
     return Focus(
       focusNode: stateManager.gridFocusNode,
       child: ScrollConfiguration(
-        behavior: const PlutoScrollBehavior().copyWith(
-          scrollbars: false,
+        behavior: PlutoScrollBehavior(
+          isMobile: PlatformHelper.isMobile,
+          userDragDevices: stateManager.configuration.scrollbar.dragDevices,
         ),
         child: DecoratedBox(
           decoration: BoxDecoration(
@@ -1467,13 +1469,41 @@ class PlutoRowColorContext {
 
 /// Extension class for [ScrollConfiguration.behavior] of [PlutoGrid].
 class PlutoScrollBehavior extends MaterialScrollBehavior {
-  const PlutoScrollBehavior() : super();
+  const PlutoScrollBehavior({
+    required this.isMobile,
+    Set<PointerDeviceKind>? userDragDevices,
+  })  : _dragDevices = userDragDevices ??
+            (isMobile ? _mobileDragDevices : _desktopDragDevices),
+        super();
+
+  final bool isMobile;
 
   @override
-  Set<PointerDeviceKind> get dragDevices => {
-        PointerDeviceKind.touch,
-        PointerDeviceKind.mouse,
-      };
+  Set<PointerDeviceKind> get dragDevices => _dragDevices;
+
+  final Set<PointerDeviceKind> _dragDevices;
+
+  static const Set<PointerDeviceKind> _mobileDragDevices = {
+    PointerDeviceKind.touch,
+    PointerDeviceKind.stylus,
+    PointerDeviceKind.invertedStylus,
+    PointerDeviceKind.unknown,
+  };
+
+  static const Set<PointerDeviceKind> _desktopDragDevices = {
+    PointerDeviceKind.mouse,
+    PointerDeviceKind.trackpad,
+    PointerDeviceKind.unknown,
+  };
+
+  @override
+  Widget buildScrollbar(
+    BuildContext context,
+    Widget child,
+    ScrollableDetails details,
+  ) {
+    return child;
+  }
 }
 
 /// A class for changing the value of a nullable property in a method such as [copyWith].

diff --git a/lib/src/pluto_grid_configuration.dart b/lib/src/pluto_grid_configuration.dart
@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
@@ -662,13 +663,15 @@ class PlutoGridScrollbarConfig {
     this.scrollbarThickness = PlutoScrollbar.defaultThickness,
     this.scrollbarThicknessWhileDragging =
         PlutoScrollbar.defaultThicknessWhileDragging,
+    this.hoverWidth = PlutoScrollbar.defaultScrollbarHoverWidth,
     this.mainAxisMargin,
     this.crossAxisMargin,
     this.scrollBarColor,
     this.scrollBarTrackColor,
     this.scrollbarRadius = PlutoScrollbar.defaultRadius,
     this.scrollbarRadiusWhileDragging =
         PlutoScrollbar.defaultRadiusWhileDragging,
+    this.dragDevices,
   });
 
   final bool draggableScrollbar;
@@ -682,6 +685,8 @@ class PlutoGridScrollbarConfig {
 
   final double scrollbarThicknessWhileDragging;
 
+  final double hoverWidth;
+
   final double? mainAxisMargin;
 
   final double? crossAxisMargin;
@@ -696,6 +701,8 @@ class PlutoGridScrollbarConfig {
 
   final Radius scrollbarRadiusWhileDragging;
 
+  final Set<PointerDeviceKind>? dragDevices;
+
   @override
   bool operator ==(covariant Object other) {
     return identical(this, other) ||
@@ -707,12 +714,15 @@ class PlutoGridScrollbarConfig {
             scrollbarThickness == other.scrollbarThickness &&
             scrollbarThicknessWhileDragging ==
                 other.scrollbarThicknessWhileDragging &&
+            hoverWidth == other.hoverWidth &&
             mainAxisMargin == other.mainAxisMargin &&
             crossAxisMargin == other.crossAxisMargin &&
             scrollBarColor == other.scrollBarColor &&
             scrollBarTrackColor == other.scrollBarTrackColor &&
             scrollbarRadius == other.scrollbarRadius &&
-            scrollbarRadiusWhileDragging == other.scrollbarRadiusWhileDragging;
+            scrollbarRadiusWhileDragging ==
+                other.scrollbarRadiusWhileDragging &&
+            dragDevices == other.dragDevices;
   }
 
   @override
@@ -722,12 +732,14 @@ class PlutoGridScrollbarConfig {
         onlyDraggingThumb,
         scrollbarThickness,
         scrollbarThicknessWhileDragging,
+        hoverWidth,
         mainAxisMargin,
         crossAxisMargin,
         scrollBarColor,
         scrollBarTrackColor,
         scrollbarRadius,
         scrollbarRadiusWhileDragging,
+        dragDevices,
       );
 }
 

diff --git a/lib/src/ui/pluto_body_rows.dart b/lib/src/ui/pluto_body_rows.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:pluto_grid/pluto_grid.dart';
 
+import '../helper/platform_helper.dart';
 import 'ui.dart';
 
 class PlutoBodyRows extends PlutoStatefulWidget {
@@ -80,8 +81,10 @@ class PlutoBodyRowsState extends PlutoStateWithChange<PlutoBodyRows> {
           scrollbarConfig.draggableScrollbar ? _horizontalScroll : null,
       isAlwaysShown: scrollbarConfig.isAlwaysShown,
       onlyDraggingThumb: scrollbarConfig.onlyDraggingThumb,
+      enableHover: PlatformHelper.isDesktop,
       thickness: scrollbarConfig.scrollbarThickness,
       thicknessWhileDragging: scrollbarConfig.scrollbarThicknessWhileDragging,
+      hoverWidth: scrollbarConfig.hoverWidth,
       mainAxisMargin: scrollbarConfig.mainAxisMargin,
       crossAxisMargin: scrollbarConfig.crossAxisMargin,
       scrollBarColor: scrollbarConfig.scrollBarColor,