From 6ff0b21012d9d1d0e101277d1dce0f44141dfa15 Mon Sep 17 00:00:00 2001
From: AnnMarueW <amward@fastmail.com>
Date: Mon, 14 Oct 2024 16:44:41 -0700
Subject: [PATCH] fixed deselected - really this time

---
 src/ts/components/core/chip/Chip.tsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/ts/components/core/chip/Chip.tsx b/src/ts/components/core/chip/Chip.tsx
index fc21444..6e2fd4b 100644
--- a/src/ts/components/core/chip/Chip.tsx
+++ b/src/ts/components/core/chip/Chip.tsx
@@ -54,22 +54,24 @@ const Chip = (props: Props) => {
         ...others
     } = props;
 
-    const onChange = (checked: boolean) => {
-        setProps({ checked });
-    };
+    // Fetch ChipGroupContext and check if the chip is part of a group
+    const chipGroupContext = React.useContext(ChipGroupContext);
+    const hasChipGroup = !!chipGroupContext;
 
-    const { chipOnClick } = React.useContext(ChipGroupContext) || {};
+    // Change handler
+    const onChange = (checked: boolean) => setProps({ checked });
 
-    console.log("chipOnClick", chipOnClick)
+    // Build eventProps conditionally
+    const eventProps = hasChipGroup
+        ? { onClick: chipGroupContext?.chipOnClick }
+        : { checked, onChange };
 
     return (
         <MantineChip
-            checked={chipOnClick ? undefined : checked}
-            onChange={onChange}
-            onClick={chipOnClick}
             data-dash-is-loading={
                 (loading_state && loading_state.is_loading) || undefined
             }
+            {...eventProps}  // Spread eventProps (onClick or checked/onChange)
             {...others}
         >
             {children}