fix(view types): handle default view type selection

unbxd · Jan 21, 2021 · c98f371 · c98f371
1 parent 0b630bc
commit c98f371
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/UnbxdSearchWrapper.js b/src/UnbxdSearchWrapper.js
@@ -37,7 +37,7 @@ import { viewTypes } from './config/constants';
  * Component to initialize Unbxd Search. UnbxdSearchWrapper also acts as a root component for modules such as Products, Pagination and facets.
  */
 const initialUnbxdState = {
-    viewType: 'GRID',
+    viewType: '',
     paginationType: paginationTypes.FIXED_PAGINATION,
     enableApplyFilters: false,
     selectedTextFacets: { add: {}, remove: {}, list: {} },
@@ -132,9 +132,6 @@ class UnbxdSearchWrapper extends Component {
             typeof unbxdCore.options.getCategoryId === 'function' &&
             unbxdCore.options.getCategoryId();
 
-        const viewType =
-            this.state.unbxdCore.getQueryParams()['viewType'] || viewTypes.GRID;
-        unbxdCore.options.extraParams['viewType'] = viewType;
 
         if (unbxdCore.options.applyMultipleFilters) {
             this.setState((currentState) => {

diff --git a/src/modules/viewTypes/ViewTypesContainer.js b/src/modules/viewTypes/ViewTypesContainer.js
@@ -10,9 +10,17 @@ class ViewTypesContainer extends React.PureComponent {
     componentDidMount() {
         const {
             helpers: { setViewTypeConfiguration },
-            viewType
+            viewType,
+            viewTypes,
+            unbxdCore
         } = this.props;
-        setViewTypeConfiguration({ viewType });
+
+        const currentViewType = unbxdCore.getQueryParams()['viewType'];
+        if (currentViewType) {
+            setViewTypeConfiguration({ viewType: currentViewType });
+        } else {
+            setViewTypeConfiguration({ viewType: viewType || viewTypes[0] });
+        }
     }
 
     getViewTypesProps() {

diff --git a/src/utils/setViewTypeConfiguration.js b/src/utils/setViewTypeConfiguration.js
@@ -6,8 +6,9 @@ function setViewTypeConfiguration(config, triggerResults = false) {
             unbxdState: { ...currentState.unbxdState, viewType }
         };
     });
+    const { unbxdCore } = this.state;
+    unbxdCore.options.extraParams['viewType'] = viewType;
     if (triggerResults) {
-        const { unbxdCore } = this.state;
         unbxdCore.options.extraParams['viewType'] = viewType;
         unbxdCore.getResults();
     }