@appbaseio/reactivesearch-vue 1.24.0 → 1.25.0

package/dist/@appbaseio/reactivesearch-vue.umd.js

@@ -36,14 +36,9 @@
 
 	  if (Object.getOwnPropertySymbols) {
 	    var symbols = Object.getOwnPropertySymbols(object);
-
-	    if (enumerableOnly) {
-	      symbols = symbols.filter(function (sym) {
-	        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-	      });
-	    }
-
-	    keys.push.apply(keys, symbols);
+	    enumerableOnly && (symbols = symbols.filter(function (sym) {
+	      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+	    })), keys.push.apply(keys, symbols);
 	  }
 
 	  return keys;
@@ -51,19 +46,12 @@
 
 	function _objectSpread2(target) {
 	  for (var i = 1; i < arguments.length; i++) {
-	    var source = arguments[i] != null ? arguments[i] : {};
-
-	    if (i % 2) {
-	      ownKeys(Object(source), true).forEach(function (key) {
-	        _defineProperty(target, key, source[key]);
-	      });
-	    } else if (Object.getOwnPropertyDescriptors) {
-	      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-	    } else {
-	      ownKeys(Object(source)).forEach(function (key) {
-	        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-	      });
-	    }
+	    var source = null != arguments[i] ? arguments[i] : {};
+	    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+	      _defineProperty(target, key, source[key]);
+	    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+	      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+	    });
 	  }
 
 	  return target;
@@ -751,23 +739,36 @@
 		createStore: createStore
 	});
 
+	/** A function that accepts a potential "extra argument" value to be injected later,
+	 * and returns an instance of the thunk middleware that uses that value
+	 */
 	function createThunkMiddleware(extraArgument) {
-	  return function (_ref) {
+	  // Standard Redux middleware definition pattern:
+	  // See: https://redux.js.org/tutorials/fundamentals/part-4-store#writing-custom-middleware
+	  var middleware = function middleware(_ref) {
 	    var dispatch = _ref.dispatch,
 	        getState = _ref.getState;
 	    return function (next) {
 	      return function (action) {
+	        // The thunk middleware looks for any functions that were passed to `store.dispatch`.
+	        // If this "action" is really a function, call it and return the result.
 	        if (typeof action === 'function') {
+	          // Inject the store's `dispatch` and `getState` methods, as well as any "extra arg"
 	          return action(dispatch, getState, extraArgument);
-	        }
+	        } // Otherwise, pass the action down the middleware chain as usual
+
 
 	        return next(action);
 	      };
 	    };
 	  };
+
+	  return middleware;
 	}
 
-	var thunk = createThunkMiddleware();
+	var thunk = createThunkMiddleware(); // Attach the factory function so users can create a customized version
+	// with whatever "extra arg" they want to inject into their thunks
+
 	thunk.withExtraArgument = createThunkMiddleware;
 
 	var constants = createCommonjsModule(function (module, exports) {
@@ -1193,6 +1194,7 @@
 	    reactiveList: 'REACTIVELIST',
 	    dataSearch: 'DATASEARCH',
 	    categorySearch: 'CATEGORYSEARCH',
+	    searchBox: 'SUGGESTION',
 	    singleList: 'SINGLELIST',
 	    multiList: 'MULTILIST',
 	    singleDataList: 'SINGLEDATALIST',
@@ -1221,9 +1223,10 @@
 	    search: 'search',
 	    term: 'term',
 	    range: 'range',
-	    geo: 'geo'
+	    geo: 'geo',
+	    suggestion: 'suggestion'
 	  };
-	  var validProps = exports.validProps = ['componentType', 'aggregationField', 'aggregationSize', 'distinctField', 'distinctFieldConfig', 'index', 'dataField', 'includeFields', 'excludeFields', 'size', 'from', 'sortBy', 'sortOptions', 'pagination', 'autoFocus', 'autosuggest', 'debounce', 'defaultValue', 'defaultSuggestions', 'fieldWeights', 'filterLabel', 'fuzziness', 'highlight', 'highlightField', 'nestedField', 'placeholder', 'queryFormat', 'searchOperators', 'enableSynonyms', 'enableQuerySuggestions', 'enablePopularSuggestions', 'queryString', 'categoryField', 'strictSelection', 'selectAllLabel', 'showCheckbox', 'showFilter', 'showSearch', 'showCount', 'showLoadMore', 'loadMoreLabel', 'showMissing', 'missingLabel', 'data', 'showRadio', 'multiSelect', 'includeNullValues', 'interval', 'showHistogram', 'snap', 'stepValue', 'range', 'showSlider', 'parseDate', 'unit'];
+	  var validProps = exports.validProps = ['componentType', 'aggregationField', 'aggregationSize', 'distinctField', 'distinctFieldConfig', 'index', 'dataField', 'includeFields', 'excludeFields', 'size', 'from', 'sortBy', 'sortOptions', 'pagination', 'autoFocus', 'autosuggest', 'debounce', 'defaultValue', 'defaultSuggestions', 'fieldWeights', 'filterLabel', 'fuzziness', 'highlight', 'highlightField', 'nestedField', 'placeholder', 'queryFormat', 'searchOperators', 'enableSynonyms', 'enableQuerySuggestions', 'enablePopularSuggestions', 'queryString', 'categoryField', 'strictSelection', 'selectAllLabel', 'showCheckbox', 'showFilter', 'showSearch', 'showCount', 'showLoadMore', 'loadMoreLabel', 'showMissing', 'missingLabel', 'data', 'showRadio', 'multiSelect', 'includeNullValues', 'interval', 'showHistogram', 'snap', 'stepValue', 'range', 'showSlider', 'parseDate', 'calendarInterval', 'unit', 'enablePopularSuggestions', 'popularSuggestionsConfig', 'enableRecentSuggestions', 'recentSuggestionsConfig', 'enablePredictiveSuggestions', 'applyStopwords', 'customStopwords'];
 	  var CLEAR_ALL = exports.CLEAR_ALL = {
 	    NEVER: 'never',
 	    ALWAYS: 'always',
@@ -2749,7 +2752,12 @@
 	      var aggsResponse = Object.values(action.aggregations) && Object.values(action.aggregations)[0];
 	      var fieldName = Object.keys(action.aggregations)[0];
 	      if (!aggsResponse) return state;
-	      var buckets = aggsResponse.buckets || [];
+	      var buckets = [];
+
+	      if (aggsResponse.buckets && Array.isArray(aggsResponse.buckets)) {
+	        buckets = aggsResponse.buckets;
+	      }
+
 	      var parsedAggs = buckets.map(function (bucket) {
 	        var doc_count = bucket.doc_count,
 	            key = bucket.key,
@@ -2765,7 +2773,7 @@
 
 	        return _extends({
 	          _doc_count: doc_count,
-	          _key: key[fieldName],
+	          _key: typeof key === 'string' ? key : key[fieldName],
 	          top_hits: hitsData
 	        }, flatData, _source);
 	      });
@@ -2775,7 +2783,7 @@
 	    return state;
 	  }
 	});
