fix(react-grid): fix incorrect filter operation updating (#1270)

fixes #1269
DevExpress · Jul 27, 2018 · ed9fa16 · ed9fa16
1 parent e40908e
commit ed9fa16
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/packages/dx-react-grid-bootstrap3/src/templates/filter-row/filter-selector.jsx b/packages/dx-react-grid-bootstrap3/src/templates/filter-row/filter-selector.jsx
@@ -6,22 +6,18 @@ import { Overlay } from '../parts/overlay';
 export class FilterSelector extends React.PureComponent {
   constructor(props) {
     super(props);
-    const getOpenedState = () => {
-      const { opened } = this.state;
-      return opened;
-    };
-    const { onChange } = this.props;
 
     this.state = { opened: false };
 
     this.handleButtonClick = () => {
-      this.setState({ opened: !getOpenedState() });
+      this.setState(prevState => ({ opened: !prevState.opened }));
     };
     this.handleOverlayHide = () => {
       this.setState({ opened: false });
     };
     this.handleMenuItemClick = (nextValue) => {
       this.setState({ opened: false });
+      const { onChange } = this.props;
       onChange(nextValue);
     };
   }

diff --git a/packages/dx-react-grid-bootstrap4/src/templates/filter-row/filter-selector.jsx b/packages/dx-react-grid-bootstrap4/src/templates/filter-row/filter-selector.jsx
@@ -6,21 +6,18 @@ import classNames from 'classnames';
 export class FilterSelector extends React.PureComponent {
   constructor(props) {
     super(props);
-    const getStateOpened = () => {
-      const { opened } = this.state;
-      return opened;
-    };
-    const { onChange } = this.props;
 
     this.state = { opened: false };
 
     this.handleButtonClick = () => {
-      this.setState({ opened: !getStateOpened() });
+      this.setState(prevState => ({ opened: !prevState.opened }));
     };
     this.handleOverlayToggle = () => {
-      if (getStateOpened()) this.setState({ opened: false });
+      const { opened } = this.state;
+      if (opened) this.setState({ opened: false });
     };
     this.handleMenuItemClick = (nextValue) => {
+      const { onChange } = this.props;
       this.setState({ opened: false });
       onChange(nextValue);
     };

diff --git a/packages/dx-react-grid-material-ui/src/templates/filter-row/filter-selector.jsx b/packages/dx-react-grid-material-ui/src/templates/filter-row/filter-selector.jsx
@@ -16,7 +16,6 @@ const styles = ({ spacing }) => ({
 class FilterSelectorBase extends React.PureComponent {
   constructor(props) {
     super(props);
-    const { onChange } = this.props;
 
     this.state = { anchorEl: null };
 
@@ -27,6 +26,7 @@ class FilterSelectorBase extends React.PureComponent {
       this.setState({ anchorEl: null });
     };
     this.handleMenuItemClick = (nextValue) => {
+      const { onChange } = this.props;
       this.setState({ anchorEl: null });
       onChange(nextValue);
     };