feat(all): fixed rows in filtered results (#13684)

* feat(android): fixed rows in filtered results * android listview * ios tableview * listview ios * chore: update docs --------- Co-authored-by: Hans Knöchel <hansemannn@users.noreply.github.com>
tidev · May 3, 2023 · bb23609 · bb23609
1 parent bfa2bc5
commit bb23609
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/listview/TiListView.java
@@ -689,8 +689,10 @@ public void update(boolean force)
 			int filteredIndex = 0;
 			for (final ListItemProxy item : sectionItems) {
 
+				boolean alwaysInclude = item.getProperties()
+					.optBoolean(TiC.PROPERTY_FILTER_ALWAYS_INCLUDE, false);
 				// Handle search query.
-				if (query != null) {
+				if (query != null && !alwaysInclude) {
 					String searchableText = item.getProperties().optString(TiC.PROPERTY_SEARCHABLE_TEXT, null);
 					if (searchableText != null) {
 						if (caseInsensitive) {

diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tableview/TiTableView.java
@@ -671,9 +671,11 @@ public void update(boolean force)
 
 					// Maintain true row index.
 					row.index = index++;
+					boolean alwaysInclude = row.getProperties()
+						.optBoolean(TiC.PROPERTY_FILTER_ALWAYS_INCLUDE, false);
 
 					// Handle search query.
-					if (query != null) {
+					if (query != null && !alwaysInclude) {
 						String attribute = row.getProperties().optString(filterAttribute, null);
 
 						if (attribute != null) {

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -432,6 +432,7 @@ public class TiC
 	public static final String PROPERTY_FILTER_ANCHORED = "filterAnchored";
 	public static final String PROPERTY_FILTER_CASE_INSENSITIVE = "filterCaseInsensitive";
 	public static final String PROPERTY_FILTER_TOUCHES_WHEN_OBSCURED = "filterTouchesWhenObscured";
+	public static final String PROPERTY_FILTER_ALWAYS_INCLUDE = "filterAlwaysInclude";
 	public static final String PROPERTY_FIRSTNAME = "firstName";
 	public static final String PROPERTY_FIRST_VISIBLE_ITEM = "firstVisibleItem";
 	public static final String PROPERTY_FIRST_VISIBLE_ITEM_INDEX = "firstVisibleItemIndex";

diff --git a/apidoc/Titanium/UI/TableViewRow.yml b/apidoc/Titanium/UI/TableViewRow.yml
@@ -226,6 +226,14 @@ properties:
     platforms: [android, iphone, ipad, macos]
     since: {android: "9.3.0", iphone: "3.2.0", ipad: "3.2.0", macos: "9.2.0"}
 
+  - name: filterAlwaysInclude
+    summary: |
+      This row will always be visible when you filter your content.
+    type: Boolean
+    default: false
+    platforms: [android, iphone, ipad, macos]
+    since: "12.2.0"
+
   - name: font
     summary: Font to use for the row title.
     type: Font

diff --git a/iphone/Classes/TiUIListView.m b/iphone/Classes/TiUIListView.m
@@ -508,7 +508,8 @@ - (void)buildResultsForSearchText
       for (int j = 0; j < maxItems; j++) {
         NSIndexPath *thePath = [NSIndexPath indexPathForRow:j inSection:i];
         id theValue = [self valueWithKey:@"searchableText" atIndexPath:thePath];
-        if (theValue != nil && [[TiUtils stringValue:theValue] rangeOfString:self.searchString options:searchOpts].location != NSNotFound) {
+        BOOL alwaysInclude = [TiUtils boolValue:[self valueWithKey:@"filterAlwaysInclude" atIndexPath:thePath] def:NO];
+        if (alwaysInclude || (theValue != nil && [[TiUtils stringValue:theValue] rangeOfString:self.searchString options:searchOpts].location != NSNotFound)) {
           (thisSection != nil) ? [thisSection addObject:thePath] : [singleSection addObject:thePath];
           hasResults = YES;
         }

diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -1357,7 +1357,8 @@ - (void)updateSearchResultIndexes
     int cellIndex = 0;
     for (TiUITableViewRowProxy *row in [thisSection rows]) {
       id value = [row valueForKey:ourSearchAttribute];
-      if (value != nil && [[TiUtils stringValue:value] rangeOfString:searchString options:searchOpts].location != NSNotFound) {
+      BOOL alwaysInclude = [TiUtils boolValue:[row valueForKey:@"filterAlwaysInclude"] def:NO];
+      if (alwaysInclude || (value != nil && [[TiUtils stringValue:value] rangeOfString:searchString options:searchOpts].location != NSNotFound)) {
         [thisIndexSet addIndex:cellIndex];
       }
       cellIndex++;