@pisell/private-materials 6.3.217 → 6.3.218

package/es/components/appointmentBooking/components/Header/index.js

@@ -5,12 +5,12 @@ import { getResourceTitle } from "../../utils.js";
 import ProgressBar from "../../../eventBooking/components/progressBar/index.js";
 import { contextUtils, useAppointmentBookingProduct, useAppointmentBookingSetting, useAppointmentBookingStep, useInterceptBrowserBack, useShopDiscount } from "../../hooks.js";
 import { useAppointmentBookingContext } from "../../context.js";
-import React, { useMemo, useRef } from "react";
-import { locales } from "@pisell/utils";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import { locales, sendWarningLog } from "@pisell/utils";
 import "./index.less";
 //#region src/components/appointmentBooking/components/Header/index.tsx
 const Header = () => {
-	var _context$appHelper, _context$appHelper$is, _currentStep$step3, _currentStep$index;
+	var _context$appHelper, _context$appHelper$is, _utils$getData, _utils$getData2, _utils$getStore, _utils$getStore$getSt, _currentStep$step3, _currentStep$index;
 	const { currentStep, appointmentBooking, setTimes, carts, currentStepParams, currentSelectedResources } = useAppointmentBookingContext();
 	const shopDiscount = useShopDiscount();
 	const context = useEngineContext();
@@ -19,7 +19,63 @@ const Header = () => {
 	const { checkProductType } = useAppointmentBookingProduct();
 	const utils = contextUtils();
 	const progressBarRef = useRef(null);
-	const isIOS = Boolean((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$is = _context$appHelper.isIOS) === null || _context$appHelper$is === void 0 ? void 0 : _context$appHelper$is.call(_context$appHelper));
+	const userAgent = typeof navigator === "undefined" ? "" : navigator.userAgent;
+	const appHelperIsIOS = Boolean((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$is = _context$appHelper.isIOS) === null || _context$appHelper$is === void 0 ? void 0 : _context$appHelper$is.call(_context$appHelper));
+	const isIOS = /iPad|iPhone|iPod/.test(userAgent) || typeof navigator !== "undefined" && navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1;
+	const shopId = (_utils$getData = (_utils$getData2 = utils.getData) === null || _utils$getData2 === void 0 ? void 0 : _utils$getData2.call(utils, "shop_id")) !== null && _utils$getData !== void 0 ? _utils$getData : (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 || (_utils$getStore$getSt = _utils$getStore.getState) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.call(_utils$getStore)) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id;
+	const isBackDiagnosisShop = String(shopId) === "8610";
+	const logBackDiagnosis = useCallback((event) => {
+		if (!isBackDiagnosisShop || typeof window === "undefined") return;
+		const diagnostics = {
+			event,
+			shopId,
+			href: window.location.href,
+			isIOS,
+			appHelperIsIOS,
+			userAgent
+		};
+		console.info("[appointment-booking][back-diagnosis]", diagnostics);
+		sendWarningLog({
+			title: "Shop8610-appointment-back-diagnosis",
+			content: [
+				{
+					key: "event",
+					value: event
+				},
+				{
+					key: "shopId",
+					value: String(shopId)
+				},
+				{
+					key: "href",
+					value: diagnostics.href
+				},
+				{
+					key: "isIOS",
+					value: String(isIOS)
+				},
+				{
+					key: "appHelperIsIOS",
+					value: String(appHelperIsIOS)
+				},
+				{
+					key: "userAgent",
+					value: userAgent
+				}
+			]
+		}).catch((error) => {
+			console.warn("[appointment-booking][back-diagnosis] send log failed", error);
+		});
+	}, [
+		appHelperIsIOS,
+		isBackDiagnosisShop,
+		isIOS,
+		shopId,
+		userAgent
+	]);
+	useEffect(() => {
+		logBackDiagnosis("header-mounted");
+	}, [logBackDiagnosis]);
 	/**
 	* @title: 获取资源名称
 	* @description:
@@ -115,7 +171,8 @@ const Header = () => {
 		onBack: handleBack,
 		onExit: () => {
 			var _progressBarRef$curre;
-			return (_progressBarRef$curre = progressBarRef.current) === null || _progressBarRef$curre === void 0 ? void 0 : _progressBarRef$curre.triggerClose();
+			logBackDiagnosis("back-trap-exit");
+			(_progressBarRef$curre = progressBarRef.current) === null || _progressBarRef$curre === void 0 || _progressBarRef$curre.triggerClose();
 		}
 	});
 	return /* @__PURE__ */ React.createElement(ProgressBar, {

package/es/index.js

@@ -106,7 +106,6 @@ import PisellVenueControlPage from "./plus/pisellReservation/PisellVenueControlP
 import PisellVenueWallPage from "./plus/pisellReservation/PisellVenueWallPage.js";
 import PisellReservationTablePage from "./plus/pisellReservation/PisellReservationTablePage.js";
 import SelectFloorMapResourceDialog from "./plus/pisellReservation/components/SelectFloorMapResourceDialog.js";
-import "./plus/pisellReservation/index.js";
 import { PisellTopology, PisellTopologyCore } from "./plus/pisellTopology/PisellTopology.js";
 import pisellAdyenDashboard_default from "./plus/pisellAdyenDashboard/index.js";
 import weekday from "dayjs/plugin/weekday";

package/es/plus/pisellReservation/data/bookingToReservationTables.js

@@ -259,4 +259,4 @@ function bookingListToReservationTableRows(bookings) {
 	return rows;
 }
 //#endregion
-export { applyHostResourceShellToBaseRow, bookingListToReservationTableRows, customerBrief, extractResourceRecordIds, filterBookingsByResourceIds, hostBookingStatusToCardStatus, hostBookingUiPatchFromRecord, isMonitorScheduleBookingSkipped, mergeBookingsForResourceRecord };
+export { applyHostResourceShellToBaseRow, bookingListToReservationTableRows, customerBrief, extractResourceRecordIds, filterBookingsByResourceIds, hostBookingUiPatchFromRecord, isMonitorScheduleBookingSkipped, mergeBookingsForResourceRecord };

package/es/plus/pisellReservation/floorMap/floorPlanApi.js

@@ -79,4 +79,4 @@ function toastFloorPlanLoadError(err) {
 	PisellToast({ content: err instanceof Error ? err.message : String(err) });
 }
 //#endregion
-export { PISELL_RESERVATION_FLOOR_PLAN_CODE, buildDefaultReservationFloorPlanPostBody, ensureShopFloorPlanByCode, putShopFloorPlan, saveViewConfigToShopFloorPlan, shopLayoutToSceneElements$1 as shopLayoutToSceneElements, toastFloorPlanLoadError, toastFloorPlanSaveError, unsubscribeShopFloorPlanCodeQuery };
+export { PISELL_RESERVATION_FLOOR_PLAN_CODE, ensureShopFloorPlanByCode, saveViewConfigToShopFloorPlan, shopLayoutToSceneElements$1 as shopLayoutToSceneElements, toastFloorPlanLoadError, toastFloorPlanSaveError, unsubscribeShopFloorPlanCodeQuery };

package/es/plus/pisellReservation/floorMap/reservationMock.js

@@ -927,4 +927,4 @@ function getReservationDataSourceFormColumns() {
 	];
 }
 //#endregion
-export { RESERVATION_BOUND_ROUND_TABLE_ELEMENT_KIND, RESERVATION_BOUND_TABLE_ELEMENT_KIND, applyReservationFloorMapLiveLabels, defaultReservationSceneElements, defaultReservationTableRows, getDefaultReservationFloorMapConfig, getReservationDataSourceFormColumns, getReservationFloorMapShellConfig, mergeFloorMapElementKindCategoriesWithDefaults, mergeFloorMapElementKindsWithDefaults };
+export { RESERVATION_BOUND_ROUND_TABLE_ELEMENT_KIND, RESERVATION_BOUND_TABLE_ELEMENT_KIND, applyReservationFloorMapLiveLabels, defaultReservationTableRows, getDefaultReservationFloorMapConfig, getReservationDataSourceFormColumns, getReservationFloorMapShellConfig, mergeFloorMapElementKindCategoriesWithDefaults, mergeFloorMapElementKindsWithDefaults };

package/es/private-materials/lowcode/authmodal/meta.d.ts

@@ -0,0 +1 @@
+export { };

package/es/pro/Login2.0/AuthModal.d.ts

@@ -9,4 +9,4 @@ interface AuthModalProps {}
  */
 declare const AuthModal: React.FC<AuthModalProps>;
 //#endregion
-export { AuthModal };
+export { AuthModal, AuthModalProps };

package/es/pro/Login2.0/index.d.ts

@@ -1,4 +1,3 @@
-import { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LoginFormData, OAuthConfig, PhoneAuthConfig, RegisterFormData, UIConfig, VerificationMethod } from "./shared/types.js";
 import { Login2, Login2Config, Login2Events, Login2Props } from "./Login2.js";
 import { Register2, Register2Config, Register2Events, Register2Props } from "./Register2.js";
-import { AuthModal } from "./AuthModal.js";
+import { AuthModal, AuthModalProps } from "./AuthModal.js";

package/es/pro/Login2.0/shared/types.d.ts

@@ -226,4 +226,4 @@ interface RegisterFormData {
   verification_token?: string;
 }
 //#endregion
-export { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };
+export { AuthMethodType, EmailAuthConfig, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig };

package/lib/components/appointmentBooking/components/Header/index.js

@@ -12,7 +12,7 @@ let _pisell_utils = require("@pisell/utils");
 require("./index.less");
 //#region src/components/appointmentBooking/components/Header/index.tsx
 const Header = () => {
-	var _context$appHelper, _context$appHelper$is, _currentStep$step3, _currentStep$index;
+	var _context$appHelper, _context$appHelper$is, _utils$getData, _utils$getData2, _utils$getStore, _utils$getStore$getSt, _currentStep$step3, _currentStep$index;
 	const { currentStep, appointmentBooking, setTimes, carts, currentStepParams, currentSelectedResources } = require_context.useAppointmentBookingContext();
 	const shopDiscount = require_hooks.useShopDiscount();
 	const context = require_useEngineContext.default();
@@ -21,7 +21,63 @@ const Header = () => {
 	const { checkProductType } = require_hooks.useAppointmentBookingProduct();
 	const utils = require_hooks.contextUtils();
 	const progressBarRef = (0, react.useRef)(null);
-	const isIOS = Boolean((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$is = _context$appHelper.isIOS) === null || _context$appHelper$is === void 0 ? void 0 : _context$appHelper$is.call(_context$appHelper));
+	const userAgent = typeof navigator === "undefined" ? "" : navigator.userAgent;
+	const appHelperIsIOS = Boolean((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$is = _context$appHelper.isIOS) === null || _context$appHelper$is === void 0 ? void 0 : _context$appHelper$is.call(_context$appHelper));
+	const isIOS = /iPad|iPhone|iPod/.test(userAgent) || typeof navigator !== "undefined" && navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1;
+	const shopId = (_utils$getData = (_utils$getData2 = utils.getData) === null || _utils$getData2 === void 0 ? void 0 : _utils$getData2.call(utils, "shop_id")) !== null && _utils$getData !== void 0 ? _utils$getData : (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 || (_utils$getStore$getSt = _utils$getStore.getState) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.call(_utils$getStore)) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id;
+	const isBackDiagnosisShop = String(shopId) === "8610";
+	const logBackDiagnosis = (0, react.useCallback)((event) => {
+		if (!isBackDiagnosisShop || typeof window === "undefined") return;
+		const diagnostics = {
+			event,
+			shopId,
+			href: window.location.href,
+			isIOS,
+			appHelperIsIOS,
+			userAgent
+		};
+		console.info("[appointment-booking][back-diagnosis]", diagnostics);
+		(0, _pisell_utils.sendWarningLog)({
+			title: "Shop8610-appointment-back-diagnosis",
+			content: [
+				{
+					key: "event",
+					value: event
+				},
+				{
+					key: "shopId",
+					value: String(shopId)
+				},
+				{
+					key: "href",
+					value: diagnostics.href
+				},
+				{
+					key: "isIOS",
+					value: String(isIOS)
+				},
+				{
+					key: "appHelperIsIOS",
+					value: String(appHelperIsIOS)
+				},
+				{
+					key: "userAgent",
+					value: userAgent
+				}
+			]
+		}).catch((error) => {
+			console.warn("[appointment-booking][back-diagnosis] send log failed", error);
+		});
+	}, [
+		appHelperIsIOS,
+		isBackDiagnosisShop,
+		isIOS,
+		shopId,
+		userAgent
+	]);
+	(0, react.useEffect)(() => {
+		logBackDiagnosis("header-mounted");
+	}, [logBackDiagnosis]);
 	/**
 	* @title: 获取资源名称
 	* @description:
@@ -117,7 +173,8 @@ const Header = () => {
 		onBack: handleBack,
 		onExit: () => {
 			var _progressBarRef$curre;
-			return (_progressBarRef$curre = progressBarRef.current) === null || _progressBarRef$curre === void 0 ? void 0 : _progressBarRef$curre.triggerClose();
+			logBackDiagnosis("back-trap-exit");
+			(_progressBarRef$curre = progressBarRef.current) === null || _progressBarRef$curre === void 0 || _progressBarRef$curre.triggerClose();
 		}
 	});
 	return /* @__PURE__ */ react.default.createElement(require_index.default, {

package/package.json

@@ -1,6 +1,21 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.217",
+  "version": "6.3.218",
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": "build-scripts build --config ./build.lowcode.js",
+    "build:tsdown": "tsdown",
+    "lowcode:rsdev": "rsbuild dev",
+    "lowcode:rsbuild": "rsbuild build",
+    "test": "vitest",
+    "test:run": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "test:ui": "vitest --ui",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
+  },
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,6 +78,10 @@
   "dependencies": {
     "@adyen/adyen-platform-experience-web": "1.12.2",
     "antd": "5.10.1",
+    "@pisell/utils": "workspace:*",
+    "@pisell/materials": "workspace:*",
+    "@pisell/icon": "workspace:*",
+    "@pisell/date-picker": "workspace:*",
     "@ant-design/icons": "^5.6.1",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^6.0.1",
@@ -78,11 +97,7 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "react-zoom-pan-pinch": "^3.7.0",
-    "styled-components": "^6.0.0-rc.3",
-    "@pisell/utils": "3.0.5",
-    "@pisell/materials": "6.3.49",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "styled-components": "^6.0.0-rc.3"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -90,20 +105,5 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
-  },
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": "build-scripts build --config ./build.lowcode.js",
-    "build:tsdown": "tsdown",
-    "lowcode:rsdev": "rsbuild dev",
-    "lowcode:rsbuild": "rsbuild build",
-    "test": "vitest",
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "test:ui": "vitest --ui",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
   }
 }

package/es/plus/pisellReservation/index.js

@@ -1,17 +0,0 @@
-import "./floorRoomCard/mapRowToFloorRoomCardData.js";
-import "./floorRoomCard/ReservationFloorRoomCard.js";
-import "./floorMap/reservationMock.js";
-import "./floorMap/floorPlanApi.js";
-import "./reservationConstants.js";
-import "./serve/formResourcePage.js";
-import "./data/bookingToReservationTables.js";
-import "./data/formResourceToReservationTables.js";
-import "./data/salesEmbeddedResourceToTableRows.js";
-import "./floorMap/reservationCards.js";
-import "./PisellReservation.js";
-import "./PisellReservationBookingPage.js";
-import "./PisellVenueControlPage.js";
-import "./PisellVenueWallPage.js";
-import "./PisellReservationTablePage.js";
-import "./components/SelectFloorMapResourceDialog.js";
-export {};