@emailmaker/emailmaker 1.1.85-dev.10 → 1.1.85-dev.11

package/vendor/antd/es/upload/Upload.js

@@ -4,13 +4,14 @@ import "../../../@rc-component/util/es/index.js";
 import { clsx } from "../../../clsx/dist/clsx.js";
 import _toConsumableArray from "../../../@babel/runtime/helpers/esm/toConsumableArray.js";
 import { useComponentConfig } from "../config-provider/context.js";
+import { isFunction, isPlainObject } from "../_util/is.js";
+import { useMergeSemantic } from "../_util/hooks/useMergeSemantic/index.js";
 import "../_util/warning.js";
 import localeValues from "../locale/en_US.js";
 import useLocale from "../locale/useLocale.js";
 import "../locale/index.js";
-import { useMergeSemantic } from "../_util/hooks/useMergeSemantic.js";
-import "../_util/hooks/index.js";
 import DisabledContext from "../config-provider/DisabledContext.js";
+import fallbackProp from "../_util/fallbackProp.js";
 import es_default from "../../../@rc-component/upload/es/index.js";
 import style_default from "./style/index.js";
 import { file2Obj, getFileItem, removeFileItem, updateFileList } from "./utils.js";
@@ -21,10 +22,15 @@ import { flushSync } from "../../../react-dom/index.js";
 const LIST_IGNORE = `__LIST_IGNORE_${Date.now()}__`;
 const InternalUpload = (props, ref) => {
 	const config = useComponentConfig("upload");
-	const { fileList, defaultFileList, onRemove, showUploadList = true, listType = "text", onPreview, onDownload, onChange, onDrop, previewFile, disabled: customDisabled, locale: propLocale, iconRender, isImageUrl, progress, prefixCls: customizePrefixCls, className, type = "select", children, style, itemRender, maxCount, data = {}, multiple = false, hasControlInside = true, action = "", accept = "", supportServerRender = true, rootClassName, styles, classNames } = props;
+	const { fileList, defaultFileList, onRemove, showUploadList = true, listType = "text", onPreview, onDownload, onChange, onDrop, previewFile, disabled: customDisabled, locale: propLocale, iconRender, isImageUrl, progress: customProgress, prefixCls: customizePrefixCls, className, type = "select", children, style, itemRender, maxCount, data = {}, multiple = false, hasControlInside = true, action = "", accept: customAccept, supportServerRender = true, rootClassName, styles, classNames } = props;
 	const disabled = React$1.useContext(DisabledContext);
 	const mergedDisabled = customDisabled ?? disabled;
 	const customRequest = props.customRequest || config.customRequest;
+	const mergedProgress = {
+		...config.progress,
+		...customProgress
+	};
+	const mergedAccept = fallbackProp(customAccept, config.accept, "");
 	const [internalFileList, setMergedFileList] = useControlledState(defaultFileList, fileList);
 	const mergedFileList = internalFileList || [];
 	const [dragState, setDragState] = React$1.useState("drop");
@@ -70,7 +76,7 @@ const InternalUpload = (props, ref) => {
 				});
 				return false;
 			}
-			if (typeof result === "object" && result) parsedFile = result;
+			if (isPlainObject(result)) parsedFile = result;
 		}
 		return parsedFile;
 	};
