Merge remote-tracking branch 'upstream/main' into feat/slug-tile-updates

ariellalgilmore · Jan 31, 2024 · de1024c · de1024c
2 parents fd8ddd9 + 944a69a
commit de1024c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/carbon-web-components/src/components/data-table/table.ts b/packages/carbon-web-components/src/components/data-table/table.ts
@@ -236,10 +236,16 @@ class CDSTable extends HostListenerMixin(LitElement) {
   private _handleFilterRows() {
     const unfilteredRows = [] as any;
     forEach(this._tableRows, (elem) => {
-      const rowText = elem.textContent?.trim();
-      const filtered = this.filterRows(rowText as string, this._searchValue);
+      let rowText = elem.textContent?.trim();
+      let filtered = this.filterRows(rowText as string, this._searchValue);
       (elem as any).filtered = filtered;
 
+      if (filtered && this.expandable) {
+        rowText = (elem as any).nextElementSibling.textContent?.trim();
+        filtered = this.filterRows(rowText as string, this._searchValue);
+        (elem as any).filtered = filtered;
+      }
+
       if (!filtered) {
         unfilteredRows.push(elem);
       }