@appbaseio/reactivesearch-vue 1.16.0-alpha.35 → 1.16.0-alpha.38

package/dist/es/ReactiveList.js

@@ -1,188 +1,23 @@
-import { helper, Actions } from '@appbaseio/reactivecore';
-import { _ as _taggedTemplateLiteralLoose, a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { Actions, helper } from '@appbaseio/reactivecore';
+import { _ as _taggedTemplateLiteralLoose, a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import { componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
 import { withClickIds } from '@appbaseio/reactivecore/lib/utils/helper';
 import { css } from 'emotion';
 import styled from '@appbaseio/vue-emotion';
 import 'polished';
-import { p as pagination, B as Button } from './Button-91561391.js';
-import { t as types } from './vueTypes-687b2304.js';
+import './Button-799185e2.js';
+import { t as types } from './vueTypes-9326e0be.js';
+import { P as Pagination } from './Pagination-b3e4054a.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
-import { c as connect, h as hasCustomRenderer, i as isQueryIdentical, u as updateDefaultQuery, a as isFunction, g as getComponent } from './index-cb1950b6.js';
-import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
+import { c as connect, h as hasCustomRenderer, i as isQueryIdentical, u as updateDefaultQuery, a as isFunction, g as getComponent } from './index-5daa8276.js';
+import { C as ComponentWrapper } from './ComponentWrapper-bbb717bc.js';
 import _mergeJSXProps from '@vue/babel-helper-vue-jsx-merge-props';
-import './Title-3522ff56.js';
-import { c as container } from './ListItem-8e8fb535.js';
-import { c as container$1 } from './Card-6446f1b7.js';
-import { F as Flex } from './Flex-8770345d.js';
-
-var getClassName = helper.getClassName,
-    handleA11yAction = helper.handleA11yAction;
-
-function getStartPage(totalPages, currentPage, showEndPage) {
-  var midValue = parseInt(totalPages / 2, 10);
-  var start = currentPage - (showEndPage ? Math.ceil(midValue / 2) - 1 : midValue);
-  return start > 1 ? start : 2;
-}
-
-var Pagination = {
-  name: 'Pagination',
-  functional: true,
-  props: {
-    currentPage: types.number,
-    innerClass: types.style,
-    pages: types.number,
-    setPage: types.func,
-    totalPages: types.number,
-    showEndPage: VueTypes.bool,
-    prevLabel: types.string,
-    nextLabel: types.string
-  },
-  render: function render(createElement, context) {
-    var h = arguments[0];
-    var props = context.props;
-
-    var onPrevPage = function onPrevPage() {
-      if (props.currentPage) {
-        props.setPage(props.currentPage - 1);
-      }
-    };
-
-    var onNextPage = function onNextPage() {
-      if (props.currentPage < props.totalPages - 1) {
-        props.setPage(props.currentPage + 1);
-      }
-    };
-
-    if (!props.totalPages) {
-      return null;
-    }
-
-    var innerClassName = getClassName(props.innerClass, 'button');
-    var primary = props.currentPage === 0;
-    var className = innerClassName || primary ? innerClassName + " " + (primary ? 'active' : '') : '';
-
-    var buildPaginationDOM = function buildPaginationDOM(position) {
-      var pages = props.pages,
-          currentPage = props.currentPage,
-          totalPages = props.totalPages,
-          setPage = props.setPage,
-          showEndPage = props.showEndPage;
-      var start = position === 'start' ? getStartPage(pages, currentPage, showEndPage) : Math.max(2, Math.ceil(totalPages - (pages - 1) / 2 + 1));
-      var paginationButtons = [];
-
-      if (start <= totalPages) {
-        var totalPagesToShow = pages < totalPages ? start + (pages - 1) : totalPages + 1;
-
-        if (showEndPage) {
-          totalPagesToShow = position === 'start' ? start + (Math.ceil(pages / 2) - pages % 2) : totalPages + 1;
-        }
-
-        if (currentPage > totalPages - pages + 2) {
-          start = Math.max(2, totalPages - pages + 2);
-          totalPagesToShow = start + pages;
-        }
-
-        var _loop = function _loop(i) {
-          var activeButton = currentPage === i - 1;
-          var classNameBtn = innerClassName || activeButton ? innerClassName + " " + (activeButton ? 'active' : '') : '';
-          var pageBtn = h(Button, {
-            "class": classNameBtn,
-            "attrs": {
-              "primary": activeButton,
-              "tabIndex": "0",
-              "alt": "page-" + i
-            },
-            "on": {
-              "keyPress": function keyPress(event) {
-                return handleA11yAction(event, function () {
-                  return setPage(i - 1);
-                });
-              },
-              "click": function click() {
-                return setPage(i - 1);
-              }
-            }
-          }, [i]);
-
-          if (i <= totalPages + 1) {
-            paginationButtons.push(pageBtn);
-          }
-        };
-
-        for (var i = start; i < Math.min(totalPages + 1, totalPagesToShow); i += 1) {
-          _loop(i);
-        }
-      }
-
-      return paginationButtons;
-    };
-
-    var buildIntermediatePaginationDom = function buildIntermediatePaginationDom() {
-      var showEndPage = props.showEndPage,
-          currentPage = props.currentPage,
-          totalPages = props.totalPages,
-          pages = props.pages;
-      if (!showEndPage) return buildPaginationDOM('start');
-
-      if (currentPage <= totalPages - pages + 2 || totalPages <= pages) {
-        return buildPaginationDOM('start');
-      }
-
-      return null;
-    };
-
-    return h("div", {
-      "class": pagination + " " + getClassName(props.innerClass, 'pagination')
-    }, [h(Button, {
-      "class": getClassName(props.innerClass, 'button') || '',
-      "attrs": {
-        "disabled": props.currentPage === 0,
-        "tabIndex": "0"
-      },
-      "on": {
-        "keyPress": function keyPress(event) {
-          return handleA11yAction(event, onPrevPage);
-        },
-        "click": onPrevPage
-      }
-    }, [props.prevLabel || 'Prev']), h(Button, {
-      "class": className,
-      "attrs": {
-        "primary": primary,
-        "tabIndex": "0"
-      },
-      "on": {
-        "keyPress": function keyPress(event) {
-          return handleA11yAction(event, function () {
-            return props.setPage(0);
-          });
-        },
-        "click": function click() {
-          return props.setPage(0);
-        }
-      }
-    }, ["1"]), props.showEndPage && props.currentPage >= Math.floor(props.pages / 2) + !!(props.pages % 2) ? h("span", ["..."]) : null, buildIntermediatePaginationDom(), props.showEndPage && props.pages > 2 && props.currentPage <= props.totalPages - Math.ceil(props.pages * 0.75) ? h("span", ["..."]) : null, props.showEndPage && props.totalPages >= props.pages && buildPaginationDOM('end'), h(Button, {
-      "class": getClassName(props.innerClass, 'button') || '',
-      "attrs": {
-        "disabled": props.currentPage >= props.totalPages - 1,
-        "tabIndex": "0"
-      },
-      "on": {
-        "keyPress": function keyPress(event) {
-          return handleA11yAction(event, onNextPage);
-        },
-        "click": onNextPage
-      }
-    }, [props.nextLabel || 'Next'])]);
-  }
-};
-
-Pagination.install = function (Vue) {
-  Vue.component(Pagination.name, Pagination);
-};
+import './Title-579f8d6c.js';
+import { c as container } from './ListItem-bdb6d53d.js';
+import { c as container$1 } from './Card-04b3c33e.js';
+import { F as Flex } from './Flex-aac91505.js';
 
 var _templateObject;
 var PoweredByImage = styled('img')(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n\twidth: 110px;\n"])));
@@ -427,11 +262,12 @@ var setQueryOptions = Actions.setQueryOptions,
     recordResultClick = Actions.recordResultClick;
 var isEqual$1 = helper.isEqual,
     getQueryOptions = helper.getQueryOptions,
-    getClassName$1 = helper.getClassName,
+    getClassName = 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: {
@@ -494,6 +330,12 @@ var ReactiveList = {
       });
     }
 
+    if (this.urlSortOption) {
+      this.sortOptionIndex = this.$props.sortOptions.findIndex(function (s) {
+        return s.label === _this.urlSortOption;
+      }) || 0;
+    }
+
     this.updateComponentProps(this.componentId, {
       from: this.from
     }, componentTypes.reactiveList);
@@ -623,19 +465,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
 
 
@@ -726,24 +560,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
 
 
@@ -751,20 +585,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);
 
@@ -801,8 +628,8 @@ var ReactiveList = {
       "attrs": {
         "labelPosition": this.sortOptions ? 'right' : 'left'
       },
-      "class": getClassName$1(this.$props.innerClass, 'resultsInfo')
-    }, [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, {
+      "class": getClassName(this.$props.innerClass, 'resultsInfo')
+    }, [this.sortOptions ? this.renderSortOptions() : null, this.$props.showResultStats && results.length ? this.renderStats() : null]), !this.isLoading && hits && hits.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,
@@ -833,7 +660,7 @@ var ReactiveList = {
       "attrs": {
         "direction": "row-reverse"
       },
-      "class": getClassName$1(this.$props.innerClass, 'poweredBy')
+      "class": getClassName(this.$props.innerClass, 'poweredBy')
     }, [h(PoweredBy)]) : null]);
   },
   methods: {
@@ -853,7 +680,7 @@ var ReactiveList = {
       var size = this.$props.size;
       var renderItem = this.$scopedSlots.renderItem || this.$props.renderItem;
       var element = this.hasCustomRender ? this.getComponent() : h("div", {
-        "class": this.$props.listClass + " " + getClassName$1(this.$props.innerClass, 'list')
+        "class": this.$props.listClass + " " + getClassName(this.$props.innerClass, 'list')
       }, [this.data.map(function (item, index) {
         return renderItem({
           item: item,
@@ -879,18 +706,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);
@@ -971,7 +798,7 @@ var ReactiveList = {
 
       if (this.stats.numberOfResults) {
         return h("p", {
-          "class": resultStats + " " + getClassName$1(this.$props.innerClass, 'resultStats')
+          "class": resultStats + " " + getClassName(this.$props.innerClass, 'resultStats')
         }, [this.stats.numberOfResults, " results found in ", this.stats.time || 0, "ms"]);
       }
 
@@ -986,23 +813,23 @@ var ReactiveList = {
       }
 
       return h("p", {
-        "class": getClassName$1(this.$props.innerClass, 'noResults') || null
+        "class": getClassName(this.$props.innerClass, 'noResults') || null
       }, [isFunction(renderNoResults) ? renderNoResults() : renderNoResults]);
     },
     handleSortChange: function handleSortChange(e) {
       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, {
@@ -1010,8 +837,11 @@ var ReactiveList = {
           sortBy: sortBy
         }, componentTypes.reactiveList);
         this.setQueryOptions(this.$props.componentId, options, true);
+        this.setPage(0);
         this.currentPageState = 0;
         this.from = 0;
+        var sortOption = this.$props.sortOptions[this.sortOptionIndex] ? this.$props.sortOptions[this.sortOptionIndex].label : null;
+        this.setPageURL(this.$props.componentId + "sortOption", sortOption, this.$props.componentId + "sortOption", false, this.$props.URLParams);
       }
     },
     triggerClickAnalytics: function triggerClickAnalytics(searchPosition, documentId) {
@@ -1035,7 +865,7 @@ var ReactiveList = {
     renderSortOptions: function renderSortOptions() {
       var h = this.$createElement;
       return h("select", {
-        "class": sortOptions + " " + getClassName$1(this.$props.innerClass, 'sortOptions'),
+        "class": sortOptions + " " + getClassName(this.$props.innerClass, 'sortOptions'),
         "attrs": {
           "name": "sort-options",
           "aria-label": "Sort options"
@@ -1123,6 +953,7 @@ var ReactiveList = {
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1,
+    urlSortOption: state.selectedValues[props.componentId + "sortOption"] && state.selectedValues[props.componentId + "sortOption"].value,
     hits: state.hits[props.componentId] && state.hits[props.componentId].hits,
     rawData: state.rawData[props.componentId],
     aggregationData: state.compositeAggregations[props.componentId],
@@ -1163,7 +994,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) {
@@ -1171,35 +1002,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/ResultCard.js

@@ -1,12 +1,12 @@
-import { b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { t as types } from './vueTypes-687b2304.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import _mergeJSXProps from '@vue/babel-helper-vue-jsx-merge-props';
-import { T as Title } from './Title-3522ff56.js';
-import { I as Image, C as Card } from './Card-6446f1b7.js';
+import { T as Title } from './Title-579f8d6c.js';
+import { I as Image, C as Card } from './Card-04b3c33e.js';
 
 var ResultCardTitle = {
   name: 'ResultCardTitle',

package/dist/es/ResultList.js

@@ -1,12 +1,12 @@
-import { b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { b as _objectWithoutPropertiesLoose } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { t as types } from './vueTypes-687b2304.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import _mergeJSXProps from '@vue/babel-helper-vue-jsx-merge-props';
-import { T as Title } from './Title-3522ff56.js';
-import { I as Image, L as ListItem } from './ListItem-8e8fb535.js';
+import { T as Title } from './Title-579f8d6c.js';
+import { I as Image, L as ListItem } from './ListItem-bdb6d53d.js';
 
 var ResultListContent = {
   name: 'ResultListContent',

package/dist/es/SelectedFilters.js

@@ -1,16 +1,16 @@
 import { Actions, helper } from '@appbaseio/reactivecore';
-import { a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import '@appbaseio/reactivecore/lib/utils/constants';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { f as filters, B as Button } from './Button-91561391.js';
-import { t as types } from './vueTypes-687b2304.js';
+import { f as filters, B as Button } from './Button-799185e2.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import 'redux';
-import { c as connect } from './index-cb1950b6.js';
-import { T as Title } from './Title-3522ff56.js';
-import { C as Container } from './Container-18b03fde.js';
+import { c as connect } from './index-5daa8276.js';
+import { T as Title } from './Title-579f8d6c.js';
+import { C as Container } from './Container-4383c6f0.js';
 
 var setValue = Actions.setValue,
     clearValues = Actions.clearValues,

package/dist/es/SingleDropdownList.js

@@ -1,24 +1,25 @@
 import { Actions, helper } from '@appbaseio/reactivecore';
-import { a as _extends } from './_rollupPluginBabelHelpers-0f24d612.js';
+import { a as _extends } from './_rollupPluginBabelHelpers-ecf6c03c.js';
 import VueTypes from 'vue-types';
 import { componentTypes } from '@appbaseio/reactivecore/lib/utils/constants';
 import 'emotion';
 import '@appbaseio/vue-emotion';
 import 'polished';
-import { l as loadMoreContainer, B as Button } from './Button-91561391.js';
-import { t as types } from './vueTypes-687b2304.js';
+import { l as loadMoreContainer, B as Button } from './Button-799185e2.js';
+import { t as types } from './vueTypes-9326e0be.js';
 import '@appbaseio/reactivecore/lib/utils/transform';
 import 'redux';
-import { f as updateCustomQuery, u as updateDefaultQuery, i as isQueryIdentical, a as isFunction, g as getComponent, h as hasCustomRenderer, c as connect } from './index-cb1950b6.js';
-import { C as ComponentWrapper } from './ComponentWrapper-4f85a67e.js';
-import { T as Title } from './Title-3522ff56.js';
-import './CancelSvg-c2c03a35.js';
-import './Input-08bb1bcf.js';
+import { f as updateCustomQuery, u as updateDefaultQuery, i as isQueryIdentical, a as isFunction, g as getComponent, h as hasCustomRenderer, c as connect } from './index-5daa8276.js';
+import { C as ComponentWrapper } from './ComponentWrapper-bbb717bc.js';
+import '@vue/babel-helper-vue-jsx-merge-props';
+import { T as Title } from './Title-579f8d6c.js';
+import './CancelSvg-4d9e0857.js';
+import './Input-d8519224.js';
 import 'compute-scroll-into-view';
-import { C as Container } from './Container-18b03fde.js';
+import { C as Container } from './Container-4383c6f0.js';
 import '@appbaseio/reactivecore/lib/utils/suggestions';
-import { g as getAggsQuery } from './utils-64a2e5f0.js';
-import { D as Dropdown } from './DropDown-c8da0a2c.js';
+import { g as getAggsQuery } from './utils-3a32e13f.js';
+import { D as Dropdown } from './DropDown-4edaa621.js';
 
 var updateQuery = Actions.updateQuery,
     setQueryOptions = Actions.setQueryOptions,
@@ -28,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() {
@@ -284,12 +286,13 @@ var SingleDropdownList = {
 
       if (this.defaultQuery) {
         var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+        var defaultQueryObj = extractQueryFromCustomQuery(defaultQueryToBeSet);
 
-        if (defaultQueryToBeSet.query) {
-          query = defaultQueryToBeSet.query;
+        if (defaultQueryObj) {
+          query = defaultQueryObj;
         }
 
-        defaultQueryOptions = getOptionsFromQuery(defaultQueryToBeSet); // Update calculated default query in store
+        defaultQueryOptions = getOptionsForCustomQuery(defaultQueryToBeSet); // Update calculated default query in store
 
         updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
       }
@@ -308,10 +311,9 @@ var SingleDropdownList = {
       var customQueryOptions;
 
       if (customQuery) {
-        var _ref = customQuery(value, props) || {};
-
-        query = _ref.query;
-        customQueryOptions = getOptionsFromQuery(customQuery(value, props));
+        var customQueryCalc = customQuery(value, props);
+        query = extractQueryFromCustomQuery(customQueryCalc);
+        customQueryOptions = getOptionsForCustomQuery(customQueryCalc);
         updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
       }
 
@@ -349,7 +351,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);
@@ -441,6 +443,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],
@@ -462,7 +468,7 @@ var mapDispatchtoProps = {
 };
 var ListConnected = ComponentWrapper(connect(mapStateToProps, mapDispatchtoProps)(SingleDropdownList), {
   componentType: componentTypes.singleDropdownList,
-  internalComponent: true
+  internalComponent: SingleDropdownList.hasInternalComponent()
 });
 
 SingleDropdownList.install = function (Vue) {