This auto-formats all *.dart files in the repository outside of the
`engine` subdirectory and enforces that these files stay formatted with
a presubmit check.
**Reviewers:** Please carefully review all the commits except for the
one titled "formatted". The "formatted" commit was auto-generated by
running `dev/tools/format.sh -a -f`. The other commits were hand-crafted
to prepare the repo for the formatting change. I recommend reviewing the
commits one-by-one via the "Commits" tab and avoiding Github's "Files
changed" tab as it will likely slow down your browser because of the
size of this PR.
---------
Co-authored-by: Kate Lovett <katelovett@google.com>
Co-authored-by: LongCatIsLooong <31859944+LongCatIsLooong@users.noreply.github.com>
Currently on iOS `TextField` horizontal drag gestures will have precedence over parent horizontal drag gestures when competing with each other because the default `touchSlop` value used by `TextField` to calculate whether the threshold for a drag has been met is the same as the one used by parent horizontal drag gestures like `PageView`, and other `Scrollable`s. The default value is `18.0`, and because the `TextField` receives the `PointerEvent` first in this scenario, it always declares victory before any parent horizontal drag gestures has the chance to.
Native iOS behavior: The parent horizontal drag gestures will always win unless the drag originated on the cursor (collapsed selection), in that case the TextField cursor drag gestures will win.
This change:
* Introduces `BaseTapAndDragGestureRecognizer.eagerVictoryOnDrag` which can be used to configure the recognizer to declare victory immediately when it detects a drag, or when disabled it will wait until it is the last recognizer in the arena before declaring victory. The default behavior is that it declares victory immediately when the drag is detected.
* Eliminates the iOS cursor drag logic from `TextSelectionGestureDetector`, this logic is now delegated to the selection handle overlay which already had this logic in place.
* Enables iOS cursor to always beat other drag gestures by setting the touch slop lower.
* Disables `eagerVictoryOnDrag` for iOS to allow for parent drag gestures to win and match native behavior.
Fixes#124421, Fixes#130198, Fixes#142624, Fixes#142447, Fixes#127017
Fixes bugs in the text selection positioning calculations so that they work even when the field is scaled. In many cases, we were simply translating things around without applying the proper localToGlobal (or vice versa) transform.
| Before | After |
| --- | --- |
| <img src="https://github.com/flutter/flutter/assets/389558/a5a45472-98c5-4cdf-b382-218971fd9404" /> | <img src="https://github.com/flutter/flutter/assets/389558/f396a1af-2546-4e38-a9d9-6c6edfa38d94" /> |
Partial fix for: https://github.com/flutter/flutter/issues/144685
It looks like there are other problems where transforms aren't applied properly. Putting a transform at the root of the application, above MaterialApp, will expose more problems.
<details>
<summary>Sample code</summary>
```dart
import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
void main() => runApp(const _App());
class _App extends StatelessWidget {
const _App();
@override
Widget build(BuildContext context) {
return const MaterialApp(home: _Home());
}
}
class _Home extends StatefulWidget {
const _Home();
@override
State<_Home> createState() => _HomeState();
}
class _HomeState extends State<_Home> {
final _controller = WebViewController();
final TextEditingController textEditingController = TextEditingController(
text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
);
final OverlayPortalController overlayPortalController = OverlayPortalController();
@override
void initState() {
super.initState();
_controller
..setJavaScriptMode(JavaScriptMode.unrestricted)
..loadRequest(Uri.https('api.flutter.dev'));
}
@override
Widget build(BuildContext context) {
overlayPortalController.show();
return Scaffold(
appBar: AppBar(
title: const Text('Scaled WebView Tester'),
),
body: Stack(
children: <Widget>[
Transform.scale(
alignment: Alignment.topLeft,
scale: 0.5,
child: TextField(
controller: textEditingController,
maxLines: null,
),
),
OverlayPortal(
controller: overlayPortalController,
overlayChildBuilder: (BuildContext context) {
return Positioned(
top: 0.0,
left: 0.0,
child: SizedBox(
height: 1000,
width: 1000,
child: Stack(
children: <Widget>[
Positioned(
top: 90.0,
left: 0.0,
child: Container(
height: 1.0,
width: 1000,
color: Colors.blue,
),
),
Positioned(
top: 102.0,
left: 0.0,
child: Container(
height: 1.0,
width: 1000,
color: Colors.blue,
),
),
],
),
),
);
},
),
],
),
);
}
}
```
</details>
* Revert "Revert "Add support for double tap and drag for text selection (#109573)" (#117497)"
This reverts commit 39fa0117a919bd401c4c8734c97ddb46fbc45cb7.
* Allow TapAndDragGestureRecognizer to accept pointer events from any devices -- the TapGestureRecognizer it replaces was previously doing this
Co-authored-by: Renzo Olivares <roliv@google.com>
* Replace PanGestureRecognizer in TextSelection with TapAndDragGestureRecognizer
* add tracking of _DragState to new tap_and_drag recognizer and remove some legacy double tap code from text_selection.dart and add logs"
* add dragTapCount, a tap count that is persistent for an entire drag and is set to null on drag end vs the regular tap count which is reset on a timer
* basic double tap to drag functionality and add a local dragTapCount in text_selection.dart to use with the timer callback
* Add offsetFromOrigin and localOffsetFromOrigin to DragUpdateDetails similar to LongPressMoveUpdateDetails, eliminates the need to hold the state of lastDragStartDetails
* make a generic baselongpressgesturerecognizer
* Revert "make a generic baselongpressgesturerecognizer"
This reverts commit aad8f7433bd01e4cd016d527af832c3b1f15fac5.
* rename tap_and_drag to selection_recognizers
* add mixin for consecutivetap
* tap and long press gesture recognizer
* Revert "Revert "make a generic baselongpressgesturerecognizer""
This reverts commit 181350c36718f644eada3e45c1b7b5939f90a340.
* Revert "Revert "Revert "make a generic baselongpressgesturerecognizer"""
This reverts commit 4d69775967858dfd66dd9429e1713da598908a85.
* Add support for secondary button clicks on drag gesture recognizer and separate drag end and tap up callback
* get test running
* rename tapCount to consecutiveTapCount
* dispose timer properly
* add some comments to tests
* Add comments
* Make ConsecutiveTapMixin private and move logic to increment tap count into mixin
* stop tracking pointer when gesture is rejected and detect drags on touch devices
* onCancel for TapAndDrag
* have the TapAndDragGestureRecognizer handle tap downs and tap ups on touch and mouse devices
* add drag to move cursor for android and iOS, and pointer device kind to DragUpdateDetails
* get tests running
* refactor TapAndDragGestureRecognizer moving some logic into _check methods
* Handle cancel properly on TapAndDragGestureRecognizer, having both onTapCancel and onDragCancel, also fix tests
* Fix test mouse drag selects and cannot drag cursor, save _initialPosition based on dragStartBehavior (either on tapDown or dragStart)
* determine if drag has a sufficient global distance to accept and fix some cancel behavior, making _checkCancel clearer
* give up pointer on drag end
* properly stop tracking pointer, fixes test for right click on Apple and non-apple platforms
* clean up some comments from last commit
* remove drag on touch for now
* fix Can select text by dragging with a mouse due to dragStart only being fired on the first PointerMoveEvent, the previous pan gesture recognizer would fire both dragStart and dragUpdate
* Revert "fix Can select text by dragging with a mouse due to dragStart only being fired on the first PointerMoveEvent, the previous pan gesture recognizer would fire both dragStart and dragUpdate"
This reverts commit 124dc79bc3389672c76d7c014ce04edab297abc6.
* correctly use _initialPosition for checkStart and call _checkUpdate after _checkStart if localDelta is not zero
* updates
* fix double tap chains
* Add docs
* Address analyzer
* more analyzer, only issues left are with print statements
* add deadlineTimer to fix conflict with ForcePressGestureRecognizer
* Revert "add deadlineTimer to fix conflict with ForcePressGestureRecognizer"
This reverts commit 3b29ddfff4cde4845edd481ecefb789fea2a0781.
* remove unecessary changes to tests
* secondaryButton should not drag
* Revert "Revert "add deadlineTimer to fix conflict with ForcePressGestureRecognizer""
This reverts commit 0a008f029f5796acd48c17c1897c0b700d5ef3a7.
* updates
* Revert "updates"
This reverts commit 4803b8443a2b67f0b8d29e9a01f712dfcb0f588c.
* Revert "Revert "Revert "add deadlineTimer to fix conflict with ForcePressGestureRecognizer"""
This reverts commit 79251a7af88d5dbb1460a960afc77e65dea18bff.
* fix shift + tap + drag tests, this was happening because a double tap + drag was being registered and not a single tap, added a duration to pumpAndSettle to fix this
* remove TapAndLongPressGestureRecognizer
* fix cupertino text field tests related to shift + tap + drag
* deadline timer try 2
* more logs
* Should reset taps when tap cancel is called, and should wait until gesture is accepted to initiate a drag
* should clear _down and _up when gesture is rejected
* remove erroneous log
* fix selectable text double tap chains test
* dont restart timer until tap up
* reset consecutiveTapCount on drag end
* fix selectableText test
* fix material text field tests
* reject TapAndDragGestureRecognizer when it is neither a tap nor a drag
* remove prints
* clean up
* shift aware
* clean up
* fix cupertino test
* fix text field focus tests
* Add 100ms delay to cupertino test, to prevent a double tap
* clean up test comments
* add comment to test
* uncomment test
* remove longpress changes
* Fix drag on mobile
* remove debug
* Fix drag to move cursor on iOS
* left over from drag fix
* add tests for drag on touch devices
* add test for double tap + drag mouse devices
* add tests
* Fix bug where initialPosition was used before it was set
* Address some review comments and fix issue where if double tap was held too long then long press gesture recognizer would take over
* remove _isDoubleTap flag since it is no longer needed due to previous commit
* Add docs for onTapCancel and onDragCancel
* analyzer fixes
* Do not test selection handles on macOS, since macOS does not support touch
* Add assert for dragStartBehavior
* add double tap + drag tests to cupertino
* use kDoubleTapTimeout instead of const Duration(milliseconds: 300) for readability
* analyzer issues
* update docs
* update more docs
* address comments
* more doc updates
* fix docs
* unused import
* fix docs
* Add more tests
* Add more tests and reject a tap up if we have exceeded the tap tolerance
* updates
* Address comments
* fix test naming
* update documentation
* move selection_recognizers to selection_gestures
* fix analyzer
* fix analyzer
* keysPressedOnDown instead of isShiftPressed
* update docs
* update docs
* Add drag update throttle to TapAndDragGestureRecognizer
* update comments
* missed from merge
* Replace _ConsecutiveTapMixin with _TapStatusTrackerMixin
* updates
* correctly cancel tap when when past tap tolerance with new implementation
* Should call tap and drag cancel if we are giving up a pointer without succesfully tracking a PointerUpEvent
* comments
* move pastTapTolerance to tap tracker
* move pastTapTolerance to tap tracker
* clean up check for nulls and remove use of consecutiveTapCountWhileDragging
* move call to super.acceptGesture to top
* remove print
* clean up
* Fix tests where both PanGestureRecognizer and TapAndDragGestureRecognizer lost
* clean up
* _GestureState -> _DragState
* more docs clean up
* more clean up
* Add onSecondaryTapCancel
* Add docs
* more docs
* Fix broken isPointerAllowed when attempting a right click drag - the _initialButtons is never reset
* revert debug flag
* make primaryPointer private
* Add support for upper count limit in TapAndDragGestureRecognizer, the tap counter should not be allowed to grow infinitely unless that is desired
* fix analyzer
* Use new TapDrag details objects and callbacks
* clean up docs
* clean up and add test for upperLimit
* Add docs for TapAndDragGestureRecognizer and remove some ambiguity of onStart onUpdate and onEnd parameters
* Address review comments
* analyzer fixes
* Call cancel before rejecting the gesture so we can still access _initialButtons
* Recognizer should reject any pointer differing from the original
* Revert "Recognizer should reject any pointer differing from the original"
This reverts commit afd9807480bd11e119bdd2b7d520631511973bab.
* Address reviewer comments
* Correct cancel behavior
* Fix consecutive tap + drag because _dragStart state was not being set when consecutive tap is greater than one
* Add more tests
* Add documentation on behavior with TapGestureRecognizer and DragGestureRecognizer
* more docs
* more docs
* remove comments
* updates
* fix multiple pointer behavior
* only handle the primary pointer
* Clean up dangerous assumptions in gesture details objects
* forgot from rebase
* update docs
* updates
* Clean up some redundant code
* remove whitespace
* fix tests as a result of #115849
* update test docs
* Fix same test from last commit for material variants
* More clean up of redundant code and update docs
* Clean up didStopTrackingLastPointer and untie TapAndDragGestureRecognizer cancel behavior from TapStatusTrackerMixin.currentUp state
* untie pastTapTolerance
* updates
* Add slopTolerance
* update docs
* Have secondary tap handled by TapGestureRecognizer
* update docs
* fix analyzer and address comments
* Add more docs
* Update cancel behavior tol not call on tap cancel when a drag has been accepted
* Change cancel behavior to only cancel if the tap down callback has been sent and merge tapcancel and dragcancel
* update docs;
* Rename selection_gestures to tap_and_drag_gestures
* Address some reviewer comments
* make deadline and slopTolerance private
* updates
* updates
* Address review comments
* remove _initialButtons
* fix docs
* trackTrap -> trackTap
* fix analyzer
* Add test to verify that tap up is called when recognizer accepts before handleEvent is called
* implement Diagnosticable for Details objects;
* sentTapDown == wonArenaForPrimaryPointer, so the implementation now only uses sentTapDown
* Count user tap up immediately and do not wait to win the arena
* Do not need to call super from TapAndDragGestureRecognizer.acceptGesture anymore because mixin implementation is gone
* Do not start selection drag on Android, iOS, and Fuchshsia touch devices if renderEditable does not have focus, this fixes many scubas
* Address reviewer comments
* fix test
* TapAndDragGestureRecognizer should wait for other recognizer to lose before winning the arena
* Address review comments
* Dont check for drag if the start was already found
* Only check for a drag if it has not already been found"
* fix from rebase
Co-authored-by: Renzo Olivares <roliv@google.com>
