@pisell/private-materials 6.11.649 → 6.11.650

package/es/pro/skuDetailModal/flow/posAutoResolution.js

@@ -23,6 +23,6 @@ const getPosAutoResolutionDraftKey = (draft) => {
 		capacity: (_draft$booking$capaci = draft.booking.capacity) !== null && _draft$booking$capaci !== void 0 ? _draft$booking$capaci : null
 	});
 };
-const shouldCompactPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
+const shouldDirectlyConfirmPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
 //#endregion
-export { getPosAutoResolutionDraftKey, isPosCreateAutoResolutionCandidate, shouldCompactPosSelectionFlow };
+export { getPosAutoResolutionDraftKey, isPosCreateAutoResolutionCandidate, shouldDirectlyConfirmPosSelectionFlow };

package/es/pro/skuDetailModal/index.js

@@ -35,7 +35,7 @@ import resolveBookingPriceDisplayAmounts, { canOpenBookingManualPriceChange } fr
 import { normalizeSelectionDuration } from "./flow/modules/time/index.js";
 import { flowModuleRegistry } from "./flow/registry.js";
 import SkuDetailSelectionFlowView from "./flow/SkuDetailSelectionFlowView.js";
-import { getPosAutoResolutionDraftKey, isPosCreateAutoResolutionCandidate, shouldCompactPosSelectionFlow } from "./flow/posAutoResolution.js";
+import { getPosAutoResolutionDraftKey, isPosCreateAutoResolutionCandidate, shouldDirectlyConfirmPosSelectionFlow } from "./flow/posAutoResolution.js";
 import dayjs from "dayjs";
 import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { locales } from "@pisell/utils";
@@ -716,24 +716,23 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		posAutoResolutionDraftKey,
 		selectionFlowInstanceKey
 	]);
