ThemedTable2 issues on search field fixed

Author: PHKenny

CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
+## 7.4.6
+
+- Fixed an issue with the `ThemedTable2` where the filtering was not working correctly after the last changes.
+- Changed behavior on `dispose()` on `ThemedTextInput` to only dispose the internal controller and focus node when they are not provided externally.
+
 ## 7.4.5
+
 - Added `initialPosition` and `onTabIndex` in `ThemedTabView` 
+
 ## 7.4.4
+
 - Solved extremely weird bug using the `ThemedTable2`, now creates a copy of the items list to prevent issues when filtering and sorting the data. (Discovered by @ManuelRomeroA)
 
 ## 7.4.3

example/pubspec.lock

@@ -374,7 +374,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "7.4.4"
+    version: "7.4.6"
   leak_tracker:
     dependency: transitive
     description:

lib/src/inputs/src/general/text_input.dart

@@ -201,8 +201,8 @@ class _ThemedTextInputState extends State<ThemedTextInput> with TickerProviderSt
   @override
   void dispose() {
     _entry?.remove();
-    _controller.dispose();
-    _focusNode.dispose();
+    if (widget.controller == null) _controller.dispose();
+    if (widget.focusNode == null) _focusNode.dispose();
     _animationController.dispose();
     super.dispose();
   }

lib/src/table2/src/table.dart

@@ -153,8 +153,8 @@ class _ThemedTable2State<T> extends State<ThemedTable2<T>> {
   /// [_sortIconSize] is the size of the sort icon
   double get _sortIconSize => 16;
 
-  /// [_search] holds the current search query used to filter items.
-  String _search = '';
+  /// [_searchController] holds the current search query used to filter items.
+  final TextEditingController _searchController = TextEditingController();
 
   /// [_filteredData] holds the filtered and sorted data currently displayed in the table.
   final ValueNotifier<List<T>> _filteredData = ValueNotifier<List<T>>([]);
@@ -225,6 +225,7 @@ class _ThemedTable2State<T> extends State<ThemedTable2<T>> {
   void dispose() {
     _isLoading.dispose();
     _filteredData.dispose();
+    _searchController.dispose();
 
     _debounce?.cancel();
 
@@ -312,10 +313,13 @@ class _ThemedTable2State<T> extends State<ThemedTable2<T>> {
                 if (widget.canSearch) ...[
                   SizedBox(
                     width: double.infinity,
-                    child: ThemedSearchInput(
-                      value: _search,
-                      onSearch: _onSearchChanged,
-                      asField: true,
+                    child: ThemedTextInput(
+                      labelText: LayrzAppLocalizations.maybeOf(context)?.t('actions.search') ?? 'Search...',
+                      prefixIcon: LayrzIcons.solarOutlineMagnifier,
+                      padding: EdgeInsets.zero,
+                      controller: _searchController,
+                      onChanged: _onSearchChanged,
+                      dense: true,
                     ),
                   ),
                   const SizedBox(height: 8),
@@ -728,44 +732,50 @@ class _ThemedTable2State<T> extends State<ThemedTable2<T>> {
   }
 
   void _filterAndSort(String source) async {
-    List<T> items = List<T>.from(widget.items, growable: true);
-    if (widget.items.isEmpty) return;
-
-    debugPrint("layrz_theme/ThemedTable2: Precomputing data from $source...");
-    _itemsStrings = {};
-    for (final item in widget.items) {
-      int rowHashCode = item.hashCode;
-      _itemsStrings[rowHashCode] = {};
-
-      for (final col in widget.columns) {
-        final colHashCode = col.hashCode;
-        _itemsStrings[rowHashCode]![colHashCode] = col.valueBuilder(item);
+    try {
+      List<T> items = List<T>.from(widget.items, growable: true);
+      if (widget.items.isEmpty) return;
+
+      debugPrint("layrz_theme/ThemedTable2: Precomputing data from $source...");
+      _itemsStrings = {};
+      for (final item in widget.items) {
+        int rowHashCode = item.hashCode;
+        _itemsStrings[rowHashCode] = {};
+
+        for (final col in widget.columns) {
+          final colHashCode = col.hashCode;
+          _itemsStrings[rowHashCode]![colHashCode] = col.valueBuilder(item);
+        }
       }
-    }
 
-    if (_search.isNotEmpty) {
-      debugPrint("layrz_theme/ThemedTable2: Filtering data...");
-      final searchLower = _search.toLowerCase();
-      items = items.where((row) {
-        final rowHashCode = row.hashCode;
-        final cols = _itemsStrings[rowHashCode];
-        if (cols == null) return false;
-        for (final entry in cols.entries) {
-          if (entry.value.toLowerCase().contains(searchLower)) return true;
-        }
-        return false;
-      }).toList();
-    }
+      debugPrint("layrz_theme/ThemedTable2: Filtering data from $source - ${_searchController.text}...");
+      if (_searchController.text.isNotEmpty) {
+        debugPrint("layrz_theme/ThemedTable2: Filtering data...");
+        final searchLower = _searchController.text.toLowerCase();
+        items = items.where((row) {
+          final rowHashCode = row.hashCode;
+          final cols = _itemsStrings[rowHashCode];
+          if (cols == null) return false;
+          for (final entry in cols.entries) {
+            if (entry.value.toLowerCase().contains(searchLower)) return true;
+          }
+          return false;
+        }).toList();
+      }
 
-    debugPrint("layrz_theme/ThemedTable2: Sorting data...");
-    items.sort(colSelected.customSort ?? _defaultSort);
-    _filteredData.value = items;
+      debugPrint("layrz_theme/ThemedTable2: Sorting data...");
+      items.sort(colSelected.customSort ?? _defaultSort);
+      _filteredData.value = items;
+    } finally {
+      debugPrint("layrz_theme/ThemedTable2: Finished filtering and sorting from $source, removing debouncer...");
+      _debounce?.cancel();
+      _debounce = null;
+      if (mounted) WidgetsBinding.instance.addPostFrameCallback((_) => setState(() {}));
+    }
   }
 
   void _onSearchChanged(String value) {
-    if (_debounce?.isActive ?? false) _debounce!.cancel();
     _debounce = Timer(const Duration(milliseconds: 300), () {
-      _search = value;
       _filterAndSort('SEARCH');
     });
     WidgetsBinding.instance.addPostFrameCallback((_) {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: layrz_theme
 description: Layrz standard styling library for Flutter. Widget library following the Material Design 3 guidelines, with a focus on reliavility and functionality.
-version: "7.4.5"
+version: "7.4.6"
 homepage: https://theme.layrz.com
 repository: https://github.com/goldenm-software/layrz_theme