From a934dc9ee2ccbf69b1b394fc82f5adac7c133c55 Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Sat, 12 Mar 2022 19:28:17 -0800
Subject: [PATCH] feat(data-table): batchSelection should consider selectable
 rows

---
 src/DataTable/DataTable.svelte | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index b8ffb16b..7d0ae252 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -170,7 +170,6 @@
     {}
   );
 
-  $: selectAll = rows.length > 0 && selectedRowIds.length === rows.length;
   let refSelectAll = null;
 
   $: batchSelectedIds.set(selectedRowIds);
@@ -181,8 +180,12 @@
   $: selectableRowIds = rowIds.filter(
     (id) => !nonSelectableRowIds.includes(id)
   );
+  $: selectAll =
+    selectableRowIds.length > 0 &&
+    selectedRowIds.length === selectableRowIds.length;
   $: indeterminate =
-    selectedRowIds.length > 0 && selectedRowIds.length < rows.length;
+    selectedRowIds.length > 0 &&
+    selectedRowIds.length < selectableRowIds.length;
   $: if (batchExpansion) {
     expandable = true;
     expanded = expandedRowIds.length === expandableRowIds.length;