naive-ui 2.22.0 → 2.24.0

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

@@ -2564,27 +2564,27 @@ declare const _default: import("vue").DefineComponent<{
     handleTgtFilterUpdateValue: (value: string | null) => void;
     handleSrcFilterUpdateValue: (value: string | null) => void;
     cssVars: import("vue").ComputedRef<{
-        '--bezier': string;
-        '--bezier-ease-in': string;
-        '--bezier-ease-out': string;
-        '--border-color': string;
-        '--border-radius': string;
-        '--extra-font-size': string;
-        '--filter-divider-color': string;
-        '--font-size': string;
-        '--header-color': string;
-        '--header-extra-text-color': string;
-        '--header-font-weight': string;
-        '--header-text-color': string;
-        '--header-text-color-disabled': string;
-        '--item-color-pending': string;
-        '--item-height': string;
-        '--item-text-color': string;
-        '--item-text-color-disabled': string;
-        '--list-color': string;
-        '--width': string;
-        '--icon-color': string;
-        '--icon-color-disabled': string;
+        '--n-bezier': string;
+        '--n-bezier-ease-in': string;
+        '--n-bezier-ease-out': string;
+        '--n-border-color': string;
+        '--n-border-radius': string;
+        '--n-extra-font-size': string;
+        '--n-filter-divider-color': string;
+        '--n-font-size': string;
+        '--n-header-color': string;
+        '--n-header-extra-text-color': string;
+        '--n-header-font-weight': string;
+        '--n-header-text-color': string;
+        '--n-header-text-color-disabled': string;
+        '--n-item-color-pending': string;
+        '--n-item-height': string;
+        '--n-item-text-color': string;
+        '--n-item-text-color-disabled': string;
+        '--n-list-color': string;
+        '--n-width': string;
+        '--n-icon-color': string;
+        '--n-icon-color-disabled': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     readonly value?: unknown;

package/es/transfer/src/Transfer.js

@@ -159,27 +159,27 @@ export default defineComponent({
                 const { value: size } = mergedSizeRef;
                 const { common: { cubicBezierEaseInOut, cubicBezierEaseIn, cubicBezierEaseOut }, self: { width, borderRadius, borderColor, listColor, headerColor, titleTextColor, titleTextColorDisabled, extraTextColor, filterDividerColor, itemTextColor, itemColorPending, itemTextColorDisabled, extraFontSize, titleFontWeight, iconColor, iconColorDisabled, [createKey('fontSize', size)]: fontSize, [createKey('itemHeight', size)]: itemHeight } } = themeRef.value;
                 return {
-                    '--bezier': cubicBezierEaseInOut,
-                    '--bezier-ease-in': cubicBezierEaseIn,
-                    '--bezier-ease-out': cubicBezierEaseOut,
-                    '--border-color': borderColor,
-                    '--border-radius': borderRadius,
-                    '--extra-font-size': extraFontSize,
-                    '--filter-divider-color': filterDividerColor,
-                    '--font-size': fontSize,
-                    '--header-color': headerColor,
-                    '--header-extra-text-color': extraTextColor,
-                    '--header-font-weight': titleFontWeight,
-                    '--header-text-color': titleTextColor,
-                    '--header-text-color-disabled': titleTextColorDisabled,
-                    '--item-color-pending': itemColorPending,
-                    '--item-height': itemHeight,
-                    '--item-text-color': itemTextColor,
-                    '--item-text-color-disabled': itemTextColorDisabled,
-                    '--list-color': listColor,
-                    '--width': width,
-                    '--icon-color': iconColor,
-                    '--icon-color-disabled': iconColorDisabled
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-bezier-ease-in': cubicBezierEaseIn,
+                    '--n-bezier-ease-out': cubicBezierEaseOut,
+                    '--n-border-color': borderColor,
+                    '--n-border-radius': borderRadius,
+                    '--n-extra-font-size': extraFontSize,
+                    '--n-filter-divider-color': filterDividerColor,
+                    '--n-font-size': fontSize,
+                    '--n-header-color': headerColor,
+                    '--n-header-extra-text-color': extraTextColor,
+                    '--n-header-font-weight': titleFontWeight,
+                    '--n-header-text-color': titleTextColor,
+                    '--n-header-text-color-disabled': titleTextColorDisabled,
+                    '--n-item-color-pending': itemColorPending,
+                    '--n-item-height': itemHeight,
+                    '--n-item-text-color': itemTextColor,
+                    '--n-item-text-color-disabled': itemTextColorDisabled,
+                    '--n-list-color': listColor,
+                    '--n-width': width,
+                    '--n-icon-color': iconColor,
+                    '--n-icon-color-disabled': iconColorDisabled
                 };
             })
         };

package/es/transfer/src/TransferList.js

@@ -70,24 +70,22 @@ export default defineComponent({
         };
     },
     render() {
-        const { mergedTheme, mergedClsPrefix, syncVLScroller } = this;
+        const { mergedTheme, mergedClsPrefix, virtualScroll, syncVLScroller } = this;
         return (h(Fragment, null,
-            this.virtualScroll ? (h(NScrollbar, { ref: "scrollerInstRef", theme: mergedTheme.peers.Scrollbar, themeOverrides: mergedTheme.peerOverrides.Scrollbar, container: this.scrollContainer, content: this.scrollContent }, {
-                default: () => (h(VirtualList, { ref: "srcVlInstRef", style: { height: '100%' }, class: `${mergedClsPrefix}-transfer-list-content`, items: this.options, itemSize: this.itemSize, showScrollbar: false, onResize: syncVLScroller, onScroll: syncVLScroller, keyField: "value" }, {
+            h(NScrollbar, { ref: "scrollerInstRef", theme: mergedTheme.peers.Scrollbar, themeOverrides: mergedTheme.peerOverrides.Scrollbar, container: virtualScroll ? this.scrollContainer : undefined, content: virtualScroll ? this.scrollContent : undefined }, {
+                default: () => virtualScroll ? (h(VirtualList, { ref: "vlInstRef", style: { height: '100%' }, class: `${mergedClsPrefix}-transfer-list-content`, items: this.options, itemSize: this.itemSize, showScrollbar: false, onResize: syncVLScroller, onScroll: syncVLScroller, keyField: "value" }, {
                     default: ({ item }) => {
                         const { source, disabled } = this;
                         return (h(NTransferListItem, { source: source, key: item.value, value: item.value, disabled: item.disabled || disabled, label: item.label }));
                     }
-                }))
-            })) : (h(NScrollbar, { theme: mergedTheme.peers.Scrollbar, themeOverrides: mergedTheme.peerOverrides.Scrollbar }, {
-                default: () => (h("div", { class: `${mergedClsPrefix}-transfer-list-content` },
+                })) : (h("div", { class: `${mergedClsPrefix}-transfer-list-content` },
                     h(TransitionGroup, { name: "item", appear: this.isMounted, css: !this.isInputing }, {
                         default: () => {
                             const { source, disabled } = this;
                             return this.options.map((option) => (h(NTransferListItem, { source: source, key: option.value, value: option.value, disabled: option.disabled || disabled, label: option.label })));
                         }
                     })))
-            })),
+            }),
             h(Transition, { name: "fade-in-transition", appear: this.isMounted, css: !this.isInputing }, {
                 default: () => this.options.length ? null : (h(NEmpty, { theme: mergedTheme.peers.Empty, themeOverrides: mergedTheme.peerOverrides.Empty }))
             })));

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

@@ -30,7 +30,7 @@ const animation = c([c('@keyframes transfer-slide-in-from-left', `
  }
  `), c('@keyframes transfer-height-collapse', `
  0% {
- max-height: var(--item-height);
+ max-height: var(--n-item-height);
  }
  100% {
  max-height: 0;
@@ -40,30 +40,34 @@ const animation = c([c('@keyframes transfer-slide-in-from-left', `
  max-height: 0;
  }
  100% {
- max-height: var(--item-height);
+ max-height: var(--n-item-height);
  }
  `)]);
 export default c([cB('transfer', `
  display: flex;
- width: var(--width);
- font-size: var(--font-size);
- `, [cM('filterable', [cB('transfer-list', [cB('transfer-list-body', {
-  height: 'calc(var(--item-height) * 5.6 + 45px)'
-})])]), cB('transfer-icon', `
- color: var(--icon-color);
- transition: color .3s var(--bezier);
+ width: var(--n-width);
+ font-size: var(--n-font-size);
+ height: 240px;
+ display: flex;
+ flex-wrap: nowrap;
+ `, [cB('transfer-icon', `
+ color: var(--n-icon-color);
+ transition: color .3s var(--n-bezier);
  `), cM('disabled', [cB('transfer-icon', {
-  color: 'var(--icon-color-disabled)'
+  color: 'var(--n-icon-color-disabled)'
 })]), cB('transfer-list', `
+ height: inherit;
+ display: flex;
+ flex-direction: column;
  background-clip: padding-box;
  width: calc(50% - 36px);
  position: relative;
- transition: background-color .3s var(--bezier);
- border-radius: var(--border-radius);
- background-color: var(--list-color);
+ transition: background-color .3s var(--n-bezier);
+ border-radius: var(--n-border-radius);
+ background-color: var(--n-list-color);
  `, [cE('border', `
- border: 1px solid var(--border-color);
- transition: border-color .3s var(--bezier);
+ border: 1px solid var(--n-border-color);
+ transition: border-color .3s var(--n-bezier);
  pointer-events: none;
  border-radius: inherit;
  position: absolute;
@@ -72,7 +76,7 @@ export default c([cB('transfer', `
  top: 0;
  bottom: 0;
  `), cB('transfer-list-header', `
- height: calc(var(--item-height) + 4px);
+ height: calc(var(--n-item-height) + 4px);
  box-sizing: border-box;
  display: flex;
  align-items: center;
@@ -80,10 +84,10 @@ export default c([cB('transfer', `
  border-radius: inherit;
  border-bottom-left-radius: 0;
  border-bottom-right-radius: 0;
- background-color: var(--header-color);
+ background-color: var(--n-header-color);
  transition:
- border-color .3s var(--bezier),
- background-color .3s var(--bezier);
+ border-color .3s var(--n-bezier),
+ background-color .3s var(--n-bezier);
  `, [cE('checkbox', `
  display: flex;
  align-items: center;
@@ -92,20 +96,21 @@ export default c([cB('transfer', `
  `), cE('header', `
  flex: 1;
  line-height: 1;
- font-weight: var(--header-font-weight);
- transition: color .3s var(--bezier);
- color: var(--header-text-color);
+ font-weight: var(--n-header-font-weight);
+ transition: color .3s var(--n-bezier);
+ color: var(--n-header-text-color);
  `, [cM('disabled', {
-  color: 'var(--header-text-color-disabled)'
+  color: 'var(--n-header-text-color-disabled)'
 })]), cE('extra', `
- transition: color .3s var(--bezier);
- font-size: var(--extra-font-size);
+ transition: color .3s var(--n-bezier);
+ font-size: var(--n-extra-font-size);
  justify-self: flex-end;
  margin-right: 14px;
  white-space: nowrap;
- color: var(--header-extra-text-color);
+ color: var(--n-header-extra-text-color);
  `)]), cB('transfer-list-body', `
- height: calc(var(--item-height) * 5.6);
+ flex-basis: 0;
+ flex-grow: 1;
  box-sizing: border-box;
  overflow: hidden;
  position: relative;
@@ -117,11 +122,11 @@ export default c([cB('transfer', `
  `, [cB('transfer-filter', `
  padding: 0 8px 8px 8px;
  box-sizing: border-box;
- background-color: var(--header-color);
+ background-color: var(--n-header-color);
  transition:
- border-color .3s var(--bezier),
- background-color .3s var(--bezier);
- border-bottom: 1px solid var(--filter-divider-color);
+ border-color .3s var(--n-bezier),
+ background-color .3s var(--n-bezier);
+ border-bottom: 1px solid var(--n-filter-divider-color);
  `), cB('transfer-list-flex-container', `
  flex: 1;
  position: relative;
@@ -146,18 +151,18 @@ export default c([cB('transfer', `
  `, [cM('transition-disabled', [cB('transfer-list-item', {
   animation: 'none !important'
 })]), cB('transfer-list-item', `
- height: var(--item-height);
- max-height: var(--item-height);
+ height: var(--n-item-height);
+ max-height: var(--n-item-height);
  transition:
- background-color .3s var(--bezier),
- color .3s var(--bezier);
+ background-color .3s var(--n-bezier),
+ color .3s var(--n-bezier);
  position: relative;
  cursor: pointer;
  display: flex;
  align-items: center;
- color: var(--item-text-color);
+ color: var(--n-item-text-color);
  `, [cNotM('disabled', [c('&:hover', {
-  backgroundColor: 'var(--item-color-pending)'
+  backgroundColor: 'var(--n-item-color-pending)'
 })]), cE('extra', `
  text-overflow: ellipsis;
  overflow: hidden;
@@ -171,19 +176,19 @@ export default c([cB('transfer', `
  `), cM('disabled', `
  cursor: not-allowed
  background-color: #0000;
- color: var(--item-text-color-disabled);
+ color: var(--n-item-text-color-disabled);
  `), cM('source', {
   animationFillMode: 'forwards'
 }, [c('&.item-enter-active', `
  transform: translateX(150%);
  animation-duration: .25s, .25s;
- animation-timing-function: var(--bezier), var(--bezier-ease-out);
+ animation-timing-function: var(--n-bezier), var(--n-bezier-ease-out);
  animation-delay: 0s, .25s;
  animation-name: transfer-height-expand, transfer-slide-in-from-right;
  `), c('&.item-leave-active', `
  transform: translateX(-150%);
  animation-duration: .25s, .25s;
- animation-timing-function: var(--bezier), var(--bezier-ease-in);
+ animation-timing-function: var(--n-bezier), var(--n-bezier-ease-in);
  animation-delay: .25s, 0s;
  animation-name: transfer-height-collapse, transfer-slide-out-to-right;
  `)]), cM('target', {
@@ -191,13 +196,13 @@ export default c([cB('transfer', `
 }, [c('&.item-enter-active', `
  transform: translateX(-150%);
  animation-duration: .25s, .25s;
- animation-timing-function: var(--bezier), var(--bezier-ease-out);
+ animation-timing-function: var(--n-bezier), var(--n-bezier-ease-out);
  animation-delay: 0s, .25s;
  animation-name: transfer-height-expand, transfer-slide-in-from-left;
  `), c('&.item-leave-active', `
  transform: translateX(150%);
  animation-duration: .25s, .25s;
- animation-timing-function: var(--bezier), var(--bezier-ease-in);
+ animation-timing-function: var(--n-bezier), var(--n-bezier-ease-in);
  animation-delay: .25s, 0s;
  animation-name: transfer-height-collapse, transfer-slide-out-to-left;
  `)])])])])])]), cB('transfer-gap', {

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

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { TreeMate, TreeMateOptions, CheckStrategy } from 'treemate';
 import type { ExtractPublicPropTypes, MaybeArray } from '../../_utils';
-import { TreeDragInfo, TreeDropInfo, TreeOptions, Key, TreeOption, AllowDrop } from './interface';
+import { TreeDragInfo, TreeDropInfo, TreeOptions, Key, TreeOption, AllowDrop, RenderSwitcherIcon } from './interface';
 import { defaultAllowDrop } from './dnd';
 export declare function createTreeMateOptions<T>(keyField: string, childrenField: string): TreeMateOptions<T, T, T>;
 declare type OnUpdateKeys = (value: Key[], option: Array<TreeOption | null>) => void;
@@ -133,6 +133,7 @@ declare const treeProps: {
     readonly renderLabel: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderPrefix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSuffix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
+    readonly renderSwitcherIcon: PropType<RenderSwitcherIcon>;
     readonly onDragenter: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragleave: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragend: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
@@ -381,6 +382,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly renderLabel: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderPrefix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
     readonly renderSuffix: PropType<({ option, checked, selected }: import("./interface").TreeRenderProps) => import("vue").VNodeChild>;
+    readonly renderSwitcherIcon: PropType<RenderSwitcherIcon>;
     readonly onDragenter: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragleave: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
     readonly onDragend: PropType<MaybeArray<(e: TreeDragInfo) => void>>;
@@ -961,17 +963,17 @@ declare const _default: import("vue").DefineComponent<{
     handleAfterEnter: () => void;
     handleResize: () => void;
     cssVars: import("vue").ComputedRef<{
-        '--arrow-color': string;
-        '--loading-color': string;
-        '--bezier': string;
-        '--font-size': string;
-        '--node-border-radius': string;
-        '--node-color-active': string;
-        '--node-color-hover': string;
-        '--node-color-pressed': string;
-        '--node-text-color': string;
-        '--node-text-color-disabled': string;
-        '--drop-mark-color': string;
+        '--n-arrow-color': string;
+        '--n-loading-color': string;
+        '--n-bezier': string;
+        '--n-font-size': string;
+        '--n-node-border-radius': string;
+        '--n-node-color-active': string;
+        '--n-node-color-hover': string;
+        '--n-node-color-pressed': string;
+        '--n-node-text-color': string;
+        '--n-node-text-color-disabled': string;
+        '--n-drop-mark-color': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     readonly internalScrollable?: unknown;
@@ -1023,6 +1025,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly renderLabel?: unknown;
     readonly renderPrefix?: unknown;
     readonly renderSuffix?: unknown;
+    readonly renderSwitcherIcon?: unknown;
     readonly onDragenter?: unknown;
     readonly onDragleave?: unknown;
     readonly onDragend?: unknown;
@@ -1228,6 +1231,7 @@ declare const _default: import("vue").DefineComponent<{
     onUpdateIndeterminateKeys?: MaybeArray<OnUpdateKeys> | undefined;
     "onUpdate:indeterminateKeys"?: MaybeArray<OnUpdateKeys> | undefined;
     selectedKeys?: Key[] | undefined;
+    renderSwitcherIcon?: RenderSwitcherIcon | undefined;
     onUpdateCheckedKeys?: MaybeArray<OnUpdateKeys> | undefined;
     "onUpdate:checkedKeys"?: MaybeArray<OnUpdateKeys> | undefined;
     onUpdateSelectedKeys?: MaybeArray<OnUpdateKeys> | undefined;

package/es/tree/src/Tree.js

@@ -97,7 +97,7 @@ const treeProps = Object.assign(Object.assign(Object.assign(Object.assign({}, us
     }, animated: {
         type: Boolean,
         default: true
-    }, virtualScroll: Boolean, watchProps: Array, renderLabel: Function, renderPrefix: Function, renderSuffix: Function, onDragenter: [Function, Array], onDragleave: [Function, Array], onDragend: [Function, Array], onDragstart: [Function, Array], onDragover: [Function, Array], onDrop: [Function, Array], onUpdateCheckedKeys: [Function, Array], 'onUpdate:checkedKeys': [Function, Array], onUpdateSelectedKeys: [Function, Array], 'onUpdate:selectedKeys': [Function, Array] }), treeSharedProps), { 
+    }, virtualScroll: Boolean, watchProps: Array, renderLabel: Function, renderPrefix: Function, renderSuffix: Function, renderSwitcherIcon: Function, onDragenter: [Function, Array], onDragleave: [Function, Array], onDragend: [Function, Array], onDragstart: [Function, Array], onDragover: [Function, Array], onDrop: [Function, Array], onUpdateCheckedKeys: [Function, Array], 'onUpdate:checkedKeys': [Function, Array], onUpdateSelectedKeys: [Function, Array], 'onUpdate:selectedKeys': [Function, Array] }), treeSharedProps), { 
     // internal props for tree-select
     internalScrollable: Boolean, internalScrollablePadding: String, 
     // use it to do check
@@ -954,6 +954,7 @@ export default defineComponent({
             renderLabelRef: toRef(props, 'renderLabel'),
             renderPrefixRef: toRef(props, 'renderPrefix'),
             renderSuffixRef: toRef(props, 'renderSuffix'),
+            renderSwitcherIconRef: toRef(props, 'renderSwitcherIcon'),
             labelFieldRef: toRef(props, 'labelField'),
             handleSwitcherClick,
             handleDragEnd,
@@ -981,26 +982,27 @@ export default defineComponent({
             handleResize, cssVars: computed(() => {
                 const { common: { cubicBezierEaseInOut }, self: { fontSize, nodeBorderRadius, nodeColorHover, nodeColorPressed, nodeColorActive, arrowColor, loadingColor, nodeTextColor, nodeTextColorDisabled, dropMarkColor } } = themeRef.value;
                 return {
-                    '--arrow-color': arrowColor,
-                    '--loading-color': loadingColor,
-                    '--bezier': cubicBezierEaseInOut,
-                    '--font-size': fontSize,
-                    '--node-border-radius': nodeBorderRadius,
-                    '--node-color-active': nodeColorActive,
-                    '--node-color-hover': nodeColorHover,
-                    '--node-color-pressed': nodeColorPressed,
-                    '--node-text-color': nodeTextColor,
-                    '--node-text-color-disabled': nodeTextColorDisabled,
-                    '--drop-mark-color': dropMarkColor
+                    '--n-arrow-color': arrowColor,
+                    '--n-loading-color': loadingColor,
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-font-size': fontSize,
+                    '--n-node-border-radius': nodeBorderRadius,
+                    '--n-node-color-active': nodeColorActive,
+                    '--n-node-color-hover': nodeColorHover,
+                    '--n-node-color-pressed': nodeColorPressed,
+                    '--n-node-text-color': nodeTextColor,
+                    '--n-node-text-color-disabled': nodeTextColorDisabled,
+                    '--n-drop-mark-color': dropMarkColor
                 };
             }) }, exposedMethods);
     },
     render() {
-        const { mergedClsPrefix, blockNode, blockLine, draggable, disabled, internalFocusable, handleKeyup, handleKeydown, handleFocusout } = this;
+        const { mergedClsPrefix, blockNode, blockLine, draggable, disabled, internalFocusable, checkable, handleKeyup, handleKeydown, handleFocusout } = this;
         const mergedFocusable = internalFocusable && !disabled;
         const tabindex = mergedFocusable ? '0' : undefined;
         const treeClass = [
             `${mergedClsPrefix}-tree`,
+            checkable && `${mergedClsPrefix}-tree--checkable`,
             (blockLine || blockNode) && `${mergedClsPrefix}-tree--block-node`,
             blockLine && `${mergedClsPrefix}-tree--block-line`
         ];

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>;
-}, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
+}, () => 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;
     expanded?: unknown;
     hide?: unknown;

package/es/tree/src/TreeNodeSwitcher.js

@@ -1,6 +1,7 @@
-import { h, defineComponent } from 'vue';
+import { h, defineComponent, inject } from 'vue';
 import { SwitcherIcon } from '../../_internal/icons';
 import { NIconSwitchTransition, NBaseLoading, NBaseIcon } from '../../_internal';
+import { treeInjectionKey } from './interface';
 export default defineComponent({
     name: 'NTreeSwitcher',
     props: {
@@ -13,18 +14,28 @@ export default defineComponent({
         loading: Boolean,
         onClick: Function
     },
-    render() {
-        const { clsPrefix } = this;
-        return (h("span", { "data-switcher": true, class: [
-                `${clsPrefix}-tree-node-switcher`,
-                {
-                    [`${clsPrefix}-tree-node-switcher--expanded`]: this.expanded,
-                    [`${clsPrefix}-tree-node-switcher--hide`]: this.hide
-                }
-            ], onClick: this.onClick },
-            h("div", { class: `${clsPrefix}-tree-node-switcher__icon` },
-                h(NIconSwitchTransition, null, {
-                    default: () => !this.loading ? (h(NBaseIcon, { clsPrefix: clsPrefix, key: "switcher" }, { default: () => h(SwitcherIcon, null) })) : (h(NBaseLoading, { clsPrefix: clsPrefix, key: "loading", radius: 85, strokeWidth: 20 }))
-                }))));
+    setup(props) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const { renderSwitcherIconRef } = inject(treeInjectionKey, null);
+        return () => {
+            const { clsPrefix } = props;
+            return (h("span", { "data-switcher": true, class: [
+                    `${clsPrefix}-tree-node-switcher`,
+                    {
+                        [`${clsPrefix}-tree-node-switcher--expanded`]: props.expanded,
+                        [`${clsPrefix}-tree-node-switcher--hide`]: props.hide
+                    }
+                ], onClick: props.onClick },
+                h("div", { class: `${clsPrefix}-tree-node-switcher__icon` },
+                    h(NIconSwitchTransition, null, {
+                        default: () => {
+                            if (props.loading) {
+                                return (h(NBaseLoading, { clsPrefix: clsPrefix, key: "loading", radius: 85, strokeWidth: 20 }));
+                            }
+                            const { value: renderSwitcherIcon } = renderSwitcherIconRef;
+                            return renderSwitcherIcon ? (renderSwitcherIcon()) : (h(NBaseIcon, { clsPrefix: clsPrefix, key: "switcher" }, { default: () => h(SwitcherIcon, null) }));
+                        }
+                    }))));
+        };
     }
 });

package/es/tree/src/dnd.js

@@ -10,7 +10,7 @@ export function renderDropMark({ position, offsetLevel, indent, el }) {
         style.top = 0;
         style.bottom = 0;
         style.borderRadius = 'inherit';
-        style.boxShadow = 'inset 0 0 0 2px var(--drop-mark-color)';
+        style.boxShadow = 'inset 0 0 0 2px var(--n-drop-mark-color)';
     }
     else {
         const cssPosition = position === 'before' ? 'top' : 'bottom';
@@ -19,7 +19,7 @@ export function renderDropMark({ position, offsetLevel, indent, el }) {
         // Maybe it is possible to use content left
         style.left = `${el.offsetLeft + 6 - offsetLevel * indent}px`;
         style.height = '2px';
-        style.backgroundColor = 'var(--drop-mark-color)';
+        style.backgroundColor = 'var(--n-drop-mark-color)';
         style.transformOrigin = cssPosition;
         style.borderRadius = '1px';
         style.transform =

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

@@ -51,6 +51,7 @@ export interface InternalDropInfo {
     node: TmNode;
     dropPosition: DropPosition;
 }
+export declare type RenderSwitcherIcon = () => VNodeChild;
 export interface TreeInjection {
     loadingKeysRef: Ref<Set<Key>>;
     highlightKeySetRef: Ref<Set<Key>>;
@@ -81,6 +82,7 @@ export interface TreeInjection {
     renderLabelRef: Ref<RenderLabel | undefined>;
     renderPrefixRef: Ref<RenderPrefix | undefined>;
     renderSuffixRef: Ref<RenderSuffix | undefined>;
+    renderSwitcherIconRef: Ref<RenderSwitcherIcon | undefined>;
     labelFieldRef: Ref<string>;
     handleSwitcherClick: (node: TreeNode<TreeOption>) => void;
     handleSelect: (node: TreeNode<TreeOption>) => void;