@appbaseio/reactivesearch-vue 1.16.0-alpha.34 → 1.16.0-alpha.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/dist/@appbaseio/reactivesearch-vue.umd.js +15843 -10573
  2. package/dist/@appbaseio/reactivesearch-vue.umd.js.map +1 -1
  3. package/dist/@appbaseio/reactivesearch-vue.umd.min.js +5 -5
  4. package/dist/@appbaseio/reactivesearch-vue.umd.min.js.map +1 -1
  5. package/dist/cjs/{Button-11307285.js → Button-d2f1aeda.js} +1 -1
  6. package/dist/cjs/{CancelSvg-4aa35935.js → CancelSvg-82021d23.js} +1 -1
  7. package/dist/cjs/{Card-fd94ef07.js → Card-4b915733.js} +2 -2
  8. package/dist/cjs/{ComponentWrapper-32481890.js → ComponentWrapper-7302fe1a.js} +2 -2
  9. package/dist/cjs/{Container-526efa6a.js → Container-8a08d663.js} +1 -1
  10. package/dist/cjs/DataSearch.js +2107 -18
  11. package/dist/cjs/{DropDown-cf9bfffc.js → DropDown-c46d8b0c.js} +19 -14
  12. package/dist/cjs/DynamicRangeSlider.js +68 -26
  13. package/dist/cjs/{Flex-f146cdad.js → Flex-699639d2.js} +1 -1
  14. package/dist/cjs/{FormControlList-808dbcef.js → FormControlList-73497794.js} +1 -1
  15. package/dist/cjs/{Input-3cc3fa59.js → Input-c6f181d5.js} +1 -1
  16. package/dist/cjs/{ListItem-b40adb04.js → ListItem-933c27e4.js} +2 -2
  17. package/dist/cjs/MultiDropdownList.js +34 -28
  18. package/dist/cjs/MultiList.js +43 -32
  19. package/dist/cjs/MultiRange.js +7 -7
  20. package/dist/cjs/Pagination-1b2320a7.js +177 -0
  21. package/dist/cjs/RangeInput.js +13 -9
  22. package/dist/cjs/RangeSlider.js +7 -7
  23. package/dist/cjs/ReactiveBase.js +3 -3
  24. package/dist/cjs/ReactiveComponent.js +34 -64
  25. package/dist/cjs/ReactiveGoogleMap.js +1764 -0
  26. package/dist/cjs/ReactiveList.js +66 -231
  27. package/dist/cjs/ResultCard.js +4 -4
  28. package/dist/cjs/ResultList.js +4 -4
  29. package/dist/cjs/SelectedFilters.js +6 -6
  30. package/dist/cjs/SingleDropdownList.js +28 -22
  31. package/dist/cjs/SingleList.js +25 -20
  32. package/dist/cjs/SingleRange.js +7 -7
  33. package/dist/cjs/StateProvider.js +2 -2
  34. package/dist/cjs/{Title-584a8cc8.js → Title-39765ee6.js} +1 -1
  35. package/dist/cjs/ToggleButton.js +7 -7
  36. package/dist/cjs/{_rollupPluginBabelHelpers-f127c8b7.js → _rollupPluginBabelHelpers-4abdbfff.js} +17 -0
  37. package/dist/cjs/{index-89c39a9e.js → index-d44a0a21.js} +11 -5
  38. package/dist/cjs/index.js +32 -23
  39. package/dist/cjs/initReactivesearch.js +98 -81
  40. package/dist/cjs/install.js +43 -37
  41. package/dist/cjs/{ssr-0ee35a09.js → ssr-c333c82c.js} +1 -1
  42. package/dist/cjs/{utils-1219e1fe.js → utils-23afb20b.js} +1 -1
  43. package/dist/cjs/version.js +1 -1
  44. package/dist/cjs/{vueTypes-57d01f18.js → vueTypes-6de9d2a9.js} +24 -13
  45. package/dist/es/{Button-91561391.js → Button-799185e2.js} +1 -1
  46. package/dist/es/{CancelSvg-c2c03a35.js → CancelSvg-4d9e0857.js} +1 -1
  47. package/dist/es/{Card-6446f1b7.js → Card-04b3c33e.js} +2 -2
  48. package/dist/es/{ComponentWrapper-4f85a67e.js → ComponentWrapper-bbb717bc.js} +2 -2
  49. package/dist/es/{Container-18b03fde.js → Container-4383c6f0.js} +1 -1
  50. package/dist/es/DataSearch.js +2106 -17
  51. package/dist/es/{DropDown-c8da0a2c.js → DropDown-4edaa621.js} +19 -14
  52. package/dist/es/DynamicRangeSlider.js +68 -26
  53. package/dist/es/{Flex-8770345d.js → Flex-aac91505.js} +1 -1
  54. package/dist/es/{FormControlList-704f8dee.js → FormControlList-fe389a2e.js} +1 -1
  55. package/dist/es/{Input-08bb1bcf.js → Input-d8519224.js} +1 -1
  56. package/dist/es/{ListItem-8e8fb535.js → ListItem-bdb6d53d.js} +2 -2
  57. package/dist/es/MultiDropdownList.js +34 -28
  58. package/dist/es/MultiList.js +43 -32
  59. package/dist/es/MultiRange.js +7 -7
  60. package/dist/es/Pagination-b3e4054a.js +172 -0
  61. package/dist/es/RangeInput.js +13 -9
  62. package/dist/es/RangeSlider.js +7 -7
  63. package/dist/es/ReactiveBase.js +3 -3
  64. package/dist/es/ReactiveComponent.js +34 -64
  65. package/dist/es/ReactiveGoogleMap.js +1756 -0
  66. package/dist/es/ReactiveList.js +66 -231
  67. package/dist/es/ResultCard.js +4 -4
  68. package/dist/es/ResultList.js +4 -4
  69. package/dist/es/SelectedFilters.js +6 -6
  70. package/dist/es/SingleDropdownList.js +28 -22
  71. package/dist/es/SingleList.js +25 -20
  72. package/dist/es/SingleRange.js +7 -7
  73. package/dist/es/StateProvider.js +2 -2
  74. package/dist/es/{Title-3522ff56.js → Title-579f8d6c.js} +1 -1
  75. package/dist/es/ToggleButton.js +7 -7
  76. package/dist/es/{_rollupPluginBabelHelpers-0f24d612.js → _rollupPluginBabelHelpers-ecf6c03c.js} +17 -1
  77. package/dist/es/{index-cb1950b6.js → index-5daa8276.js} +11 -5
  78. package/dist/es/index.js +28 -19
  79. package/dist/es/initReactivesearch.js +99 -82
  80. package/dist/es/install.js +45 -35
  81. package/dist/es/{ssr-a41dfea9.js → ssr-e3196de1.js} +1 -1
  82. package/dist/es/{utils-64a2e5f0.js → utils-3a32e13f.js} +1 -1
  83. package/dist/es/version.js +1 -1
  84. package/dist/es/{vueTypes-687b2304.js → vueTypes-9326e0be.js} +24 -13
  85. package/package.json +86 -80
  86. package/dist/cjs/DataSearch-8658fd8e.js +0 -2154
  87. package/dist/cjs/install-35f74190.js +0 -1196
  88. package/dist/es/DataSearch-66e72d1d.js +0 -2141
  89. package/dist/es/install-ecef1861.js +0 -1189
