Fix tabs not switching

forus-labs · Sep 24, 2024 · df33117 · df33117
1 parent 9c71f1e
commit df33117
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 2 deletions.
diff --git a/forui/CHANGELOG.md b/forui/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.5.1
+
+###
+
+* Fix `FTabs` not showing correct tab entry when switching tabs. 
+ [Issue #203](https://github.com/forus-labs/forui/issues/203).
+
+
 ## 0.5.0
 
 The minimum Flutter version has been increased from `3.19.0` to `3.24.0`.

diff --git a/forui/lib/src/widgets/tabs/tabs.dart b/forui/lib/src/widgets/tabs/tabs.dart
@@ -161,7 +161,10 @@ class _FTabsState extends State<FTabs> with SingleTickerProviderStateMixin {
               dividerColor: Colors.transparent,
               labelStyle: style.selectedLabel,
               unselectedLabelStyle: style.unselectedLabel,
-              onTap: (index) => widget.onPress?.call(index),
+              onTap: (index) {
+                setState(() {});
+                widget.onPress?.call(index);
+              },
             ),
           ),
           SizedBox(height: style.spacing),

diff --git a/forui/pubspec.yaml b/forui/pubspec.yaml
@@ -1,6 +1,6 @@
 name: forui
 description: Forui is a UI library for Flutter that provides a set of minimalistic widgets heavily inspired by Shadcn/ui.
-version: 0.5.0
+version: 0.5.1
 homepage: https://forui.dev/
 documentation: https://forui.dev/docs
 repository: https://github.com/forus-labs/forui/tree/main/forui

diff --git a/forui/test/src/widgets/tabs/tabs_test.dart b/forui/test/src/widgets/tabs/tabs_test.dart
@@ -79,5 +79,79 @@ void main() {
 
       expect(tester.takeException(), null);
     });
+
+    testWidgets('tap on current entry', (tester) async {
+      await tester.pumpWidget(
+        MaterialApp(
+          home: TestScaffold(
+            data: FThemes.zinc.light,
+            child: FTabs(
+              tabs: const [
+                FTabEntry(label: Text('foo'), content: Text('foo content')),
+                FTabEntry(label: Text('bar'), content: Text('bar content')),
+              ],
+            ),
+          ),
+        ),
+      );
+
+      expect(find.text('foo content'), findsOneWidget);
+      expect(find.text('bar content'), findsNothing);
+
+      await tester.tap(find.text('foo'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('foo content'), findsOneWidget);
+      expect(find.text('bar content'), findsNothing);
+    });
+
+    testWidgets('using internal controller and tapping on tab switches tab entry', (tester) async {
+      await tester.pumpWidget(
+        MaterialApp(
+          home: TestScaffold(
+            data: FThemes.zinc.light,
+            child: FTabs(
+              tabs: const [
+                FTabEntry(label: Text('foo'), content: Text('foo content')),
+                FTabEntry(label: Text('bar'), content: Text('bar content')),
+              ],
+            ),
+          ),
+        ),
+      );
+
+      expect(find.text('bar content'), findsNothing);
+
+      await tester.tap(find.text('bar'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('bar content'), findsOneWidget);
+    });
+
+    testWidgets('using external controller and tapping on tab switches tab entry', (tester) async {
+      final controller = FTabController(length: 2, vsync: tester);
+
+      await tester.pumpWidget(
+        MaterialApp(
+          home: TestScaffold(
+            data: FThemes.zinc.light,
+            child: FTabs(
+              controller: controller,
+              tabs: const [
+                FTabEntry(label: Text('foo'), content: Text('foo content')),
+                FTabEntry(label: Text('bar'), content: Text('bar content')),
+              ],
+            ),
+          ),
+        ),
+      );
+
+      expect(find.text('bar content'), findsNothing);
+
+      await tester.tap(find.text('bar'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('bar content'), findsOneWidget);
+    });
   });
 }