naive-ui 2.33.2 → 2.33.4

package/es/tag/src/Tag.js

@@ -1,8 +1,8 @@
-import { h, defineComponent, computed, ref, provide, toRef } from 'vue';
+import { h, defineComponent, computed, ref, provide, toRef, watchEffect } from 'vue';
 import { useRtl } from '../../_mixins/use-rtl';
 import { NBaseClose } from '../../_internal/close';
 import { useConfig, useThemeClass, useTheme } from '../../_mixins';
-import { warn, createKey, call, createInjectionKey, color2Class, resolveWrappedSlot } from '../../_utils';
+import { createKey, call, createInjectionKey, color2Class, resolveWrappedSlot, warnOnce } from '../../_utils';
 import { tagLight } from '../styles';
 import commonProps from './common-props';
 import style from './styles/index.cssr';
@@ -14,23 +14,24 @@ export const tagProps = Object.assign(Object.assign(Object.assign({}, useTheme.p
     internalCloseFocusable: {
         type: Boolean,
         default: true
+    }, internalCloseIsButtonTag: {
+        type: Boolean,
+        default: true
     }, 
     // deprecated
-    onCheckedChange: {
-        type: Function,
-        validator: () => {
-            if (process.env.NODE_ENV !== 'production') {
-                warn('tag', '`on-checked-change` is deprecated, please use `on-update:checked` instead');
-            }
-            return true;
-        },
-        default: undefined
-    } });
+    onCheckedChange: Function });
 export const tagInjectionKey = createInjectionKey('n-tag');
 export default defineComponent({
     name: 'Tag',
     props: tagProps,
     setup(props) {
+        if (process.env.NODE_ENV !== 'production') {
+            watchEffect(() => {
+                if (props.onCheckedChange !== undefined) {
+                    warnOnce('tag', '`on-checked-change` is deprecated, please use `on-update:checked` instead');
+                }
+            });
+        }
         const contentRef = ref(null);
         const { mergedBorderedRef, mergedClsPrefixRef, inlineThemeDisabled, mergedRtlRef } = useConfig(props);
         const themeRef = useTheme('Tag', '-tag', style, tagLight, props, mergedClsPrefixRef);
@@ -151,7 +152,7 @@ export default defineComponent({
             ], style: this.cssVars, onClick: this.handleClick, onMouseenter: this.onMouseenter, onMouseleave: this.onMouseleave },
             iconNode || avatarNode,
             h("span", { class: `${mergedClsPrefix}-tag__content`, ref: "contentRef" }, (_b = (_a = this.$slots).default) === null || _b === void 0 ? void 0 : _b.call(_a)),
-            !this.checkable && closable ? (h(NBaseClose, { clsPrefix: mergedClsPrefix, class: `${mergedClsPrefix}-tag__close`, disabled: this.disabled, onClick: this.handleCloseClick, focusable: this.internalCloseFocusable, round: round, absolute: true })) : null,
+            !this.checkable && closable ? (h(NBaseClose, { clsPrefix: mergedClsPrefix, class: `${mergedClsPrefix}-tag__close`, disabled: this.disabled, onClick: this.handleCloseClick, focusable: this.internalCloseFocusable, round: round, isButtonTag: this.internalCloseIsButtonTag, absolute: true })) : null,
             !this.checkable && this.mergedBordered ? (h("div", { class: `${mergedClsPrefix}-tag__border`, style: { borderColor } })) : null));
     }
 });

package/es/theme-editor/src/MaximizeIcon.d.ts

@@ -1 +1 @@
-export declare const MaximizeIcon: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+export declare const MaximizeIcon: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/theme-editor/src/MinimizeIcon.d.ts

@@ -1 +1 @@
-export declare const MinimizeIcon: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+export declare const MinimizeIcon: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/theme-editor/src/ThemeEditor.d.ts