-	const isPosSelectionFlowCompacted = shouldCompactPosSelectionFlow({
+	const canDirectlyConfirmPosSelectionFlow = shouldDirectlyConfirmPosSelectionFlow({
 		eligible: isPosCreateAutoResolutionEligible,
 		status: posAutoResolutionStatus,
 		currentStepIndex: currentStep
 	});
-	const visibleProcedureSteps = useMemo(() => isPosSelectionFlowCompacted ? procedureSteps.slice(0, 1) : procedureSteps, [isPosSelectionFlowCompacted, procedureSteps]);
-	const maxStepIndex = useMemo(() => Math.max(0, visibleProcedureSteps.length - 1), [visibleProcedureSteps]);
+	const maxStepIndex = useMemo(() => Math.max(0, procedureSteps.length - 1), [procedureSteps]);
 	useLayoutEffect(() => {
 		var _selectionFlowRef$cur4, _selectionFlowRef$cur5, _procedureRef$current, _procedureRef$current2;
-		if (visibleProcedureSteps.length === 0) return;
+		if (procedureSteps.length === 0) return;
 		const sourceStepIndex = isCustomSelectionFlow ? (_selectionFlowRef$cur4 = (_selectionFlowRef$cur5 = selectionFlowRef.current) === null || _selectionFlowRef$cur5 === void 0 ? void 0 : _selectionFlowRef$cur5.getState().currentStepIndex) !== null && _selectionFlowRef$cur4 !== void 0 ? _selectionFlowRef$cur4 : currentStep : currentStep;
-		const nextStepIndex = Math.min(Math.max(0, sourceStepIndex), visibleProcedureSteps.length - 1);
+		const nextStepIndex = Math.min(Math.max(0, sourceStepIndex), procedureSteps.length - 1);
 		if (currentStep !== nextStepIndex) setCurrentStep(nextStepIndex);
 		(_procedureRef$current = procedureRef.current) === null || _procedureRef$current === void 0 || (_procedureRef$current2 = _procedureRef$current.goToStep) === null || _procedureRef$current2 === void 0 || _procedureRef$current2.call(_procedureRef$current, nextStepIndex);
 	}, [
 		currentStep,
 		isCustomSelectionFlow,
-		visibleProcedureSteps
+		procedureSteps
 	]);
 	/**
 	* @description: 格式化组合规格数据
@@ -1269,10 +1268,11 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		translationOriginal
 	]);
 	const pcConfirmButtonText = useMemo(() => {
-		if (isCustomSelectionFlow) return currentStep < maxStepIndex ? locales.getText("pisell2.text.sku.detail.modal.btn.next") : locales.getText("pisell2.text.sku.detail.modal.btn.confirm");
+		if (isCustomSelectionFlow) return currentStep < maxStepIndex && !canDirectlyConfirmPosSelectionFlow ? locales.getText("pisell2.text.sku.detail.modal.btn.next") : locales.getText("pisell2.text.sku.detail.modal.btn.confirm");
 		if (currentStep === 0 && hasSkuOptions) return locales.getText("pisell2.text.sku.detail.modal.btn.next");
 		return locales.getText("pisell2.text.sku.detail.modal.btn.confirm");
 	}, [
+		canDirectlyConfirmPosSelectionFlow,
 		currentStep,
 		hasSkuOptions,
 		isCustomSelectionFlow,
@@ -1321,7 +1321,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			if (isCustomSelectionFlow && !flowDraft) {
 				const flow = selectionFlowRef.current;
 				if (!flow) return false;
-				if (isPosCreateAutoResolutionEligible && posAutoResolutionStatus === "resolved" && currentStep === 0) {
+				if (canDirectlyConfirmPosSelectionFlow) {
 					const openTaskId = openTaskIdRef.current;
 					const draftKey = getPosAutoResolutionDraftKey(flow.getState().draft);
 					const runId = posAutoResolutionRunRef.current + 1;
@@ -1876,11 +1876,11 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	};
 	const procedureHeaderProps = {
 		showBackOnFirstStep: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false,
-		showSteps: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false && visibleProcedureSteps.length > 1,
+		showSteps: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false && procedureSteps.length > 1,
 		left: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false ? leftHeaderBack() : void 0,
 		right: leftHeaderClose(),
 		stepsProps: {
-			items: visibleProcedureSteps,
+			items: procedureSteps,
 			mobileBreakpoint: 480,
 			clickable: isCustomSelectionFlow ? false : void 0
 		}

package/lib/pro/skuDetailModal/flow/posAutoResolution.js

@@ -23,8 +23,8 @@ const getPosAutoResolutionDraftKey = (draft) => {
 		capacity: (_draft$booking$capaci = draft.booking.capacity) !== null && _draft$booking$capaci !== void 0 ? _draft$booking$capaci : null
 	});
 };
-const shouldCompactPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
+const shouldDirectlyConfirmPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
 //#endregion
 exports.getPosAutoResolutionDraftKey = getPosAutoResolutionDraftKey;
 exports.isPosCreateAutoResolutionCandidate = isPosCreateAutoResolutionCandidate;
-exports.shouldCompactPosSelectionFlow = shouldCompactPosSelectionFlow;
+exports.shouldDirectlyConfirmPosSelectionFlow = shouldDirectlyConfirmPosSelectionFlow;

package/lib/pro/skuDetailModal/index.js

@@ -722,24 +722,23 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		posAutoResolutionDraftKey,
 		selectionFlowInstanceKey
 	]);
-	const isPosSelectionFlowCompacted = require_posAutoResolution.shouldCompactPosSelectionFlow({
+	const canDirectlyConfirmPosSelectionFlow = require_posAutoResolution.shouldDirectlyConfirmPosSelectionFlow({
 		eligible: isPosCreateAutoResolutionEligible,
 		status: posAutoResolutionStatus,
 		currentStepIndex: currentStep
 	});
-	const visibleProcedureSteps = (0, react.useMemo)(() => isPosSelectionFlowCompacted ? procedureSteps.slice(0, 1) : procedureSteps, [isPosSelectionFlowCompacted, procedureSteps]);
-	const maxStepIndex = (0, react.useMemo)(() => Math.max(0, visibleProcedureSteps.length - 1), [visibleProcedureSteps]);
+	const maxStepIndex = (0, react.useMemo)(() => Math.max(0, procedureSteps.length - 1), [procedureSteps]);
 	(0, react.useLayoutEffect)(() => {
 		var _selectionFlowRef$cur4, _selectionFlowRef$cur5, _procedureRef$current, _procedureRef$current2;
-		if (visibleProcedureSteps.length === 0) return;
+		if (procedureSteps.length === 0) return;
 		const sourceStepIndex = isCustomSelectionFlow ? (_selectionFlowRef$cur4 = (_selectionFlowRef$cur5 = selectionFlowRef.current) === null || _selectionFlowRef$cur5 === void 0 ? void 0 : _selectionFlowRef$cur5.getState().currentStepIndex) !== null && _selectionFlowRef$cur4 !== void 0 ? _selectionFlowRef$cur4 : currentStep : currentStep;
-		const nextStepIndex = Math.min(Math.max(0, sourceStepIndex), visibleProcedureSteps.length - 1);
+		const nextStepIndex = Math.min(Math.max(0, sourceStepIndex), procedureSteps.length - 1);
 		if (currentStep !== nextStepIndex) setCurrentStep(nextStepIndex);
 		(_procedureRef$current = procedureRef.current) === null || _procedureRef$current === void 0 || (_procedureRef$current2 = _procedureRef$current.goToStep) === null || _procedureRef$current2 === void 0 || _procedureRef$current2.call(_procedureRef$current, nextStepIndex);
 	}, [
 		currentStep,
 		isCustomSelectionFlow,
-		visibleProcedureSteps
+		procedureSteps
 	]);
 	/**
 	* @description: 格式化组合规格数据
@@ -1275,10 +1274,11 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		translationOriginal
 	]);
 	const pcConfirmButtonText = (0, react.useMemo)(() => {
-		if (isCustomSelectionFlow) return currentStep < maxStepIndex ? _pisell_utils.locales.getText("pisell2.text.sku.detail.modal.btn.next") : _pisell_utils.locales.getText("pisell2.text.sku.detail.modal.btn.confirm");
+		if (isCustomSelectionFlow) return currentStep < maxStepIndex && !canDirectlyConfirmPosSelectionFlow ? _pisell_utils.locales.getText("pisell2.text.sku.detail.modal.btn.next") : _pisell_utils.locales.getText("pisell2.text.sku.detail.modal.btn.confirm");
 		if (currentStep === 0 && hasSkuOptions) return _pisell_utils.locales.getText("pisell2.text.sku.detail.modal.btn.next");
 		return _pisell_utils.locales.getText("pisell2.text.sku.detail.modal.btn.confirm");
 	}, [
+		canDirectlyConfirmPosSelectionFlow,
 		currentStep,
 		hasSkuOptions,
 		isCustomSelectionFlow,
@@ -1327,7 +1327,7 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			if (isCustomSelectionFlow && !flowDraft) {
 				const flow = selectionFlowRef.current;
 				if (!flow) return false;
-				if (isPosCreateAutoResolutionEligible && posAutoResolutionStatus === "resolved" && currentStep === 0) {
+				if (canDirectlyConfirmPosSelectionFlow) {
 					const openTaskId = openTaskIdRef.current;
 					const draftKey = require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft);
 					const runId = posAutoResolutionRunRef.current + 1;
@@ -1882,11 +1882,11 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	};
 	const procedureHeaderProps = {
 		showBackOnFirstStep: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false,
-		showSteps: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false && visibleProcedureSteps.length > 1,
+		showSteps: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false && procedureSteps.length > 1,
 		left: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowProcedureSteps) !== false ? leftHeaderBack() : void 0,
 		right: leftHeaderClose(),
 		stepsProps: {
-			items: visibleProcedureSteps,
+			items: procedureSteps,
 			mobileBreakpoint: 480,
 			clickable: isCustomSelectionFlow ? false : void 0
 		}

package/package.json

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