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

Adds an onMove callback on a DragTarget. (#60174)

Browse Source
This commit is contained in:
Daniel Iglesia 2020-07-28 09:56:09 -07:00 committed by GitHub
parent 901ccbe65b
commit 0fdb21f31f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 112 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/flutter/lib/src/widgets/drag_target.dart
View File

@ -57,6 +57,11 @@ typedef DragEndCallback = void Function(DraggableDetails details);
/// Used by [DragTarget.onLeave].
typedef DragTargetLeave = void Function(Object data);
/// Signature for when a [Draggable] moves within a [DragTarget].
///
/// Used by [DragTarget.onMove].
typedef DragTargetMove = void Function(DragTargetDetails<dynamic> details);
/// Where the [Draggable] should be anchored during a drag.
enum DragAnchor {
/// Display the feedback anchored at the position of the original child. If
@ -504,6 +509,7 @@ class DragTarget<T> extends StatefulWidget {
this.onAccept,
this.onAcceptWithDetails,
this.onLeave,
this.onMove,
}) : super(key: key);
/// Called to build the contents of this widget.
@ -535,6 +541,11 @@ class DragTarget<T> extends StatefulWidget {
/// the target.
final DragTargetLeave onLeave;
/// Called when a [Draggable] moves within this [DragTarget].
///
/// Note that this includes entering and leaving the target.
final DragTargetMove onMove;
@override
_DragTargetState<T> createState() => _DragTargetState<T>();
}
@ -588,6 +599,13 @@ class _DragTargetState<T> extends State<DragTarget<T>> {
widget.onAcceptWithDetails(DragTargetDetails<T>(data: avatar.data as T, offset: avatar._lastOffset));
}
void didMove(_DragAvatar<Object> avatar) {
if (!mounted)
return;
if (widget.onMove != null)
widget.onMove(DragTargetDetails<dynamic>(data: avatar.data, offset: avatar._lastOffset));
}
@override
Widget build(BuildContext context) {
assert(widget.builder != null);
@ -680,9 +698,13 @@ class _DragAvatar<T> extends Drag {
}
}
// If everything's the same, bail early.
if (listsMatch)
// If everything's the same, report moves, and bail early.
if (listsMatch) {
for (final _DragTargetState<T> target in _enteredTargets) {
target.didMove(this);
}
return;
}
// Leave old targets.
_leaveAllEntered();
@ -696,6 +718,11 @@ class _DragAvatar<T> extends Drag {
orElse: () => null,
);
// Report moves to the targets.
for (final _DragTargetState<T> target in _enteredTargets) {
target.didMove(this);
}
_activeTarget = newTarget;
}

83
packages/flutter/test/widgets/draggable_test.dart
View File

@ -17,6 +17,7 @@ void main() {
final List<int> accepted = <int>[];
final List<DragTargetDetails<int>> acceptedDetails = <DragTargetDetails<int>>[];
int dragStartedCount = 0;
int moveCount = 0;
await tester.pumpWidget(MaterialApp(
home: Column(
@ -33,6 +34,7 @@ void main() {
builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
return Container(height: 100.0, child: const Text('Target'));
},
onMove: (_) => moveCount++,
onAccept: accepted.add,
onAcceptWithDetails: acceptedDetails.add,
),
@ -46,6 +48,7 @@ void main() {
expect(find.text('Dragging'), findsNothing);
expect(find.text('Target'), findsOneWidget);
expect(dragStartedCount, 0);
expect(moveCount, 0);
final Offset firstLocation = tester.getCenter(find.text('Source'));
final TestGesture gesture = await tester.startGesture(firstLocation, pointer: 7);
@ -57,6 +60,7 @@ void main() {
expect(find.text('Dragging'), findsOneWidget);
expect(find.text('Target'), findsOneWidget);
expect(dragStartedCount, 1);
expect(moveCount, 0);
final Offset secondLocation = tester.getCenter(find.text('Target'));
await gesture.moveTo(secondLocation);
@ -68,6 +72,7 @@ void main() {
expect(find.text('Dragging'), findsOneWidget);
expect(find.text('Target'), findsOneWidget);
expect(dragStartedCount, 1);
expect(moveCount, 1);
await gesture.up();
await tester.pump();
@ -79,6 +84,7 @@ void main() {
expect(find.text('Dragging'), findsNothing);
expect(find.text('Target'), findsOneWidget);
expect(dragStartedCount, 1);
expect(moveCount, 1);
});
testWidgets('Drag and drop - onLeave callback fires correctly', (WidgetTester tester) async {
@ -156,6 +162,83 @@ void main() {
expect(leftBehind['Target 2'], equals(1));
});
testWidgets('Drag and drop - onMove callback fires correctly', (WidgetTester tester) async {
final Map<String,int> targetMoveCount = <String,int>{
'Target 1': 0,
'Target 2': 0,
};
await tester.pumpWidget(MaterialApp(
home: Column(
children: <Widget>[
const Draggable<int>(
data: 1,
child: Text('Source'),
feedback: Text('Dragging'),
),
DragTarget<int>(
builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
return Container(height: 100.0, child: const Text('Target 1'));
},
onMove: (DragTargetDetails<dynamic> details) {
if (details.data is int) {
targetMoveCount['Target 1'] =
targetMoveCount['Target 1'] + (details.data as int);
}
},
),
DragTarget<int>(
builder: (BuildContext context, List<int> data, List<dynamic> rejects) {
return Container(height: 100.0, child: const Text('Target 2'));
},
onMove: (DragTargetDetails<dynamic> details) {
if (details.data is int) {
targetMoveCount['Target 2'] =
targetMoveCount['Target 2'] + (details.data as int);
}
},
),
],
),
));
expect(targetMoveCount['Target 1'], equals(0));
expect(targetMoveCount['Target 2'], equals(0));
final Offset firstLocation = tester.getCenter(find.text('Source'));
final TestGesture gesture = await tester.startGesture(firstLocation, pointer: 7);
await tester.pump();
expect(targetMoveCount['Target 1'], equals(0));
expect(targetMoveCount['Target 2'], equals(0));
final Offset secondLocation = tester.getCenter(find.text('Target 1'));
await gesture.moveTo(secondLocation);
await tester.pump();
expect(targetMoveCount['Target 1'], equals(1));
expect(targetMoveCount['Target 2'], equals(0));
final Offset thirdLocation = tester.getCenter(find.text('Target 2'));
await gesture.moveTo(thirdLocation);
await tester.pump();
expect(targetMoveCount['Target 1'], equals(1));
expect(targetMoveCount['Target 2'], equals(1));
await gesture.moveTo(secondLocation);
await tester.pump();
expect(targetMoveCount['Target 1'], equals(2));
expect(targetMoveCount['Target 2'], equals(1));
await gesture.up();
await tester.pump();
expect(targetMoveCount['Target 1'], equals(2));
expect(targetMoveCount['Target 2'], equals(1));
});
testWidgets('Drag and drop - dragging over button', (WidgetTester tester) async {
final List<String> events = <String>[];
Offset firstLocation, secondLocation;