@@ -6,20 +6,20 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
6
6
 
7
7
  var configureStore = require('@appbaseio/reactivecore');
8
8
  var configureStore__default = _interopDefault(configureStore);
9
- var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
9
+ var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
10
10
  var VueTypes = _interopDefault(require('vue-types'));
11
11
  var constants = require('@appbaseio/reactivecore/lib/utils/constants');
12
12
  require('emotion');
13
13
  require('@appbaseio/vue-emotion');
14
14
  require('polished');
15
- var vueTypes = require('./vueTypes-57d01f18.js');
15
+ var vueTypes = require('./vueTypes-6de9d2a9.js');
16
16
  require('@appbaseio/reactivecore/lib/utils/transform');
17
17
  require('redux');
18
- var index = require('./index-89c39a9e.js');
19
- var ComponentWrapper = require('./ComponentWrapper-32481890.js');
20
- var Title = require('./Title-584a8cc8.js');
21
- var Container = require('./Container-526efa6a.js');
22
- var FormControlList = require('./FormControlList-808dbcef.js');
18
+ var index = require('./index-d44a0a21.js');
19
+ var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
20
+ var Title = require('./Title-39765ee6.js');
21
+ var Container = require('./Container-8a08d663.js');
22
+ var FormControlList = require('./FormControlList-73497794.js');
23
23
 
