@pisell/private-materials 6.12.371 → 6.12.373

package/es/plus/salesSdk/utils/resolveLocalizedText.js

@@ -22,7 +22,7 @@ function resolveLocalizedText(value, translationOriginal, localeOverride) {
 		const locale = localeOverride || ((_locales$getLocale = locales.getLocale) === null || _locales$getLocale === void 0 ? void 0 : _locales$getLocale.call(locales)) || locales.locale || "en";
 		const normalized = ((_locales$formatLocale = locales.formatLocale) === null || _locales$formatLocale === void 0 ? void 0 : _locales$formatLocale.call(locales, locale)) || locale;
 		const record = value;
-		return record[normalized] || record[locale] || record.auto || record.default || record.original || record.en || record["zh-CN"] || record["zh-HK"] || record.ja || record.pt || record.kitchen || Object.keys(record).sort().map((key) => record[key]).find((text) => typeof text === "string" && text) || "";
+		return record[normalized] || record[locale] || record.original || record.default || record.auto || record.en || record["zh-CN"] || record["zh-HK"] || record.ja || record.pt || record.kitchen || Object.keys(record).sort().map((key) => record[key]).find((text) => typeof text === "string" && text) || "";
 	}
 	return String(value);
 }

package/es/pro/compensatedPisellContainer/floatingLayer/index.js

@@ -1,6 +1,7 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import useScrollActivity from "../../../hooks/useScrollActivity.js";
-import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { observeTransitions } from "./observeTransitions.js";
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Button } from "antd";
 import classNames from "classnames";
 import { createPortal } from "react-dom";
@@ -8,7 +9,6 @@ import "./index.less";
 //#region src/pro/compensatedPisellContainer/floatingLayer/index.tsx
 const prefixCls = "pisell-lowcode-floating-layer";
 const legacyDrawerPrefixCls = "pisell-lowcode-drawer";
-const motionDuration = 300;
 const ModalButton = Button;
 const overlayBaseZIndex = 600;
 const overlayZIndexStep = 10;
@@ -72,35 +72,28 @@ const getFloatingLayoutState = (isLayoutChanging = false) => {
 		viewportSize: getViewportSize()
 	};
 };