-	unwrapExports(compositeAggsReducer_1);
+	var compositeAggsReducer = unwrapExports(compositeAggsReducer_1);
 
 	var appliedSettingsReducer_1 = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -4557,6 +4565,8 @@
 	    return target;
 	  };
 
+	  exports.replaceDiacritics = replaceDiacritics;
+
 	  var _diacritics2 = _interopRequireDefault(diacritics_1);
 
 	  function _interopRequireDefault(obj) {
@@ -4834,6 +4844,7 @@
 	  exports["default"] = getSuggestions;
 	});
 	unwrapExports(suggestions);
+	var suggestions_1 = suggestions.replaceDiacritics;
 
 	var helper = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -4867,6 +4878,7 @@
 	  exports.extractFieldsFromSource = extractFieldsFromSource;
 	  exports.normalizeDataField = normalizeDataField;
 	  exports.handleOnSuggestions = handleOnSuggestions;
+	  exports.isValidDateRangeQueryFormat = isValidDateRangeQueryFormat;
 
 	  var _dateFormats2 = _interopRequireDefault(dateFormats_1);
 
@@ -5255,7 +5267,7 @@
 	      case 'epoch_millis':
 	        return date.getTime();
 
-	      case 'epoch_seconds':
+	      case 'epoch_second':
 	        return Math.floor(date.getTime() / 1000);
 
 	      default:
@@ -5648,6 +5660,10 @@
 	    });
 	    return withClickIds(finalSuggestions);
 	  };
+
+	  function isValidDateRangeQueryFormat(queryFormat) {
+	    return Object.keys(_dateFormats2["default"]).includes(queryFormat);
+	  }
 	});
 	unwrapExports(helper);
 	var helper_1 = helper.getTopSuggestions;
@@ -5678,6 +5694,7 @@
 	var helper_26 = helper.extractFieldsFromSource;
 	var helper_27 = helper.normalizeDataField;
 	var helper_28 = helper.handleOnSuggestions;
+	var helper_29 = helper.isValidDateRangeQueryFormat;
 
 	var value = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -6036,6 +6053,7 @@
 	  exports.updateCompositeAggs = updateCompositeAggs;
 	  exports.updateHits = updateHits;
 	  exports.saveQueryToHits = saveQueryToHits;
+	  exports.mockDataForTesting = mockDataForTesting;
 
 	  function updateAggs(component, aggregations) {
 	    var append = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -6077,12 +6095,25 @@
 	      query: query
 	    };
 	  }
+
+	  function mockDataForTesting(component, data) {
+	    return function (dispatch) {
+	      if (data.hasOwnProperty('aggregations')) {
+	        dispatch(updateAggs(component, data.aggregations));
+	      }
+
+	      if (data.hasOwnProperty('hits')) {
+	        dispatch(updateHits(component, data, data.time || undefined));
+	      }
+	    };
+	  }
 	});
 	unwrapExports(hits);
 	var hits_1 = hits.updateAggs;
 	var hits_2 = hits.updateCompositeAggs;
 	var hits_3 = hits.updateHits;
 	var hits_4 = hits.saveQueryToHits;
