fix(selectable): use latest state in onChange (#4292)

elastic · Nov 24, 2020 · 1fdfca2 · 1fdfca2
1 parent d5f5d6f
commit 1fdfca2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 **Bug fixes**
 
+- Fixed stale state argument passed to `searchProps.onChange` in an `EuiSelectable`([#4292](https://github.com/elastic/eui/pull/4292))
 - Fixed initial focus of an `EuiButtonGroup` when first item in a popover ([#4288](https://github.com/elastic/eui/pull/4288))
 
 **Theme: Amsterdam**

diff --git a/src/components/selectable/selectable.tsx b/src/components/selectable/selectable.tsx
@@ -349,18 +349,17 @@ export class EuiSelectable<T = {}> extends Component<
   };
 
   onOptionClick = (options: Array<EuiSelectableOption<T>>) => {
-    this.setState((state) => ({
-      visibleOptions: getMatchingOptions<T>(options, state.searchValue),
-      activeOptionIndex: this.state.activeOptionIndex,
-    }));
+    const { searchValue } = this.state;
+    const visibleOptions = getMatchingOptions<T>(options, searchValue);
+
+    this.setState({ visibleOptions });
+
     if (this.props.onChange) {
       this.props.onChange(options);
     }
+
     if (this.props.searchProps && this.props.searchProps.onChange) {
-      this.props.searchProps.onChange(
-        { ...this.state.visibleOptions },
-        this.state.searchValue
-      );
+      this.props.searchProps.onChange(visibleOptions, searchValue);
     }
   };