naive-ui 2.18.0 → 2.19.1

package/es/timeline/src/TimelineItem.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, inject, h, renderSlot } from 'vue';
-import { createKey, throwError } from '../../_utils';
+import { createKey, formatLength, throwError } from '../../_utils';
 import { timelineInjectionKey } from './Timeline';
 const timelineItemProps = {
     time: [String, Number],
@@ -22,12 +22,13 @@ export default defineComponent({
         return {
             mergedClsPrefix: NTimeline.mergedClsPrefixRef,
             cssVars: computed(() => {
-                const { props: { size }, mergedThemeRef } = NTimeline;
+                const { props: { size, iconSize: iconSizeProp }, mergedThemeRef } = NTimeline;
                 const { type } = props;
-                const { self: { titleTextColor, contentTextColor, metaTextColor, lineColor, titleFontWeight, contentFontSize, [createKey('titleMargin', size)]: titleMargin, [createKey('titleFontSize', size)]: titleFontSize, [createKey('circleBorder', type)]: circleBorder }, common: { cubicBezierEaseInOut } } = mergedThemeRef.value;
+                const { self: { titleTextColor, contentTextColor, metaTextColor, lineColor, titleFontWeight, contentFontSize, [createKey('iconSize', size)]: iconSize, [createKey('titleMargin', size)]: titleMargin, [createKey('titleFontSize', size)]: titleFontSize, [createKey('circleBorder', type)]: circleBorder, [createKey('iconColor', type)]: iconColor }, common: { cubicBezierEaseInOut } } = mergedThemeRef.value;
                 return {
                     '--bezier': cubicBezierEaseInOut,
                     '--circle-border': circleBorder,
+                    '--icon-color': iconColor,
                     '--content-font-size': contentFontSize,
                     '--content-text-color': contentTextColor,
                     '--line-color': lineColor,
@@ -35,25 +36,24 @@ export default defineComponent({
                     '--title-font-size': titleFontSize,
                     '--title-font-weight': titleFontWeight,
                     '--title-margin': titleMargin,
-                    '--title-text-color': titleTextColor
+                    '--title-text-color': titleTextColor,
+                    '--icon-size': formatLength(iconSizeProp) || iconSize
                 };
             })
         };
     },
     render() {
-        const { mergedClsPrefix, color } = this;
+        const { mergedClsPrefix, color, $slots } = this;
         return (h("div", { class: [
                 `${mergedClsPrefix}-timeline-item`,
                 `${mergedClsPrefix}-timeline-item--${this.type}-type`
             ], style: this.cssVars },
             h("div", { class: `${mergedClsPrefix}-timeline-item-timeline` },
                 h("div", { class: `${mergedClsPrefix}-timeline-item-timeline__line` }),
-                h("div", { class: `${mergedClsPrefix}-timeline-item-timeline__circle`, style: { borderColor: color } })),
+                $slots.icon ? (h("div", { class: `${mergedClsPrefix}-timeline-item-timeline__icon`, style: { color: color } }, $slots.icon())) : (h("div", { class: `${mergedClsPrefix}-timeline-item-timeline__circle`, style: { borderColor: color } }))),
             h("div", { class: `${mergedClsPrefix}-timeline-item-content` },
-                this.title || this.$slots.header ? (h("div", { class: `${mergedClsPrefix}-timeline-item-content__title` }, renderSlot(this.$slots, 'header', undefined, () => [this.title]))) : null,
-                h("div", { class: `${mergedClsPrefix}-timeline-item-content__content` }, renderSlot(this.$slots, 'default', undefined, () => [
-                    this.content
-                ])),
-                h("div", { class: `${mergedClsPrefix}-timeline-item-content__meta` }, renderSlot(this.$slots, 'footer', undefined, () => [this.time])))));
+                this.title || $slots.header ? (h("div", { class: `${mergedClsPrefix}-timeline-item-content__title` }, renderSlot($slots, 'header', undefined, () => [this.title]))) : null,
+                h("div", { class: `${mergedClsPrefix}-timeline-item-content__content` }, renderSlot($slots, 'default', undefined, () => [this.content])),
+                h("div", { class: `${mergedClsPrefix}-timeline-item-content__meta` }, renderSlot($slots, 'footer', undefined, () => [this.time])))));
     }
 });

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