24
24
  var updateQuery = configureStore.Actions.updateQuery,
25
25
  setQueryOptions = configureStore.Actions.setQueryOptions,
@@ -0,0 +1,177 @@
1
+ 'use strict';
2
+
3
+ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
4
+
5
+ var configureStore = require('@appbaseio/reactivecore');
6
+ var configureStore__default = _interopDefault(configureStore);
7
+ var VueTypes = _interopDefault(require('vue-types'));
8
+ var Button = require('./Button-d2f1aeda.js');
9
+ var vueTypes = require('./vueTypes-6de9d2a9.js');
10
+
11
+ var getClassName = configureStore.helper.getClassName,
12
+ handleA11yAction = configureStore.helper.handleA11yAction;
13
+
14
+ function getStartPage(totalPages, currentPage, showEndPage) {
15
+ var midValue = parseInt(totalPages / 2, 10);
16
+ var start = currentPage - (showEndPage ? Math.ceil(midValue / 2) - 1 : midValue);
17
+ return start > 1 ? start : 2;
18
+ }
19
+
20
+ var Pagination = {
21
+ name: 'Pagination',
22
+ functional: true,
23
+ props: {
24
+ currentPage: vueTypes.types.number,
25
+ innerClass: vueTypes.types.style,
26
+ pages: vueTypes.types.number,
27
+ setPage: vueTypes.types.func,
28
+ totalPages: vueTypes.types.number,
29
+ showEndPage: VueTypes.bool,
30
+ prevLabel: vueTypes.types.string,
31
+ nextLabel: vueTypes.types.string
32
+ },
33
+ render: function render(createElement, context) {
34
+ var h = arguments[0];
35
+ var props = context.props;
36
+
37
+ var onPrevPage = function onPrevPage() {
38
+ if (props.currentPage) {
39
+ props.setPage(props.currentPage - 1);
40
+ }
41
+ };
42
+
43
+ var onNextPage = function onNextPage() {
44
+ if (props.currentPage < props.totalPages - 1) {
45
+ props.setPage(props.currentPage + 1);
46
+ }
47
+ };
48
+
49
+ if (!props.totalPages) {
50
+ return null;
51
+ }
52
+
53
+ var innerClassName = getClassName(props.innerClass, 'button');
54
+ var primary = props.currentPage === 0;
55
+ var className = innerClassName || primary ? innerClassName + " " + (primary ? 'active' : '') : '';
56
+
57
+ var buildPaginationDOM = function buildPaginationDOM(position) {
58
+ var pages = props.pages,
59
+ currentPage = props.currentPage,
60
+ totalPages = props.totalPages,
61
+ setPage = props.setPage,
62
+ showEndPage = props.showEndPage;
63
+ var start = position === 'start' ? getStartPage(pages, currentPage, showEndPage) : Math.max(2, Math.ceil(totalPages - (pages - 1) / 2 + 1));
64
+ var paginationButtons = [];
65
+
66
+ if (start <= totalPages) {
67
+ var totalPagesToShow = pages < totalPages ? start + (pages - 1) : totalPages + 1;
68
+
69
+ if (showEndPage) {
70
+ totalPagesToShow = position === 'start' ? start + (Math.ceil(pages / 2) - pages % 2) : totalPages + 1;
71
+ }
72
+
73
+ if (currentPage > totalPages - pages + 2) {
74
+ start = Math.max(2, totalPages - pages + 2);
75
+ totalPagesToShow = start + pages;
76
+ }
77
+
78
+ var _loop = function _loop(i) {
79
+ var activeButton = currentPage === i - 1;
80
+ var classNameBtn = innerClassName || activeButton ? innerClassName + " " + (activeButton ? 'active' : '') : '';
81
+ var pageBtn = h(Button.Button, {
82
+ "class": classNameBtn,
83
+ "attrs": {
84
+ "primary": activeButton,
85
+ "tabIndex": "0",
86
+ "alt": "page-" + i
87
+ },
88
+ "on": {
89
+ "keyPress": function keyPress(event) {
90
+ return handleA11yAction(event, function () {
91
+ return setPage(i - 1);
92
+ });
93
+ },
94
+ "click": function click() {
95
+ return setPage(i - 1);
96
+ }
97
+ }
98
+ }, [i]);
99
+
100
+ if (i <= totalPages + 1) {
101
+ paginationButtons.push(pageBtn);
102
+ }
103
+ };
104
+
105
+ for (var i = start; i < Math.min(totalPages + 1, totalPagesToShow); i += 1) {
106
+ _loop(i);
107
+ }
108
+ }
109
+
110
+ return paginationButtons;
111
+ };
112
+
113
+ var buildIntermediatePaginationDom = function buildIntermediatePaginationDom() {
114
+ var showEndPage = props.showEndPage,
115
+ currentPage = props.currentPage,
116
+ totalPages = props.totalPages,
117
+ pages = props.pages;
118
+ if (!showEndPage) return buildPaginationDOM('start');
119
+
120
+ if (currentPage <= totalPages - pages + 2 || totalPages <= pages) {
121
+ return buildPaginationDOM('start');
122
+ }
123
+
124
+ return null;
125
+ };
126
+
127
+ return h("div", {
128
+ "class": Button.pagination + " " + getClassName(props.innerClass, 'pagination')
129
+ }, [h(Button.Button, {
130
+ "class": getClassName(props.innerClass, 'button') || '',
131
+ "attrs": {
132
+ "disabled": props.currentPage === 0,
133
+ "tabIndex": "0"
134
+ },
135
+ "on": {
136
+ "keyPress": function keyPress(event) {
137
+ return handleA11yAction(event, onPrevPage);
138
+ },
139
+ "click": onPrevPage
140
+ }
141
+ }, [props.prevLabel || 'Prev']), h(Button.Button, {
142
+ "class": className,
143
+ "attrs": {
144
+ "primary": primary,
145
+ "tabIndex": "0"
146
+ },
147
+ "on": {
148
+ "keyPress": function keyPress(event) {
149
+ return handleA11yAction(event, function () {
150
+ return props.setPage(0);
151
+ });
152
+ },
153
+ "click": function click() {
154
+ return props.setPage(0);
155
+ }
156
+ }
157
+ }, ["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, {
158
+ "class": getClassName(props.innerClass, 'button') || '',
159
+ "attrs": {
160
+ "disabled": props.currentPage >= props.totalPages - 1,
161
+ "tabIndex": "0"
162
+ },
163
+ "on": {
164
+ "keyPress": function keyPress(event) {
165
+ return handleA11yAction(event, onNextPage);
166
+ },
167
+ "click": onNextPage
168
+ }
169
+ }, [props.nextLabel || 'Next'])]);
170
+ }
171
+ };
172
+
173
+ Pagination.install = function (Vue) {
174
+ Vue.component(Pagination.name, Pagination);
175
+ };
176
+
177
+ exports.Pagination = Pagination;
@@ -6,24 +6,24 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
6
6
 
