@pisell/private-materials 6.11.661 → 6.11.662

package/lib/pro/skuDetailModal/flow/modules/time/index.js

@@ -174,16 +174,30 @@ const refreshAvailabilityTimes = function() {
 		const posDurationAvailability = isPosDurationAvailabilityContext(context);
 		const posSessionAvailability = isPosSessionAvailabilityContext(context);
 		const posCustomTimeAvailability = posDurationAvailability || posSessionAvailability;
-		const requestedDuration = getAvailabilityDurationOverride(context, durationOverride);
-		const requestedStartTime = getAvailabilityStartTimeOverride(context, startTimeOverride);
+		const draftRequestedDuration = getAvailabilityDurationOverride(context, durationOverride);
+		const draftRequestedStartTime = getAvailabilityStartTimeOverride(context, startTimeOverride);
 		const selectedDate = context.draft.booking.startDate.format("YYYY-MM-DD");
 		const requestId = Date.now() + Math.random();
 		const previousTimeData = context.getModuleData(module.key);
-		const posCustomTimeHydrationKey = posCustomTimeAvailability && requestedDuration && requestedStartTime ? `${selectedDate}|${requestedStartTime}|${requestedDuration}` : void 0;
+		const posCustomTimeHydrationKey = posCustomTimeAvailability && draftRequestedDuration && draftRequestedStartTime ? `${selectedDate}|${draftRequestedStartTime}|${draftRequestedDuration}` : void 0;
+		const product = context.draft.productData;
+		const effectiveSelectionIntent = require_posCustomTime.resolvePosFlexibleDurationRequestIntent({
+			selectionIntent,
+			previousSelectionIntent: previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.posCustomTimeSelectionIntent,
+			hydrationKey: posCustomTimeHydrationKey,
+			previousHydrationKey: previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.posCustomTimeHydrationKey
+		});
+		const suppressFlexiblePresetOverride = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !require_posCustomTime.shouldApplyPosFlexibleDurationOverride({
+			selectionIntent: effectiveSelectionIntent,
+			isEditMode: context.services.selectionFlowMode === "edit"
+		});
+		const requestedDuration = suppressFlexiblePresetOverride ? void 0 : draftRequestedDuration;
+		const requestedStartTime = suppressFlexiblePresetOverride ? void 0 : draftRequestedStartTime;
 		context.setModuleData(module.key, {
 			requestId,
 			timeSlots: [],
-			posCustomTimeHydrationKey
+			posCustomTimeHydrationKey,
+			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 		});
 		const group = (yield availability.getProductTimeRanges(availability.contextId, require_objectSpread2._objectSpread2({
 			productIds: [availability.productId],
@@ -194,8 +208,7 @@ const refreshAvailabilityTimes = function() {
 			partySize: require_index$1.resolveSelectionFlowQueryPartySize(context.draft, availability.partySize)
 		}, requestedDuration ? require_objectSpread2._objectSpread2({ durationMinutesByProductId: { [String(availability.productId)]: requestedDuration } }, requestedStartTime ? { durationStartTimesByProductId: { [String(availability.productId)]: [requestedStartTime] } } : {}) : {}))).find((item) => String(item.productId) === String(availability.productId));
 		const candidates = (group === null || group === void 0 ? void 0 : group.ranges) || [];
-		const product = context.draft.productData;
-		if (posDurationAvailability && selectionIntent === "restore" && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && candidates.length === 0) {
+		if (posDurationAvailability && effectiveSelectionIntent === "restore" && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && candidates.length === 0) {
 			var _context$hostContext, _moduleOptions$slice, _context$draft$bookin2, _normalizeDurationMin3;
 			const moduleOptions = require_index$1.getModuleOptions(module);
 			const configuredSlice = (_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.bookingConfig) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.config) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.basic) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.service_time;
@@ -236,7 +249,8 @@ const refreshAvailabilityTimes = function() {
 				timeSlots: [],
 				selectedCandidate: void 0,
 				slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
-				posCustomTimeHydrationKey
+				posCustomTimeHydrationKey,
+				posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 			});
 			return;
 		}
