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

package/dist/cjs/SingleList.js

@@ -6,23 +6,23 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var vueTypes = require('./vueTypes-57d01f18.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-89c39a9e.js');
-var ComponentWrapper = require('./ComponentWrapper-32481890.js');
-var Title = require('./Title-584a8cc8.js');
-var Input = require('./Input-3cc3fa59.js');
-var Container = require('./Container-526efa6a.js');
+var index = require('./index-d44a0a21.js');
+var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
+var Title = require('./Title-39765ee6.js');
+var Input = require('./Input-c6f181d5.js');
+var Container = require('./Container-8a08d663.js');
 var suggestions = require('@appbaseio/reactivecore/lib/utils/suggestions');
-var FormControlList = require('./FormControlList-808dbcef.js');
-var utils = require('./utils-1219e1fe.js');
+var FormControlList = require('./FormControlList-73497794.js');
+var utils = require('./utils-23afb20b.js');
 
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
@@ -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/SingleRange.js

@@ -6,20 +6,20 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-require('./_rollupPluginBabelHelpers-f127c8b7.js');
+require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var vueTypes = require('./vueTypes-57d01f18.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-89c39a9e.js');
-var ComponentWrapper = require('./ComponentWrapper-32481890.js');
-var Title = require('./Title-584a8cc8.js');
-var Container = require('./Container-526efa6a.js');
-var FormControlList = require('./FormControlList-808dbcef.js');
+var index = require('./index-d44a0a21.js');
+var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
+var Title = require('./Title-39765ee6.js');
+var Container = require('./Container-8a08d663.js');
+var FormControlList = require('./FormControlList-73497794.js');
 
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,

package/dist/cjs/StateProvider.js

@@ -6,11 +6,11 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 require('@appbaseio/reactivecore/lib/utils/constants');
 require('redux');
-var index = require('./index-89c39a9e.js');
+var index = require('./index-d44a0a21.js');
 
 var getSearchState = configureStore.helper.getSearchState;
 var defaultKeys = ['hits', 'value', 'aggregations', 'error'];

package/dist/cjs/{Title-584a8cc8.js → Title-39765ee6.js}

@@ -2,7 +2,7 @@
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
 

package/dist/cjs/ToggleButton.js

@@ -6,20 +6,20 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-require('./_rollupPluginBabelHelpers-f127c8b7.js');
+require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var Button = require('./Button-11307285.js');
-var vueTypes = require('./vueTypes-57d01f18.js');
+var Button = require('./Button-d2f1aeda.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-89c39a9e.js');
-var ComponentWrapper = require('./ComponentWrapper-32481890.js');
-var Title = require('./Title-584a8cc8.js');
-var Container = require('./Container-526efa6a.js');
+var index = require('./index-d44a0a21.js');
+var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
+var Title = require('./Title-39765ee6.js');
+var Container = require('./Container-8a08d663.js');
 
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,

package/dist/cjs/{_rollupPluginBabelHelpers-f127c8b7.js → _rollupPluginBabelHelpers-4abdbfff.js}

@@ -18,6 +18,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 = {};
@@ -62,6 +78,7 @@ function _toPropertyKey(arg) {
 }
 
 exports._extends = _extends;
+exports._inheritsLoose = _inheritsLoose;
 exports._objectWithoutPropertiesLoose = _objectWithoutPropertiesLoose;
 exports._taggedTemplateLiteralLoose = _taggedTemplateLiteralLoose;
 exports._toPropertyKey = _toPropertyKey;

package/dist/cjs/{index-89c39a9e.js → index-d44a0a21.js}

@@ -4,7 +4,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 var redux = require('redux');
 
@@ -160,10 +160,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/cjs/index.js

@@ -3,43 +3,43 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('@appbaseio/reactivecore');
-require('./_rollupPluginBabelHelpers-f127c8b7.js');
+require('./_rollupPluginBabelHelpers-4abdbfff.js');
 require('vue-types');
 require('@appbaseio/reactivecore/lib/utils/constants');
 require('@appbaseio/reactivecore/lib/utils/helper');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-require('./Button-11307285.js');