@@ -1,4 +1,5 @@
-import { c, cB, cE, cM } from '../../../_utils/cssr'; // vars:
+import { c, cB, cE, cM } from '../../../_utils/cssr';
+const lineHeight = 1.25; // vars:
 // --bezier
 // --circle-border
 // --content-font-size
@@ -9,40 +10,41 @@ import { c, cB, cE, cM } from '../../../_utils/cssr'; // vars:
 // --title-font-weight
 // --title-margin
 // --title-text-color
+// --icon-size
 
 export default cB('timeline', `
  position: relative;
  width: 100%;
  display: flex;
  flex-direction: column;
- line-height: 1.25;
+ line-height: ${lineHeight};
 `, [cM('horizontal', `
  flex-direction: row;
  `, [cB('timeline-item', `
  flex-shrink: 0;
  padding-right: 40px;
  `, [cB('timeline-item-content', `
- margin-top: 26px;
+ margin-top: calc(var(--icon-size) + 12px);
  `, [cE('meta', `
  margin-top: 6px;
  margin-bottom: unset;
  `)]), cB('timeline-item-timeline', `
  width: 100%;
- height: 26px;
+ height: calc(var(--icon-size) + 12px);
  `, [cE('line', `
- left: 14px;
- top: 6px;
+ left: var(--icon-size);
+ top: calc(var(--icon-size) / 2 - 1px);
  right: 0px;
  width: unset;
  height: 2px;
  `)])])]), cM('right-placement', [cB('timeline-item', [cB('timeline-item-content', `
  text-align: right;
- margin-right: 26px;
+ margin-right: calc(var(--icon-size) + 12px);
  `), cB('timeline-item-timeline', `
- width: 14px;
+ width: var(--icon-size);
  right: 0;
  `)])]), cM('left-placement', [cB('timeline-item', [cB('timeline-item-content', `
- margin-left: 26px;
+ margin-left: calc(var(--icon-size) + 12px);
  `), cB('timeline-item-timeline', `
  left: 0;
  `)])]), cB('timeline-item', `
@@ -69,25 +71,32 @@ export default cB('timeline', `
  margin-bottom: 20px;
  color: var(--meta-text-color);
  `)]), cB('timeline-item-timeline', `
- width: 26px;
+ width: calc(var(--icon-size) + 12px);
  position: absolute;
- top: 2px;
- bottom: 0;
+ top: calc(var(--title-font-size) * ${lineHeight} / 2 - var(--icon-size) / 2);
  height: 100%;
  `, [cE('circle', `
  border: var(--circle-border);
  transition:
  background-color .3s var(--bezier),
  border-color .3s var(--bezier);
- width: 14px;
- height: 14px;
- border-radius: 7px;
+ width: var(--icon-size);
+ height: var(--icon-size);
+ border-radius: var(--icon-size);
  box-sizing: border-box;
+ `), cE('icon', `
+ color: var(--icon-color);
+ font-size: var(--icon-size);
+ height: var(--icon-size);
+ width: var(--icon-size);
+ display: flex;
+ align-items: center;
+ justify-content: center;
  `), cE('line', `
  transition: background-color .3s var(--bezier);
  position: absolute;
- top: 14px;
- left: 6px;
+ top: var(--icon-size);
+ left: calc(var(--icon-size) / 2 - 1px);
  bottom: 0px;
  width: 2px;
  background-color: var(--line-color);

package/es/timeline/styles/_common.d.ts

@@ -3,5 +3,7 @@ declare const _default: {
     titleMarginLarge: string;
     titleFontSizeMedium: string;
     titleFontSizeLarge: string;
+    iconSizeMedium: string;
+    iconSizeLarge: string;
 };
 export default _default;

package/es/timeline/styles/_common.js

@@ -2,5 +2,7 @@ export default {
     titleMarginMedium: 0,
     titleMarginLarge: '-2px 0 0 0',
     titleFontSizeMedium: '14px',
-    titleFontSizeLarge: '16px'
+    titleFontSizeLarge: '16px',
+    iconSizeMedium: '14px',
+    iconSizeLarge: '14px'
 };

package/es/timeline/styles/dark.js

@@ -5,7 +5,7 @@ const timelineDark = {
     common: commonDark,
     self(vars) {
         const { textColor3, infoColorSuppl, errorColorSuppl, successColorSuppl, warningColorSuppl, textColor1, textColor2, railColor, fontWeightStrong, fontSize } = vars;
-        return Object.assign(Object.assign({}, sizeVariables), { contentFontSize: fontSize, titleFontWeight: fontWeightStrong, circleBorder: `2px solid ${textColor3}`, circleBorderInfo: `2px solid ${infoColorSuppl}`, circleBorderError: `2px solid ${errorColorSuppl}`, circleBorderSuccess: `2px solid ${successColorSuppl}`, circleBorderWarning: `2px solid ${warningColorSuppl}`, titleTextColor: textColor1, contentTextColor: textColor2, metaTextColor: textColor3, lineColor: railColor });
+        return Object.assign(Object.assign({}, sizeVariables), { contentFontSize: fontSize, titleFontWeight: fontWeightStrong, circleBorder: `2px solid ${textColor3}`, circleBorderInfo: `2px solid ${infoColorSuppl}`, circleBorderError: `2px solid ${errorColorSuppl}`, circleBorderSuccess: `2px solid ${successColorSuppl}`, circleBorderWarning: `2px solid ${warningColorSuppl}`, iconColor: textColor3, iconColorInfo: infoColorSuppl, iconColorError: errorColorSuppl, iconColorSuccess: successColorSuppl, iconColorWarning: warningColorSuppl, titleTextColor: textColor1, contentTextColor: textColor2, metaTextColor: textColor3, lineColor: railColor });
     }
 };
 export default timelineDark;

package/es/timeline/styles/light.d.ts

@@ -8,6 +8,11 @@ declare const self: (vars: ThemeCommonVars) => {
     circleBorderError: string;
     circleBorderSuccess: string;
     circleBorderWarning: string;
+    iconColor: string;
+    iconColorInfo: string;
+    iconColorError: string;
+    iconColorSuccess: string;
+    iconColorWarning: string;
     titleTextColor: string;
     contentTextColor: string;
     metaTextColor: string;
@@ -16,6 +21,8 @@ declare const self: (vars: ThemeCommonVars) => {
     titleMarginLarge: string;
     titleFontSizeMedium: string;
     titleFontSizeLarge: string;
+    iconSizeMedium: string;
+    iconSizeLarge: string;
 };
 export declare type TimelineThemeVars = ReturnType<typeof self>;
 declare const timelineLight: Theme<'Timeline', TimelineThemeVars>;

package/es/timeline/styles/light.js

@@ -2,7 +2,7 @@ import sizeVariables from './_common';
 import { commonLight } from '../../_styles/common';
 const self = (vars) => {
     const { textColor3, infoColor, errorColor, successColor, warningColor, textColor1, textColor2, railColor, fontWeightStrong, fontSize } = vars;
-    return Object.assign(Object.assign({}, sizeVariables), { contentFontSize: fontSize, titleFontWeight: fontWeightStrong, circleBorder: `2px solid ${textColor3}`, circleBorderInfo: `2px solid ${infoColor}`, circleBorderError: `2px solid ${errorColor}`, circleBorderSuccess: `2px solid ${successColor}`, circleBorderWarning: `2px solid ${warningColor}`, titleTextColor: textColor1, contentTextColor: textColor2, metaTextColor: textColor3, lineColor: railColor });
+    return Object.assign(Object.assign({}, sizeVariables), { contentFontSize: fontSize, titleFontWeight: fontWeightStrong, circleBorder: `2px solid ${textColor3}`, circleBorderInfo: `2px solid ${infoColor}`, circleBorderError: `2px solid ${errorColor}`, circleBorderSuccess: `2px solid ${successColor}`, circleBorderWarning: `2px solid ${warningColor}`, iconColor: textColor3, iconColorInfo: infoColor, iconColorError: errorColor, iconColorSuccess: successColor, iconColorWarning: warningColor, titleTextColor: textColor1, contentTextColor: textColor2, metaTextColor: textColor3, lineColor: railColor });
 };
 const timelineLight = {
     name: 'Timeline',

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

@@ -123,16 +123,9 @@ declare const tooltipProps: {
     onClickoutside: import("vue").PropType<(e: MouseEvent) => void>;
     'onUpdate:show': import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     onUpdateShow: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
-    onShow: {
-        type: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
-        validator: () => boolean;
-        default: undefined;
-    };
-    onHide: {
-        type: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
-        validator: () => boolean;
-        default: undefined;
-    };
+    zIndex: NumberConstructor;
+    onShow: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
+    onHide: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
     arrow: {
         type: import("vue").PropType<boolean | undefined>;
         default: undefined;
@@ -263,16 +256,9 @@ declare const _default: import("vue").DefineComponent<{
     onClickoutside: import("vue").PropType<(e: MouseEvent) => void>;
     'onUpdate:show': import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
     onUpdateShow: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void>>;
-    onShow: {
-        type: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
-        validator: () => boolean;
-        default: undefined;
-    };
-    onHide: {
-        type: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
-        validator: () => boolean;
-        default: undefined;
-    };
+    zIndex: NumberConstructor;
+    onShow: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
+    onHide: import("vue").PropType<import("../../_utils").MaybeArray<(value: boolean) => void> | undefined>;
     arrow: {
         type: import("vue").PropType<boolean | undefined>;
         default: undefined;
@@ -450,6 +436,7 @@ declare const _default: import("vue").DefineComponent<{
     onClickoutside?: unknown;
     'onUpdate:show'?: unknown;
     onUpdateShow?: unknown;
+    zIndex?: unknown;
     onShow?: unknown;
     onHide?: unknown;
     arrow?: unknown;
@@ -476,6 +463,7 @@ declare const _default: import("vue").DefineComponent<{
     maxWidth?: number | undefined;
     minWidth?: number | undefined;
     width?: number | "trigger" | undefined;
+    zIndex?: number | undefined;
     theme?: import("../../_mixins").Theme<"Tooltip", {
         borderRadius: string;
         boxShadow: string;
@@ -566,8 +554,6 @@ declare const _default: import("vue").DefineComponent<{
     animated: boolean;
     defaultShow: boolean;
     internalExtraClass: string[];
-    onShow: import("../../_utils").MaybeArray<(value: boolean) => void> | undefined;
-    onHide: import("../../_utils").MaybeArray<(value: boolean) => void> | undefined;
     arrow: boolean | undefined;
 }>;
 export default _default;

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

@@ -513,8 +513,8 @@ declare const _default: import("vue").DefineComponent<{
     disabled: boolean;
     itemSize: number;
     virtualScroll: boolean;
-    options: Option[];
     isMounted: boolean;
+    options: Option[];
     isInputing: boolean;
 } & {}>, {
     source: boolean;

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

@@ -24,6 +24,9 @@ export declare const treeSharedProps: {
         readonly type: PropType<Key[]>;
         readonly default: () => never[];
     };
+    readonly indeterminateKeys: PropType<Key[]>;
+    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<(value: Key[]) => void>>;
+    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<(value: Key[]) => void>>;
     readonly onUpdateExpandedKeys: PropType<MaybeArray<(value: Key[]) => void>>;
     readonly 'onUpdate:expandedKeys': PropType<MaybeArray<(value: Key[]) => void>>;
 };
@@ -33,7 +36,7 @@ declare const treeProps: {
     readonly internalDataTreeMate: PropType<TreeMate<TreeOption, TreeOption, TreeOption>>;
     readonly internalDisplayTreeMate: PropType<TreeMate<TreeOption, TreeOption, TreeOption>>;
     readonly internalHighlightKeySet: PropType<Set<Key>>;
-    readonly internalCheckOnSelect: BooleanConstructor;
+    readonly internalUnifySelectCheck: BooleanConstructor;
     readonly internalHideFilteredNode: BooleanConstructor;
     readonly internalCheckboxFocusable: {
         readonly type: BooleanConstructor;
@@ -43,7 +46,7 @@ declare const treeProps: {
         readonly type: BooleanConstructor;
         readonly default: true;
     };
-    readonly internalCheckStrategy: {
+    readonly checkStrategy: {
         readonly type: PropType<CheckStrategy>;
         readonly default: "all";
     };
@@ -66,6 +69,9 @@ declare const treeProps: {
         readonly type: PropType<Key[]>;
         readonly default: () => never[];
     };
+    readonly indeterminateKeys: PropType<Key[]>;
+    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<(value: Key[]) => void>>;
+    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<(value: Key[]) => void>>;
     readonly onUpdateExpandedKeys: PropType<MaybeArray<(value: Key[]) => void>>;
     readonly 'onUpdate:expandedKeys': PropType<MaybeArray<(value: Key[]) => void>>;
     readonly data: {
@@ -277,7 +283,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly internalDataTreeMate: PropType<TreeMate<TreeOption, TreeOption, TreeOption>>;
     readonly internalDisplayTreeMate: PropType<TreeMate<TreeOption, TreeOption, TreeOption>>;
     readonly internalHighlightKeySet: PropType<Set<Key>>;
-    readonly internalCheckOnSelect: BooleanConstructor;
+    readonly internalUnifySelectCheck: BooleanConstructor;
     readonly internalHideFilteredNode: BooleanConstructor;
     readonly internalCheckboxFocusable: {
         readonly type: BooleanConstructor;
@@ -287,7 +293,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: BooleanConstructor;
         readonly default: true;
     };
-    readonly internalCheckStrategy: {
+    readonly checkStrategy: {
         readonly type: PropType<CheckStrategy>;
         readonly default: "all";
     };
@@ -310,6 +316,9 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: PropType<Key[]>;
         readonly default: () => never[];
     };
+    readonly indeterminateKeys: PropType<Key[]>;
+    readonly onUpdateIndeterminateKeys: PropType<MaybeArray<(value: Key[]) => void>>;
+    readonly 'onUpdate:indeterminateKeys': PropType<MaybeArray<(value: Key[]) => void>>;
     readonly onUpdateExpandedKeys: PropType<MaybeArray<(value: Key[]) => void>>;
     readonly 'onUpdate:expandedKeys': PropType<MaybeArray<(value: Key[]) => void>>;
     readonly data: {
@@ -962,11 +971,11 @@ declare const _default: import("vue").DefineComponent<{
     readonly internalDataTreeMate?: unknown;
     readonly internalDisplayTreeMate?: unknown;
     readonly internalHighlightKeySet?: unknown;
-    readonly internalCheckOnSelect?: unknown;
+    readonly internalUnifySelectCheck?: unknown;
     readonly internalHideFilteredNode?: unknown;
     readonly internalCheckboxFocusable?: unknown;
     readonly internalFocusable?: unknown;
-    readonly internalCheckStrategy?: unknown;
+    readonly checkStrategy?: unknown;
     readonly filter?: unknown;
     readonly defaultExpandAll?: unknown;
     readonly expandedKeys?: unknown;
@@ -974,6 +983,9 @@ declare const _default: import("vue").DefineComponent<{
     readonly labelField?: unknown;
     readonly childrenField?: unknown;
     readonly defaultExpandedKeys?: unknown;
+    readonly indeterminateKeys?: unknown;
+    readonly onUpdateIndeterminateKeys?: unknown;
+    readonly 'onUpdate:indeterminateKeys'?: unknown;
     readonly onUpdateExpandedKeys?: unknown;
     readonly 'onUpdate:expandedKeys'?: unknown;
     readonly data?: unknown;
@@ -1028,6 +1040,7 @@ declare const _default: import("vue").DefineComponent<{
     remote: boolean;
     cascade: boolean;
     indent: number;
+    checkStrategy: CheckStrategy;
     leafOnly: boolean;
     labelField: string;
     childrenField: string;
@@ -1037,11 +1050,10 @@ declare const _default: import("vue").DefineComponent<{
     internalScrollable: boolean;
     blockLine: boolean;
     selectable: boolean;
-    internalCheckOnSelect: boolean;
+    internalUnifySelectCheck: boolean;
     internalHideFilteredNode: boolean;
     internalCheckboxFocusable: boolean;
     internalFocusable: boolean;
-    internalCheckStrategy: CheckStrategy;
     expandOnDragenter: boolean;
     blockNode: boolean;
     defaultCheckedKeys: Key[];
@@ -1202,6 +1214,9 @@ declare const _default: import("vue").DefineComponent<{
     internalDataTreeMate?: TreeMate<TreeOption, TreeOption, TreeOption> | undefined;
     internalDisplayTreeMate?: TreeMate<TreeOption, TreeOption, TreeOption> | undefined;
     internalHighlightKeySet?: Set<Key> | undefined;
+    indeterminateKeys?: Key[] | undefined;
+    onUpdateIndeterminateKeys?: MaybeArray<(value: Key[]) => void> | undefined;
+    "onUpdate:indeterminateKeys"?: MaybeArray<(value: Key[]) => void> | undefined;
     selectedKeys?: Key[] | undefined;
     onUpdateCheckedKeys?: MaybeArray<(value: Key[]) => void> | undefined;
     "onUpdate:checkedKeys"?: MaybeArray<(value: Key[]) => void> | undefined;
@@ -1220,6 +1235,7 @@ declare const _default: import("vue").DefineComponent<{
     remote: boolean;
     cascade: boolean;
     indent: number;
+    checkStrategy: CheckStrategy;
     leafOnly: boolean;
     labelField: string;
     childrenField: string;
@@ -1229,11 +1245,10 @@ declare const _default: import("vue").DefineComponent<{
     internalScrollable: boolean;
     blockLine: boolean;
     selectable: boolean;
-    internalCheckOnSelect: boolean;
+    internalUnifySelectCheck: boolean;
     internalHideFilteredNode: boolean;
     internalCheckboxFocusable: boolean;
     internalFocusable: boolean;
-    internalCheckStrategy: CheckStrategy;
     expandOnDragenter: boolean;
     blockNode: boolean;
     defaultCheckedKeys: Key[];

package/es/tree/src/Tree.js

@@ -52,6 +52,9 @@ export const treeSharedProps = {
         type: Array,
         default: () => []
     },
+    indeterminateKeys: Array,
+    onUpdateIndeterminateKeys: [Function, Array],
+    'onUpdate:indeterminateKeys': [Function, Array],
     onUpdateExpandedKeys: [Function, Array],
     'onUpdate:expandedKeys': [Function, Array]
 };
@@ -91,14 +94,14 @@ const treeProps = Object.assign(Object.assign(Object.assign(Object.assign({}, us
     // use it to do check
     internalDataTreeMate: Object, 
     // use it to display
-    internalDisplayTreeMate: Object, internalHighlightKeySet: Object, internalCheckOnSelect: Boolean, internalHideFilteredNode: Boolean, internalCheckboxFocusable: {
+    internalDisplayTreeMate: Object, internalHighlightKeySet: Object, internalUnifySelectCheck: Boolean, internalHideFilteredNode: Boolean, internalCheckboxFocusable: {
         type: Boolean,
         default: true
     }, internalFocusable: {
         // Make tree-select take over keyboard operations
         type: Boolean,
         default: true
-    }, internalCheckStrategy: {
+    }, checkStrategy: {
         type: String,
         default: 'all'
     } });
@@ -130,15 +133,19 @@ export default defineComponent({
         const controlledCheckedKeysRef = toRef(props, 'checkedKeys');
         const mergedCheckedKeysRef = useMergedState(controlledCheckedKeysRef, uncontrolledCheckedKeysRef);
         const checkedStatusRef = computed(() => {
-            return dataTreeMateRef.value.getCheckedKeys(mergedCheckedKeysRef.value, {
+            const value = dataTreeMateRef.value.getCheckedKeys(mergedCheckedKeysRef.value, {
                 cascade: props.cascade
             });
+            return value;
         });
-        const mergedCheckStrategyRef = computed(() => props.leafOnly ? 'child' : props.internalCheckStrategy);
+        const mergedCheckStrategyRef = computed(() => props.leafOnly ? 'child' : props.checkStrategy);
         const displayedCheckedKeysRef = computed(() => {
             return checkedStatusRef.value.checkedKeys;
         });
         const displayedIndeterminateKeysRef = computed(() => {
+            const { indeterminateKeys } = props;
+            if (indeterminateKeys !== undefined)
+                return indeterminateKeys;
             return checkedStatusRef.value.indeterminateKeys;
         });
         const uncontrolledSelectedKeysRef = ref(props.defaultSelectedKeys || props.selectedKeys);
@@ -333,6 +340,13 @@ export default defineComponent({
             if (_onUpdateCheckedKeys)
                 call(_onUpdateCheckedKeys, value);
         }
+        function doUpdateIndeterminateKeys(value) {
+            const { 'onUpdate:indeterminateKeys': _onUpdateIndeterminateKeys, onUpdateIndeterminateKeys } = props;
+            if (_onUpdateIndeterminateKeys)
+                call(_onUpdateIndeterminateKeys, value);
+            if (onUpdateIndeterminateKeys)
+                call(onUpdateIndeterminateKeys, value);
+        }
         function doUpdateSelectedKeys(value) {
             const { 'onUpdate:selectedKeys': _onUpdateSelectedKeys, onUpdateSelectedKeys } = props;
             uncontrolledSelectedKeysRef.value = value;
@@ -398,12 +412,16 @@ export default defineComponent({
             if (props.disabled || node.disabled) {
                 return;
             }
-            const { checkedKeys } = dataTreeMateRef.value[checked ? 'check' : 'uncheck'](node.key, displayedCheckedKeysRef.value, {
+            if (props.internalUnifySelectCheck && !props.multiple) {
+                handleSelect(node);
+                return;
+            }
+            const { checkedKeys, indeterminateKeys } = dataTreeMateRef.value[checked ? 'check' : 'uncheck'](node.key, displayedCheckedKeysRef.value, {
                 cascade: props.cascade,
-                leafOnly: props.leafOnly,
                 checkStrategy: mergedCheckStrategyRef.value
             });
             doUpdateCheckedKeys(checkedKeys);
+            doUpdateIndeterminateKeys(indeterminateKeys);
         }
         function toggleExpand(key) {
             if (props.disabled)
@@ -432,14 +450,19 @@ export default defineComponent({
             if (props.disabled ||
                 node.disabled ||
                 !props.selectable ||
-                (props.leafOnly && !node.isLeaf)) {
+                (mergedCheckStrategyRef.value === 'child' && !node.isLeaf)) {
                 return;
             }
             pendingNodeKeyRef.value = node.key;
-            if (props.internalCheckOnSelect) {
+            if (props.internalUnifySelectCheck) {
                 const { value: { checkedKeys, indeterminateKeys } } = checkedStatusRef;
-                handleCheck(node, !(checkedKeys.includes(node.key) ||
-                    indeterminateKeys.includes(node.key)));
+                if (props.multiple) {
+                    handleCheck(node, !(checkedKeys.includes(node.key) ||
+                        indeterminateKeys.includes(node.key)));
+                }
+                else {
+                    doUpdateCheckedKeys([node.key]);
+                }
             }
             if (props.multiple) {
                 const selectedKeys = Array.from(mergedSelectedKeysRef.value);
@@ -839,9 +862,9 @@ export default defineComponent({
             mergedSelectedKeysRef,
             mergedExpandedKeysRef,
             mergedThemeRef: themeRef,
+            mergedCheckStrategyRef,
             disabledRef: toRef(props, 'disabled'),
             checkableRef: toRef(props, 'checkable'),
-            leafOnlyRef: toRef(props, 'leafOnly'),
             selectableRef: toRef(props, 'selectable'),
             remoteRef: toRef(props, 'remote'),
             onLoadRef: toRef(props, 'onLoad'),

package/es/tree/src/TreeNode.js

@@ -146,10 +146,13 @@ const TreeNode = defineComponent({
             disabled: computed(() => NTree.disabledRef.value || props.tmNode.disabled),
             checkable: computed(() => NTree.checkableRef.value &&
                 (NTree.cascadeRef.value ||
-                    (NTree.leafOnlyRef.value && props.tmNode.isLeaf))),
+                    NTree.mergedCheckStrategyRef.value !== 'child' ||
+                    props.tmNode.isLeaf)),
             checkboxDisabled: computed(() => !!props.tmNode.rawNode.checkboxDisabled),
             selectable: computed(() => NTree.selectableRef.value &&
-                (NTree.leafOnlyRef.value ? !!props.tmNode.isLeaf : true)),
+                (NTree.mergedCheckStrategyRef.value === 'child'
+                    ? props.tmNode.isLeaf
+                    : true)),
             internalScrollable: NTree.internalScrollableRef,
             draggable: NTree.draggableRef,
             blockLine: NTree.blockLineRef,

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

@@ -1,4 +1,4 @@
-import { TreeNode } from 'treemate';
+import { CheckStrategy, TreeNode } from 'treemate';
 import { InjectionKey, Ref, VNodeChild } from 'vue';
 import type { MergedTheme } from '../../_mixins';
 import type { TreeTheme } from '../styles';
@@ -73,7 +73,7 @@ export interface TreeInjection {
     disabledRef: Ref<boolean>;
     checkableRef: Ref<boolean>;
     cascadeRef: Ref<boolean>;
-    leafOnlyRef: Ref<boolean>;
+    mergedCheckStrategyRef: Ref<CheckStrategy>;
     selectableRef: Ref<boolean>;
     pendingNodeKeyRef: Ref<null | Key>;
     internalScrollableRef: Ref<boolean>;