@pisell/private-materials 6.11.686 → 6.11.687

package/es/plus/saleDetail/hooks/useAdjustTimeModal.js

@@ -659,6 +659,7 @@ function useAdjustTimeModal(options) {
 				if (yield function() {
 					var _ref23 = _asyncToGenerator(function* () {
 						if (mode === "checkout") {
+							yield previewQueueRef.current;
 							yield salesSdkCart.waitForCartConsistency();
 							const checkoutResult = yield sales === null || sales === void 0 ? void 0 : sales.openCheckout();
 							const isBackWithPaymentChanged = (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.reason) === "back" && (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.isChangePaymentNotIncludeVoucher) === true;
@@ -786,9 +787,7 @@ function useAdjustTimeModal(options) {
 				onSave: (result) => {
 					handleSave(result);
 				},
-				onCheckout: (result) => {
-					handleCheckout(result);
-				},
+				onCheckout: handleCheckout,
 				onPreviewChange: handlePreviewChange,
 				onTicketCountClick: bookingSelection && bookingSelection.options.length > 1 ? openBookingSelectionFromAdjustTime : void 0
 			}) : null);

package/es/plus/salesSdk/adjustTime/hooks/useAdjustTimeModalController.js

@@ -1,4 +1,5 @@
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import { useSalesSdk } from "../../hooks/useSalesSdk.js";
 import { addMinutes, applyTimeToDate, formatTime, getDelayToNextBillableMinuteChange, minutesBetween, resolveBillableMinuteDate, resolveFlexibleBusinessEnd, toDate } from "../utils/time.js";
 import { resolveDefaultChangeTimeValue } from "../utils/changeTime.js";
@@ -308,6 +309,8 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	const start = useMemo(() => toDate(booking.start), [booking.start]);
 	const end = useMemo(() => toDate(booking.end), [booking.end]);
 	const [liveNow, setLiveNow] = useState(() => resolveBillableMinuteDate(/* @__PURE__ */ new Date()));
+	const [checkoutPending, setCheckoutPending] = useState(false);
+	const checkoutPendingRef = useRef(false);
 	const [manualEndTime, setManualEndTime] = useState(() => getManualDefaultEndTime(end, liveNow));
 	const [manualEndDate, setManualEndDate] = useState(() => resolveDefaultManualEndDate(end, liveNow));
 	const [changeTimeValue, setChangeTimeValue] = useState(() => resolveDefaultChangeTimeValue({
@@ -322,6 +325,7 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	const prevOpenRef = useRef(false);
 	const latestOnPreviewChangeRef = useRef();
 	latestOnPreviewChangeRef.current = onPreviewChange;
+	const pendingPreviewRef = useRef();
 	/** 重置 Manual Add time 的 Date 和 HH:mm 文本，保持 UI 和计算值一致。 */
 	const resetManualEnd = useCallback((defaultManualEnd) => {
 		setManualEndDate(defaultManualEnd);
@@ -330,10 +334,11 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	/** Pay overtime 按分钟计费，只在跨过计费分钟时刷新 controller 派生数据。 */
 	/** 注册调试入口：允许运行时通过事件/localStorage 临时覆盖营业结束时间。 */
 	useEffect(() => {
-		if (!open) return void 0;
+		if (!open || checkoutPending) return void 0;
 		let timeoutId;
 		let intervalId;
 		const tick = () => {
+			if (checkoutPendingRef.current) return;
 			const now = resolveBillableMinuteDate(/* @__PURE__ */ new Date());
 			setLiveNow((prev) => prev.getTime() === now.getTime() ? prev : now);
 		};
@@ -346,7 +351,7 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 			if (timeoutId != null) window.clearTimeout(timeoutId);
 			if (intervalId != null) window.clearInterval(intervalId);
 		};
-	}, [open]);
+	}, [open, checkoutPending]);
 	useEffect(() => {
 		if (typeof window === "undefined") return void 0;
 		const setDebugClosingTime = (time) => {
@@ -636,8 +641,7 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	]);
 	/** action/time/price 变化后通知外层写入 tempOrder 预览；不依赖 previewDueAmount，避免预览回填触发循环。 */
 	useEffect(() => {
-		var _latestOnPreviewChang2;
-		if (!open) return;
+		if (!open || checkoutPendingRef.current) return;
 		const actionType = isProductAction(activeAction) ? "product" : activeAction;
 		const previewResult = {
 			actionType,
@@ -651,19 +655,30 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 			manualDueAmount,
 			selectedProductId: scenario.selectedProductId
 		};
+		const notifyPreviewChange = () => {
+			var _latestOnPreviewChang;
+			if (checkoutPendingRef.current) return;
+			(_latestOnPreviewChang = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang === void 0 || _latestOnPreviewChang.call(latestOnPreviewChangeRef, previewResult);
+		};
 		if (actionType === "changeTime") {
+			pendingPreviewRef.current = previewResult;
 			const timerId = window.setTimeout(() => {
-				var _latestOnPreviewChang;
-				(_latestOnPreviewChang = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang === void 0 || _latestOnPreviewChang.call(latestOnPreviewChangeRef, previewResult);
+				if (pendingPreviewRef.current !== previewResult) return;
+				pendingPreviewRef.current = void 0;
+				notifyPreviewChange();
 			}, 0);
-			return () => window.clearTimeout(timerId);
+			return () => {
+				window.clearTimeout(timerId);
+				if (pendingPreviewRef.current === previewResult) pendingPreviewRef.current = void 0;
+			};
 		}
-		(_latestOnPreviewChang2 = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang2 === void 0 || _latestOnPreviewChang2.call(latestOnPreviewChangeRef, previewResult);
+		notifyPreviewChange();
 	}, [
 		activeAction,
 		addedMinutes,
 		autoPricing,
 		booking.id,
+		checkoutPending,
 		localDueAmount,
 		manualDueAmount,
 		open,
@@ -698,10 +713,23 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 		changeTimeValue,
 		scenario,
 		handleActionChange,
-		handleCheckout: useMemoizedFn(() => {
-			if (checkoutDisabled || previewLoading) return;
-			onCheckout === null || onCheckout === void 0 || onCheckout(buildSubmitResult());
-		}),
+		handleCheckout: useMemoizedFn(_asyncToGenerator(function* () {
+			if (checkoutDisabled || previewLoading || checkoutPendingRef.current) return;
+			const pendingPreview = pendingPreviewRef.current;
+			pendingPreviewRef.current = void 0;
+			checkoutPendingRef.current = true;
+			setCheckoutPending(true);
+			try {
+				if (pendingPreview) {
+					var _latestOnPreviewChang2;
+					yield (_latestOnPreviewChang2 = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang2 === void 0 ? void 0 : _latestOnPreviewChang2.call(latestOnPreviewChangeRef, pendingPreview);
+				}
+				yield onCheckout === null || onCheckout === void 0 ? void 0 : onCheckout(buildSubmitResult());
+			} finally {
+				checkoutPendingRef.current = false;
+				setCheckoutPending(false);
+			}
+		})),
 		handleSave,
 		handleManualEndTimeChange,
 		handleChangeTimeChange,

package/lib/plus/saleDetail/hooks/useAdjustTimeModal.js

@@ -663,6 +663,7 @@ function useAdjustTimeModal(options) {
 				if (yield function() {
 					var _ref23 = require_asyncToGenerator._asyncToGenerator(function* () {
 						if (mode === "checkout") {
+							yield previewQueueRef.current;
 							yield salesSdkCart.waitForCartConsistency();
 							const checkoutResult = yield sales === null || sales === void 0 ? void 0 : sales.openCheckout();
 							const isBackWithPaymentChanged = (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.reason) === "back" && (checkoutResult === null || checkoutResult === void 0 ? void 0 : checkoutResult.isChangePaymentNotIncludeVoucher) === true;
@@ -790,9 +791,7 @@ function useAdjustTimeModal(options) {
 				onSave: (result) => {
 					handleSave(result);
 				},
-				onCheckout: (result) => {
-					handleCheckout(result);
-				},
+				onCheckout: handleCheckout,
 				onPreviewChange: handlePreviewChange,
 				onTicketCountClick: bookingSelection && bookingSelection.options.length > 1 ? openBookingSelectionFromAdjustTime : void 0
 			}) : null);

package/lib/plus/salesSdk/adjustTime/hooks/useAdjustTimeModalController.js

@@ -1,5 +1,6 @@
 require("../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
+const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_useSalesSdk = require("../../hooks/useSalesSdk.js");
 const require_time = require("../utils/time.js");
 const require_changeTime = require("../utils/changeTime.js");
@@ -309,6 +310,8 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	const start = (0, react.useMemo)(() => require_time.toDate(booking.start), [booking.start]);
 	const end = (0, react.useMemo)(() => require_time.toDate(booking.end), [booking.end]);
 	const [liveNow, setLiveNow] = (0, react.useState)(() => require_time.resolveBillableMinuteDate(/* @__PURE__ */ new Date()));
+	const [checkoutPending, setCheckoutPending] = (0, react.useState)(false);
+	const checkoutPendingRef = (0, react.useRef)(false);
 	const [manualEndTime, setManualEndTime] = (0, react.useState)(() => getManualDefaultEndTime(end, liveNow));
 	const [manualEndDate, setManualEndDate] = (0, react.useState)(() => resolveDefaultManualEndDate(end, liveNow));
 	const [changeTimeValue, setChangeTimeValue] = (0, react.useState)(() => require_changeTime.resolveDefaultChangeTimeValue({
@@ -323,6 +326,7 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	const prevOpenRef = (0, react.useRef)(false);
 	const latestOnPreviewChangeRef = (0, react.useRef)();
 	latestOnPreviewChangeRef.current = onPreviewChange;
+	const pendingPreviewRef = (0, react.useRef)();
 	/** 重置 Manual Add time 的 Date 和 HH:mm 文本，保持 UI 和计算值一致。 */
 	const resetManualEnd = (0, react.useCallback)((defaultManualEnd) => {
 		setManualEndDate(defaultManualEnd);
@@ -331,10 +335,11 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	/** Pay overtime 按分钟计费，只在跨过计费分钟时刷新 controller 派生数据。 */
 	/** 注册调试入口：允许运行时通过事件/localStorage 临时覆盖营业结束时间。 */
 	(0, react.useEffect)(() => {
-		if (!open) return void 0;
+		if (!open || checkoutPending) return void 0;
 		let timeoutId;
 		let intervalId;
 		const tick = () => {
+			if (checkoutPendingRef.current) return;
 			const now = require_time.resolveBillableMinuteDate(/* @__PURE__ */ new Date());
 			setLiveNow((prev) => prev.getTime() === now.getTime() ? prev : now);
 		};
@@ -347,7 +352,7 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 			if (timeoutId != null) window.clearTimeout(timeoutId);
 			if (intervalId != null) window.clearInterval(intervalId);
 		};
-	}, [open]);
+	}, [open, checkoutPending]);
 	(0, react.useEffect)(() => {
 		if (typeof window === "undefined") return void 0;
 		const setDebugClosingTime = (time) => {
@@ -637,8 +642,7 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 	]);
 	/** action/time/price 变化后通知外层写入 tempOrder 预览；不依赖 previewDueAmount，避免预览回填触发循环。 */
 	(0, react.useEffect)(() => {
-		var _latestOnPreviewChang2;
-		if (!open) return;
+		if (!open || checkoutPendingRef.current) return;
 		const actionType = isProductAction(activeAction) ? "product" : activeAction;
 		const previewResult = {
 			actionType,
@@ -652,19 +656,30 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 			manualDueAmount,
 			selectedProductId: scenario.selectedProductId
 		};
+		const notifyPreviewChange = () => {
+			var _latestOnPreviewChang;
+			if (checkoutPendingRef.current) return;
+			(_latestOnPreviewChang = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang === void 0 || _latestOnPreviewChang.call(latestOnPreviewChangeRef, previewResult);
+		};
 		if (actionType === "changeTime") {
+			pendingPreviewRef.current = previewResult;
 			const timerId = window.setTimeout(() => {
-				var _latestOnPreviewChang;
-				(_latestOnPreviewChang = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang === void 0 || _latestOnPreviewChang.call(latestOnPreviewChangeRef, previewResult);
+				if (pendingPreviewRef.current !== previewResult) return;
+				pendingPreviewRef.current = void 0;
+				notifyPreviewChange();
 			}, 0);
-			return () => window.clearTimeout(timerId);
+			return () => {
+				window.clearTimeout(timerId);
+				if (pendingPreviewRef.current === previewResult) pendingPreviewRef.current = void 0;
+			};
 		}
-		(_latestOnPreviewChang2 = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang2 === void 0 || _latestOnPreviewChang2.call(latestOnPreviewChangeRef, previewResult);
+		notifyPreviewChange();
 	}, [
 		activeAction,
 		addedMinutes,
 		autoPricing,
 		booking.id,
+		checkoutPending,
 		localDueAmount,
 		manualDueAmount,
 		open,
@@ -699,10 +714,23 @@ const useAdjustTimeModalController = ({ open, booking, products, resourceEndTime
 		changeTimeValue,
 		scenario,
 		handleActionChange,
-		handleCheckout: (0, ahooks.useMemoizedFn)(() => {
-			if (checkoutDisabled || previewLoading) return;
-			onCheckout === null || onCheckout === void 0 || onCheckout(buildSubmitResult());
-		}),
+		handleCheckout: (0, ahooks.useMemoizedFn)(require_asyncToGenerator._asyncToGenerator(function* () {
+			if (checkoutDisabled || previewLoading || checkoutPendingRef.current) return;
+			const pendingPreview = pendingPreviewRef.current;
+			pendingPreviewRef.current = void 0;
+			checkoutPendingRef.current = true;
+			setCheckoutPending(true);
+			try {
+				if (pendingPreview) {
+					var _latestOnPreviewChang2;
+					yield (_latestOnPreviewChang2 = latestOnPreviewChangeRef.current) === null || _latestOnPreviewChang2 === void 0 ? void 0 : _latestOnPreviewChang2.call(latestOnPreviewChangeRef, pendingPreview);
+				}
+				yield onCheckout === null || onCheckout === void 0 ? void 0 : onCheckout(buildSubmitResult());
+			} finally {
+				checkoutPendingRef.current = false;
+				setCheckoutPending(false);
+			}
+		})),
 		handleSave,
 		handleManualEndTimeChange,
 		handleChangeTimeChange,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.686",
+  "version": "6.11.687",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -73,8 +73,8 @@
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
     "@pisell/utils": "3.0.7",
-    "@pisell/icon": "0.0.11",
     "@pisell/materials": "6.11.266",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {