From 84a1198ef2f7a9ea768f104e2670294bd97af54a Mon Sep 17 00:00:00 2001
From: Akira Sudoh <asudoh@gmail.com>
Date: Fri, 17 Apr 2020 07:51:21 +0900
Subject: [PATCH] fix(TableToolbarSearch): fix focus management (#5872)

This change checks if there was actual change in the expanded state of
`<TableToolbarSearch>`, to set the focus upon expanding.

Fixes #5852.
---
 packages/react/src/components/DataTable/TableToolbarSearch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/components/DataTable/TableToolbarSearch.js b/packages/react/src/components/DataTable/TableToolbarSearch.js
index c00a41593825..7de5b5e7da1f 100644
--- a/packages/react/src/components/DataTable/TableToolbarSearch.js
+++ b/packages/react/src/components/DataTable/TableToolbarSearch.js
@@ -80,7 +80,7 @@ const TableToolbarSearch = ({
   const handleExpand = (event, value = !expanded) => {
     if (!controlled && (!persistent || (!persistent && !persistant))) {
       setExpandedState(value);
-      if (value) {
+      if (value && !expanded) {
         setFocusTarget(searchRef);
       }
     }