naive-ui 2.43.2 → 2.44.1

package/es/tabs/src/Tabs.mjs

@@ -24,10 +24,7 @@ export const tabsProps = Object.assign(Object.assign({}, useTheme.props), {
   },
   closable: Boolean,
   justifyContent: String,
-  size: {
-    type: String,
-    default: 'medium'
-  },
+  size: String,
   placement: {
     type: String,
     default: 'top'
@@ -80,7 +77,8 @@ export default defineComponent({
     }
     const {
       mergedClsPrefixRef,
-      inlineThemeDisabled
+      inlineThemeDisabled,
+      mergedComponentPropsRef
     } = useConfig(props);
     const themeRef = useTheme('Tabs', '-tabs', style, tabsLight, props, mergedClsPrefixRef);
     const tabsElRef = ref(null);
@@ -92,6 +90,13 @@ export default defineComponent({
     const startReachedRef = ref(true);
     const endReachedRef = ref(true);
     const compitableSizeRef = useCompitable(props, ['labelSize', 'size']);
+    const mergedSizeRef = computed(() => {
+      var _a, _b;
+      if (compitableSizeRef.value) return compitableSizeRef.value;
+      const configSize = (_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.Tabs) === null || _b === void 0 ? void 0 : _b.size;
+      if (configSize) return configSize;
+      return 'medium';
+    });
     const compitableValueRef = useCompitable(props, ['activeName', 'value']);
     const uncontrolledValueRef = ref((_b = (_a = compitableValueRef.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : slots.default ? (_d = (_c = flatten(slots.default())[0]) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.name : null);
     const mergedValueRef = useMergedState(compitableValueRef, uncontrolledValueRef);
@@ -564,7 +569,7 @@ export default defineComponent({
     const cssVarsRef = computed(() => {
       const {
         value: size
-      } = compitableSizeRef;
+      } = mergedSizeRef;
       const {
         type
       } = props;
@@ -646,7 +651,7 @@ export default defineComponent({
       };
     });
     const themeClassHandle = inlineThemeDisabled ? useThemeClass('tabs', computed(() => {
-      return `${compitableSizeRef.value[0]}${props.type[0]}`;
+      return `${mergedSizeRef.value[0]}${props.type[0]}`;
     }), cssVarsRef, props) : undefined;
     return Object.assign({
       mergedClsPrefix: mergedClsPrefixRef,
@@ -662,7 +667,7 @@ export default defineComponent({
       addTabFixed: addTabFixedRef,
       tabWrapperStyle: tabWrapperStyleRef,
       handleNavResize,
-      mergedSize: compitableSizeRef,
+      mergedSize: mergedSizeRef,
       handleScroll,
       handleTabsResize,
       cssVars: inlineThemeDisabled ? undefined : cssVarsRef,

package/es/tabs/src/public-types.d.ts

@@ -0,0 +1 @@
+export type TabsSize = 'small' | 'medium' | 'large';

package/es/tabs/src/public-types.mjs

@@ -0,0 +1 @@
+export {};

package/es/tag/index.d.ts

@@ -1,2 +1,3 @@
+export type * from './src/public-types';
 export { default as NTag, tagProps } from './src/Tag';
 export type { TagProps, TagSlots } from './src/Tag';

package/es/tag/src/Tag.d.ts

@@ -35,10 +35,7 @@ export declare const tagProps: {
         readonly default: "default";
     };
     round: BooleanConstructor;
-    size: {
-        readonly type: PropType<"tiny" | "small" | "medium" | "large">;
-        readonly default: "medium";
-    };
+    size: PropType<import("./public-types").TagSize>;
     closable: BooleanConstructor;
     disabled: {
         readonly type: PropType<boolean | undefined>;
@@ -348,10 +345,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         readonly default: "default";
     };
     round: BooleanConstructor;
-    size: {
-        readonly type: PropType<"tiny" | "small" | "medium" | "large">;
-        readonly default: "medium";
-    };
+    size: PropType<import("./public-types").TagSize>;
     closable: BooleanConstructor;
     disabled: {
         readonly type: PropType<boolean | undefined>;
@@ -696,10 +690,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         readonly default: "default";
     };
     round: BooleanConstructor;
-    size: {
-        readonly type: PropType<"tiny" | "small" | "medium" | "large">;
-        readonly default: "medium";
-    };
+    size: PropType<import("./public-types").TagSize>;
     closable: BooleanConstructor;
     disabled: {
         readonly type: PropType<boolean | undefined>;
@@ -972,7 +963,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>> & Readonly<{}>, {
     disabled: boolean | undefined;
     type: "default" | "info" | "warning" | "error" | "success" | "primary";
-    size: "tiny" | "small" | "medium" | "large";
     bordered: boolean | undefined;
     closable: boolean;
     round: boolean;

package/es/tag/src/Tag.mjs

@@ -51,8 +51,13 @@ export default defineComponent({
       mergedBorderedRef,
       mergedClsPrefixRef,
       inlineThemeDisabled,
-      mergedRtlRef
+      mergedRtlRef,
+      mergedComponentPropsRef
     } = useConfig(props);
+    const mergedSizeRef = computed(() => {
+      var _a, _b;
+      return props.size || ((_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.Tag) === null || _b === void 0 ? void 0 : _b.size) || 'medium';
+    });
     const themeRef = useTheme('Tag', '-tag', style, tagLight, props, mergedClsPrefixRef);
     provide(tagInjectionKey, {
       roundRef: toRef(props, 'round')
@@ -96,12 +101,12 @@ export default defineComponent({
     const cssVarsRef = computed(() => {
       const {
         type,
-        size,
         color: {
           color,
           textColor
         } = {}
       } = props;
+      const size = mergedSizeRef.value;
       const {
         common: {
           cubicBezierEaseInOut
@@ -180,14 +185,13 @@ export default defineComponent({
       let hash = '';
       const {
         type,
-        size,
         color: {
           color,
           textColor
         } = {}
       } = props;
       hash += type[0];
-      hash += size[0];
+      hash += mergedSizeRef.value[0];
       if (color) {
         hash += `a${color2Class(color)}`;
       }

package/es/tag/src/common-props.d.ts

@@ -1,4 +1,5 @@
 import type { PropType } from 'vue';
+import type { TagSize } from './public-types';
 export interface TagColor {
     color?: string;
     borderColor?: string;
@@ -11,10 +12,7 @@ declare const _default: {
         readonly default: "default";
     };
     readonly round: BooleanConstructor;
-    readonly size: {
-        readonly type: PropType<"tiny" | "small" | "medium" | "large">;
-        readonly default: "medium";
-    };
+    readonly size: PropType<TagSize>;
     readonly closable: BooleanConstructor;
     readonly disabled: {
         readonly type: PropType<boolean | undefined>;

package/es/tag/src/common-props.mjs

@@ -5,10 +5,7 @@ export default {
     default: 'default'
   },
   round: Boolean,
-  size: {
-    type: String,
-    default: 'medium'
-  },
+  size: String,
   closable: Boolean,
   disabled: {
     type: Boolean,

package/es/tag/src/public-types.d.ts

@@ -0,0 +1 @@
+export type TagSize = 'tiny' | 'small' | 'medium' | 'large';

package/es/tag/src/public-types.mjs

@@ -0,0 +1 @@
+export {};

package/es/time-picker/index.d.ts

@@ -1,3 +1,4 @@
 export type { TimePickerInst } from './src/interface';
+export type * from './src/public-types';
 export { default as NTimePicker, timePickerProps } from './src/TimePicker';
 export type { TimePickerProps, TimePickerSlots } from './src/TimePicker';

package/es/time-picker/src/TimePicker.d.ts

@@ -2,7 +2,8 @@ import type { PropType, VNode } from 'vue';
 import type { FollowerPlacement } from 'vueuc';
 import type { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
 import type { FormValidationStatus } from '../../form/src/public-types';
-import type { IsHourDisabled, IsMinuteDisabled, IsSecondDisabled, ItemValue, OnUpdateFormattedValue, OnUpdateValue, PanelRef, Size } from './interface';
+import type { IsHourDisabled, IsMinuteDisabled, IsSecondDisabled, ItemValue, OnUpdateFormattedValue, OnUpdateValue, PanelRef } from './interface';
+import type { TimePickerSize } from './public-types';
 export declare const timePickerProps: {
     to: {
         type: PropType<HTMLElement | string | boolean>;
@@ -31,7 +32,7 @@ export declare const timePickerProps: {
     valueFormat: StringConstructor;
     formattedValue: PropType<string | null>;
     isHourDisabled: PropType<IsHourDisabled>;
-    size: PropType<Size>;
+    size: PropType<TimePickerSize>;
     isMinuteDisabled: PropType<IsMinuteDisabled>;
     isSecondDisabled: PropType<IsSecondDisabled>;
     inputReadonly: BooleanConstructor;
@@ -1039,7 +1040,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueFormat: StringConstructor;
     formattedValue: PropType<string | null>;
     isHourDisabled: PropType<IsHourDisabled>;
-    size: PropType<Size>;
+    size: PropType<TimePickerSize>;
     isMinuteDisabled: PropType<IsMinuteDisabled>;
     isSecondDisabled: PropType<IsSecondDisabled>;
     inputReadonly: BooleanConstructor;
@@ -2173,7 +2174,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     secondInFormat: import("vue").ComputedRef<boolean>;
     mergedAttrSize: import("vue").ComputedRef<number>;
     displayTimeString: import("vue").Ref<string, string>;
-    mergedSize: import("vue").ComputedRef<"small" | "medium" | "large">;
+    mergedSize: import("vue").ComputedRef<TimePickerSize>;
     mergedDisabled: import("vue").ComputedRef<boolean>;
     isValueInvalid: import("vue").ComputedRef<boolean>;
     isHourInvalid: import("vue").ComputedRef<boolean>;
@@ -2598,7 +2599,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     valueFormat: StringConstructor;
     formattedValue: PropType<string | null>;
     isHourDisabled: PropType<IsHourDisabled>;
-    size: PropType<Size>;
+    size: PropType<TimePickerSize>;
     isMinuteDisabled: PropType<IsMinuteDisabled>;
     isSecondDisabled: PropType<IsSecondDisabled>;
     inputReadonly: BooleanConstructor;

package/es/time-picker/src/TimePicker.mjs

@@ -118,13 +118,29 @@ export default defineComponent({
       mergedBorderedRef,
       mergedClsPrefixRef,
       namespaceRef,
-      inlineThemeDisabled
+      inlineThemeDisabled,
+      mergedComponentPropsRef
     } = useConfig(props);
     const {
       localeRef,
       dateLocaleRef
     } = useLocale('TimePicker');
-    const formItem = useFormItem(props);
+    const formItem = useFormItem(props, {
+      mergedSize: NFormItem => {
+        var _a, _b;
+        const {
+          size
+        } = props;
+        if (size) return size;
+        const {
+          mergedSize: formItemSize
+        } = NFormItem || {};
+        if (formItemSize === null || formItemSize === void 0 ? void 0 : formItemSize.value) return formItemSize.value;
+        const configSize = (_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.TimePicker) === null || _b === void 0 ? void 0 : _b.size;
+        if (configSize) return configSize;
+        return 'medium';
+      }
+    });
     const {
       mergedSizeRef,
       mergedDisabledRef,

package/es/time-picker/src/interface.d.ts

@@ -27,7 +27,6 @@ export type OnUpdateFormattedValueImpl = (value: string | null, timestampValue:
 export type IsHourDisabled = (hour: number) => boolean;
 export type IsMinuteDisabled = (minute: number, hour: number | null) => boolean;
 export type IsSecondDisabled = (second: number, minute: number | null, hour: number | null) => boolean;
-export type Size = 'small' | 'medium' | 'large';
 export interface TimePickerInst {
     focus: () => void;
     blur: () => void;

package/es/time-picker/src/public-types.d.ts

@@ -0,0 +1 @@
+export type TimePickerSize = 'small' | 'medium' | 'large';

package/es/time-picker/src/public-types.mjs

@@ -0,0 +1 @@
+export {};

package/es/tooltip/src/Tooltip.d.ts

@@ -671,23 +671,23 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
 }>> & Readonly<{}>, {
     disabled: boolean;
     raw: boolean;
+    width: number | "trigger";
+    duration: number;
+    scrollable: boolean;
+    trigger: import("../..").PopoverTrigger;
     to: string | boolean | HTMLElement;
     placement: import("vueuc").FollowerPlacement;
-    width: number | "trigger";
     show: boolean | undefined;
     showArrow: boolean;
-    trigger: import("../..").PopoverTrigger;
     arrow: boolean | undefined;
     defaultShow: boolean;
     delay: number;
-    duration: number;
     arrowPointToCenter: boolean;
     displayDirective: "show" | "if";
     flip: boolean;
     animated: boolean;
     overlap: boolean;
     keepAliveOnHover: boolean;
-    scrollable: boolean;
     internalDeactivateImmediately: boolean;
     internalSyncTargetWithParent: boolean;
     internalInheritedEventHandlers: import("../../popover/src/Popover").TriggerEventHandlers[];

package/es/transfer/index.d.ts

@@ -1,3 +1,4 @@
 export type { Option as TransferOption, TransferRenderSourceLabel, TransferRenderSourceList, TransferRenderTargetLabel } from './src/interface';
+export type * from './src/public-types';
 export { default as NTransfer, transferProps } from './src/Transfer';
 export type { TransferProps } from './src/Transfer';

package/es/transfer/src/Transfer.d.ts

@@ -1,6 +1,7 @@
 import type { PropType, VNodeChild } from 'vue';
 import type { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
 import type { Filter, OnUpdateValue, Option, OptionValue, TransferRenderSourceLabel, TransferRenderSourceList, TransferRenderTargetLabel } from './interface';
+import type { TransferSize } from './public-types';
 export declare const transferProps: {
     readonly value: PropType<OptionValue[] | null>;
     readonly defaultValue: {
@@ -36,7 +37,7 @@ export declare const transferProps: {
         readonly type: PropType<Filter>;
         readonly default: (pattern: string, option: Option) => number | true;
     };
-    readonly size: PropType<"small" | "medium" | "large">;
+    readonly size: PropType<TransferSize>;
     readonly renderSourceLabel: PropType<TransferRenderSourceLabel>;
     readonly renderTargetLabel: PropType<TransferRenderTargetLabel>;
     readonly renderSourceList: PropType<TransferRenderSourceList>;
@@ -1203,7 +1204,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         readonly type: PropType<Filter>;
         readonly default: (pattern: string, option: Option) => number | true;
     };
-    readonly size: PropType<"small" | "medium" | "large">;
+    readonly size: PropType<TransferSize>;
     readonly renderSourceLabel: PropType<TransferRenderSourceLabel>;
     readonly renderTargetLabel: PropType<TransferRenderTargetLabel>;
     readonly renderSourceList: PropType<TransferRenderSourceList>;
@@ -2758,7 +2759,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     filteredTgtOpts: import("vue").ComputedRef<Option[]>;
     srcPattern: import("vue").Ref<string, string>;
     tgtPattern: import("vue").Ref<string, string>;
-    mergedSize: import("vue").ComputedRef<"small" | "medium" | "large">;
+    mergedSize: import("vue").ComputedRef<TransferSize>;
     mergedSrcFilterable: import("vue").ComputedRef<boolean>;
     handleSrcFilterUpdateValue: (value: string | null) => void;
     handleTgtFilterUpdateValue: (value: string | null) => void;
@@ -2829,7 +2830,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         readonly type: PropType<Filter>;
         readonly default: (pattern: string, option: Option) => number | true;
     };
-    readonly size: PropType<"small" | "medium" | "large">;
+    readonly size: PropType<TransferSize>;
     readonly renderSourceLabel: PropType<TransferRenderSourceLabel>;
     readonly renderTargetLabel: PropType<TransferRenderTargetLabel>;
     readonly renderSourceList: PropType<TransferRenderSourceList>;

package/es/transfer/src/Transfer.mjs

@@ -74,10 +74,26 @@ export default defineComponent({
       });
     }
     const {
-      mergedClsPrefixRef
+      mergedClsPrefixRef,
+      mergedComponentPropsRef
     } = useConfig(props);
     const themeRef = useTheme('Transfer', '-transfer', style, transferLight, props, mergedClsPrefixRef);
-    const formItem = useFormItem(props);
+    const formItem = useFormItem(props, {
+      mergedSize: NFormItem => {
+        var _a, _b;
+        const {
+          size
+        } = props;
+        if (size) return size;
+        const {
+          mergedSize: formItemSize
+        } = NFormItem || {};
+        if (formItemSize === null || formItemSize === void 0 ? void 0 : formItemSize.value) return formItemSize.value;
+        const configSize = (_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.Transfer) === null || _b === void 0 ? void 0 : _b.size;
+        if (configSize) return configSize;
+        return 'medium';
+      }
+    });
     const {
       mergedSizeRef,
       mergedDisabledRef

package/es/transfer/src/TransferList.d.ts

@@ -853,6 +853,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         };
     }>;
     mergedClsPrefix: import("vue").Ref<string, string>;
+    mergedRenderEmpty: import("vue").ComputedRef<(() => import("vue").VNodeChild) | undefined>;
     scrollerInstRef: import("vue").Ref<{
         $el: HTMLElement;
         containerRef: HTMLElement | null;

package/es/transfer/src/TransferList.mjs

@@ -1,6 +1,7 @@
-import { defineComponent, h, inject, ref } from 'vue';
+import { computed, defineComponent, h, inject, ref } from 'vue';
 import { VirtualList } from 'vueuc';
 import { NScrollbar } from "../../_internal/index.mjs";
+import { useConfig } from "../../_mixins/index.mjs";
 import { NEmpty } from "../../empty/index.mjs";
 import { transferInjectionKey } from "./interface.mjs";
 import NTransferListItem from "./TransferListItem.mjs";
@@ -30,8 +31,15 @@ export default defineComponent({
       mergedThemeRef,
       mergedClsPrefixRef
     } = inject(transferInjectionKey);
+    const {
+      mergedComponentPropsRef
+    } = useConfig();
     const scrollerInstRef = ref(null);
     const vlInstRef = ref(null);
+    const mergedRenderEmptyRef = computed(() => {
+      var _a, _b;
+      return (_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.Transfer) === null || _b === void 0 ? void 0 : _b.renderEmpty;
+    });
     function syncVLScroller() {
       var _a;
       (_a = scrollerInstRef.value) === null || _a === void 0 ? void 0 : _a.sync();
@@ -59,6 +67,7 @@ export default defineComponent({
     return {
       mergedTheme: mergedThemeRef,
       mergedClsPrefix: mergedClsPrefixRef,
+      mergedRenderEmpty: mergedRenderEmptyRef,
       scrollerInstRef,
       vlInstRef,
       syncVLScroller,
@@ -67,12 +76,13 @@ export default defineComponent({
     };
   },
   render() {
+    var _a;
     const {
       mergedTheme,
       options
     } = this;
     if (options.length === 0) {
-      return h(NEmpty, {
+      return ((_a = this.mergedRenderEmpty) === null || _a === void 0 ? void 0 : _a.call(this)) || h(NEmpty, {
         theme: mergedTheme.peers.Empty,
         themeOverrides: mergedTheme.peerOverrides.Empty
       });

package/es/transfer/src/public-types.d.ts

@@ -0,0 +1 @@
+export type TransferSize = 'small' | 'medium' | 'large';

package/es/transfer/src/public-types.mjs

@@ -0,0 +1 @@
+export {};

package/es/tree/index.d.ts

@@ -1,4 +1,5 @@
 export type { TreeDragInfo, TreeDropInfo, TreeInst, TreeOption, TreeOverrideNodeClickBehavior, TreeOverrideNodeClickBehaviorReturn } from './src/interface';
+export type * from './src/public-types';
 export { default as NTree, treeProps } from './src/Tree';
 export type { TreeProps, TreeSlots } from './src/Tree';
 export { treeGetClickTarget } from './src/utils';

package/es/tree/src/Tree.d.ts

@@ -5,6 +5,7 @@ import type { ScrollbarInst } from '../../_internal';
 import type { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
 import type { ScrollbarProps } from '../../scrollbar/src/Scrollbar';
 import type { AllowDrop, CheckOnClick, GetChildren, Key, OnLoad, RenderLabel, RenderPrefix, RenderSuffix, RenderSwitcherIcon, TreeDragInfo, TreeDropInfo, TreeNodeProps, TreeOption, TreeOptions, TreeOverrideNodeClickBehavior } from './interface';
+import type { TreeSpinProps } from './public-types';
 import { defaultAllowDrop } from './dnd';
 export declare function createTreeMateOptions<T>(keyField: string, childrenField: string, disabledField: string, getChildren: GetChildren | undefined): TreeMateOptions<T, T, T>;
 export type OnUpdateCheckedKeys = (value: Array<string & number>, option: Array<TreeOption | null>, meta: {
@@ -95,6 +96,7 @@ export declare const treeProps: {
         readonly type: PropType<CheckStrategy>;
         readonly default: "all";
     };
+    readonly spinProps: PropType<TreeSpinProps>;
     /**
      * @deprecated
      */
@@ -465,6 +467,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         readonly type: PropType<CheckStrategy>;
         readonly default: "all";
     };
+    readonly spinProps: PropType<TreeSpinProps>;
     /**
      * @deprecated
      */
@@ -907,6 +910,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             } | undefined;
         };
     }>;
+    mergedRenderEmpty: import("vue").ComputedRef<(() => VNodeChild) | undefined>;
     rtlEnabled: import("vue").Ref<import("../../config-provider/src/internal-interface").RtlItem | undefined, import("../../config-provider/src/internal-interface").RtlItem | undefined> | undefined;
     fNodes: import("vue").ComputedRef<({
         key: import("treemate").Key;
@@ -1247,6 +1251,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         readonly type: PropType<CheckStrategy>;
         readonly default: "all";
     };
+    readonly spinProps: PropType<TreeSpinProps>;
     /**
      * @deprecated
      */

package/es/tree/src/Tree.mjs

@@ -204,6 +204,7 @@ export const treeProps = Object.assign(Object.assign(Object.assign(Object.assign
     type: String,
     default: 'all'
   },
+  spinProps: Object,
   /**
    * @deprecated
    */
@@ -224,10 +225,15 @@ export default defineComponent({
     const {
       mergedClsPrefixRef,
       inlineThemeDisabled,
-      mergedRtlRef
+      mergedRtlRef,
+      mergedComponentPropsRef
     } = useConfig(props);
     const rtlEnabledRef = useRtl('Tree', mergedRtlRef, mergedClsPrefixRef);
     const themeRef = useTheme('Tree', '-tree', style, treeLight, props, mergedClsPrefixRef);
+    const mergedRenderEmptyRef = computed(() => {
+      var _a, _b;
+      return (_b = (_a = mergedComponentPropsRef === null || mergedComponentPropsRef === void 0 ? void 0 : mergedComponentPropsRef.value) === null || _a === void 0 ? void 0 : _a.Tree) === null || _b === void 0 ? void 0 : _b.renderEmpty;
+    });
     const selfElRef = ref(null);
     const scrollbarInstRef = ref(null);
     const virtualListInstRef = ref(null);
@@ -1272,6 +1278,7 @@ export default defineComponent({
       labelFieldRef: toRef(props, 'labelField'),
       multipleRef: toRef(props, 'multiple'),
       overrideDefaultNodeClickBehaviorRef: toRef(props, 'overrideDefaultNodeClickBehavior'),
+      spinPropsRef: toRef(props, 'spinProps'),
       handleSwitcherClick,
       handleDragEnd,
       handleDragEnter,
@@ -1369,6 +1376,7 @@ export default defineComponent({
     return Object.assign(Object.assign({}, exposedMethods), {
       mergedClsPrefix: mergedClsPrefixRef,
       mergedTheme: themeRef,
+      mergedRenderEmpty: mergedRenderEmptyRef,
       rtlEnabled: rtlEnabledRef,
       fNodes: mergedFNodesRef,
       aip: aipRef,
@@ -1447,11 +1455,14 @@ export default defineComponent({
         default: () => {
           var _a;
           (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
-          return !fNodes.length ? resolveSlot(this.$slots.empty, () => [h(NEmpty, {
-            class: `${mergedClsPrefix}-tree__empty`,
-            theme: this.mergedTheme.peers.Empty,
-            themeOverrides: this.mergedTheme.peerOverrides.Empty
-          })]) : h(VVirtualList, {
+          return !fNodes.length ? resolveSlot(this.$slots.empty, () => {
+            var _a;
+            return [((_a = this.mergedRenderEmpty) === null || _a === void 0 ? void 0 : _a.call(this)) || h(NEmpty, {
+              class: `${mergedClsPrefix}-tree__empty`,
+              theme: this.mergedTheme.peers.Empty,
+              themeOverrides: this.mergedTheme.peerOverrides.Empty
+            })];
+          }) : h(VVirtualList, {
             ref: "virtualListInstRef",
             items: this.fNodes,
             itemSize: depx(mergedTheme.self.nodeHeight),
@@ -1505,11 +1516,14 @@ export default defineComponent({
         onKeydown: mergedFocusable ? handleKeydown : undefined,
         onFocusout: mergedFocusable ? handleFocusout : undefined,
         onDragleave: draggable ? this.handleDragLeaveTree : undefined
-      }, !fNodes.length ? resolveSlot(this.$slots.empty, () => [h(NEmpty, {
-        class: `${mergedClsPrefix}-tree__empty`,
-        theme: this.mergedTheme.peers.Empty,
-        themeOverrides: this.mergedTheme.peerOverrides.Empty
-      })]) : fNodes.map(createNode));
+      }, !fNodes.length ? resolveSlot(this.$slots.empty, () => {
+        var _a;
+        return [((_a = this.mergedRenderEmpty) === null || _a === void 0 ? void 0 : _a.call(this)) || h(NEmpty, {
+          class: `${mergedClsPrefix}-tree__empty`,
+          theme: this.mergedTheme.peers.Empty,
+          themeOverrides: this.mergedTheme.peerOverrides.Empty
+        })];
+      }) : fNodes.map(createNode));
     }
   }
 });

package/es/tree/src/TreeNodeSwitcher.mjs

@@ -25,7 +25,8 @@ export default defineComponent({
   },
   setup(props) {
     const {
-      renderSwitcherIconRef
+      renderSwitcherIconRef,
+      spinPropsRef
     } = inject(treeInjectionKey, null);
     return () => {
       const {
@@ -47,12 +48,12 @@ export default defineComponent({
       }, h(NIconSwitchTransition, null, {
         default: () => {
           if (props.loading) {
-            return h(NBaseLoading, {
+            return h(NBaseLoading, Object.assign({
               clsPrefix: clsPrefix,
               key: "loading",
               radius: 85,
               strokeWidth: 20
-            });
+            }, spinPropsRef === null || spinPropsRef === void 0 ? void 0 : spinPropsRef.value));
           }
           const {
             value: renderSwitcherIcon

package/es/tree/src/interface.d.ts

@@ -3,6 +3,7 @@ import type { HTMLAttributes, Ref, VNodeChild } from 'vue';
 import type { VirtualListScrollTo } from 'vueuc';
 import type { MergedTheme } from '../../_mixins';
 import type { TreeTheme } from '../styles';
+import type { TreeSpinProps } from './public-types';
 export type Key = string | number;
 export type OnLoad = (node: TreeOption) => Promise<unknown>;
 export interface TreeOptionBase {
@@ -104,6 +105,7 @@ export interface TreeInjection {
     disabledFieldRef: Ref<string>;
     showLineRef: Ref<boolean>;
     overrideDefaultNodeClickBehaviorRef: Ref<TreeOverrideNodeClickBehavior | undefined>;
+    spinPropsRef: Ref<TreeSpinProps | undefined>;
     handleSwitcherClick: (node: TreeNode<TreeOption>) => void;
     handleSelect: (node: TreeNode<TreeOption>) => void;
     handleCheck: (node: TreeNode<TreeOption>, checked: boolean) => void;

package/es/tree/src/public-types.d.ts

@@ -0,0 +1,2 @@
+import type { SharedSpinProps } from '../../_internal';
+export type TreeSpinProps = SharedSpinProps;

package/es/tree/src/public-types.mjs

@@ -0,0 +1 @@
+export {};