+	var hits_5 = hits.mockDataForTesting;
 
 	var xdate = createCommonjsModule(function (module) {
 	  /**
@@ -6910,6 +6941,8 @@
 
 	  var _xdate2 = _interopRequireDefault(xdate);
 
+	  var _dateFormats2 = _interopRequireDefault(dateFormats_1);
+
 	  function _interopRequireDefault(obj) {
 	    return obj && obj.__esModule ? obj : {
 	      "default": obj
@@ -6943,10 +6976,10 @@
 	    return obj;
 	  }
 
-	  var componentToTypeMap = exports.componentToTypeMap = (_componentToTypeMap = {}, _defineProperty(_componentToTypeMap, constants$1.componentTypes.reactiveList, constants$1.queryTypes.search), _defineProperty(_componentToTypeMap, constants$1.componentTypes.dataSearch, constants$1.queryTypes.search), _defineProperty(_componentToTypeMap, constants$1.componentTypes.categorySearch, constants$1.queryTypes.search), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleDataList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleDropdownList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiDataList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiDropdownList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.tagCloud, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.toggleButton, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.numberBox, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.datePicker, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.dateRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.dynamicRangeSlider, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleDropdownRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiDropdownRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.rangeSlider, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.ratingsFilter, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.rangeInput, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.geoDistanceDropdown, constants$1.queryTypes.geo), _defineProperty(_componentToTypeMap, constants$1.componentTypes.geoDistanceSlider, constants$1.queryTypes.geo), _defineProperty(_componentToTypeMap, constants$1.componentTypes.reactiveMap, constants$1.queryTypes.geo), _componentToTypeMap);
+	  var componentToTypeMap = exports.componentToTypeMap = (_componentToTypeMap = {}, _defineProperty(_componentToTypeMap, constants$1.componentTypes.reactiveList, constants$1.queryTypes.search), _defineProperty(_componentToTypeMap, constants$1.componentTypes.dataSearch, constants$1.queryTypes.search), _defineProperty(_componentToTypeMap, constants$1.componentTypes.categorySearch, constants$1.queryTypes.search), _defineProperty(_componentToTypeMap, constants$1.componentTypes.searchBox, constants$1.queryTypes.suggestion), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleDataList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleDropdownList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiDataList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiDropdownList, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.tagCloud, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.toggleButton, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.numberBox, constants$1.queryTypes.term), _defineProperty(_componentToTypeMap, constants$1.componentTypes.datePicker, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.dateRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.dynamicRangeSlider, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleDropdownRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiDropdownRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.singleRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.multiRange, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.rangeSlider, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.ratingsFilter, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.rangeInput, constants$1.queryTypes.range), _defineProperty(_componentToTypeMap, constants$1.componentTypes.geoDistanceDropdown, constants$1.queryTypes.geo), _defineProperty(_componentToTypeMap, constants$1.componentTypes.geoDistanceSlider, constants$1.queryTypes.geo), _defineProperty(_componentToTypeMap, constants$1.componentTypes.reactiveMap, constants$1.queryTypes.geo), _componentToTypeMap);
 	  var multiRangeComponents = [constants$1.componentTypes.multiRange, constants$1.componentTypes.multiDropdownRange];
 	  var dateRangeComponents = [constants$1.componentTypes.dateRange, constants$1.componentTypes.datePicker];
-	  var searchComponents = [constants$1.componentTypes.categorySearch, constants$1.componentTypes.dataSearch];
+	  var searchComponents = [constants$1.componentTypes.categorySearch, constants$1.componentTypes.dataSearch, constants$1.componentTypes.searchBox];
 	  var listComponentsWithPagination = [constants$1.componentTypes.singleList, constants$1.componentTypes.multiList, constants$1.componentTypes.singleDropdownList, constants$1.componentTypes.multiDropdownList];
 
 	  var getNormalizedField = exports.getNormalizedField = function getNormalizedField(field) {
@@ -7002,7 +7035,7 @@
 	        return null;
 	      }
 
-	      return {
+	      return _extends({
 	        id: componentId,
 	        type: queryType,
 	        dataField: getNormalizedField(props.dataField),
@@ -7041,7 +7074,17 @@
 	        distinctField: props.distinctField,
 	        distinctFieldConfig: props.distinctFieldConfig,
 	        index: props.index
-	      };
+	      }, queryType === constants$1.queryTypes.suggestion ? {
+	        enablePopularSuggestions: props.enablePopularSuggestions,
+	        enableRecentSuggestions: props.enableRecentSuggestions,
+	        popularSuggestionsConfig: props.popularSuggestionsConfig,
+	        recentSuggestionsConfig: props.recentSuggestionsConfig,
+	        applyStopwords: props.applyStopwords,
+	        customStopwords: props.customStopwords,
+	        enablePredictiveSuggestions: props.enablePredictiveSuggestions
+	      } : {}, {
+	        calendarInterval: props.calendarInterval
+	      });
 	    }
 
 	    return null;
@@ -7071,6 +7114,7 @@
 	    var calcValues = store.selectedValues[component] || store.internalValues[component];
 	    var value = calcValues !== undefined && calcValues !== null ? calcValues.value : undefined;
 	    var queryFormat = componentProps.queryFormat;
+	    var calendarInterval = void 0;
 	    var interval = componentProps.interval;
 	    var type = componentToTypeMap[componentProps.componentType];
 	    var dataField = componentProps.dataField;
@@ -7139,6 +7183,24 @@
 	        aggregations = ['histogram'];
 	      }
 
+	      if (componentProps.componentType === constants$1.componentTypes.dynamicRangeSlider || componentProps.componentType === constants$1.componentTypes.rangeSlider) {
+	        calendarInterval = Object.keys(_dateFormats2["default"]).includes(queryFormat) ? componentProps.calendarInterval || 'month' : undefined;
+
+	        if (value) {
+	          if ((0, helper.isValidDateRangeQueryFormat)(componentProps.queryFormat)) {
+	            value = {
+	              start: (0, helper.formatDate)(new _xdate2["default"](value.start), componentProps),
+	              end: (0, helper.formatDate)(new _xdate2["default"](value.end), componentProps)
+	            };
+	          } else {
+	            value = {
+	              start: parseFloat(value.start),
+	              end: parseFloat(value.end)
+	            };
+	          }
+	        }
+	      }
+
 	      if (dateRangeComponents.includes(componentProps.componentType)) {
 	        queryFormat = 'or';
 
@@ -7261,6 +7323,7 @@
 	    }
 
 	    return _extends({}, componentProps, {
+	      calendarInterval: calendarInterval,
 	      dataField: dataField,
 	      queryFormat: queryFormat,
 	      type: type,
@@ -7271,7 +7334,7 @@
 	      defaultQuery: store.defaultQueries ? store.defaultQueries[component] : undefined,
 	      customHighlight: store.customHighlightOptions ? store.customHighlightOptions[component] : undefined,
 	      categoryValue: store.internalValues[component] ? store.internalValues[component].category : undefined,
-	      value: value,
+	      value: componentProps.componentType === constants$1.componentTypes.searchBox ? value || undefined : value,
 	      pagination: pagination,
 	      from: from
 	    }, customOptions);
@@ -7307,7 +7370,8 @@
 	    var orderOfQueries = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
 	    var finalQuery = {};
 	    var react = flatReactProp(store.dependencyTree[componentID], componentID);
-	    react.forEach(function (component) {
+	    react.forEach(function (componentObject) {
+	      var component = componentObject;
 	      var customQuery = store.customQueries[component];
 
 	      if (!isInternalComponent(component)) {
@@ -7320,7 +7384,11 @@
 	            execute = true;
 	          }
 
-	          var dependentQuery = getRSQuery(component, extractPropsFromState(store, component), execute);
+	          var dependentQuery = getRSQuery(component, extractPropsFromState(store, component, _extends({}, store.props[component].componentType === constants$1.componentTypes.searchBox ? _extends({}, execute === false ? {
+	            type: constants$1.queryTypes.search
+	          } : {}, calcValues.category ? {
+	            categoryValue: calcValues.category
+	          } : {}) : {})), execute);
 
 	          if (dependentQuery) {
 	            finalQuery[component] = dependentQuery;
@@ -13948,9 +14016,14 @@
 	    }
 
 	    this.internalComponent = this.$props.componentId + "__internal";
-	    this.sortOptionIndex = this.defaultSortOption ? this.sortOptions.findIndex(function (s) {
-	      return s.label === _this.defaultSortOption;
-	    }) : 0;
+	    this.sortOptionIndex = 0;
+
+	    if (this.defaultSortOption && this.sortOptions && Array.isArray(this.sortOptions)) {
+	      this.sortOptionIndex = this.sortOptions.findIndex(function (s) {
+	        return s.label === _this.defaultSortOption;
+	      });
+	    }
+
 	    this.updateComponentProps(this.componentId, {
 	      from: this.from
 	    }, constants_1$1.reactiveList);
@@ -13960,7 +14033,7 @@
 	  },
 	  props: {
 	    currentPage: VueTypes.number.def(0),
-	    includeFields: types.includeFields.def(['*']),
+	    includeFields: types.includeFields,
 	    // component props
 	    className: types.string,
 	    componentId: types.stringRequired,
@@ -13969,7 +14042,7 @@
 	    aggregationSize: VueTypes.number,
 	    defaultQuery: types.func,
 	    defaultSortOption: types.string,
-	    excludeFields: types.excludeFields.def([]),
+	    excludeFields: types.excludeFields,
 	    innerClass: types.style,
 	    listClass: VueTypes.string.def(''),
 	    loader: types.title,
@@ -13981,7 +14054,7 @@
 	    pages: VueTypes.number.def(5),
 	    pagination: VueTypes.bool.def(false),
 	    infiniteScroll: VueTypes.bool.def(true),
-	    paginationAt: types.paginationAt.def('bottom'),
+	    paginationAt: VueTypes.oneOf(['top', 'bottom', 'both']).def('bottom'),
 	    react: types.react,
 	    scrollOnChange: VueTypes.bool.def(true),
 	    showResultStats: VueTypes.bool.def(true),
@@ -14182,11 +14255,11 @@
 	    var options = getQueryOptions(this.$props);
 	    options.from = this.$data.from;
 
-	    if (this.$props.sortOptions) {
+	    if (this.sortOptions && this.sortOptions[this.sortOptionIndex]) {
 	      var _ref2;
 
-	      var sortField = this.$props.sortOptions[this.sortOptionIndex].dataField;
-	      var sortBy = this.$props.sortOptions[this.sortOptionIndex].sortBy;
+	      var sortField = this.sortOptions[this.sortOptionIndex].dataField;
+	      var sortBy = this.sortOptions[this.sortOptionIndex].sortBy;
 	      options.sort = [(_ref2 = {}, _ref2[sortField] = {
 	        order: sortBy
 	      }, _ref2)]; // To handle sort options for RS API
@@ -14256,10 +14329,10 @@
 	      "class": this.$props.className
 	    }, [this.isLoading && this.shouldRenderPagination && this.showInfiniteScroll && (this.$scopedSlots.loader || this.$props.loader), this.renderErrorComponent(), h(Flex, {
 	      "attrs": {
-	        "labelPosition": this.$props.sortOptions ? 'right' : 'left'
+	        "labelPosition": this.sortOptions ? 'right' : 'left'
 	      },
 	      "class": getClassName$1(this.$props.innerClass, 'resultsInfo')
-	    }, [this.$props.sortOptions ? this.renderSortOptions() : null, this.$props.showResultStats && results.length ? this.renderStats() : null]), !this.isLoading && results.length === 0 ? this.renderNoResult() : null, this.shouldRenderPagination && (this.$props.paginationAt === 'top' || this.$props.paginationAt === 'both') ? h(Pagination, {
+	    }, [this.sortOptions ? this.renderSortOptions() : null, this.$props.showResultStats && results.length ? this.renderStats() : null]), !this.isLoading && results.length === 0 ? this.renderNoResult() : null, this.shouldRenderPagination && (this.$props.paginationAt === 'top' || this.$props.paginationAt === 'both') ? h(Pagination, {
 	      "attrs": {
 	        "pages": this.$props.pages,
 	        "totalPages": this.totalPages,
@@ -14330,15 +14403,18 @@
 	      var options = getQueryOptions(props);
 	      options.from = this.$data.from;
 
-	      if (props.sortOptions) {
-	        var _ref5;
-
+	      if (props.sortOptions && Array.isArray(props.sortOptions)) {
 	        var sortOptionIndex = props.defaultSortOption ? props.sortOptions.findIndex(function (s) {
 	          return s.label === props.defaultSortOption;
 	        }) : 0;
-	        options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
-	          order: props.sortOptions[sortOptionIndex].sortBy
-	        }, _ref5)];
+
+	        if (props.sortOptions[sortOptionIndex]) {
+	          var _ref5;
+
+	          options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
+	            order: props.sortOptions[sortOptionIndex].sortBy
+	          }, _ref5)];
+	        }
 	      } else if (props.sortBy) {
 	        var _ref6;
 
@@ -14434,31 +14510,39 @@
 	    renderNoResult: function renderNoResult() {
 	      var h = this.$createElement;
 	      var renderNoResults = this.$scopedSlots.renderNoResults || this.$props.renderNoResults;
+
+	      if (this.$scopedSlots.renderNoResults) {
+	        return isFunction$1(renderNoResults) ? renderNoResults() : renderNoResults;
+	      }
+
 	      return h("p", {
 	        "class": getClassName$1(this.$props.innerClass, 'noResults') || null
 	      }, [isFunction$1(renderNoResults) ? renderNoResults() : renderNoResults]);
 	    },
 	    handleSortChange: function handleSortChange(e) {
-	      var _ref7;
+	      var index = e.target.value;
 
-	      var index = e.target.value; // 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.$props.sortOptions[index].dataField;
-	      var sortBy = this.$props.sortOptions[index].sortBy;
-	      options.sort = [(_ref7 = {}, _ref7[sortField] = {
-	        order: sortBy
-	      }, _ref7)];
-	      this.sortOptionIndex = index; // To handle sort options for RS API
+	      if (this.sortOptions && this.sortOptions[index]) {
+	        var _ref7;
 
-	      this.updateComponentProps(this.componentId, {
-	        dataField: sortField,
-	        sortBy: sortBy
-	      }, constants_1$1.reactiveList);
-	      this.setQueryOptions(this.$props.componentId, options, true);
-	      this.currentPageState = 0;
-	      this.from = 0;
+	        // 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] = {
+	          order: sortBy
+	        }, _ref7)];
+	        this.sortOptionIndex = index; // To handle sort options for RS API
+
+	        this.updateComponentProps(this.componentId, {
+	          dataField: sortField,
+	          sortBy: sortBy
+	        }, constants_1$1.reactiveList);
+	        this.setQueryOptions(this.$props.componentId, options, true);
+	        this.currentPageState = 0;
+	        this.from = 0;
+	      }
 	    },
 	    triggerClickAnalytics: function triggerClickAnalytics(searchPosition, documentId) {
 	      var docId = documentId;
@@ -14492,7 +14576,7 @@
 	        "domProps": {
 	          "value": this.sortOptionIndex
 	        }
-	      }, [this.$props.sortOptions.map(function (sort, index) {
+	      }, [this.sortOptions.map(function (sort, index) {
 	        return h("option", {
 	          "key": sort.label,
 	          "domProps": {
@@ -14598,11 +14682,7 @@
 	}; // Only used for SSR
 
 	ReactiveList.generateQueryOptions = function (props) {
-	  // simulate default (includeFields and excludeFields) props to generate consistent query
-	  var options = getQueryOptions(_extends({
-	    includeFields: ['*'],
-	    excludeFields: []
-	  }, props));
+	  var options = getQueryOptions(props);
 	  var size = props.size,
 	      dataField = props.dataField,
 	      defaultSortOption = props.defaultSortOption,
@@ -15745,7 +15825,7 @@
 	        paramsString = '?' + querystring.stringify(params);
 	      }
 
-	      var finalURL = _this.mongodb ? _this.protocol + '://' + _this.url : _this.protocol + '://' + _this.url + '/' + app + '/' + path + paramsString;
+	      var finalURL = isMongoRequest ? _this.protocol + '://' + _this.url : _this.protocol + '://' + _this.url + '/' + app + '/' + path + paramsString;
 	      return handleTransformRequest(Object.assign({}, {
 	        url: finalURL
 	      }, requestOptions)).then(function (ts) {
@@ -15782,7 +15862,7 @@
 
 	                if (data) {
 	                  Object.keys(data).forEach(function (key) {
-	                    if (data[key] && Object.prototype.hasOwnProperty.call(data[key], 'error')) {
+	                    if (data[key] && Object.prototype.hasOwnProperty.call(data[key], 'error') && !!data[key].error) {
 	                      errorResponses += 1;
 	                    }
 	                  });
@@ -16683,7 +16763,7 @@
 	    headers: types.headers,
 	    getSearchParams: types.func,
 	    setSearchParams: types.func,
-	    as: types.string.def('div')
+	    as: VueTypes.string.def('div')
 	  },
 	  mounted: function mounted() {
 	    var _this = this;
@@ -16831,7 +16911,9 @@
 	        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;
@@ -18442,24 +18524,22 @@
 
 	    return __webpack_require__(0);
 	    /******/
-	  }([
-	    /* 0 */
-
-	    /***/
-
-	    /* 1 */
-
-	    /***/
-
-	    /* 2 */
+	  }
+	  /************************************************************************/
 
-	    /***/
+	  /******/
+	  ([
+	  /* 0 */
 
-	    /******/
+	  /***/
 	  function (module, exports, __webpack_require__) {
 	    module.exports = __webpack_require__(1);
 	    /***/
-	  }, function (module, exports, __webpack_require__) {
+	  },
+	  /* 1 */
+
+	  /***/
+	  function (module, exports, __webpack_require__) {
 
 	    Object.defineProperty(exports, "__esModule", {
 	      value: true
@@ -18492,7 +18572,11 @@
 	      }
 	    });
 	    /***/
-	  }, function (module, exports) {
+	  },
+	  /* 2 */
+
+	  /***/
+	  function (module, exports) {
 
 	    Object.defineProperty(exports, "__esModule", {
 	      value: true
@@ -18661,7 +18745,9 @@
 	    }
 	    /***/
 
-	  }]);
+	  }
+	  /******/
+	  ]);
 	});
 	unwrapExports(dist);
 	var dist_1 = dist.findAll;
