@appbaseio/reactivesearch-vue 1.16.0-alpha.35 → 1.16.0-alpha.38

package/dist/es/SingleList.js

@@ -1,21 +1,21 @@
 import { Actions, helper } from '@appbaseio/reactivecore';
-import { a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import { componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { t as types } from './vueTypes-687b2304.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
-import { f as updateCustomQuery, u as updateDefaultQuery, i as isQueryIdentical, a as isFunction, g as getComponent, n as isEvent, h as hasCustomRenderer, c as connect } from './index-cb1950b6.js';
-import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
-import { T as Title } from './Title-3522ff56.js';
-import { I as Input } from './Input-08bb1bcf.js';
-import { C as Container } from './Container-18b03fde.js';
+import { f as updateCustomQuery, u as updateDefaultQuery, i as isQueryIdentical, a as isFunction, g as getComponent, n as isEvent, h as hasCustomRenderer, c as connect } from './index-5daa8276.js';
+import { C as ComponentWrapper } from './ComponentWrapper-bbb717bc.js';
+import { T as Title } from './Title-579f8d6c.js';
+import { I as Input } from './Input-d8519224.js';
+import { C as Container } from './Container-4383c6f0.js';
 import { replaceDiacritics } from '@appbaseio/reactivecore/lib/utils/suggestions';
-import { U as UL, R as Radio } from './FormControlList-704f8dee.js';
-import { g as getAggsQuery } from './utils-64a2e5f0.js';
+import { U as UL, R as Radio } from './FormControlList-fe389a2e.js';
+import { g as getAggsQuery } from './utils-3a32e13f.js';
 
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,
@@ -24,8 +24,9 @@ var updateQuery = Actions.updateQuery,
 var getQueryOptions = helper.getQueryOptions,
     checkValueChange = helper.checkValueChange,
     getClassName = helper.getClassName,
-    getOptionsFromQuery = helper.getOptionsFromQuery,
-    isEqual = helper.isEqual;
+    isEqual = helper.isEqual,
+    extractQueryFromCustomQuery = helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = helper.getOptionsForCustomQuery;
 var SingleList = {
   name: 'SingleList',
   props: {
@@ -267,12 +268,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
 
         updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -291,10 +293,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);
         updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
       }
 
@@ -318,7 +319,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, _extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -463,6 +464,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],
@@ -484,7 +489,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper(connect(mapStateToProps, mapDispatchtoProps)(SingleList), {
   componentType: componentTypes.singleList,
-  internalComponent: true
+  internalComponent: SingleList.hasInternalComponent()
 });
 
 SingleList.install = function (Vue) {

package/dist/es/SingleRange.js

@@ -1,18 +1,18 @@
 import { Actions, helper } from '@appbaseio/reactivecore';
-import './_rollupPluginBabelHelpers-0f24d612.js';
+import './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import { componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { t as types } from './vueTypes-687b2304.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
-import { f as updateCustomQuery, i as isQueryIdentical, c as connect } from './index-cb1950b6.js';
-import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
-import { T as Title } from './Title-3522ff56.js';
-import { C as Container } from './Container-18b03fde.js';
-import { U as UL, R as Radio } from './FormControlList-704f8dee.js';
+import { f as updateCustomQuery, i as isQueryIdentical, c as connect } from './index-5daa8276.js';
+import { C as ComponentWrapper } from './ComponentWrapper-bbb717bc.js';
+import { T as Title } from './Title-579f8d6c.js';
+import { C as Container } from './Container-4383c6f0.js';
+import { U as UL, R as Radio } from './FormControlList-fe389a2e.js';
 
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,

package/dist/es/StateProvider.js

@@ -1,9 +1,9 @@
 import { helper } from '@appbaseio/reactivecore';
-import { a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import '@appbaseio/reactivecore/lib/utils/constants';
 import 'redux';
-import { c as connect } from './index-cb1950b6.js';
+import { c as connect } from './index-5daa8276.js';
 
 var getSearchState = helper.getSearchState;
 var defaultKeys = ['hits', 'value', 'aggregations', 'error'];

package/dist/es/{Title-3522ff56.js → Title-579f8d6c.js}

@@ -1,4 +1,4 @@
-import { _ as _taggedTemplateLiteralLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { _ as _taggedTemplateLiteralLoose } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import styled from '@appbaseio/vue-emotion';
 
 var _templateObject;

package/dist/es/ToggleButton.js

@@ -1,18 +1,18 @@
 import { Actions, helper } from '@appbaseio/reactivecore';
-import './_rollupPluginBabelHelpers-0f24d612.js';
+import './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import { componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { B as Button, t as toggleButtons } from './Button-91561391.js';
-import { t as types } from './vueTypes-687b2304.js';
+import { B as Button, t as toggleButtons } from './Button-799185e2.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
-import { f as updateCustomQuery, i as isQueryIdentical, c as connect } from './index-cb1950b6.js';
-import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
-import { T as Title } from './Title-3522ff56.js';
-import { C as Container } from './Container-18b03fde.js';
+import { f as updateCustomQuery, i as isQueryIdentical, c as connect } from './index-5daa8276.js';
+import { C as ComponentWrapper } from './ComponentWrapper-bbb717bc.js';
+import { T as Title } from './Title-579f8d6c.js';
+import { C as Container } from './Container-4383c6f0.js';
 
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,

package/dist/es/{_rollupPluginBabelHelpers-0f24d612.js → _rollupPluginBabelHelpers-ecf6c03c.js}

@@ -16,6 +16,22 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+function _inheritsLoose(subClass, superClass) {
+  subClass.prototype = Object.create(superClass.prototype);
+  subClass.prototype.constructor = subClass;
+
+  _setPrototypeOf(subClass, superClass);
+}
+
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+
+  return _setPrototypeOf(o, p);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -59,4 +75,4 @@ function _toPropertyKey(arg) {
   return typeof key === "symbol" ? key : String(key);
 }
 
-export { _taggedTemplateLiteralLoose as _, _extends as a, _objectWithoutPropertiesLoose as b, _toPropertyKey as c };
+export { _taggedTemplateLiteralLoose as _, _extends as a, _objectWithoutPropertiesLoose as b, _toPropertyKey as c, _inheritsLoose as d };

package/dist/es/{index-cb1950b6.js → index-5daa8276.js}

@@ -1,5 +1,5 @@
 import { helper } from '@appbaseio/reactivecore';
-import { a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import { validProps } from '@appbaseio/reactivecore/lib/utils/constants';
 import { bindActionCreators } from 'redux';
 
@@ -155,10 +155,16 @@ var isFunction = function isFunction(element) {
 }; // parses current array (i.e. this.$props.value) for `onChange` callback for multi-* components
 
 function parseValueArray(objectValues, currentValue) {
-  var keys = Object.keys(objectValues);
-  var selectedValues = keys.map(function (key) {
-    return objectValues[key] ? key : null;
-  });
+  var selectedValues;
+
+  if (Array.isArray(objectValues)) {
+    selectedValues = [].concat(objectValues);
+  } else {
+    var keys = Object.keys(objectValues);
+    selectedValues = keys.map(function (key) {
+      return objectValues[key] ? key : null;
+    });
+  }
 
   if (selectedValues.includes(currentValue)) {
     return selectedValues.filter(function (item) {

package/dist/es/index.js

@@ -1,42 +1,41 @@
 import '@appbaseio/reactivecore';
-import './_rollupPluginBabelHelpers-0f24d612.js';
+import './_rollupPluginBabelHelpers-ecf6c03c.js';
 import 'vue-types';
 import '@appbaseio/reactivecore/lib/utils/constants';
 import '@appbaseio/reactivecore/lib/utils/helper';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import './Button-91561391.js';
-import './vueTypes-687b2304.js';
+import './Button-799185e2.js';
+import './vueTypes-9326e0be.js';
+import './Pagination-b3e4054a.js';
 export { default as ReactiveList } from './ReactiveList.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
-import './index-cb1950b6.js';
-import './ComponentWrapper-4f85a67e.js';
+import './index-5daa8276.js';
+import './ComponentWrapper-bbb717bc.js';
 import '@vue/babel-helper-vue-jsx-merge-props';
-import './Title-3522ff56.js';
-import './ListItem-8e8fb535.js';
-import './Card-6446f1b7.js';
-import './Flex-8770345d.js';
+import './Title-579f8d6c.js';
+import './ListItem-bdb6d53d.js';
+import './Card-04b3c33e.js';
+import './Flex-aac91505.js';
 import '@appbaseio/reactivecore/lib/actions/analytics';
 import 'appbase-js';
 import 'url-search-params-polyfill';
 export { default as ReactiveBase } from './ReactiveBase.js';
 import 'hotkeys-js';
-export { D as DataSearch } from './DataSearch-66e72d1d.js';
-import './CancelSvg-c2c03a35.js';
-import './Input-08bb1bcf.js';
+export { default as DataSearch } from './DataSearch.js';
+import './CancelSvg-4d9e0857.js';
+import './Input-d8519224.js';
 import 'compute-scroll-into-view';
-import './Container-18b03fde.js';
+import './Container-4383c6f0.js';
 import 'vue-highlight-words';
-import { i as install } from './install-ecef1861.js';
-export { S as SearchBox, i as install } from './install-ecef1861.js';
 import '@appbaseio/reactivecore/lib/utils/suggestions';
-import './FormControlList-704f8dee.js';
-import './utils-64a2e5f0.js';
+import './FormControlList-fe389a2e.js';
+import './utils-3a32e13f.js';
 export { default as SingleList } from './SingleList.js';
 export { default as MultiList } from './MultiList.js';
-import './DropDown-c8da0a2c.js';
+import './DropDown-4edaa621.js';
 export { default as SingleDropdownList } from './SingleDropdownList.js';
 export { default as MultiDropdownList } from './MultiDropdownList.js';
 export { default as ToggleButton } from './ToggleButton.js';
@@ -47,10 +46,18 @@ export { default as MultiRange } from './MultiRange.js';
 export { default as ResultCard } from './ResultCard.js';
 export { default as ResultList } from './ResultList.js';
 import 'vue-no-ssr';
-import './ssr-a41dfea9.js';
+import './ssr-e3196de1.js';
 export { default as RangeSlider } from './RangeSlider.js';
 export { default as DynamicRangeSlider } from './DynamicRangeSlider.js';
 export { default as StateProvider } from './StateProvider.js';
+import 'gmap-vue';
+import 'gmap-vue/dist/components-implementation/map';
+import 'ngeohash';
+export { default as ReactiveGoogleMap } from './ReactiveGoogleMap.js';
+import 'gmap-vue/dist/components/cluster';
+import 'gmap-vue/dist/components-implementation/info-window';
+import 'gmap-vue/dist/components/marker';
+import 'gmap-vue/dist/mixins/map-element';
 import '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import '@appbaseio/reactivecore/lib/reducers/queryReducer';
 import '@appbaseio/reactivecore/lib/reducers/queryOptionsReducer';
@@ -63,6 +70,8 @@ export { default as initReactivesearch } from './initReactivesearch.js';
 import version from './version.js';
 export { default as version } from './version.js';
 export { default as RangeInput } from './RangeInput.js';
+import install from './install.js';
+export { default as install } from './install.js';
 
 // Add polyfills to support in IE
 

package/dist/es/initReactivesearch.js

@@ -1,7 +1,7 @@
-import { a as _extends, b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { a as _extends, b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import { validProps, componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
-import { pushToAndClause, buildQuery } from '@appbaseio/reactivecore/lib/utils/helper';
-import { getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
+import { pushToAndClause, buildQuery, extractQueryFromCustomQuery, getOptionsForCustomQuery } from '@appbaseio/reactivecore/lib/utils/helper';
+import { isSearchComponent, getRSQuery, extractPropsFromState, getDependentQueries } from '@appbaseio/reactivecore/lib/utils/transform';
 import Appbase from 'appbase-js';
 import valueReducer from '@appbaseio/reactivecore/lib/reducers/valueReducer';
 import queryReducer from '@appbaseio/reactivecore/lib/reducers/queryReducer';
@@ -12,10 +12,9 @@ import dependencyTreeReducer from '@appbaseio/reactivecore/lib/reducers/dependen
 import fetchGraphQL from '@appbaseio/reactivecore/lib/utils/graphQL';
 import { isPropertyDefined } from '@appbaseio/reactivecore/lib/actions/utils';
 
-var _excluded = ["aggs", "size"];
+var _excluded = ["aggs", "size"],
+    _excluded2 = ["query"];
 var X_SEARCH_CLIENT = 'ReactiveSearch Vue';
-var componentsWithHighlightQuery = [componentTypes.dataSearch, componentTypes.categorySearch];
-var componentsWithOptions = [componentTypes.reactiveList, componentTypes.reactiveMap, componentTypes.singleList, componentTypes.multiList, componentTypes.tagCloud].concat(componentsWithHighlightQuery);
 var componentsWithoutFilters = [componentTypes.numberBox, componentTypes.ratingsFilter];
 var resultComponents = [componentTypes.reactiveList, componentTypes.reactiveMap];
 
@@ -49,23 +48,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 _extends({
+      query: extractQueryFromCustomQuery(defaultQuery)
+    }, 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 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) {
@@ -120,6 +131,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;
@@ -151,74 +167,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)
+      }
 
+      var componentQueryOptions = {}; // [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 = {};
+      if (component && component.source.generateQueryOptions) {
+        componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
+      }
 
-        if (componentsWithHighlightQuery.includes(componentType) && component.highlight) {
-          highlightQuery = component.source.highlightQuery(component);
-        }
+      var highlightQuery = {};
 
-        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 = _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
+      if (component.source.highlightQuery) {
+        highlightQuery = component.source.highlightQuery(component);
+      }
 
+      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 = _objectWithoutPropertiesLoose(_ref, _excluded);
+
+        if (aggs && Object.keys(aggs).length) {
+          isInternalComponentPresent = true;
+          componentQueryOptions = _extends({}, componentQueryOptions, {
+            aggs: aggs,
+            size: typeof size === 'undefined' ? 100 : size
+          });
+        } // sort, highlight, size, from - query should be applied on the main component
 
-          if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
-            if (!otherQueryOptions) otherQueryOptions = {};
-            if (!highlightQuery) highlightQuery = {};
 
-            var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
-              size: size
-            });
+        if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+          if (!otherQueryOptions) otherQueryOptions = {};
+          if (!highlightQuery) highlightQuery = {};
 
-            if (isInternalComponentPresent) {
-              mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery);
-            }
-
-            if (isResultComponent) {
-              var currentPage = component.currentPage ? component.currentPage - 1 : 0;
+          var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
+            size: size
+          });
 
-              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-                currentPage = selectedValues[component.componentId].value - 1 || 0;
-              }
+          if (isInternalComponentPresent) {
+            mainQueryOptions = _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 = _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: _extends({}, mainQueryOptions)
+            var resultSize = component.size || 10;
+            var from = currentPage * resultSize; // Update props for RS API
+
+            compProps.from = from;
+            mainQueryOptions = _extends({}, mainQueryOptions, highlightQuery, {
+              size: resultSize,
+              from: from
             });
           }
+
+          componentQueryOptions = _extends({}, componentQueryOptions, mainQueryOptions);
         }
       } // [3] set dependency tree
 
@@ -236,25 +244,38 @@ function initReactivesearch(componentCollection, searchState, settings) {
           react: react
         });
       } // [4] set query list
+      // Do not set default query for suggestions
 
 
-      if (isResultComponent) {
-        var _getQuery = getQuery(component, value, componentType),
-            query = _getQuery.query;
+      if (isInternalComponentPresent && !isSearchComponent(component.componentType)) {
+        var _ref2 = getDefaultQuery(component, value) || {},
+            defaultQuery = _ref2.query,
+            defaultQueryOptions = _objectWithoutPropertiesLoose(_ref2, _excluded2);
 
         queryList = queryReducer(queryList, {
           type: 'SET_QUERY',
           component: internalComponent,
-          query: query
+          query: defaultQuery
         });
-      } else {
-        queryList = queryReducer(queryList, {
-          type: 'SET_QUERY',
-          component: component.componentId,
-          query: getQuery(component, value, componentType)
+        queryOptions = queryOptionsReducer(queryOptions, {
+          type: 'SET_QUERY_OPTIONS',
+          component: internalComponent,
+          options: _extends({}, componentQueryOptions, defaultQueryOptions)
         });
-      } // Set component type in component props
+      }
 
+      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: _extends({}, componentQueryOptions)
+      }); // Set component type in component props
 
       compProps.componentType = componentType;
       componentProps[component.componentId] = compProps;