@appbaseio/reactivesearch-vue 1.16.0-alpha.36 → 1.16.0-alpha.37

package/dist/cjs/ReactiveList.js

@@ -272,9 +272,10 @@ var isEqual$1 = configureStore.helper.isEqual,
     getQueryOptions = configureStore.helper.getQueryOptions,
     getClassName = configureStore.helper.getClassName,
     parseHits = configureStore.helper.parseHits,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
     getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
-    getResultStats = configureStore.helper.getResultStats;
+    getResultStats = configureStore.helper.getResultStats,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var ReactiveList = {
   name: 'ReactiveList',
   components: {
@@ -337,6 +338,12 @@ var ReactiveList = {
       });
     }
 
+    if (this.urlSortOption) {
+      this.sortOptionIndex = this.$props.sortOptions.findIndex(function (s) {
+        return s.label === _this.urlSortOption;
+      }) || 0;
+    }
+
     this.updateComponentProps(this.componentId, {
       from: this.from
     }, constants.componentTypes.reactiveList);
@@ -466,19 +473,11 @@ var ReactiveList = {
         var options = getQueryOptions(this.$props);
         options.from = 0;
         this.$defaultQuery = newVal(null, this.$props);
-
-        var _ref = this.$defaultQuery || {},
-            sort = _ref.sort,
-            query = _ref.query;
-
-        if (sort) {
-          options.sort = this.$defaultQuery.sort;
-        }
-
-        var queryOptions = getOptionsFromQuery(this.$defaultQuery);
+        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
         if (queryOptions) {
-          options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(this.$defaultQuery));
+          options = _rollupPluginBabelHelpers._extends({}, options, queryOptions);
         } // Update calculated default query in store
 
 
@@ -569,24 +568,24 @@ var ReactiveList = {
     options.from = this.$data.from;
 
     if (this.sortOptions && this.sortOptions[this.sortOptionIndex]) {
-      var _ref2;
+      var _ref;
 
       var sortField = this.sortOptions[this.sortOptionIndex].dataField;
       var sortBy = this.sortOptions[this.sortOptionIndex].sortBy;
-      options.sort = [(_ref2 = {}, _ref2[sortField] = {
+      options.sort = [(_ref = {}, _ref[sortField] = {
         order: sortBy
-      }, _ref2)]; // To handle sort options for RS API
+      }, _ref)]; // To handle sort options for RS API
 
       this.updateComponentProps(this.componentId, {
         dataField: sortField,
         sortBy: sortBy
       }, constants.componentTypes.reactiveList);
     } else if (this.$props.sortBy) {
-      var _ref3;
+      var _ref2;
 
-      options.sort = [(_ref3 = {}, _ref3[this.$props.dataField] = {
+      options.sort = [(_ref2 = {}, _ref2[this.$props.dataField] = {
         order: this.$props.sortBy
-      }, _ref3)];
+      }, _ref2)];
     } // Override sort query with defaultQuery's sort if defined
 
 
@@ -594,20 +593,13 @@ var ReactiveList = {
 
     if (this.$props.defaultQuery) {
       this.$defaultQuery = this.$props.defaultQuery();
-      options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(this.$defaultQuery));
-
-      if (this.$defaultQuery.sort) {
-        options.sort = this.$defaultQuery.sort;
-      } // Update calculated default query in store
-
+      options = _rollupPluginBabelHelpers._extends({}, options, getOptionsForCustomQuery(this.$defaultQuery)); // Update calculated default query in store
 
       index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props);
     } // execute is set to false at the time of mount
 
 
-    var _ref4 = this.$defaultQuery || {},
-        query = _ref4.query;
-
+    var query = extractQueryFromCustomQuery(this.$defaultQuery);
     var execute = false;
     this.setQueryOptions(this.$props.componentId, _rollupPluginBabelHelpers._extends({}, options, this.getAggsQuery()), execute);
 
