@appbaseio/reactivesearch-vue 1.16.0-alpha.3 → 1.16.0-alpha.30

package/dist/cjs/RangeSlider.js

@@ -6,19 +6,19 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-280a574c.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('@appbaseio/vue-emotion');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-e0583d76.js');
-var ComponentWrapper = require('./ComponentWrapper-5a0a8849.js');
-var Title = require('./Title-e9beb554.js');
-var Container = require('./Container-f84e72fc.js');
+var index = require('./index-2a8358cd.js');
+var ComponentWrapper = require('./ComponentWrapper-ab813390.js');
+var Title = require('./Title-39765ee6.js');
+var Container = require('./Container-8a08d663.js');
 var NoSSR = _interopDefault(require('vue-no-ssr'));
-var ssr = require('./ssr-b7a729f9.js');
+var ssr = require('./ssr-c333c82c.js');
 
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
@@ -64,7 +64,8 @@ var RangeSlider = {
     title: vueTypes.types.title,
     URLParams: VueTypes.bool.def(false),
     sliderOptions: VueTypes.object.def({}),
-    nestedField: vueTypes.types.string
+    nestedField: vueTypes.types.string,
+    index: VueTypes.string
   },
   methods: {
     handleSliderChange: function handleSliderChange(values) {
@@ -79,32 +80,28 @@ var RangeSlider = {
         });
       }
     },