7
7
  var configureStore = require('@appbaseio/reactivecore');
8
8
  var configureStore__default = _interopDefault(configureStore);
9
- var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
9
+ var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
10
10
  var VueTypes = _interopDefault(require('vue-types'));
11
11
  var constants = require('@appbaseio/reactivecore/lib/utils/constants');
12
12
  var emotion = require('emotion');
13
13
  var styled = require('@appbaseio/vue-emotion');
14
14
  var styled__default = _interopDefault(styled);
15
15
  require('polished');
16
- var vueTypes = require('./vueTypes-57d01f18.js');
16
+ var vueTypes = require('./vueTypes-6de9d2a9.js');
17
17
  require('@appbaseio/reactivecore/lib/utils/transform');
18
18
  require('redux');
19
- var index = require('./index-89c39a9e.js');
20
- var ComponentWrapper = require('./ComponentWrapper-32481890.js');
21
- require('./Title-584a8cc8.js');
22
- var Flex = require('./Flex-f146cdad.js');
23
- var Input = require('./Input-3cc3fa59.js');
24
- var Container = require('./Container-526efa6a.js');
19
+ var index = require('./index-d44a0a21.js');
20
+ var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
21
+ require('./Title-39765ee6.js');
22
+ var Flex = require('./Flex-699639d2.js');
23
+ var Input = require('./Input-c6f181d5.js');
24
+ var Container = require('./Container-8a08d663.js');
25
25
  require('vue-no-ssr');