@@ -19391,8 +19477,8 @@
 	  name: 'Mic',
 	  props: {
 	    children: types.title,
-	    lang: types.string.def('en-US'),
-	    iconPosition: types.string.def('left'),
+	    lang: VueTypes.string.def('en-US'),
+	    iconPosition: VueTypes.string.def('left'),
 	    handleResult: types.func,
 	    onNoMatch: types.func,
 	    onError: types.func,
@@ -19804,10 +19890,10 @@
 	    })]),
 	    aggregationField: types.string,
 	    aggregationSize: VueTypes.number,
-	    size: VueTypes.number.def(10),
+	    size: VueTypes.number,
 	    debounce: VueTypes.number.def(0),
 	    defaultValue: types.string,
-	    excludeFields: types.excludeFields.def([]),
+	    excludeFields: types.excludeFields,
 	    value: types.value,
 	    defaultSuggestions: types.suggestions,
 	    enableSynonyms: VueTypes.bool.def(true),
@@ -19821,9 +19907,9 @@
 	    highlightField: types.stringOrArray,
 	    icon: types.children,
 	    iconPosition: VueTypes.oneOf(['left', 'right']).def('left'),
-	    includeFields: types.includeFields.def(['*']),
+	    includeFields: types.includeFields,
 	    innerClass: types.style,
