antdv-next 1.5.0 → 1.5.2

package/dist/listy/style/index.js

@@ -44,7 +44,11 @@ const genListyStyle = (token) => {
 			}
 		},
 		[`${componentCls}-group-section`]: { position: "relative" },
-		[`${componentCls}-scrollbar`]: { zIndex: 1 },
+		[`${componentCls}-scrollbar`]: {
+			zIndex: 1,
+			cursor: "pointer",
+			"&:hover": { backgroundColor: token.colorFillQuaternary }
+		},
 		"&-rtl": { direction: "rtl" }
 	} };
 };

package/dist/locale/en_US.js

@@ -77,6 +77,10 @@ const localeValues = {
 		expand: "Expand",
 		collapse: "Collapse"
 	},
+	Carousel: {
+		prevSlide: "Previous slide",
+		nextSlide: "Next slide"
+	},
 	Form: {
 		optional: "(optional)",
 		defaultValidateMessages: {

package/dist/locale/index.d.ts

@@ -67,6 +67,10 @@ interface Locale {
     refresh?: string;
     scanned?: string;
   };
+  Carousel?: {
+    prevSlide: string;
+    nextSlide: string;
+  };
   ColorPicker?: {
     presetEmpty: string;
     transparent: string;

package/dist/locale/is_IS.js

@@ -104,7 +104,7 @@ const localeValues = {
 			},
 			number: {
 				len: "${label} verður að vera jafngildi ${len}",
-				min: "Lágmarksgildi ${label} er ${mín}",
+				min: "Lágmarksgildi ${label} er ${min}",
 				max: "Hámarksgildi ${label} er ${max}",
 				range: "${label} verður að vera á milli ${min}-${max}"
 			},

package/dist/locale/mn_MN.js

@@ -118,7 +118,7 @@ const localeValues = {
 			},
 			array: {
 				len: "${len} ${label} байх ёстой",
-				min: "Дор хаяж ${мин} ${label}",
+				min: "Дор хаяж ${min} ${label}",
 				max: "Хамгийн ихдээ ${max} ${label}",
 				range: "${label}-н хэмжээ ${min}-${max} хооронд байх ёстой"
 			},

package/dist/locale/sq_AL.d.ts

@@ -0,0 +1,5 @@
+import { Locale } from "./index.js";
+//#region src/locale/sq_AL.d.ts
+declare const localeValues: Locale;
+//#endregion
+export { localeValues as default };

package/dist/locale/sq_AL.js

@@ -0,0 +1,151 @@
+import locale from "../time-picker/locale/sq_AL.js";
+import locale$1 from "../date-picker/locale/sq_AL.js";
+import sq_AL_default from "../calendar/locale/sq_AL.js";
+//#region src/locale/sq_AL.ts
+const typeTemplate = "${label} nuk është një ${type} i vlefshëm";
+const localeValues = {
+	locale: "sq",
+	Pagination: {
+		items_per_page: "/ faqe",
+		jump_to: "Shko te",
+		jump_to_confirm: "konfirmo",
+		page: "Faqe",
+		prev_page: "Faqja e mëparshme",
+		next_page: "Faqja tjetër",
+		prev_5: "5 faqet e mëparshme",
+		next_5: "5 faqet e tjera",
+		prev_3: "3 faqet e mëparshme",
+		next_3: "3 faqet e tjera"
+	},
+	DatePicker: locale$1,
+	TimePicker: locale,
+	Calendar: sq_AL_default,
+	global: {
+		placeholder: "Ju lutemi zgjidhni",
+		close: "Mbyll",
+		sortable: "i renditshëm"
+	},
+	Table: {
+		filterTitle: "Menuja e filtrimit",
+		filterConfirm: "OK",
+		filterReset: "Rivendos",
+		filterEmptyText: "Pa filtra",
+		filterCheckAll: "Zgjidh të gjitha elementet",
+		filterSearchPlaceholder: "Kërko në filtra",
+		emptyText: "Nuk ka të dhëna",
+		selectAll: "Zgjidh faqen aktuale",
+		selectInvert: "Përmbys faqen aktuale",
+		selectNone: "Pastro të gjitha të dhënat",
+		selectionAll: "Zgjidh të gjitha të dhënat",
+		sortTitle: "Rendit",
+		expand: "Zgjero rreshtin",
+		collapse: "Mblidh rreshtin",
+		triggerDesc: "Kliko për renditje zbritëse",
+		triggerAsc: "Kliko për renditje ngjitëse",
+		cancelSort: "Kliko për të anuluar renditjen"
+	},
+	Tour: {
+		Next: "Tjetër",
+		Previous: "I mëparshëm",
+		Finish: "Përfundo"
+	},
+	Modal: {
+		okText: "OK",
+		cancelText: "Anulo",
+		justOkText: "OK"
+	},
+	Popconfirm: {
+		okText: "OK",
+		cancelText: "Anulo"
+	},
+	Transfer: {
+		titles: ["", ""],
+		searchPlaceholder: "Kërko këtu",
+		itemUnit: "element",
+		itemsUnit: "elemente",
+		remove: "Hiq",
+		selectCurrent: "Zgjidh faqen aktuale",
+		removeCurrent: "Hiq faqen aktuale",
+		selectAll: "Zgjidh të gjitha të dhënat",
+		deselectAll: "Çzgjidh të gjitha të dhënat",
+		removeAll: "Hiq të gjitha të dhënat",
+		selectInvert: "Përmbys faqen aktuale"
+	},
+	Upload: {
+		uploading: "Duke ngarkuar...",
+		removeFile: "Hiq skedarin",
+		uploadError: "Gabim gjatë ngarkimit",
+		previewFile: "Shiko skedarin",
+		downloadFile: "Shkarko skedarin"
+	},
+	Empty: { description: "Nuk ka të dhëna" },
+	Icon: { icon: "ikonë" },
+	Text: {
+		edit: "Ndrysho",
+		copy: "Kopjo",
+		copied: "U kopjua",
+		expand: "Zgjero",
+		collapse: "Mblidh"
+	},
+	Form: {
+		optional: "(opsionale)",
+		defaultValidateMessages: {
+			default: "Gabim në validimin e fushës ${label}",
+			required: "Ju lutemi shkruani ${label}",
+			enum: "${label} duhet të jetë një nga [${enum}]",
+			whitespace: "${label} nuk mund të jetë karakter bosh",
+			date: {
+				format: "Formati i datës për ${label} është i pavlefshëm",
+				parse: "${label} nuk mund të konvertohet në datë",
+				invalid: "${label} është datë e pavlefshme"
+			},
+			types: {
+				string: typeTemplate,
+				method: typeTemplate,
+				array: typeTemplate,
+				object: typeTemplate,
+				number: typeTemplate,
+				date: typeTemplate,
+				boolean: typeTemplate,
+				integer: typeTemplate,
+				float: typeTemplate,
+				regexp: typeTemplate,
+				email: typeTemplate,
+				url: typeTemplate,
+				hex: typeTemplate
+			},
+			string: {
+				len: "${label} duhet të ketë ${len} karaktere",
+				min: "${label} duhet të ketë të paktën ${min} karaktere",
+				max: "${label} duhet të ketë më së shumti ${max} karaktere",
+				range: "${label} duhet të ketë midis ${min}-${max} karaktere"
+			},
+			number: {
+				len: "${label} duhet të jetë e barabartë me ${len}",
+				min: "${label} duhet të jetë minimumi ${min}",
+				max: "${label} duhet të jetë maksimumi ${max}",
+				range: "${label} duhet të jetë midis ${min}-${max}"
+			},
+			array: {
+				len: "Duhet të ketë ${len} ${label}",
+				min: "Të paktën ${min} ${label}",
+				max: "Më së shumti ${max} ${label}",
+				range: "Sasia e ${label} duhet të jetë midis ${min}-${max}"
+			},
+			pattern: { mismatch: "${label} nuk përputhet me modelin ${pattern}" }
+		}
+	},
+	QRCode: {
+		expired: "Kodi QR ka skaduar",
+		refresh: "Rifresko",
+		scanned: "U skanua"
+	},
+	ColorPicker: {
+		presetEmpty: "Bosh",
+		transparent: "Transparent",
+		singleColor: "Një ngjyrë",
+		gradientColor: "Ngjyrë gradient"
+	}
+};
+//#endregion
+export { localeValues as default };

package/dist/locale/zh_CN.js

@@ -77,6 +77,10 @@ const localeValues = {
 		expand: "展开",
 		collapse: "收起"
 	},
+	Carousel: {
+		prevSlide: "上一张幻灯片",
+		nextSlide: "下一张幻灯片"
+	},
 	Form: {
 		optional: "（可选）",
 		defaultValidateMessages: {

package/dist/locale/zh_TW.js

@@ -18,21 +18,21 @@ const localeValues = {
 	Table: {
 		filterTitle: "篩選器",
 		filterConfirm: "確定",
-		filterReset: "重置",
-		filterEmptyText: "無篩選項",
+		filterReset: "重設",
+		filterEmptyText: "無篩選條件",
 		filterCheckAll: "全選",
-		filterSearchPlaceholder: "在篩選項中搜尋",
-		emptyText: "暫無數據",
-		selectAll: "全部選取",
-		selectInvert: "反向選取",
-		selectNone: "清空所有",
-		selectionAll: "全選所有",
+		filterSearchPlaceholder: "搜尋篩選條件",
+		emptyText: "暫無資料",
+		selectAll: "選取目前頁面",
+		selectInvert: "反向選取目前頁面",
+		selectNone: "清除全部資料",
+		selectionAll: "選取所有資料",
 		sortTitle: "排序",
-		expand: "展開行",
-		collapse: "關閉行",
-		triggerDesc: "點擊降序",
-		triggerAsc: "點擊升序",
-		cancelSort: "取消排序"
+		expand: "展開列",
+		collapse: "收合列",
+		triggerDesc: "點擊以遞減排序",
+		triggerAsc: "點擊以遞增排序",
+		cancelSort: "點擊以取消排序"
 	},
 	Modal: {
 		okText: "確定",
@@ -50,44 +50,44 @@ const localeValues = {
 	},
 	Transfer: {
 		titles: ["", ""],
-		searchPlaceholder: "搜尋資料",
+		searchPlaceholder: "在此搜尋",
 		itemUnit: "項目",
 		itemsUnit: "項目",
-		remove: "删除",
-		selectCurrent: "全選當頁",
-		removeCurrent: "删除當頁",
-		selectAll: "全選所有",
-		removeAll: "删除全部",
-		selectInvert: "反選當頁",
-		deselectAll: "取消全選"
+		remove: "移除",
+		selectCurrent: "選取目前頁面",
+		removeCurrent: "移除目前頁面",
+		selectAll: "選取所有資料",
+		removeAll: "移除所有資料",
+		selectInvert: "反向選取目前頁面",
+		deselectAll: "取消選取所有資料"
 	},
 	Upload: {
 		uploading: "正在上傳...",
-		removeFile: "刪除檔案",
+		removeFile: "移除檔案",
 		uploadError: "上傳失敗",
-		previewFile: "檔案預覽",
-		downloadFile: "下载文件"
+		previewFile: "預覽檔案",
+		downloadFile: "下載檔案"
 	},
-	Empty: { description: "無此資料" },
-	Icon: { icon: "圖標" },
+	Empty: { description: "暫無資料" },
+	Icon: { icon: "圖示" },
 	Text: {
 		edit: "編輯",
 		copy: "複製",
 		copied: "複製成功",
 		expand: "展開",
-		collapse: "收起"
+		collapse: "收合"
 	},
 	Form: {
-		optional: "（可選）",
+		optional: "（選填）",
 		defaultValidateMessages: {
-			default: "字段驗證錯誤${label}",
+			default: "欄位驗證錯誤：${label}",
 			required: "請輸入${label}",
-			enum: "${label}必須是其中一個[${enum}]",
-			whitespace: "${label}不能為空字符",
+			enum: "${label}必須是 [${enum}] 其中之一",
+			whitespace: "${label}不能是空白字元",
 			date: {
-				format: "${label}日期格式無效",
-				parse: "${label}不能轉換為日期",
-				invalid: "${label}是一個無效日期"
+				format: "${label}的日期格式無效",
+				parse: "${label}無法轉換為日期",
+				invalid: "${label}是無效的日期"
 			},
 			types: {
 				string: typeTemplate,
@@ -105,10 +105,10 @@ const localeValues = {
 				hex: typeTemplate
 			},
 			string: {
-				len: "${label}須為${len}個字符",
-				min: "${label}最少${min}個字符",
-				max: "${label}最多${max}個字符",
-				range: "${label}須在${min}-${max}字符之間"
+				len: "${label}須為${len}個字元",
+				min: "${label}最少需要${min}個字元",
+				max: "${label}最多可為${max}個字元",
+				range: "${label}須介於${min}-${max}個字元之間"
 			},
 			number: {
 				len: "${label}必須等於${len}",
@@ -122,12 +122,12 @@ const localeValues = {
 				max: "最多${max}個${label}",
 				range: "${label}數量須在${min}-${max}之間"
 			},
-			pattern: { mismatch: "${label}與模式不匹配${pattern}" }
+			pattern: { mismatch: "${label}與模式 ${pattern} 不相符" }
 		}
 	},
 	QRCode: {
-		expired: "二維碼過期",
-		refresh: "點擊刷新",
+		expired: "QR Code 已過期",
+		refresh: "重新整理",
 		scanned: "已掃描"
 	},
 	ColorPicker: {

package/dist/masonry/Masonry.js

@@ -1,6 +1,6 @@
 import { useComponentBaseConfig } from "../config-provider/context.js";
 import { genCssVar } from "../theme/util/genStyleUtils.js";
-import { getAttrStyleAndClass, useMergeSemantic, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getAttrStyleAndClass, useMergeSemantic, useSemanticRootStyle, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
 import { toPropsRefs } from "../_util/tools.js";
 import useCSSVarCls from "../config-provider/hooks/useCSSVarCls.js";
 import { responsiveArray } from "../_util/responsiveObserver.js";
@@ -51,7 +51,8 @@ const Masonry = /* @__PURE__ */ defineComponent((props, { expose, emit, attrs, s
 			columns: columnCount.value
 		};
 	});
-	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, styles), useToProps(mergedProps));
+	const contextStyleRoot = useSemanticRootStyle(contextStyle);
+	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(mergedProps));
 	const itemHeights = ref([]);
 	const collectItemSize = useDelay(() => {
 		const nextItemHeights = mergedItems.value.map((item, index) => {
@@ -121,8 +122,7 @@ const Masonry = /* @__PURE__ */ defineComponent((props, { expose, emit, attrs, s
 			"class": clsx(prefixCls.value, contextClassName.value, mergedClassNames.value?.root, props.rootClass, className, hashId.value, cssVarCls.value, { [`${prefixCls.value}-rtl`]: direction.value === "rtl" }),
 			"style": {
 				height: `${totalHeight.value}px`,
-				...contextStyles.value.root,
-				...contextStyle.value,
+				...mergedStyles.value.root,
 				...style
 			}
 		}), [createVNode(TransitionGroup, transitionProps, _isSlot(_slot = itemWithPositions.value.map((motionInfo) => {

package/dist/mentions/index.d.ts

@@ -78,6 +78,7 @@ interface MentionsSlots {
     option: MentionsOptionProps;
     index: number;
   }) => any;
+  popupRender?: MentionProps['popupRender'];
 }
 interface MentionsProps extends MentionProps {}
 interface MentionsRef extends MentionsRef$1 {}

package/dist/mentions/index.js

@@ -11,6 +11,7 @@ import { getMergedStatus, getStatusClassNames } from "../_util/statusUtils.js";
 import { DefaultRenderEmpty } from "../config-provider/defaultRenderEmpty.js";
 import { useFormItemInputContext } from "../form/context.js";
 import useVariant from "../form/hooks/useVariant.js";
+import usePopupRender from "../select/usePopupRender.js";
 import getAllowClear from "../_util/getAllowClear.js";
 import toList from "../_util/toList.js";
 import Spin from "../spin/index.js";
@@ -41,6 +42,7 @@ const omitKeys = [
 	"allowClear",
 	"filterOption",
 	"popupClassName",
+	"popupRender",
 	"options",
 	"notFoundContent"
 ];
@@ -170,6 +172,7 @@ const Mentions = /* @__PURE__ */ defineComponent((props, { slots, emit, expose,
 			},
 			suffix: mergedStyles.value.suffix
 		};
+		const mergedPopupRender = usePopupRender(slots?.popupRender ?? props?.popupRender);
 		const restProps = omit(props, omitKeys);
 		return createVNode(VcMentions, mergeProps({ "ref": mentionsRef }, restAttrs, restProps, {
 			"prefixCls": prefixCls.value,
@@ -178,6 +181,7 @@ const Mentions = /* @__PURE__ */ defineComponent((props, { slots, emit, expose,
 			"classNames": classNames,
 			"styles": mergedStylesValue,
 			"popupClassName": props.popupClassName,
+			"popupRender": mergedPopupRender,
 			"notFoundContent": notFoundContent.value,
 			"disabled": mergedDisabled.value,
 			"allowClear": mergedAllowClear.value,

package/dist/menu/MenuItem.js

@@ -3,7 +3,7 @@ import { getSlotPropsFnRun } from "../_util/tools.js";
 import InternalTooltip from "../tooltip/index.js";
 import { useSiderCtx } from "../layout/Sider.js";
 import { useMenuContext } from "./MenuContext.js";
-import { createVNode, defineComponent, isVNode, mergeProps } from "vue";
+import { computed, createVNode, defineComponent, isVNode, mergeProps, shallowRef, watch } from "vue";
 import { clsx } from "@v-c/util";
 import { filterEmpty, getAttrStyleAndClass } from "@v-c/util/dist/props-util";
 import { omit } from "es-toolkit/compat";
@@ -15,6 +15,11 @@ function _isSlot(s) {
 const MenuItem = /* @__PURE__ */ defineComponent((props, { slots, attrs }) => {
 	const menuContext = useMenuContext();
 	const { siderCollapsed } = useSiderCtx();
+	const mergedCollapsed = computed(() => !!(siderCollapsed?.value || menuContext.value.inlineCollapsed));
+	const tooltipOpen = shallowRef(false);
+	watch(mergedCollapsed, () => {
+		tooltipOpen.value = false;
+	});
 	return () => {
 		const extra = getSlotPropsFnRun(slots, props, "extra");
 		const icon = getSlotPropsFnRun(slots, props, "icon");
@@ -39,9 +44,14 @@ const MenuItem = /* @__PURE__ */ defineComponent((props, { slots, attrs }) => {
 		if (typeof title === "undefined") tooltipTitle = firstLevel ? children : "";
 		else if (title === false) tooltipTitle = "";
 		const tooltipProps = { title: tooltipTitle };
-		if (!siderCollapsed?.value && !isInlineCollapsed) {
+		if (!mergedCollapsed.value) {
 			tooltipProps.title = null;
 			tooltipProps.open = false;
+		} else {
+			tooltipProps.open = tooltipOpen.value;
+			tooltipProps.onOpenChange = (open) => {
+				tooltipOpen.value = open;
+			};
 		}
 		const childrenLength = children.length;
 		let returnNode = createVNode(Item, mergeProps(omit(pureAttrs(attrs), ["itemData"]), omit(props, [

package/dist/menu/SubMenu.d.ts

@@ -2,7 +2,7 @@ import { EmptyEmit, VueNode } from "../_util/type.js";
 import { SubMenuType } from "./interface.js";
 import { SlotsType } from "vue";
 //#region src/menu/SubMenu.d.ts
-interface SubMenuProps extends Omit<SubMenuType, 'key' | 'label' | 'children'> {
+interface SubMenuProps extends Omit<SubMenuType, 'key' | 'label' | 'children' | 'title'> {
   title?: VueNode;
 }
 interface SubMenuSlots {

package/dist/menu/style/vertical.js

@@ -29,7 +29,7 @@ const getVerticalInlineStyle = (token) => {
 	};
 };
 const getVerticalStyle = (token) => {
-	const { componentCls, iconCls, itemHeight, colorTextLightSolid, dropdownWidth, controlHeightLG, motionEaseOut, padding, paddingXL, itemMarginInline, fontSizeLG, motionDurationFast, motionDurationSlow, paddingXS, boxShadowSecondary, collapsedWidth, collapsedIconSize } = token;
+	const { componentCls, iconCls, itemHeight, colorTextLightSolid, dropdownWidth, controlHeightLG, padding, paddingXL, itemMarginInline, fontSizeLG, motionDurationSlow, paddingXS, boxShadowSecondary, collapsedWidth, collapsedIconSize } = token;
 	const inlineItemStyle = {
 		height: itemHeight,
 		lineHeight: unit(itemHeight),
@@ -63,11 +63,7 @@ const getVerticalStyle = (token) => {
 			[`&${componentCls}-root`]: { [`${componentCls}-item, ${componentCls}-submenu-title`]: {
 				display: "flex",
 				alignItems: "center",
-				transition: [
-					`border-color ${motionDurationSlow}`,
-					`background-color ${motionDurationSlow}`,
-					`padding ${motionDurationFast} ${motionEaseOut}`
-				].join(","),
+				transition: [`border-color ${motionDurationSlow}`, `background-color ${motionDurationSlow}`].join(","),
 				[`> ${componentCls}-title-content`]: {
 					flex: "auto",
 					minWidth: 0,

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, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { mergeClassNames, mergeStyles, 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";
@@ -63,7 +63,8 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 		pauseOnHover: mergedPauseOnHover.value
 	});
 	const mergedProps = computed(() => props);
-	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(classes, contextClasses), useToArr(styles, contextStyles), useToProps(mergedProps));
+	const contextStyleRoot = useSemanticRootStyle(contextStyle);
+	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClasses, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(mergedProps));
 	expose({
 		...api,
 		prefixCls,
@@ -143,7 +144,7 @@ function useInternalMessage(messageConfig) {
 				fakeResult.then = () => {};
 				return fakeResult;
 			}
-			const { open: originOpen, prefixCls, contextClassName, contextStyle, contextClasses, contextStyles, classNames: originClassNames, styles: originStyles } = holderRef.value;
+			const { open: originOpen, prefixCls, contextClassName, contextClasses, contextStyles, classNames: originClassNames, styles: originStyles } = holderRef.value;
 			const noticePrefixCls = `${prefixCls}-notice`;
 			const { content, icon, type, key, class: className, style, onClose, classes: configClassNames = {}, styles = {}, ...restConfig } = config;
 			let mergedKey = key;
@@ -183,7 +184,6 @@ function useInternalMessage(messageConfig) {
 					class: clsx({ [`${noticePrefixCls}-${type}`]: !!type }, className, contextClassName, mergedClassNames.root),
 					style: {
 						...mergedStyles.root,
-						...contextStyle,
 						...style
 					},
 					onClose: () => {

package/dist/modal/PurePanel.js

@@ -1,5 +1,5 @@
 import { useComponentBaseConfig } from "../config-provider/context.js";
-import { getAttrStyleAndClass as getAttrStyleAndClass$1, useMergeSemantic, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { getAttrStyleAndClass as getAttrStyleAndClass$1, 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";
@@ -14,7 +14,8 @@ var PurePanel_default = withPureRenderTheme(/* @__PURE__ */ defineComponent((pro
 	const { prefixCls, getPrefixCls, styles: contextStyles, classes: contextClassNames, class: contextClassName, style: contextStyle } = useComponentBaseConfig("modal", props, []);
 	const { classes, styles } = toPropsRefs(props, "classes", "styles");
 	const rootPrefixCls = computed(() => getPrefixCls(void 0, ""));
-	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, styles), useToProps(computed(() => props)));
+	const contextStyleRoot = useSemanticRootStyle(contextStyle);
+	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, contextStyleRoot, styles), useToProps(computed(() => props)));
 	const rootCls = useCSSVarCls(rootPrefixCls);
 	const [hashId, cssVarCls] = style_default(prefixCls, rootCls);
 	const confirmPrefixCls = computed(() => `${prefixCls.value}-confirm`);
@@ -45,11 +46,7 @@ var PurePanel_default = withPureRenderTheme(/* @__PURE__ */ defineComponent((pro
 			"prefixCls": prefixCls.value,
 			"className": clsx(hashId.value, `${prefixCls.value}-pure-panel`, type && confirmPrefixCls.value, type && `${confirmPrefixCls.value}-${type}`, attrClassName, contextClassName.value, cssVarCls.value, rootCls.value, props.rootClass, mergedClassNames.value?.root),
 			"animationVisible": true,
-			"style": [
-				contextStyle,
-				mergedStyles.value?.root,
-				attrStyle
-			]
+			"style": [mergedStyles.value?.root, attrStyle]
 		}, restAttrs, {
 			"closeIcon": renderCloseIcon(prefixCls.value, slots.closeIcon || closeIcon),
 			"closable": closable,

package/dist/notification/index.js

@@ -93,7 +93,8 @@ const GlobalHolderWrapper = /* @__PURE__ */ defineComponent((props) => {
 		const configHolderNode = createVNode(ConfigProvider, {
 			"prefixCls": global.getRootPrefixCls(),
 			"iconPrefixCls": global.getIconPrefixCls(),
-			"theme": global.theme.value
+			"theme": global.theme.value,
+			"locale": globalConfig().locale
 		}, _isSlot(holderNode) ? holderNode : { default: () => [holderNode] });
 		return global.holderRender ? global.holderRender(configHolderNode) : configHolderNode;
 	};

package/dist/notification/useNotification.js

@@ -1,11 +1,13 @@
 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, useToArr, useToProps } from "../_util/hooks/useMergeSemantic.js";
+import { mergeClassNames, mergeStyles, 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";
 import { getCloseIconConfig, getMotion, getPlacementStyle } from "./util.js";
+import localeValues from "../locale/en_US.js";
+import useLocale from "../locale/useLocale.js";
 import { computeClosable, pickClosable } from "../_util/hooks/useClosable.js";
 import { getCloseIcon, getIconWrapperClassName, resolveIconNode } from "./PurePanel.js";
 import { isRenderable } from "../_util/is.js";
@@ -41,7 +43,8 @@ const renderNotifications = (node, { prefixCls, key }) => {
 };
 const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 	const { getPrefixCls, getPopupContainer, notification, direction } = useBaseConfig("notification");
-	const { classes: contextClassNames, styles: contextStyles } = useComponentBaseConfig("notification", props);
+	const [contextLocale] = useLocale("global", localeValues.global);
+	const { classes: contextClassNames, style: contextStyle, styles: contextStyles } = useComponentBaseConfig("notification", props);
 	const { classes, styles } = toPropsRefs(props, "classes", "styles");
 	const [, token] = useToken();
 	const prefixCls = computed(() => props.prefixCls || getPrefixCls("notification"));
@@ -49,7 +52,7 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 		return typeof props.duration === "number" && props.duration > 0 ? props.duration : false;
 	});
 	const getStyle = (placement) => {
-		return getPlacementStyle(placement, props?.top ?? DEFAULT_OFFSET, props?.bottom ?? DEFAULT_DURATION);
+		return getPlacementStyle(placement, props?.top ?? DEFAULT_OFFSET, props?.bottom ?? DEFAULT_OFFSET);
 	};
 	const getClassName = () => clsx({ [`${prefixCls.value}-rtl`]: props.rtl ?? direction.value === "rtl" });
 	const getNotificationMotion = () => getMotion(prefixCls.value);
@@ -73,13 +76,15 @@ const Holder = /* @__PURE__ */ defineComponent((props, { expose }) => {
 		}
 	})));
 	const mergedProps = computed(() => props);
-	const [mergedClassNames, mergedStyles] = useMergeSemantic(useToArr(contextClassNames, classes), useToArr(contextStyles, styles), useToProps(mergedProps));
+	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
+		styles: mergedStyles,
+		closeLabel: computed(() => contextLocale.value?.close ?? localeValues.global?.close ?? "Close")
 	});
 	return () => {
 		return holder?.();
@@ -173,9 +178,8 @@ function useInternalNotification(notificationConfig) {
 				warning(false, "usage", "You are calling notice in render which will break in React 18 concurrent mode. Please trigger in effect instead.");
 				return;
 			}
-			const { open: originOpen, prefixCls, notification, classNames: originClassNames, styles: originStyles } = holderRef.value;
+			const { open: originOpen, prefixCls, notification, classNames: originClassNames, styles: originStyles, closeLabel } = holderRef.value;
 			const contextClassName = notification?.class || {};
-			const contextStyle = notification?.style || {};
 			const noticePrefixCls = `${prefixCls}-notice`;
 			const { title, description, icon, type, actions, class: className, style, role = "alert", closeIcon, closable, classes: configClassNames = {}, styles = {}, ...restConfig } = config;
 			const mergedTitle = title;
@@ -188,7 +192,7 @@ function useInternalNotification(notificationConfig) {
 			}))), pickClosable(notificationContext), computed(() => ({
 				closable: true,
 				closeIcon: realCloseIcon
-			})));
+			})), closeLabel);
 			const mergedClosable = rawClosable ? {
 				onClose: closable && typeof closable === "object" ? closable.onClose : void 0,
 				closeIcon: mergedCloseIcon,
@@ -222,7 +226,6 @@ function useInternalNotification(notificationConfig) {
 				},
 				class: clsx({ [`${noticePrefixCls}-${type}`]: type }, { [`${noticePrefixCls}-with-icon`]: !!iconNode }, className, contextClassName, mergedClassNames.root),
 				style: {
-					...contextStyle,
 					...mergedStyles.root,
 					...style
 				},