diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index ccf50bcf260..24703432399 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,13 @@ # CHANGELOG +## NEXT_VERSION + +`NEXT_VERSION` + +### Features + +- `n-message` add `border` theme variable for each type, closes [#7105](https://github.com/tusen-ai/naive-ui/issues/7105). + ## 2.43.1 `2025-09-15` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 7c0e0300828..242342777e5 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,13 @@ # CHANGELOG +## NEXT_VERSION + +`NEXT_VERSION` + +### Features + +- `n-message` 增加各类型的 `border` 主题变量,关闭 [#7105](https://github.com/tusen-ai/naive-ui/issues/7105) + ## 2.43.1 `2025-09-15` diff --git a/src/message/src/Message.tsx b/src/message/src/Message.tsx index 7e43a422a20..77274fe257f 100644 --- a/src/message/src/Message.tsx +++ b/src/message/src/Message.tsx @@ -1,12 +1,7 @@ import type { CSSProperties, PropType, VNodeChild } from 'vue' /* eslint-disable no-cond-assign */ import type { MessageRenderMessage, MessageType } from './types' -import { - computed, - defineComponent, - h, - inject -} from 'vue' +import { computed, defineComponent, h, inject } from 'vue' import { NBaseClose, NBaseIcon, @@ -69,22 +64,18 @@ export default defineComponent({ fontSize, lineHeight, borderRadius, - border, - iconColorInfo, - iconColorSuccess, - iconColorWarning, - iconColorError, - iconColorLoading, closeIconSize, closeBorderRadius, [createKey('textColor', type)]: textColor, [createKey('boxShadow', type)]: boxShadow, + [createKey('border', type)]: border, [createKey('color', type)]: color, [createKey('closeColorHover', type)]: closeColorHover, [createKey('closeColorPressed', type)]: closeColorPressed, [createKey('closeIconColor', type)]: closeIconColor, [createKey('closeIconColorPressed', type)]: closeIconColorPressed, - [createKey('closeIconColorHover', type)]: closeIconColorHover + [createKey('closeIconColorHover', type)]: closeIconColorHover, + [createKey('iconColor', type)]: iconColor } } = themeRef.value return { @@ -102,11 +93,7 @@ export default defineComponent({ '--n-text-color': textColor, '--n-color': color, '--n-box-shadow': boxShadow, - '--n-icon-color-info': iconColorInfo, - '--n-icon-color-success': iconColorSuccess, - '--n-icon-color-warning': iconColorWarning, - '--n-icon-color-error': iconColorError, - '--n-icon-color-loading': iconColorLoading, + '--n-icon-color': iconColor, '--n-close-color-hover': closeColorHover, '--n-close-color-pressed': closeColorPressed, '--n-close-icon-color': closeIconColor, @@ -179,9 +166,7 @@ export default defineComponent({ > {(iconNode = createIconVNode(icon, type, mergedClsPrefix)) && showIcon ? ( -