Skip to content

Commit 7f9d04d

Browse files
ValentinVignalPiinks
authored andcommitted
format: Format files
1 parent 51fe18e commit 7f9d04d

File tree

2 files changed

+71
-72
lines changed

2 files changed

+71
-72
lines changed

packages/flutter/lib/src/material/reorderable_list.dart

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -334,27 +334,21 @@ class _ReorderableListViewState extends State<ReorderableListView> {
334334
case TargetPlatform.linux:
335335
case TargetPlatform.windows:
336336
case TargetPlatform.macOS:
337-
338-
final ListenableBuilder dragHandle = ListenableBuilder(
339-
listenable: _dragging,
340-
builder: (BuildContext context, Widget? child) {
341-
final MouseCursor effectiveMouseCursor = WidgetStateProperty.resolveAs<MouseCursor>(
342-
widget.mouseCursor ?? const WidgetStateMouseCursor.fromMap(<WidgetStatesConstraint, MouseCursor>{
343-
WidgetState.dragged: SystemMouseCursors.grabbing,
344-
WidgetState.any: SystemMouseCursors.grab,
345-
}),
346-
<WidgetState>{
347-
if (_dragging.value) WidgetState.dragged
348-
},
349-
);
350-
return MouseRegion(
351-
cursor: effectiveMouseCursor,
352-
child:child,
353-
);
354-
},
355-
child: const Icon(Icons.drag_handle),
356-
357-
);
337+
final ListenableBuilder dragHandle = ListenableBuilder(
338+
listenable: _dragging,
339+
builder: (BuildContext context, Widget? child) {
340+
final MouseCursor effectiveMouseCursor = WidgetStateProperty.resolveAs<MouseCursor>(
341+
widget.mouseCursor ??
342+
const WidgetStateMouseCursor.fromMap(<WidgetStatesConstraint, MouseCursor>{
343+
WidgetState.dragged: SystemMouseCursors.grabbing,
344+
WidgetState.any: SystemMouseCursors.grab,
345+
}),
346+
<WidgetState>{if (_dragging.value) WidgetState.dragged},
347+
);
348+
return MouseRegion(cursor: effectiveMouseCursor, child: child);
349+
},
350+
child: const Icon(Icons.drag_handle),
351+
);
358352
switch (widget.scrollDirection) {
359353
case Axis.horizontal:
360354
return Stack(
@@ -368,10 +362,7 @@ class _ReorderableListViewState extends State<ReorderableListView> {
368362
bottom: 8,
369363
child: Align(
370364
alignment: AlignmentDirectional.bottomCenter,
371-
child: ReorderableDragStartListener(
372-
index: index,
373-
child: dragHandle,
374-
),
365+
child: ReorderableDragStartListener(index: index, child: dragHandle),
375366
),
376367
),
377368
],
@@ -388,10 +379,7 @@ class _ReorderableListViewState extends State<ReorderableListView> {
388379
end: 8,
389380
child: Align(
390381
alignment: AlignmentDirectional.centerEnd,
391-
child: ReorderableDragStartListener(
392-
index: index,
393-
child: dragHandle,
394-
),
382+
child: ReorderableDragStartListener(index: index, child: dragHandle),
395383
),
396384
),
397385
],
@@ -484,11 +472,11 @@ class _ReorderableListViewState extends State<ReorderableListView> {
484472
itemCount: widget.itemCount,
485473
onReorder: widget.onReorder,
486474
onReorderStart: (int index) {
487-
_dragging.value = true;
475+
_dragging.value = true;
488476
widget.onReorderStart?.call(index);
489477
},
490478
onReorderEnd: (int index) {
491-
_dragging.value = false;
479+
_dragging.value = false;
492480
widget.onReorderEnd?.call(index);
493481
},
494482
proxyDecorator: widget.proxyDecorator ?? _proxyDecorator,

packages/flutter/test/material/reorderable_list_test.dart

Lines changed: 52 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,10 @@ void main() {
23382338
),
23392339
);
23402340

2341-
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
2341+
final TestGesture gesture = await tester.createGesture(
2342+
kind: PointerDeviceKind.mouse,
2343+
pointer: 1,
2344+
);
23422345
await gesture.addPointer(location: tester.getCenter(find.byIcon(Icons.drag_handle).first));
23432346
await tester.pump();
23442347
expect(
@@ -2359,49 +2362,57 @@ void main() {
23592362
);
23602363
}, variant: TargetPlatformVariant.desktop());
23612364

