@appbaseio/reactivesearch-vue 1.27.0-gamma.2 → 1.28.0

package/dist/es/ReactiveComponent.js

@@ -8,10 +8,7 @@ import 'redux';
 import { f as updateCustomQuery, u as updateDefaultQuery, i as isQueryIdentical, c as connect } from './index-78920565.js';
 import { C as ComponentWrapper } from './ComponentWrapper-0f3431d1.js';
 
-var _excluded = ["options"],
-    _excluded2 = ["query"],
-    _excluded3 = ["query"],
-    _excluded4 = ["query"];
+var _excluded = ["options"];
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,
     setCustomQuery = Actions.setCustomQuery,
@@ -19,15 +16,16 @@ var updateQuery = Actions.updateQuery,
 var parseHits = helper.parseHits,
     isEqual = helper.isEqual,
     getCompositeAggsQuery = helper.getCompositeAggsQuery,
-    getOptionsFromQuery = helper.getOptionsFromQuery,
-    getResultStats = helper.getResultStats;
+    getResultStats = helper.getResultStats,
+    extractQueryFromCustomQuery = helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = helper.getOptionsForCustomQuery;
 var ReactiveComponent = {
   name: 'ReactiveComponent',
   props: {
     componentId: types.stringRequired,
     aggregationField: types.string,
     aggregationSize: VueTypes.number,
-    size: VueTypes.number.def(20),
+    size: VueTypes.number,
     defaultQuery: types.func,
     customQuery: types.func,
     filterLabel: types.string,
@@ -69,25 +67,16 @@ var ReactiveComponent = {
 
     if (customQuery) {
       var calcCustomQuery = customQuery(this.selectedValue, props);
-
-      var _ref = calcCustomQuery || {},
-          query = _ref.query;
-
-      var customQueryOptions = calcCustomQuery ? getOptionsFromQuery(calcCustomQuery) : null;
+      var query = extractQueryFromCustomQuery(calcCustomQuery);
+      var customQueryOptions = calcCustomQuery ? getOptionsForCustomQuery(calcCustomQuery) : null;
 
       if (customQueryOptions) {
         this.setQueryOptions(componentId, _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: queryToSet,
+        query: query,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -95,36 +84,35 @@ var ReactiveComponent = {
       });
     }
 
-    this.setQuery = function (_ref2) {
-      var options = _ref2.options,
-          obj = _objectWithoutPropertiesLoose(_ref2, _excluded);
+    this.setQuery = function (_ref) {
+      var options = _ref.options,
+          obj = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-      if (options) {
-        _this.setQueryOptions(props.componentId, _extends({}, options, _this.getAggsQuery()), false);
+      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
+
+      if (queryToBeSet && queryToBeSet.query) {
+        queryToBeSet = queryToBeSet.query;
       }
 
-      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
+      var customQueryCalc = _extends({}, options, {
+        query: queryToBeSet
+      });
 
-      if (obj && obj.query && obj.query.query) {
-        queryToBeSet = obj.query.query;
+      var rsAPIQuery = customQueryCalc; // handle stored queries
+
+      if (queryToBeSet && queryToBeSet.id) {
+        rsAPIQuery = queryToBeSet;
       } // Update customQuery field for RS API
 
 
-      if (obj && obj.query || options) {
-        var customQueryCalc = _extends({}, options);
+      _this.setCustomQuery(props.componentId, rsAPIQuery);
 
-        if (obj && obj.query) {
-          if (obj.query.id) {
-            customQueryCalc = queryToBeSet;
-          } else {
-            customQueryCalc.query = obj.query;
-          }
-        }
-
-        _this.setCustomQuery(props.componentId, customQueryCalc);
+      if (options) {
+        _this.setQueryOptions(props.componentId, _extends({}, _this.getAggsQuery(), options), false);
       }
 
       _this.updateQuery(_extends({}, obj, {
+        query: customQueryCalc.query,
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -135,29 +123,22 @@ var ReactiveComponent = {
     if (props.defaultQuery) {
       this.internalComponent = props.componentId + "__internal";
     }
-  },
-  beforeMount: function beforeMount() {
+
     if (this.internalComponent && this.$props.defaultQuery) {
       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 = _objectWithoutPropertiesLoose(_ref3, _excluded2);
+      var _query = extractQueryFromCustomQuery(this.$defaultQuery);
+
+      var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
       if (queryOptions) {
         this.setQueryOptions(this.internalComponent, _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: queryToSet
+        query: _query
       });
     }
   },
@@ -205,10 +186,8 @@ var ReactiveComponent = {
     defaultQuery: function defaultQuery(newVal, oldVal) {
       if (newVal && !isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
         this.$defaultQuery = newVal(this.selectedValue, this.$props);
-
-        var _ref4 = this.$defaultQuery || {},
-            query = _ref4.query,
-            queryOptions = _objectWithoutPropertiesLoose(_ref4, _excluded3);
+        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
         if (queryOptions) {
           this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, this.getAggsQuery()), false);
@@ -216,15 +195,9 @@ var ReactiveComponent = {
 
 
         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: queryToSet
+          query: query
         });
       }
     },
@@ -232,10 +205,8 @@ var ReactiveComponent = {
       if (newVal && !isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
         var componentId = this.$props.componentId;
         this.$customQuery = newVal(this.selectedValue, this.$props);
-
-        var _ref5 = this.$customQuery || {},
-            query = _ref5.query,
-            queryOptions = _objectWithoutPropertiesLoose(_ref5, _excluded4);
+        var query = extractQueryFromCustomQuery(this.$customQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$customQuery);
 
         if (queryOptions) {
           this.setQueryOptions(componentId, _extends({}, queryOptions, this.getAggsQuery()), false);
@@ -243,15 +214,9 @@ var ReactiveComponent = {
 
 
         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: queryToSet
+          query: query
         });
       }
     }
@@ -331,6 +296,10 @@ var ReactiveComponent = {
   }
 };
 
+ReactiveComponent.hasInternalComponent = function (props) {
+  return !!props.defaultQuery;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     aggregations: state.aggregations[props.componentId] && state.aggregations[props.componentId] || null,

package/dist/es/ReactiveList.js

@@ -429,9 +429,10 @@ var isEqual$1 = helper.isEqual,
     getQueryOptions = helper.getQueryOptions,
     getClassName$1 = helper.getClassName,
     parseHits = helper.parseHits,
-    getOptionsFromQuery = helper.getOptionsFromQuery,
     getCompositeAggsQuery = helper.getCompositeAggsQuery,
-    getResultStats = helper.getResultStats;
+    getResultStats = helper.getResultStats,
+    extractQueryFromCustomQuery = helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = helper.getOptionsForCustomQuery;
 var ReactiveList = {
   name: 'ReactiveList',
   components: {
@@ -629,19 +630,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 = _extends({}, options, getOptionsFromQuery(this.$defaultQuery));
+          options = _extends({}, options, queryOptions);
         } // Update calculated default query in store
 
 
@@ -732,24 +725,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
       }, 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
 
 
@@ -757,20 +750,13 @@ var ReactiveList = {
 
     if (this.$props.defaultQuery) {
       this.$defaultQuery = this.$props.defaultQuery();
-      options = _extends({}, options, getOptionsFromQuery(this.$defaultQuery));
-
-      if (this.$defaultQuery.sort) {
-        options.sort = this.$defaultQuery.sort;
-      } // Update calculated default query in store
-
+      options = _extends({}, options, getOptionsForCustomQuery(this.$defaultQuery)); // Update calculated default query in store
 
       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, _extends({}, options, this.getAggsQuery()), execute);
 
@@ -885,18 +871,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, _extends({}, options, this.getAggsQuery()), true);
@@ -999,16 +985,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, {
@@ -1173,7 +1159,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) {
@@ -1181,35 +1167,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(connect(mapStateToProps, mapDispatchtoProps)(ReactiveList), {
   componentType: componentTypes.reactiveList,
-  internalComponent: true
+  internalComponent: ReactiveList.hasInternalComponent()
 });
 
 ReactiveList.install = function (Vue) {

package/dist/es/SelectedFilters.js

@@ -26,6 +26,7 @@ var SelectedFilters = {
     showClearAll: VueTypes.bool.def(true),
     title: types.title,
     resetToDefault: VueTypes.bool.def(false),
+    clearAllBlacklistComponents: VueTypes.array,
     resetToValues: VueTypes.object
   },
   inject: {
@@ -80,12 +81,13 @@ var SelectedFilters = {
     },
     clearValues: function clearValues() {
       var resetToDefault = this.resetToDefault,
-          resetToValues = this.resetToValues;
+          resetToValues = this.resetToValues,
+          clearAllBlacklistComponents = this.clearAllBlacklistComponents;
 
       if (resetToDefault) {
-        this.resetValuesToDefault();
+        this.resetValuesToDefault(clearAllBlacklistComponents);
       } else {
-        this.clearValuesAction(resetToValues);
+        this.clearValuesAction(resetToValues, clearAllBlacklistComponents);
       }
 
       this.$emit('clear', resetToValues);

package/dist/es/SingleDropdownList.js

@@ -14,12 +14,12 @@ import { C as ComponentWrapper } from './ComponentWrapper-0f3431d1.js';
 import '@vue/babel-helper-vue-jsx-merge-props';
 import { T as Title } from './Title-3522ff56.js';
 import './CancelSvg-c2c03a35.js';
-import './Input-10b1d62d.js';
+import './Input-08bb1bcf.js';
 import 'compute-scroll-into-view';
 import { C as Container } from './Container-18b03fde.js';
 import '@appbaseio/reactivecore/lib/utils/suggestions';
 import { g as getAggsQuery } from './utils-64a2e5f0.js';
-import { D as Dropdown } from './DropDown-0dd8f2a3.js';
+import { D as Dropdown } from './DropDown-60a426a2.js';
 
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,
@@ -29,9 +29,10 @@ var getQueryOptions = helper.getQueryOptions,
     checkValueChange = helper.checkValueChange,
     checkPropChange = helper.checkPropChange,
     getClassName = helper.getClassName,
-    getOptionsFromQuery = helper.getOptionsFromQuery,
     isEqual = helper.isEqual,
-    getCompositeAggsQuery = helper.getCompositeAggsQuery;
+    getCompositeAggsQuery = helper.getCompositeAggsQuery,
+    extractQueryFromCustomQuery = helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = helper.getOptionsForCustomQuery;
 var SingleDropdownList = {
   name: 'SingleDropdownList',
   data: function data() {
@@ -68,7 +69,7 @@ var SingleDropdownList = {
     selectAllLabel: types.string,
     showCount: VueTypes.bool.def(true),
     showFilter: VueTypes.bool.def(true),
-    size: VueTypes.number.def(100),
+    size: VueTypes.number,
     sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
     title: types.title,
     URLParams: VueTypes.bool.def(false),
@@ -280,22 +281,22 @@ var SingleDropdownList = {
       }
     },
     updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-      var defaultQueryOptions;
       var query = SingleDropdownList.defaultQuery(value, props);
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
-        }
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
+        } // Update calculated default query in store
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+        var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
+        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       }
 
-      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       this.updateQuery({
         componentId: this.internalComponent,
         query: query,
@@ -306,17 +307,15 @@ var SingleDropdownList = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = SingleDropdownList.defaultQuery(value, props);
-      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);
         updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+        var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
+        this.setQueryOptions(props.componentId, customQueryOptions, false);
       }
 
-      this.setQueryOptions(props.componentId, customQueryOptions, false);
       this.updateQuery({
         componentId: props.componentId,
         query: query,
@@ -350,7 +349,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, _extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -442,6 +441,10 @@ SingleDropdownList.generateQueryOptions = function (props, after) {
   }) : 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],
@@ -463,7 +466,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper(connect(mapStateToProps, mapDispatchtoProps)(SingleDropdownList), {
   componentType: componentTypes.singleDropdownList,
-  internalComponent: true
+  internalComponent: SingleDropdownList.hasInternalComponent()
 });
 
 SingleDropdownList.install = function (Vue) {

package/dist/es/SingleList.js

@@ -11,7 +11,7 @@ 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-78920565.js';
 import { C as ComponentWrapper } from './ComponentWrapper-0f3431d1.js';
 import { T as Title } from './Title-3522ff56.js';
-import { I as Input } from './Input-10b1d62d.js';
+import { I as Input } from './Input-08bb1bcf.js';
 import { C as Container } from './Container-18b03fde.js';
 import { replaceDiacritics } from '@appbaseio/reactivecore/lib/utils/suggestions';
 import { U as UL, R as Radio } from './FormControlList-704f8dee.js';
@@ -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: {
@@ -262,22 +263,22 @@ var SingleList = {
       checkValueChange(props.componentId, value, props.beforeValueChange, performUpdate);
     },
     updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-      var defaultQueryOptions;
       var query = SingleList.defaultQuery(value, props);
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
-        }
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
+        } // Update calculated default query in store
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+        var defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet);
+        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       }
 
-      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
       this.updateQuery({
         componentId: this.internalComponent,
         query: query,
@@ -288,17 +289,15 @@ var SingleList = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = SingleList.defaultQuery(value, props);
-      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);
+        var customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
         updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+        this.setQueryOptions(props.componentId, customQueryOptions, false);
       }
 
-      this.setQueryOptions(props.componentId, customQueryOptions, false);
       this.updateQuery({
         componentId: props.componentId,
         query: query,
@@ -318,7 +317,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 +462,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 +487,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

@@ -150,17 +150,16 @@ var SingleRange = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = SingleRange.defaultQuery(value, props);
-      var customQueryOptions;
 
       if (customQuery) {
         var _ref = customQuery(value, props) || {};
 
         query = _ref.query;
-        customQueryOptions = getOptionsFromQuery(customQuery(value, props));
+        var customQueryOptions = getOptionsFromQuery(customQuery(value, props));
         updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+        this.setQueryOptions(props.componentId, customQueryOptions, false);
       }
 
-      this.setQueryOptions(props.componentId, customQueryOptions, false);
       this.updateQuery({
         componentId: props.componentId,
         query: query,