@appbaseio/reactivesearch-vue 1.16.0-alpha.6 → 1.16.0-alpha.62

package/dist/cjs/MultiList.js

@@ -6,22 +6,23 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-c705cbe6.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-baca18c4.js');
-var ComponentWrapper = require('./ComponentWrapper-603848ed.js');
-var Title = require('./Title-65d39104.js');
-var Input = require('./Input-95cb19f8.js');
-var Container = require('./Container-6cdd3864.js');
-var FormControlList = require('./FormControlList-f3857d4b.js');
-var utils = require('./utils-ea846a20.js');
+var index = require('./index-6a167fe0.js');
+var ComponentWrapper = require('./ComponentWrapper-ad3dad02.js');
+var Title = require('./Title-1de7d0f4.js');
+var Input = require('./Input-e6603a7e.js');
+var Container = require('./Container-daf30918.js');
+var suggestions = require('@appbaseio/reactivecore/lib/utils/suggestions');
+var FormControlList = require('./FormControlList-c195a592.js');
+var utils = require('./utils-d6a52588.js');
 
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
@@ -31,7 +32,8 @@ var isEqual = configureStore.helper.isEqual,
     getQueryOptions = configureStore.helper.getQueryOptions,
     checkValueChange = configureStore.helper.checkValueChange,
     getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery;
