@homebound/beam 2.146.2 → 2.147.0

package/dist/components/Table/GridTable.js

@@ -802,9 +802,13 @@ function resolveStyles(style) {
  * We return a copy of `[Parent, [Child]]` tuples so that we don't modify the `GridDataRow.children`.
  */
 function filterRows(api, columns, rows, filter) {
-    // Make a function to do recursion
-    function filterFn(acc, row) {
+    // Make a functions to do recursion
+    function acceptAll(acc, row) {
         var _a, _b;
+        return acc.concat([[row, (_b = (_a = row.children) === null || _a === void 0 ? void 0 : _a.reduce(acceptAll, [])) !== null && _b !== void 0 ? _b : []]]);
+    }
+    function filterFn(acc, row) {
+        var _a, _b, _c, _d;
         // Break up "foo bar" into `[foo, bar]` and a row must match both `foo` and `bar`
         const filters = (filter && filter.split(/ +/)) || [];
         const matches = row.kind === "header" ||
@@ -812,15 +816,18 @@ function filterRows(api, columns, rows, filter) {
             filters.length === 0 ||
             !!row.pin ||
             filters.every((f) => columns.map((c) => applyRowFn(c, row, api, 0)).some((maybeContent) => matchesFilter(maybeContent, f)));
-        const matchedChildren = (_b = (_a = row.children) === null || _a === void 0 ? void 0 : _a.reduce(filterFn, [])) !== null && _b !== void 0 ? _b : [];
-        // If row or any children match, add the parent (and its matched children)
-        if (matches || matchedChildren.length > 0) {
-            return acc.concat([[row, matchedChildren]]);
+        if (matches) {
+            return acc.concat([[row, (_b = (_a = row.children) === null || _a === void 0 ? void 0 : _a.reduce(acceptAll, [])) !== null && _b !== void 0 ? _b : []]]);
         }
         else {
-            return acc;
+            const matchedChildren = (_d = (_c = row.children) === null || _c === void 0 ? void 0 : _c.reduce(filterFn, [])) !== null && _d !== void 0 ? _d : [];
+            if (matchedChildren.length > 0) {
+                return acc.concat([[row, matchedChildren]]);
+            }
+            else {
+                return acc;
+            }
         }
     }
-    ;
     return rows.reduce(filterFn, []);
 }

package/dist/components/Table/sortRows.js

@@ -25,9 +25,9 @@ function sortBatch(columns, batch, sortState, caseSensitive) {
         const v2 = sortValue((0, GridTable_1.applyRowFn)(column, b, {}, 0), caseSensitive);
         const v1e = v1 === null || v1 === undefined;
         const v2e = v2 === null || v2 === undefined;
-        if (a.pin || b.pin) {
+        if ((a.pin || b.pin) && !(a.pin === b.pin)) {
             const ap = a.pin === "first" ? -1 : a.pin === "last" ? 1 : 0;
-            const bp = b.pin === "first" ? -1 : a.pin === "last" ? 1 : 0;
+            const bp = b.pin === "first" ? -1 : b.pin === "last" ? 1 : 0;
             return ap === bp ? 0 : ap < bp ? -1 : 1;
         }
         else if ((v1e && v2e) || v1 === v2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebound/beam",
-  "version": "2.146.2",
+  "version": "2.147.0",
   "author": "Homebound",
   "license": "MIT",
   "main": "dist/index.js",