From 83f146a0c7fb96f466e3ff49eb39909fd17fdc16 Mon Sep 17 00:00:00 2001 From: d-polikhranidi <76728763+d-polikhranidi@users.noreply.github.com> Date: Fri, 27 Sep 2024 00:06:57 +0300 Subject: [PATCH 1/8] Add animationDuration property to useTabController hook --- .../flutter_hooks/lib/src/tab_controller.dart | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/flutter_hooks/lib/src/tab_controller.dart b/packages/flutter_hooks/lib/src/tab_controller.dart index 5aba96c3..ba40e36f 100644 --- a/packages/flutter_hooks/lib/src/tab_controller.dart +++ b/packages/flutter_hooks/lib/src/tab_controller.dart @@ -6,6 +6,7 @@ part of 'hooks.dart'; /// - [TabController] TabController useTabController({ required int initialLength, + Duration? animationDuration = kTabScrollDuration, TickerProvider? vsync, int initialIndex = 0, List? keys, @@ -17,6 +18,7 @@ TabController useTabController({ vsync: vsync, length: initialLength, initialIndex: initialIndex, + animationDuration: animationDuration, keys: keys, ), ); @@ -27,23 +29,24 @@ class _TabControllerHook extends Hook { required this.length, required this.vsync, required this.initialIndex, - List? keys, - }) : super(keys: keys); + required this.animationDuration, + super.keys, + }); final int length; final TickerProvider vsync; final int initialIndex; + final Duration? animationDuration; @override - HookState> createState() => - _TabControllerHookState(); + HookState> createState() => _TabControllerHookState(); } -class _TabControllerHookState - extends HookState { +class _TabControllerHookState extends HookState { late final controller = TabController( length: hook.length, initialIndex: hook.initialIndex, + animationDuration: hook.animationDuration, vsync: hook.vsync, ); From ffc0d2abaaaef246fb5a0e7a3951656d538c9e88 Mon Sep 17 00:00:00 2001 From: d-polikhranidi <76728763+d-polikhranidi@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:55:25 +0300 Subject: [PATCH 2/8] Update use_tab_controller_test.dart --- .../test/use_tab_controller_test.dart | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/flutter_hooks/test/use_tab_controller_test.dart b/packages/flutter_hooks/test/use_tab_controller_test.dart index 80ddaf97..dd207dc0 100644 --- a/packages/flutter_hooks/test/use_tab_controller_test.dart +++ b/packages/flutter_hooks/test/use_tab_controller_test.dart @@ -138,6 +138,27 @@ void main() { verifyNoMoreInteractions(vsync); ticker.dispose(); }); + testWidgets('initial animationDuration matches with real constructor', (tester) async { + late TabController controller; + late TabController controller2; + + final vsync = TickerProviderMock(); + final ticker = Ticker((_) {}); + when(vsync.createTicker((_) {})).thenReturn(ticker); + + await tester.pumpWidget( + HookBuilder( + builder: (context) { + controller = useTabController(initialLength: 4); + controller2 = TabController(length: 4, vsync: vsync); + return Container(); + }, + ), + ); + + expect(controller.animationDuration, controller2.animationDuration); + + }); }); } From 34a47fd74a5973b47a08f296dab46400ca74c3d8 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Wed, 2 Oct 2024 12:57:30 +0200 Subject: [PATCH 3/8] Update packages/flutter_hooks/test/use_tab_controller_test.dart --- packages/flutter_hooks/test/use_tab_controller_test.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/flutter_hooks/test/use_tab_controller_test.dart b/packages/flutter_hooks/test/use_tab_controller_test.dart index dd207dc0..3abc85b8 100644 --- a/packages/flutter_hooks/test/use_tab_controller_test.dart +++ b/packages/flutter_hooks/test/use_tab_controller_test.dart @@ -138,6 +138,7 @@ void main() { verifyNoMoreInteractions(vsync); ticker.dispose(); }); + testWidgets('initial animationDuration matches with real constructor', (tester) async { late TabController controller; late TabController controller2; From 85156a54a5efadda4c4e7d339894c870581d2935 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Wed, 2 Oct 2024 12:57:34 +0200 Subject: [PATCH 4/8] Update packages/flutter_hooks/test/use_tab_controller_test.dart --- packages/flutter_hooks/test/use_tab_controller_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/flutter_hooks/test/use_tab_controller_test.dart b/packages/flutter_hooks/test/use_tab_controller_test.dart index 3abc85b8..c12c5331 100644 --- a/packages/flutter_hooks/test/use_tab_controller_test.dart +++ b/packages/flutter_hooks/test/use_tab_controller_test.dart @@ -158,7 +158,6 @@ void main() { ); expect(controller.animationDuration, controller2.animationDuration); - }); }); } From cbd4e6631be74a1ed630b375539a19503c1ca2b7 Mon Sep 17 00:00:00 2001 From: d-polikhranidi <76728763+d-polikhranidi@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:03:38 +0300 Subject: [PATCH 5/8] Update use_tab_controller_test.dart --- packages/flutter_hooks/test/use_tab_controller_test.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/flutter_hooks/test/use_tab_controller_test.dart b/packages/flutter_hooks/test/use_tab_controller_test.dart index c12c5331..84e7d57e 100644 --- a/packages/flutter_hooks/test/use_tab_controller_test.dart +++ b/packages/flutter_hooks/test/use_tab_controller_test.dart @@ -143,13 +143,10 @@ void main() { late TabController controller; late TabController controller2; - final vsync = TickerProviderMock(); - final ticker = Ticker((_) {}); - when(vsync.createTicker((_) {})).thenReturn(ticker); - await tester.pumpWidget( HookBuilder( builder: (context) { + final vsync = useSingleTickerProvider(); controller = useTabController(initialLength: 4); controller2 = TabController(length: 4, vsync: vsync); return Container(); From a92e2fe983efa46ae36f00a08dbdcb3dd97423eb Mon Sep 17 00:00:00 2001 From: Dalis Date: Wed, 2 Oct 2024 14:28:48 +0300 Subject: [PATCH 6/8] dart format and update import in hooks.dart --- packages/flutter_hooks/lib/src/hooks.dart | 9 +-------- packages/flutter_hooks/test/use_tab_controller_test.dart | 4 +--- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/packages/flutter_hooks/lib/src/hooks.dart b/packages/flutter_hooks/lib/src/hooks.dart index 023868de..1a77c602 100644 --- a/packages/flutter_hooks/lib/src/hooks.dart +++ b/packages/flutter_hooks/lib/src/hooks.dart @@ -2,14 +2,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart' - show - Brightness, - DraggableScrollableController, - ExpansionTileController, - WidgetStatesController, - SearchController, - TabController, - WidgetState; + show Brightness, DraggableScrollableController, ExpansionTileController, SearchController, TabController, WidgetState, WidgetStatesController, kTabScrollDuration; import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart'; diff --git a/packages/flutter_hooks/test/use_tab_controller_test.dart b/packages/flutter_hooks/test/use_tab_controller_test.dart index 84e7d57e..f93b1641 100644 --- a/packages/flutter_hooks/test/use_tab_controller_test.dart +++ b/packages/flutter_hooks/test/use_tab_controller_test.dart @@ -20,9 +20,7 @@ void main() { final element = tester.element(find.byType(HookBuilder)); expect( - element - .toDiagnosticsNode(style: DiagnosticsTreeStyle.offstage) - .toStringDeep(), + element.toDiagnosticsNode(style: DiagnosticsTreeStyle.offstage).toStringDeep(), equalsIgnoringHashCodes( 'HookBuilder\n' ' │ useSingleTickerProvider\n' From 82c543ccfdf175041cc69252aadd746e72b5894f Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sun, 23 Feb 2025 15:07:10 +0100 Subject: [PATCH 7/8] Fix --- packages/flutter_hooks/lib/src/hooks.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/flutter_hooks/lib/src/hooks.dart b/packages/flutter_hooks/lib/src/hooks.dart index a3893261..d1e4664a 100644 --- a/packages/flutter_hooks/lib/src/hooks.dart +++ b/packages/flutter_hooks/lib/src/hooks.dart @@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart' show Brightness, + CarouselController, DraggableScrollableController, ExpansionTileController, SearchController, From 2dd4ebaf7549c0548544eb2ed79d5ae0221fb5e5 Mon Sep 17 00:00:00 2001 From: Remi Rousselet Date: Sun, 23 Feb 2025 15:10:43 +0100 Subject: [PATCH 8/8] Format --- packages/flutter_hooks/lib/src/tab_controller.dart | 6 ++++-- packages/flutter_hooks/test/use_tab_controller_test.dart | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/flutter_hooks/lib/src/tab_controller.dart b/packages/flutter_hooks/lib/src/tab_controller.dart index ba40e36f..eef5f0ac 100644 --- a/packages/flutter_hooks/lib/src/tab_controller.dart +++ b/packages/flutter_hooks/lib/src/tab_controller.dart @@ -39,10 +39,12 @@ class _TabControllerHook extends Hook { final Duration? animationDuration; @override - HookState> createState() => _TabControllerHookState(); + HookState> createState() => + _TabControllerHookState(); } -class _TabControllerHookState extends HookState { +class _TabControllerHookState + extends HookState { late final controller = TabController( length: hook.length, initialIndex: hook.initialIndex, diff --git a/packages/flutter_hooks/test/use_tab_controller_test.dart b/packages/flutter_hooks/test/use_tab_controller_test.dart index f93b1641..b4dffce7 100644 --- a/packages/flutter_hooks/test/use_tab_controller_test.dart +++ b/packages/flutter_hooks/test/use_tab_controller_test.dart @@ -20,7 +20,9 @@ void main() { final element = tester.element(find.byType(HookBuilder)); expect( - element.toDiagnosticsNode(style: DiagnosticsTreeStyle.offstage).toStringDeep(), + element + .toDiagnosticsNode(style: DiagnosticsTreeStyle.offstage) + .toStringDeep(), equalsIgnoringHashCodes( 'HookBuilder\n' ' │ useSingleTickerProvider\n' @@ -137,7 +139,8 @@ void main() { ticker.dispose(); }); - testWidgets('initial animationDuration matches with real constructor', (tester) async { + testWidgets('initial animationDuration matches with real constructor', + (tester) async { late TabController controller; late TabController controller2;