2362-
testWidgets('Mouse cursor behavior on the drag handle can be provided', (WidgetTester tester) async {
2363-
await tester.pumpWidget(
2364-
MaterialApp(
2365-
home: Scaffold(
2366-
body: ReorderableListView.builder(
2367-
mouseCursor: const WidgetStateMouseCursor.fromMap(<WidgetStatesConstraint, MouseCursor>{
2368-
WidgetState.dragged: SystemMouseCursors.copy,
2369-
WidgetState.any: SystemMouseCursors.resizeColumn,
2370-
}),
2371-
itemBuilder: (BuildContext context, int index) {
2372-
return ReorderableDragStartListener(
2373-
key: ValueKey<int>(index),
2374-
index: index,
2375-
child: Text('$index'),
2376-
);
2377-
},
2378-
itemCount: 5,
2379-
onReorder: (int fromIndex, int toIndex) {},
2365+
testWidgets(
2366+
'Mouse cursor behavior on the drag handle can be provided',
2367+
(WidgetTester tester) async {
2368+
await tester.pumpWidget(
2369+
MaterialApp(
2370+
home: Scaffold(
2371+
body: ReorderableListView.builder(
2372+
mouseCursor:
2373+
const WidgetStateMouseCursor.fromMap(<WidgetStatesConstraint, MouseCursor>{
2374+
WidgetState.dragged: SystemMouseCursors.copy,
2375+
WidgetState.any: SystemMouseCursors.resizeColumn,
2376+
}),
2377+
itemBuilder: (BuildContext context, int index) {
2378+
return ReorderableDragStartListener(
2379+
key: ValueKey<int>(index),
2380+
index: index,
2381+
child: Text('$index'),
2382+
);
2383+
},
2384+
itemCount: 5,
2385+
onReorder: (int fromIndex, int toIndex) {},
2386+
),
23802387
),
23812388
),
2382-
),
2383-
);
2389+
);
23842390

2385-
final TestGesture gesture = await tester.createGesture(kind: PointerDeviceKind.mouse, pointer: 1);
2386-
await gesture.addPointer(location: tester.getCenter(find.byIcon(Icons.drag_handle).first));
2387-
await tester.pump();
2388-
expect(
2389-
RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
2390-
SystemMouseCursors.resizeColumn,
2391-
);
2392-
await gesture.down(tester.getCenter(find.byIcon(Icons.drag_handle).first));
2393-
await tester.pump(kLongPressTimeout);
2394-
expect(
2395-
RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
2396-
SystemMouseCursors.copy,
2397-
);
2398-
await gesture.up();
2399-
await tester.pumpAndSettle();
2400-
expect(
2401-
RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
2402-
SystemMouseCursors.resizeColumn,
2403-
);
2404-
}, variant: TargetPlatformVariant.desktop());
2391+
final TestGesture gesture = await tester.createGesture(
2392+
kind: PointerDeviceKind.mouse,
2393+
pointer: 1,
2394+
);
2395+
await gesture.addPointer(location: tester.getCenter(find.byIcon(Icons.drag_handle).first));
2396+
await tester.pump();
2397+
expect(
2398+
RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
2399+
SystemMouseCursors.resizeColumn,
2400+
);
2401+
await gesture.down(tester.getCenter(find.byIcon(Icons.drag_handle).first));
2402+
await tester.pump(kLongPressTimeout);
2403+
expect(
2404+
RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
2405+
SystemMouseCursors.copy,
2406+
);
2407+
await gesture.up();
2408+
await tester.pumpAndSettle();
2409+
expect(
2410+
RendererBinding.instance.mouseTracker.debugDeviceActiveCursor(1),
2411+
SystemMouseCursors.resizeColumn,
2412+
);
2413+
},
2414+
variant: TargetPlatformVariant.desktop(),
2415+
);
24052416
}
24062417

24072418
Future<void> longPressDrag(WidgetTester tester, Offset start, Offset end) async {

0 commit comments

Comments
 (0)