naive-ui 2.20.2 → 2.21.2

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

@@ -120,6 +120,7 @@ declare const Scrollbar: import("vue").DefineComponent<{
     scrollTo: ScrollTo;
     mergedClsPrefix: import("vue").ComputedRef<string>;
     containerScrollTop: import("vue").Ref<number>;
+    wrapperRef: import("vue").Ref<HTMLElement | null>;
     containerRef: import("vue").Ref<HTMLElement | null>;
     contentRef: import("vue").Ref<HTMLElement | null>;
     yRailRef: import("vue").Ref<HTMLElement | null>;

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

@@ -27,6 +27,7 @@ const Scrollbar = defineComponent({
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
         // dom ref
+        const wrapperRef = ref(null);
         const containerRef = ref(null);
         const contentRef = ref(null);
         const yRailRef = ref(null);
@@ -285,6 +286,10 @@ const Scrollbar = defineComponent({
             syncPositionState();
             syncScrollState();
         }
+        function isMouseUpAway(e) {
+            var _a;
+            return !((_a = wrapperRef.value) === null || _a === void 0 ? void 0 : _a.contains(e.target));
+        }
         function handleXScrollMouseDown(e) {
             e.preventDefault();
             e.stopPropagation();
@@ -329,8 +334,7 @@ const Scrollbar = defineComponent({
             off('mouseup', window, handleXScrollMouseUp, true);
             xBarPressed = false;
             sync();
-            const { value: container } = mergedContainerRef;
-            if (!(container === null || container === void 0 ? void 0 : container.contains(e.target))) {
+            if (isMouseUpAway(e)) {
                 hideBar();
             }
         }
@@ -375,8 +379,7 @@ const Scrollbar = defineComponent({
             off('mouseup', window, handleYScrollMouseUp, true);
             yBarPressed = false;
             sync();
-            const { value: container } = mergedContainerRef;
-            if (!(container === null || container === void 0 ? void 0 : container.contains(e.target))) {
+            if (isMouseUpAway(e)) {
                 hideBar();
             }
         }
@@ -432,6 +435,7 @@ const Scrollbar = defineComponent({
             scrollTo,
             mergedClsPrefix: mergedClsPrefixRef,
             containerScrollTop: containerScrollTopRef,
+            wrapperRef,
             containerRef,
             contentRef,
             yRailRef,
@@ -470,6 +474,7 @@ const Scrollbar = defineComponent({
         if (!this.scrollable)
             return renderSlot($slots, 'default');
         const createChildren = () => h('div', mergeProps(this.$attrs, {
+            ref: 'wrapperRef',
             class: `${mergedClsPrefix}-scrollbar`,
             style: this.cssVars,
             onMouseenter: this.handleMouseEnterWrapper,

package/es/_internal/select-menu/src/SelectMenu.d.ts

@@ -279,9 +279,13 @@ declare const _default: import("vue").DefineComponent<{
             tableHeaderColor: string;
             hoverColor: string;
             tableColorHover: string;
+            tableColorStriped: string;
             pressedColor: string;
             opacityDisabled: string;
             inputColorDisabled: string;
+            buttonColor2: string;
+            buttonColor2Hover: string;
+            buttonColor2Pressed: string;
             boxShadow1: string;
             boxShadow2: string;
             boxShadow3: string;
@@ -460,8 +464,8 @@ declare const _default: import("vue").DefineComponent<{
     show: boolean;
     multiple: boolean;
     focusable: boolean;
-    clsPrefix: string;
     loading: boolean;
+    clsPrefix: string;
     scrollable: boolean;
     treeMate: SelectTreeMate;
     autoPending: boolean;

package/es/_internal/selection/src/Selection.d.ts

@@ -332,9 +332,13 @@ declare const _default: import("vue").DefineComponent<{
             tableHeaderColor: string;
             hoverColor: string;
             tableColorHover: string;
+            tableColorStriped: string;
             pressedColor: string;
             opacityDisabled: string;
             inputColorDisabled: string;
+            buttonColor2: string;
+            buttonColor2Hover: string;
+            buttonColor2Pressed: string;
             boxShadow1: string;
             boxShadow2: string;
             boxShadow3: string;
@@ -569,8 +573,8 @@ declare const _default: import("vue").DefineComponent<{
     active: boolean;
     disabled: boolean;
     autofocus: boolean;
-    clsPrefix: string;
     loading: boolean;
+    clsPrefix: string;
     showArrow: boolean;
     selectedOption: SelectBaseOption<string | number, string | ((option: SelectBaseOption<string | number, string | any>, selected: boolean) => import("vue").VNodeChild)> | null;
     selectedOptions: SelectBaseOption<string | number, string | ((option: SelectBaseOption<string | number, string | any>, selected: boolean) => import("vue").VNodeChild)>[] | null;

package/es/_internal/suffix/src/Suffix.d.ts

@@ -12,7 +12,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
-    loading: BooleanConstructor;
+    loading: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     onClear: PropType<(e: MouseEvent) => void>;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     clsPrefix?: unknown;
@@ -21,8 +24,8 @@ declare const _default: import("vue").DefineComponent<{
     loading?: unknown;
     onClear?: unknown;
 } & {
-    clsPrefix: string;
     loading: boolean;
+    clsPrefix: string;
 } & {
     showArrow?: boolean | undefined;
     onClear?: ((e: MouseEvent) => void) | undefined;

package/es/_internal/suffix/src/Suffix.js

@@ -18,7 +18,10 @@ export default defineComponent({
             type: Boolean,
             default: undefined
         },
-        loading: Boolean,
+        loading: {
+            type: Boolean,
+            default: false
+        },
         onClear: Function
     },
     setup(props) {

package/es/_styles/common/dark.js

@@ -18,6 +18,7 @@ const base = {
     alphaDisabledInput: '0.06',
     alphaPending: '0.09',
     alphaTablePending: '0.06',
+    alphaTableStriped: '0.05',
     alphaPressed: '0.05',
     alphaAvatar: '0.18',
     alphaRail: '0.2',
@@ -87,5 +88,5 @@ const derived = Object.assign(Object.assign({ name: 'common' }, commonVariables)
     // close
     closeColorHover: overlay(Number(base.alphaClose) * 1.25), closeColor: overlay(Number(base.alphaClose)), closeColorPressed: overlay(Number(base.alphaClose) * 0.8), closeColorDisabled: overlay(base.alpha4), 
     // clear
-    clearColor: overlay(base.alpha4), clearColorHover: scaleColor(overlay(base.alpha4), { alpha: 1.25 }), clearColorPressed: scaleColor(overlay(base.alpha4), { alpha: 0.8 }), scrollbarColor: overlay(base.alphaScrollbar), scrollbarColorHover: overlay(base.alphaScrollbarHover), scrollbarWidth: '5px', scrollbarHeight: '5px', scrollbarBorderRadius: '5px', progressRailColor: overlay(base.alphaProgressRail), railColor: overlay(base.alphaRail), popoverColor: base.neutralPopover, tableColor: base.neutralCard, cardColor: base.neutralCard, modalColor: base.neutralModal, bodyColor: base.neutralBody, tagColor: neutral(base.alphaTag), avatarColor: overlay(base.alphaAvatar), invertedColor: base.neutralBase, inputColor: overlay(base.alphaInput), codeColor: overlay(base.alphaCode), tabColor: overlay(base.alphaTab), actionColor: overlay(base.alphaAction), tableHeaderColor: overlay(base.alphaAction), hoverColor: overlay(base.alphaPending), tableColorHover: overlay(base.alphaTablePending), pressedColor: overlay(base.alphaPressed), opacityDisabled: base.alphaDisabled, inputColorDisabled: overlay(base.alphaDisabledInput), boxShadow1: '0 1px 2px -2px rgba(0, 0, 0, .24), 0 3px 6px 0 rgba(0, 0, 0, .18), 0 5px 12px 4px rgba(0, 0, 0, .12)', boxShadow2: '0 3px 6px -4px rgba(0, 0, 0, .24), 0 6px 12px 0 rgba(0, 0, 0, .16), 0 9px 18px 8px rgba(0, 0, 0, .10)', boxShadow3: '0 6px 16px -9px rgba(0, 0, 0, .08), 0 9px 28px 0 rgba(0, 0, 0, .05), 0 12px 48px 16px rgba(0, 0, 0, .03)' });
+    clearColor: overlay(base.alpha4), clearColorHover: scaleColor(overlay(base.alpha4), { alpha: 1.25 }), clearColorPressed: scaleColor(overlay(base.alpha4), { alpha: 0.8 }), scrollbarColor: overlay(base.alphaScrollbar), scrollbarColorHover: overlay(base.alphaScrollbarHover), scrollbarWidth: '5px', scrollbarHeight: '5px', scrollbarBorderRadius: '5px', progressRailColor: overlay(base.alphaProgressRail), railColor: overlay(base.alphaRail), popoverColor: base.neutralPopover, tableColor: base.neutralCard, cardColor: base.neutralCard, modalColor: base.neutralModal, bodyColor: base.neutralBody, tagColor: neutral(base.alphaTag), avatarColor: overlay(base.alphaAvatar), invertedColor: base.neutralBase, inputColor: overlay(base.alphaInput), codeColor: overlay(base.alphaCode), tabColor: overlay(base.alphaTab), actionColor: overlay(base.alphaAction), tableHeaderColor: overlay(base.alphaAction), hoverColor: overlay(base.alphaPending), tableColorHover: overlay(base.alphaTablePending), tableColorStriped: overlay(base.alphaTableStriped), pressedColor: overlay(base.alphaPressed), opacityDisabled: base.alphaDisabled, inputColorDisabled: overlay(base.alphaDisabledInput), buttonColor2: 'rgba(255, 255, 255, .06)', buttonColor2Hover: 'rgba(255, 255, 255, .09)', buttonColor2Pressed: 'rgba(255, 255, 255, .05)', boxShadow1: '0 1px 2px -2px rgba(0, 0, 0, .24), 0 3px 6px 0 rgba(0, 0, 0, .18), 0 5px 12px 4px rgba(0, 0, 0, .12)', boxShadow2: '0 3px 6px -4px rgba(0, 0, 0, .24), 0 6px 12px 0 rgba(0, 0, 0, .16), 0 9px 18px 8px rgba(0, 0, 0, .10)', boxShadow3: '0 6px 16px -9px rgba(0, 0, 0, .08), 0 9px 28px 0 rgba(0, 0, 0, .05), 0 12px 48px 16px rgba(0, 0, 0, .03)' });
 export default derived;

package/es/_styles/common/light.d.ts

@@ -67,9 +67,13 @@ declare const derived: {
     tableHeaderColor: string;
     hoverColor: string;
     tableColorHover: string;
+    tableColorStriped: string;
     pressedColor: string;
     opacityDisabled: string;
     inputColorDisabled: string;
+    buttonColor2: string;
+    buttonColor2Hover: string;
+    buttonColor2Pressed: string;
     boxShadow1: string;
     boxShadow2: string;
     boxShadow3: string;

package/es/_styles/common/light.js

@@ -80,7 +80,7 @@ const derived = Object.assign(Object.assign({ name: 'common' }, commonVariables)
     // error color
     errorColor: base.errorDefault, errorColorHover: base.errorHover, errorColorPressed: base.errorActive, errorColorSuppl: base.errorSuppl, 
     // text color
-    textColorBase: base.neutralTextBase, textColor1: 'rgb(31, 34, 37)', textColor2: 'rgb(51, 54, 57)', textColor3: 'rgb(158, 164, 170)', 
+    textColorBase: base.neutralTextBase, textColor1: 'rgb(31, 34, 37)', textColor2: 'rgb(51, 54, 57)', textColor3: 'rgb(118, 124, 130)', 
     // textColor4: neutral(base.alpha4), // disabled, placeholder, icon
     // textColor5: neutral(base.alpha5),
     textColorDisabled: neutral(base.alpha4), placeholderColor: neutral(base.alpha4), placeholderColorDisabled: neutral(base.alpha5), iconColor: neutral(base.alpha4), iconColorHover: scaleColor(neutral(base.alpha4), { lightness: 0.75 }), iconColorPressed: scaleColor(neutral(base.alpha4), { lightness: 0.9 }), iconColorDisabled: neutral(base.alpha5), opacity1: base.alpha1, opacity2: base.alpha2, opacity3: base.alpha3, opacity4: base.alpha4, opacity5: base.alpha5, dividerColor: 'rgb(239, 239, 245)', borderColor: 'rgb(224, 224, 230)', 
@@ -89,5 +89,8 @@ const derived = Object.assign(Object.assign({ name: 'common' }, commonVariables)
     // clear
     clearColor: neutral(base.alpha4), clearColorHover: scaleColor(neutral(base.alpha4), { lightness: 0.75 }), clearColorPressed: scaleColor(neutral(base.alpha4), { lightness: 0.9 }), scrollbarColor: overlay(base.alphaScrollbar), scrollbarColorHover: overlay(base.alphaScrollbarHover), scrollbarWidth: '5px', scrollbarHeight: '5px', scrollbarBorderRadius: '5px', progressRailColor: neutral(base.alphaProgressRail), railColor: 'rgb(219, 219, 223)', popoverColor: base.neutralPopover, tableColor: base.neutralCard, cardColor: base.neutralCard, modalColor: base.neutralModal, bodyColor: base.neutralBody, tagColor: 'rgb(250, 250, 252)', avatarColor: neutral(base.alphaAvatar), invertedColor: 'rgb(0, 20, 40)', inputColor: neutral(base.alphaInput), codeColor: 'rgb(244, 244, 248)', tabColor: 'rgb(247, 247, 250)', actionColor: 'rgb(250, 250, 252)', tableHeaderColor: 'rgb(250, 250, 252)', hoverColor: 'rgb(243, 243, 245)', 
     // use color with alpha since it can be nested with header filter & sorter effect
-    tableColorHover: 'rgba(0, 0, 100, 0.02)', pressedColor: 'rgb(237, 237, 239)', opacityDisabled: base.alphaDisabled, inputColorDisabled: 'rgb(250, 250, 252)', boxShadow1: '0 1px 2px -2px rgba(0, 0, 0, .08), 0 3px 6px 0 rgba(0, 0, 0, .06), 0 5px 12px 4px rgba(0, 0, 0, .04)', boxShadow2: '0 3px 6px -4px rgba(0, 0, 0, .12), 0 6px 16px 0 rgba(0, 0, 0, .08), 0 9px 28px 8px rgba(0, 0, 0, .05)', boxShadow3: '0 6px 16px -9px rgba(0, 0, 0, .08), 0 9px 28px 0 rgba(0, 0, 0, .05), 0 12px 48px 16px rgba(0, 0, 0, .03)' });
+    tableColorHover: 'rgba(0, 0, 100, 0.03)', tableColorStriped: 'rgba(0, 0, 100, 0.02)', pressedColor: 'rgb(237, 237, 239)', opacityDisabled: base.alphaDisabled, inputColorDisabled: 'rgb(250, 250, 252)', 
+    // secondary button color
+    // can also be used in tertiary button & quaternary button
+    buttonColor2: 'rgba(46, 51, 56, .05)', buttonColor2Hover: 'rgba(46, 51, 56, .09)', buttonColor2Pressed: 'rgba(46, 51, 56, .13)', boxShadow1: '0 1px 2px -2px rgba(0, 0, 0, .08), 0 3px 6px 0 rgba(0, 0, 0, .06), 0 5px 12px 4px rgba(0, 0, 0, .04)', boxShadow2: '0 3px 6px -4px rgba(0, 0, 0, .12), 0 6px 16px 0 rgba(0, 0, 0, .08), 0 9px 28px 8px rgba(0, 0, 0, .05)', boxShadow3: '0 6px 16px -9px rgba(0, 0, 0, .08), 0 9px 28px 0 rgba(0, 0, 0, .05), 0 12px 48px 16px rgba(0, 0, 0, .03)' });
 export default derived;

package/es/_styles/global/index.cssr.js

@@ -1,5 +1,10 @@
 import { c } from '../../_utils/cssr';
-import commonVariables from '../common/_common'; // All the components need the style
+import commonVariables from '../common/_common';
+const {
+  fontSize,
+  fontFamily,
+  lineHeight
+} = commonVariables; // All the components need the style
 // It is static and won't be changed in the app's lifetime
 // If user want to overrides it they need to use `n-global-style` is provided
 //
@@ -12,9 +17,9 @@ import commonVariables from '../common/_common'; // All the components need the
 
 export default c('body', `
  margin: 0;
- font-size: ${commonVariables.fontSize};
- font-family: ${commonVariables.fontFamily};
- line-height: ${commonVariables.lineHeight};
+ font-size: ${fontSize};
+ font-family: ${fontFamily};
+ line-height: ${lineHeight};
  -webkit-text-size-adjust: 100%;
  -webkit-tap-highlight-color: transparent;
 `, [c('input', `

package/es/_styles/transitions/icon-switch.cssr.js

@@ -1,10 +1,14 @@
 import { c } from '../../_utils/cssr';
 import commonVariables from '../common/_common';
+const {
+  cubicBezierEaseInOut,
+  transformDebounceScale
+} = commonVariables;
 export default function ({
   originalTransform = '',
   left = 0,
   top = 0,
-  transition = `all .3s ${commonVariables.cubicBezierEaseInOut} !important`
+  transition = `all .3s ${cubicBezierEaseInOut} !important`
 } = {}) {
   return [c('&.icon-switch-transition-enter-from, &.icon-switch-transition-leave-to', {
     transform: originalTransform + ' scale(0.75)',
@@ -12,7 +16,7 @@ export default function ({
     top,
     opacity: 0
   }), c('&.icon-switch-transition-enter-to, &.icon-switch-transition-leave-from', {
-    transform: `${commonVariables.transformDebounceScale} ${originalTransform}`,
+    transform: `${transformDebounceScale} ${originalTransform}`,
     left,
     top,
     opacity: 1

package/es/_utils/naive/extract-public-props.d.ts

@@ -1,6 +1,6 @@
 import { ExtractPropTypes } from 'vue';
 import { useTheme } from '../../_mixins';
 declare type themePropKeys = keyof typeof useTheme.props;
-export declare type ExtractPublicPropTypes<T> = Omit<Partial<ExtractPropTypes<T>>, themePropKeys | Extract<keyof T, `internal${string}`>>;
+export declare type ExtractPublicPropTypes<T> = Omit<Partial<ExtractPropTypes<T>>, Exclude<themePropKeys, 'themeOverrides'> | Extract<keyof T, `internal${string}`>>;
 export declare type ExtractInternalPropTypes<T> = Partial<ExtractPropTypes<T>>;
 export {};

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

@@ -437,9 +437,13 @@ declare const _default: import("vue").DefineComponent<{
             tableHeaderColor: string;
             hoverColor: string;
             tableColorHover: string;
+            tableColorStriped: string;
             pressedColor: string;
             opacityDisabled: string;
             inputColorDisabled: string;
+            buttonColor2: string;
+            buttonColor2Hover: string;
+            buttonColor2Pressed: string;
             boxShadow1: string;
             boxShadow2: string;
             boxShadow3: string;

package/es/auto-complete/src/AutoComplete.d.ts

@@ -1,4 +1,4 @@
-import { PropType } from 'vue';
+import { PropType, InputHTMLAttributes } from 'vue';
 import { TreeNode } from 'treemate';
 import { MaybeArray } from '../../_utils';
 import type { ExtractPublicPropTypes } from '../../_utils';
@@ -34,6 +34,7 @@ declare const autoCompleteProps: {
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
     readonly getShow: PropType<(inputValue: string) => boolean>;
+    readonly inputProps: PropType<InputHTMLAttributes>;
     readonly size: PropType<"small" | "medium" | "large">;
     readonly options: {
         readonly type: PropType<AutoCompleteOptions>;
@@ -430,6 +431,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly blurAfterSelect: BooleanConstructor;
     readonly clearAfterSelect: BooleanConstructor;
     readonly getShow: PropType<(inputValue: string) => boolean>;
+    readonly inputProps: PropType<InputHTMLAttributes>;
     readonly size: PropType<"small" | "medium" | "large">;
     readonly options: {
         readonly type: PropType<AutoCompleteOptions>;
@@ -889,9 +891,13 @@ declare const _default: import("vue").DefineComponent<{
             tableHeaderColor: string;
             hoverColor: string;
             tableColorHover: string;
+            tableColorStriped: string;
             pressedColor: string;
             opacityDisabled: string;
             inputColorDisabled: string;
+            buttonColor2: string;
+            buttonColor2Hover: string;
+            buttonColor2Pressed: string;
             boxShadow1: string;
             boxShadow2: string;
             boxShadow3: string;
@@ -1084,6 +1090,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly blurAfterSelect?: unknown;
     readonly clearAfterSelect?: unknown;
     readonly getShow?: unknown;
+    readonly inputProps?: unknown;
     readonly size?: unknown;
     readonly options?: unknown;
     readonly zIndex?: unknown;
@@ -1463,6 +1470,7 @@ declare const _default: import("vue").DefineComponent<{
     loading?: boolean | undefined;
     bordered?: boolean | undefined;
     clearable?: boolean | undefined;
+    inputProps?: InputHTMLAttributes | undefined;
     "onUpdate:value"?: MaybeArray<OnUpdateValue> | undefined;
     onUpdateValue?: MaybeArray<OnUpdateValue> | undefined;
     getShow?: ((inputValue: string) => boolean) | undefined;

package/es/auto-complete/src/AutoComplete.js

@@ -26,7 +26,7 @@ const autoCompleteProps = Object.assign(Object.assign({}, useTheme.props), { to:
     }, disabled: {
         type: Boolean,
         default: undefined
-    }, placeholder: String, value: String, blurAfterSelect: Boolean, clearAfterSelect: Boolean, getShow: Function, size: String, options: {
+    }, placeholder: String, value: String, blurAfterSelect: Boolean, clearAfterSelect: Boolean, getShow: Function, inputProps: Object, size: String, options: {
         type: Array,
         default: () => []
     }, zIndex: Number, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], onSelect: [Function, Array], onBlur: [Function, Array], onFocus: [Function, Array], 
@@ -232,7 +232,10 @@ export default defineComponent({
                                 });
                             }
                             const { mergedTheme } = this;
-                            return (h(NInput, { theme: mergedTheme.peers.Input, themeOverrides: mergedTheme.peerOverrides.Input, bordered: this.mergedBordered, value: this.mergedValue, placeholder: this.placeholder, size: this.mergedSize, disabled: this.mergedDisabled, clearable: this.clearable, loading: this.loading, onClear: this.handleClear, onFocus: this.handleFocus, onUpdateValue: this.handleInput, onBlur: this.handleBlur }));
+                            return (h(NInput, { theme: mergedTheme.peers.Input, themeOverrides: mergedTheme.peerOverrides.Input, bordered: this.mergedBordered, value: this.mergedValue, placeholder: this.placeholder, size: this.mergedSize, disabled: this.mergedDisabled, clearable: this.clearable, loading: this.loading, inputProps: this.inputProps, onClear: this.handleClear, onFocus: this.handleFocus, onUpdateValue: this.handleInput, onBlur: this.handleBlur }, {
+                                suffix: this.$slots.suffix,
+                                prefix: this.$slots.prefix
+                            }));
                         }
                     }),
                     h(VFollower, { show: this.active, to: this.adjustedTo, containerClass: this.namespace, zIndex: this.zIndex, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey, placement: "bottom-start", width: "target" }, {

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

@@ -14,6 +14,7 @@ declare const avatarProps: {
     };
     readonly round: BooleanConstructor;
     readonly onError: PropType<(e: Event) => void>;
+    readonly fallbackSrc: StringConstructor;
     readonly theme: PropType<import("../../_mixins").Theme<"Avatar", {
         borderRadius: string;
         fontSize: string;
@@ -60,6 +61,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     readonly round: BooleanConstructor;
     readonly onError: PropType<(e: Event) => void>;
+    readonly fallbackSrc: StringConstructor;
     readonly theme: PropType<import("../../_mixins").Theme<"Avatar", {
         borderRadius: string;
         fontSize: string;
@@ -93,6 +95,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     textRef: import("vue").Ref<HTMLElement | null>;
     selfRef: import("vue").Ref<HTMLElement | null>;
+    mergedRoundRef: import("vue").ComputedRef<boolean>;
     mergedClsPrefix: import("vue").ComputedRef<string>;
     fitTextTransform: () => void;
     cssVars: import("vue").ComputedRef<{
@@ -100,8 +103,10 @@ declare const _default: import("vue").DefineComponent<{
         '--border-radius': string;
         '--color': string;
         '--bezier': string;
-        '--size': string;
+        '--merged-size': string;
     }>;
+    hasLoadError: import("vue").Ref<boolean>;
+    handleError: (e: Event) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     readonly size?: unknown;
     readonly src?: unknown;
@@ -110,6 +115,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly objectFit?: unknown;
     readonly round?: unknown;
     readonly onError?: unknown;
+    readonly fallbackSrc?: unknown;
     readonly theme?: unknown;
     readonly themeOverrides?: unknown;
     readonly builtinThemeOverrides?: unknown;
@@ -152,6 +158,7 @@ declare const _default: import("vue").DefineComponent<{
         heightHuge: string;
         color: string;
     }, any>> | undefined;
+    fallbackSrc?: string | undefined;
 }>, {
     round: boolean;
     size: number | "small" | "medium" | "large";

package/es/avatar/src/Avatar.js

@@ -1,5 +1,6 @@
-import { h, ref, computed, defineComponent } from 'vue';
+import { h, ref, computed, defineComponent, inject, watch } from 'vue';
 import { VResizeObserver } from 'vueuc';
+import { tagInjectionKey } from '../../tag/src/Tag';
 import { useConfig, useTheme } from '../../_mixins';
 import { avatarLight } from '../styles';
 import { createKey } from '../../_utils';
@@ -10,12 +11,13 @@ const avatarProps = Object.assign(Object.assign({}, useTheme.props), { size: {
     }, src: String, circle: Boolean, color: String, objectFit: {
         type: String,
         default: 'fill'
-    }, round: Boolean, onError: Function });
+    }, round: Boolean, onError: Function, fallbackSrc: String });
 export default defineComponent({
     name: 'Avatar',
     props: avatarProps,
     setup(props) {
         const { mergedClsPrefixRef } = useConfig(props);
+        const hasLoadErrorRef = ref(false);
         let memoedTextHtml = null;
         const textRef = ref(null);
         const selfRef = ref(null);
@@ -36,13 +38,31 @@ export default defineComponent({
             }
         };
         const themeRef = useTheme('Avatar', 'Avatar', style, avatarLight, props, mergedClsPrefixRef);
+        const TagInjection = inject(tagInjectionKey, null);
+        const mergedRoundRef = computed(() => {
+            if (props.round || props.circle)
+                return true;
+            if (TagInjection) {
+                return TagInjection.roundRef.value;
+            }
+            return false;
+        });
+        const handleError = (e) => {
+            hasLoadErrorRef.value = true;
+            const { onError } = props;
+            if (onError) {
+                onError(e);
+            }
+        };
+        watch(() => props.src, () => (hasLoadErrorRef.value = false));
         return {
             textRef,
             selfRef,
+            mergedRoundRef,
             mergedClsPrefix: mergedClsPrefixRef,
             fitTextTransform,
             cssVars: computed(() => {
-                const { size, round, circle } = props;
+                const { size } = props;
                 const { self: { borderRadius, fontSize, color }, common: { cubicBezierEaseInOut } } = themeRef.value;
                 let height;
                 if (typeof size === 'number') {
@@ -53,18 +73,30 @@ export default defineComponent({
                 }
                 return {
                     '--font-size': fontSize,
-                    '--border-radius': round || circle ? '50%' : borderRadius,
+                    '--border-radius': mergedRoundRef.value ? '50%' : borderRadius,
                     '--color': color,
                     '--bezier': cubicBezierEaseInOut,
-                    '--size': height
+                    '--merged-size': `var(--avatar-size-override, ${height})`
                 };
-            })
+            }),
+            hasLoadError: hasLoadErrorRef,
+            handleError
         };
     },
     render() {
         const { $slots, src, mergedClsPrefix } = this;
-        return (h("span", { ref: "selfRef", class: `${mergedClsPrefix}-avatar`, style: this.cssVars }, !$slots.default && src ? (h("img", { src: src, onError: this.onError, style: { objectFit: this.objectFit } })) : (h(VResizeObserver, { onResize: this.fitTextTransform }, {
-            default: () => (h("span", { ref: "textRef", class: `${mergedClsPrefix}-avatar__text`, style: { background: this.color } }, $slots))
-        }))));
+        let img;
+        if (this.hasLoadError) {
+            img = h("img", { src: this.fallbackSrc, style: { objectFit: this.objectFit } });
+        }
+        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))
+            }));
+        }
+        else {
+            img = (h("img", { src: src, onError: this.handleError, style: { objectFit: this.objectFit } }));
+        }
+        return (h("span", { ref: "selfRef", class: `${mergedClsPrefix}-avatar`, style: this.cssVars }, img));
     }
 });

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

@@ -6,8 +6,8 @@ import { c, cE, cB } from '../../../_utils/cssr'; // vars:
 // --size
 
 export default cB('avatar', `
- width: var(--size);
- height: var(--size);
+ width: var(--merged-size);
+ height: var(--merged-size);
  color: #FFF;
  font-size: var(--font-size);
  display: inline-flex;