@@ -722,18 +714,18 @@ var ReactiveList = {
         }) : 0;
 
         if (props.sortOptions[sortOptionIndex]) {
-          var _ref5;
+          var _ref3;
 
-          options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
+          options.sort = [(_ref3 = {}, _ref3[props.sortOptions[sortOptionIndex].dataField] = {
             order: props.sortOptions[sortOptionIndex].sortBy
-          }, _ref5)];
+          }, _ref3)];
         }
       } else if (props.sortBy) {
-        var _ref6;
+        var _ref4;
 
-        options.sort = [(_ref6 = {}, _ref6[props.dataField] = {
+        options.sort = [(_ref4 = {}, _ref4[props.dataField] = {
           order: props.sortBy
-        }, _ref6)];
+        }, _ref4)];
       }
 
       this.setQueryOptions(this.$props.componentId, _rollupPluginBabelHelpers._extends({}, options, this.getAggsQuery()), true);
@@ -836,16 +828,16 @@ var ReactiveList = {
       var index = e.target.value;
 
       if (this.sortOptions && this.sortOptions[index]) {
-        var _ref7;
+        var _ref5;
 
         // This fixes issue #371 (where sorting a multi-result page with infinite loader breaks)
         var options = getQueryOptions(this.$props);
         options.from = 0;
         var sortField = this.sortOptions[index].dataField;
         var sortBy = this.sortOptions[index].sortBy;
-        options.sort = [(_ref7 = {}, _ref7[sortField] = {
+        options.sort = [(_ref5 = {}, _ref5[sortField] = {
           order: sortBy
-        }, _ref7)];
+        }, _ref5)];
         this.sortOptionIndex = index; // To handle sort options for RS API
 
         this.updateComponentProps(this.componentId, {
@@ -853,8 +845,11 @@ var ReactiveList = {
           sortBy: sortBy
         }, constants.componentTypes.reactiveList);
         this.setQueryOptions(this.$props.componentId, options, true);
+        this.setPage(0);
         this.currentPageState = 0;
         this.from = 0;
+        var sortOption = this.$props.sortOptions[this.sortOptionIndex] ? this.$props.sortOptions[this.sortOptionIndex].label : null;
+        this.setPageURL(this.$props.componentId + "sortOption", sortOption, this.$props.componentId + "sortOption", false, this.$props.URLParams);
       }
     },
     triggerClickAnalytics: function triggerClickAnalytics(searchPosition, documentId) {
@@ -966,6 +961,7 @@ var ReactiveList = {
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1,
+    urlSortOption: state.selectedValues[props.componentId + "sortOption"] && state.selectedValues[props.componentId + "sortOption"].value,
     hits: state.hits[props.componentId] && state.hits[props.componentId].hits,
     rawData: state.rawData[props.componentId],
     aggregationData: state.compositeAggregations[props.componentId],
@@ -1006,7 +1002,7 @@ ReactiveList.generateQueryOptions = function (props) {
   options.size = size || 10;
 
   var getSortOption = function getSortOption() {
-    var _ref9;
+    var _ref7;
 
     if (defaultSortOption) {
       var sortOption = sortOptionsNew.find(function (option) {
@@ -1014,35 +1010,39 @@ ReactiveList.generateQueryOptions = function (props) {
       });
 
       if (sortOption) {
-        var _ref8;
+        var _ref6;
 
-        return _ref8 = {}, _ref8[sortOption.dataField] = {
+        return _ref6 = {}, _ref6[sortOption.dataField] = {
           order: sortOption.sortBy
-        }, _ref8;
+        }, _ref6;
       }
     }
 
-    return _ref9 = {}, _ref9[sortOptionsNew[0].dataField] = {
+    return _ref7 = {}, _ref7[sortOptionsNew[0].dataField] = {
       order: sortOptionsNew[0].sortBy
-    }, _ref9;
+    }, _ref7;
   };
 
   if (sortOptionsNew) {
     options.sort = [getSortOption()];
   } else if (sortBy) {
-    var _ref10;
+    var _ref8;
 
-    options.sort = [(_ref10 = {}, _ref10[dataField] = {
+    options.sort = [(_ref8 = {}, _ref8[dataField] = {
       order: sortBy
-    }, _ref10)];
+    }, _ref8)];
   }
 
   return options;
 };
 
+ReactiveList.hasInternalComponent = function () {
+  return true;
+};
+
 var RLConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(ReactiveList), {
   componentType: constants.componentTypes.reactiveList,
-  internalComponent: true
+  internalComponent: ReactiveList.hasInternalComponent()
 });
 
 ReactiveList.install = function (Vue) {

package/dist/cjs/SingleDropdownList.js

@@ -36,9 +36,10 @@ var getQueryOptions = configureStore.helper.getQueryOptions,
     checkValueChange = configureStore.helper.checkValueChange,
     checkPropChange = configureStore.helper.checkPropChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
     isEqual = configureStore.helper.isEqual,
-    getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery;
+    getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var SingleDropdownList = {
   name: 'SingleDropdownList',
   data: function data() {
@@ -292,12 +293,13 @@ var SingleDropdownList = {
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
         }
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
+        defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -316,10 +318,9 @@ var SingleDropdownList = {
       var customQueryOptions;
 
       if (customQuery) {
-        var _ref = customQuery(value, props) || {};
-
-        query = _ref.query;
-        customQueryOptions = getOptionsFromQuery(customQuery(value, props));
+        var customQueryCalc = customQuery(value, props);
+        query = extractQueryFromCustomQuery(customQueryCalc);
+        customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
         index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
       }
 
@@ -357,7 +358,7 @@ var SingleDropdownList = {
 
       if (props.defaultQuery) {
         var value = this.$data.currentValue;
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -449,6 +450,10 @@ SingleDropdownList.generateQueryOptions = function (props, after) {
   }) : utils.getAggsQuery(queryOptions, props);
 };
 
+SingleDropdownList.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -470,7 +475,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(SingleDropdownList), {
   componentType: constants.componentTypes.singleDropdownList,
-  internalComponent: true
+  internalComponent: SingleDropdownList.hasInternalComponent()
 });
 
 SingleDropdownList.install = function (Vue) {

package/dist/cjs/SingleList.js

@@ -31,8 +31,9 @@ var updateQuery = configureStore.Actions.updateQuery,
 var getQueryOptions = configureStore.helper.getQueryOptions,
     checkValueChange = configureStore.helper.checkValueChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
-    isEqual = configureStore.helper.isEqual;
+    isEqual = configureStore.helper.isEqual,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var SingleList = {
   name: 'SingleList',
   props: {
@@ -274,12 +275,13 @@ var SingleList = {
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
         }
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
+        defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         index.updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -298,10 +300,9 @@ var SingleList = {
       var customQueryOptions;
 
       if (customQuery) {
-        var _ref = customQuery(value, props) || {};
-
-        query = _ref.query;
-        customQueryOptions = getOptionsFromQuery(customQuery(value, props));
+        var customQueryCalc = customQuery(value, props);
+        query = extractQueryFromCustomQuery(customQueryCalc);
+        customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
         index.updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
       }
 
@@ -325,7 +326,7 @@ var SingleList = {
 
       if (props.defaultQuery) {
         var value = this.$data.currentValue;
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -470,6 +471,10 @@ SingleList.defaultQuery = function (value, props) {
   return query;
 };
 
+SingleList.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -491,7 +496,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(SingleList), {
   componentType: constants.componentTypes.singleList,
-  internalComponent: true
+  internalComponent: SingleList.hasInternalComponent()
 });
 
 SingleList.install = function (Vue) {

package/dist/cjs/initReactivesearch.js

@@ -18,10 +18,9 @@ var dependencyTreeReducer = _interopDefault(require('@appbaseio/reactivecore/lib
 var fetchGraphQL = _interopDefault(require('@appbaseio/reactivecore/lib/utils/graphQL'));
 var utils = require('@appbaseio/reactivecore/lib/actions/utils');
 
-var _excluded = ["aggs", "size"];
+var _excluded = ["aggs", "size"],
+    _excluded2 = ["query"];
 var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
-var componentsWithHighlightQuery = [constants.componentTypes.dataSearch, constants.componentTypes.categorySearch];
-var componentsWithOptions = [constants.componentTypes.reactiveList, constants.componentTypes.reactiveMap, constants.componentTypes.singleList, constants.componentTypes.multiList, constants.componentTypes.tagCloud].concat(componentsWithHighlightQuery);
 var componentsWithoutFilters = [constants.componentTypes.numberBox, constants.componentTypes.ratingsFilter];
 var resultComponents = [constants.componentTypes.reactiveList, constants.componentTypes.reactiveMap];
 
@@ -55,23 +54,35 @@ function parseValue(value, component) {
   }
 
   return value;
-}
+} // Returns query DSL with query property and other options
+
+
+function getDefaultQuery(component, value) {
+  // get custom or default query of sensor components
+  var currentValue = parseValue(value, component); // get default query of result components
+
+  if (component.defaultQuery) {
+    var defaultQuery = component.defaultQuery(currentValue, component);
+    return _rollupPluginBabelHelpers._extends({
+      query: helper.extractQueryFromCustomQuery(defaultQuery)
+    }, helper.getOptionsForCustomQuery(defaultQuery));
+  }
 
-function getQuery(component, value, componentType) {
-  // get default query of result components
-  if (resultComponents.includes(componentType)) {
-    return component.defaultQuery ? component.defaultQuery() : {};
-  } // get custom or default query of sensor components
+  return component.source.defaultQuery ? {
+    query: component.source.defaultQuery(currentValue, component)
+  } : {};
+} // Only results the query part
 
 
+function getCustomQuery(component, value) {
+  // get custom or default query of sensor components
   var currentValue = parseValue(value, component);
 
   if (component.customQuery) {
-    var customQuery = component.customQuery(currentValue, component);
-    return customQuery && customQuery.query;
+    return helper.extractQueryFromCustomQuery(component.customQuery(currentValue, component));
   }
 
-  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : {};
+  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : null;
 }
 
 function initReactivesearch(componentCollection, searchState, settings) {
@@ -126,6 +137,11 @@ function initReactivesearch(componentCollection, searchState, settings) {
         }
       });
       var isInternalComponentPresent = false;
+
+      if (component.source.hasInternalComponent) {
+        isInternalComponentPresent = component.source.hasInternalComponent(component);
+      }
+
       var isResultComponent = resultComponents.includes(componentType);
       var internalComponent = component.componentId + "__internal";
       var label = component.filterLabel || component.componentId;
@@ -157,74 +173,66 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
       if (component.defaultQuery && typeof component.defaultQuery === 'function') {
         defaultQueries[component.componentId] = component.defaultQuery(value, compProps);
-      } // [2] set query options - main component query (valid for result components)
-
+      }
 
-      if (componentsWithOptions.includes(componentType)) {
-        var options = component.source.generateQueryOptions ? component.source.generateQueryOptions(component) : null;
-        var highlightQuery = {};
+      var componentQueryOptions = {}; // [2] set query options - main component query (valid for result components)
 
-        if (componentsWithHighlightQuery.includes(componentType) && component.highlight) {
-          highlightQuery = component.source.highlightQuery(component);
-        }
+      if (component && component.source.generateQueryOptions) {
+        componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
+      }
 
-        if (options && Object.keys(options).length || highlightQuery && Object.keys(highlightQuery).length) {
-          // eslint-disable-next-line
-          var _ref = options || {},
-              aggs = _ref.aggs,
-              size = _ref.size,
-              otherQueryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
-
-          if (aggs && Object.keys(aggs).length) {
-            isInternalComponentPresent = true; // query should be applied on the internal component
-            // to enable feeding the data to parent component
-
-            queryOptions = queryOptionsReducer(queryOptions, {
-              type: 'SET_QUERY_OPTIONS',
-              component: internalComponent,
-              options: {
-                aggs: aggs,
-                size: typeof size === 'undefined' ? 100 : size
-              }
-            });
-          } // sort, highlight, size, from - query should be applied on the main component
+      var highlightQuery = {};
 
+      if (component.source.highlightQuery) {
+        highlightQuery = component.source.highlightQuery(component);
+      }
 
-          if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
-            if (!otherQueryOptions) otherQueryOptions = {};
-            if (!highlightQuery) highlightQuery = {};
+      if (componentQueryOptions && Object.keys(componentQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+        // eslint-disable-next-line
+        var _ref = componentQueryOptions || {},
+            aggs = _ref.aggs,
+            size = _ref.size,
+            otherQueryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
+
+        if (aggs && Object.keys(aggs).length) {
+          isInternalComponentPresent = true;
+          componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, {
+            aggs: aggs,
+            size: typeof size === 'undefined' ? 100 : size
+          });
+        } // sort, highlight, size, from - query should be applied on the main component
 
-            var mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery, {
-              size: size
-            });
 
-            if (isInternalComponentPresent) {
-              mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery);
-            }
+        if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+          if (!otherQueryOptions) otherQueryOptions = {};
+          if (!highlightQuery) highlightQuery = {};
 
-            if (isResultComponent) {
-              var currentPage = component.currentPage ? component.currentPage - 1 : 0;
+          var mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery, {
+            size: size
+          });
 
-              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-                currentPage = selectedValues[component.componentId].value - 1 || 0;
-              }
+          if (isInternalComponentPresent) {
+            mainQueryOptions = _rollupPluginBabelHelpers._extends({}, otherQueryOptions, highlightQuery);
+          }
 
-              var resultSize = component.size || 10;
-              var from = currentPage * resultSize; // Update props for RS API
+          if (isResultComponent) {
+            var currentPage = component.currentPage ? component.currentPage - 1 : 0;
 
-              compProps.from = from;
-              mainQueryOptions = _rollupPluginBabelHelpers._extends({}, mainQueryOptions, highlightQuery, {
-                size: resultSize,
-                from: from
-              });
+            if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
+              currentPage = selectedValues[component.componentId].value - 1 || 0;
             }
 
-            queryOptions = queryOptionsReducer(queryOptions, {
-              type: 'SET_QUERY_OPTIONS',
-              component: component.componentId,
-              options: _rollupPluginBabelHelpers._extends({}, mainQueryOptions)
+            var resultSize = component.size || 10;
+            var from = currentPage * resultSize; // Update props for RS API
+
+            compProps.from = from;
+            mainQueryOptions = _rollupPluginBabelHelpers._extends({}, mainQueryOptions, highlightQuery, {
+              size: resultSize,
+              from: from
             });
           }
+
+          componentQueryOptions = _rollupPluginBabelHelpers._extends({}, componentQueryOptions, mainQueryOptions);
         }
       } // [3] set dependency tree
 
@@ -244,23 +252,32 @@ function initReactivesearch(componentCollection, searchState, settings) {
       } // [4] set query list
 
 
-      if (isResultComponent) {
-        var _getQuery = getQuery(component, value, componentType),
-            query = _getQuery.query;
+      var _ref2 = getDefaultQuery(component, value) || {},
+          defaultQuery = _ref2.query,
+          defaultQueryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, _excluded2);
 
-        queryList = queryReducer(queryList, {
-          type: 'SET_QUERY',
-          component: internalComponent,
-          query: query
-        });
-      } else {
-        queryList = queryReducer(queryList, {
-          type: 'SET_QUERY',
-          component: component.componentId,
-          query: getQuery(component, value, componentType)
-        });
-      } // Set component type in component props
+      queryList = queryReducer(queryList, {
+        type: 'SET_QUERY',
+        component: internalComponent,
+        query: defaultQuery
+      });
+      queryOptions = queryOptionsReducer(queryOptions, {
+        type: 'SET_QUERY_OPTIONS',
+        component: internalComponent,
+        options: _rollupPluginBabelHelpers._extends({}, componentQueryOptions, defaultQueryOptions)
+      });
+      var customQuery = getCustomQuery(component, value); // set custom query for main component
 
+      queryList = queryReducer(queryList, {
+        type: 'SET_QUERY',
+        component: component.componentId,
+        query: customQuery
+      });
+      queryOptions = queryOptionsReducer(queryOptions, {
+        type: 'SET_QUERY_OPTIONS',
+        component: component.componentId,
+        options: _rollupPluginBabelHelpers._extends({}, componentQueryOptions)
+      }); // Set component type in component props
 
       compProps.componentType = componentType;
       componentProps[component.componentId] = compProps;

package/dist/cjs/version.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.16.0-alpha.36";
+var version = "1.16.0-alpha.37";
 
 exports.default = version;