@heycar/heycars-map 0.7.10 → 0.7.11

package/dist/index.cjs

@@ -9,7 +9,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.7.10";
+const version = "0.7.11";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -3373,6 +3373,19 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT = "MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT";
+const MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT = 100 + 20;
+const MINI_PROGRAM_WEB_VIEW_CLOSE_DELAY = 100 + 70;
+const patchMiniprogramRedirectTo = (wx2) => {
+  const patchedRedirectTo = (props) => {
+    const webviewCloseEvent = new Event(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT);
+    dispatchEvent(webviewCloseEvent);
+    setTimeout(() => {
+      wx2.miniProgram.redirectTo(props);
+    }, MINI_PROGRAM_WEB_VIEW_CLOSE_DELAY);
+  };
+  return patchedRedirectTo;
+};
 const DEVICE_ORIENTATION_INTERVAL = 1e3;
 const CSS_DEVICE_ORIENTATION_VAR_PREFIX = "--CSS_DEVICE_ORIENTATION_VAR_ROTATION_DEGREE_";
 const useDeviceOrientation = (props) => {
@@ -3416,8 +3429,12 @@ function compatibaleAddEventListenerDeviceOrientation(handler) {
   if (isIOSDeviceOrientationPermissionGranted) {
     return addEventListener("deviceorientation", handler);
   }
-  const handleTouchEnd = () => {
+  const handleTouchEnd = async () => {
     removeEventListener("touchend", handleTouchEnd);
+    if (detectBrowserPlatform() === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM && await waitMiniProgramWebviewClose(MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT)) {
+      addEventListener("touchend", handleTouchEnd);
+      return;
+    }
     DeviceOrientationEvent == null ? void 0 : DeviceOrientationEvent.requestPermission().then((permissionState) => {
       if (permissionState === "granted") {
         isIOSDeviceOrientationPermissionGranted = true;
@@ -3438,6 +3455,20 @@ function compatibleRemoveEventListenerDeviceOrientation(handler) {
   }
   return removeEventListener("deviceorientation", handler);
 }
+function waitMiniProgramWebviewClose(duration) {
+  return new Promise((resolve) => {
+    const handleMiniProgramWebviewClose = () => {
+      removeEventListener(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, handleMiniProgramWebviewClose);
+      clearTimeout(timer);
+      resolve(true);
+    };
+    addEventListener(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, handleMiniProgramWebviewClose);
+    const timer = setTimeout(() => {
+      removeEventListener(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, handleMiniProgramWebviewClose);
+      resolve(false);
+    }, duration);
+  });
+}
 const watchVisibilityState = () => {
   const visibilityStateRef = Vue.ref(document.visibilityState);
   const handleVisibilityChange = () => {
@@ -7586,6 +7617,8 @@ exports.BusinessTaxiServiceMap = BusinessTaxiServiceMap;
 exports.DrivingLine = DrivingLine;
 exports.DrivingRoute = DrivingRoute;
 exports.HeycarMap = HeycarMap;
+exports.MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT = MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT;
+exports.MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT = MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT;
 exports.MapProvider = MapProvider;
 exports.PassengerCircle = PassengerCircle;
 exports.PickupPoints = PickupPoints;
@@ -7595,6 +7628,7 @@ exports.TaxiCar = TaxiCar;
 exports.WalkingLine = WalkingLine;
 exports.WalkingRoute = WalkingRoute;
 exports.WaveCircle = WaveCircle;
+exports.patchMiniprogramRedirectTo = patchMiniprogramRedirectTo;
 exports.useBusinessAlarm = useBusinessAlarm;
 exports.useBusinessQuotingMap = useBusinessQuotingMap;
 exports.useBusinessRecomendPlaceMap = useBusinessRecomendPlaceMap;

package/dist/index.js

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.7.10";
+const version = "0.7.11";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -3371,6 +3371,19 @@ const BusinessQuotingMap = defineLagecySetup(function BusinessQuotingMap2(props)
     })]);
   };
 }).props(["fallback", "from", "loading", "mapRef", "registerOverlay", "renderDescription", "to", "fromDescription", "log"]);
+const MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT = "MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT";
+const MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT = 100 + 20;
+const MINI_PROGRAM_WEB_VIEW_CLOSE_DELAY = 100 + 70;
+const patchMiniprogramRedirectTo = (wx2) => {
+  const patchedRedirectTo = (props) => {
+    const webviewCloseEvent = new Event(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT);
+    dispatchEvent(webviewCloseEvent);
+    setTimeout(() => {
+      wx2.miniProgram.redirectTo(props);
+    }, MINI_PROGRAM_WEB_VIEW_CLOSE_DELAY);
+  };
+  return patchedRedirectTo;
+};
 const DEVICE_ORIENTATION_INTERVAL = 1e3;
 const CSS_DEVICE_ORIENTATION_VAR_PREFIX = "--CSS_DEVICE_ORIENTATION_VAR_ROTATION_DEGREE_";
 const useDeviceOrientation = (props) => {
@@ -3414,8 +3427,12 @@ function compatibaleAddEventListenerDeviceOrientation(handler) {
   if (isIOSDeviceOrientationPermissionGranted) {
     return addEventListener("deviceorientation", handler);
   }
-  const handleTouchEnd = () => {
+  const handleTouchEnd = async () => {
     removeEventListener("touchend", handleTouchEnd);
+    if (detectBrowserPlatform() === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM && await waitMiniProgramWebviewClose(MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT)) {
+      addEventListener("touchend", handleTouchEnd);
+      return;
+    }
     DeviceOrientationEvent == null ? void 0 : DeviceOrientationEvent.requestPermission().then((permissionState) => {
       if (permissionState === "granted") {
         isIOSDeviceOrientationPermissionGranted = true;
@@ -3436,6 +3453,20 @@ function compatibleRemoveEventListenerDeviceOrientation(handler) {
   }
   return removeEventListener("deviceorientation", handler);
 }
+function waitMiniProgramWebviewClose(duration) {
+  return new Promise((resolve) => {
+    const handleMiniProgramWebviewClose = () => {
+      removeEventListener(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, handleMiniProgramWebviewClose);
+      clearTimeout(timer);
+      resolve(true);
+    };
+    addEventListener(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, handleMiniProgramWebviewClose);
+    const timer = setTimeout(() => {
+      removeEventListener(MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT, handleMiniProgramWebviewClose);
+      resolve(false);
+    }, duration);
+  });
+}
 const watchVisibilityState = () => {
   const visibilityStateRef = ref(document.visibilityState);
   const handleVisibilityChange = () => {
@@ -7585,6 +7616,8 @@ export {
   DrivingLine,
   DrivingRoute,
   HeycarMap,
+  MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT,
+  MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT,
   MapProvider,
   PassengerCircle,
   PickupPoints,
@@ -7594,6 +7627,7 @@ export {
   WalkingLine,
   WalkingRoute,
   WaveCircle,
+  patchMiniprogramRedirectTo,
   useBusinessAlarm,
   useBusinessQuotingMap,
   useBusinessRecomendPlaceMap,

package/dist/src/index.d.ts

@@ -31,3 +31,4 @@ export { useMapPlace } from "./hooks/useMapPlace";
 export { useMapRecomendPlace } from "./hooks/useMapRecomendPlace";
 export { useWalkingRoute } from "./hooks/useWalkingRoute";
 export * from "./types/interface";
+export * from "./utils/patchMiniprogram";

package/dist/src/types/wx.d.ts

@@ -7,6 +7,12 @@ export interface WxGetLocationSuccessResponse extends WxResponse {
     speed: string;
     accuracy: string;
 }
+interface WxMiniProgramRedirectToProps {
+    url: string;
+    sucess?: () => void;
+    fail?: () => void;
+    complete?: () => void;
+}
 interface WxGetLocationProps {
     type: "wgs84" | "gcj02";
     success: (response: WxGetLocationSuccessResponse) => void;
@@ -17,5 +23,8 @@ export interface Wx {
     ready: (callback: () => void) => void;
     error: (callback: (response: WxResponse) => void) => void;
     getLocation: (props: WxGetLocationProps) => void;
+    miniProgram: {
+        redirectTo: (props: WxMiniProgramRedirectToProps) => void;
+    };
 }
 export {};

package/dist/src/utils/patchMiniprogram.d.ts

@@ -0,0 +1,4 @@
+import type { Wx } from "../types/wx";
+export declare const MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT = "MINI_PROGRAM_WEB_VIEW_CLOSE_EVENT";
+export declare const MINI_PROGRAM_WEB_VIEW_CLOSE_TIMEOUT: number;
+export declare const patchMiniprogramRedirectTo: (wx: Wx) => Wx["miniProgram"]["redirectTo"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.7.10",
+  "version": "0.7.11",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",