+    extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
+    getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
 var MultiList = {
   name: 'MultiList',
   props: {
@@ -40,7 +42,7 @@ var MultiList = {
     queryFormat: VueTypes.oneOf(['and', 'or']).def('or'),
     showCheckbox: VueTypes.bool.def(true),
     beforeValueChange: vueTypes.types.func,
-    className: vueTypes.types.string.def(''),
+    className: VueTypes.string.def(''),
     componentId: vueTypes.types.stringRequired,
     customQuery: vueTypes.types.func,
     dataField: vueTypes.types.stringRequired,
@@ -58,43 +60,53 @@ var MultiList = {
     showCount: VueTypes.bool.def(true),
     showFilter: 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: vueTypes.types.title,
     URLParams: VueTypes.bool.def(false),
     showMissing: VueTypes.bool.def(false),
     missingLabel: VueTypes.string.def('N/A'),
-    nestedField: vueTypes.types.string
+    nestedField: vueTypes.types.string,
+    index: VueTypes.string
   },
   data: function data() {
     var props = this.$props;
     this.__state = {
       currentValue: {},
-      modifiedOptions: props.options && props.options[props.dataField] ? props.options[props.dataField].buckets : [],
+      modifiedOptions: [],
       searchTerm: ''
     };
     this.internalComponent = props.componentId + "__internal";
     return this.__state;
   },
   created: function created() {
-    // Set custom and default queries in store
+    if (!this.enableAppbase && this.$props.index) {
+      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
+    }
+
+    var props = this.$props;
+    this.modifiedOptions = this.options && this.options[props.dataField] ? this.options[props.dataField].buckets : []; // Set custom and default queries in store
+
     index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
     index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.currentValue);
   },
   beforeMount: function beforeMount() {
     this.updateQueryHandlerOptions(this.$props);
+    var value = this.selectedValue || this.$props.value || this.$props.defaultValue;
+    this.setValue(value, !this.selectedValue);
+  },
+  mounted: function mounted() {
+    var currentValue = Object.keys(this.$data.currentValue);
 
-    if (this.selectedValue) {
-      this.setValue(this.selectedValue);
-    } else if (this.$props.value) {
-      this.setValue(this.$props.value, true);
-    } else if (this.$props.defaultValue) {
-      this.setValue(this.$props.defaultValue, true);
+    if (this.$props.value !== undefined && !isEqual(this.$props.value, currentValue)) {
+      this.$emit('change', currentValue);
     }
   },
   watch: {
     options: function options(newVal) {
-      this.modifiedOptions = newVal[this.$props.dataField] ? newVal[this.$props.dataField].buckets : [];
+      if (newVal) {
+        this.modifiedOptions = newVal[this.$props.dataField] ? newVal[this.$props.dataField].buckets : [];
+      }
     },
     size: function size() {
       this.updateQueryHandlerOptions(this.$props);
@@ -132,7 +144,11 @@ var MultiList = {
       }
 
       if (!isEqual(selectedValue, newVal)) {
-        this.setValue(newVal || [], true);
+        if (this.value === undefined) {
+          this.setValue(newVal, true);
+        } else {
+          this.$emit('change', newVal);
+        }
       }
     },
     defaultQuery: function defaultQuery(newVal, oldVal) {
@@ -161,8 +177,12 @@ var MultiList = {
       return index.isFunction(renderErrorCalc) ? renderErrorCalc(this.error) : renderErrorCalc;
     }
 
-    if (!this.hasCustomRenderer && this.modifiedOptions.length === 0) {
-      return null;
+    if (!this.hasCustomRenderer && this.modifiedOptions.length === 0 && !this.isLoading) {
+      if (this.renderNoResult) {
+        this.renderNoResult();
+      } else {
+        return null;
+      }
     }
 
     var itemsToRender = this.$data.modifiedOptions;
@@ -174,7 +194,7 @@ var MultiList = {
     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.replaceDiacritics(String(item.key)).toLowerCase().includes(suggestions.replaceDiacritics(_this2.$data.searchTerm).toLowerCase());
         }
 
         return true;
@@ -327,22 +347,22 @@ var MultiList = {
       checkValueChange(props.componentId, finalValues, props.beforeValueChange, performUpdate);
     },
     updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-      var defaultQueryOptions;
       var query = MultiList.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);
       this.updateQuery({
         componentId: this.internalComponent,
         query: query,
@@ -353,17 +373,15 @@ var MultiList = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = MultiList.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);
       this.updateQuery({
         componentId: props.componentId,
         query: query,
@@ -383,8 +401,8 @@ var MultiList = {
 
       if (props.defaultQuery) {
         var value = Object.keys(this.$data.currentValue);
-        var defaultQueryOptions = getOptionsFromQuery(props.defaultQuery(value, props));
-        this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, queryOptions), defaultQueryOptions));
+        var defaultQueryOptions = getOptionsForCustomQuery(props.defaultQuery(value, props));
+        this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, defaultQueryOptions));
       } else {
         this.setQueryOptions(this.internalComponent, queryOptions);
       }
@@ -427,7 +445,7 @@ var MultiList = {
       if (value === undefined) {
         this.setValue(currentValue);
       } else {
-        var values = index.parseValueArray(value, currentValue);
+        var values = index.parseValueArray(value || [], currentValue);
         this.$emit('change', values);
       }
     },
@@ -469,7 +487,13 @@ var MultiList = {
 
 MultiList.defaultQuery = function (value, props) {
   var query = null;
-  var type = props.queryFormat === 'or' ? 'terms' : 'term';
+  var queryFormat = props.queryFormat;
+
+  if (queryFormat === undefined) {
+    queryFormat = 'or';
+  }
+
+  var type = queryFormat === 'or' ? 'terms' : 'term';
 
   if (!Array.isArray(value) || value.length === 0) {
     return null;
@@ -490,14 +514,14 @@ MultiList.defaultQuery = function (value, props) {
   } else if (value) {
     var listQuery;
 
-    if (props.queryFormat === 'or') {
+    if (queryFormat === 'or') {
       if (props.showMissing) {
-        var _type, _ref2;
+        var _type, _ref;
 
         var hasMissingTerm = value.includes(props.missingLabel);
-        var should = [(_ref2 = {}, _ref2[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
+        var should = [(_ref = {}, _ref[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
           return item !== props.missingLabel;
-        }), _type), _ref2)];
+        }), _type), _ref)];
 
         if (hasMissingTerm) {
           should = should.concat({
@@ -524,9 +548,9 @@ MultiList.defaultQuery = function (value, props) {
     } else {
       // adds a sub-query with must as an array of objects for each term/value
       var queryArray = value.map(function (item) {
-        var _type3, _ref3;
+        var _type3, _ref2;
 
-        return _ref3 = {}, _ref3[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref3;
+        return _ref2 = {}, _ref2[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref2;
       });
       listQuery = {
         bool: {
@@ -565,7 +589,8 @@ var mapStateToProps = function mapStateToProps(state, props) {
     selectedValue: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value || null,
     themePreset: state.config.themePreset,
     error: state.error[props.componentId],
-    componentProps: state.props[props.componentId]
+    componentProps: state.props[props.componentId],
+    enableAppbase: state.config.enableAppbase
   };
 };
 
@@ -575,9 +600,14 @@ var mapDispatchtoProps = {
   setCustomQuery: setCustomQuery,
   setDefaultQuery: setDefaultQuery
 };
+
+MultiList.hasInternalComponent = function () {
+  return true;
+};
+
 var ListConnected = ComponentWrapper.ComponentWrapper(index.connect(mapStateToProps, mapDispatchtoProps)(MultiList), {
   componentType: constants.componentTypes.multiList,
-  internalComponent: true
+  internalComponent: MultiList.hasInternalComponent()
 });
 
 MultiList.install = function (Vue) {

package/dist/cjs/MultiRange.js

@@ -6,20 +6,20 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-c705cbe6.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 require('emotion');
 require('@appbaseio/vue-emotion');
 require('polished');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-baca18c4.js');
-var ComponentWrapper = require('./ComponentWrapper-603848ed.js');
-var Title = require('./Title-65d39104.js');
-var Container = require('./Container-6cdd3864.js');
-var FormControlList = require('./FormControlList-f3857d4b.js');
+var index = require('./index-6a167fe0.js');
+var ComponentWrapper = require('./ComponentWrapper-ad3dad02.js');
+var Title = require('./Title-1de7d0f4.js');
+var Container = require('./Container-daf30918.js');
+var FormControlList = require('./FormControlList-c195a592.js');
 
 var updateQuery = configureStore.Actions.updateQuery,
     setQueryOptions = configureStore.Actions.setQueryOptions,
@@ -55,7 +55,8 @@ var MultiRange = {
     showCheckbox: VueTypes.bool.def(true),
     title: vueTypes.types.title,
     URLParams: VueTypes.bool.def(false),
-    nestedField: vueTypes.types.string
+    nestedField: vueTypes.types.string,
+    index: VueTypes.string
   },
   methods: {
     handleClick: function handleClick(e) {
@@ -99,7 +100,7 @@ var MultiRange = {
         if (reset) {
           selectedValues = values;
         } else {
-          selectedValues = _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, selectedValues), values);
+          selectedValues = _rollupPluginBabelHelpers._extends({}, selectedValues, values);
         }
       } else if (selectedValues[item]) {
         currentValue = currentValue.filter(function (value) {
@@ -118,7 +119,7 @@ var MultiRange = {
           return item.indexOf(value.label) !== -1;
         });
         currentValue = [].concat(currentValue, currentItems);
-        selectedValues = _rollupPluginBabelHelpers._extends(_rollupPluginBabelHelpers._extends({}, selectedValues), {}, (_extends2 = {}, _extends2[item] = true, _extends2));
+        selectedValues = _rollupPluginBabelHelpers._extends({}, selectedValues, (_extends2 = {}, _extends2[typeof item === 'object' ? item.label : item] = true, _extends2));
       }
 
       var performUpdate = function performUpdate() {
@@ -137,17 +138,16 @@ var MultiRange = {
     updateQueryHandler: function updateQueryHandler(value, props) {
       var customQuery = props.customQuery;
       var query = MultiRange.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);
       this.updateQuery({
         componentId: props.componentId,
         query: query,
@@ -173,7 +173,7 @@ var MultiRange = {
     },
     selectedValue: function selectedValue(newVal) {
       if (!isEqual(this.$data.currentValue, newVal)) {
-        this.selectItem(newVal);
+        this.selectItem(newVal, true, undefined, true);
       }
     },
     customQuery: function customQuery(newVal, oldVal) {
@@ -183,7 +183,11 @@ var MultiRange = {
     }
   },
   created: function created() {
-    // Set custom query in store
+    if (!this.enableAppbase && this.$props.index) {
+      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
+    } // Set custom query in store
+
+
     index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
   },
   beforeMount: function beforeMount() {
@@ -289,7 +293,8 @@ MultiRange.defaultQuery = function (values, props) {
 var mapStateToProps = function mapStateToProps(state, props) {
   return {
     selectedValue: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value || null,
-    componentProps: state.props[props.componentId]
+    componentProps: state.props[props.componentId],
+    enableAppbase: state.config.enableAppbase
   };
 };
 

package/dist/cjs/{Pagination-af399262.js → Pagination-fe5452fc.js}

@@ -4,8 +4,9 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var Button = require('./Button-d48d4365.js');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var VueTypes = _interopDefault(require('vue-types'));
+var Button = require('./Button-446f819e.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 
 var getClassName = configureStore.helper.getClassName,
     handleA11yAction = configureStore.helper.handleA11yAction;
@@ -25,7 +26,7 @@ var Pagination = {
     pages: vueTypes.types.number,
     setPage: vueTypes.types.func,
     totalPages: vueTypes.types.number,
-    showEndPage: vueTypes.types.bool,
+    showEndPage: VueTypes.bool,
     prevLabel: vueTypes.types.string,
     nextLabel: vueTypes.types.string
   },
@@ -61,6 +62,7 @@ var Pagination = {
           showEndPage = props.showEndPage;
       var start = position === 'start' ? getStartPage(pages, currentPage, showEndPage) : Math.max(2, Math.ceil(totalPages - (pages - 1) / 2 + 1));
       var paginationButtons = [];
+      var endPage = start;
 
       if (start <= totalPages) {
         var totalPagesToShow = pages < totalPages ? start + (pages - 1) : totalPages + 1;
@@ -98,6 +100,10 @@ var Pagination = {
 
           if (i <= totalPages + 1) {
             paginationButtons.push(pageBtn);
+
+            if (i === Math.min(totalPages + 1, totalPagesToShow) - 1) {
+              endPage = i;
+            }
           }
         };
 
@@ -106,7 +112,7 @@ var Pagination = {
         }
       }
 
-      return paginationButtons;
+      return [paginationButtons, start, endPage];
     };
 
     var buildIntermediatePaginationDom = function buildIntermediatePaginationDom() {
@@ -114,10 +120,10 @@ var Pagination = {
           currentPage = props.currentPage,
           totalPages = props.totalPages,
           pages = props.pages;
-      if (!showEndPage) return buildPaginationDOM('start');
+      if (!showEndPage) return buildPaginationDOM('start')[0];
 
-      if (currentPage <= totalPages - pages + 2 || totalPages <= pages) {
-        return buildPaginationDOM('start');
+      if (currentPage <= totalPages - pages + 2 || totalPages < pages) {
+        return buildPaginationDOM('start')[0];
       }
 
       return null;
@@ -153,7 +159,7 @@ var Pagination = {
           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.Button, {
+    }, ["1"]), props.showEndPage && props.currentPage >= Math.floor(props.pages / 2) + !!(props.pages % 2) && buildPaginationDOM('start')[1] !== 2 ? h("span", ["..."]) : null, buildIntermediatePaginationDom(), props.showEndPage && props.pages > 2 && props.currentPage <= props.totalPages - Math.ceil(props.pages * 0.75) && buildPaginationDOM('start')[2] !== buildPaginationDOM('end')[1] - 1 ? h("span", ["..."]) : null, props.showEndPage && props.totalPages >= props.pages && buildPaginationDOM('end')[0], h(Button.Button, {
       "class": getClassName(props.innerClass, 'button') || '',
       "attrs": {
         "disabled": props.currentPage >= props.totalPages - 1,

package/dist/cjs/RangeInput.js

@@ -6,58 +6,38 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var configureStore = require('@appbaseio/reactivecore');
 var configureStore__default = _interopDefault(configureStore);
-var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
+var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-c705cbe6.js');
 var VueTypes = _interopDefault(require('vue-types'));
 var constants = require('@appbaseio/reactivecore/lib/utils/constants');
 var emotion = require('emotion');
 var styled = require('@appbaseio/vue-emotion');
 var styled__default = _interopDefault(styled);
 require('polished');
-var vueTypes = require('./vueTypes-c21f265b.js');
+var vueTypes = require('./vueTypes-6de9d2a9.js');
 require('@appbaseio/reactivecore/lib/utils/transform');
 require('redux');
-var index = require('./index-baca18c4.js');
-var ComponentWrapper = require('./ComponentWrapper-603848ed.js');
-require('./Title-65d39104.js');
-var Flex = require('./Flex-befd65fc.js');
-var Input = require('./Input-95cb19f8.js');
-var Container = require('./Container-6cdd3864.js');
+var index = require('./index-6a167fe0.js');
+var ComponentWrapper = require('./ComponentWrapper-ad3dad02.js');
+require('./Title-1de7d0f4.js');
+var Flex = require('./Flex-aa517a13.js');
+var Input = require('./Input-e6603a7e.js');
+var Container = require('./Container-daf30918.js');
 require('vue-no-ssr');
-require('./ssr-3ca8a14f.js');
+require('./ssr-3027b848.js');
 var RangeSlider = require('./RangeSlider.js');
 
-function _templateObject2() {
-  var data = _rollupPluginBabelHelpers._taggedTemplateLiteralLoose(["\n\t", ";\n\tfont-size: 13px;\n\tmargin: 8px;\n"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _rollupPluginBabelHelpers._taggedTemplateLiteralLoose(["\n\tcolor: ", ";\n"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
+var _templateObject, _templateObject2;
 
 var alert = function alert(_ref) {
   var theme = _ref.theme;
-  return emotion.css(_templateObject(), theme.colors.alertColor);
+  return emotion.css(_templateObject || (_templateObject = _rollupPluginBabelHelpers._taggedTemplateLiteralLoose(["\n\tcolor: ", ";\n"])), theme.colors.alertColor);
 };
 
-var Content = styled__default('div')(_templateObject2(), function (props) {
+var Content = styled__default('div')(_templateObject2 || (_templateObject2 = _rollupPluginBabelHelpers._taggedTemplateLiteralLoose(["\n\t", ";\n\tfont-size: 13px;\n\tmargin: 8px;\n"])), function (props) {
   return props.alert && alert;
 });
 
-var checkValueChange = configureStore.helper.checkValueChange,
-    getClassName = configureStore.helper.getClassName,
-    getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
+var getClassName = configureStore.helper.getClassName,
     isEqual = configureStore.helper.isEqual;
 var RangeInput = {
   name: 'RangeInput',
@@ -103,7 +83,7 @@ var RangeInput = {
     stepValue: vueTypes.types.number,
     componentStyle: vueTypes.types.style,
     componentId: vueTypes.types.stringRequired,
-    includeNullValues: vueTypes.types.bool,
+    includeNullValues: VueTypes.bool,
     beforeValueChange: vueTypes.types.func,
     customQuery: vueTypes.types.func,
     data: vueTypes.types.data,
@@ -138,17 +118,19 @@ var RangeInput = {
       return false;
     },
     handleChange: function handleChange(value, event) {
+      var currentValue = value;
+
       if (this.shouldUpdate(value) && !isEqual(value, this.currentValue)) {
         switch (event) {
           case 'change':
             if (!value) {
-              value = {
+              currentValue = {
                 start: this.$props.range ? this.$props.range.start : 0,
                 end: this.$props.range ? this.$props.range.end : 10
               };
             }
 
-            this.$data.currentValue = _rollupPluginBabelHelpers._extends({}, value);
+            this.$data.currentValue = _rollupPluginBabelHelpers._extends({}, currentValue);
             this.$emit('change', this.$data.currentValue);
             break;
 
@@ -158,13 +140,13 @@ var RangeInput = {
             break;
 
           default:
-            this.$data.currentValue = _rollupPluginBabelHelpers._extends({}, value);
+            this.$data.currentValue = _rollupPluginBabelHelpers._extends({}, currentValue);
             break;
         }
       }
     },
     handleOnChange: function handleOnChange(value) {
-      this.handleChange(value, 'change');
+      this.handleChange(value || this.$props.range, 'change');
     },
     handleValueChange: function handleValueChange(value) {
       this.handleChange(value, 'value-change');
@@ -180,12 +162,10 @@ var RangeInput = {
         } else {
           this.$data.isEndValid = false;
         }
-      } else {
-        if (name === 'start' && !this.$data.isStartValid) {
-          this.$data.isStartValid = true;
-        } else if (name === 'end' && !this.$data.isEndValid) {
-          this.$data.isEndValid = true;
-        }
+      } else if (name === 'start' && !this.$data.isStartValid) {
+        this.$data.isStartValid = true;
+      } else if (name === 'end' && !this.$data.isEndValid) {
+        this.$data.isEndValid = true;
       }
 
       if (this.$data.isStartValid && this.$data.isEndValid) {
@@ -221,6 +201,10 @@ var RangeInput = {
     if (this.$props.defaultValue && this.$props.defaultValue.start && this.$props.defaultValue.end) {
       this.handleChange(this.$props.defaultValue);
     }
+
+    if (this.isControlled()) {
+      this.handleChange(this.$props.value, 'change');
+    }
   },
   render: function render() {
     var h = arguments[0];
@@ -342,7 +326,7 @@ var RangeInput = {
   }
 };
 
-var mapStateToProps = function mapStateToProps(state, props) {
+var mapStateToProps = function mapStateToProps(state) {
   return {
     themePreset: state.config.themePreset
   };