@heycar/heycars-map 2.0.0-switchMap2 → 2.0.0-switchMap3

package/dist/v2/hooks/useMapSupplier.d.ts

@@ -1,3 +1,4 @@
+import type { AnyFn } from "@vueuse/core";
 import type { Status, UseMapLoaderOutput, UseMapLoaderProps } from "./useMapLoader";
 export interface MapSupplierPayolad extends UseMapLoaderProps {
     gmapRasterId: string;
@@ -9,3 +10,6 @@ export interface MapSupplierPayolad extends UseMapLoaderProps {
 }
 export declare const useMapSupplier: () => MapSupplierPayolad;
 export declare const provideMapSupplier: (payload: MapSupplierPayolad) => void;
+export declare const useMapAssertSupplier: () => {
+    assertSupplier: <T extends AnyFn>(fn: T) => T;
+};

package/dist/v2/hooks/useMapSupplier.js

@@ -7,7 +7,24 @@ const useMapSupplier = () => {
   return payload;
 };
 const provideMapSupplier = (payload) => provide(context, payload);
+const useMapAssertSupplier = () => {
+  const payload = useMapSupplier();
+  const instanceSupplier = payload.supplier;
+  function assertSupplier(fn) {
+    return function fnWithAssertSupplier(...args) {
+      console.log("instanceSupplier, payload.supplier = ", instanceSupplier, payload.supplier);
+      if (instanceSupplier === payload.supplier)
+        return fn(...args);
+      throw Error(
+        `MyError: expect instance supplier ${payload.supplier}, actual is ${instanceSupplier} 
+ You probably call the api (exposed by useBusinessXXX) before the Element <BusinessXXX /> rendering!`
+      );
+    };
+  }
+  return { assertSupplier };
+};
 export {
   provideMapSupplier,
+  useMapAssertSupplier,
   useMapSupplier
 };

package/dist/v2/hooks-business/useBusinessRecomendPlaceMap.js

@@ -1,5 +1,5 @@
 import { reactive, ref, readonly } from "vue-demi";
-import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.5be4fdcf.js";
+import { E as EMPTY_PLACE } from "../chunks/BusinessRecomendPlaceMap.f589ebf7.js";
 import { CenterPlaceStatus } from "../types/interface.js";
 import { proxyFunctionalProperty, assertAssingedBeforeUsed } from "../utils/helper.js";
 const useBusinessRecomendPlaceMap = () => {

package/dist/v2/index.js

@@ -2,7 +2,7 @@ import "./utils/alipayPolyfill.js";
 import { AbsoluteAddressBox } from "./business-components/AbsoluteAddressBox/AbsoluteAddressBox.js";
 import { AddressBox } from "./business-components/AddressBox/AddressBox.js";
 import { BusinessQuotingMap } from "./business-components/BusinessQuotingMap/BusinessQuotingMap.js";
-import { B } from "./chunks/BusinessRecomendPlaceMap.5be4fdcf.js";
+import { B } from "./chunks/BusinessRecomendPlaceMap.f589ebf7.js";
 import { BusinessReselectPlaceMap } from "./business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js";
 import { BusinessTaxiEndMap } from "./business-components/BusinessTaxiEndMap/BusinessTaxiEndMap.js";
 import { BusinessTaxiServiceMap } from "./business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js";

package/dist/v2/utils/ManualAbortError.d.ts

@@ -0,0 +1,3 @@
+export declare const MANUAL_ABORT_MESSAGE = "MANUAL_ABORT_MESSAGE";
+export declare const throwNoneManualAbortError: (e: unknown) => void;
+export declare const logNoneManualAbortError: (e: unknown) => void;

package/dist/v2/utils/ManualAbortError.js

@@ -0,0 +1,14 @@
+const MANUAL_ABORT_MESSAGE = "MANUAL_ABORT_MESSAGE";
+const throwNoneManualAbortError = (e) => {
+  if (e !== MANUAL_ABORT_MESSAGE)
+    throw e;
+};
+const logNoneManualAbortError = (e) => {
+  if (e !== MANUAL_ABORT_MESSAGE)
+    console.error(e);
+};
+export {
+  MANUAL_ABORT_MESSAGE,
+  logNoneManualAbortError,
+  throwNoneManualAbortError
+};

package/dist/v2/utils/helper.d.ts

@@ -33,4 +33,5 @@ export declare const assertAssingedBeforeUsed: () => never;
 type PickFunctionalPropertyName<T, K extends keyof T = keyof T> = K extends any ? T[K] extends (...args: any) => any ? K : never : never;
 type PickFunctionalProperty<T> = Pick<T, PickFunctionalPropertyName<T>>;
 export declare const proxyFunctionalProperty: <T extends object>(target: T) => PickFunctionalProperty<T>;
+export declare const createAbortable: (signal?: AbortSignal) => <F extends ((...args: any) => Promise<any>) | undefined>(fn: F) => F;
 export {};

package/dist/v2/utils/helper.js

@@ -147,12 +147,29 @@ const proxyFunctionalProperty = (target) => {
   }
   return result;
 };
+const createAbortable = (signal) => {
+  return function abortable(fn) {
+    if (!fn || !signal)
+      return fn;
+    return function abrotableFn(...args) {
+      return new Promise((resolve, reject) => {
+        if (signal.aborted)
+          return reject(signal.reason);
+        signal.addEventListener("abort", () => reject(signal.reason));
+        fn(...args).then((result) => {
+          signal.aborted ? reject(signal.reason) : resolve(result);
+        }, reject);
+      });
+    };
+  };
+};
 export {
   assertAngle,
   assertAssingedBeforeUsed,
   assertNotEmptyArray,
   assertPoint,
   assertZone,
+  createAbortable,
   createAsyncNoFailNonNullable,
   createReadOnce,
   createRunOnce,

package/dist/v2/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "2.0.0-switchMap2";
+const pkgVersion = "2.0.0-switchMap3";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/v2/utils/patchGoogleMapLoader.d.ts

@@ -0,0 +1,2 @@
+import { Loader } from "@googlemaps/js-api-loader";
+export declare const patchGoogleMapLoader: (loader: Loader) => void;

package/dist/v2/utils/patchGoogleMapLoader.js

@@ -0,0 +1,64 @@
+const patchGoogleMapLoader = (loader) => {
+  loader.setScript = setScript;
+};
+function setScript() {
+  var _a, _b;
+  if (document.getElementById(this.id)) {
+    this.callback();
+    return;
+  }
+  const params = {
+    key: this.apiKey,
+    channel: this.channel,
+    client: this.client,
+    libraries: this.libraries.length && this.libraries,
+    v: this.version,
+    mapIds: this.mapIds,
+    language: this.language,
+    region: this.region,
+    authReferrerPolicy: this.authReferrerPolicy
+  };
+  Object.keys(params).forEach((key) => !params[key] && delete params[key]);
+  if (!((_b = (_a = window == null ? void 0 : window.google) == null ? void 0 : _a.maps) == null ? void 0 : _b.importLibrary)) {
+    ((g) => {
+      let h, a, k, p = "The Google Maps JavaScript API", c = "google", l = "importLibrary", q = "__ib__", m = document, b = window;
+      b = b[c] || (b[c] = {});
+      const d = b.maps || (b.maps = {}), r = /* @__PURE__ */ new Set(), e = new URLSearchParams(), u = () => (
+        // @ts-ignore
+        h || (h = new Promise(async (f, n) => {
+          var _a2;
+          await (a = m.createElement("script"));
+          a.id = this.id;
+          e.set("libraries", [...r] + "");
+          for (k in g)
+            e.set(
+              k.replace(/[A-Z]/g, (t) => "_" + t[0].toLowerCase()),
+              g[k]
+            );
+          e.set("callback", c + ".maps." + q);
+          e.set("t", Date.now().toString());
+          a.src = this.url + `?` + e;
+          d[q] = f;
+          a.onerror = () => h = n(Error(p + " could not load."));
+          a.nonce = this.nonce || ((_a2 = m.querySelector("script[nonce]")) == null ? void 0 : _a2.nonce) || "";
+          m.head.append(a);
+        }))
+      );
+      d[l] ? console.warn(p + " only loads once. Ignoring:", g) : d[l] = (f, ...n) => r.add(f) && u().then(() => d[l](f, ...n));
+    })(params);
+  }
+  const libraryPromises = this.libraries.map((library) => this.importLibrary(library));
+  if (!libraryPromises.length) {
+    libraryPromises.push(this.importLibrary("core"));
+  }
+  Promise.all(libraryPromises).then(
+    () => this.callback(),
+    (error) => {
+      const event = new ErrorEvent("error", { error });
+      this.loadErrorCallback(event);
+    }
+  );
+}
+export {
+  patchGoogleMapLoader
+};

package/dist/v3/Demo/DemoBusinessRecomendPlace.js

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.39888296.js";
+import { B as BusinessRecomendPlaceMap } from "../chunks/BusinessRecomendPlaceMap.86e9c287.js";
 import { useBusinessRecomendPlaceMap } from "../hooks-business/useBusinessRecomendPlaceMap.js";
 import { defineSetup } from "../types/helper.js";
 import { d as demo } from "../chunks/Demo.css.e921a2f6.js";

package/dist/v3/business-components/BusinessQuotingMap/BusinessQuotingMap.js

@@ -4,7 +4,7 @@ import { createElement } from "../../demi-polyfill/demi-polyfill.js";
 import { useHeycarMap } from "../../hooks/useHeycarMap.js";
 import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapFitView } from "../../hooks/useMapFitView.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapSupplier, useMapAssertSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { place2point, pipeDefer } from "../../utils/transform.js";
@@ -25,6 +25,9 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
   const {
     language
   } = useMapSupplier();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const {
     mapRef,
     setMap
@@ -40,7 +43,7 @@ const BusinessQuotingMapInner = defineSetup("BusinessQuotingMapInner", function(
     mapRef,
     padding: BUSINESS_QUOTING_FITVIEW_PANDING
   });
-  mapContext.setFitView = () => setFitView(false);
+  mapContext.setFitView = assertSupplier(() => setFitView(false));
   const fittableRegistryOverlay = createFittableRegisterOverlay({
     registerOverlay,
     immediate: true

package/dist/v3/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.js

@@ -14,6 +14,7 @@ import "../../hooks/useMapSupplier.js";
 import "../../hooks/useMapZoom.js";
 import "../../types/helper.js";
 import "../../types/interface.js";
+import "../../utils/ManualAbortError.js";
 import "../../utils/compare.js";
 import "../../utils/helper.js";
 import "../../utils/platform.js";
@@ -25,7 +26,7 @@ import "../GreenZone/GreenZone.js";
 import "../PassengerCircle/PassengerCircle.js";
 import "../PickupPoints/PickupPoints.js";
 import "./useCacheCenterPlace.js";
-import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.39888296.js";
+import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.86e9c287.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

package/dist/v3/business-components/BusinessRecomendPlaceMap/index.js

@@ -1,4 +1,4 @@
-import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.39888296.js";
+import { B, f, D, E, a, c, R, e, b, d, Z } from "../../chunks/BusinessRecomendPlaceMap.86e9c287.js";
 export {
   B as BusinessRecomendPlaceMap,
   f as BusinessRecomendPlaceMapInner,

package/dist/v3/business-components/BusinessReselectPlaceMap/BusinessReselectPlaceMap.js

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { reactive, watch, watchEffect } from "vue-demi";
+import { reactive, watch, watchEffect, onUnmounted } from "vue-demi";
 import { apiMemoryShouldSkipByKey } from "../../api/memory.js";
 import { HeycarMap } from "../../components/MapProvider/MapProvider.js";
 import { createElement } from "../../demi-polyfill/demi-polyfill.js";
@@ -9,17 +9,18 @@ import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapDrag } from "../../hooks/useMapDrag.js";
 import { useMapGeometry } from "../../hooks/useMapGeometry.js";
 import { useMapRecomendPlace } from "../../hooks/useMapRecomendPlace.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { useMapZoom } from "../../hooks/useMapZoom.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
 import { CenterPlaceStatus } from "../../types/interface.js";
+import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
 import { watchPostEffectOnce, generateCreateElementV2PropsOn } from "../../utils/compare.js";
 import { equalAssign, isPlacesInclude } from "../../utils/helper.js";
 import { detectBrowserPlatform } from "../../utils/platform.js";
 import { place2point, isPlaceEqual, pipeOnlyLastEffect, isZoneEqual, geoPositionError2businessTimeout } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinatePointType, toCoordinateRecommendZonePlacesType } from "../../utils/typeChecking.js";
 import { AbsoluteAddressBox } from "../AbsoluteAddressBox/AbsoluteAddressBox.js";
-import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_LARGE_LIMIT, a as RECOMMEND_PLACE_DRAG_LIMIT, Z as ZONE_ZOOM, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM } from "../../chunks/BusinessRecomendPlaceMap.39888296.js";
+import { E as EMPTY_PLACE, m as memoize, R as RECOMMEND_PLACE_LARGE_LIMIT, a as RECOMMEND_PLACE_DRAG_LIMIT, Z as ZONE_ZOOM, b as RECOMMEND_PLACE_ZONE_ICON_MIN, c as RECOMMEND_PLACE_ICON_ZOOM_MIN, d as RECOMMEND_PLACE_ZONE_TEXT_MIN, e as RECOMMEND_PLACE_TEXT_ZOOM_MIN, D as DEFAULT_ZOOM } from "../../chunks/BusinessRecomendPlaceMap.86e9c287.js";
 import { DeviceOrientation } from "../DeviceOrientation/DeviceOrientation.js";
 import { GreenZone } from "../GreenZone/GreenZone.js";
 import { PassengerCircle } from "../PassengerCircle/PassengerCircle.js";
@@ -41,6 +42,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       ...EMPTY_PLACE
     }
   } = props;