@@ -252,8 +266,8 @@ const refreshAvailabilityTimes = function() {
 		const existingCandidate = context.draft.booking.selectedCandidate;
 		const draftStartTime = normalizeStartTimeValue(context.draft.booking.startTime);
 		const draftEndTime = normalizeStartTimeValue(context.draft.booking.endTime);
-		const requestedPosStartTime = requestedStartTime || draftStartTime;
-		const requestedPosDuration = (_ref4 = requestedDuration !== null && requestedDuration !== void 0 ? requestedDuration : normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _ref4 !== void 0 ? _ref4 : getDraftRangeDurationMinutes(context);
+		const requestedPosStartTime = suppressFlexiblePresetOverride ? requestedStartTime : requestedStartTime || draftStartTime;
+		const requestedPosDuration = suppressFlexiblePresetOverride ? requestedDuration : (_ref4 = requestedDuration !== null && requestedDuration !== void 0 ? requestedDuration : normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _ref4 !== void 0 ? _ref4 : getDraftRangeDurationMinutes(context);
 		const restoredDraftCandidate = draftStartTime ? times.find((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable) && (posSessionAvailability ? require_posCustomTime.isSameAvailabilityCandidateRange(candidate, {
 			date: selectedDate,
 			startTime: draftStartTime,
@@ -269,8 +283,8 @@ const refreshAvailabilityTimes = function() {
 			startTime: requestedPosStartTime,
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, requestedPosStartTime)) : void 0;
-		const customSelectionIntent = posCustomTimeAvailability && selectionIntent === "custom";
-		const fallbackSelectionIntent = posCustomTimeAvailability && selectionIntent === "fallback";
+		const customSelectionIntent = posCustomTimeAvailability && effectiveSelectionIntent === "custom";
+		const fallbackSelectionIntent = posCustomTimeAvailability && effectiveSelectionIntent === "fallback";
 		const requestedCustomRange = requestedPosStartTime && requestedPosDuration ? {
 			date: selectedDate,
 			startTime: requestedPosStartTime,
@@ -311,7 +325,8 @@ const refreshAvailabilityTimes = function() {
 				candidate
 			})),
 			selectedCandidate: initialCandidate,
-			posCustomTimeHydrationKey
+			posCustomTimeHydrationKey,
+			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 		});
 		const shouldWriteInitialCandidate = Boolean(initialCandidate) && (posCustomTimeAvailability || !existingCandidate || initialCandidate.key !== existingCandidate.key);
 		if (initialCandidate && shouldWriteInitialCandidate) {

package/lib/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -2,6 +2,12 @@ const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
 //#region src/pro/skuDetailModal/flow/modules/time/posCustomTime.ts
+const resolvePosFlexibleDurationRequestIntent = (params) => {
+	if (params.selectionIntent !== "restore") return params.selectionIntent;
+	if (params.hydrationKey && params.hydrationKey === params.previousHydrationKey && params.previousSelectionIntent) return params.previousSelectionIntent;
+	return "restore";
+};
+const shouldApplyPosFlexibleDurationOverride = (params) => params.isEditMode || params.selectionIntent !== "restore";
 const isFlexibleDurationValue = (value) => {
 	if (typeof value === "string") {
 		const text = value.trim().toLowerCase();
@@ -83,5 +89,7 @@ exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;
 exports.resolvePosCustomTimeDefaultStartTime = resolvePosCustomTimeDefaultStartTime;
 exports.resolvePosFlexibleDurationInitialCandidate = resolvePosFlexibleDurationInitialCandidate;
+exports.resolvePosFlexibleDurationRequestIntent = resolvePosFlexibleDurationRequestIntent;
+exports.shouldApplyPosFlexibleDurationOverride = shouldApplyPosFlexibleDurationOverride;
 exports.shouldResetPosFlexibleTimeForDate = shouldResetPosFlexibleTimeForDate;
 exports.shouldShowPosCustomTimeCandidateCards = shouldShowPosCustomTimeCandidateCards;

package/lib/pro/skuDetailModal/flow/types.d.ts

@@ -163,6 +163,14 @@ interface SelectionFlowAvailabilityService {
   contextId: string;
   productId: number | string;
   partySize: number;
+  /**
+   * 日历浏览超出当前投影时，按新的可视日期窗口准备一个 Availability context。
+   * Host 负责复用已覆盖该范围的 context，并保留仍可能被当前选择引用的旧 context。
+   */
+  ensureDateRange?: (dateRange: {
+    startDate: string;
+    endDate: string;
+  }) => Promise<void>;
   getProductTimeRanges: (contextId: string, request: Record<string, unknown>) => Promise<Array<{
     productId: number | string;
     title?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.661",
+  "version": "6.11.662",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,11 +69,11 @@
     "react-zoom-pan-pinch": "^3.7.0",
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
-    "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/materials": "6.11.256",
     "@pisell/utils": "3.0.4",
+    "@pisell/date-picker": "3.0.10",
+    "@pisell/materials": "6.11.256",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.10"
+    "@pisell/pi-payment-sdk": "0.0.3"
   },
   "peerDependencies": {
     "react": "^18.0.0",