Manage outsideclick event on FiltersNotFrequent component #1387

metasfresh · Jan 17, 2018 · 438470f · 438470f
1 parent 6a2695e
commit 438470f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/actions/ViewActions.js b/src/actions/ViewActions.js
@@ -93,7 +93,6 @@ export function filterViewRequest(windowId, viewId, filters) {
       }
     });
   });
-  console.log(filters);
   return axios.post(
     config.API_URL + "/documentView/" + windowId + "/" + viewId + "/filter",
     {

diff --git a/src/components/filters/FiltersFrequent.js b/src/components/filters/FiltersFrequent.js
@@ -33,7 +33,7 @@ class FiltersFrequent extends Component {
     const { widgetShown, dropdownToggled } = this.props;
     const { allowOutsideClickListener } = this.state;
     if (allowOutsideClickListener) {
-      !widgetShown && this.toggleFilter(null, null);
+      !widgetShown && this.toggleFilter(null);
       dropdownToggled();
     }
   };

diff --git a/src/components/filters/FiltersNotFrequent.js b/src/components/filters/FiltersNotFrequent.js
@@ -12,7 +12,8 @@ class FiltersNotFrequent extends Component {
 
     this.state = {
       isOpenDropdown: false,
-      openFilterId: null
+      openFilterId: null,
+      allowOutsideClickListener: true
     };
   }
 
@@ -22,13 +23,18 @@ class FiltersNotFrequent extends Component {
 
   outsideClick = () => {
     const { widgetShown, dropdownToggled } = this.props;
-    if (!widgetShown) {
+    const { allowOutsideClickListener } = this.state;
+    if (allowOutsideClickListener && !widgetShown) {
       dropdownToggled();
       this.toggleDropdown(false);
       this.toggleFilter(null);
     }
   };
 
+  allowOutsideClickListener = value => {
+    this.setState({ allowOutsideClickListener: value });
+  };
+
   toggleDropdown = value => {
     this.setState({
       isOpenDropdown: value
@@ -119,6 +125,7 @@ class FiltersNotFrequent extends Component {
                 onHide={() => handleShow(false)}
                 viewId={viewId}
                 outsideClick={this.outsideClick}
+                allowOutsideClickListener={this.allowOutsideClickListener}
               />
             )}
           </div>