[Chore] delete typeahead mousedown listener, pass onOptionSelected to…

… ListItem (#2319) Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com> Co-authored-by: Shan He <heshan0131@gmail.com>
keplergl · Sep 18, 2023 · cfada4d · cfada4d
1 parent 2714c75
commit cfada4d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/components/src/common/item-selector/dropdown-list.tsx b/src/components/src/common/item-selector/dropdown-list.tsx
@@ -218,10 +218,13 @@ export default class DropdownList extends Component<DropdownListProps, DropdownL
                   [classList.listItemFixed]: true
                 })}
                 key={`${display(value)}_${i}`}
-                onMouseDown={e => this._onClick(value, e)}
                 onClick={e => this._onClick(value, e)}
               >
-                <CustomListItemComponent value={value} displayOption={display} />
+                <CustomListItemComponent
+                  value={value}
+                  displayOption={display}
+                  onOptionSelected={this.props.onOptionSelected}
+                />
               </div>
             ))}
           </div>
@@ -233,10 +236,13 @@ export default class DropdownList extends Component<DropdownListProps, DropdownL
               hover: this.props.selectionIndex === i + valueOffset
             })}
             key={`${display(value)}_${i}`}
-            onMouseDown={e => this._onClick(value, e)}
             onClick={e => this._onClick(value, e)}
           >
-            <CustomListItemComponent value={value} displayOption={display} />
+            <CustomListItemComponent
+              value={value}
+              displayOption={display}
+              onOptionSelected={this.props.onOptionSelected}
+            />
           </div>
         ))}
 

diff --git a/src/components/src/common/item-selector/typeahead.tsx b/src/components/src/common/item-selector/typeahead.tsx
@@ -336,7 +336,7 @@ class Typeahead extends Component<TypeaheadProps, TypeaheadState> {
       });
     }
 
-    return this.props.onOptionSelected?.(option, event);
+    this.props.onOptionSelected?.(option, event);
   };
 
   // use () => {} to avoid binding 'this'
@@ -355,9 +355,9 @@ class Typeahead extends Component<TypeaheadProps, TypeaheadState> {
   _onEnter = event => {
     const selection = this.getSelection();
     if (!selection) {
-      return this.props.onKeyDown?.(event);
+      this.props.onKeyDown?.(event);
     }
-    return this._onOptionSelected(selection, event);
+    this._onOptionSelected(selection, event);
   };
 
   _onEscape = () => {