+  const abortController = new AbortController();
   const {
     coordinatifyPoint,
     unCoordinatifyPoint,
@@ -68,6 +70,9 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     mapRef,
     defaultValue: DEFAULT_ZOOM
   });
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const defaultPlace = unCoordinatifyPlace(toCoordinatePlaceType(inputDefaultPlace));
   const centerPlace = reactive({
     lng: defaultPlace.lng,
@@ -148,19 +153,19 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       emitGeoErrorOnce(error);
     }
   });
-  mapContext.apiMapDistance = (from, to) => {
+  mapContext.apiMapDistance = assertSupplier((from, to) => {
     return apiMapDistance(unCoordinatifyPoint(toCoordinatePointType(from)), unCoordinatifyPoint(toCoordinatePointType(to)));
-  };
-  mapContext.setCenterPlaceByUserSpecified = setCenterPlaceByUserSpecified;
-  mapContext.setCenterPlaceByUserSpecifiedInZone = setCenterPlaceByUserSpecifiedInZone;
-  mapContext.panToGeoPositionByRecomend = () => {
+  });
+  mapContext.setCenterPlaceByUserSpecified = assertSupplier(setCenterPlaceByUserSpecified);
+  mapContext.setCenterPlaceByUserSpecifiedInZone = assertSupplier(setCenterPlaceByUserSpecifiedInZone);
+  mapContext.panToGeoPositionByRecomend = assertSupplier(() => {
     if (geoError.value)
       return false;
     updateCenterPlaceByPoint(geoPosition.value, {
       source: "geo"
     });
     return true;
-  };
+  });
   const {
     isDragging
   } = useMapDrag({
@@ -183,6 +188,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -202,7 +208,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -224,7 +230,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
       }));
     }
   });
