From dfd0a04db3c2031601c40beb38f5f4afb834303c Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Tue, 10 Apr 2018 13:54:42 +0300
Subject: [PATCH 1/3] Fix open and close callbacks for mobile filter modal

---
 src/components/SearchFiltersMobile/SearchFiltersMobile.js | 4 ++--
 src/containers/SearchPage/MainPanel.js                    | 8 ++++++--
 src/containers/SearchPage/SearchPage.js                   | 2 ++
 .../SearchPage/__snapshots__/SearchPage.test.js.snap      | 2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/SearchFiltersMobile/SearchFiltersMobile.js b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
index 552dbe58..71ac43cb 100644
--- a/src/components/SearchFiltersMobile/SearchFiltersMobile.js
+++ b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
@@ -247,8 +247,8 @@ SearchFiltersMobileComponent.propTypes = {
   showAsModalMaxWidth: number.isRequired,
   onMapIconClick: func.isRequired,
   onManageDisableScrolling: func.isRequired,
-  onOpenModal: func,
-  onCloseModal: func,
+  onOpenModal: func.isRequired,
+  onCloseModal: func.isRequired,
   categories: array,
   amenities: array,
 
diff --git a/src/containers/SearchPage/MainPanel.js b/src/containers/SearchPage/MainPanel.js
index c13fc815..2cf4fe8e 100644
--- a/src/containers/SearchPage/MainPanel.js
+++ b/src/containers/SearchPage/MainPanel.js
@@ -29,6 +29,8 @@ class MainPanel extends Component {
       searchParamsAreInSync,
       onActivateListing,
       onManageDisableScrolling,
+      onOpenModal,
+      onCloseModal,
       onMapIconClick,
       pagination,
       searchParamsForPagination,
@@ -84,8 +86,8 @@ class MainPanel extends Component {
           showAsModalMaxWidth={showAsModalMaxWidth}
           onMapIconClick={onMapIconClick}
           onManageDisableScrolling={onManageDisableScrolling}
-          onOpenModal={this.onOpenMobileModal}
-          onCloseModal={this.onCloseMobileModal}
+          onOpenModal={onOpenModal}
+          onCloseModal={onCloseModal}
           {...primaryFilters}
         />
         {isSearchFiltersPanelOpen ? (
@@ -145,6 +147,8 @@ MainPanel.propTypes = {
   searchParamsAreInSync: bool.isRequired,
   onActivateListing: func.isRequired,
   onManageDisableScrolling: func.isRequired,
+  onOpenModal: func.isRequired,
+  onCloseModal: func.isRequired,
   onMapIconClick: func.isRequired,
   pagination: propTypes.pagination,
   searchParamsForPagination: object,
diff --git a/src/containers/SearchPage/SearchPage.js b/src/containers/SearchPage/SearchPage.js
index ccd92167..ba89b943 100644
--- a/src/containers/SearchPage/SearchPage.js
+++ b/src/containers/SearchPage/SearchPage.js
@@ -236,6 +236,8 @@ export class SearchPageComponent extends Component {
             searchParamsAreInSync={searchParamsAreInSync}
             onActivateListing={onActivateListing}
             onManageDisableScrolling={onManageDisableScrolling}
+            onOpenModal={this.onOpenMobileModal}
+            onCloseModal={this.onCloseMobileModal}
             onMapIconClick={onMapIconClick}
             pagination={pagination}
             searchParamsForPagination={parse(location.search)}
diff --git a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
index df9d474c..95048a34 100644
--- a/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
+++ b/src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap
@@ -32,8 +32,10 @@ exports[`SearchPageComponent matches snapshot 1`] = `
       }
       listings={Array []}
       onActivateListing={[Function]}
+      onCloseModal={[Function]}
       onManageDisableScrolling={[Function]}
       onMapIconClick={[Function]}
+      onOpenModal={[Function]}
       pagination={
         Object {
           "page": 1,

From 2ca5b73d2c04de6e5bd0ec4e692dde358b0a97a2 Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Tue, 10 Apr 2018 13:54:53 +0300
Subject: [PATCH 2/3] Include secondaryFilters in mobile filter view

---
 src/containers/SearchPage/MainPanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/containers/SearchPage/MainPanel.js b/src/containers/SearchPage/MainPanel.js
index 2cf4fe8e..adde0b38 100644
--- a/src/containers/SearchPage/MainPanel.js
+++ b/src/containers/SearchPage/MainPanel.js
@@ -89,6 +89,7 @@ class MainPanel extends Component {
           onOpenModal={onOpenModal}
           onCloseModal={onCloseModal}
           {...primaryFilters}
+          {...secondaryFilters}
         />
         {isSearchFiltersPanelOpen ? (
           <div className={classNames(css.searchFiltersPanel)}>

From 568c1d772f6c581a26f28aa2bdb609ab8531a7e0 Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Tue, 10 Apr 2018 14:48:26 +0300
Subject: [PATCH 3/3] Remove redundant default props

---
 src/components/SearchFiltersMobile/SearchFiltersMobile.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/SearchFiltersMobile/SearchFiltersMobile.js b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
index 71ac43cb..acc4df76 100644
--- a/src/components/SearchFiltersMobile/SearchFiltersMobile.js
+++ b/src/components/SearchFiltersMobile/SearchFiltersMobile.js
@@ -231,8 +231,6 @@ SearchFiltersMobileComponent.defaultProps = {
   className: null,
   resultsCount: null,
   searchingInProgress: false,
-  onOpenModal: null,
-  onCloseModal: null,
   categories: null,
   amenities: null,
 };