@@ -134,5 +134,5 @@ declare const _default: import("vue").DefineComponent<{}, {
     isMaximized: import("vue").Ref<{
         valueOf: () => boolean;
     }>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

package/es/thing/src/Thing.d.ts

@@ -54,7 +54,7 @@ declare const _default: import("vue").DefineComponent<{
         textColor: string;
         titleFontWeight: string;
     }, any>>>;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: StringConstructor;
     titleExtra: StringConstructor;
     description: StringConstructor;

package/es/time/src/Time.d.ts

@@ -38,7 +38,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly timeZone: StringConstructor;
 }, {
     renderedTime: import("vue").ComputedRef<string>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly time: {
         readonly type: PropType<number | Date>;
         readonly default: undefined;

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

@@ -497,7 +497,7 @@ declare const _default: import("vue").DefineComponent<{
     minuteScrollRef: import("vue").Ref<null>;
     secondScrollRef: import("vue").Ref<null>;
     amPmScrollRef: import("vue").Ref<null>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     actions: {
         type: PropType<("confirm" | "now")[] | null>;
         default: () => string[];

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

@@ -14,7 +14,7 @@ declare const _default: import("vue").DefineComponent<{
         default: null;
     };
     onItemClick: PropType<(value: number | 'am' | 'pm') => void>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     clsPrefix: {
         type: StringConstructor;
         required: true;

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

@@ -2428,7 +2428,7 @@ declare const _default: import("vue").DefineComponent<{
     }> | undefined;
     themeClass: import("vue").Ref<string> | undefined;
     onRender: (() => void) | undefined;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     to: {
         type: PropType<string | boolean | HTMLElement>;
         default: undefined;

package/es/timeline/src/Timeline.d.ts

@@ -176,7 +176,7 @@ declare const _default: import("vue").DefineComponent<{
         iconSizeMedium: string;
         iconSizeLarge: string;
     }, any>>>;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     readonly horizontal: BooleanConstructor;
     readonly itemPlacement: {
         readonly type: PropType<"left" | "right">;

package/es/timeline/src/TimelineItem.d.ts

@@ -46,7 +46,7 @@ declare const _default: import("vue").DefineComponent<{
     }> | undefined;
     themeClass: import("vue").Ref<string> | undefined;
     onRender: (() => void) | undefined;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     time: PropType<string | number>;
     title: StringConstructor;
     content: StringConstructor;

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

@@ -25,10 +25,10 @@ export default cB('timeline', `
  padding-right: 40px;
  `, [c('>', [cB('timeline-item-content', `
  margin-top: calc(var(--n-icon-size) + 12px);
- `, [cE('meta', `
+ `, [c('>', [cE('meta', `
  margin-top: 6px;
  margin-bottom: unset;
- `)]), cB('timeline-item-timeline', `
+ `)])]), cB('timeline-item-timeline', `
  width: 100%;
  height: calc(var(--n-icon-size) + 12px);
  `, [cE('line', `
@@ -58,7 +58,6 @@ export default cB('timeline', `
  font-size: var(--n-title-font-size);
  transition: color .3s var(--n-bezier);
  font-weight: var(--n-title-font-weight);
- margin-bottom: 6px;
  color: var(--n-title-text-color);
  `), cE('content', `
  transition: color .3s var(--n-bezier);

package/es/timeline/styles/_common.js

@@ -1,6 +1,6 @@
 export default {
-    titleMarginMedium: '0',
-    titleMarginLarge: '-2px 0 0 0',
+    titleMarginMedium: '0 0 6px 0',
+    titleMarginLarge: '-2px 0 6px 0',
     titleFontSizeMedium: '14px',
     titleFontSizeLarge: '16px',
     iconSizeMedium: '14px',

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

@@ -456,7 +456,7 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     syncPosition: () => void;
     setShow: (value: boolean) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     theme: import("vue").PropType<import("../../_mixins").Theme<"Tooltip", {
         borderRadius: string;
         boxShadow: string;

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

@@ -35,6 +35,7 @@ export declare const transferProps: {
     readonly renderSourceLabel: PropType<TransferRenderSourceLabel>;
     readonly renderTargetLabel: PropType<TransferRenderTargetLabel>;
     readonly renderSourceList: PropType<TransferRenderSourceList>;
+    readonly renderTargetList: PropType<TransferRenderSourceList>;
     readonly 'onUpdate:value': PropType<MaybeArray<OnUpdateValue>>;
     readonly onUpdateValue: PropType<MaybeArray<OnUpdateValue>>;
     readonly onChange: PropType<MaybeArray<OnUpdateValue>>;
@@ -1120,6 +1121,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly renderSourceLabel: PropType<TransferRenderSourceLabel>;
     readonly renderTargetLabel: PropType<TransferRenderTargetLabel>;
     readonly renderSourceList: PropType<TransferRenderSourceList>;
+    readonly renderTargetList: PropType<TransferRenderSourceList>;
     readonly 'onUpdate:value': PropType<MaybeArray<OnUpdateValue>>;
     readonly onUpdateValue: PropType<MaybeArray<OnUpdateValue>>;
     readonly onChange: PropType<MaybeArray<OnUpdateValue>>;
@@ -2699,7 +2701,7 @@ declare const _default: import("vue").DefineComponent<{
         '--n-close-icon-color-pressed': string;
         '--n-divider-color': string;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly value: PropType<OptionValue[] | null>;
     readonly defaultValue: {
         readonly type: PropType<OptionValue[] | null>;
@@ -2732,6 +2734,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly renderSourceLabel: PropType<TransferRenderSourceLabel>;
     readonly renderTargetLabel: PropType<TransferRenderTargetLabel>;
     readonly renderSourceList: PropType<TransferRenderSourceList>;
+    readonly renderTargetList: PropType<TransferRenderSourceList>;
     readonly 'onUpdate:value': PropType<MaybeArray<OnUpdateValue>>;
     readonly onUpdateValue: PropType<MaybeArray<OnUpdateValue>>;
     readonly onChange: PropType<MaybeArray<OnUpdateValue>>;

package/es/transfer/src/Transfer.js

@@ -33,7 +33,7 @@ export const transferProps = Object.assign(Object.assign({}, useTheme.props), {
                 .toLowerCase()
                 .indexOf(('' + pattern).toLowerCase());
         }
-    }, size: String, renderSourceLabel: Function, renderTargetLabel: Function, renderSourceList: Function, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], onChange: [Function, Array] });
+    }, size: String, renderSourceLabel: Function, renderTargetLabel: Function, renderSourceList: Function, renderTargetList: Function, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], onChange: [Function, Array] });
 export default defineComponent({
     name: 'Transfer',
     props: transferProps,
@@ -158,7 +158,7 @@ export default defineComponent({
         };
     },
     render() {
-        const { mergedClsPrefix, renderSourceList, mergedTheme, mergedSrcFilterable, targetFilterable } = this;
+        const { mergedClsPrefix, renderSourceList, renderTargetList, mergedTheme, mergedSrcFilterable, targetFilterable } = this;
         return (h("div", { class: [
                 `${mergedClsPrefix}-transfer`,
                 this.mergedDisabled && `${mergedClsPrefix}-transfer--disabled`
@@ -179,8 +179,13 @@ export default defineComponent({
                 h(NTransferHeader, { onClearAll: this.handleTargetClearAll, size: this.mergedSize, title: this.targetTitle }),
                 h("div", { class: `${mergedClsPrefix}-transfer-list-body` },
                     targetFilterable ? (h(NTransferFilter, { onUpdateValue: this.handleTgtFilterUpdateValue, value: this.tgtPattern, disabled: this.mergedDisabled, placeholder: this.sourceFilterPlaceholder })) : null,
-                    h("div", { class: `${mergedClsPrefix}-transfer-list-flex-container` },
-                        h(NTransferList, { options: this.filteredTgtOpts, disabled: this.mergedDisabled, virtualScroll: this.virtualScroll, itemSize: this.itemSize }))),
+                    h("div", { class: `${mergedClsPrefix}-transfer-list-flex-container` }, renderTargetList ? (h(NScrollbar, { theme: mergedTheme.peers.Scrollbar, themeOverrides: mergedTheme.peerOverrides.Scrollbar }, {
+                        default: () => renderTargetList({
+                            onCheck: this.handleChecked,
+                            checkedOptions: this.filteredTgtOpts,
+                            pattern: this.tgtPattern
+                        })
+                    })) : (h(NTransferList, { options: this.filteredTgtOpts, disabled: this.mergedDisabled, virtualScroll: this.virtualScroll, itemSize: this.itemSize })))),
                 h("div", { class: `${mergedClsPrefix}-transfer-list__border` }))));
     }
 });

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

@@ -493,7 +493,7 @@ declare const _default: import("vue").DefineComponent<{
             } | undefined;
         };
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     value: StringConstructor;
     placeholder: StringConstructor;
     disabled: BooleanConstructor;

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

@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
     onCheckedAll: PropType<() => void>;
     onClearAll: PropType<() => void>;
     title: StringConstructor;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     size: {
         type: PropType<"small" | "medium" | "large">;
         required: true;

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

@@ -524,7 +524,7 @@ declare const _default: import("vue").DefineComponent<{
     syncVLScroller: () => void;
     scrollContainer: () => HTMLElement | null;
     scrollContent: () => HTMLElement | null;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     virtualScroll: {
         type: BooleanConstructor;
         required: true;

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

@@ -505,7 +505,7 @@ declare const _default: import("vue").DefineComponent<{
     handleClick: () => void;
     renderSourceLabel: import("vue").Ref<import("./interface").TransferRenderSourceLabel | undefined>;
     renderTargetLabel: import("vue").Ref<import("./interface").TransferRenderTargetLabel | undefined>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     source: BooleanConstructor;
     label: {
         type: StringConstructor;

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

@@ -18,7 +18,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<() => void>;
         required: true;
     };
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     clsPrefix: {
         type: StringConstructor;
         required: true;

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

@@ -1147,7 +1147,7 @@ declare const _default: import("vue").DefineComponent<{
     }> | undefined;
     themeClass: import("vue").Ref<string> | undefined;
     onRender: (() => void) | undefined;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly internalTreeSelect: BooleanConstructor;
     readonly internalScrollable: BooleanConstructor;
     readonly internalScrollablePadding: StringConstructor;

package/es/tree/src/Tree.js

@@ -19,7 +19,7 @@ import { call, createDataKey, resolveSlot, warn, warnOnce } from '../../_utils';
 import { NxScrollbar } from '../../_internal';
 import { treeLight } from '../styles';
 import NTreeNode from './TreeNode';
-import { keysWithFilter, emptyImage, filterTree } from './utils';
+import { keysWithFilter, emptyImage, filterTree, isNodeDisabled } from './utils';
 import { useKeyboard } from './keyboard';
 import { treeInjectionKey } from './interface';
 import MotionWrapper from './MotionWrapper';
@@ -305,13 +305,21 @@ export default defineComponent({
         }, {
             deep: false
         });
-        let memorizedExpandedKeys;
+        let expandAnimationDisabled = false;
+        const disableExpandAnimationForOneTick = () => {
+            expandAnimationDisabled = true;
+            void nextTick(() => {
+                expandAnimationDisabled = false;
+            });
+        };
+        let memoizedExpandedKeys;
         watch(toRef(props, 'pattern'), (value, oldValue) => {
             if (props.showIrrelevantNodes) {
-                memorizedExpandedKeys = undefined;
+                memoizedExpandedKeys = undefined;
                 if (value) {
                     const { expandedKeys: expandedKeysAfterChange, highlightKeySet } = keysWithFilter(props.data, props.pattern, props.keyField, props.childrenField, mergedFilterRef.value);
                     uncontrolledHighlightKeySetRef.value = highlightKeySet;
+                    disableExpandAnimationForOneTick();
                     doUpdateExpandedKeys(expandedKeysAfterChange, getOptionsByKeys(expandedKeysAfterChange));
                 }
                 else {
@@ -320,16 +328,18 @@ export default defineComponent({
             }
             else {
                 if (!value.length) {
-                    if (memorizedExpandedKeys !== undefined) {
-                        doUpdateExpandedKeys(memorizedExpandedKeys, getOptionsByKeys(memorizedExpandedKeys));
+                    if (memoizedExpandedKeys !== undefined) {
+                        disableExpandAnimationForOneTick();
+                        doUpdateExpandedKeys(memoizedExpandedKeys, getOptionsByKeys(memoizedExpandedKeys));
                     }
                 }
                 else {
                     if (!oldValue.length) {
-                        memorizedExpandedKeys = mergedExpandedKeysRef.value;
+                        memoizedExpandedKeys = mergedExpandedKeysRef.value;
                     }
                     const { expandedKeys } = filteredTreeInfoRef.value;
                     if (expandedKeys !== undefined) {
+                        disableExpandAnimationForOneTick();
                         doUpdateExpandedKeys(expandedKeys, getOptionsByKeys(expandedKeys));
                     }
                 }
@@ -384,7 +394,7 @@ export default defineComponent({
         // fixable and need some changes in vueuc, I've no time so I just leave it
         // here. Maybe the bug won't be fixed during the life time of the project.
         watch(expandedNonLoadingKeysRef, (value, prevValue) => {
-            if (!props.animated) {
+            if (!props.animated || expandAnimationDisabled) {
                 void nextTick(syncScrollbar);
                 return;
             }
@@ -595,7 +605,7 @@ export default defineComponent({
         }
         function handleCheck(node, checked) {
             // We don't guard for leaf only since we have done it in view layer
-            if (props.disabled || node.disabled) {
+            if (props.disabled || isNodeDisabled(node, props.disabledField)) {
                 return;
             }
             if (props.internalUnifySelectCheck && !props.multiple) {
@@ -723,14 +733,20 @@ export default defineComponent({
         // Dnd
         function handleDragEnter({ event, node }) {
             // node should be a tmNode
-            if (!props.draggable || props.disabled || node.disabled)
+            if (!props.draggable ||
+                props.disabled ||
+                isNodeDisabled(node, props.disabledField)) {
                 return;
+            }
             handleDragOver({ event, node }, false);
             doDragEnter({ event, node: node.rawNode });
         }
         function handleDragLeave({ event, node }) {
-            if (!props.draggable || props.disabled || node.disabled)
+            if (!props.draggable ||
+                props.disabled ||
+                isNodeDisabled(node, props.disabledField)) {
                 return;
+            }
             doDragLeave({ event, node: node.rawNode });
         }
         function handleDragLeaveTree(e) {
@@ -741,14 +757,20 @@ export default defineComponent({
         // Dragend is ok, we don't need to add global listener to reset drag status
         function handleDragEnd({ event, node }) {
             resetDndState();
-            if (!props.draggable || props.disabled || node.disabled)
+            if (!props.draggable ||
+                props.disabled ||
+                isNodeDisabled(node, props.disabledField)) {
                 return;
+            }
             doDragEnd({ event, node: node.rawNode });
         }
         function handleDragStart({ event, node }) {
             var _a;
-            if (!props.draggable || props.disabled || node.disabled)
+            if (!props.draggable ||
+                props.disabled ||
+                isNodeDisabled(node, props.disabledField)) {
                 return;
+            }
             // Most of time, the image will block user's view
             emptyImage && ((_a = event.dataTransfer) === null || _a === void 0 ? void 0 : _a.setDragImage(emptyImage, 0, 0));
             dragStartX = event.clientX;
@@ -757,8 +779,11 @@ export default defineComponent({
         }
         function handleDragOver({ event, node }, emit = true) {
             var _a;
-            if (!props.draggable || props.disabled || node.disabled)
+            if (!props.draggable ||
+                props.disabled ||
+                isNodeDisabled(node, props.disabledField)) {
                 return;
+            }
             const { value: draggingNode } = draggingNodeRef;
             if (!draggingNode)
                 return;
@@ -943,7 +968,9 @@ export default defineComponent({
             droppingNodeRef.value = finalDropNode;
         }
         function handleDrop({ event, node, dropPosition }) {
-            if (!props.draggable || props.disabled || node.disabled) {
+            if (!props.draggable ||
+                props.disabled ||
+                isNodeDisabled(node, props.disabledField)) {
                 return;
             }
             const { value: draggingNode } = draggingNodeRef;
@@ -1064,6 +1091,7 @@ export default defineComponent({
             droppingOffsetLevelRef,
             fNodesRef,
             pendingNodeKeyRef,
+            disabledFieldRef: toRef(props, 'disabledField'),
             internalScrollableRef: toRef(props, 'internalScrollable'),
             internalCheckboxFocusableRef: toRef(props, 'internalCheckboxFocusable'),
             internalTreeSelect: props.internalTreeSelect,

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

@@ -48,7 +48,7 @@ declare const TreeNode: import("vue").DefineComponent<{
     handleLineClick: (e: MouseEvent) => void;
     handleContentClick: (e: MouseEvent) => void;
     handleSwitcherClick: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     clsPrefix: {
         type: StringConstructor;
         required: true;

package/es/tree/src/TreeNode.js

@@ -7,6 +7,7 @@ import NTreeNodeCheckbox from './TreeNodeCheckbox';
 import NTreeNodeContent from './TreeNodeContent';
 import { treeInjectionKey } from './interface';
 import { renderDropMark } from './dnd';
+import { isNodeDisabled } from './utils';
 const TreeNode = defineComponent({
     name: 'TreeNode',
     props: {
@@ -22,8 +23,12 @@ const TreeNode = defineComponent({
     setup(props) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const NTree = inject(treeInjectionKey);
-        const { droppingNodeParentRef, droppingMouseNodeRef, draggingNodeRef, droppingPositionRef, droppingOffsetLevelRef, nodePropsRef, indentRef, blockLineRef, checkboxPlacementRef, checkOnClickRef } = NTree;
-        const disabledRef = computed(() => NTree.disabledRef.value || props.tmNode.disabled);
+        const { droppingNodeParentRef, droppingMouseNodeRef, draggingNodeRef, droppingPositionRef, droppingOffsetLevelRef, nodePropsRef, indentRef, blockLineRef, checkboxPlacementRef, checkOnClickRef, disabledFieldRef } = NTree;
+        const checkboxDisabledRef = useMemo(() => !!props.tmNode.rawNode.checkboxDisabled);
+        const nodeIsDisabledRef = useMemo(() => {
+            return isNodeDisabled(props.tmNode, disabledFieldRef.value);
+        });
+        const disabledRef = useMemo(() => NTree.disabledRef.value || nodeIsDisabledRef.value);
         const resolvedNodePropsRef = computed(() => {
             const { value: nodeProps } = nodePropsRef;
             if (!nodeProps)
@@ -62,7 +67,7 @@ const TreeNode = defineComponent({
                 NTree.handleSwitcherClick(tmNode);
             }
         }
-        const selectableRef = useMemo(() => !props.tmNode.disabled &&
+        const selectableRef = useMemo(() => !nodeIsDisabledRef.value &&
             NTree.selectableRef.value &&
             (NTree.internalTreeSelect
                 ? NTree.mergedCheckStrategyRef.value !== 'child' ||
@@ -212,7 +217,7 @@ const TreeNode = defineComponent({
             disabled: disabledRef,
             checkable: checkableRef,
             mergedCheckOnClick: mergedCheckOnClickRef,
-            checkboxDisabled: computed(() => !!props.tmNode.rawNode.checkboxDisabled),
+            checkboxDisabled: checkboxDisabledRef,
             selectable: selectableRef,
             expandOnClick: NTree.expandOnClickRef,
             internalScrollable: NTree.internalScrollableRef,

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

@@ -196,7 +196,7 @@ declare const _default: import("vue").DefineComponent<{
             } | undefined;
         };
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     clsPrefix: {
         type: StringConstructor;
         required: true;

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

@@ -22,7 +22,7 @@ declare const _default: import("vue").DefineComponent<{
     renderSuffix: import("vue").Ref<(({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild) | undefined>;
     labelField: import("vue").Ref<string>;
     handleClick: (e: MouseEvent) => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     clsPrefix: {
         type: StringConstructor;
         required: true;

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

@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
     hide: BooleanConstructor;
     loading: BooleanConstructor;
     onClick: 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<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     clsPrefix: {
         type: StringConstructor;
         required: true;

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

@@ -93,6 +93,7 @@ export interface TreeInjection {
     checkboxPlacementRef: 'left' | 'right';
     internalTreeSelect: boolean;
     checkOnClickRef: Ref<boolean | CheckOnClick>;
+    disabledFieldRef: Ref<string>;
     handleSwitcherClick: (node: TreeNode<TreeOption>) => void;
     handleSelect: (node: TreeNode<TreeOption>) => void;
     handleCheck: (node: TreeNode<TreeOption>, checked: boolean) => void;

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

@@ -1,4 +1,5 @@
-import { Key, TreeOption } from './interface';
+import { Key, TmNode, TreeOption } from './interface';
+export declare function isNodeDisabled(node: TmNode, disabledField: string): boolean;
 export declare function keysWithFilter(nodes: TreeOption[], pattern: string, keyField: string, childrenField: string, filter: (pattern: string, node: TreeOption) => boolean): {
     expandedKeys: Key[];
     highlightKeySet: Set<Key>;

package/es/tree/src/utils.js

@@ -1,4 +1,7 @@
 import { isBrowser } from '../../_utils';
+export function isNodeDisabled(node, disabledField) {
+    return !!node.rawNode[disabledField];
+}
 function traverse(nodes, childrenField, callback, callbackAfter) {
     nodes === null || nodes === void 0 ? void 0 : nodes.forEach((node) => {
         callback(node);