-	    innerRef: types.string.def('searchInputField'),
+	    innerRef: VueTypes.string.def('searchInputField'),
 	    render: types.func,
 	    renderQuerySuggestions: types.func,
 	    renderPopularSuggestions: types.func,
@@ -19855,7 +19941,7 @@
 	    focusShortcuts: VueTypes.arrayOf(VueTypes.oneOfType([VueTypes.string, VueTypes.number])).def(['/']),
 	    addonBefore: VueTypes.any,
 	    addonAfter: VueTypes.any,
-	    expandSuggestionsContainer: types.bool.def(true),
+	    expandSuggestionsContainer: VueTypes.bool.def(true),
 	    index: VueTypes.string
 	  },
 	  beforeMount: function beforeMount() {
@@ -20516,7 +20602,7 @@
 	              highlightedIndex: highlightedIndex
 	            }), _this3.renderErrorComponent(), !_this3.hasCustomRenderer && isOpen && hasSuggestions ? h("ul", {
 	              "class": suggestions$1(_this3.themePreset, theme) + " " + getClassName$3(_this3.$props.innerClass, 'list')
-	            }, [_this3.suggestionsList.slice(0, size).map(function (item, index) {
+	            }, [_this3.suggestionsList.slice(0, size || 10).map(function (item, index) {
 	              return h("li", {
 	                "domProps": _extends({}, getItemProps({
 	                  item: item
@@ -20995,7 +21081,7 @@
 	  name: 'SingleList',
 	  props: {
 	    beforeValueChange: types.func,
-	    className: types.string.def(''),
+	    className: VueTypes.string.def(''),
 	    componentId: types.stringRequired,
 	    customQuery: types.func,
 	    dataField: types.stringRequired,
@@ -21015,7 +21101,7 @@
 	    showFilter: VueTypes.bool.def(true),
 	    showRadio: VueTypes.bool.def(true),
 	    showSearch: 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),
@@ -21129,7 +21215,7 @@
 	    var filteredItemsToRender = itemsToRender.filter(function (item) {
 	      if (String(item.key).length) {
 	        if (_this.$props.showSearch && _this.$data.searchTerm) {
-	          return String(item.key).toLowerCase().includes(_this.$data.searchTerm.toLowerCase());
+	          return suggestions_1(String(item.key)).toLowerCase().includes(suggestions_1(_this.$data.searchTerm.toLowerCase()));
 	        }
 
 	        return true;
@@ -21476,7 +21562,7 @@
 	    queryFormat: VueTypes.oneOf(['and', 'or']).def('or'),
 	    showCheckbox: VueTypes.bool.def(true),
 	    beforeValueChange: types.func,
-	    className: types.string.def(''),
+	    className: VueTypes.string.def(''),
 	    componentId: types.stringRequired,
 	    customQuery: types.func,
 	    dataField: types.stringRequired,
@@ -21623,7 +21709,7 @@
 	    var filteredItemsToRender = itemsToRender.filter(function (item) {
 	      if (String(item.key).length) {
 	        if (_this2.$props.showSearch && _this2.$data.searchTerm) {
-	          return String(item.key).toLowerCase().includes(_this2.$data.searchTerm.toLowerCase());
+	          return suggestions_1(String(item.key)).toLowerCase().includes(suggestions_1(_this2.$data.searchTerm).toLowerCase());
 	        }
 
 	        return true;
@@ -22097,7 +22183,9 @@
 	    single: VueTypes.bool,
 	    small: VueTypes.bool.def(false),
 	    themePreset: types.themePreset,
-	    showSearch: VueTypes.bool
+	    showSearch: VueTypes.bool,
+	    showClear: VueTypes.bool,
+	    searchPlaceholder: VueTypes.string.def('Type here to search...')
 	  },
 	  render: function render() {
 	    var _this = this;
@@ -22125,7 +22213,7 @@
 	    var filteredItemsToRender = itemsToRender.filter(function (item) {
 	      if (String(item[labelField]).length) {
 	        if (_this.$props.showSearch && _this.$data.searchTerm) {
-	          return String(item[labelField]).toLowerCase().includes(_this.$data.searchTerm.toLowerCase());
+	          return suggestions_1(String(item[labelField])).toLowerCase().includes(suggestions_1(_this.$data.searchTerm.toLowerCase()));
 	        }
 
 	        return true;
@@ -22171,25 +22259,10 @@
 	            getItemEvents: getItemEvents
 	          }) : isOpen && itemsToRender.length ? h("ul", {
 	            "class": suggestions$1(themePreset, _this.theme) + " " + (_this.$props.small ? 'small' : '') + " " + getClassName$6(_this.$props.innerClass, 'list')
-	          }, [_this.$props.showSearch ? h(Input, {
-	            "attrs": {
-	              "id": _this.$props.componentId + "-input",
-	              "showIcon": false,
-	              "placeholder": "Type here to search...",
-	              "value": _this.$data.searchTerm,
-	              "themePreset": themePreset
-	            },
-	            "style": {
-	              border: 0,
-	              borderBottom: '1px solid #ddd'
-	            },
-	            "class": getClassName$6(_this.$props.innerClass, 'input'),
-	            "on": {
-	              "change": _this.handleInputChange
-	            }
-	          }) : null, !hasCustomRenderer && filteredItemsToRender.length === 0 ? _this.renderNoResult() : filteredItemsToRender.map(function (item, index) {
+	          }, [_this.$props.showSearch ? _this.renderSearchbox() : null, !hasCustomRenderer && filteredItemsToRender.length === 0 ? _this.renderNoResult() : filteredItemsToRender.map(function (item, index) {
 	            var selected = _this.$props.multi // MultiDropdownList
-	            && (selectedItem && !!selectedItem[item[keyField]] || Array.isArray(selectedItem) && selectedItem.find(function (value) {
+	            && (selectedItem && !!selectedItem[item[keyField]] // MultiDropdownRange
+	            || Array.isArray(selectedItem) && selectedItem.find(function (value) {
 	              return value[labelField] === item[labelField];
 	            }));
 	            if (!_this.$props.multi) selected = item.key === selectedItem;
@@ -22239,6 +22312,7 @@
 
 	      if (!this.$props.multi) {
 	        this.isOpen = false;
+	        this.searchTerm = '';
 	      }
 	    },
 	    handleStateChange: function handleStateChange(_ref2) {
@@ -22262,6 +22336,9 @@
 	      var value = e.target.value;
 	      this.searchTerm = value;
 	    },
+	    clearSearchTerm: function clearSearchTerm() {
+	      this.searchTerm = '';
+	    },
 	    renderToString: function renderToString(value) {
 	      var _this2 = this;
 
@@ -22302,6 +22379,51 @@
 	      return h("p", {
 	        "class": getClassName$6(this.$props.innerClass, 'noResults') || null
 	      }, [isFunction$1(renderNoResults) ? renderNoResults() : renderNoResults]);
+	    },
+	    renderSearchbox: function renderSearchbox() {
+	      var h = this.$createElement;
+	      var _this$$props2 = this.$props,
+	          componentId = _this$$props2.componentId,
+	          searchPlaceholder = _this$$props2.searchPlaceholder,
+	          showClear = _this$$props2.showClear,
+	          themePreset = _this$$props2.themePreset,
+	          innerClass = _this$$props2.innerClass;
+	      var InputComponent = h(Input, {
+	        "attrs": {
+	          "id": componentId + "-input",
+	          "showIcon": false,
+	          "showClear": showClear,
+	          "placeholder": searchPlaceholder,
+	          "value": this.$data.searchTerm,
+	          "themePreset": themePreset
+	        },
+	        "style": {
+	          border: 0,
+	          borderBottom: '1px solid #ddd'
+	        },
+	        "class": getClassName$6(innerClass, 'input'),
+	        "on": {
+	          "change": this.handleInputChange
+	        }
+	      });
+
+	      if (showClear) {
+	        return h(InputWrapper, [InputComponent, this.searchTerm && h(IconGroup, {
+	          "attrs": {
+	            "groupPosition": "right",
+	            "positionType": "absolute"
+	          }
+	        }, [h(IconWrapper, {
+	          "on": {
+	            "click": this.clearSearchTerm
+	          },
+	          "attrs": {
+	            "isClearIcon": true
+	          }
+	        }, [h(CancelSvg)])])]);
+	      }
+
+	      return InputComponent;
 	    }
 	  }
 	};
@@ -22360,10 +22482,12 @@
 	    showMissing: VueTypes.bool.def(false),
 	    missingLabel: VueTypes.string.def('N/A'),
 	    showSearch: VueTypes.bool.def(false),
+	    showClear: VueTypes.bool.def(false),
 	    showLoadMore: VueTypes.bool.def(false),
 	    loadMoreLabel: VueTypes.oneOfType([VueTypes.string, VueTypes.any]).def('Load More'),
 	    nestedField: types.string,
-	    index: VueTypes.string
+	    index: VueTypes.string,
+	    searchPlaceholder: VueTypes.string.def('Type here to search...')
 	  },
 	  created: function created() {
 	    if (!this.enableAppbase && this.$props.index) {
@@ -22477,7 +22601,9 @@
 	    if (!this.hasCustomRenderer && this.$data.modifiedOptions.length === 0 && !this.isLoading) {
 	      if (renderNoResults && isFunction$1(renderNoResults)) {
 	        return h("div", [renderNoResults()]);
-	      } else if (renderNoResults && !isFunction$1(renderNoResults)) {
+	      }
+
+	      if (renderNoResults && !isFunction$1(renderNoResults)) {
 	        return renderNoResults;
 	      }
 
@@ -22515,6 +22641,8 @@
 	        "renderNoResults": this.$scopedSlots.renderNoResults || this.$props.renderNoResults,
 	        "themePreset": this.themePreset,
 	        "showSearch": this.$props.showSearch,
+	        "showClear": this.$props.showClear,
+	        "searchPlaceholder": this.$props.searchPlaceholder,
 	        "transformData": this.$props.transformData,
 	        "footer": showLoadMore && !isLastBucket && h("div", {
 	          "attrs": {
@@ -22807,10 +22935,12 @@
 	    showMissing: VueTypes.bool.def(false),
 	    missingLabel: VueTypes.string.def('N/A'),
 	    showSearch: VueTypes.bool.def(false),
+	    showClear: VueTypes.bool.def(false),
 	    showLoadMore: VueTypes.bool.def(false),
 	    loadMoreLabel: VueTypes.oneOfType([VueTypes.string, VueTypes.any]).def('Load More'),
 	    nestedField: types.string,
-	    index: VueTypes.string
+	    index: VueTypes.string,
+	    searchPlaceholder: VueTypes.string.def('Type here to search...')
 	  },
 	  created: function created() {
 	    if (!this.enableAppbase && this.$props.index) {
@@ -22938,7 +23068,9 @@
 	    if (!this.hasCustomRenderer && this.$data.modifiedOptions.length === 0 && !this.isLoading) {
 	      if (renderNoResults && isFunction$1(renderNoResults)) {
 	        return h("div", [renderNoResults()]);
-	      } else if (renderNoResults && !isFunction$1(renderNoResults)) {
+	      }
+
+	      if (renderNoResults && !isFunction$1(renderNoResults)) {
 	        return renderNoResults;
 	      }
 
@@ -22977,6 +23109,8 @@
 	        "renderItem": renderItemCalc,
 	        "renderNoResults": this.$scopedSlots.renderNoResults || this.$props.renderNoResults,
 	        "showSearch": this.$props.showSearch,
+	        "showClear": this.$props.showClear,
+	        "searchPlaceholder": this.$props.searchPlaceholder,
 	        "transformData": this.$props.transformData,
 	        "footer": showLoadMore && !isLastBucket && h("div", {
 	          "attrs": {
@@ -23323,7 +23457,7 @@
 	    componentId: types.stringRequired,
 	    data: types.data,
 	    dataField: types.stringRequired,
-	    defaultValue: types.stringOrArray,
+	    defaultValue: types.any,
 	    value: types.stringOrArray,
 	    filterLabel: types.string,
 	    nestedField: types.string,
@@ -23676,7 +23810,7 @@
 	    this.internalComponent = null;
 	    this.$defaultQuery = null; // Set custom query in store
 
-	    updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+	    updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
 	    var customQuery = props.customQuery,
 	        componentId = props.componentId,
 	        filterLabel = props.filterLabel,
@@ -23699,7 +23833,7 @@
 	    }
 
 	    if (customQuery) {
-	      var calcCustomQuery = customQuery(props);
+	      var calcCustomQuery = customQuery(this.selectedValue, props);
 
 	      var _ref = calcCustomQuery || {},
 	          query = _ref.query;
@@ -23718,7 +23852,7 @@
 
 	      this.updateQuery({
 	        componentId: componentId,
-	        queryToSet: queryToSet,
+	        query: queryToSet,
 	        value: this.selectedValue || null,
 	        label: filterLabel,
 	        showFilter: showFilter,
@@ -23769,8 +23903,8 @@
 	  },
 	  beforeMount: function beforeMount() {
 	    if (this.internalComponent && this.$props.defaultQuery) {
-	      updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
-	      this.$defaultQuery = 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,
@@ -23834,8 +23968,8 @@
 	      }
 	    },
 	    defaultQuery: function defaultQuery(newVal, oldVal) {
-	      if (newVal && !isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
-	        this.$defaultQuery = newVal();
+	      if (newVal && !isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
+	        this.$defaultQuery = newVal(this.selectedValue, this.$props);
 
 	        var _ref4 = this.$defaultQuery || {},
 	            query = _ref4.query,
@@ -23846,7 +23980,7 @@
 	        } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false); // Update default query for RS API
 
 
-	        updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
+	        updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
 	        var queryToSet = query || null;
 
 	        if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
@@ -23860,9 +23994,9 @@
 	      }
 	    },
 	    customQuery: function customQuery(newVal, oldVal) {
-	      if (newVal && !isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
+	      if (newVal && !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,
@@ -23873,7 +24007,7 @@
 	        } else this.setQueryOptions(componentId, this.getAggsQuery(), false); // Update custom query for RS API
 
 
-	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
 	        var queryToSet = query || null;
 
 	        if (this.$customQuery && this.$customQuery.id) {
@@ -25947,6 +26081,7 @@
 	    var orderOfQueries = [];
 	    var hits = {};
 	    var aggregations = {};
+	    var compositeAggregations = {};
 	    var state = {};
 	    var customQueries = {};
 	    var defaultQueries = {};
@@ -25961,16 +26096,7 @@
 	          compProps[key] = component[key];
 	        }
 	      });
-	      var isInternalComponentPresent = false; // Set custom and default queries
-
-	      if (component.customQuery && typeof component.customQuery === 'function') {
-	        customQueries[component.componentId] = component.customQuery(component.value, compProps);
-	      }
-
-	      if (component.defaultQuery && typeof component.defaultQuery === 'function') {
-	        defaultQueries[component.componentId] = component.defaultQuery(component.value, compProps);
-	      }
-
+	      var isInternalComponentPresent = false;
 	      var isResultComponent = resultComponents.includes(componentType);
 	      var internalComponent = component.componentId + "__internal";
 	      var label = component.filterLabel || component.componentId;
@@ -25994,7 +26120,16 @@
 	        reference: reference,
 	        showFilter: showFilter,
 	        URLParams: component.URLParams || false
-	      }); // [2] set query options - main component query (valid for result components)
+	      }); // Set custom and default queries
+
+	      if (component.customQuery && typeof component.customQuery === 'function') {
+	        customQueries[component.componentId] = component.customQuery(value, compProps);
+	      }
+
+	      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;
@@ -26081,7 +26216,7 @@
 
 
 	      if (isResultComponent) {
-	        var _getQuery = getQuery(component, null, componentType),
+	        var _getQuery = getQuery(component, value, componentType),
 	            query = _getQuery.query;
 
 	        queryList = queryReducer(queryList, {
@@ -26181,6 +26316,11 @@
 	              var _extends4;
 
 	              aggregations = _extends({}, aggregations, (_extends4 = {}, _extends4[component] = response.aggregations, _extends4));
+	              compositeAggregations = compositeAggsReducer(compositeAggregations, {
+	                type: constants_9,
+	                aggregations: response.aggregations,
+	                append: false
+	              });
 	            }
 
 	            hits = _extends({}, hits, (_extends5 = {}, _extends5[component] = {
@@ -26207,6 +26347,8 @@
 	      var promotedResults = {};
 	      var rawData = {};
 	      var customData = {};
+	      var settingsResponse = {};
+	      var timestamp = {};
 	      var allPromises = orderOfQueries.map(function (component) {
 	        return new Promise(function (responseResolve, responseReject) {
 	          handleTransformResponse(res[component], component).then(function (response) {
@@ -26225,6 +26367,11 @@
 
 	              if (response.customData) {
 	                customData[component] = response.customData;
+	              } // Update settings
+
+
+	              if (response.settings) {
+	                settingsResponse[component] = response.settings;
 	              }
 
 	              if (response.aggregations) {
@@ -26233,6 +26380,7 @@
 	                aggregations = _extends({}, aggregations, (_extends6 = {}, _extends6[component] = response.aggregations, _extends6));
 	              }
 
+	              timestamp[component] = res._timestamp;
 	              hits = _extends({}, hits, (_extends7 = {}, _extends7[component] = {
 	                hits: response.hits.hits,
 	                total: typeof response.hits.total === 'object' ? response.hits.total.value : response.hits.total,
@@ -26248,8 +26396,11 @@
 	      Promise.all(allPromises).then(function () {
 	        state = _extends({}, state, {
 	          hits: hits,
+	          timestamp: timestamp,
 	          aggregations: aggregations,
+	          compositeAggregations: compositeAggregations,
 	          promotedResults: promotedResults,
+	          settings: settingsResponse,
 	          customData: customData,
 	          rawData: rawData
 	        });
@@ -26308,7 +26459,7 @@
 	  });
 	}
 
-	var version = "1.24.0";
+	var version = "1.25.0";
 
 	var _templateObject$n, _templateObject2$a;