firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Registering multiple transformed events should work (#48149)

Browse Source
This commit is contained in:
Mouad Debbar 2020-01-06 14:24:52 -08:00 committed by GitHub
parent 2221a9f514
commit f6a88d0309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter/lib/src/gestures/pointer_signal_resolver.dart
View File

@ -10,6 +10,10 @@ import 'events.dart';
/// interest in a pointer signal event.
typedef PointerSignalResolvedCallback = void Function(PointerSignalEvent event);
bool _isSameEvent(PointerSignalEvent event1, PointerSignalEvent event2) {
return (event1.original ?? event1) == (event2.original ?? event2);
}
/// An resolver for pointer signal events.
///
/// Objects interested in a [PointerSignalEvent] should register a callback to
@ -29,7 +33,7 @@ class PointerSignalResolver {
void register(PointerSignalEvent event, PointerSignalResolvedCallback callback) {
assert(event != null);
assert(callback != null);
assert(_currentEvent == null || _currentEvent == event);
assert(_currentEvent == null || _isSameEvent(_currentEvent, event));
if (_firstRegisteredCallback != null) {
return;
}
@ -47,7 +51,7 @@ class PointerSignalResolver {
assert(_currentEvent == null);
return;
}
assert((_currentEvent.original ?? _currentEvent) == event);
assert(_isSameEvent(_currentEvent, event));
try {
_firstRegisteredCallback(_currentEvent);
} catch (exception, stack) {

15
packages/flutter/test/gestures/pointer_signal_resolver_test.dart
View File

@ -74,14 +74,29 @@ void main() {
const PointerScrollEvent originalEvent = PointerScrollEvent();
final PointerSignalEvent transformedEvent = originalEvent
.transformed(Matrix4.translationValues(10.0, 20.0, 0.0));
final PointerSignalEvent anotherTransformedEvent = originalEvent
.transformed(Matrix4.translationValues(30.0, 50.0, 0.0));
expect(originalEvent, isNot(same(transformedEvent)));
expect(transformedEvent.original, same(originalEvent));
expect(originalEvent, isNot(same(anotherTransformedEvent)));
expect(anotherTransformedEvent.original, same(originalEvent));
final List<PointerSignalEvent> events = <PointerSignalEvent>[];
resolver.register(transformedEvent, (PointerSignalEvent event) {
events.add(event);
});
// Registering a second transformed event should not throw an assertion.
expect(() {
resolver.register(anotherTransformedEvent, (PointerSignalEvent event) {
// This shouldn't be called because only the first registered callback is
// invoked.
events.add(event);
});
}, returnsNormally);
resolver.resolve(originalEvent);
expect(events.single, same(transformedEvent));