From b3b5a024aa029995dca291a1d3b07bc677bf454f Mon Sep 17 00:00:00 2001
From: TJ Egan <tw15egan@gmail.com>
Date: Thu, 28 Jan 2021 11:26:28 -0800
Subject: [PATCH] fix(TableSelectAll): prevent selection of items that do not
 match filter (#7645)

* fix(TableSelectAll): prevent selection of items that do not match filter

* fix(TableBatchActions): use plural when selection equals 0

* chore(snapshot): update snapshots
---
 packages/react/src/components/DataTable/DataTable.js          | 2 +-
 packages/react/src/components/DataTable/TableBatchActions.js  | 2 +-
 .../DataTable/__tests__/__snapshots__/DataTable-test.js.snap  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react/src/components/DataTable/DataTable.js b/packages/react/src/components/DataTable/DataTable.js
index 17d1c59911f9..409652c153f5 100644
--- a/packages/react/src/components/DataTable/DataTable.js
+++ b/packages/react/src/components/DataTable/DataTable.js
@@ -444,7 +444,7 @@ export default class DataTable extends React.Component {
           })
         : this.state.rowIds;
     if (filteredRowIds.length == 0) {
-      return this.state.rowIds;
+      return [];
     }
     return filteredRowIds;
   };
diff --git a/packages/react/src/components/DataTable/TableBatchActions.js b/packages/react/src/components/DataTable/TableBatchActions.js
index 5fcc52101697..566a06d3830b 100644
--- a/packages/react/src/components/DataTable/TableBatchActions.js
+++ b/packages/react/src/components/DataTable/TableBatchActions.js
@@ -49,7 +49,7 @@ const TableBatchActions = ({
       <div className={`${prefix}--batch-summary`}>
         <p className={`${prefix}--batch-summary__para`}>
           <span>
-            {totalSelected > 1
+            {totalSelected > 1 || totalSelected === 0
               ? t('carbon.table.batch.items.selected', { totalSelected })
               : t('carbon.table.batch.item.selected', { totalSelected })}
           </span>
diff --git a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
index ba93ede056b6..a6e53794944d 100644
--- a/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
+++ b/packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap
@@ -2025,7 +2025,7 @@ exports[`DataTable should render 1`] = `
                   className="bx--batch-summary__para"
                 >
                   <span>
-                    0 item selected
+                    0 items selected
                   </span>
                 </p>
               </div>
@@ -3030,7 +3030,7 @@ exports[`DataTable sticky header should render 1`] = `
                   className="bx--batch-summary__para"
                 >
                   <span>
-                    0 item selected
+                    0 items selected
                   </span>
                 </p>
               </div>