-const isSameFloatingLayout = (prevLayout, nextLayout) => {
-	return Math.abs(prevLayout.bodyScale.x - nextLayout.bodyScale.x) < .001 && Math.abs(prevLayout.bodyScale.y - nextLayout.bodyScale.y) < .001 && prevLayout.viewportSize.width === nextLayout.viewportSize.width && prevLayout.viewportSize.height === nextLayout.viewportSize.height && prevLayout.isLayoutChanging === nextLayout.isLayoutChanging;
+const isSameFloatingGeometry = (prevLayout, nextLayout) => {
+	return Math.abs(prevLayout.bodyScale.x - nextLayout.bodyScale.x) < .001 && Math.abs(prevLayout.bodyScale.y - nextLayout.bodyScale.y) < .001 && prevLayout.viewportSize.width === nextLayout.viewportSize.width && prevLayout.viewportSize.height === nextLayout.viewportSize.height;
 };
 const useBodyScaleViewport = () => {
 	const [layoutState, setLayoutState] = useState(() => getFloatingLayoutState(false));
 	const updateFrameRef = useRef();
-	const settleTimerRef = useRef();
+	const settleFrameRef = useRef();
 	useEffect(() => {
 		var _window$visualViewpor;
 		if (typeof window === "undefined" || typeof document === "undefined") return;
-		const setNextLayout = (isLayoutChanging) => {
-			const nextLayout = getFloatingLayoutState(isLayoutChanging);
-			setLayoutState((prevLayout) => isSameFloatingLayout(prevLayout, nextLayout) ? prevLayout : nextLayout);
-		};
-		const markLayoutSettled = () => {
-			if (settleTimerRef.current) window.clearTimeout(settleTimerRef.current);
-			settleTimerRef.current = window.setTimeout(() => {
-				setNextLayout(false);
-			}, motionDuration);
+		const updateGeometry = () => {
+			const nextLayout = getFloatingLayoutState(true);
+			setLayoutState((prevLayout) => isSameFloatingGeometry(prevLayout, nextLayout) ? prevLayout : nextLayout);
 		};
 		const scheduleScaleViewportUpdate = () => {
 			if (updateFrameRef.current) window.cancelAnimationFrame(updateFrameRef.current);
 			updateFrameRef.current = window.requestAnimationFrame(() => {
 				updateFrameRef.current = void 0;
-				setNextLayout(true);
-				markLayoutSettled();
+				updateGeometry();
 			});
 		};
-		setNextLayout(false);
+		updateGeometry();
 		window.addEventListener("resize", scheduleScaleViewportUpdate);
 		(_window$visualViewpor = window.visualViewport) === null || _window$visualViewpor === void 0 || _window$visualViewpor.addEventListener("resize", scheduleScaleViewportUpdate);
 		const bodyObserver = new MutationObserver(scheduleScaleViewportUpdate);
@@ -111,12 +104,21 @@ const useBodyScaleViewport = () => {
 		return () => {
 			var _window$visualViewpor2;
 			if (updateFrameRef.current) window.cancelAnimationFrame(updateFrameRef.current);
-			if (settleTimerRef.current) window.clearTimeout(settleTimerRef.current);
 			window.removeEventListener("resize", scheduleScaleViewportUpdate);
 			(_window$visualViewpor2 = window.visualViewport) === null || _window$visualViewpor2 === void 0 || _window$visualViewpor2.removeEventListener("resize", scheduleScaleViewportUpdate);
 			bodyObserver.disconnect();
 		};
 	}, []);
+	useLayoutEffect(() => {
+		if (!layoutState.isLayoutChanging) return;
+		document.body.getBoundingClientRect();
+		settleFrameRef.current = requestAnimationFrame(() => {
+			setLayoutState((current) => _objectSpread2(_objectSpread2({}, current), {}, { isLayoutChanging: false }));
+		});
+		return () => {
+			if (settleFrameRef.current !== void 0) cancelAnimationFrame(settleFrameRef.current);
+		};
+	}, [layoutState]);
 	return layoutState;
 };
 const getDefaultDrawerSize = (size) => {
@@ -233,7 +235,13 @@ const TransformFloatingLayer = (props) => {
 		shouldAutoHideHeaderFooter
 	]);
 	const [rendered, setRendered] = useState(mergedOpen);
-	const [motionOpen, setMotionOpen] = useState(mergedOpen);
+	const [motion, setMotion] = useState({
+		open: false,
+		id: 0
+	});
+	const motionOpen = motion.open;
+	const wrapperRef = useRef(null);
+	const maskRef = useRef(null);
 	const shouldRenderLayer = rendered || mergedOpen;
 	const skipCurrentEnterMotion = skipEnterMotion && mergedOpen;
 	const effectiveMotionOpen = skipCurrentEnterMotion ? true : motionOpen;
@@ -241,10 +249,16 @@ const TransformFloatingLayer = (props) => {
 	const overlayIdRef = useRef();
 	const autoZIndexRef = useRef();
 	const autoZIndexActiveRef = useRef(false);
-	const mountedRef = useRef(false);
-	const renderedRef = useRef(mergedOpen);
-	const motionFrameRef = useRef();
-	const motionTimerRef = useRef();
+	const hasOpenedRef = useRef(false);
+	const motionRunRef = useRef(0);
+	const motionOptionsRef = useRef({
+		afterOpenChange,
+		shouldDestroyOnClose
+	});
+	motionOptionsRef.current = {
+		afterOpenChange,
+		shouldDestroyOnClose
+	};
 	if (overlayIdRef.current === void 0) overlayIdRef.current = getNextOverlayId();
 	const overlayId = overlayIdRef.current;
 	const releaseAutoZIndex = () => {
@@ -260,50 +274,49 @@ const TransformFloatingLayer = (props) => {
 		autoZIndexActiveRef.current = true;
 	}
 	const mergedZIndex = (_ref = zIndex !== null && zIndex !== void 0 ? zIndex : autoZIndexRef.current) !== null && _ref !== void 0 ? _ref : overlayBaseZIndex;
-	const updateRendered = (nextRendered) => {
-		renderedRef.current = nextRendered;
-		setRendered(nextRendered);
-	};
 	const handleClose = (event) => {
 		const closeHandler = mode === "modal" ? onCancel || onClose : onClose || onCancel;
 		closeHandler === null || closeHandler === void 0 || closeHandler(event);
 	};
-	useEffect(() => {
+	useEffect(() => () => releaseAutoZIndex(), []);
+	useLayoutEffect(() => {
+		const id = ++motionRunRef.current;
+		let frame;
+		if (mergedOpen) {
+			hasOpenedRef.current = true;
+			setRendered(true);
+		}
+		if (mergedOpen && !skipEnterMotion && !motionOpen) {
+			var _wrapperRef$current, _maskRef$current;
+			(_wrapperRef$current = wrapperRef.current) === null || _wrapperRef$current === void 0 || _wrapperRef$current.getBoundingClientRect();
+			(_maskRef$current = maskRef.current) === null || _maskRef$current === void 0 || _maskRef$current.getBoundingClientRect();
+			frame = requestAnimationFrame(() => {
+				frame = requestAnimationFrame(() => setMotion({
+					open: true,
+					id
+				}));
+			});
+		} else setMotion({
+			open: mergedOpen,
+			id
+		});
 		return () => {
-			if (motionFrameRef.current) window.cancelAnimationFrame(motionFrameRef.current);
-			if (motionTimerRef.current) window.clearTimeout(motionTimerRef.current);
-			releaseAutoZIndex();
+			++motionRunRef.current;
+			if (frame !== void 0) cancelAnimationFrame(frame);
 		};
-	}, []);
-	useEffect(() => {
-		if (typeof window === "undefined") return;
-		if (motionFrameRef.current) window.cancelAnimationFrame(motionFrameRef.current);
-		if (motionTimerRef.current) window.clearTimeout(motionTimerRef.current);
-		if (mergedOpen) if (renderedRef.current) setMotionOpen(true);
-		else {
-			updateRendered(true);
-			setMotionOpen(false);
-			motionFrameRef.current = window.requestAnimationFrame(() => {
-				setMotionOpen(true);
-			});
-		}
-		else setMotionOpen(false);
-		if (!mountedRef.current) {
-			mountedRef.current = true;
-			return;
-		}
-		motionTimerRef.current = window.setTimeout(() => {
-			afterOpenChange === null || afterOpenChange === void 0 || afterOpenChange(mergedOpen);
-			if (!mergedOpen) {
+	}, [mergedOpen, skipEnterMotion]);
+	useLayoutEffect(() => {
+		if (!hasOpenedRef.current || motion.id !== motionRunRef.current || motion.open !== mergedOpen) return;
+		return observeTransitions([wrapperRef.current, maskRef.current].filter((element) => element !== null), () => {
+			var _motionOptionsRef$cur, _motionOptionsRef$cur2;
+			if (motion.id !== motionRunRef.current) return;
+			if (!motion.open) {
 				releaseAutoZIndex();
-				if (shouldDestroyOnClose) updateRendered(false);
+				if (motionOptionsRef.current.shouldDestroyOnClose) setRendered(false);
 			}
-		}, motionDuration);
-	}, [
-		afterOpenChange,
-		mergedOpen,
-		shouldDestroyOnClose
-	]);
+			(_motionOptionsRef$cur = (_motionOptionsRef$cur2 = motionOptionsRef.current).afterOpenChange) === null || _motionOptionsRef$cur === void 0 || _motionOptionsRef$cur.call(_motionOptionsRef$cur2, motion.open);
+		});
+	}, [motion, mergedOpen]);
 	useEffect(() => {
 		if (!mergedOpen || keyboard === false || typeof window === "undefined") return;
 		const handleKeyDown = (event) => {
@@ -410,12 +423,14 @@ const TransformFloatingLayer = (props) => {
 		className: classNames(`${prefixCls}-root`, `${prefixCls}-mode-${mode}`, `${prefixCls}-${centered && mode === "modal" ? "center" : placement}`, getLegacyDrawerRootClasses(mode, placement), rootClassName, wrapClassName, layerClassNames === null || layerClassNames === void 0 ? void 0 : layerClassNames.root),
 		style: _objectSpread2(_objectSpread2(_objectSpread2({ zIndex: mergedZIndex }, rootScaleStyle), rootStyle), styles === null || styles === void 0 ? void 0 : styles.root)
 	}, mask ? /* @__PURE__ */ React.createElement("div", {
+		ref: maskRef,
 		className: classNames(`${prefixCls}-mask`, getLegacyDrawerClass(mode, "mask"), layerClassNames === null || layerClassNames === void 0 ? void 0 : layerClassNames.mask),
 		style: maskStyle,
 		onClick: (event) => {
 			if (event.target === event.currentTarget && maskClosable) handleClose(event);
 		}
 	}) : null, /* @__PURE__ */ React.createElement("div", {
+		ref: wrapperRef,
 		className: classNames(`${prefixCls}-content-wrapper`, getLegacyDrawerWrapperClasses(mode), className, layerClassNames === null || layerClassNames === void 0 ? void 0 : layerClassNames.wrapper),
 		style: wrapperStyle
 	}, modalRender ? modalRender(contentNode) : contentNode)) : null;

package/es/pro/compensatedPisellContainer/floatingLayer/observeTransitions.js

@@ -0,0 +1,65 @@
+//#region src/pro/compensatedPisellContainer/floatingLayer/observeTransitions.ts
+/** Observe only the shell's own transitions, never animations inside its content. */
+const observeTransitions = (elements, onSettled) => {
+	let disposed = false;
+	let frame;
+	const pendingEvents = /* @__PURE__ */ new Map();
+	const supportsAnimations = elements.every((element) => typeof element.getAnimations === "function");
+	const isMotionProperty = (property) => property === "opacity" || property === "transform";
+	const check = () => {
+		if (disposed) return;
+		if (supportsAnimations) {
+			const transitions = [];
+			elements.forEach((element) => {
+				transitions.push(...element.getAnimations().filter((animation) => isMotionProperty(animation.transitionProperty) && animation.playState !== "finished" && animation.playState !== "idle"));
+			});
+			if (transitions.length) {
+				Promise.all(transitions.map((animation) => animation.finished.catch(() => void 0))).then(check);
+				return;
+			}
+		} else if ([...pendingEvents.values()].some((properties) => properties.size)) return;
+		disposed = true;
+		removeListeners();
+		onSettled();
+	};
+	const scheduleCheck = () => {
+		if (frame !== void 0) cancelAnimationFrame(frame);
+		frame = requestAnimationFrame(check);
+	};
+	const handleTransition = (event) => {
+		const transition = event;
+		if (event.target !== event.currentTarget || !isMotionProperty(transition.propertyName)) return;
+		const element = event.currentTarget;
+		const properties = pendingEvents.get(element);
+		if (event.type === "transitionrun") properties.add(transition.propertyName);
+		else {
+			properties.delete(transition.propertyName);
+			scheduleCheck();
+		}
+	};
+	const removeListeners = () => {
+		elements.forEach((element) => {
+			element.removeEventListener("transitionrun", handleTransition);
+			element.removeEventListener("transitionend", handleTransition);
+			element.removeEventListener("transitioncancel", handleTransition);
+		});
+	};
+	elements.forEach((element) => {
+		pendingEvents.set(element, /* @__PURE__ */ new Set());
+		if (!supportsAnimations) {
+			element.addEventListener("transitionrun", handleTransition);
+			element.addEventListener("transitionend", handleTransition);
+			element.addEventListener("transitioncancel", handleTransition);
+		}
+		element.getBoundingClientRect();
+	});
+	if (supportsAnimations) Promise.resolve().then(check);
+	else frame = requestAnimationFrame(scheduleCheck);
+	return () => {
+		disposed = true;
+		if (frame !== void 0) cancelAnimationFrame(frame);
+		removeListeners();
+	};
+};
+//#endregion
+export { observeTransitions };