From c28ff52a189c614dc3dde3bb9bd529935b272dbc Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 19 Nov 2021 13:18:03 +0200 Subject: [PATCH] Flutter upgrade --- lib/main_app.dart | 10 ++++++++++ lib/ui/app/entity_dropdown.dart | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/main_app.dart b/lib/main_app.dart index 6fac93987..a46be6b68 100644 --- a/lib/main_app.dart +++ b/lib/main_app.dart @@ -3,6 +3,7 @@ import 'dart:async'; // Flutter imports: import 'package:flutter/foundation.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -262,6 +263,7 @@ class InvoiceNinjaAppState extends State { child: WebSocketRefresh( companyId: state.company?.id, child: MaterialApp( + scrollBehavior: MyCustomScrollBehavior(), navigatorKey: navigatorKey, supportedLocales: kLanguages .map( @@ -552,3 +554,11 @@ class InvoiceNinjaAppState extends State { ); } } + +class MyCustomScrollBehavior extends MaterialScrollBehavior { + @override + Set get dragDevices => { + PointerDeviceKind.touch, + PointerDeviceKind.mouse, + }; +} diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart index 78551bb31..10b89fe2f 100644 --- a/lib/ui/app/entity_dropdown.dart +++ b/lib/ui/app/entity_dropdown.dart @@ -327,7 +327,6 @@ class _EntityDropdownState extends State { alignment: Alignment.centerRight, children: [ InkWell( - //key: ValueKey('__stack_${widget.labelText}__'), onTap: () => _showOptions(), child: IgnorePointer( child: TextFormField(