@appbaseio/reactivesearch-vue 1.27.0-gamma.3 → 1.29.0

package/dist/cjs/ReactiveComponent.js

@@ -15,10 +15,7 @@ require('redux');
 var index = require('./index-4509aa45.js');
 var ComponentWrapper = require('./ComponentWrapper-10bad289.js');
 
-var _excluded = ["options"],
-    _excluded2 = ["query"],
-    _excluded3 = ["query"],
-    _excluded4 = ["query"];
+var _excluded = ["options"];
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
     setCustomQuery = configureStore.Actions.setCustomQuery,
@@ -26,15 +23,16 @@ var updateQuery = configureStore.Actions.updateQuery,
 var parseHits = configureStore.helper.parseHits,
     isEqual = configureStore.helper.isEqual,
     getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
-    getResultStats = configureStore.helper.getResultStats;
+    getResultStats = configureStore.helper.getResultStats,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var ReactiveComponent = {
   name: 'ReactiveComponent',
   props: {
     componentId: vueTypes.types.stringRequired,
     aggregationField: vueTypes.types.string,
     aggregationSize: VueTypes.number,
-    size: VueTypes.number.def(20),
+    size: VueTypes.number,
     defaultQuery: vueTypes.types.func,
     customQuery: vueTypes.types.func,
     filterLabel: vueTypes.types.string,
@@ -76,25 +74,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, _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: queryToSet,
+        query: query,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -102,36 +91,35 @@ var ReactiveComponent = {
       });
     }
 
-    this.setQuery = function (_ref2) {
-      var options = _ref2.options,
-          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, _excluded);
+    this.setQuery = function (_ref) {
+      var options = _ref.options,
+          obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
 
-      if (options) {
-        _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 (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 = _rollupPluginBabelHelpers._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 = _rollupPluginBabelHelpers._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, _rollupPluginBabelHelpers._extends({}, _this.getAggsQuery(), options), false);
       }
 
       _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
+        query: customQueryCalc.query,
         componentId: props.componentId,
         label: props.filterLabel,
         showFilter: props.showFilter,
@@ -142,29 +130,22 @@ var ReactiveComponent = {
     if (props.defaultQuery) {
       this.internalComponent = props.componentId + "__internal";
     }
-  },
-  beforeMount: function beforeMount() {
+
     if (this.internalComponent && 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, _excluded2);
+      var _query = extractQueryFromCustomQuery(this.$defaultQuery);
+
+      var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
       if (queryOptions) {
         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: queryToSet
+        query: _query
       });
     }
   },
@@ -212,10 +193,8 @@ var ReactiveComponent = {
     defaultQuery: function defaultQuery(newVal, oldVal) {
       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, _excluded3);
+        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
         if (queryOptions) {
           this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
@@ -223,15 +202,9 @@ var ReactiveComponent = {
 
 
         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: queryToSet
+          query: query
         });
       }
     },
@@ -239,10 +212,8 @@ var ReactiveComponent = {
       if (newVal && !index.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 = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, _excluded4);
+        var query = extractQueryFromCustomQuery(this.$customQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$customQuery);
 
         if (queryOptions) {
           this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
@@ -250,15 +221,9 @@ var ReactiveComponent = {
 
 
         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: queryToSet
+          query: query
         });
       }
     }
@@ -338,6 +303,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/cjs/ReactiveList.js

@@ -14,7 +14,7 @@ var emotion = require('emotion');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
 require('polished');
