From 5ce1ff0e1e56cc19194892b791bb63edb24d1b0c Mon Sep 17 00:00:00 2001
From: Aaron Casanova <aaron.casanova@shopify.com>
Date: Thu, 28 Mar 2024 10:17:00 -0700
Subject: [PATCH 1/2] Revert Tooltip updates to close on enter/space key
 interactions

---
 .../src/components/Button/Button.stories.tsx  |  1 +
 .../src/components/Tooltip/Tooltip.tsx        | 18 ++---
 .../components/Tooltip/tests/Tooltip.test.tsx | 68 -------------------
 3 files changed, 5 insertions(+), 82 deletions(-)

diff --git a/polaris-react/src/components/Button/Button.stories.tsx b/polaris-react/src/components/Button/Button.stories.tsx
index 9718fc55030..b7d5b9097c0 100644
--- a/polaris-react/src/components/Button/Button.stories.tsx
+++ b/polaris-react/src/components/Button/Button.stories.tsx
@@ -854,6 +854,7 @@ export function CopyToClipboard() {
             hoverDelay={500}
             preferredPosition="above"
             content="Copy"
+            active={status === 'copied' ? false : undefined}
           >
             <Button
               variant="tertiary"
diff --git a/polaris-react/src/components/Tooltip/Tooltip.tsx b/polaris-react/src/components/Tooltip/Tooltip.tsx
index e2df522fa85..ab64dae2618 100644
--- a/polaris-react/src/components/Tooltip/Tooltip.tsx
+++ b/polaris-react/src/components/Tooltip/Tooltip.tsx
@@ -159,15 +159,10 @@ export function Tooltip({
 
   const handleKeyUp = useCallback(
     (event: React.KeyboardEvent) => {
-      const isChildInteraction =
-        event.target !== activatorContainer.current &&
-        (event.key === 'Enter' || event.key === ' ');
-
-      if (event.key === 'Escape' || isChildInteraction) {
-        handleClose?.();
-        handleBlur();
-        persistOnClick && togglePersisting();
-      }
+      if (event.key !== 'Escape') return;
+      handleClose?.();
+      handleBlur();
+      persistOnClick && togglePersisting();
     },
     [handleBlur, handleClose, persistOnClick, togglePersisting],
   );
@@ -214,11 +209,6 @@ export function Tooltip({
         handleFocus();
       }}
       onBlur={() => {
-        if (hoverDelayTimeout.current) {
-          clearTimeout(hoverDelayTimeout.current);
-          hoverDelayTimeout.current = null;
-        }
-
         handleClose();
         handleBlur();
 
diff --git a/polaris-react/src/components/Tooltip/tests/Tooltip.test.tsx b/polaris-react/src/components/Tooltip/tests/Tooltip.test.tsx
index 0514179ed83..b17a4202214 100644
--- a/polaris-react/src/components/Tooltip/tests/Tooltip.test.tsx
+++ b/polaris-react/src/components/Tooltip/tests/Tooltip.test.tsx
@@ -132,74 +132,6 @@ describe('<Tooltip />', () => {
     });
   });
 
-  it('does not close when enter is pressed on keyup of the activatorContainer', () => {
-    const tooltip = mountWithApp(
-      <Tooltip active content="This order has shipping labels.">
-        <div>Order #1001</div>
-      </Tooltip>,
-    );
-
-    findWrapperComponent(tooltip)!.trigger('onKeyUp', {
-      target: tooltip.domNode,
-      key: 'Enter',
-    });
-
-    expect(tooltip).toContainReactComponent(TooltipOverlay, {
-      active: true,
-    });
-  });
-
-  it('does not close when space is pressed on keyup of the activatorContainer', () => {
-    const tooltip = mountWithApp(
-      <Tooltip active content="This order has shipping labels.">
-        <div>Order #1001</div>
-      </Tooltip>,
-    );
-
-    findWrapperComponent(tooltip)!.trigger('onKeyUp', {
-      target: tooltip.domNode,
-      key: ' ',
-    });
-
-    expect(tooltip).toContainReactComponent(TooltipOverlay, {
-      active: true,
-    });
-  });
-
-  it('closes itself when enter is pressed on keyup of child elements', () => {
-    const tooltip = mountWithApp(
-      <Tooltip active content="This order has shipping labels.">
-        <button>Order #1001</button>
-      </Tooltip>,
-    );
-
-    findWrapperComponent(tooltip)!.trigger('onKeyUp', {
-      target: tooltip.find('button')!.domNode,
-      key: 'Enter',
-    });
-
-    expect(tooltip).toContainReactComponent(TooltipOverlay, {
-      active: false,
-    });
-  });
-
-  it('closes itself when space is pressed on keyup of child elements', () => {
-    const tooltip = mountWithApp(
-      <Tooltip active content="This order has shipping labels.">
-        <button>Order #1001</button>
-      </Tooltip>,
-    );
-
-    findWrapperComponent(tooltip)!.trigger('onKeyUp', {
-      target: tooltip.find('button')!.domNode,
-      key: ' ',
-    });
-
-    expect(tooltip).toContainReactComponent(TooltipOverlay, {
-      active: false,
-    });
-  });
-
   it('does not call onOpen when initially activated', () => {
     const openSpy = jest.fn();
     const tooltip = mountWithApp(

From 07b2fa2e3bb987eb8271a6cad0dedd3285c16186 Mon Sep 17 00:00:00 2001
From: Aaron Casanova <aaron.casanova@shopify.com>
Date: Thu, 28 Mar 2024 10:24:54 -0700
Subject: [PATCH 2/2] Update changeset entry

---
 .changeset/flat-eagles-press.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/flat-eagles-press.md b/.changeset/flat-eagles-press.md
index 63e79f89d5e..3b9818ea6fd 100644
--- a/.changeset/flat-eagles-press.md
+++ b/.changeset/flat-eagles-press.md
@@ -2,4 +2,4 @@
 '@shopify/polaris': minor
 ---
 
-Added `useCopyToClipboard` hook for building copy actions matching common actions guidelines. Updated `Tooltip` to dismiss on child enter/space key interactions.
+Added `useCopyToClipboard` hook for building copy actions matching common actions guidelines