@appbaseio/reactivesearch-vue 1.23.4-alpha → 1.24.3

package/dist/cjs/ReactiveComponent.js

@@ -52,7 +52,7 @@ var ReactiveComponent = {
     this.internalComponent = null;
     this.$defaultQuery = null; // Set custom query in store
 
-    index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+    index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
     var customQuery = props.customQuery,
         componentId = props.componentId,
         filterLabel = props.filterLabel,
@@ -75,7 +75,7 @@ var ReactiveComponent = {
     }
 
     if (customQuery) {
-      var calcCustomQuery = customQuery(props);
+      var calcCustomQuery = customQuery(this.selectedValue, props);
 
       var _ref = calcCustomQuery || {},
           query = _ref.query;
@@ -94,7 +94,7 @@ var ReactiveComponent = {
 
       this.updateQuery({
         componentId: componentId,
-        queryToSet: queryToSet,
+        query: queryToSet,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -145,8 +145,8 @@ var ReactiveComponent = {
   },
   beforeMount: function beforeMount() {
     if (this.internalComponent && this.$props.defaultQuery) {
-      index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
-      this.$defaultQuery = this.$props.defaultQuery();
+      index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
+      this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
 
       var _ref3 = this.$defaultQuery || {},
           query = _ref3.query,
@@ -210,8 +210,8 @@ var ReactiveComponent = {
       }
     },
     defaultQuery: function defaultQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
-        this.$defaultQuery = newVal();
+      if (newVal && !index.isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
+        this.$defaultQuery = newVal(this.selectedValue, this.$props);
 
         var _ref4 = this.$defaultQuery || {},
             query = _ref4.query,
@@ -222,7 +222,7 @@ var ReactiveComponent = {
         } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false); // Update default query for RS API
 
 
-        index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, undefined);
+        index.updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
         var queryToSet = query || null;
 
         if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
@@ -236,9 +236,9 @@ var ReactiveComponent = {
       }
     },
     customQuery: function customQuery(newVal, oldVal) {
-      if (newVal && !index.isQueryIdentical(newVal, oldVal, undefined, this.$props)) {
+      if (newVal && !index.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,
@@ -249,7 +249,7 @@ var ReactiveComponent = {
         } else this.setQueryOptions(componentId, this.getAggsQuery(), false); // Update custom query for RS API
 
 
-        index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, undefined);
+        index.updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
         var queryToSet = query || null;
 
         if (this.$customQuery && this.$customQuery.id) {

package/dist/cjs/ReactiveList.js

@@ -980,6 +980,11 @@ var ReactiveList = {
     renderNoResult: function renderNoResult() {
       var h = this.$createElement;
       var renderNoResults = this.$scopedSlots.renderNoResults || this.$props.renderNoResults;
+
+      if (this.$scopedSlots.renderNoResults) {
+        return index.isFunction(renderNoResults) ? renderNoResults() : renderNoResults;
+      }
+
       return h("p", {
         "class": getClassName$1(this.$props.innerClass, 'noResults') || null
       }, [index.isFunction(renderNoResults) ? renderNoResults() : renderNoResults]);

package/dist/cjs/initReactivesearch.js

@@ -122,16 +122,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
           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;
@@ -155,7 +146,16 @@ function initReactivesearch(componentCollection, searchState, settings) {
         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;
@@ -242,7 +242,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
 
       if (isResultComponent) {
-        var _getQuery = getQuery(component, null, componentType),
+        var _getQuery = getQuery(component, value, componentType),
             query = _getQuery.query;
 
         queryList = queryReducer(queryList, {

package/dist/cjs/version.js

@@ -2,6 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.23.4-alpha";
+var version = "1.24.3";
 
 exports.default = version;

package/dist/es/ReactiveComponent.js

@@ -45,7 +45,7 @@ var ReactiveComponent = {
     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,
@@ -68,7 +68,7 @@ var ReactiveComponent = {
     }
 
     if (customQuery) {
-      var calcCustomQuery = customQuery(props);
+      var calcCustomQuery = customQuery(this.selectedValue, props);
 
       var _ref = calcCustomQuery || {},
           query = _ref.query;
@@ -87,7 +87,7 @@ var ReactiveComponent = {
 
       this.updateQuery({
         componentId: componentId,
-        queryToSet: queryToSet,
+        query: queryToSet,
         value: this.selectedValue || null,
         label: filterLabel,
         showFilter: showFilter,
@@ -138,8 +138,8 @@ var ReactiveComponent = {
   },
   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,
@@ -203,8 +203,8 @@ var ReactiveComponent = {
       }
     },
     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,
@@ -215,7 +215,7 @@ var ReactiveComponent = {
         } 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) {
@@ -229,9 +229,9 @@ var ReactiveComponent = {
       }
     },
     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,
@@ -242,7 +242,7 @@ var ReactiveComponent = {
         } 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) {

package/dist/es/ReactiveList.js

@@ -972,6 +972,11 @@ var ReactiveList = {
     renderNoResult: function renderNoResult() {
       var h = this.$createElement;
       var renderNoResults = this.$scopedSlots.renderNoResults || this.$props.renderNoResults;
+
+      if (this.$scopedSlots.renderNoResults) {
+        return isFunction(renderNoResults) ? renderNoResults() : renderNoResults;
+      }
+
       return h("p", {
         "class": getClassName$1(this.$props.innerClass, 'noResults') || null
       }, [isFunction(renderNoResults) ? renderNoResults() : renderNoResults]);

package/dist/es/initReactivesearch.js

@@ -116,16 +116,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
           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;
@@ -149,7 +140,16 @@ function initReactivesearch(componentCollection, searchState, settings) {
         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;
@@ -236,7 +236,7 @@ function initReactivesearch(componentCollection, searchState, settings) {
 
 
       if (isResultComponent) {
-        var _getQuery = getQuery(component, null, componentType),
+        var _getQuery = getQuery(component, value, componentType),
             query = _getQuery.query;
 
         queryList = queryReducer(queryList, {

package/dist/es/version.js

@@ -1,3 +1,3 @@
-var version = "1.23.4-alpha";
+var version = "1.24.3";
 
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "1.23.4-alpha",
+	"version": "1.24.3",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -34,10 +34,10 @@
 	],
 	"sideEffects": false,
 	"dependencies": {
-		"@appbaseio/reactivecore": "9.12.8-alpha",
+		"@appbaseio/reactivecore": "9.13.0",
 		"@appbaseio/vue-emotion": "0.4.4",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-		"appbase-js": "^4.4.22-alpha",
+		"appbase-js": "^4.5.1",
 		"compute-scroll-into-view": "^1.0.11",
 		"emotion": "9.2.12",
 		"hotkeys-js": "^3.8.7",