-var Button = require('./Button-11307285.js');
+var Button = require('./Button-e0b7c1f6.js');
 var vueTypes = require('./vueTypes-57d01f18.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
@@ -437,9 +437,10 @@ var isEqual$1 = configureStore.helper.isEqual,
     getQueryOptions = configureStore.helper.getQueryOptions,
     getClassName$1 = configureStore.helper.getClassName,
     parseHits = configureStore.helper.parseHits,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
     getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
-    getResultStats = configureStore.helper.getResultStats;
+    getResultStats = configureStore.helper.getResultStats,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var ReactiveList = {
   name: 'ReactiveList',
   components: {
@@ -637,19 +638,11 @@ var ReactiveList = {
         var options = getQueryOptions(this.$props);
         options.from = 0;
         this.$defaultQuery = newVal(null, this.$props);
-
-        var _ref = this.$defaultQuery || {},
-            sort = _ref.sort,
-            query = _ref.query;
-
-        if (sort) {
-          options.sort = this.$defaultQuery.sort;
-        }
-
-        var queryOptions = getOptionsFromQuery(this.$defaultQuery);
+        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
         if (queryOptions) {
-          options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(this.$defaultQuery));
+          options = _rollupPluginBabelHelpers._extends({}, options, queryOptions);
         } // Update calculated default query in store
 
 
@@ -740,24 +733,24 @@ var ReactiveList = {
     options.from = this.$data.from;
 
     if (this.sortOptions && this.sortOptions[this.sortOptionIndex]) {
-      var _ref2;
+      var _ref;
 
       var sortField = this.sortOptions[this.sortOptionIndex].dataField;
       var sortBy = this.sortOptions[this.sortOptionIndex].sortBy;
-      options.sort = [(_ref2 = {}, _ref2[sortField] = {
+      options.sort = [(_ref = {}, _ref[sortField] = {
         order: sortBy
-      }, _ref2)]; // To handle sort options for RS API
+      }, _ref)]; // To handle sort options for RS API
 
       this.updateComponentProps(this.componentId, {
         dataField: sortField,
         sortBy: sortBy
       }, constants.componentTypes.reactiveList);
     } else if (this.$props.sortBy) {
-      var _ref3;
+      var _ref2;
 
-      options.sort = [(_ref3 = {}, _ref3[this.$props.dataField] = {
+      options.sort = [(_ref2 = {}, _ref2[this.$props.dataField] = {
         order: this.$props.sortBy
-      }, _ref3)];
+      }, _ref2)];
     } // Override sort query with defaultQuery's sort if defined
 
 
@@ -765,20 +758,13 @@ var ReactiveList = {
 
     if (this.$props.defaultQuery) {
       this.$defaultQuery = this.$props.defaultQuery();
-      options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(this.$defaultQuery));
-
-      if (this.$defaultQuery.sort) {
-        options.sort = this.$defaultQuery.sort;
-      } // Update calculated default query in store
-
+      options = _rollupPluginBabelHelpers._extends({}, options, getOptionsForCustomQuery(this.$defaultQuery)); // Update calculated default query in store
 
       index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props);
     } // execute is set to false at the time of mount
 
 
-    var _ref4 = this.$defaultQuery || {},
-        query = _ref4.query;
-
+    var query = extractQueryFromCustomQuery(this.$defaultQuery);
     var execute = false;
     this.setQueryOptions(this.$props.componentId, _rollupPluginBabelHelpers._extends({}, options, this.getAggsQuery()), execute);
 
@@ -893,18 +879,18 @@ var ReactiveList = {
         }) : 0;
 
         if (props.sortOptions[sortOptionIndex]) {
-          var _ref5;
+          var _ref3;
 
-          options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
+          options.sort = [(_ref3 = {}, _ref3[props.sortOptions[sortOptionIndex].dataField] = {
             order: props.sortOptions[sortOptionIndex].sortBy
-          }, _ref5)];
+          }, _ref3)];
         }
       } else if (props.sortBy) {
-        var _ref6;
+        var _ref4;
 
-        options.sort = [(_ref6 = {}, _ref6[props.dataField] = {
+        options.sort = [(_ref4 = {}, _ref4[props.dataField] = {
           order: props.sortBy
-        }, _ref6)];
+        }, _ref4)];
       }
 
       this.setQueryOptions(this.$props.componentId, _rollupPluginBabelHelpers._extends({}, options, this.getAggsQuery()), true);
@@ -1007,16 +993,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, {
@@ -1181,7 +1167,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) {
@@ -1189,35 +1175,39 @@ ReactiveList.generateQueryOptions = function (props) {
       });
 
       if (sortOption) {
-        var _ref8;
+        var _ref6;
 
-        return _ref8 = {}, _ref8[sortOption.dataField] = {
+        return _ref6 = {}, _ref6[sortOption.dataField] = {
           order: sortOption.sortBy
-        }, _ref8;
+        }, _ref6;
       }
     }
 
