naive-ui 2.21.3 → 2.23.0

package/es/_internal/close/src/styles/index.cssr.js

@@ -1,4 +1,5 @@
-import { cB, cM, c } from '../../../../_utils/cssr'; // vars:
+import { cB, cM, c } from '../../../../_utils/cssr'; // Note: non-prefixed color should be removed after css vars prefix migration
+// vars:
 // --close-color
 // --close-color-hover
 // --close-color-pressed
@@ -6,12 +7,12 @@ import { cB, cM, c } from '../../../../_utils/cssr'; // vars:
 
 export default cB('base-close', `
  cursor: pointer;
- color: var(--close-color);
+ color: var(--close-color, var(--n-close-color));
 `, [c('&:hover', {
-  color: 'var(--close-color-hover)'
+  color: 'var(--close-color-hover, var(--n-close-color))'
 }), c('&:active', {
-  color: 'var(--close-color-pressed)'
+  color: 'var(--close-color-pressed, var(--n-close-color-pressed))'
 }), cM('disabled', {
   cursor: 'not-allowed!important',
-  color: 'var(--close-color-disabled)'
+  color: 'var(--close-color-disabled, var(--n-close-color-disabled))'
 })]);

package/es/_internal/scrollbar/src/ScrollBar.d.ts

@@ -51,6 +51,7 @@ declare const scrollbarProps: {
     };
     readonly container: PropType<() => HTMLElement | null | undefined>;
     readonly content: PropType<() => HTMLElement | null | undefined>;
+    readonly containerClass: StringConstructor;
     readonly containerStyle: PropType<string | CSSProperties>;
     readonly contentClass: StringConstructor;
     readonly contentStyle: PropType<string | CSSProperties>;
@@ -94,6 +95,7 @@ declare const Scrollbar: import("vue").DefineComponent<{
     };
     readonly container: PropType<() => HTMLElement | null | undefined>;
     readonly content: PropType<() => HTMLElement | null | undefined>;
+    readonly containerClass: StringConstructor;
     readonly containerStyle: PropType<string | CSSProperties>;
     readonly contentClass: StringConstructor;
     readonly contentStyle: PropType<string | CSSProperties>;
