@appbaseio/reactivesearch-vue 1.33.9-alpha → 1.33.10

package/dist/cjs/ReactiveGoogleMap.js

@@ -116,6 +116,7 @@ var ReactiveMap = {
     URLParams: VueTypes.bool,
     autoCenter: VueTypes.bool,
     getMapRef: VueTypes.func.isRequired,
+    getMapPromise: VueTypes.func,
     center: vueTypes.types.location,
     defaultCenter: vueTypes.types.location,
     defaultPin: vueTypes.types.string,
@@ -183,32 +184,37 @@ var ReactiveMap = {
       }
     },
     defaultQuery: function defaultQuery(newVal, oldVal) {
+      var _this = this;
       if (!index.isQueryIdentical(newVal, oldVal, null, this.$props)) {
-        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);
-        if (queryOptions) {
-          options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(this.$defaultQuery));
-        }
-        // Update calculated default query in store
-        this.setQueryOptions(this.$props.componentId, options, false);
-        var persistMapQuery = true;
-        var forceExecute = true;
-        // Update default query to include the geo bounding box query
-        this.setDefaultQueryForRSAPI();
-        var meta = {
-          mapBoxBounds: this.mapBoxBounds
-        };
-        this.setMapData(this.componentId, query, persistMapQuery, forceExecute, meta);
-        this.currentPageState = 0;
-        this.from = 0;
+        this.getMapPromise().then(function () {
+          var options = getQueryOptions(_this.$props);
+          options.from = 0;
+          _this.$defaultQuery = newVal(null, _this.$props);
+          // Update default query to include the geo bounding box query
+          _this.setDefaultQueryForRSAPI();
+          if (_this.$defaultQuery) {
+            var _ref = _this.$defaultQuery || {},
+              sort = _ref.sort,
+              query = _ref.query;
+            if (sort) {
+              options.sort = _this.$defaultQuery.sort;
+            }
+            var queryOptions = getOptionsFromQuery(_this.$defaultQuery);
+            if (queryOptions) {
+              options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(_this.$defaultQuery));
+            }
+            // Update calculated default query in store
+            _this.setQueryOptions(_this.$props.componentId, options, false);
+            var persistMapQuery = true;
+            var forceExecute = true;
+            var meta = {
+              mapBoxBounds: _this.mapBoxBounds
+            };
+            _this.setMapData(_this.componentId, query, persistMapQuery, forceExecute, meta);
+            _this.currentPageState = 0;
+            _this.from = 0;
+          }
+        });
       }
     },
     promotedResults: function promotedResults(newVal, oldVal) {
@@ -236,7 +242,7 @@ var ReactiveMap = {
       }
     },
     rawData: function rawData(newVal, oldVal) {
-      var _this = this;
+      var _this2 = this;
       if (!isEqual(newVal, oldVal)) {
         var promotedResults = this.promotedResults,
           hits = this.hits;
@@ -255,10 +261,10 @@ var ReactiveMap = {
           filteredResults = [].concat(parsedPromotedResults, filteredResults);
         }
         filteredResults = filteredResults.filter(function (item) {
-          return !!item[_this.dataField];
+          return !!item[_this2.dataField];
         }).map(function (item) {
           var _extends2;
-          return _rollupPluginBabelHelpers._extends({}, item, (_extends2 = {}, _extends2[_this.dataField] = getLocationObject(item[_this.dataField]), _extends2));
+          return _rollupPluginBabelHelpers._extends({}, item, (_extends2 = {}, _extends2[_this2.dataField] = getLocationObject(item[_this2.dataField]), _extends2));
         });
         this.filteredResults = this.addNoise(filteredResults);
         if (this.calculateMarkers) {
@@ -303,15 +309,15 @@ var ReactiveMap = {
       return this.parseLocation(MAP_CENTER);
     },
     addNoise: function addNoise(hits) {
-      var _this2 = this;
+      var _this3 = this;
       var hitMap = {};
       var updatedHits = [];
       hits.forEach(function (item) {
         var updatedItem = _rollupPluginBabelHelpers._extends({}, item);
-        var location = _this2.parseLocation(item[_this2.dataField]);
+        var location = _this3.parseLocation(item[_this3.dataField]);
         var key = JSON.stringify(location);
         var count = hitMap[key] || 0;
-        updatedItem[_this2.dataField] = count ? withDistinctLat(location, count) : location;
+        updatedItem[_this3.dataField] = count ? withDistinctLat(location, count) : location;
         updatedHits = [].concat(updatedHits, [updatedItem]);
         hitMap[key] = count + 1;
       });
@@ -324,9 +330,9 @@ var ReactiveMap = {
       return null;
     },
     getHitsCenter: function getHitsCenter(hits) {
-      var _this3 = this;
+      var _this4 = this;
       var data = hits.map(function (hit) {
-        return hit[_this3.dataField];
+        return hit[_this4.dataField];
       });
       if (data.length) {
         var numCoords = data.length;
@@ -365,7 +371,7 @@ var ReactiveMap = {
       return false;
     },
     getCenter: function getCenter(hits) {
-      var _this4 = this;
+      var _this5 = this;
       if (this.center) {
         return this.parseLocation(this.center);
       }
@@ -373,7 +379,7 @@ var ReactiveMap = {
       if (mapRef && typeof mapRef.getCenter === 'function' && this.$options.preserveCenter) {
         var currentCenter = mapRef.getCenter();
         setTimeout(function () {
-          _this4.$options.preserveCenter = false;
+          _this5.$options.preserveCenter = false;
         }, 100);
         return this.parseLocation({
           lat: currentCenter.lat(),
@@ -431,12 +437,14 @@ var ReactiveMap = {
       // or whenever searchAsMove is true and the map is dragged
       if (executeUpdate || !this.skipBoundingBox && !this.mapBoxBounds) {
         this.$defaultQuery = this.getGeoQuery();
-        var persistMapQuery = !!this.center;
-        var forceExecute = this.searchAsMove;
-        var meta = {
-          mapBoxBounds: this.mapBoxBounds
-        };
-        this.setMapData(this.componentId, this.$defaultQuery, persistMapQuery, forceExecute, meta);
+        if (this.$defaultQuery) {
+          var persistMapQuery = !!this.center;
+          var forceExecute = this.searchAsMove;
+          var meta = {
+            mapBoxBounds: this.mapBoxBounds
+          };
+          this.setMapData(this.componentId, this.$defaultQuery, persistMapQuery, forceExecute, meta);
+        }
       }
       this.skipBoundingBox = false;
     },
@@ -710,69 +718,77 @@ var ReactiveMap = {
     this.updateComponentProps(this.internalComponent, {
       from: this.from
     }, constants.componentTypes.reactiveMap);
+    this.setDefaultQueryForRSAPI();
   },
   mounted: function mounted() {
-    if (this.defaultPage < 0 && this.currentPage > 0) {
-      if (this.$props.URLParams) {
-        this.setPageURL(this.$props.componentId, this.currentPage, this.$props.componentId, false, true);
+    var _this6 = this;
+    this.getMapPromise().then(function () {
+      if (_this6.defaultPage < 0 && _this6.currentPage > 0) {
+        if (_this6.$props.URLParams) {
+          _this6.setPageURL(_this6.$props.componentId, _this6.currentPage, _this6.$props.componentId, false, true);
+        }
       }
-    }
-    var options = getQueryOptions(this.$props);
-    options.from = this.$data.from;
-    if (this.$props.sortBy) {
-      var _ref3;
-      options.sort = [(_ref3 = {}, _ref3[this.$props.dataField] = {
-        order: this.$props.sortBy
-      }, _ref3)];
-    }
-    this.$defaultQuery = null;
-    if (this.$props.defaultQuery) {
-      this.$defaultQuery = this.$props.defaultQuery() || {};
-      options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(this.$defaultQuery));
-
-      // Override sort query with defaultQuery's sort if defined
-      if (this.$defaultQuery.sort) {
-        options.sort = this.$defaultQuery.sort;
+      var options = getQueryOptions(_this6.$props);
+      options.from = _this6.$data.from;
+      if (_this6.$props.sortBy) {
+        var _ref3;
+        options.sort = [(_ref3 = {}, _ref3[_this6.$props.dataField] = {
+          order: _this6.$props.sortBy
+        }, _ref3)];
       }
-      // since we want defaultQuery to be executed anytime
-      // map component's query is being executed
-      var persistMapQuery = true;
-      // no need to forceExecute because setReact() will capture the main query
-      // and execute the defaultQuery along with it
-      var forceExecute = false;
+      _this6.$defaultQuery = null;
+      if (_this6.$props.defaultQuery) {
+        _this6.$defaultQuery = _this6.$props.defaultQuery();
+        // Update default query for RS API
+        _this6.setDefaultQueryForRSAPI();
+        if (_this6.$defaultQuery) {
+          options = _rollupPluginBabelHelpers._extends({}, options, getOptionsFromQuery(_this6.$defaultQuery));
 
-      // Update default query for RS API
-      this.setDefaultQueryForRSAPI();
-      var meta = {
-        mapBoxBounds: this.mapBoxBounds
-      };
-      this.setMapData(this.componentId, this.$defaultQuery.query, persistMapQuery, forceExecute, meta);
-    } else {
-      // only apply geo-distance when defaultQuery prop is not set
-      var query = this.getGeoDistanceQuery();
-      if (query) {
-        // - only persist the map query if center prop is set
-        // - ideally, persist the map query if you want to keep executing it
-        //   whenever there is a change (due to subscription) in the component query
-        var _persistMapQuery = !!this.center;
+          // Override sort query with defaultQuery's sort if defined
+          if (_this6.$defaultQuery.sort) {
+            options.sort = _this6.$defaultQuery.sort;
+          }
+          // since we want defaultQuery to be executed anytime
+          // map component's query is being executed
+          var persistMapQuery = true;
+          // no need to forceExecute because setReact() will capture the main query
+          // and execute the defaultQuery along with it
+          var forceExecute = false;
+          var meta = {
+            mapBoxBounds: _this6.mapBoxBounds
+          };
+          if (_this6.$defaultQuery) {
+            _this6.setMapData(_this6.componentId, _this6.$defaultQuery.query, persistMapQuery, forceExecute, meta);
+            _this6.setQueryOptions(_this6.componentId, options);
+          }
+        }
+      } else {
+        // only apply geo-distance when defaultQuery prop is not set
+        var query = _this6.getGeoDistanceQuery();
+        if (query) {
+          // - only persist the map query if center prop is set
+          // - ideally, persist the map query if you want to keep executing it
+          //   whenever there is a change (due to subscription) in the component query
+          var _persistMapQuery = !!_this6.center;
 
-        // - forceExecute will make sure that the component query + Map query gets executed
-        //   irrespective of the changes in the component query
-        // - forceExecute will only come into play when searchAsMove is true
-        // - kindly note that forceExecute may result in one additional network request
-        //   since it bypasses the gatekeeping
-        var _forceExecute = this.searchAsMove;
-        // Set meta for `distance` and `coordinates` in selected value
-        var center = this.center || this.defaultCenter;
-        var coordinatesObject = this.getArrPosition(center);
-        var _meta = {
-          distance: this.defaultRadius,
-          coordinates: coordinatesObject.lat + ", " + coordinatesObject.lon
-        };
-        this.setMapData(this.componentId, query, _persistMapQuery, _forceExecute, _meta);
+          // - forceExecute will make sure that the component query + Map query gets executed
+          //   irrespective of the changes in the component query
+          // - forceExecute will only come into play when searchAsMove is true
+          // - kindly note that forceExecute may result in one additional network request
+          //   since it bypasses the gatekeeping
+          var _forceExecute = _this6.searchAsMove;
+          // Set meta for `distance` and `coordinates` in selected value
+          var center = _this6.center || _this6.defaultCenter;
+          var coordinatesObject = _this6.getArrPosition(center);
+          var _meta = {
+            distance: _this6.defaultRadius,
+            coordinates: coordinatesObject.lat + ", " + coordinatesObject.lon
+          };
+          _this6.setMapData(_this6.componentId, query, _persistMapQuery, _forceExecute, _meta);
+        }
+        _this6.setQueryOptions(_this6.componentId, options);
       }
-    }
-    this.setQueryOptions(this.componentId, options, !(this.$defaultQuery && this.$defaultQuery.query));
+    });
   },
   render: function render() {
     var h = arguments[0];
@@ -2028,9 +2044,18 @@ var ReactiveGoogleMap = {
     calculateMarkers: VueTypes.func,
     highlightMarkerOnHover: VueTypes.bool.def(true)
   },
+  created: function created() {
+    var _this = this;
+    this.mapRefPromiseResolve = null;
+    this.mapRefPromiseRejecter = null;
+    this.mapRefPromise = new Promise(function (resolve, reject) {
+      _this.mapRefPromiseResolver = resolve;
+      _this.mapRefPromiseRejecter = reject;
+    });
+  },
   methods: {
     renderMap: function renderMap(_ref) {
-      var _this = this;
+      var _this2 = this;
       var resultsToRender = _ref.resultsToRender,
         center = _ref.center,
         zoom = _ref.zoom,
@@ -2079,7 +2104,7 @@ var ReactiveGoogleMap = {
           "highlightMarkerOnHover": this.highlightMarkerOnHover,
           "renderItem": this.$scopedSlots.renderItem ? function () {
             return {
-              custom: _this.$scopedSlots.renderItem
+              custom: _this2.$scopedSlots.renderItem
             };
           } : this.renderItem,
           "defaultPin": defaultPin,
@@ -2094,6 +2119,9 @@ var ReactiveGoogleMap = {
     getMapRef: function getMapRef() {
       return this.mapRef;
     },
+    getMapRefPromise: function getMapRefPromise() {
+      return this.mapRefPromise;
+    },
     removeMarkers: function removeMarkers() {
       var clusterManagerInstance;
       var currentInstance = this;
@@ -2114,11 +2142,12 @@ var ReactiveGoogleMap = {
     }
   },
   mounted: function mounted() {
-    var _this2 = this;
+    var _this3 = this;
     if (this.$refs.mapRef) {
       this.$refs.mapRef.$mapPromise.then(function (map) {
-        _this2.mapRef = map;
-      });
+        _this3.mapRef = map;
+        _this3.mapRefPromiseResolver(_this3.mapRef);
+      })["catch"](this.mapRefPromiseRejecter);
     }
   },
   render: function render() {
@@ -2126,6 +2155,7 @@ var ReactiveGoogleMap = {
     return h(RMConnected, _mergeJSXProps([{
       "attrs": {
         "getMapRef": this.getMapRef,
+        "getMapPromise": this.getMapRefPromise,
         "renderMap": this.renderMap,
         "componentId": this.componentId,
         "className": this.className,

package/dist/cjs/version.js

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