From 54dd00689cafd922d1c423ea90994b1822a543e2 Mon Sep 17 00:00:00 2001
From: Cassandra <cassandra.tam@cultureamp.com>
Date: Wed, 2 Oct 2024 14:04:14 +1000
Subject: [PATCH] fix(future/Select): stop propagation on touch devices (#5113)

---
 .changeset/nasty-toys-raise.md                |  5 ++
 .../Select/_docs/Select.stories.tsx           | 47 +++++++++++++++++++
 .../Select/subcomponents/Option/Option.tsx    | 19 ++++++--
 3 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/nasty-toys-raise.md

diff --git a/.changeset/nasty-toys-raise.md b/.changeset/nasty-toys-raise.md
new file mode 100644
index 00000000000..f5de304e8ff
--- /dev/null
+++ b/.changeset/nasty-toys-raise.md
@@ -0,0 +1,5 @@
+---
+"@kaizen/components": patch
+---
+
+Future Select - stop propagation when selecting an option using a touch device.
diff --git a/packages/components/src/__future__/Select/_docs/Select.stories.tsx b/packages/components/src/__future__/Select/_docs/Select.stories.tsx
index 135e6280291..45dcb170b58 100644
--- a/packages/components/src/__future__/Select/_docs/Select.stories.tsx
+++ b/packages/components/src/__future__/Select/_docs/Select.stories.tsx
@@ -1,5 +1,6 @@
 import React from "react"
 import { Meta, StoryObj } from "@storybook/react"
+import { RadioField, RadioGroup } from "~components/Radio"
 import { Select } from "../Select"
 import { SelectOption } from "../types"
 import {
@@ -26,6 +27,10 @@ const meta = {
   args: {
     label: "Label",
     items: singleMockItems,
+    onFocus: undefined,
+    onFocusChange: undefined,
+    onOpenChange: undefined,
+    onSelectionChange: undefined,
   },
   parameters: {
     actions: {
@@ -190,3 +195,45 @@ export const PortalContainer: Story = {
   },
   parameters: { docs: { source: { type: "code" } } },
 }
+
+export const TouchDeviceTest: Story = {
+  name: "Touch Device Pointer Event (Manual Test)",
+  render: args => {
+    const [selected, setSelected] = React.useState("radio-1")
+    return (
+      <div>
+        <p>
+          On touch devices, the radios below were changing when selecting an
+          option sitting above it.
+          <br />
+          At this time, we could not automate this test, so this story exists
+          for manual testing.
+        </p>
+        <Select {...args} />
+        <RadioGroup labelText="Radio group">
+          <RadioField
+            labelText="Label 1"
+            name="radio-group"
+            value="radio-value-1"
+            onChange={() => setSelected("radio-1")}
+            selectedStatus={selected === "radio-1"}
+          />
+          <RadioField
+            labelText="Label 2"
+            name="radio-group"
+            value="radio-value-2"
+            onChange={() => setSelected("radio-2")}
+            selectedStatus={selected === "radio-2"}
+          />
+          <RadioField
+            labelText="Label 3"
+            name="radio-group"
+            value="radio-value-3"
+            onChange={() => setSelected("radio-3")}
+            selectedStatus={selected === "radio-3"}
+          />
+        </RadioGroup>
+      </div>
+    )
+  },
+}
diff --git a/packages/components/src/__future__/Select/subcomponents/Option/Option.tsx b/packages/components/src/__future__/Select/subcomponents/Option/Option.tsx
index bee37d2ff45..1fb6ea283f0 100644
--- a/packages/components/src/__future__/Select/subcomponents/Option/Option.tsx
+++ b/packages/components/src/__future__/Select/subcomponents/Option/Option.tsx
@@ -1,8 +1,7 @@
 import React, { HTMLAttributes } from "react"
-import { useFocusRing } from "@react-aria/focus"
-import { useOption } from "@react-aria/listbox"
-import { mergeProps } from "@react-aria/utils"
+import { FocusableElement } from "@react-types/shared"
 import classnames from "classnames"
+import { mergeProps, useFocusRing, useOption } from "react-aria"
 import { CheckIcon } from "~components/Icon"
 import { OverrideClassName } from "~components/types/OverrideClassName"
 import { useSelectContext } from "../../context"
@@ -26,11 +25,23 @@ export const Option = <Option extends SelectOption = SelectOption>({
     ref
   )
 
+  const { onPointerUp, ...restOptionProps } = optionProps
+
   const { isFocusVisible, focusProps } = useFocusRing()
 
   return (
     <li
-      {...mergeProps(optionProps, focusProps, props)}
+      {...mergeProps(restOptionProps, focusProps, props, {
+        onPointerUp: (e: React.PointerEvent<FocusableElement>) => {
+          if (e.pointerType === "touch") {
+            // On touch devices, the listbox closes too quickly so below elements will trigger their pointer events.
+            // Slow it down a bit to prevent the appearance of propagation.
+            setTimeout(() => state.setSelectedKey(item.key), 250)
+          } else {
+            onPointerUp?.(e)
+          }
+        },
+      })}
       ref={ref}
       className={classnames(
         styles.option,