-    handleSlider: function handleSlider(values) {
-      var _this = this;
-
-      clearTimeout(this.handleSliderChange._tId);
-      this.handleSliderChange._tId = setTimeout(function () {
-        _this.handleSliderChange(values);
-      }, 100);
+    handleSlider: function handleSlider() {
+      var sliderValues = this.$refs.slider.getValue();
+      this.handleSliderChange(sliderValues);
     },
     handleChange: function handleChange(currentValue, props) {
-      var _this2 = this;
+      var _this = this;
 
       if (props === void 0) {
         props = this.$props;
       }
 
       var performUpdate = function performUpdate() {
-        _this2.currentValue = currentValue;
+        _this.currentValue = currentValue;
 
-        _this2.updateQueryHandler([currentValue[0], currentValue[1]], props);
+        _this.updateQueryHandler([currentValue[0], currentValue[1]], props);
 
-        _this2.$emit('valueChange', {
+        _this.$emit('valueChange', {
           start: currentValue[0],
           end: currentValue[1]
         });
 
-        _this2.$emit('value-change', {
+        _this.$emit('value-change', {
           start: currentValue[0],
           end: currentValue[1]
         });
@@ -136,7 +133,7 @@ var RangeSlider = {
           currentEnd = value[1]; // check if the slider is at its initial position
 
       var isInitialValue = currentStart === start && currentEnd === end;
-      this.setQueryOptions(props.componentId, customQueryOptions);
+      this.setQueryOptions(props.componentId, customQueryOptions, false);
       this.updateQuery({
         componentId: props.componentId,
         query: query,
@@ -172,6 +169,10 @@ var RangeSlider = {
   created: function created() {
     if (!this.$props.range) {
       console.error('%crange is not defined. Read more about this at https://opensource.appbase.io/reactive-manual/vue/range-components/rangeslider.html#props', 'font-size: 12.5px;');
+    }
+
+    if (!this.enableAppbase && this.$props.index) {
+      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
     } // Set custom query in store
 
 
@@ -211,12 +212,13 @@ var RangeSlider = {
         "max": this.$props.range.end,
         "dotSize": 20,
         "height": 4,
-        "enable-cross": false
+        "enable-cross": false,
+        "tooltip": "always"
+      },
+      "on": {
+        "drag-end": this.handleSlider
       },
-      "props": _rollupPluginBabelHelpers._extends({}, this.$props.sliderOptions),
-      "on": _rollupPluginBabelHelpers._extends({}, {
-        input: this.handleSlider
-      })
+      "props": _rollupPluginBabelHelpers._extends({}, this.$props.sliderOptions)
     }), this.$props.rangeLabels && h("div", {
       "class": "label-container"
     }, [h("label", {
@@ -258,7 +260,7 @@ RangeSlider.defaultQuery = function (values, props) {
 
 RangeSlider.parseValue = function (value, props) {
   if (value) {
-    return [value.start, value.end];
+    return Array.isArray(value) ? value : [value.start, value.end];
   }
 
   if (props.range) {
@@ -273,7 +275,8 @@ var mapStateToProps = function mapStateToProps(state, props) {
     options: state.aggregations[props.componentId] ? state.aggregations[props.componentId][props.dataField] && state.aggregations[props.componentId][props.dataField].buckets // eslint-disable-line
     : [],
     selectedValue: state.selectedValues[props.componentId] ? state.selectedValues[props.componentId].value : null,
-    componentProps: state.props[props.componentId]
+    componentProps: state.props[props.componentId],
+    enableAppbase: state.config.enableAppbase
   };
 };
 

package/dist/cjs/ReactiveBase.js

@@ -6,16 +6,16 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-280a574c.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 require('@appbaseio/reactivecore/lib/utils/constants');
+var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('redux');
-var index = require('./index-e0583d76.js');
+var index = require('./index-2a8358cd.js');
 var _mergeJSXProps = _interopDefault(require('@vue/babel-helper-vue-jsx-merge-props'));
-var helper = require('@appbaseio/reactivecore/lib/utils/helper');
 var analytics = require('@appbaseio/reactivecore/lib/actions/analytics');
 var Appbase = _interopDefault(require('appbase-js'));
 require('url-search-params-polyfill');
@@ -49,15 +49,7 @@ var Provider = {
   }
 };
 
-function _templateObject() {
-  var data = _rollupPluginBabelHelpers._taggedTemplateLiteralLoose(["\n\tfont-family: ", ";\n\tfont-size: ", ";\n\tcolor: ", ";\n\twidth: 100%;\n\n\tinput,\n\tbutton,\n\ttextarea,\n\tselect {\n\t\tfont-family: ", ";\n\t}\n\n\t*,\n\t*:before,\n\t*:after {\n\t\tbox-sizing: border-box;\n\t}\n"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
+var _templateObject;
 var Base = {
   functional: true,
   render: function render(h, _ref) {
@@ -69,7 +61,7 @@ var Base = {
     return h(T, _mergeJSXProps([{}, props]), [children]);
   }
 };
-var Base$1 = styled__default(Base)(_templateObject(), function (_ref2) {
+var Base$1 = styled__default(Base)(_templateObject || (_templateObject = _rollupPluginBabelHelpers._taggedTemplateLiteralLoose(["\n\tfont-family: ", ";\n\tfont-size: ", ";\n\tcolor: ", ";\n\twidth: 100%;\n\n\tinput,\n\tbutton,\n\ttextarea,\n\tselect {\n\t\tfont-family: ", ";\n\t}\n\n\t*,\n\t*:before,\n\t*:after {\n\t\tbox-sizing: border-box;\n\t}\n"])), function (_ref2) {
   var theme = _ref2.theme;
   return theme.typography.fontFamily;
 }, function (_ref3) {
@@ -93,7 +85,7 @@ var URLParamsProvider = {
     headers: vueTypes.types.headers,
     getSearchParams: vueTypes.types.func,
     setSearchParams: vueTypes.types.func,
-    as: vueTypes.types.string.def('div')
+    as: VueTypes.string.def('div')
   },
   mounted: function mounted() {
     var _this = this;
@@ -241,7 +233,9 @@ var URLParamsProvider = {
         return value.map(function (item) {
           return _this3.getValue(item);
         });
-      } else if (value && typeof value === 'object') {
+      }
+
+      if (value && typeof value === 'object') {
         // TODO: support for NestedList
         if (value.location) return value;
         if (value.category) return value;
@@ -366,11 +360,11 @@ var ReactiveBase = {
     }
   },
   props: {
-    app: vueTypes.types.stringRequired,
+    app: vueTypes.types.string,
     analytics: VueTypes.bool,
     analyticsConfig: vueTypes.types.analyticsConfig,
     appbaseConfig: vueTypes.types.appbaseConfig,
-    enableAppbase: vueTypes.types.bool.def(false),
+    enableAppbase: VueTypes.bool.def(false),
     credentials: vueTypes.types.string,
     headers: vueTypes.types.headers,
     queryParams: vueTypes.types.string,
@@ -379,13 +373,15 @@ var ReactiveBase = {
     type: vueTypes.types.string,
     url: vueTypes.types.string,
     mapKey: vueTypes.types.string,
+    initialQueriesSyncTime: vueTypes.types.number,
     className: vueTypes.types.string,
     initialState: VueTypes.object.def({}),
     transformRequest: vueTypes.types.func,
     transformResponse: vueTypes.types.func,
     as: VueTypes.string.def('div'),
     getSearchParams: vueTypes.types.func,
-    setSearchParams: vueTypes.types.func
+    setSearchParams: vueTypes.types.func,
+    mongodb: vueTypes.types.mongodb
   },
   provide: function provide() {
     return {
@@ -425,6 +421,27 @@ var ReactiveBase = {
           this.store.dispatch(analytics.updateAnalyticsConfig(newVal));
         }
       }
+    },
+    mongodb: function mongodb() {
+      this.updateState(this.$props);
+    }
+  },
+  computed: {
+    getHeaders: function getHeaders() {
+      var _this$$props = this.$props,
+          enableAppbase = _this$$props.enableAppbase,
+          headers = _this$$props.headers,
+          appbaseConfig = _this$$props.appbaseConfig,
+          mongodb = _this$$props.mongodb;
+
+      var _ref = appbaseConfig || {},
+          enableTelemetry = _ref.enableTelemetry;
+
+      return _rollupPluginBabelHelpers._extends({}, enableAppbase && !mongodb && _rollupPluginBabelHelpers._extends({
+        'X-Search-Client': index.X_SEARCH_CLIENT
+      }, enableTelemetry === false && {
+        'X-Enable-Telemetry': false
+      }), headers);
     }
   },
   methods: {
@@ -435,10 +452,10 @@ var ReactiveBase = {
     setStore: function setStore(props) {
       var credentials = props.url && props.url.trim() !== '' && !props.credentials ? null : props.credentials;
 
-      var appbaseConfig = _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, props.analyticsConfig), props.appbaseConfig);
+      var appbaseConfig = _rollupPluginBabelHelpers._extends({}, props.analyticsConfig, props.appbaseConfig);
 
       var config = {
-        url: props.url && props.url.trim() !== '' ? props.url : 'https://scalr.api.appbase.io',
+        url: props.url && props.url.trim() !== '' ? props.url : '',
         app: props.app,
         credentials: credentials,
         type: props.type ? props.type : '*',
@@ -446,7 +463,8 @@ var ReactiveBase = {
         transformResponse: props.transformResponse,
         enableAppbase: props.enableAppbase,
         analytics: props.appbaseConfig ? props.appbaseConfig.recordAnalytics : props.analytics,
-        analyticsConfig: appbaseConfig
+        analyticsConfig: appbaseConfig,
+        mongodb: props.mongodb
       };
       var queryParams = '';
 
@@ -458,9 +476,10 @@ var ReactiveBase = {
 
       var params = new URLSearchParams(queryParams);
       var selectedValues = {};
+      var urlValues = {};
       Array.from(params.keys()).forEach(function (key) {
         try {
-          var _extends2;
+          var _extends2, _extends3;
 
           var parsedParams = JSON.parse(params.get(key));
           var selectedValue = {};
@@ -472,13 +491,13 @@ var ReactiveBase = {
           }
 
           if (parsedParams.category) selectedValue.category = parsedParams.category;
-          selectedValues = _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, selectedValues), {}, (_extends2 = {}, _extends2[key] = selectedValue, _extends2));
+          selectedValue.reference = 'URL';
+          selectedValues = _rollupPluginBabelHelpers._extends({}, selectedValues, (_extends2 = {}, _extends2[key] = selectedValue, _extends2));
+          urlValues = _rollupPluginBabelHelpers._extends({}, urlValues, (_extends3 = {}, _extends3[key] = selectedValue.value, _extends3));
         } catch (e) {// Do not add to selectedValues if JSON parsing fails.
         }
       });
-      var _props$headers = props.headers,
-          headers = _props$headers === void 0 ? {} : _props$headers,
-          themePreset = props.themePreset;
+      var themePreset = props.themePreset;
       var appbaseRef = Appbase(config);
 
       if (this.$props.transformRequest) {
@@ -490,13 +509,16 @@ var ReactiveBase = {
       }
 
       var initialState = _rollupPluginBabelHelpers._extends({
-        config: _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, config), {}, {
+        config: _rollupPluginBabelHelpers._extends({}, config, {
+          initialQueriesSyncTime: props.initialQueriesSyncTime,
+          initialTimestamp: new Date().getTime(),
           mapKey: props.mapKey,
           themePreset: themePreset
         }),
         appbaseRef: appbaseRef,
         selectedValues: selectedValues,
-        headers: headers
+        urlValues: urlValues,
+        headers: this.getHeaders
       }, this.$props.initialState);
 
       this.store = configureStore__default(initialState);
@@ -505,10 +527,9 @@ var ReactiveBase = {
   render: function render() {
     var h = arguments[0];
     var children = this.$slots["default"];
-    var _this$$props = this.$props,
-        headers = _this$$props.headers,
-        style = _this$$props.style,
-        className = _this$$props.className;
+    var _this$$props2 = this.$props,
+        style = _this$$props2.style,
+        className = _this$$props2.className;
     return h(Provider, {
       "attrs": {
         "store": this.store
@@ -516,7 +537,7 @@ var ReactiveBase = {
     }, [h(URLParamsProvider$1, {
       "attrs": {
         "as": this.$props.as,
-        "headers": headers,
+        "headers": this.getHeaders,
         "className": className,
         "getSearchParams": this.getSearchParams,
         "setSearchParams": this.setSearchParams

package/dist/cjs/ReactiveComponent.js

@@ -6,15 +6,19 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-280a574c.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-e0583d76.js');
-var ComponentWrapper = require('./ComponentWrapper-5a0a8849.js');
+var index = require('./index-2a8358cd.js');
+var ComponentWrapper = require('./ComponentWrapper-ab813390.js');
 
+var _excluded = ["options"],
+    _excluded2 = ["query"],
+    _excluded3 = ["query"],
+    _excluded4 = ["query"];
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
     setCustomQuery = configureStore.Actions.setCustomQuery,
@@ -38,7 +42,8 @@ var ReactiveComponent = {
     showFilter: VueTypes.bool.def(true),
     URLParams: VueTypes.bool.def(false),
     distinctField: vueTypes.types.string,
-    distinctFieldConfig: vueTypes.types.props
+    distinctFieldConfig: vueTypes.types.props,
+    index: VueTypes.string
   },
   created: function created() {
     var _this = this;
@@ -47,25 +52,30 @@ var ReactiveComponent = {
     this.internalComponent = null;
     this.$defaultQuery = null; // Set custom query in store
 
-    index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+    index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
     var customQuery = props.customQuery,
         componentId = props.componentId,
         filterLabel = props.filterLabel,
         showFilter = props.showFilter,
         URLParams = props.URLParams,
         distinctField = props.distinctField,
-        distinctFieldConfig = props.distinctFieldConfig;
+        distinctFieldConfig = props.distinctFieldConfig,
+        index$1 = props.index;
 
-    if (this.config.enableAppbase && this.aggregationField && this.aggregationField !== '') {
+    if (this.enableAppbase && this.aggregationField && this.aggregationField !== '') {
       console.warn('Warning(ReactiveSearch): The `aggregationField` prop has been marked as deprecated, please use the `distinctField` prop instead.');
     }
 
-    if (!this.config.enableAppbase && (distinctField || distinctFieldConfig)) {
+    if (!this.enableAppbase && (distinctField || distinctFieldConfig)) {
       console.warn('Warning(ReactiveSearch): In order to use the `distinctField` and `distinctFieldConfig` props, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
     }
 
+    if (!this.enableAppbase && index$1) {
+      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
+    }
+
     if (customQuery) {
-      var calcCustomQuery = customQuery(props);
+      var calcCustomQuery = customQuery(this.selectedValue, props);
 
       var _ref = calcCustomQuery || {},
           query = _ref.query;
@@ -73,12 +83,18 @@ var ReactiveComponent = {
       var customQueryOptions = calcCustomQuery ? getOptionsFromQuery(calcCustomQuery) : null;
 
       if (customQueryOptions) {
-        this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, customQueryOptions), this.getAggsQuery()), false);
+        this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, customQueryOptions, this.getAggsQuery()), false);
       } else this.setQueryOptions(componentId, this.getAggsQuery(), false);
 
+      var queryToSet = query || null;
+
+      if (calcCustomQuery && calcCustomQuery.id) {
+        queryToSet = calcCustomQuery;
+      }
+
       this.updateQuery({
         componentId: componentId,
-        query: query,
+        query: queryToSet,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -88,10 +104,16 @@ var ReactiveComponent = {
 
     this.setQuery = function (_ref2) {
       var options = _ref2.options,
-          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, ["options"]);
+          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, _excluded);
 
       if (options) {
-        _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, options), _this.getAggsQuery()), false);
+        _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends({}, options, _this.getAggsQuery()), false);
+      }
+
+      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
+
+      if (obj && obj.query && obj.query.query) {
+        queryToBeSet = obj.query.query;
       } // Update customQuery field for RS API
 
 
@@ -99,13 +121,17 @@ var ReactiveComponent = {
         var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options);
 
         if (obj && obj.query) {
-          customQueryCalc.query = obj.query;
+          if (obj.query.id) {
+            customQueryCalc = queryToBeSet;
+          } else {
+            customQueryCalc.query = obj.query;
+          }
         }
 
         _this.setCustomQuery(props.componentId, customQueryCalc);
       }
 
-      _this.updateQuery(_rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, obj), {}, {
+      _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -119,20 +145,26 @@ var ReactiveComponent = {
   },
   beforeMount: function beforeMount() {
     if (this.internalComponent && this.$props.defaultQuery) {
-      index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
-      this.$defaultQuery = this.$props.defaultQuery();
+      index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
+      this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
 
       var _ref3 = this.$defaultQuery || {},
           query = _ref3.query,
-          queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, ["query"]);
+          queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, _excluded2);
 
       if (queryOptions) {
-        this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), this.getAggsQuery()), false);
+        this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
       } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false);
 
+      var queryToSet = query || null;
+
+      if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+        queryToSet = this.$defaultQuery;
+      }
+
       this.updateQuery({
         componentId: this.internalComponent,
-        query: query || null
+        query: queryToSet
       });
     }
   },
@@ -178,43 +210,55 @@ var ReactiveComponent = {
       }
     },
     defaultQuery: function defaultQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
-        this.$defaultQuery = newVal();
+      if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
+        this.$defaultQuery = newVal(this.selectedValue, this.$props);
 
         var _ref4 = this.$defaultQuery || {},
             query = _ref4.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, ["query"]);
+            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, _excluded3);
 
         if (queryOptions) {
-          this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), this.getAggsQuery()), false);
+          this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
         } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false); // Update default query for RS API
 
 
-        index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
+        index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
+        var queryToSet = query || null;
+
+        if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
+          queryToSet = this.$defaultQuery;
+        }
+
         this.updateQuery({
           componentId: this.internalComponent,
-          query: query || null
+          query: queryToSet
         });
       }
     },
     customQuery: function customQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
+      if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
         var componentId = this.$props.componentId;
-        this.$customQuery = newVal(this.$props);
+        this.$customQuery = newVal(this.selectedValue, this.$props);
 
         var _ref5 = this.$customQuery || {},
             query = _ref5.query,
-            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, ["query"]);
+            queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, _excluded4);
 
         if (queryOptions) {
-          this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), this.getAggsQuery()), false);
+          this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
         } else this.setQueryOptions(componentId, this.getAggsQuery(), false); // Update custom query for RS API
 
 
-        index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+        index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
+        var queryToSet = query || null;
+
+        if (this.$customQuery && this.$customQuery.id) {
+          queryToSet = this.$customQuery;
+        }
+
         this.updateQuery({
           componentId: componentId,
-          query: query || null
+          query: queryToSet
         });
       }
     }
@@ -228,10 +272,10 @@ var ReactiveComponent = {
           isLoading = this.isLoading,
           selectedValue = this.selectedValue;
 
-      var propsToBePassed = _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({
+      var propsToBePassed = _rollupPluginBabelHelpers._extends({
         error: error,
         loading: isLoading
-      }, this.getData()), {}, {
+      }, this.getData(), {
         value: selectedValue,
         setQuery: this.setQuery
       });
@@ -308,7 +352,7 @@ var mapStateToProps = function mapStateToProps(state, props) {
     total: state.hits[props.componentId] && state.hits[props.componentId].total,
     hidden: state.hits[props.componentId] && state.hits[props.componentId].hidden,
     componentProps: state.props[props.componentId],
-    config: state.config
+    enableAppbase: state.config.enableAppbase
   };
 };