-  watchPostEffectOnce(() => updateRecommendPlaceOnlyInZone(defaultPlace));
+  watchPostEffectOnce(() => updateRecommendPlaceOnlyInZone(defaultPlace).catch(throwNoneManualAbortError));
   watch(centerPlace, (place) => {
     equalAssign(mapContext.centerPlace, coordinatifyPlace({
       ...place
@@ -236,6 +242,7 @@ const BusinessReselectPlaceMapInner = defineSetup("BusinessReselectPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = isQueryingRef.value ? CenterPlaceStatus.QUERYING_INFO : !availableRef.value ? CenterPlaceStatus.SERVICE_UNAVAILABLE : CenterPlaceStatus.OK;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a;
     const {

package/dist/v3/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.js

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { ref, watch } from "vue-demi";
+import { ref, watch, onUnmounted } from "vue-demi";
 import { apiGetAuxiliaryGrapStatus } from "../../api/browser.js";
 import { setGlobalGoogleSnapRoadProxyUrl } from "../../api/googleSnapRoad.js";
 import { HeycarMap } from "../../components/MapProvider/MapProvider.js";
@@ -8,9 +8,10 @@ import { useGeoLocation } from "../../hooks/useGeoLocation.js";
 import { useHeycarMap } from "../../hooks/useHeycarMap.js";
 import { useMapCoordinatify } from "../../hooks/useMapCoordinatify.js";
 import { useMapFitView } from "../../hooks/useMapFitView.js";
-import { useMapSupplier } from "../../hooks/useMapSupplier.js";
+import { useMapAssertSupplier, useMapSupplier } from "../../hooks/useMapSupplier.js";
 import { defineSetup, defineLagecySetup } from "../../types/helper.js";
-import { assertNotEmptyArray } from "../../utils/helper.js";
+import { MANUAL_ABORT_MESSAGE } from "../../utils/ManualAbortError.js";
+import { createAbortable, assertNotEmptyArray } from "../../utils/helper.js";
 import { place2point, pipeDefer, lnglat2point } from "../../utils/transform.js";
 import { toCoordinatePlaceType, toCoordinateTrackPoint } from "../../utils/typeChecking.js";
 import { AuxiliaryGraspRoad } from "../AuxiliaryGraspRoad/AuxiliaryGraspRoad.js";
@@ -26,7 +27,6 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     interval,
     disablePassenger,
     mapContext,
-    getDriverPositionTrack,
     renderStartSerivceTitle,
     renderInServiceTitle
   } = props;
@@ -36,6 +36,12 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     setMap,
     mapElementRef
   } = useHeycarMap();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
+  const abortController = new AbortController();
+  const abortable = createAbortable(abortController.signal);
+  const getDriverPositionTrack = abortable(props.getDriverPositionTrack);
   const {
     unCoordinatifyPlace,
     unCoordinatifyTrackPoint
@@ -47,7 +53,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
     mapRef,
     padding: BUSINESS_TAXI_SERVICE_FITVIEW_PANDING
   });
-  mapContext.setFitView = () => setFitView(false);
+  mapContext.setFitView = assertSupplier(() => setFitView(false));
   const deferedSetFitView = pipeDefer(() => registerOverlay.setFitView(true));
   const {
     geoLoading,
@@ -79,6 +85,7 @@ const BusinessTaxiServiceMapInner = defineSetup("BusinessTaxiServiceMapInner", f
   }, {
     immediate: true
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     const {
       driverStatus,

package/dist/v3/chunks/{BusinessRecomendPlaceMap.39888296.js → BusinessRecomendPlaceMap.86e9c287.js}

@@ -1,5 +1,5 @@
 import { createVNode } from "vue";
-import { computed, watch, watchEffect } from "vue-demi";
+import { computed, watch, watchEffect, onUnmounted } from "vue-demi";
 import { apiSaveCenterPlaceToCache } from "../api/browser.js";
 import { apiMemoryShouldSkipByKey } from "../api/memory.js";
 import { HeycarMap } from "../components/MapProvider/MapProvider.js";
@@ -10,10 +10,11 @@ import { useMapCoordinatify } from "../hooks/useMapCoordinatify.js";
 import { useMapDrag } from "../hooks/useMapDrag.js";
 import { useMapGeometry } from "../hooks/useMapGeometry.js";
 import { useMapRecomendPlace } from "../hooks/useMapRecomendPlace.js";
-import { useMapSupplier } from "../hooks/useMapSupplier.js";
+import { useMapSupplier, useMapAssertSupplier } from "../hooks/useMapSupplier.js";
 import { useMapZoom } from "../hooks/useMapZoom.js";
 import { defineSetup, defineLagecySetup } from "../types/helper.js";
 import { CenterPlaceStatus } from "../types/interface.js";
+import { throwNoneManualAbortError, MANUAL_ABORT_MESSAGE } from "../utils/ManualAbortError.js";
 import { watchPostEffectOnce, generateCreateElementV2PropsOn } from "../utils/compare.js";
 import { equalAssign, isPlacesInclude } from "../utils/helper.js";
 import { detectBrowserPlatform } from "../utils/platform.js";
@@ -286,6 +287,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     getRecomendPlace,
     mapContext
   } = props;
+  const abortController = new AbortController();
   const {
     coordinatifyPoint,
     unCoordinatifyPoint,
@@ -316,6 +318,9 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   const {
     readyPromise
   } = useMapSupplier();
+  const {
+    assertSupplier
+  } = useMapAssertSupplier();
   const {
     centerPlace,
     isFirstLoad,
@@ -418,19 +423,19 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       emitGeoErrorOnce(error);
     }
   });
-  mapContext.apiMapDistance = (from, to) => {
+  mapContext.apiMapDistance = assertSupplier((from, to) => {
     return apiMapDistance(unCoordinatifyPoint(toCoordinatePointType(from)), unCoordinatifyPoint(toCoordinatePointType(to)));
-  };
-  mapContext.setCenterPlaceByUserSpecified = setCenterPlaceByUserSpecified;
-  mapContext.setCenterPlaceByUserSpecifiedInZone = setCenterPlaceByUserSpecifiedInZone;
-  mapContext.panToGeoPositionByRecomend = () => {
+  });
+  mapContext.setCenterPlaceByUserSpecified = assertSupplier(setCenterPlaceByUserSpecified);
+  mapContext.setCenterPlaceByUserSpecifiedInZone = assertSupplier(setCenterPlaceByUserSpecifiedInZone);
+  mapContext.panToGeoPositionByRecomend = assertSupplier(() => {
     if (geoError.value)
       return false;
     updateCenterPlaceByPoint(geoPosition.value, {
       source: "geo"
     });
     return true;
-  };
+  });
   const {
     isDragging
   } = useMapDrag({
@@ -454,6 +459,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
     emptyPlaceName: emptyTitle,
     queryingPlaceName: queryingTitle,
     context: centerSource,
+    signal: abortController.signal,
     getAvailable: pipedGetAvailable,
     getRecomendPlace: pipedGetRecomendPlace,
     getLimit: (context) => {
@@ -473,7 +479,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
       ...place
     }),
     onChangePlace: (place) => emit("changePlace", coordinatifyPlace(place)),
-    onChange: async ({
+    onChange: ({
       place,
       inputPlace,
       isInZone,
@@ -498,7 +504,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   const centerPlaceStatusRef = computed(() => isFirstLoad && geoLoading.value ? CenterPlaceStatus.GEO_LOADING : isQueryingRef.value ? CenterPlaceStatus.QUERYING_INFO : !availableRef.value ? CenterPlaceStatus.SERVICE_UNAVAILABLE : CenterPlaceStatus.OK);
   watchPostEffectOnce(() => {
     if (!isFirstLoad)
-      updateRecommendPlaceOnlyInZone(defaultCenterPlace);
+      updateRecommendPlaceOnlyInZone(defaultCenterPlace).catch(throwNoneManualAbortError);
   });
   watch(centerPlace, (place) => {
     if (centerPlaceStatusRef.value === CenterPlaceStatus.OK) {
@@ -516,6 +522,7 @@ const BusinessRecomendPlaceMapInner = defineSetup("BusinessRecomendPlaceMapInner
   watchEffect(() => {
     mapContext.centerPlaceStatusRef.value = centerPlaceStatusRef.value;
   });
+  onUnmounted(() => abortController.abort(MANUAL_ABORT_MESSAGE));
   return () => {
     var _a;
     const {

package/dist/v3/hooks/useMapLoader.js

@@ -1,6 +1,7 @@
 import { shallowRef, computed, ref } from "vue-demi";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
 import { createRunOnce } from "../utils/helper.js";
+import { patchGoogleMapLoader } from "../utils/patchGoogleMapLoader.js";
 import { t as throttle } from "../chunks/throttle.8bdd8d3b.js";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var distExports = {};
@@ -639,11 +640,13 @@ const useGmapLoader = (props) => {
       if (statusRef.value === "SUCCESS")
         return;
       const loader = new Loader(options);
+      patchGoogleMapLoader(loader);
       clearTimeout(timerRef.value);
       timerRef.value = window.setTimeout(() => {
         statusRef.value = "TIMEOUT";
       }, GMAP_LOAD_TIMEOUT);
       if (loader.status !== LoaderStatus.INITIALIZED) {
+        window.google = void 0;
         loader.reset();
       }
       statusRef.value = "LOADING";

package/dist/v3/hooks/useMapPlace.d.ts

@@ -3,6 +3,7 @@ import type { Place, Point } from "../types/interface";
 export interface UseMapPlaceProps {
     pointRef: Ref<Point>;
     emptyPlaceName: string;
+    signal?: AbortSignal;
     onChange?: (value: Place) => any;
 }
 export declare const useAmapPlace: (props: UseMapPlaceProps) => {

package/dist/v3/hooks/useMapPlace.js

@@ -1,13 +1,13 @@
 import { ref, reactive, watch } from "vue-demi";
 import { REGEO_TIMEOUT } from "../api/contants.js";
 import { createPipeTw } from "../utils/cn2tw.js";
-import { equalAssign } from "../utils/helper.js";
+import { equalAssign, createAbortable } from "../utils/helper.js";
 import { amapPlaceName2DisplayName, gmapPlaceName2DisplayName } from "../utils/transform.js";
 import { inChina } from "./useMapInChina.js";
 import { useMapSupplier } from "./useMapSupplier.js";
 import { useUpdate } from "./useUdate.js";
 const useAmapPlace = (props) => {
-  const { onChange, emptyPlaceName } = props;
+  const { signal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
@@ -17,6 +17,7 @@ const useAmapPlace = (props) => {
     name: "",
     displayName: ""
   });
+  const abortable = createAbortable(signal);
   const { idx: placeKey, update } = useUpdate();
   const updatePlace = (value) => {
     pointRef.value = value;
@@ -28,7 +29,7 @@ const useAmapPlace = (props) => {
     place.name = value.name;
     place.displayName = value.displayName;
   };
-  const getPlaceByRegeo = ([lng, lat]) => {
+  const getPlaceByRegeo = abortable(([lng, lat]) => {
     return new Promise((resolve) => {
       const geocoder = new AMap.Geocoder({ lang: language === "en" ? "en" : "zh_cn" });
       const pipeTw = createPipeTw(language === "zh-TW");
@@ -58,7 +59,7 @@ const useAmapPlace = (props) => {
         resolve({ lng, lat, name, displayName });
       }, REGEO_TIMEOUT);
     });
-  };
+  });
   watch(
     () => [placeKey.value],
     async () => {
@@ -71,7 +72,7 @@ const useAmapPlace = (props) => {
   return { place, updatePlace, setPlace, getPlaceByRegeo };
 };
 const useGmapPlace = (props) => {
-  const { onChange, emptyPlaceName } = props;
+  const { signal, onChange, emptyPlaceName } = props;
   const defaultPoint = [...props.pointRef.value];
   const pointRef = ref(defaultPoint);
   const { readyPromise, language } = useMapSupplier();
@@ -82,6 +83,7 @@ const useGmapPlace = (props) => {
     name: "",
     displayName: ""
   });
+  const abortable = createAbortable(signal);
   const updatePlace = (value) => {
     pointRef.value = value;
     update();
@@ -92,7 +94,7 @@ const useGmapPlace = (props) => {
     place.name = value.name;
     place.displayName = value.displayName;
   };
-  const getPlaceByRegeo = ([lng, lat]) => {
+  const getPlaceByRegeo = abortable(([lng, lat]) => {
     return new Promise((resolve) => {
       const geocoder = new google.maps.Geocoder();
       const pipeTw = createPipeTw(language === "zh-TW");
@@ -113,7 +115,7 @@ const useGmapPlace = (props) => {
         resolve({ lng, lat, name, displayName });
       }, REGEO_TIMEOUT);
     });
-  };
+  });
   watch(
     () => placeKey.value,
     async () => {

package/dist/v3/hooks/useMapRecomendPlace.d.ts

@@ -5,6 +5,7 @@ export interface UseMapRecomendPlaceProps<C = Record<string, any>> {
     context?: C;
     emptyPlaceName: string;
     queryingPlaceName: string;
+    signal?: AbortSignal;
     getLimit: (context?: C) => number;
     getAvailable?: (place: Place) => Promise<boolean>;
     getRecomendPlace: (place: Place, context?: C) => Promise<RecommendZonePlaces | undefined>;