-    return _ref9 = {}, _ref9[sortOptionsNew[0].dataField] = {
+    return _ref7 = {}, _ref7[sortOptionsNew[0].dataField] = {
       order: sortOptionsNew[0].sortBy
-    }, _ref9;
+    }, _ref7;
   };
 
   if (sortOptionsNew) {
     options.sort = [getSortOption()];
   } else if (sortBy) {
-    var _ref10;
+    var _ref8;
 
-    options.sort = [(_ref10 = {}, _ref10[dataField] = {
+    options.sort = [(_ref8 = {}, _ref8[dataField] = {
       order: sortBy
-    }, _ref10)];
+    }, _ref8)];
   }
 
   return options;
 };
 
+ReactiveList.hasInternalComponent = function () {
+  return true;
+};
+
 var RLConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(ReactiveList), {
   componentType: constants.componentTypes.reactiveList,
-  internalComponent: true
+  internalComponent: ReactiveList.hasInternalComponent()
 });
 
 ReactiveList.install = function (Vue) {

package/dist/cjs/SelectedFilters.js

@@ -12,7 +12,7 @@ require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var Button = require('./Button-11307285.js');
+var Button = require('./Button-e0b7c1f6.js');
 var vueTypes = require('./vueTypes-57d01f18.js');
 require('redux');
 var index = require('./index-4509aa45.js');
@@ -33,6 +33,7 @@ var SelectedFilters = {
     showClearAll: VueTypes.bool.def(true),
     title: vueTypes.types.title,
     resetToDefault: VueTypes.bool.def(false),
+    clearAllBlacklistComponents: VueTypes.array,
     resetToValues: VueTypes.object
   },
   inject: {
@@ -87,12 +88,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/cjs/SingleDropdownList.js

@@ -12,7 +12,7 @@ var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var Button = require('./Button-11307285.js');
+var Button = require('./Button-e0b7c1f6.js');
 var vueTypes = require('./vueTypes-57d01f18.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
@@ -36,9 +36,10 @@ var getQueryOptions = configureStore.helper.getQueryOptions,
     checkValueChange = configureStore.helper.checkValueChange,
     checkPropChange = configureStore.helper.checkPropChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
     isEqual = configureStore.helper.isEqual,
-    getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery;
+    getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var SingleDropdownList = {
   name: 'SingleDropdownList',
   data: function data() {
@@ -75,7 +76,7 @@ var SingleDropdownList = {
     selectAllLabel: vueTypes.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: vueTypes.types.title,
     URLParams: VueTypes.bool.def(false),
@@ -287,22 +288,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
 
         index.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,
@@ -313,17 +314,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);
         index.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,
@@ -357,7 +356,7 @@ var SingleDropdownList = {
 
       if (props.defaultQuery) {
         var value = this.$data.currentValue;
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
         this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
@@ -449,6 +448,10 @@ SingleDropdownList.generateQueryOptions = function (props, after) {
   }) : utils.getAggsQuery(queryOptions, props);
 };
 
+SingleDropdownList.hasInternalComponent = function () {
+  return true;
+};
+
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -470,7 +473,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(SingleDropdownList), {
   componentType: constants.componentTypes.singleDropdownList,
-  internalComponent: true
+  internalComponent: SingleDropdownList.hasInternalComponent()
 });
 
 SingleDropdownList.install = function (Vue) {

package/dist/cjs/SingleList.js

@@ -31,8 +31,9 @@ var updateQuery = configureStore.Actions.updateQuery,
 var getQueryOptions = configureStore.helper.getQueryOptions,
     checkValueChange = configureStore.helper.checkValueChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
-    isEqual = configureStore.helper.isEqual;
+    isEqual = configureStore.helper.isEqual,
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var SingleList = {
   name: 'SingleList',
   props: {
@@ -269,22 +270,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
 
         index.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,
@@ -295,17 +296,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);
         index.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,
@@ -325,7 +324,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 +469,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 +494,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

@@ -157,17 +157,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));
         index.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,