From c64075acbe80984b912229af486b85120aa013bf Mon Sep 17 00:00:00 2001
From: Eric Liu <ericyl.us@gmail.com>
Date: Wed, 20 Oct 2021 10:02:10 -0700
Subject: [PATCH] fix(data-table): include border style for non-expandable rows
 (#864)

* fix(data-table): include border style for non-expandable rows

Fixes #861

* docs(data-table): use batchExpansion for non-expandable rows example [ci skip]
---
 .../pages/framed/DataTable/DataTableNonExpandableRows.svelte   | 2 +-
 src/DataTable/DataTable.svelte                                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte b/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte
index 4a1a4bf9..ff08ef97 100644
--- a/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte
+++ b/docs/src/pages/framed/DataTable/DataTableNonExpandableRows.svelte
@@ -48,7 +48,7 @@
 </script>
 
 <DataTable
-  expandable
+  batchExpansion
   nonExpandableRowIds="{rows
     .filter((row) => row.port < 3000)
     .map((row) => row.id)}"
diff --git a/src/DataTable/DataTable.svelte b/src/DataTable/DataTable.svelte
index 7b932b67..856192ad 100644
--- a/src/DataTable/DataTable.svelte
+++ b/src/DataTable/DataTable.svelte
@@ -345,7 +345,8 @@
             <TableCell
               class="bx--table-expand"
               headers="expand"
-              data-previous-value="{expandedRows[row.id]
+              data-previous-value="{!nonExpandableRowIds.includes(row.id) &&
+              expandedRows[row.id]
                 ? 'collapsed'
                 : undefined}"
             >