From 5619b06cc4f3329f43cc3cce694837ed29ffdb90 Mon Sep 17 00:00:00 2001
From: Neeraj Walia <nwalia.ez@gmail.com>
Date: Wed, 23 Aug 2023 00:48:34 +0530
Subject: [PATCH] Fix Tab accessibility issues with popup modals

---
 packages/ui/src/components/Checkbox/Checkbox.tsx |  6 +++++-
 packages/ui/src/components/Input/Input.tsx       | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/components/Checkbox/Checkbox.tsx b/packages/ui/src/components/Checkbox/Checkbox.tsx
index 0f325e4a18a..396ffa8a22f 100644
--- a/packages/ui/src/components/Checkbox/Checkbox.tsx
+++ b/packages/ui/src/components/Checkbox/Checkbox.tsx
@@ -159,7 +159,11 @@ export function Checkbox({
         if (values && checked === undefined) active = values[id || name]
 
         function handleBlurEvent(e: React.FocusEvent<HTMLInputElement>) {
-          if (handleBlur) handleBlur(e)
+          if (handleBlur) {
+            setTimeout(() => {
+              handleBlur(e)
+            }, 100)
+          }
           if (onBlur) onBlur(e)
         }
 
diff --git a/packages/ui/src/components/Input/Input.tsx b/packages/ui/src/components/Input/Input.tsx
index b570a71c1ff..031fbfda561 100644
--- a/packages/ui/src/components/Input/Input.tsx
+++ b/packages/ui/src/components/Input/Input.tsx
@@ -81,7 +81,11 @@ function Input({
   if (values && !value) value = values[id || name]
 
   function handleBlurEvent(e: React.FocusEvent<HTMLInputElement>) {
-    if (handleBlur) handleBlur(e)
+    if (handleBlur) {
+      setTimeout(() => {
+        handleBlur(e)
+      }, 100)
+    }
     if (onBlur) onBlur(e)
   }
 
@@ -267,7 +271,11 @@ function TextArea({
   if (values && !value) value = values[id || name]
 
   function handleBlurEvent(e: React.FocusEvent<HTMLTextAreaElement>) {
-    if (handleBlur) handleBlur(e)
+    if (handleBlur) {
+      setTimeout(() => {
+        handleBlur(e)
+      }, 100)
+    }
     if (onBlur) onBlur(e)
   }