-require('./vueTypes-57d01f18.js');
+require('./Button-d2f1aeda.js');
+require('./vueTypes-6de9d2a9.js');
+require('./Pagination-1b2320a7.js');
 var ReactiveList = require('./ReactiveList.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-require('./index-89c39a9e.js');
-require('./ComponentWrapper-32481890.js');
+require('./index-d44a0a21.js');
+require('./ComponentWrapper-7302fe1a.js');
 require('@vue/babel-helper-vue-jsx-merge-props');
-require('./Title-584a8cc8.js');
-require('./ListItem-b40adb04.js');
-require('./Card-fd94ef07.js');
-require('./Flex-f146cdad.js');
+require('./Title-39765ee6.js');
+require('./ListItem-933c27e4.js');
+require('./Card-4b915733.js');
+require('./Flex-699639d2.js');
 require('@appbaseio/reactivecore/lib/actions/analytics');
 require('appbase-js');
 require('url-search-params-polyfill');
 var ReactiveBase = require('./ReactiveBase.js');
 require('hotkeys-js');
-var DataSearch = require('./DataSearch-8658fd8e.js');
-require('./CancelSvg-4aa35935.js');
-require('./Input-3cc3fa59.js');
+var DataSearch = require('./DataSearch.js');
+require('./CancelSvg-82021d23.js');
+require('./Input-c6f181d5.js');
 require('compute-scroll-into-view');
-require('./Container-526efa6a.js');
+require('./Container-8a08d663.js');
 require('vue-highlight-words');
-var install = require('./install-35f74190.js');
 require('@appbaseio/reactivecore/lib/utils/suggestions');
-require('./FormControlList-808dbcef.js');
-require('./utils-1219e1fe.js');
+require('./FormControlList-73497794.js');
+require('./utils-23afb20b.js');
 var SingleList = require('./SingleList.js');
 var MultiList = require('./MultiList.js');
-require('./DropDown-cf9bfffc.js');
+require('./DropDown-c46d8b0c.js');
 var SingleDropdownList = require('./SingleDropdownList.js');
 var MultiDropdownList = require('./MultiDropdownList.js');
 var ToggleButton = require('./ToggleButton.js');
@@ -50,10 +50,18 @@ var MultiRange = require('./MultiRange.js');
 var ResultCard = require('./ResultCard.js');
 var ResultList = require('./ResultList.js');
 require('vue-no-ssr');
-require('./ssr-0ee35a09.js');
+require('./ssr-c333c82c.js');
 var RangeSlider = require('./RangeSlider.js');
 var DynamicRangeSlider = require('./DynamicRangeSlider.js');
 var StateProvider = require('./StateProvider.js');
+require('gmap-vue');
+require('gmap-vue/dist/components-implementation/map');
+require('ngeohash');
+var ReactiveGoogleMap = require('./ReactiveGoogleMap.js');
+require('gmap-vue/dist/components/cluster');
+require('gmap-vue/dist/components-implementation/info-window');
+require('gmap-vue/dist/components/marker');
+require('gmap-vue/dist/mixins/map-element');
 require('@appbaseio/reactivecore/lib/reducers/valueReducer');
 require('@appbaseio/reactivecore/lib/reducers/queryReducer');
 require('@appbaseio/reactivecore/lib/reducers/queryOptionsReducer');
@@ -65,22 +73,21 @@ require('@appbaseio/reactivecore/lib/actions/utils');
 var initReactivesearch = require('./initReactivesearch.js');
 var version = require('./version.js');
 var RangeInput = require('./RangeInput.js');
+var install = require('./install.js');
 
 // Add polyfills to support in IE
 
 if (typeof window !== 'undefined' && window.Vue) {
-  install.install(window.Vue);
+  install.default(window.Vue);
 }
 var index = {
   version: version.default,
-  install: install.install
+  install: install.default
 };
 
 exports.ReactiveList = ReactiveList.default;
 exports.ReactiveBase = ReactiveBase.default;
-exports.DataSearch = DataSearch.DataSearch;
-exports.SearchBox = install.SearchBox;
-exports.install = install.install;
+exports.DataSearch = DataSearch.default;
 exports.SingleList = SingleList.default;
 exports.MultiList = MultiList.default;
 exports.SingleDropdownList = SingleDropdownList.default;
@@ -95,7 +102,9 @@ exports.ResultList = ResultList.default;
 exports.RangeSlider = RangeSlider.default;
 exports.DynamicRangeSlider = DynamicRangeSlider.default;
 exports.StateProvider = StateProvider.default;
+exports.ReactiveGoogleMap = ReactiveGoogleMap.default;
 exports.initReactivesearch = initReactivesearch.default;
 exports.version = version.default;
 exports.RangeInput = RangeInput.default;
+exports.install = install.default;
 exports.default = index;

package/dist/cjs/initReactivesearch.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var transform = require('@appbaseio/reactivecore/lib/utils/transform');
@@ -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;