@@ -133,7 +139,7 @@ const InternalUpload = (props, ref) => {
 	};
 	const handleRemove = (file) => {
 		let currentFile;
-		Promise.resolve(typeof onRemove === "function" ? onRemove(file) : onRemove).then((ret) => {
+		Promise.resolve(isFunction(onRemove) ? onRemove(file) : onRemove).then((ret) => {
 			if (ret === false) return;
 			const removedFileList = removeFileItem(file, mergedFileList);
 			if (removedFileList) {
@@ -186,7 +192,7 @@ const InternalUpload = (props, ref) => {
 		data,
 		multiple,
 		action,
-		accept,
+		accept: mergedAccept,
 		supportServerRender,
 		prefixCls,
 		disabled: mergedDisabled,
@@ -227,7 +233,7 @@ const InternalUpload = (props, ref) => {
 				...propLocale
 			},
 			isImageUrl,
-			progress,
+			progress: mergedProgress,
 			appendAction: button,
 			appendActionVisible: buttonVisible,
 			itemRender,

package/vendor/antd/es/upload/UploadList/ListItem.js

@@ -2,6 +2,7 @@
 import { clsx } from "../../../../clsx/dist/clsx.js";
 import { ConfigContext } from "../../config-provider/context.js";
 import es_default from "../../../../@rc-component/motion/es/index.js";
+import { isFunction } from "../../_util/is.js";
 import "../../config-provider/index.js";
 import Tooltip from "../../tooltip/index.js";
 import RefIcon from "../../../../@ant-design/icons/es/icons/EyeOutlined.js";
@@ -50,13 +51,13 @@ const ListItem = /*#__PURE__*/ React$1.forwardRef(({ prefixCls, className, style
 	}
 	const listItemClassName = clsx(`${prefixCls}-list-item`, `${prefixCls}-list-item-${mergedStatus}`, itemClassNames?.item);
 	const linkProps = typeof file.linkProps === "string" ? JSON.parse(file.linkProps) : file.linkProps;
-	const removeIcon = (typeof showRemoveIcon === "function" ? showRemoveIcon(file) : showRemoveIcon) ? actionIconRender((typeof customRemoveIcon === "function" ? customRemoveIcon(file) : customRemoveIcon) || /*#__PURE__*/ React$1.createElement(RefIcon$1, null), () => onClose(file), prefixCls, locale.removeFile, true) : null;
-	const downloadIcon = (typeof showDownloadIcon === "function" ? showDownloadIcon(file) : showDownloadIcon) && mergedStatus === "done" ? actionIconRender((typeof customDownloadIcon === "function" ? customDownloadIcon(file) : customDownloadIcon) || /*#__PURE__*/ React$1.createElement(RefIcon$2, null), () => onDownload(file), prefixCls, locale.downloadFile) : null;
+	const removeIcon = (isFunction(showRemoveIcon) ? showRemoveIcon(file) : showRemoveIcon) ? actionIconRender((isFunction(customRemoveIcon) ? customRemoveIcon(file) : customRemoveIcon) || /*#__PURE__*/ React$1.createElement(RefIcon$1, null), () => onClose(file), prefixCls, locale.removeFile, true) : null;
+	const downloadIcon = (isFunction(showDownloadIcon) ? showDownloadIcon(file) : showDownloadIcon) && mergedStatus === "done" ? actionIconRender((isFunction(customDownloadIcon) ? customDownloadIcon(file) : customDownloadIcon) || /*#__PURE__*/ React$1.createElement(RefIcon$2, null), () => onDownload(file), prefixCls, locale.downloadFile) : null;
 	const downloadOrDelete = listType !== "picture-card" && listType !== "picture-circle" && /*#__PURE__*/ React$1.createElement("span", {
 		key: "download-delete",
 		className: clsx(`${prefixCls}-list-item-actions`, { picture: listType === "picture" })
 	}, downloadIcon, removeIcon);
-	const extraContent = typeof customExtra === "function" ? customExtra(file) : customExtra;
+	const extraContent = isFunction(customExtra) ? customExtra(file) : customExtra;
 	const extra = extraContent && /*#__PURE__*/ React$1.createElement("span", { className: `${prefixCls}-list-item-extra` }, extraContent);
 	const listItemNameClass = clsx(`${prefixCls}-list-item-name`);
 	const fileName = file.url ? /*#__PURE__*/ React$1.createElement("a", {
@@ -74,13 +75,13 @@ const ListItem = /*#__PURE__*/ React$1.forwardRef(({ prefixCls, className, style
 		onClick: (e) => onPreview(file, e),
 		title: file.name
 	}, file.name, extra);
-	const previewIcon = (typeof showPreviewIcon === "function" ? showPreviewIcon(file) : showPreviewIcon) && (file.url || file.thumbUrl) ? /*#__PURE__*/ React$1.createElement("a", {
+	const previewIcon = (isFunction(showPreviewIcon) ? showPreviewIcon(file) : showPreviewIcon) && (file.url || file.thumbUrl) ? /*#__PURE__*/ React$1.createElement("a", {
 		href: file.url || file.thumbUrl,
 		target: "_blank",
 		rel: "noopener noreferrer",
 		onClick: (e) => onPreview(file, e),
 		title: locale.previewFile
-	}, typeof customPreviewIcon === "function" ? customPreviewIcon(file) : customPreviewIcon || /*#__PURE__*/ React$1.createElement(RefIcon, null)) : null;
+	}, isFunction(customPreviewIcon) ? customPreviewIcon(file) : customPreviewIcon || /*#__PURE__*/ React$1.createElement(RefIcon, null)) : null;
 	const pictureCardActions = (listType === "picture-card" || listType === "picture-circle") && mergedStatus !== "uploading" && /*#__PURE__*/ React$1.createElement("span", { className: `${prefixCls}-list-item-actions` }, previewIcon, mergedStatus === "done" && downloadIcon, removeIcon);
 	const { getPrefixCls } = React$1.useContext(ConfigContext);
 	const rootPrefixCls = getPrefixCls();

package/vendor/antd/es/upload/UploadList/index.js

@@ -6,11 +6,12 @@ import _toConsumableArray from "../../../../@babel/runtime/helpers/esm/toConsuma
 import { ConfigContext } from "../../config-provider/context.js";
 import CSSMotionList_default from "../../../../@rc-component/motion/es/CSSMotionList.js";
 import es_default from "../../../../@rc-component/motion/es/index.js";
-import { useForceUpdate } from "../../_util/hooks/useForceUpdate.js";
-import "../../_util/hooks/index.js";
+import { isFunction } from "../../_util/is.js";
 import { cloneElement as cloneElement$1 } from "../../_util/reactNode.js";
 import "../../config-provider/index.js";
 import RefIcon from "../../../../@ant-design/icons/es/icons/LoadingOutlined.js";
+import { useForceUpdate } from "../../_util/hooks/useForceUpdate.js";
+import "../../_util/hooks/index.js";
 import initCollapseMotion from "../../_util/motion.js";
 import Button from "../../button/Button.js";
 import RefIcon$1 from "../../../../@ant-design/icons/es/icons/FileTwoTone.js";
@@ -52,7 +53,7 @@ const InternalUploadList = (props, ref) => {
 		return onPreview(file);
 	};
 	const onInternalDownload = (file) => {
-		if (typeof onDownload === "function") onDownload(file);
+		if (isFunction(onDownload)) onDownload(file);
 		else if (file.url) window.open(file.url);
 	};
 	const onInternalClose = (file) => {

package/vendor/antd/es/upload/utils.js

@@ -37,11 +37,28 @@ const extname = (url = "") => {
 	return (/\.[^./\\]*$/.exec(filenameWithoutSuffix) || [""])[0];
 };
 const isImageFileType = (type) => type.indexOf("image/") === 0;
+const imageExtensions = [
+	".avif",
+	".bmp",
+	".dpg",
+	".gif",
+	".heic",
+	".heif",
+	".ico",
+	".jfif",
+	".jpg",
+	".jpeg",
+	".png",
+	".svg",
+	".tif",
+	".tiff",
+	".webp"
+];
 const isImageUrl = (file) => {
 	if (file.type && !file.thumbUrl) return isImageFileType(file.type);
 	const url = file.thumbUrl || file.url || "";
 	const extension = extname(url);
-	if (/^data:image\//.test(url) || /(webp|svg|png|gif|jpg|jpeg|jfif|bmp|dpg|ico|heic|heif)$/i.test(extension)) return true;
+	if (/^data:image\//.test(url) || imageExtensions.includes(extension?.toLowerCase() || "")) return true;
 	if (/^data:/.test(url)) return false;
 	if (extension) return false;
 	return true;

package/vendor/antd/es/version/version.js

@@ -1,4 +1,4 @@
 //#region node_modules/antd/es/version/version.js
-var version_default = "6.3.5";
+var version_default = "6.4.3";
 //#endregion
 export { version_default as default };

package/vendor/antd/es/watermark/index.js

@@ -26,12 +26,13 @@ function getSizeDiff(prev, next) {
 }
 const DEFAULT_GAP_X = 100;
 const DEFAULT_GAP_Y = 100;
+const WATERMARK_Z_INDEX_OFFSET = 1;
 const fixedStyle = {
 	position: "relative",
 	overflow: "hidden"
 };
 const Watermark = (props) => {
-	const { zIndex = 9, rotate = -22, width, height, image, content, font = {}, style, className, rootClassName, gap = [DEFAULT_GAP_X, DEFAULT_GAP_Y], offset, children, inherit = true, onRemove } = props;
+	const { zIndex, rotate = -22, width, height, image, content, font = {}, style, className, rootClassName, gap = [DEFAULT_GAP_X, DEFAULT_GAP_Y], offset, children, inherit = true, onRemove } = props;
 	const { className: contextClassName, style: contextStyle } = useComponentConfig("watermark");
 	const mergedStyle = {
 		...fixedStyle,
@@ -39,6 +40,7 @@ const Watermark = (props) => {
 		...style
 	};
 	const [, token] = useToken();
+	const mergedZIndex = zIndex ?? token.zIndexPopupBase - WATERMARK_Z_INDEX_OFFSET;
 	const { color = token.colorFill, fontSize = token.fontSizeLG, fontWeight = "normal", fontStyle = "normal", fontFamily = "sans-serif", textAlign = "center" } = font;
 	const [gapX = DEFAULT_GAP_X, gapY = DEFAULT_GAP_Y] = gap;
 	const gapXCenter = gapX / 2;
@@ -47,7 +49,7 @@ const Watermark = (props) => {
 	const offsetTop = offset?.[1] ?? gapYCenter;
 	const markStyle = React.useMemo(() => {
 		const mergedMarkStyle = {
-			zIndex,
+			zIndex: mergedZIndex,
 			position: "absolute",
 			left: 0,
 			top: 0,
@@ -72,7 +74,7 @@ const Watermark = (props) => {
 		mergedMarkStyle.backgroundPosition = `${positionLeft}px ${positionTop}px`;
 		return mergedMarkStyle;
 	}, [
-		zIndex,
+		mergedZIndex,
 		offsetLeft,
 		gapXCenter,
 		offsetTop,
@@ -170,7 +172,7 @@ const Watermark = (props) => {
 	useMutateObserver(targetElements, onMutate);
 	useEffect(syncWatermark, [
 		rotate,
-		zIndex,
+		mergedZIndex,
 		width,
 		height,
 		image,

package/vendor/antd/es/watermark/useSingletonCache.js

@@ -1,4 +1,5 @@
 import isEqual from "../../../@rc-component/util/es/isEqual.js";
+import "../../../@rc-component/util/es/index.js";
 import * as React$1 from "../../../react/index.js";
 //#region node_modules/antd/es/watermark/useSingletonCache.js
 /**

package/vendor/antd/es/watermark/useWatermark.js

@@ -2,9 +2,9 @@ import useEvent from "../../../@rc-component/util/es/hooks/useEvent.js";
 import "../../../@rc-component/util/es/index.js";
 import { getStyleStr } from "./utils.js";
 import * as React$1 from "../../../react/index.js";
-const emphasizedStyle = { visibility: "visible !important" };
 const noop = () => {};
-function useWatermark(markStyle, onRemove) {
+const emphasizedStyle = { visibility: "visible !important" };
+const useWatermark = (markStyle, onRemove) => {
 	const watermarkMapRef = React$1.useRef(/* @__PURE__ */ new Map());
 	const onRemoveEvent = useEvent(onRemove ?? noop);
 	const appendWatermark = (base64Url, markWidth, container) => {
@@ -41,6 +41,6 @@ function useWatermark(markStyle, onRemove) {
 		removeWatermark,
 		isWatermarkEle
 	];
-}
+};
 //#endregion
 export { useWatermark as default };

package/vendor/antd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "6.3.5",
+  "version": "6.4.3",
   "license": "MIT",
   "type": "module",
   "sideEffects": [