From 7bafc7e0715035f7073a2596424a8d15ec5932e2 Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Thu, 8 Feb 2018 15:44:03 +0200
Subject: [PATCH] Clear features filter on reset all

Also add enableReinitialize and keepDirtyOnReinitialize props to the
form to enable filter clear without a destroy call to the form.
---
 src/components/SearchFiltersMobile/SearchFiltersMobile.js   | 2 +-
 .../SelectMultipleFilterMobile.js                           | 2 ++
 .../SelectMultipleFilterMobileForm.js                       | 6 +-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/SearchFiltersMobile/SearchFiltersMobile.js b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
index d224302a..54c5f6b6 100644
--- a/src/components/SearchFiltersMobile/SearchFiltersMobile.js
+++ b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
@@ -100,7 +100,7 @@ class SearchFiltersMobileComponent extends Component {
   resetAll(e) {
     const { urlQueryParams, history } = this.props;
 
-    const queryParams = omit(urlQueryParams, CATEGORY_URL_PARAM);
+    const queryParams = omit(urlQueryParams, [CATEGORY_URL_PARAM, FEATURES_URL_PARAM]);
     history.push(createResourceLocatorString('SearchPage', routeConfiguration(), {}, queryParams));
 
     // blur event target if event is passed
diff --git a/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobile.js b/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobile.js
index efc2db6d..d8d0ea92 100644
--- a/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobile.js
+++ b/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobile.js
@@ -43,6 +43,8 @@ const SelectMultipleFilterMobile = props => {
         initialValuesCount={initialValues.length}
         onChange={handleSelect}
         onClear={handleClear}
+        enableReinitialize={true}
+        keepDirtyOnReinitialize={true}
       />
     </div>
   );
diff --git a/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobileForm.js b/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobileForm.js
index fd36e9e4..315f6497 100644
--- a/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobileForm.js
+++ b/src/components/SelectMultipleFilterMobile/SelectMultipleFilterMobileForm.js
@@ -17,11 +17,7 @@ class SelectMultipleFilterMobileFormComponent extends Component {
   }
 
   handleClear() {
-    const { destroy, onClear } = this.props;
-    // destroy redux form state so that initial values passed
-    // to the form are also cleared
-    destroy();
-    onClear();
+    this.props.onClear();
   }
 
   toggleIsOpen() {