fix(react): fix dropdown disabled state not closing upstream

p3ol · Sep 29, 2022 · 2b18843 · 2b18843
1 parent 26c7743
commit 2b18843
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/react/lib/Dropdown/index.js b/packages/react/lib/Dropdown/index.js
@@ -43,10 +43,7 @@ const Dropdown = forwardRef(({
   });
   const { x, y, reference, floating, strategy, context } = useFloating({
     open: state.opened,
-    onOpenChange: o => {
-      dispatch({ opened: o });
-      onToggle?.({ opened: o });
-    },
+    onOpenChange: (...args) => onOpenChange(...args),
     placement,
     strategy: 'fixed',
     whileElementsMounted: autoUpdate,
@@ -88,6 +85,15 @@ const Dropdown = forwardRef(({
     innerRef,
   }));
 
+  const onOpenChange = o => {
+    if (disabled && o) {
+      return;
+    }
+
+    dispatch({ opened: o });
+    onToggle?.({ opened: o });
+  };
+
   const toggle = () => {
     if (disabled) {
       return;