26
- require('./ssr-0ee35a09.js');
26
+ require('./ssr-c333c82c.js');
27
27
  var RangeSlider = require('./RangeSlider.js');
28
28
 
29
29
  var _templateObject, _templateObject2;
@@ -201,6 +201,10 @@ var RangeInput = {
201
201
  if (this.$props.defaultValue && this.$props.defaultValue.start && this.$props.defaultValue.end) {
202
202
  this.handleChange(this.$props.defaultValue);
203
203
  }
204
+
205
+ if (this.isControlled()) {
206
+ this.handleChange(this.$props.value, 'change');
207
+ }
204
208
  },
205
209
  render: function render() {
206
210
  var h = arguments[0];
@@ -6,19 +6,19 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
6
6
 
7
7
  var configureStore = require('@appbaseio/reactivecore');
8
8
  var configureStore__default = _interopDefault(configureStore);
9
- var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
9
+ var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
10
10
  var VueTypes = _interopDefault(require('vue-types'));
11
11
  var constants = require('@appbaseio/reactivecore/lib/utils/constants');
12
12
  require('@appbaseio/vue-emotion');
13
- var vueTypes = require('./vueTypes-57d01f18.js');
13
+ var vueTypes = require('./vueTypes-6de9d2a9.js');
14
14
  require('@appbaseio/reactivecore/lib/utils/transform');
15
15
  require('redux');
16
- var index = require('./index-89c39a9e.js');
17
- var ComponentWrapper = require('./ComponentWrapper-32481890.js');
18
- var Title = require('./Title-584a8cc8.js');
19
- var Container = require('./Container-526efa6a.js');
16
+ var index = require('./index-d44a0a21.js');
17
+ var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
18
+ var Title = require('./Title-39765ee6.js');
19
+ var Container = require('./Container-8a08d663.js');
20
20
  var NoSSR = _interopDefault(require('vue-no-ssr'));
21
- var ssr = require('./ssr-0ee35a09.js');
21
+ var ssr = require('./ssr-c333c82c.js');
22
22
 
23
23
  var updateQuery = configureStore.Actions.updateQuery,
24
24
  setQueryOptions = configureStore.Actions.setQueryOptions,
@@ -6,15 +6,15 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
6
6
 
7
7
  var configureStore = require('@appbaseio/reactivecore');
8
8
  var configureStore__default = _interopDefault(configureStore);
9
- var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
9
+ var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
10
10
  var VueTypes = _interopDefault(require('vue-types'));
11
11
  require('@appbaseio/reactivecore/lib/utils/constants');
12
12
  var helper = require('@appbaseio/reactivecore/lib/utils/helper');
13
13
  var styled = require('@appbaseio/vue-emotion');
14
14
  var styled__default = _interopDefault(styled);
15
- var vueTypes = require('./vueTypes-57d01f18.js');
15
+ var vueTypes = require('./vueTypes-6de9d2a9.js');
16
16
  require('redux');
17
- var index = require('./index-89c39a9e.js');
17
+ var index = require('./index-d44a0a21.js');
18
18
  var _mergeJSXProps = _interopDefault(require('@vue/babel-helper-vue-jsx-merge-props'));
19
19
  var analytics = require('@appbaseio/reactivecore/lib/actions/analytics');
20
20
  var Appbase = _interopDefault(require('appbase-js'));
@@ -6,19 +6,16 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
6
6
 
7
7
  var configureStore = require('@appbaseio/reactivecore');
8
8
  var configureStore__default = _interopDefault(configureStore);
9
- var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-f127c8b7.js');
9
+ var _rollupPluginBabelHelpers = require('./_rollupPluginBabelHelpers-4abdbfff.js');
10
10
  var VueTypes = _interopDefault(require('vue-types'));
11
11
  var constants = require('@appbaseio/reactivecore/lib/utils/constants');
12
- var vueTypes = require('./vueTypes-57d01f18.js');
12
+ var vueTypes = require('./vueTypes-6de9d2a9.js');
13
13
  require('@appbaseio/reactivecore/lib/utils/transform');
14
14
  require('redux');
15
- var index = require('./index-89c39a9e.js');
16
- var ComponentWrapper = require('./ComponentWrapper-32481890.js');
15
+ var index = require('./index-d44a0a21.js');
16
+ var ComponentWrapper = require('./ComponentWrapper-7302fe1a.js');
17
17
 
18
- var _excluded = ["options"],
19
- _excluded2 = ["query"],
20
- _excluded3 = ["query"],
21
- _excluded4 = ["query"];
18
+ var _excluded = ["options"];
22
19
  var updateQuery = configureStore.Actions.updateQuery,
23
20
  setQueryOptions = configureStore.Actions.setQueryOptions,
24
21
  setCustomQuery = configureStore.Actions.setCustomQuery,
@@ -26,8 +23,9 @@ var updateQuery = configureStore.Actions.updateQuery,
26
23
  var parseHits = configureStore.helper.parseHits,
27
24
  isEqual = configureStore.helper.isEqual,
28
25
  getCompositeAggsQuery = configureStore.helper.getCompositeAggsQuery,
29
- getOptionsFromQuery = configureStore.helper.getOptionsFromQuery,
30
- getResultStats = configureStore.helper.getResultStats;
26
+ getResultStats = configureStore.helper.getResultStats,
27
+ extractQueryFromCustomQuery = configureStore.helper.extractQueryFromCustomQuery,
28
+ getOptionsForCustomQuery = configureStore.helper.getOptionsForCustomQuery;
31
29
  var ReactiveComponent = {
32
30
  name: 'ReactiveComponent',
33
31
  props: {
@@ -76,25 +74,16 @@ var ReactiveComponent = {
76
74
 
77
75
  if (customQuery) {
78
76
  var calcCustomQuery = customQuery(this.selectedValue, props);
79
-
80
- var _ref = calcCustomQuery || {},
81
- query = _ref.query;
82
-
83
- var customQueryOptions = calcCustomQuery ? getOptionsFromQuery(calcCustomQuery) : null;
77
+ var query = extractQueryFromCustomQuery(calcCustomQuery);
78
+ var customQueryOptions = calcCustomQuery ? getOptionsForCustomQuery(calcCustomQuery) : null;
84
79
 
85
80
  if (customQueryOptions) {
86
81
  this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, customQueryOptions, this.getAggsQuery()), false);
87
82
  } else this.setQueryOptions(componentId, this.getAggsQuery(), false);
88
83
 
89
- var queryToSet = query || null;
90
-
91
- if (calcCustomQuery && calcCustomQuery.id) {
92
- queryToSet = calcCustomQuery;
93
- }
94
-
95
84
  this.updateQuery({
96
85
  componentId: componentId,
97
- query: queryToSet,
86
+ query: query,
98
87
  value: this.selectedValue || null,
99
88
  label: filterLabel,
100
89
  showFilter: showFilter,
@@ -102,9 +91,9 @@ var ReactiveComponent = {
102
91
  });
103
92
  }
104
93
 
105
- this.setQuery = function (_ref2) {
106
- var options = _ref2.options,
107
- obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref2, _excluded);
94
+ this.setQuery = function (_ref) {
95
+ var options = _ref.options,
96
+ obj = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref, _excluded);
108
97
 
109
98
  if (options) {
110
99
  _this.setQueryOptions(props.componentId, _rollupPluginBabelHelpers._extends({}, options, _this.getAggsQuery()), false);
@@ -114,17 +103,17 @@ var ReactiveComponent = {
114
103
 
115
104
  if (obj && obj.query && obj.query.query) {
116
105
  queryToBeSet = obj.query.query;
117
- } // Update customQuery field for RS API
106
+ }
118
107
 
108
+ var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options); // Update customQuery field for RS API
119
109
 
120
- if (obj && obj.query || options) {
121
- var customQueryCalc = _rollupPluginBabelHelpers._extends({}, options);
122
110
 
123
- if (obj && obj.query) {
124
- if (obj.query.id) {
111
+ if (queryToBeSet || options) {
112
+ if (queryToBeSet.query) {
113
+ if (queryToBeSet.id) {
125
114
  customQueryCalc = queryToBeSet;
126
115
  } else {
127
- customQueryCalc.query = obj.query;
116
+ customQueryCalc.query = queryToBeSet;
128
117
  }
129
118
  }
130
119
 
@@ -132,6 +121,7 @@ var ReactiveComponent = {
132
121
  }
133
122
 
134
123
  _this.updateQuery(_rollupPluginBabelHelpers._extends({}, obj, {
124
+ query: customQueryCalc,
135
125
  componentId: props.componentId,
136
126
  label: props.filterLabel,
137
127
  showFilter: props.showFilter,
@@ -147,24 +137,16 @@ var ReactiveComponent = {
147
137
  if (this.internalComponent && this.$props.defaultQuery) {
148
138
  index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
149
139
  this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
150
-
151
- var _ref3 = this.$defaultQuery || {},
152
- query = _ref3.query,
153
- queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref3, _excluded2);
140
+ var query = extractQueryFromCustomQuery(this.$defaultQuery);
141
+ var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
154
142
 
155
143
  if (queryOptions) {
156
144
  this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
157
145
  } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false);
158
146
 
159
- var queryToSet = query || null;
160
-
161
- if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
162
- queryToSet = this.$defaultQuery;
163
- }
164
-
165
147
  this.updateQuery({
166
148
  componentId: this.internalComponent,
167
- query: queryToSet
149
+ query: query
168
150
  });
169
151
  }
170
152
  },
@@ -212,10 +194,8 @@ var ReactiveComponent = {
212
194
  defaultQuery: function defaultQuery(newVal, oldVal) {
213
195
  if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
214
196
  this.$defaultQuery = newVal(this.selectedValue, this.$props);
215
-
216
- var _ref4 = this.$defaultQuery || {},
217
- query = _ref4.query,
218
- queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref4, _excluded3);
197
+ var query = extractQueryFromCustomQuery(this.$defaultQuery);
198
+ var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
219
199
 
220
200
  if (queryOptions) {
221
201
  this.setQueryOptions(this.internalComponent, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
@@ -223,15 +203,9 @@ var ReactiveComponent = {
223
203
 
224
204
 
225
205
  index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
226
- var queryToSet = query || null;
227
-
228
- if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
229
- queryToSet = this.$defaultQuery;
230
- }
231
-
232
206
  this.updateQuery({
233
207
  componentId: this.internalComponent,
234
- query: queryToSet
208
+ query: query
235
209
  });
236
210
  }
237
211
  },
@@ -239,10 +213,8 @@ var ReactiveComponent = {
239
213
  if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
240
214
  var componentId = this.$props.componentId;
241
215
  this.$customQuery = newVal(this.selectedValue, this.$props);
242
-
243
- var _ref5 = this.$customQuery || {},
244
- query = _ref5.query,
245
- queryOptions = _rollupPluginBabelHelpers._objectWithoutPropertiesLoose(_ref5, _excluded4);
216
+ var query = extractQueryFromCustomQuery(this.$customQuery);
217
+ var queryOptions = getOptionsForCustomQuery(this.$customQuery);
246
218
 
247
219
  if (queryOptions) {
248
220
  this.setQueryOptions(componentId, _rollupPluginBabelHelpers._extends({}, queryOptions, this.getAggsQuery()), false);
@@ -250,15 +222,9 @@ var ReactiveComponent = {
250
222
 
251
223
 
252
224
  index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
253
- var queryToSet = query || null;
254
-
255
- if (this.$customQuery && this.$customQuery.id) {
256
- queryToSet = this.$customQuery;
257
- }
258
-
259
225
  this.updateQuery({
260
226
  componentId: componentId,
261
- query: queryToSet
227
+ query: query
262
228
  });
263
229
  }
264
230
  }
@@ -338,6 +304,10 @@ var ReactiveComponent = {
338
304
  }
339
305
  };
340
306
 
307
+ ReactiveComponent.hasInternalComponent = function (props) {
308
+ return !!props.defaultQuery;
309
+ };
310
+
341
311
  var mapStateToProps = function mapStateToProps(state, props) {
342
312
  return {
343
313
  aggregations: state.aggregations[props.componentId] && state.aggregations[props.componentId] || null,