secondaryTap support for overlay

juancastillo0 · Jul 26, 2021 · 9cd4d10 · 9cd4d10
1 parent ea8163d
commit 9cd4d10
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/lib/widgets/portal/custom_overlay.dart b/lib/widgets/portal/custom_overlay.dart
@@ -3,22 +3,39 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:snippet_generator/globals/option.dart';
 import 'package:snippet_generator/widgets/globals.dart';
+import 'package:snippet_generator/widgets/portal/global_stack.dart';
 import 'package:snippet_generator/widgets/portal/portal_utils.dart';
 
+enum OverlayGesture {
+  tap,
+  secondaryTap,
+}
+
 class CustomOverlayButton extends HookWidget {
   final Widget Function(PortalNotifier) portalBuilder;
   final Widget child;
   final PortalBundler? builder;
   final PortalParams params;
+  final OverlayGesture gesture;
 
   const CustomOverlayButton({
     required this.portalBuilder,
     required this.child,
     this.params = const PortalParams(),
     this.builder,
+    this.gesture = OverlayGesture.tap,
     Key? key,
   }) : super(key: key);
 
+  const CustomOverlayButton.stack({
+    required this.portalBuilder,
+    required this.child,
+    this.params = const PortalParams(),
+    this.gesture = OverlayGesture.tap,
+    Key? key,
+  })  : builder = StackPortal.make,
+        super(key: key);
+
   @override
   Widget build(BuildContext context) {
     final show = useState(false);
@@ -33,6 +50,21 @@ class CustomOverlayButton extends HookWidget {
     final _childKey = useMemoized(() => GlobalKey());
     final toggle = _portalNotifier.toggle;
 
+    final Widget _inner;
+    switch (gesture) {
+      case OverlayGesture.tap:
+        _inner = TextButton(
+          onPressed: toggle,
+          child: child,
+        );
+        break;
+      case OverlayGesture.secondaryTap:
+        _inner = GestureDetector(
+          onSecondaryTap: toggle,
+          child: child,
+        );
+    }
+
     if (builder != null) {
       return builder!(
         show: show.value,
@@ -52,10 +84,7 @@ class CustomOverlayButton extends HookWidget {
         ),
         child: KeyedSubtree(
           key: _childKey,
-          child: TextButton(
-            onPressed: toggle,
-            child: child,
-          ),
+          child: _inner,
         ),
       );
     }
@@ -64,10 +93,7 @@ class CustomOverlayButton extends HookWidget {
       show: show.value,
       portal: portalBuilder(_portalNotifier),
       onTapOutside: toggle,
-      child: TextButton(
-        onPressed: toggle,
-        child: child,
-      ),
+      child: _inner,
     );
   }
 }

diff --git a/lib/widgets/small_icon_button.dart b/lib/widgets/small_icon_button.dart
@@ -4,12 +4,14 @@ class SmallIconButton extends StatelessWidget {
   final bool center;
   final void Function()? onPressed;
   final Widget child;
+  final double? splashRadius;
 
   const SmallIconButton({
     Key? key,
     this.center = true,
     required this.child,
     required this.onPressed,
+    this.splashRadius,
   }) : super(key: key);
 
   @override
@@ -19,7 +21,7 @@ class SmallIconButton extends StatelessWidget {
       constraints: const BoxConstraints(),
       alignment: Alignment.center,
       padding: EdgeInsets.zero,
-      splashRadius: 22,
+      splashRadius: splashRadius ?? 22,
       iconSize: 18,
       onPressed: onPressed,
     );