fix: remove stopPropagation usages

nexxtway · Aug 3, 2020 · d71867d · d71867d
1 parent 9f52c7c
commit d71867d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/src/components/InternalDropdown/index.js b/src/components/InternalDropdown/index.js
@@ -228,17 +228,10 @@ const InternalDropdown = forwardRef((props, reference) => {
         return handleChange(rest);
     };
 
-    const handleTabKeyPressed = event => {
-        if (showCheckbox && event.target.tagName !== 'BUTTON') {
-            event.stopPropagation();
-        }
-    };
-
     const keyHandlerMap = {
         [UP_KEY]: handleKeyUpPressed,
         [DOWN_KEY]: handleKeyDownPressed,
         [ENTER_KEY]: handleKeyEnterPressed,
-        [TAB_KEY]: handleTabKeyPressed,
     };
 
     const handleKeyPressed = event => {

diff --git a/src/components/MultiSelect/index.js b/src/components/MultiSelect/index.js
@@ -104,9 +104,14 @@ const MultiSelect = React.forwardRef((props, ref) => {
     };
 
     const handleKeyDown = event => {
-        if ((event.keyCode === ESCAPE_KEY || event.keyCode === TAB_KEY) && isOpen) {
-            event.preventDefault();
-            closeAndFocusInput();
+        if (isOpen) {
+            if (
+                event.keyCode === ESCAPE_KEY ||
+                (event.keyCode === TAB_KEY && !(showCheckbox && event.target.tagName !== 'BUTTON'))
+            ) {
+                event.preventDefault();
+                closeAndFocusInput();
+            }
         }
         if (event.target !== comboboxRef.current) return;
         if (event.keyCode === ENTER_KEY || event.keyCode === SPACE_KEY) {
@@ -134,7 +139,6 @@ const MultiSelect = React.forwardRef((props, ref) => {
 
     const handleTriggerClick = event => {
         event.preventDefault();
-        event.stopPropagation();
         toggleDropdown();
     };
 

diff --git a/src/components/Option/index.js b/src/components/Option/index.js
@@ -58,7 +58,6 @@ class OptionItem extends Component {
         const { disabled, privateOnClick, label, name, icon, value, showCheckbox } = this.props;
         if (showCheckbox) {
             event.preventDefault();
-            event.stopPropagation();
         }
         if (disabled) {
             event.preventDefault();
@@ -79,7 +78,6 @@ class OptionItem extends Component {
     handleOnlyClick(event) {
         const { disabled, privateOnClick, label, name, icon, value } = this.props;
         event.preventDefault();
-        event.stopPropagation();
 
         if (disabled) {
             event.preventDefault();