Use defaultPrevented instead of internal flag

JedWatson · Apr 4, 2022 · 150c020 · 150c020
1 parent 53cc8ce
commit 150c020
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.changeset/allow-event-bubbling-for-all-controls.md b/.changeset/allow-event-bubbling-for-all-controls.md
@@ -2,4 +2,4 @@
 'react-select': patch
 ---
 
-Use internal flag to prevent duplicate event handler for clicking select.
+Use defaultPrevented to skip duplicate event handler for clicking select.
diff --git a/packages/react-select/src/Select.tsx b/packages/react-select/src/Select.tsx
@@ -594,7 +594,6 @@ export default class Select<
   openAfterFocus = false;
   scrollToFocusedOptionOnUpdate = false;
   userIsDragging?: boolean;
-  dropdownEventAlreadyHandled = false;
 
   // Refs
   // ------------------------------
@@ -1158,8 +1157,7 @@ export default class Select<
     event: React.MouseEvent<HTMLDivElement> | React.TouchEvent<HTMLDivElement>
   ) => {
     // Event captured by dropdown indicator
-    if (this.dropdownEventAlreadyHandled) {
-      this.dropdownEventAlreadyHandled = false;
+    if (event.defaultPrevented) {
       return;
     }
     const { openMenuOnClick } = this.props;
@@ -1198,7 +1196,6 @@ export default class Select<
     ) {
       return;
     }
-    this.dropdownEventAlreadyHandled = true;
     if (this.props.isDisabled) return;
     const { isMulti, menuIsOpen } = this.props;
     this.focusInput();