@@ -156,6 +158,7 @@ declare const Scrollbar: import("vue").DefineComponent<{
     readonly xScrollable?: unknown;
     readonly container?: unknown;
     readonly content?: unknown;
+    readonly containerClass?: unknown;
     readonly containerStyle?: unknown;
     readonly contentClass?: unknown;
     readonly contentStyle?: unknown;
@@ -189,6 +192,7 @@ declare const Scrollbar: import("vue").DefineComponent<{
         color: string;
         colorHover: string;
     }, any>> | undefined;
+    containerClass?: string | undefined;
     onResize?: ((e: ResizeObserverEntry) => void) | undefined;
     container?: (() => HTMLElement | null | undefined) | undefined;
     containerStyle?: string | CSSProperties | undefined;

package/es/_internal/scrollbar/src/ScrollBar.js

@@ -19,7 +19,7 @@ const scrollbarProps = Object.assign(Object.assign({}, useTheme.props), { size:
         default: false
     }, 
     // If container is set, resize observer won't not attached
-    container: Function, content: Function, containerStyle: [String, Object], contentClass: String, contentStyle: [String, Object], horizontalRailStyle: [String, Object], verticalRailStyle: [String, Object], onScroll: Function, onWheel: Function, onResize: Function, internalOnUpdateScrollLeft: Function });
+    container: Function, content: Function, containerClass: String, containerStyle: [String, Object], contentClass: String, contentStyle: [String, Object], horizontalRailStyle: [String, Object], verticalRailStyle: [String, Object], onScroll: Function, onWheel: Function, onResize: Function, internalOnUpdateScrollLeft: Function });
 const Scrollbar = defineComponent({
     name: 'Scrollbar',
     props: scrollbarProps,
@@ -480,7 +480,10 @@ const Scrollbar = defineComponent({
             onMouseenter: this.handleMouseEnterWrapper,
             onMouseleave: this.handleMouseLeaveWrapper
         }), [
-            this.container ? (renderSlot($slots, 'default')) : (h("div", { ref: "containerRef", class: `${mergedClsPrefix}-scrollbar-container`, style: this.containerStyle, onScroll: this.handleScroll, onWheel: this.onWheel },
+            this.container ? (renderSlot($slots, 'default')) : (h("div", { ref: "containerRef", class: [
+                    `${mergedClsPrefix}-scrollbar-container`,
+                    this.containerClass
+                ], style: this.containerStyle, onScroll: this.handleScroll, onWheel: this.onWheel },
                 h(VResizeObserver, { onResize: this.handleContentResize }, {
                     default: () => (h("div", { ref: "contentRef", style: [
                             {

package/es/_internal/selection/src/Selection.js

@@ -491,15 +491,17 @@ export default defineComponent({
                 body = (h("div", { ref: "patternInputWrapperRef", class: `${clsPrefix}-base-selection-label` },
                     h("input", Object.assign({}, this.inputProps, { ref: "patternInputRef", class: `${clsPrefix}-base-selection-input`, value: this.patternInputFocused && this.active ? this.pattern : '', placeholder: "", readonly: disabled, disabled: disabled, tabindex: -1, autofocus: this.autofocus, onFocus: this.handlePatternInputFocus, onBlur: this.handlePatternInputBlur, onInput: this.handlePatternInputInput, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd })),
                     showPlaceholder ? null : this.patternInputFocused &&
-                        this.active ? null : (h("div", { class: `${clsPrefix}-base-selection-label__render-label ${clsPrefix}-base-selection-overlay`, key: "input" }, renderTag
-                        ? renderTag({
-                            option: this.selectedOption,
-                            handleClose: () => { }
-                        })
-                        : renderLabel
-                            ? renderLabel(this.selectedOption, true)
-                            : render(this.label, this.selectedOption, true))),
-                    showPlaceholder ? (h("div", { class: `${clsPrefix}-base-selection-placeholder ${clsPrefix}-base-selection-overlay`, key: "placeholder" }, this.filterablePlaceholder)) : null,
+                        this.active ? null : (h("div", { class: `${clsPrefix}-base-selection-label__render-label ${clsPrefix}-base-selection-overlay`, key: "input" },
+                        h("div", { class: `${clsPrefix}-base-selection-overlay__wrapper` }, renderTag
+                            ? renderTag({
+                                option: this.selectedOption,
+                                handleClose: () => { }
+                            })
+                            : renderLabel
+                                ? renderLabel(this.selectedOption, true)
+                                : render(this.label, this.selectedOption, true)))),
+                    showPlaceholder ? (h("div", { class: `${clsPrefix}-base-selection-placeholder ${clsPrefix}-base-selection-overlay`, key: "placeholder" },
+                        h("div", { class: `${clsPrefix}-base-selection-overlay__wrapper` }, this.filterablePlaceholder))) : null,
                     suffix));
             }
             else {

package/es/_internal/selection/src/styles/index.cssr.js

@@ -70,7 +70,6 @@ export default c([cB('base-selection', `
  display: flex;
  align-items: center;
  white-space: nowrap;
- overflow: hidden;
  pointer-events: none;
  position: absolute;
  top: 0;
@@ -79,7 +78,12 @@ export default c([cB('base-selection', `
  left: 0;
  padding: var(--padding-single);
  transition: color .3s var(--bezier);
- `), cB('base-selection-placeholder', `
+ `, [cE('wrapper', `
+ flex-basis: 0;
+ flex-grow: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ `)]), cB('base-selection-placeholder', `
  color: var(--placeholder-color);
  `), cB('base-selection-tags', `
  cursor: pointer;

package/es/alert/src/Alert.d.ts

@@ -528,26 +528,26 @@ declare const _default: import("vue").DefineComponent<{
         };
     }>;
     cssVars: import("vue").ComputedRef<{
-        '--bezier': string;
-        '--color': string;
-        '--close-color': string;
-        '--close-color-hover': string;
-        '--close-color-pressed': string;
-        '--icon-color': string;
-        '--border': string;
-        '--title-text-color': string;
-        '--content-text-color': string;
-        '--line-height': string;
-        '--border-radius': string;
-        '--font-size': string;
-        '--title-font-weight': string;
-        '--icon-size': string;
-        '--icon-margin': string;
-        '--close-size': string;
-        '--close-margin': string;
-        '--padding': string;
-        '--icon-margin-left': string;
-        '--icon-margin-right': string;
+        '--n-bezier': string;
+        '--n-color': string;
+        '--n-close-color': string;
+        '--n-close-color-hover': string;
+        '--n-close-color-pressed': string;
+        '--n-icon-color': string;
+        '--n-border': string;
+        '--n-title-text-color': string;
+        '--n-content-text-color': string;
+        '--n-line-height': string;
+        '--n-border-radius': string;
+        '--n-font-size': string;
+        '--n-title-font-weight': string;
+        '--n-icon-size': string;
+        '--n-icon-margin': string;
+        '--n-close-size': string;
+        '--n-close-margin': string;
+        '--n-padding': string;
+        '--n-icon-margin-left': string;
+        '--n-icon-margin-right': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     title?: unknown;

package/es/alert/src/Alert.js

@@ -44,26 +44,26 @@ export default defineComponent({
             const { type } = props;
             const { left, right } = getMargin(iconMargin);
             return {
-                '--bezier': cubicBezierEaseInOut,
-                '--color': self[createKey('color', type)],
-                '--close-color': self[createKey('closeColor', type)],
-                '--close-color-hover': self[createKey('closeColorHover', type)],
-                '--close-color-pressed': self[createKey('closeColorPressed', type)],
-                '--icon-color': self[createKey('iconColor', type)],
-                '--border': self[createKey('border', type)],
-                '--title-text-color': self[createKey('titleTextColor', type)],
-                '--content-text-color': self[createKey('contentTextColor', type)],
-                '--line-height': lineHeight,
-                '--border-radius': borderRadius,
-                '--font-size': fontSize,
-                '--title-font-weight': titleFontWeight,
-                '--icon-size': iconSize,
-                '--icon-margin': iconMargin,
-                '--close-size': closeSize,
-                '--close-margin': closeMargin,
-                '--padding': padding,
-                '--icon-margin-left': left,
-                '--icon-margin-right': right
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-color': self[createKey('color', type)],
+                '--n-close-color': self[createKey('closeColor', type)],
+                '--n-close-color-hover': self[createKey('closeColorHover', type)],
+                '--n-close-color-pressed': self[createKey('closeColorPressed', type)],
+                '--n-icon-color': self[createKey('iconColor', type)],
+                '--n-border': self[createKey('border', type)],
+                '--n-title-text-color': self[createKey('titleTextColor', type)],
+                '--n-content-text-color': self[createKey('contentTextColor', type)],
+                '--n-line-height': lineHeight,
+                '--n-border-radius': borderRadius,
+                '--n-font-size': fontSize,
+                '--n-title-font-weight': titleFontWeight,
+                '--n-icon-size': iconSize,
+                '--n-icon-margin': iconMargin,
+                '--n-close-size': closeSize,
+                '--n-close-margin': closeMargin,
+                '--n-padding': padding,
+                '--n-icon-margin-left': left,
+                '--n-icon-margin-right': right
             };
         });
         const visibleRef = ref(true);
@@ -126,9 +126,9 @@ export default defineComponent({
                         }
                     })))),
                     h("div", { class: `${mergedClsPrefix}-alert-body` },
-                        this.title !== undefined && (h("div", { class: `${mergedClsPrefix}-alert-body__title` }, renderSlot($slots, 'header', undefined, () => [
+                        this.title || $slots.header ? (h("div", { class: `${mergedClsPrefix}-alert-body__title` }, renderSlot($slots, 'header', undefined, () => [
                             this.title
-                        ]))),
+                        ]))) : null,
                         $slots.default && (h("div", { class: `${mergedClsPrefix}-alert-body__content` }, $slots))))) : null;
             }
         }));

package/es/alert/src/styles/index.cssr.js

@@ -1,44 +1,44 @@
 import { c, cB, cE, cM } from '../../../_utils/cssr';
 import fadeInHeightExpandTranstion from '../../../_styles/transitions/fade-in-height-expand.cssr'; // vars:
-// --bezier
-// --color
-// --close-color
-// --close-color-hover
-// --close-color-pressed
-// --icon-color
-// --border
-// --title-text-color
-// --content-text-color
-// --line-height
-// --border-radius
-// --font-size
-// --title-font-weight
-// --icon-size
-// --icon-margin
-// --close-size
-// --close-margin
-// --padding
-// --icon-margin-left
-// --icon-margin-right
+// --n-bezier
+// --n-color
+// --n-close-color
+// --n-close-color-hover
+// --n-close-color-pressed
+// --n-icon-color
+// --n-border
+// --n-title-text-color
+// --n-content-text-color
+// --n-line-height
+// --n-border-radius
+// --n-font-size
+// --n-title-font-weight
+// --n-icon-size
+// --n-icon-margin
+// --n-close-size
+// --n-close-margin
+// --n-padding
+// --n-icon-margin-left
+// --n-icon-margin-right
 
 export default cB('alert', `
- line-height: var(--line-height);
- border-radius: var(--border-radius);
+ line-height: var(--n-line-height);
+ border-radius: var(--n-border-radius);
  position: relative;
- transition: background-color .3s var(--bezier);
- background-color: var(--color);
+ transition: background-color .3s var(--n-bezier);
+ background-color: var(--n-color);
  text-align: start;
 `, [cE('icon', {
-  color: 'var(--icon-color)'
+  color: 'var(--n-icon-color)'
 }), cB('alert-body', {
-  border: 'var(--border)',
-  padding: 'var(--padding)'
+  border: 'var(--n-border)',
+  padding: 'var(--n-padding)'
 }, [cE('title', {
-  color: 'var(--title-text-color)'
+  color: 'var(--n-title-text-color)'
 }), cE('content', {
-  color: 'var(--content-text-color)'
+  color: 'var(--n-content-text-color)'
 })]), fadeInHeightExpandTranstion({
-  originalTransition: 'transform .3s var(--bezier)',
+  originalTransition: 'transform .3s var(--n-bezier)',
   enterToProps: {
     transform: 'scale(1)'
   },
@@ -52,32 +52,32 @@ export default cB('alert', `
  align-items: center;
  justify-content: center;
  display: flex;
- width: var(--icon-size);
- height: var(--icon-size);
- font-size: var(--icon-size);
- margin: var(--icon-margin);
+ width: var(--n-icon-size);
+ height: var(--n-icon-size);
+ font-size: var(--n-icon-size);
+ margin: var(--n-icon-margin);
  `), cE('close', `
- transition: color .3s var(--bezier);
+ transition: color .3s var(--n-bezier);
  position: absolute;
  right: 0;
  top: 0;
- margin: var(--close-margin);
- font-size: var(--close-size);
+ margin: var(--n-close-margin);
+ font-size: var(--n-close-size);
  `), cM('show-icon', [cB('alert-body', {
-  paddingLeft: 'calc(var(--icon-margin-left) + var(--icon-size) + var(--icon-margin-right))'
+  paddingLeft: 'calc(var(--n-icon-margin-left) + var(--n-icon-size) + var(--n-icon-margin-right))'
 })]), cB('alert-body', `
- border-radius: var(--border-radius);
- transition: border-color .3s var(--bezier);
+ border-radius: var(--n-border-radius);
+ transition: border-color .3s var(--n-bezier);
  `, [cE('title', `
- transition: color .3s var(--bezier);
+ transition: color .3s var(--n-bezier);
  font-size: 16px;
  line-height: 19px;
- font-weight: var(--title-font-weight);
+ font-weight: var(--n-title-font-weight);
  `, [c('& +', [cE('content', {
   marginTop: '9px'
 })])]), cE('content', {
-  transition: 'color .3s var(--bezier)',
-  fontSize: 'var(--font-size)'
+  transition: 'color .3s var(--n-bezier)',
+  fontSize: 'var(--n-font-size)'
 })]), cE('icon', {
-  transition: 'color .3s var(--bezier)'
+  transition: 'color .3s var(--n-bezier)'
 })]);

package/es/anchor/src/AnchorAdapter.js

@@ -17,18 +17,18 @@ export default defineComponent({
         const cssVarsRef = computed(() => {
             const { self: { railColor, linkColor, railColorActive, linkTextColor, linkTextColorHover, linkTextColorPressed, linkTextColorActive, linkFontSize, railWidth, linkPadding, borderRadius }, common: { cubicBezierEaseInOut } } = themeRef.value;
             return {
-                '--link-border-radius': borderRadius,
-                '--link-color': linkColor,
-                '--link-font-size': linkFontSize,
-                '--link-text-color': linkTextColor,
-                '--link-text-color-hover': linkTextColorHover,
-                '--link-text-color-active': linkTextColorActive,
-                '--link-text-color-pressed': linkTextColorPressed,
-                '--link-padding': linkPadding,
-                '--bezier': cubicBezierEaseInOut,
-                '--rail-color': railColor,
-                '--rail-color-active': railColorActive,
-                '--rail-width': railWidth
+                '--n-link-border-radius': borderRadius,
+                '--n-link-color': linkColor,
+                '--n-link-font-size': linkFontSize,
+                '--n-link-text-color': linkTextColor,
+                '--n-link-text-color-hover': linkTextColorHover,
+                '--n-link-text-color-active': linkTextColorActive,
+                '--n-link-text-color-pressed': linkTextColorPressed,
+                '--n-link-padding': linkPadding,
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-rail-color': railColor,
+                '--n-rail-color-active': railColorActive,
+                '--n-rail-width': railWidth
             };
         });
         return {

package/es/anchor/src/styles/index.cssr.js

@@ -1,21 +1,21 @@
 import { c, cE, cB, cM, cNotM } from '../../../_utils/cssr'; // vars:
-// --link-color
-// --link-font-size
-// --link-text-color
-// --link-text-color-hover
-// --link-text-color-active
-// --link-text-color-pressed
-// --bezier
-// --rail-color
-// --rail-color-active
-// --rail-width
-// --link-padding
-// --link-border-radius
+// --n-link-color
+// --n-link-font-size
+// --n-link-text-color
+// --n-link-text-color-hover
+// --n-link-text-color-active
+// --n-link-text-color-pressed
+// --n-bezier
+// --n-rail-color
+// --n-rail-color-active
+// --n-rail-width
+// --n-link-padding
+// --n-link-border-radius
 
 export default cB('anchor', `
  position: relative;
 `, [cNotM('block', `
- padding-left: var(--rail-width);
+ padding-left: var(--n-rail-width);
  `, [cB('anchor-link', [c('+, >', [cB('anchor-link', `
  margin-top: .5em;
  `)])]), cB('anchor-link-background', `
@@ -25,56 +25,52 @@ export default cB('anchor', `
  `), cNotM('show-rail', [c('>', [cB('anchor-link', 'padding-left: 0;')])])]), cM('block', [cB('anchor-link', `
  margin-bottom: 4px;
  padding: 2px 8px;
- transition: background-color .3s var(--bezier);
+ transition: background-color .3s var(--n-bezier);
  background-color: transparent;
- border-radius: var(--link-border-radius);
+ border-radius: var(--n-link-border-radius);
  `, [cM('active', `
- background-color: var(--link-color);
+ background-color: var(--n-link-color);
  `)])]), cB('anchor-link-background', `
  position: absolute;
- left: calc(var(--rail-width) / 2);
+ left: calc(var(--n-rail-width) / 2);
  width: 100%;
- background-color: var(--link-color);
+ background-color: var(--n-link-color);
  transition:
- top .15s var(--bezier),
- max-width .15s var(--bezier),
- background-color .3s var(--bezier);
+ top .15s var(--n-bezier),
+ max-width .15s var(--n-bezier),
+ background-color .3s var(--n-bezier);
  `), cB('anchor-rail', `
  position: absolute;
  left: 0;
  top: 0;
  bottom: 0;
- width: var(--rail-width);
- border-radius: calc(var(--rail-width) / 2);
+ width: var(--n-rail-width);
+ border-radius: calc(var(--n-rail-width) / 2);
  overflow: hidden;
- transition: background-color .3s var(--bezier);
- background-color: var(--rail-color);
+ transition: background-color .3s var(--n-bezier);
+ background-color: var(--n-rail-color);
  `, [cE('bar', `
  position: absolute;
  left: 0;
- width: var(--rail-width);
+ width: var(--n-rail-width);
  height: 21px;
  background-color: #0000;
  transition: 
- top .15s var(--bezier),
- background-color .3s var(--bezier);
+ top .15s var(--n-bezier),
+ background-color .3s var(--n-bezier);
  `, [cM('active', {
-  backgroundColor: 'var(--rail-color-active)'
+  backgroundColor: 'var(--n-rail-color-active)'
 })])]), cB('anchor-link', `
- padding: var(--link-padding);
+ padding: var(--n-link-padding);
  position: relative;
  line-height: 1.5;
- font-size: var(--link-font-size);
+ font-size: var(--n-link-font-size);
  min-height: 1.5em;
  display: flex;
  flex-direction: column;
- `, [cM('active', [cE('title', `
- color: var(--link-text-color-active);
- `)]), c('&:hover, &:focus', [cE('title', `
- color: var(--link-text-color-hover);
- `)]), c('&:active', [cE('title', `
- color: var(--link-text-color-pressed);
- `)]), cE('title', `
+ `, [cM('active', [c('>', [cE('title', `
+ color: var(--n-link-text-color-active);
+ `)])]), cE('title', `
  outline: none;
  max-width: 100%;
  text-decoration: none;
@@ -84,6 +80,10 @@ export default cB('anchor', `
  cursor: pointer;
  display: inline-block;
  padding-right: 16px;
- transition: color .3s var(--bezier);
- color: var(--link-text-color);
- `)])]);
+ transition: color .3s var(--n-bezier);
+ color: var(--n-link-text-color);
+ `, [c('&:hover, &:focus', `
+ color: var(--n-link-text-color-hover);
+ `), c('&:active', `
+ color: var(--n-link-text-color-pressed);
+ `)])])]);

package/es/avatar/src/Avatar.d.ts

@@ -7,7 +7,6 @@ declare const avatarProps: {
     };
     readonly src: StringConstructor;
     readonly circle: BooleanConstructor;
-    readonly color: StringConstructor;
     readonly objectFit: {
         readonly type: PropType<"fill" | "none" | "contain" | "cover" | "scale-down">;
         readonly default: "fill";
@@ -15,6 +14,8 @@ declare const avatarProps: {
     readonly round: BooleanConstructor;
     readonly onError: PropType<(e: Event) => void>;
     readonly fallbackSrc: StringConstructor;
+    /** @deprecated */
+    readonly color: StringConstructor;
     readonly theme: PropType<import("../../_mixins").Theme<"Avatar", {
         borderRadius: string;
         fontSize: string;
@@ -54,7 +55,6 @@ declare const _default: import("vue").DefineComponent<{
     };
     readonly src: StringConstructor;
     readonly circle: BooleanConstructor;
-    readonly color: StringConstructor;
     readonly objectFit: {
         readonly type: PropType<"fill" | "none" | "contain" | "cover" | "scale-down">;
         readonly default: "fill";
@@ -62,6 +62,8 @@ declare const _default: import("vue").DefineComponent<{
     readonly round: BooleanConstructor;
     readonly onError: PropType<(e: Event) => void>;
     readonly fallbackSrc: StringConstructor;
+    /** @deprecated */
+    readonly color: StringConstructor;
     readonly theme: PropType<import("../../_mixins").Theme<"Avatar", {
         borderRadius: string;
         fontSize: string;
@@ -111,11 +113,11 @@ declare const _default: import("vue").DefineComponent<{
     readonly size?: unknown;
     readonly src?: unknown;
     readonly circle?: unknown;
-    readonly color?: unknown;
     readonly objectFit?: unknown;
     readonly round?: unknown;
     readonly onError?: unknown;
     readonly fallbackSrc?: unknown;
+    readonly color?: unknown;
     readonly theme?: unknown;
     readonly themeOverrides?: unknown;
     readonly builtinThemeOverrides?: unknown;

package/es/avatar/src/Avatar.js

@@ -8,10 +8,12 @@ import style from './styles/index.cssr';
 const avatarProps = Object.assign(Object.assign({}, useTheme.props), { size: {
         type: [String, Number],
         default: 'medium'
-    }, src: String, circle: Boolean, color: String, objectFit: {
+    }, src: String, circle: Boolean, objectFit: {
         type: String,
         default: 'fill'
-    }, round: Boolean, onError: Function, fallbackSrc: String });
+    }, round: Boolean, onError: Function, fallbackSrc: String, 
+    /** @deprecated */
+    color: String });
 export default defineComponent({
     name: 'Avatar',
     props: avatarProps,
@@ -62,7 +64,7 @@ export default defineComponent({
             mergedClsPrefix: mergedClsPrefixRef,
             fitTextTransform,
             cssVars: computed(() => {
-                const { size } = props;
+                const { size, color: propColor } = props;
                 const { self: { borderRadius, fontSize, color }, common: { cubicBezierEaseInOut } } = themeRef.value;
                 let height;
                 if (typeof size === 'number') {
@@ -74,7 +76,7 @@ export default defineComponent({
                 return {
                     '--font-size': fontSize,
                     '--border-radius': mergedRoundRef.value ? '50%' : borderRadius,
-                    '--color': color,
+                    '--color': propColor || color,
                     '--bezier': cubicBezierEaseInOut,
                     '--merged-size': `var(--avatar-size-override, ${height})`
                 };
@@ -91,7 +93,7 @@ export default defineComponent({
         }
         else if (!(!$slots.default && src)) {
             img = (h(VResizeObserver, { onResize: this.fitTextTransform }, {
-                default: () => (h("span", { ref: "textRef", class: `${mergedClsPrefix}-avatar__text`, style: { background: this.color } }, $slots))
+                default: () => (h("span", { ref: "textRef", class: `${mergedClsPrefix}-avatar__text` }, $slots))
             }));
         }
         else {

package/es/avatar/src/styles/index.cssr.js

@@ -3,7 +3,7 @@ import { c, cE, cB } from '../../../_utils/cssr'; // vars:
 // --border-radius
 // --color
 // --bezier
-// --size
+// --merged-size
 
 export default cB('avatar', `
  width: var(--merged-size);
@@ -30,7 +30,5 @@ export default cB('avatar', `
  top: 50%;
  `), cB('icon', `
  vertical-align: bottom;
- font-size: var(--size);
- `), cE('text', {
-  lineHeight: 1.25
-})]);
+ font-size: calc(var(--merged-size) - 6px);
+ `), cE('text', 'line-height: 1.25')]);

package/es/badge/src/Badge.d.ts

@@ -111,12 +111,12 @@ declare const _default: import("vue").DefineComponent<{
     handleAfterEnter: () => void;
     handleAfterLeave: () => void;
     cssVars: import("vue").ComputedRef<{
-        '--font-size': string;
-        '--font-family': string;
-        '--color': string;
-        '--ripple-color': string;
-        '--bezier': string;
-        '--ripple-bezier': string;
+        '--n-font-size': string;
+        '--n-font-family': string;
+        '--n-color': string;
+        '--n-ripple-color': string;
+        '--n-bezier': string;
+        '--n-ripple-bezier': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     readonly value?: unknown;