antdv-next 1.5.4 → 1.5.6

package/dist/message/index.js

@@ -5,7 +5,7 @@ import PurePanel from "./PurePanel.js";
 import PureList from "./PureList.js";
 import { wrapPromiseFn } from "./util.js";
 import useMessage, { useInternalMessage } from "./useMessage.js";
-import { createVNode, defineComponent, getCurrentInstance, isVNode, onMounted, render, shallowRef, watch } from "vue";
+import { computed, createVNode, defineComponent, getCurrentInstance, isVNode, onMounted, render, shallowRef, watch } from "vue";
 //#region src/message/index.tsx
 function _isSlot(s) {
 	return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
@@ -15,7 +15,7 @@ let taskQueue = [];
 let defaultGlobalConfig = {};
 let act = (callback) => callback();
 function getGlobalContext() {
-	const { getContainer, duration, rtl, maxCount, top, pauseOnHover } = defaultGlobalConfig;
+	const { getContainer, duration, rtl, maxCount, top, pauseOnHover, stack, classes, styles } = defaultGlobalConfig;
 	const mergedContainer = getContainer?.() || document.body;
 	let appContext = defaultGlobalConfig.appContext;
 	const instance = getCurrentInstance();
@@ -28,19 +28,21 @@ function getGlobalContext() {
 		maxCount,
 		top,
 		pauseOnHover,
+		stack,
+		classes,
+		styles,
 		appContext
 	};
 }
 const GlobalHolder = /* @__PURE__ */ defineComponent((props, { expose }) => {
-	const { messageConfig, sync } = props;
+	const { sync } = props;
 	const { getPrefixCls } = useBaseConfig();
-	const prefixCls = defaultGlobalConfig.prefixCls || getPrefixCls("message");
 	const appConfig = useAppConfig();
-	const [api, holder] = useInternalMessage({
-		...messageConfig,
-		prefixCls,
+	const [api, holder] = useInternalMessage(computed(() => ({
+		...props.messageConfig,
+		prefixCls: defaultGlobalConfig.prefixCls || getPrefixCls("message"),
 		...appConfig.message || {}
-	});
+	})));
 	onMounted(() => {
 		sync?.();
 	});
@@ -60,7 +62,10 @@ const GlobalHolder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 		return holder;
 	};
 }, { props: {
-	messageConfig: { required: true },
+	messageConfig: {
+		type: Object,
+		required: true
+	},
 	sync: {
 		type: Function,
 		required: true

package/dist/message/interface.d.ts

@@ -32,6 +32,14 @@ interface ConfigOptions {
   transitionName?: string;
   maxCount?: number;
   rtl?: boolean;
+  /**
+   * @descCN 堆叠模式，超过阈值时会将所有消息收起
+   * @descEN Stack mode. Messages are collapsed when the threshold is exceeded.
+   * @since 1.5.5
+   */
+  stack?: boolean | {
+    threshold?: number;
+  };
   /**
    * @descCN 悬停时是否暂停计时器
    * @descEN keep the timer running or not on hover

package/dist/message/useMessage.d.ts

@@ -5,6 +5,6 @@ type HolderProps = ConfigOptions & {
   onAllRemoved?: VoidFunction;
 };
 declare function useInternalMessage(messageConfig?: MaybeRef<HolderProps>): readonly [MessageInstance, () => import("vue/jsx-runtime").JSX.Element];
-declare function useMessage(messageConfig?: ConfigOptions): readonly [MessageInstance, () => import("vue/jsx-runtime").JSX.Element];
+declare function useMessage(messageConfig?: MaybeRef<ConfigOptions>): readonly [MessageInstance, () => import("vue/jsx-runtime").JSX.Element];
 //#endregion
 export { useMessage as default, useInternalMessage };

package/dist/message/useMessage.js

@@ -1,6 +1,6 @@
 import { devUseWarning } from "../_util/warning.js";
 import { useBaseConfig, useComponentBaseConfig } from "../config-provider/context.js";
-import { mergeClassNames, mergeStyles, resolveStyleOrClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { resolveStyleOrClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { toPropsRefs } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
 import style_default from "./style/index.js";
@@ -16,6 +16,7 @@ function _isSlot(s) {
 }
 const DEFAULT_OFFSET = 8;
 const DEFAULT_DURATION = 3;
+const DEFAULT_STACK_CONFIG = false;
 const Wrapper = /* @__PURE__ */ defineComponent((props, { slots }) => {
 	const prefixCls = computed(() => props.prefixCls);
 	const rootCls = useCSSVarCls(prefixCls);
@@ -46,10 +47,14 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 	});
 	const mergedDuration = computed(() => props.duration ?? DEFAULT_DURATION);
 	const mergedPauseOnHover = computed(() => props.pauseOnHover === void 0 ? true : props.pauseOnHover);
+	const mergedStack = computed(() => props.stack ?? DEFAULT_STACK_CONFIG);
 	const getStyle = () => getPlacementOffsetStyle(mergedTop.value);
 	const getClassName = () => clsx({ [`${prefixCls.value}-rtl`]: props.rtl ?? direction.value === "rtl" });
 	const getNotificationMotion = () => getMotion(prefixCls.value, props.transitionName);
-	const [api, holder] = useNotification({
+	const mergedProps = computed(() => props);
+	const contextStyleRoot = useSemanticRootStyle(contextStyle);
+	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClasses, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(mergedProps));
+	const [api, holder] = useNotification(computed(() => ({
 		prefixCls: prefixCls.value,
 		style: getStyle,
 		className: getClassName,
@@ -60,20 +65,15 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 		maxCount: props.maxCount,
 		onAllRemoved: props.onAllRemoved,
 		renderNotifications,
-		pauseOnHover: mergedPauseOnHover.value
-	});
-	const mergedProps = computed(() => props);
-	const contextStyleRoot = useSemanticRootStyle(contextStyle);
-	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClasses, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(mergedProps));
+		pauseOnHover: mergedPauseOnHover.value,
+		stack: mergedStack.value,
+		classNames: mergedClassNames.value,
+		styles: mergedStyles.value
+	})));
 	expose({
 		...api,
 		prefixCls,
-		contextClassName,
-		contextStyle,
-		contextClasses,
-		contextStyles,
-		classNames: mergedClassNames,
-		styles: mergedStyles
+		contextClassName
 	});
 	return () => holder?.();
 }, {
@@ -107,6 +107,11 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 			required: false,
 			default: void 0
 		},
+		stack: {
+			type: [Boolean, Object],
+			required: false,
+			default: void 0
+		},
 		pauseOnHover: {
 			type: Boolean,
 			required: false,
@@ -144,7 +149,7 @@ function useInternalMessage(messageConfig) {
 				fakeResult.then = () => {};
 				return fakeResult;
 			}
-			const { open: originOpen, prefixCls, contextClassName, contextClasses, contextStyles, classNames: originClassNames, styles: originStyles } = holderRef.value;
+			const { open: originOpen, prefixCls, contextClassName } = holderRef.value;
 			const noticePrefixCls = `${prefixCls}-notice`;
 			const { content, icon, type, key, class: className, style, onClose, classes: configClassNames = {}, styles = {}, ...restConfig } = config;
 			let mergedKey = key;
@@ -153,15 +158,11 @@ function useInternalMessage(messageConfig) {
 				mergedKey = `antd-message-${keyIndex}`;
 			}
 			const contextConfig = {
-				...messageConfig,
+				...unref(messageConfig),
 				...config
 			};
-			const resolvedContextClassNames = resolveStyleOrClass(contextClasses, { props: contextConfig });
 			const semanticClassNames = resolveStyleOrClass(configClassNames, { props: contextConfig });
-			const resolvedContextStyles = resolveStyleOrClass(contextStyles, { props: contextConfig });
 			const semanticStyles = resolveStyleOrClass(styles, { props: contextConfig });
-			const mergedClassNames = mergeClassNames(void 0, resolvedContextClassNames, semanticClassNames, originClassNames);
-			const mergedStyles = mergeStyles(resolvedContextStyles, semanticStyles, originStyles);
 			const iconNode = resolveMessageIcon(prefixCls, icon, type);
 			const typeIconCls = type ? `${noticePrefixCls}-icon-${type}` : void 0;
 			return wrapPromiseFn((resolve) => {
@@ -172,20 +173,13 @@ function useInternalMessage(messageConfig) {
 					icon: iconNode,
 					title: content,
 					classNames: {
-						wrapper: clsx(type && `${prefixCls}-${type}`, mergedClassNames.wrapper),
-						icon: clsx(typeIconCls, mergedClassNames.icon),
-						title: mergedClassNames.title
-					},
-					styles: {
-						wrapper: mergedStyles.wrapper,
-						icon: mergedStyles.icon,
-						title: mergedStyles.title
-					},
-					class: clsx({ [`${noticePrefixCls}-${type}`]: !!type }, className, contextClassName, mergedClassNames.root),
-					style: {
-						...mergedStyles.root,
-						...style
+						...semanticClassNames,
+						wrapper: clsx(type && `${prefixCls}-${type}`, semanticClassNames?.wrapper),
+						icon: clsx(typeIconCls, semanticClassNames?.icon)
 					},
+					styles: semanticStyles,
+					class: clsx({ [`${noticePrefixCls}-${type}`]: !!type }, className, contextClassName),
+					style,
 					onClose: () => {
 						onClose?.();
 						resolve();

package/dist/modal/ConfirmDialog.js

@@ -22,7 +22,7 @@ const CONFIRM_OMIT_SEMANTIC_NAMES = ["body"];
 const ConfirmContent = /* @__PURE__ */ defineComponent((props) => {
 	if (isDev) {
 		const { icon } = props;
-		devUseWarning("Modal")(!(typeof icon === "string" && icon?.length > 2), "breaking", `\`icon\` is using VueNode instead of string naming in v4. Please check \`${icon}\` at https://ant.design/components/icon`);
+		devUseWarning("Modal")(!(typeof icon === "string" && icon?.length > 2), "breaking", `\`icon\` is using VueNode instead of string naming. Please check \`${icon}\` at https://ant.design/components/icon`);
 	}
 	const mergedType = computed(() => {
 		const { type } = props;

package/dist/modal/Modal.js

@@ -2,6 +2,7 @@ import { devUseWarning, isDev } from "../_util/warning.js";
 import { useBaseConfig, useComponentBaseConfig } from "../config-provider/context.js";
 import { ContextIsolator } from "../_util/ContextIsolator.js";
 import { useMergedMask } from "../_util/hooks/useMergedMask.js";
+import { normalizeStyle as normalizeStyle$1 } from "../_util/styleUtils.js";
 import { getAttrStyleAndClass, useMergeSemantic, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { ZIndexProvider } from "../_util/zindexContext.js";
 import { useZIndex } from "../_util/hooks/useZIndex.js";
@@ -231,9 +232,9 @@ const Modal = /* @__PURE__ */ defineComponent((props, { slots, attrs, emit }) =>
 			"scrollLock": props.scrollLock,
 			"className": mergedClassName,
 			"style": {
-				...contextStyle.value,
+				...normalizeStyle$1(contextStyle.value) || {},
 				...responsiveWidthVars.value,
-				...attrStyle
+				...normalizeStyle$1(attrStyle) || {}
 			},
 			"classNames": {
 				...dialogClassNames,

package/dist/modal/PurePanel.js

@@ -1,5 +1,5 @@
 import { useComponentBaseConfig } from "../config-provider/context.js";
-import { getAttrStyleAndClass as getAttrStyleAndClass$1, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getAttrStyleAndClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { getSlotPropsFnRun } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
 import { Footer, renderCloseIcon } from "./shared.js";
@@ -20,7 +20,7 @@ var PurePanel_default = withPureRenderTheme(/* @__PURE__ */ defineComponent((pro
 	const [hashId, cssVarCls] = style_default(prefixCls, rootCls);
 	const confirmPrefixCls = computed(() => `${prefixCls.value}-confirm`);
 	return () => {
-		const { className: attrClassName, restAttrs, style: attrStyle } = getAttrStyleAndClass$1(attrs);
+		const { className: attrClassName, restAttrs, style: attrStyle } = getAttrStyleAndClass(attrs);
 		const { type, closable, closeIcon } = props;
 		const footer = getSlotPropsFnRun(slots, props, "footer", false);
 		const title = getSlotPropsFnRun(slots, props, "title", false);

package/dist/modal/interface.d.ts

@@ -84,9 +84,6 @@ interface ModalProps extends ModalCommonProps {
   cancelButtonProps?: ButtonProps;
   /** @deprecated Please use `destroyOnHidden` instead */
   destroyOnClose?: boolean;
-  /**
-   * @since 5.25.0
-   */
   destroyOnHidden?: boolean;
   wrapClassName?: string;
   maskTransitionName?: string;
@@ -114,9 +111,6 @@ interface ModalProps extends ModalCommonProps {
   modalRender?: (node: any) => any;
   focusTriggerAfterClose?: boolean;
   mousePosition?: MousePosition;
-  /**
-   * @since 5.18.0
-   */
   loading?: boolean;
   focusable?: FocusableConfig;
 }

package/dist/modal/shared.js

@@ -1,5 +1,6 @@
 import { getSlotPropsFnRun } from "../_util/tools.js";
 import { DisabledContextProvider } from "../config-provider/DisabledContext.js";
+import { isRenderable } from "../_util/is.js";
 import useLocale from "../locale/useLocale.js";
 import { useModalProvider } from "./context.js";
 import { getConfirmLocale } from "./locale.js";
@@ -13,7 +14,7 @@ function _isSlot(s) {
 }
 function renderCloseIcon(prefixCls, closeIcon) {
 	closeIcon = getSlotPropsFnRun({}, { closeIcon }, "closeIcon");
-	return createVNode("span", { "class": `${prefixCls}-close-x` }, [closeIcon || createVNode(CloseOutlined, { "class": `${prefixCls}-close-icon` }, null)]);
+	return createVNode("span", { "class": `${prefixCls}-close-x` }, [isRenderable(closeIcon) ? closeIcon : createVNode(CloseOutlined, { "class": `${prefixCls}-close-icon` }, null)]);
 }
 const Footer = /* @__PURE__ */ defineComponent((props) => {
 	const [locale] = useLocale("Modal", getConfirmLocale());

package/dist/notification/PurePanel.d.ts

@@ -19,7 +19,7 @@ interface PureContentProps {
 }
 declare const TypeIcon: Record<IconType, any>;
 declare function resolveIconNode(icon: VueNode | undefined, type: IconType | undefined): VueNode;
-declare function getIconWrapperClassName(prefixCls: string, type: IconType | undefined): string;
+declare function getIconWrapperClassName(prefixCls: string, type: IconType | undefined, icon?: VueNode): string;
 declare const PureContent: import("vue").DefineSetupFnComponent<PureContentProps, {}, {}, PureContentProps & {}, import("vue").PublicProps>;
 interface PurePanelProps extends Omit<PureContentProps, 'prefixCls' | 'children' | 'classes' | 'styles'> {
   content?: VueNode;

package/dist/notification/PurePanel.js

@@ -1,9 +1,10 @@
 import { useBaseConfig, useComponentBaseConfig } from "../config-provider/context.js";
+import { normalizeStyle as normalizeStyle$1 } from "../_util/styleUtils.js";
 import { pureAttrs, useMergeSemantic, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { getSlotPropsFnRun, toPropsRefs } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
+import { isRenderable } from "../_util/is.js";
 import style_default, { PurePanelStyle } from "./style/index.js";
-import isNonNullable from "../_util/isNonNullable.js";
 import useClosable, { pickClosable } from "../_util/hooks/useClosable.js";
 import { computed, createVNode, defineComponent, mergeDefaults, mergeProps } from "vue";
 import { clsx } from "@v-c/util";
@@ -13,7 +14,7 @@ import { Notification } from "@v-c/notification";
 //#region src/notification/PurePanel.tsx
 function getCloseIcon(prefixCls, closeIcon) {
 	if (closeIcon === null || closeIcon === false) return null;
-	return closeIcon || createVNode(CloseOutlined, { "class": `${prefixCls}-close-icon` }, null);
+	return isRenderable(closeIcon) ? closeIcon : createVNode(CloseOutlined, { "class": `${prefixCls}-close-icon` }, null);
 }
 const TypeIcon = {
 	success: CheckCircleFilled,
@@ -23,18 +24,18 @@ const TypeIcon = {
 };
 const typeToIcon = TypeIcon;
 function resolveIconNode(icon, type) {
-	if (icon) return icon;
+	if (isRenderable(icon)) return icon;
 	if (type && typeToIcon[type]) return createVNode(typeToIcon[type]);
 	return null;
 }
-function getIconWrapperClassName(prefixCls, type) {
-	return type ? `${prefixCls}-icon-${type}` : "";
+function getIconWrapperClassName(prefixCls, type, icon) {
+	return !isRenderable(icon) && type ? `${prefixCls}-icon-${type}` : "";
 }
 const PureContent = /* @__PURE__ */ defineComponent((props) => {
 	return () => {
 		const { prefixCls, icon, type, title, description, actions, role = "alert", styles, classes: pureContentCls } = props;
 		let iconNode;
-		if (icon) iconNode = createVNode("span", {
+		if (isRenderable(icon)) iconNode = createVNode("span", {
 			"class": clsx(`${prefixCls}-icon`, pureContentCls.icon),
 			"style": styles.icon
 		}, [icon]);
@@ -43,7 +44,7 @@ const PureContent = /* @__PURE__ */ defineComponent((props) => {
 			style: styles.icon
 		});
 		else iconNode = null;
-		const hasTitle = isNonNullable(title) && title !== false && title !== "";
+		const hasTitle = isRenderable(title);
 		return createVNode("div", {
 			"class": clsx({ [`${prefixCls}-with-icon`]: iconNode }),
 			"role": role
@@ -192,14 +193,15 @@ const PurePanel = /* @__PURE__ */ defineComponent((props, { attrs, slots }) => {
 		const slotIcon = getSlotPropsFnRun(slots, props, "icon");
 		const mergedNcs = mergedClassNames.value;
 		const mergedNss = mergedStyles.value;
-		const iconNode = resolveIconNode(slotIcon ?? props.icon, props.type);
-		const iconWrapperClass = clsx(getIconWrapperClassName(noticePrefixCls, props.type), mergedNcs?.icon);
+		const mergedIcon = slotIcon ?? props.icon;
+		const iconNode = resolveIconNode(mergedIcon, props.type);
+		const iconWrapperClass = clsx(getIconWrapperClassName(noticePrefixCls, props.type, mergedIcon), mergedNcs?.icon);
 		return createVNode("div", {
 			"class": clsx(`${noticePrefixCls}-pure-panel`, hashId.value, notificationClassName, cssVarCls.value, rootCls.value, mergedClassNames.value?.root),
 			"style": mergedStyles.value.root
 		}, [createVNode(PurePanelStyle, { "prefixCls": prefixCls.value }, null), createVNode(Notification, mergeProps({ "style": {
 			...contextStyle.value,
-			...style
+			...normalizeStyle$1(style) || {}
 		} }, pureAttrs(attrs), restProps, {
 			"prefixCls": prefixCls.value,
 			"duration": null,

package/dist/notification/index.js

@@ -60,7 +60,10 @@ const GlobalHolder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 		return holder;
 	};
 }, { props: {
-	notificationConfig: { required: true },
+	notificationConfig: {
+		type: Object,
+		required: true
+	},
 	sync: {
 		type: Function,
 		required: true

package/dist/notification/interface.d.ts

@@ -13,6 +13,8 @@ type NotificationPlacement = (typeof NotificationPlacements)[number];
 type IconType = 'success' | 'info' | 'error' | 'warning';
 type NotificationSemanticName = keyof NotificationSemanticClassNames & keyof NotificationSemanticStyles;
 interface NotificationSemanticClassNames {
+  list?: string;
+  listContent?: string;
   root?: string;
   title?: string;
   description?: string;
@@ -20,6 +22,8 @@ interface NotificationSemanticClassNames {
   icon?: string;
 }
 interface NotificationSemanticStyles {
+  list?: CSSProperties;
+  listContent?: CSSProperties;
   root?: CSSProperties;
   title?: CSSProperties;
   description?: CSSProperties;

package/dist/notification/useNotification.js

@@ -1,7 +1,7 @@
 import { devUseWarning } from "../_util/warning.js";
 import { useBaseConfig, useComponentBaseConfig } from "../config-provider/context.js";
 import useToken from "../theme/useToken.js";
-import { mergeClassNames, mergeStyles, resolveStyleOrClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { resolveStyleOrClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { toPropsRefs } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
 import { isRenderable } from "../_util/is.js";
@@ -56,6 +56,9 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 	};
 	const getClassName = () => clsx({ [`${prefixCls.value}-rtl`]: props.rtl ?? direction.value === "rtl" });
 	const getNotificationMotion = () => getMotion(prefixCls.value);
+	const mergedProps = computed(() => props);
+	const contextStyleRoot = useSemanticRootStyle(contextStyle);
+	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(mergedProps));
 	const [api, holder] = useNotification$1(computed(() => ({
 		prefixCls: prefixCls.value,
 		style: getStyle,
@@ -73,17 +76,14 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 			threshold: typeof props.stack === "object" ? props.stack.threshold : void 0,
 			offset: 8,
 			gap: token.value?.margin
-		}
+		},
+		classNames: mergedClassNames.value,
+		styles: mergedStyles.value
 	})));
-	const mergedProps = computed(() => props);
-	const contextStyleRoot = useSemanticRootStyle(contextStyle);
-	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(mergedProps));
 	expose({
 		...api,
 		prefixCls,
 		notification,
-		classNames: mergedClassNames,
-		styles: mergedStyles,
 		closeLabel: computed(() => contextLocale.value?.close ?? localeValues.global?.close ?? "Close")
 	});
 	return () => {
@@ -175,10 +175,10 @@ function useInternalNotification(notificationConfig) {
 	const wrapAPIFn = () => {
 		const open = (config) => {
 			if (!holderRef.value) {
-				warning(false, "usage", "You are calling notice in render which will break in React 18 concurrent mode. Please trigger in effect instead.");
+				warning(false, "usage", "You are calling notice in render which will not take effect. Please trigger in effect instead.");
 				return;
 			}
-			const { open: originOpen, prefixCls, notification, classNames: originClassNames, styles: originStyles, closeLabel } = holderRef.value;
+			const { open: originOpen, prefixCls, notification, closeLabel } = holderRef.value;
 			const contextClassName = notification?.class || {};
 			const noticePrefixCls = `${prefixCls}-notice`;
 			const { title, description, icon, type, actions, class: className, style, role = "alert", closeIcon, closable, classes: configClassNames = {}, styles = {}, ...restConfig } = config;
@@ -200,10 +200,8 @@ function useInternalNotification(notificationConfig) {
 			} : false;
 			const semanticClassNames = resolveStyleOrClass(configClassNames, { props: config });
 			const semanticStyles = resolveStyleOrClass(styles, { props: config });
-			const mergedClassNames = mergeClassNames(void 0, originClassNames, semanticClassNames);
-			const mergedStyles = mergeStyles(originStyles, semanticStyles);
 			const iconNode = resolveIconNode(icon, type);
-			const iconWrapperClass = clsx(getIconWrapperClassName(noticePrefixCls, type), mergedClassNames.icon);
+			const iconWrapperClass = clsx(getIconWrapperClassName(noticePrefixCls, type, icon), semanticClassNames?.icon);
 			return originOpen({
 				placement: unref(notificationConfig)?.placement ?? DEFAULT_PLACEMENT,
 				...restConfig,
@@ -214,19 +212,19 @@ function useInternalNotification(notificationConfig) {
 				role,
 				classNames: {
 					icon: iconWrapperClass,
-					title: mergedClassNames.title,
-					description: mergedClassNames.description,
-					actions: mergedClassNames.actions
+					title: semanticClassNames?.title,
+					description: semanticClassNames?.description,
+					actions: semanticClassNames?.actions
 				},
 				styles: {
-					icon: mergedStyles.icon,
-					title: mergedStyles.title,
-					description: mergedStyles.description,
-					actions: mergedStyles.actions
+					icon: semanticStyles?.icon,
+					title: semanticStyles?.title,
+					description: semanticStyles?.description,
+					actions: semanticStyles?.actions
 				},
-				class: clsx({ [`${noticePrefixCls}-${type}`]: type }, { [`${noticePrefixCls}-with-icon`]: !!iconNode }, className, contextClassName, mergedClassNames.root),
+				class: clsx({ [`${noticePrefixCls}-${type}`]: type }, { [`${noticePrefixCls}-with-icon`]: !!iconNode }, className, contextClassName, semanticClassNames?.root),
 				style: {
-					...mergedStyles.root,
+					...semanticStyles?.root,
 					...style
 				},
 				closable: mergedClosable

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.5.4";
+var version = "1.5.6";
 //#endregion
 export { version };

package/dist/pagination/Pagination.js

@@ -2,8 +2,8 @@ import { devUseWarning, isDev } from "../_util/warning.js";
 import { useComponentBaseConfig } from "../config-provider/context.js";
 import { useSize } from "../config-provider/hooks/useSize.js";
 import useToken from "../theme/useToken.js";
-import { useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
-import { getSlotPropsFnRun, toPropsRefs as toPropsRefs$1 } from "../_util/tools.js";
+import { getAttrStyleAndClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getSlotPropsFnRun, toPropsRefs } from "../_util/tools.js";
 import useLocale from "../locale/useLocale.js";
 import useVariant from "../form/hooks/useVariant.js";
 import Select from "../select/index.js";
@@ -13,7 +13,6 @@ import bordered_default from "./style/bordered.js";
 import resolveShowSizeChanger from "./useShowSizeChanger.js";
 import { Fragment, computed, createVNode, defineComponent, h, mergeProps } from "vue";
 import { clsx } from "@v-c/util";
-import { getAttrStyleAndClass } from "@v-c/util/dist/props-util";
 import { DoubleLeftOutlined, DoubleRightOutlined, EllipsisOutlined, LeftOutlined, RightOutlined } from "@antdv-next/icons";
 import { omit } from "es-toolkit";
 import VcPagination from "@v-c/pagination";
@@ -32,7 +31,7 @@ const omitKeys = [
 ];
 const Pagination = /* @__PURE__ */ defineComponent((props, { slots, attrs, emit }) => {
 	const { getPrefixCls, prefixCls, direction, class: contextClassName, style: contextStyle, classes: contextClassNames, styles: contextStyles, showSizeChanger: contextShowSizeChangerConfig } = useComponentBaseConfig("pagination", props, ["showSizeChanger"]);
-	const { size, responsive, classes, styles, showSizeChanger } = toPropsRefs$1(props, "size", "responsive", "classes", "styles", "showSizeChanger");
+	const { size, responsive, classes, styles, showSizeChanger } = toPropsRefs(props, "size", "responsive", "classes", "styles", "showSizeChanger");
 	const [hashId, cssVarCls] = style_default(prefixCls, prefixCls);
 	const [, token] = useToken();
 	const mergedSize = useSize(size);

package/dist/popconfirm/index.js

@@ -312,7 +312,10 @@ const Popconfirm = /* @__PURE__ */ defineComponent((props, { slots, attrs, expos
 			type: Function,
 			required: false
 		},
-		motion: { required: false },
+		motion: {
+			type: Object,
+			required: false
+		},
 		rootClass: {
 			type: String,
 			required: false

package/dist/popover/PurePanel.js

@@ -220,7 +220,10 @@ const RawPurePanel = /* @__PURE__ */ defineComponent((props, { slots, attrs }) =
 			type: Function,
 			required: false
 		},
-		motion: { required: false },
+		motion: {
+			type: Object,
+			required: false
+		},
 		rootClass: {
 			type: String,
 			required: false
@@ -373,7 +376,10 @@ const PurePanel = /* @__PURE__ */ defineComponent((props, { attrs, slots }) => {
 			type: Function,
 			required: false
 		},
-		motion: { required: false },
+		motion: {
+			type: Object,
+			required: false
+		},
 		rootClass: {
 			type: String,
 			required: false

package/dist/popover/index.js

@@ -226,7 +226,10 @@ const Popover = /* @__PURE__ */ defineComponent((props, { slots, attrs, expose,
 			type: Function,
 			required: false
 		},
-		motion: { required: false },
+		motion: {
+			type: Object,
+			required: false
+		},
 		rootClass: {
 			type: String,
 			required: false

package/dist/qrcode/QrcodeStatus.js

@@ -42,7 +42,10 @@ const QRcodeStatus = /* @__PURE__ */ defineComponent((props) => {
 		type: Function,
 		required: false
 	},
-	status: { required: true }
+	status: {
+		type: String,
+		required: true
+	}
 } });
 //#endregion
 export { QRcodeStatus as default };

package/dist/qrcode/index.js

@@ -1,6 +1,7 @@
 import { devUseWarning, isDev } from "../_util/warning.js";
 import { useComponentBaseConfig } from "../config-provider/context.js";
 import useToken from "../theme/useToken.js";
+import { normalizeStyle as normalizeStyle$1 } from "../_util/styleUtils.js";
 import { useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { toPropsRefs } from "../_util/tools.js";
 import useLocale from "../locale/useLocale.js";
@@ -74,7 +75,7 @@ const QRCode = /* @__PURE__ */ defineComponent((props, { emit, attrs, slots, exp
 		const rootStyle = {
 			backgroundColor: bgColor,
 			...mergedStyles.value?.root,
-			...style,
+			...normalizeStyle$1(style) || {},
 			width: _width,
 			height: _height
 		};

package/dist/radio/group.js

@@ -1,7 +1,7 @@
 import { useOrientation } from "../_util/hooks/useOrientation.js";
 import { useComponentBaseConfig } from "../config-provider/context.js";
 import { useSize } from "../config-provider/hooks/useSize.js";
-import { getAttrStyleAndClass as getAttrStyleAndClass$1 } from "../_util/hooks/useMergeSemantic.js";
+import { getAttrStyleAndClass } from "../_util/hooks/useMergeSemantic.js";
 import { toPropsRefs as toPropsRefs$1 } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
 import { checkRenderNode } from "../_util/vueNode.js";
@@ -54,7 +54,7 @@ const RadioGroup = /* @__PURE__ */ defineComponent((props, { slots, attrs, emit
 	return () => {
 		const { buttonStyle, block, rootClass, id, options, disabled } = props;
 		const children = checkRenderNode(filterEmpty(slots?.default?.() ?? []));
-		const { className, restAttrs, style } = getAttrStyleAndClass$1(attrs);
+		const { className, restAttrs, style } = getAttrStyleAndClass(attrs);
 		const classString = clsx(groupPrefixCls.value, `${groupPrefixCls.value}-${buttonStyle}`, {
 			[`${groupPrefixCls.value}-large`]: mergedSize.value === "large",
 			[`${groupPrefixCls.value}-small`]: mergedSize.value === "small",