naive-ui 2.19.0 → 2.19.1

package/es/_utils/naive/mutable.d.ts

@@ -1,3 +1,3 @@
-export declare type Mutable<T> = {
+export declare type Mutable<T> = T extends Record<string, unknown> ? {
     -readonly [P in keyof T]: T[P] extends ReadonlyArray<infer U> ? Array<Mutable<U>> : Mutable<T[P]>;
-};
+} : T;

package/es/dialog/src/DialogProvider.d.ts

@@ -1,9 +1,9 @@
 import { ExtractPropTypes, PropType, InjectionKey, Ref, CSSProperties } from 'vue';
-import type { ExtractPublicPropTypes } from '../../_utils';
+import type { ExtractPublicPropTypes, Mutable } from '../../_utils';
 import { exposedDialogEnvProps } from './DialogEnvironment';
-export declare type DialogOptions = Omit<Partial<ExtractPropTypes<typeof exposedDialogEnvProps>>, 'internalStyle'> & {
+export declare type DialogOptions = Mutable<Omit<Partial<ExtractPropTypes<typeof exposedDialogEnvProps>>, 'internalStyle'> & {
     style?: string | CSSProperties;
-};
+}>;
 export declare type DialogReactive = {
     readonly key: string;
     readonly destroy: () => void;
@@ -41,23 +41,23 @@ declare const _default: import("vue").DefineComponent<{
     dialogList: Ref<{
         readonly key: string;
         readonly destroy: () => void;
-        readonly type?: "default" | "error" | "info" | "success" | "warning" | undefined;
-        readonly content?: string | (() => import("vue").VNodeChild) | undefined;
-        readonly icon?: (() => import("vue").VNodeChild) | undefined;
-        readonly title?: string | (() => import("vue").VNodeChild) | undefined;
-        readonly action?: (() => import("vue").VNodeChild) | undefined;
-        readonly bordered?: boolean | undefined;
-        readonly loading?: boolean | undefined;
-        readonly onClose?: (() => unknown) | undefined;
-        readonly closable?: boolean | undefined;
-        readonly showIcon?: boolean | undefined;
-        readonly iconPlacement?: import("./interface").IconPlacement | undefined;
-        readonly negativeText?: string | undefined;
-        readonly positiveText?: string | undefined;
-        readonly onPositiveClick?: ((e: MouseEvent) => unknown) | undefined;
-        readonly onNegativeClick?: ((e: MouseEvent) => unknown) | undefined;
-        readonly onMaskClick?: ((e: MouseEvent) => void) | undefined;
-        readonly maskClosable?: boolean | undefined;
+        type?: "default" | "error" | "info" | "success" | "warning" | undefined;
+        content?: string | (() => import("vue").VNodeChild) | undefined;
+        icon?: (() => import("vue").VNodeChild) | undefined;
+        title?: string | (() => import("vue").VNodeChild) | undefined;
+        action?: (() => import("vue").VNodeChild) | undefined;
+        bordered?: boolean | undefined;
+        loading?: boolean | undefined;
+        onClose?: (() => unknown) | undefined;
+        closable?: boolean | undefined;
+        showIcon?: boolean | undefined;
+        iconPlacement?: import("./interface").IconPlacement | undefined;
+        negativeText?: string | undefined;
+        positiveText?: string | undefined;
+        onPositiveClick?: ((e: MouseEvent) => unknown) | undefined;
+        onNegativeClick?: ((e: MouseEvent) => unknown) | undefined;
+        onMaskClick?: ((e: MouseEvent) => void) | undefined;
+        maskClosable?: boolean | undefined;
         style?: any;
     }[]>;
     dialogInstRefs: Record<string, DialogInst>;

package/es/notification/src/NotificationProvider.d.ts

@@ -228,22 +228,22 @@ declare const _default: import("vue").DefineComponent<{
         readonly destroy: () => void;
         readonly hide: () => void;
         readonly deactivate: () => void;
-        duration?: Mutable<number | undefined>;
-        onClose?: {} | undefined;
-        onLeave?: {} | undefined;
-        onAfterEnter?: {} | undefined;
-        onAfterLeave?: {} | undefined;
-        onHide?: {} | undefined;
-        onAfterShow?: {} | undefined;
-        onAfterHide?: {} | undefined;
-        closable?: Mutable<boolean | undefined>;
-        type?: Mutable<"default" | "error" | "info" | "success" | "warning" | undefined>;
-        avatar?: {} | undefined;
-        title?: string | {} | undefined;
-        description?: string | {} | undefined;
-        content?: string | {} | undefined;
-        meta?: string | {} | undefined;
-        action?: string | {} | undefined;
+        duration?: number | undefined;
+        onClose?: (() => any) | undefined;
+        onLeave?: (() => void) | undefined;
+        onAfterEnter?: (() => void) | undefined;
+        onAfterLeave?: (() => void) | undefined;
+        onHide?: (() => void) | undefined;
+        onAfterShow?: (() => void) | undefined;
+        onAfterHide?: (() => void) | undefined;
+        closable?: boolean | undefined;
+        type?: "default" | "error" | "info" | "success" | "warning" | undefined;
+        avatar?: (() => import("vue").VNodeChild) | undefined;
+        title?: string | (() => import("vue").VNodeChild) | undefined;
+        description?: string | (() => import("vue").VNodeChild) | undefined;
+        content?: string | (() => import("vue").VNodeChild) | undefined;
+        meta?: string | (() => import("vue").VNodeChild) | undefined;
+        action?: string | (() => import("vue").VNodeChild) | undefined;
     }[]>;
     notificationRefs: Record<string, NotificationRef>;
     handleAfterLeave: (key: string) => void;

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

@@ -36,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;
@@ -283,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;
@@ -971,7 +971,7 @@ 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;
@@ -1050,7 +1050,7 @@ declare const _default: import("vue").DefineComponent<{
     internalScrollable: boolean;
     blockLine: boolean;
     selectable: boolean;
-    internalCheckOnSelect: boolean;
+    internalUnifySelectCheck: boolean;
     internalHideFilteredNode: boolean;
     internalCheckboxFocusable: boolean;
     internalFocusable: boolean;
@@ -1245,7 +1245,7 @@ declare const _default: import("vue").DefineComponent<{
     internalScrollable: boolean;
     blockLine: boolean;
     selectable: boolean;
-    internalCheckOnSelect: boolean;
+    internalUnifySelectCheck: boolean;
     internalHideFilteredNode: boolean;
     internalCheckboxFocusable: boolean;
     internalFocusable: boolean;

package/es/tree/src/Tree.js

@@ -94,7 +94,7 @@ 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: {
@@ -133,9 +133,10 @@ 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.checkStrategy);
         const displayedCheckedKeysRef = computed(() => {
@@ -341,7 +342,6 @@ export default defineComponent({
         }
         function doUpdateIndeterminateKeys(value) {
             const { 'onUpdate:indeterminateKeys': _onUpdateIndeterminateKeys, onUpdateIndeterminateKeys } = props;
-            uncontrolledCheckedKeysRef.value = value;
             if (_onUpdateIndeterminateKeys)
                 call(_onUpdateIndeterminateKeys, value);
             if (onUpdateIndeterminateKeys)
@@ -412,9 +412,12 @@ export default defineComponent({
             if (props.disabled || node.disabled) {
                 return;
             }
+            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);
@@ -447,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);
@@ -854,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>;

package/es/tree-select/src/TreeSelect.d.ts

@@ -1041,7 +1041,6 @@ declare const _default: import("vue").DefineComponent<{
     handleMenuLeave: () => void;
     handleTriggerClick: () => void;
     handleMenuClickoutside: (e: MouseEvent) => void;
-    handleUpdateSelectedKeys: (keys: Key[]) => void;
     handleUpdateCheckedKeys: (keys: Key[]) => void;
     handleUpdateIndeterminateKeys: (keys: Key[]) => void;
     handleTriggerFocus: (e: FocusEvent) => void;

package/es/tree-select/src/TreeSelect.js

@@ -117,7 +117,7 @@ export default defineComponent({
                 ? initMergedValue[initMergedValue.length - 1]
                 : null);
         const mergedCascadeRef = computed(() => {
-            return props.multiple && props.cascade;
+            return props.multiple && props.cascade && props.checkable;
         });
         // The same logic as tree, now it's not that complex so I don't extract a
         // function to reuse it.
@@ -136,21 +136,9 @@ export default defineComponent({
         const treeSelectedKeysRef = computed(() => {
             if (props.checkable)
                 return [];
-            const { value: mergedValue } = mergedValueRef;
-            const { multiple } = props;
-            return Array.isArray(mergedValue)
-                ? multiple
-                    ? mergedValue
-                    : []
-                : multiple
-                    ? []
-                    : mergedValue === null
-                        ? []
-                        : [mergedValue];
+            return treeCheckedKeysRef.value;
         });
         const treeCheckedKeysRef = computed(() => {
-            if (!props.checkable)
-                return [];
             const { value: mergedValue } = mergedValueRef;
             if (props.multiple) {
                 if (Array.isArray(mergedValue))
@@ -308,10 +296,7 @@ export default defineComponent({
             const { value: { getNode } } = dataTreeMateRef;
             return keys.map((key) => { var _a; return ((_a = getNode(key)) === null || _a === void 0 ? void 0 : _a.rawNode) || null; });
         }
-        function handleUpdateSelectedKeys(keys) {
-            if (props.checkable && props.multiple) {
-                return;
-            }
+        function handleUpdateCheckedKeys(keys) {
             const options = getOptionsByKeys(keys);
             if (props.multiple) {
                 doUpdateValue(keys, options);
@@ -332,18 +317,8 @@ export default defineComponent({
                 patternRef.value = '';
             }
         }
-        function handleUpdateCheckedKeys(keys) {
-            // only in checkable & multiple mode, we use tree's check update
-            if (props.checkable && props.multiple) {
-                doUpdateValue(keys, getOptionsByKeys(keys));
-                if (props.filterable) {
-                    focusSelectionInput();
-                    patternRef.value = '';
-                }
-            }
-        }
         function handleUpdateIndeterminateKeys(keys) {
-            if (props.checkable && props.multiple) {
+            if (props.checkable) {
                 doUpdateIndeterminateKeys(keys, getOptionsByKeys(keys));
             }
         }
@@ -525,7 +500,6 @@ export default defineComponent({
             handleMenuLeave,
             handleTriggerClick,
             handleMenuClickoutside,
-            handleUpdateSelectedKeys,
             handleUpdateCheckedKeys,
             handleUpdateIndeterminateKeys,
             handleTriggerFocus,
@@ -568,7 +542,7 @@ export default defineComponent({
                                 const { mergedClsPrefix, filteredTreeInfo, checkable, multiple } = this;
                                 return withDirectives(h("div", { class: `${mergedClsPrefix}-tree-select-menu`, ref: "menuElRef", style: this.cssVars, tabindex: 0, onMousedown: this.handleMenuMousedown, onKeyup: this.handleKeyup, onKeydown: this.handleKeydown, onFocusin: this.handleMenuFocusin, onFocusout: this.handleMenuFocusout },
                                     filteredTreeInfo.filteredTree.length ? (h(NTree, { ref: "treeInstRef", blockLine: true, animated: false, data: filteredTreeInfo.filteredTree, cancelable: multiple, labelField: this.labelField, theme: mergedTheme.peers.Tree, themeOverrides: mergedTheme.peerOverrides.Tree, defaultExpandAll: this.defaultExpandAll, defaultExpandedKeys: this.defaultExpandedKeys, expandedKeys: this.mergedExpandedKeys, checkedKeys: this.treeCheckedKeys, selectedKeys: this.treeSelectedKeys, checkable: checkable, checkStrategy: this.checkStrategy, cascade: this.mergedCascade, leafOnly: this.leafOnly, multiple: this.multiple, virtualScroll: this.consistentMenuWidth &&
-                                            this.virtualScroll, internalDataTreeMate: this.dataTreeMate, internalDisplayTreeMate: this.displayTreeMate, internalHighlightKeySet: filteredTreeInfo.highlightKeySet, internalCheckOnSelect: true, internalScrollable: true, internalScrollablePadding: this.menuPadding, internalFocusable: false, internalCheckboxFocusable: false, onUpdateCheckedKeys: this.handleUpdateCheckedKeys, onUpdateIndeterminateKeys: this.handleUpdateIndeterminateKeys, onUpdateExpandedKeys: this.doUpdateExpandedKeys, onUpdateSelectedKeys: this.handleUpdateSelectedKeys })) : (h("div", { class: `${mergedClsPrefix}-tree-select-menu__empty` },
+                                            this.virtualScroll, internalDataTreeMate: this.dataTreeMate, internalDisplayTreeMate: this.displayTreeMate, internalHighlightKeySet: filteredTreeInfo.highlightKeySet, internalUnifySelectCheck: true, internalScrollable: true, internalScrollablePadding: this.menuPadding, internalFocusable: false, internalCheckboxFocusable: false, onUpdateCheckedKeys: this.handleUpdateCheckedKeys, onUpdateIndeterminateKeys: this.handleUpdateIndeterminateKeys, onUpdateExpandedKeys: this.doUpdateExpandedKeys })) : (h("div", { class: `${mergedClsPrefix}-tree-select-menu__empty` },
                                         h(NEmpty, { theme: mergedTheme.peers.Empty, themeOverrides: mergedTheme.peerOverrides.Empty }))),
                                     h(NBaseFocusDetector, { onFocus: this.handleTabOut })), [[clickoutside, this.handleMenuClickoutside]]);
                             }

package/es/upload/src/Upload.js

@@ -225,19 +225,20 @@ export default defineComponent({
                     return fileInfo;
                 }
                 return null;
-            }))).then((fileInfos) => {
+            })))
+                .then((fileInfos) => __awaiter(this, void 0, void 0, function* () {
                 let nextTickChain = Promise.resolve();
                 fileInfos.forEach((fileInfo) => {
-                    nextTickChain = nextTickChain
-                        // eslint-disable-next-line @typescript-eslint/promise-function-async
-                        .then(() => nextTick())
-                        .then(() => {
+                    nextTickChain = nextTickChain.then(nextTick).then(() => {
                         fileInfo &&
                             doChange(fileInfo, e, {
                                 append: true
                             });
                     });
                 });
+                return yield nextTickChain;
+            }))
+                .then(() => {
                 if (props.defaultUpload) {
                     submit();
                 }

package/es/upload/src/UploadProgress.d.ts

@@ -9,10 +9,6 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<"error" | "info" | "success">;
         required: true;
     };
-    delay: {
-        type: NumberConstructor;
-        default: number;
-    };
 }, {
     mergedTheme: import("vue").Ref<{
         common: {
@@ -368,14 +364,11 @@ declare const _default: import("vue").DefineComponent<{
     show?: unknown;
     percentage?: unknown;
     status?: unknown;
-    delay?: unknown;
 } & {
     show: boolean;
-    delay: number;
     percentage: number;
     status: "error" | "info" | "success";
 } & {}>, {
     show: boolean;
-    delay: number;
 }>;
 export default _default;

package/es/upload/src/UploadProgress.js

@@ -13,13 +13,9 @@ export default defineComponent({
         status: {
             type: String,
             required: true
-        },
-        delay: {
-            type: Number,
-            default: 900
         }
     },
-    setup(props) {
+    setup() {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const NUpload = inject(uploadInjectionKey);
         return {

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

@@ -14,7 +14,7 @@ export default c([cB('upload', [cM('dragger-inside', [cE('trigger', `
  padding: 24px;
  opacity: 1;
  transition:
- opacity: .3s var(--bezier),
+ opacity .3s var(--bezier),
  border-color .3s var(--bezier),
  background-color .3s var(--bezier);
  background-color: var(--dragger-color);
@@ -32,7 +32,10 @@ export default c([cB('upload', [cM('dragger-inside', [cE('trigger', `
  `, [cM('disabled', `
  opacity: var(--item-disabled-opacity);
  cursor: not-allowed;
- `), cM('image-card', [cB('upload-dragger', `
+ `), cM('image-card', `
+ width: 96px;
+ height: 96px;
+ `, [cB('upload-dragger', `
  padding: 0;
  height: 100%;
  width: 100%;

package/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.19.0";
+declare const _default: "2.19.1";
 export default _default;

package/es/version.js

@@ -1 +1 @@
-export default '2.19.0';
+export default '2.19.1';

package/lib/_utils/naive/mutable.d.ts

@@ -1,3 +1,3 @@
-export declare type Mutable<T> = {
+export declare type Mutable<T> = T extends Record<string, unknown> ? {
     -readonly [P in keyof T]: T[P] extends ReadonlyArray<infer U> ? Array<Mutable<U>> : Mutable<T[P]>;
-};
+} : T;

package/lib/dialog/src/DialogProvider.d.ts

@@ -1,9 +1,9 @@
 import { ExtractPropTypes, PropType, InjectionKey, Ref, CSSProperties } from 'vue';
-import type { ExtractPublicPropTypes } from '../../_utils';
+import type { ExtractPublicPropTypes, Mutable } from '../../_utils';
 import { exposedDialogEnvProps } from './DialogEnvironment';
-export declare type DialogOptions = Omit<Partial<ExtractPropTypes<typeof exposedDialogEnvProps>>, 'internalStyle'> & {
+export declare type DialogOptions = Mutable<Omit<Partial<ExtractPropTypes<typeof exposedDialogEnvProps>>, 'internalStyle'> & {
     style?: string | CSSProperties;
-};
+}>;
 export declare type DialogReactive = {
     readonly key: string;
     readonly destroy: () => void;
@@ -41,23 +41,23 @@ declare const _default: import("vue").DefineComponent<{
     dialogList: Ref<{
         readonly key: string;
         readonly destroy: () => void;
-        readonly type?: "default" | "error" | "info" | "success" | "warning" | undefined;
-        readonly content?: string | (() => import("vue").VNodeChild) | undefined;
-        readonly icon?: (() => import("vue").VNodeChild) | undefined;
-        readonly title?: string | (() => import("vue").VNodeChild) | undefined;
-        readonly action?: (() => import("vue").VNodeChild) | undefined;
-        readonly bordered?: boolean | undefined;
-        readonly loading?: boolean | undefined;
-        readonly onClose?: (() => unknown) | undefined;
-        readonly closable?: boolean | undefined;
-        readonly showIcon?: boolean | undefined;
-        readonly iconPlacement?: import("./interface").IconPlacement | undefined;
-        readonly negativeText?: string | undefined;
-        readonly positiveText?: string | undefined;
-        readonly onPositiveClick?: ((e: MouseEvent) => unknown) | undefined;
-        readonly onNegativeClick?: ((e: MouseEvent) => unknown) | undefined;
-        readonly onMaskClick?: ((e: MouseEvent) => void) | undefined;
-        readonly maskClosable?: boolean | undefined;
+        type?: "default" | "error" | "info" | "success" | "warning" | undefined;
+        content?: string | (() => import("vue").VNodeChild) | undefined;
+        icon?: (() => import("vue").VNodeChild) | undefined;
+        title?: string | (() => import("vue").VNodeChild) | undefined;
+        action?: (() => import("vue").VNodeChild) | undefined;
+        bordered?: boolean | undefined;
+        loading?: boolean | undefined;
+        onClose?: (() => unknown) | undefined;
+        closable?: boolean | undefined;
+        showIcon?: boolean | undefined;
+        iconPlacement?: import("./interface").IconPlacement | undefined;
+        negativeText?: string | undefined;
+        positiveText?: string | undefined;
+        onPositiveClick?: ((e: MouseEvent) => unknown) | undefined;
+        onNegativeClick?: ((e: MouseEvent) => unknown) | undefined;
+        onMaskClick?: ((e: MouseEvent) => void) | undefined;
+        maskClosable?: boolean | undefined;
         style?: any;
     }[]>;
     dialogInstRefs: Record<string, DialogInst>;

package/lib/notification/src/NotificationProvider.d.ts

@@ -228,22 +228,22 @@ declare const _default: import("vue").DefineComponent<{
         readonly destroy: () => void;
         readonly hide: () => void;
         readonly deactivate: () => void;
-        duration?: Mutable<number | undefined>;
-        onClose?: {} | undefined;
-        onLeave?: {} | undefined;
-        onAfterEnter?: {} | undefined;
-        onAfterLeave?: {} | undefined;
-        onHide?: {} | undefined;
-        onAfterShow?: {} | undefined;
-        onAfterHide?: {} | undefined;
-        closable?: Mutable<boolean | undefined>;
-        type?: Mutable<"default" | "error" | "info" | "success" | "warning" | undefined>;
-        avatar?: {} | undefined;
-        title?: string | {} | undefined;
-        description?: string | {} | undefined;
-        content?: string | {} | undefined;
-        meta?: string | {} | undefined;
-        action?: string | {} | undefined;
+        duration?: number | undefined;
+        onClose?: (() => any) | undefined;
+        onLeave?: (() => void) | undefined;
+        onAfterEnter?: (() => void) | undefined;
+        onAfterLeave?: (() => void) | undefined;
+        onHide?: (() => void) | undefined;
+        onAfterShow?: (() => void) | undefined;
+        onAfterHide?: (() => void) | undefined;
+        closable?: boolean | undefined;
+        type?: "default" | "error" | "info" | "success" | "warning" | undefined;
+        avatar?: (() => import("vue").VNodeChild) | undefined;
+        title?: string | (() => import("vue").VNodeChild) | undefined;
+        description?: string | (() => import("vue").VNodeChild) | undefined;
+        content?: string | (() => import("vue").VNodeChild) | undefined;
+        meta?: string | (() => import("vue").VNodeChild) | undefined;
+        action?: string | (() => import("vue").VNodeChild) | undefined;
     }[]>;
     notificationRefs: Record<string, NotificationRef>;
     handleAfterLeave: (key: string) => void;

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

@@ -36,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;
@@ -283,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;
@@ -971,7 +971,7 @@ 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;
@@ -1050,7 +1050,7 @@ declare const _default: import("vue").DefineComponent<{
     internalScrollable: boolean;
     blockLine: boolean;
     selectable: boolean;
-    internalCheckOnSelect: boolean;
+    internalUnifySelectCheck: boolean;
     internalHideFilteredNode: boolean;
     internalCheckboxFocusable: boolean;
     internalFocusable: boolean;
@@ -1245,7 +1245,7 @@ declare const _default: import("vue").DefineComponent<{
     internalScrollable: boolean;
     blockLine: boolean;
     selectable: boolean;
-    internalCheckOnSelect: boolean;
+    internalUnifySelectCheck: boolean;
     internalHideFilteredNode: boolean;
     internalCheckboxFocusable: boolean;
     internalFocusable: boolean;

package/lib/tree/src/Tree.js

@@ -98,7 +98,7 @@ const treeProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _m
     // 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: {
@@ -137,9 +137,10 @@ exports.default = (0, vue_1.defineComponent)({
         const controlledCheckedKeysRef = (0, vue_1.toRef)(props, 'checkedKeys');
         const mergedCheckedKeysRef = (0, vooks_1.useMergedState)(controlledCheckedKeysRef, uncontrolledCheckedKeysRef);
         const checkedStatusRef = (0, vue_1.computed)(() => {
-            return dataTreeMateRef.value.getCheckedKeys(mergedCheckedKeysRef.value, {
+            const value = dataTreeMateRef.value.getCheckedKeys(mergedCheckedKeysRef.value, {
                 cascade: props.cascade
             });
+            return value;
         });
         const mergedCheckStrategyRef = (0, vue_1.computed)(() => props.leafOnly ? 'child' : props.checkStrategy);
         const displayedCheckedKeysRef = (0, vue_1.computed)(() => {
@@ -345,7 +346,6 @@ exports.default = (0, vue_1.defineComponent)({
         }
         function doUpdateIndeterminateKeys(value) {
             const { 'onUpdate:indeterminateKeys': _onUpdateIndeterminateKeys, onUpdateIndeterminateKeys } = props;
-            uncontrolledCheckedKeysRef.value = value;
             if (_onUpdateIndeterminateKeys)
                 (0, _utils_1.call)(_onUpdateIndeterminateKeys, value);
             if (onUpdateIndeterminateKeys)
@@ -416,9 +416,12 @@ exports.default = (0, vue_1.defineComponent)({
             if (props.disabled || node.disabled) {
                 return;
             }
+            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);
@@ -451,14 +454,19 @@ exports.default = (0, vue_1.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);
@@ -858,9 +866,9 @@ exports.default = (0, vue_1.defineComponent)({
             mergedSelectedKeysRef,
             mergedExpandedKeysRef,
             mergedThemeRef: themeRef,
+            mergedCheckStrategyRef,
             disabledRef: (0, vue_1.toRef)(props, 'disabled'),
             checkableRef: (0, vue_1.toRef)(props, 'checkable'),
-            leafOnlyRef: (0, vue_1.toRef)(props, 'leafOnly'),
             selectableRef: (0, vue_1.toRef)(props, 'selectable'),
             remoteRef: (0, vue_1.toRef)(props, 'remote'),
             onLoadRef: (0, vue_1.toRef)(props, 'onLoad'),

package/lib/tree/src/TreeNode.js

@@ -148,10 +148,13 @@ const TreeNode = (0, vue_1.defineComponent)({
             disabled: (0, vue_1.computed)(() => NTree.disabledRef.value || props.tmNode.disabled),
             checkable: (0, vue_1.computed)(() => NTree.checkableRef.value &&
                 (NTree.cascadeRef.value ||
-                    (NTree.leafOnlyRef.value && props.tmNode.isLeaf))),
+                    NTree.mergedCheckStrategyRef.value !== 'child' ||
+                    props.tmNode.isLeaf)),
             checkboxDisabled: (0, vue_1.computed)(() => !!props.tmNode.rawNode.checkboxDisabled),
             selectable: (0, vue_1.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/lib/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>;

package/lib/tree-select/src/TreeSelect.d.ts

@@ -1041,7 +1041,6 @@ declare const _default: import("vue").DefineComponent<{
     handleMenuLeave: () => void;
     handleTriggerClick: () => void;
     handleMenuClickoutside: (e: MouseEvent) => void;
-    handleUpdateSelectedKeys: (keys: Key[]) => void;
     handleUpdateCheckedKeys: (keys: Key[]) => void;
     handleUpdateIndeterminateKeys: (keys: Key[]) => void;
     handleTriggerFocus: (e: FocusEvent) => void;

package/lib/tree-select/src/TreeSelect.js

@@ -119,7 +119,7 @@ exports.default = (0, vue_1.defineComponent)({
                 ? initMergedValue[initMergedValue.length - 1]
                 : null);
         const mergedCascadeRef = (0, vue_1.computed)(() => {
-            return props.multiple && props.cascade;
+            return props.multiple && props.cascade && props.checkable;
         });
         // The same logic as tree, now it's not that complex so I don't extract a
         // function to reuse it.
@@ -138,21 +138,9 @@ exports.default = (0, vue_1.defineComponent)({
         const treeSelectedKeysRef = (0, vue_1.computed)(() => {
             if (props.checkable)
                 return [];
-            const { value: mergedValue } = mergedValueRef;
-            const { multiple } = props;
-            return Array.isArray(mergedValue)
-                ? multiple
-                    ? mergedValue
-                    : []
-                : multiple
-                    ? []
-                    : mergedValue === null
-                        ? []
-                        : [mergedValue];
+            return treeCheckedKeysRef.value;
         });
         const treeCheckedKeysRef = (0, vue_1.computed)(() => {
-            if (!props.checkable)
-                return [];
             const { value: mergedValue } = mergedValueRef;
             if (props.multiple) {
                 if (Array.isArray(mergedValue))
@@ -310,10 +298,7 @@ exports.default = (0, vue_1.defineComponent)({
             const { value: { getNode } } = dataTreeMateRef;
             return keys.map((key) => { var _a; return ((_a = getNode(key)) === null || _a === void 0 ? void 0 : _a.rawNode) || null; });
         }
-        function handleUpdateSelectedKeys(keys) {
-            if (props.checkable && props.multiple) {
-                return;
-            }
+        function handleUpdateCheckedKeys(keys) {
             const options = getOptionsByKeys(keys);
             if (props.multiple) {
                 doUpdateValue(keys, options);
@@ -334,18 +319,8 @@ exports.default = (0, vue_1.defineComponent)({
                 patternRef.value = '';
             }
         }
-        function handleUpdateCheckedKeys(keys) {
-            // only in checkable & multiple mode, we use tree's check update
-            if (props.checkable && props.multiple) {
-                doUpdateValue(keys, getOptionsByKeys(keys));
-                if (props.filterable) {
-                    focusSelectionInput();
-                    patternRef.value = '';
-                }
-            }
-        }
         function handleUpdateIndeterminateKeys(keys) {
-            if (props.checkable && props.multiple) {
+            if (props.checkable) {
                 doUpdateIndeterminateKeys(keys, getOptionsByKeys(keys));
             }
         }
@@ -527,7 +502,6 @@ exports.default = (0, vue_1.defineComponent)({
             handleMenuLeave,
             handleTriggerClick,
             handleMenuClickoutside,
-            handleUpdateSelectedKeys,
             handleUpdateCheckedKeys,
             handleUpdateIndeterminateKeys,
             handleTriggerFocus,
@@ -570,7 +544,7 @@ exports.default = (0, vue_1.defineComponent)({
                                 const { mergedClsPrefix, filteredTreeInfo, checkable, multiple } = this;
                                 return (0, vue_1.withDirectives)((0, vue_1.h)("div", { class: `${mergedClsPrefix}-tree-select-menu`, ref: "menuElRef", style: this.cssVars, tabindex: 0, onMousedown: this.handleMenuMousedown, onKeyup: this.handleKeyup, onKeydown: this.handleKeydown, onFocusin: this.handleMenuFocusin, onFocusout: this.handleMenuFocusout },
                                     filteredTreeInfo.filteredTree.length ? ((0, vue_1.h)(tree_1.NTree, { ref: "treeInstRef", blockLine: true, animated: false, data: filteredTreeInfo.filteredTree, cancelable: multiple, labelField: this.labelField, theme: mergedTheme.peers.Tree, themeOverrides: mergedTheme.peerOverrides.Tree, defaultExpandAll: this.defaultExpandAll, defaultExpandedKeys: this.defaultExpandedKeys, expandedKeys: this.mergedExpandedKeys, checkedKeys: this.treeCheckedKeys, selectedKeys: this.treeSelectedKeys, checkable: checkable, checkStrategy: this.checkStrategy, cascade: this.mergedCascade, leafOnly: this.leafOnly, multiple: this.multiple, virtualScroll: this.consistentMenuWidth &&
-                                            this.virtualScroll, internalDataTreeMate: this.dataTreeMate, internalDisplayTreeMate: this.displayTreeMate, internalHighlightKeySet: filteredTreeInfo.highlightKeySet, internalCheckOnSelect: true, internalScrollable: true, internalScrollablePadding: this.menuPadding, internalFocusable: false, internalCheckboxFocusable: false, onUpdateCheckedKeys: this.handleUpdateCheckedKeys, onUpdateIndeterminateKeys: this.handleUpdateIndeterminateKeys, onUpdateExpandedKeys: this.doUpdateExpandedKeys, onUpdateSelectedKeys: this.handleUpdateSelectedKeys })) : ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-tree-select-menu__empty` },
+                                            this.virtualScroll, internalDataTreeMate: this.dataTreeMate, internalDisplayTreeMate: this.displayTreeMate, internalHighlightKeySet: filteredTreeInfo.highlightKeySet, internalUnifySelectCheck: true, internalScrollable: true, internalScrollablePadding: this.menuPadding, internalFocusable: false, internalCheckboxFocusable: false, onUpdateCheckedKeys: this.handleUpdateCheckedKeys, onUpdateIndeterminateKeys: this.handleUpdateIndeterminateKeys, onUpdateExpandedKeys: this.doUpdateExpandedKeys })) : ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-tree-select-menu__empty` },
                                         (0, vue_1.h)(empty_1.NEmpty, { theme: mergedTheme.peers.Empty, themeOverrides: mergedTheme.peerOverrides.Empty }))),
                                     (0, vue_1.h)(_internal_1.NBaseFocusDetector, { onFocus: this.handleTabOut })), [[vdirs_1.clickoutside, this.handleMenuClickoutside]]);
                             }

package/lib/upload/src/Upload.js

@@ -227,19 +227,20 @@ exports.default = (0, vue_1.defineComponent)({
                     return fileInfo;
                 }
                 return null;
-            }))).then((fileInfos) => {
+            })))
+                .then((fileInfos) => __awaiter(this, void 0, void 0, function* () {
                 let nextTickChain = Promise.resolve();
                 fileInfos.forEach((fileInfo) => {
-                    nextTickChain = nextTickChain
-                        // eslint-disable-next-line @typescript-eslint/promise-function-async
-                        .then(() => (0, vue_1.nextTick)())
-                        .then(() => {
+                    nextTickChain = nextTickChain.then(vue_1.nextTick).then(() => {
                         fileInfo &&
                             doChange(fileInfo, e, {
                                 append: true
                             });
                     });
                 });
+                return yield nextTickChain;
+            }))
+                .then(() => {
                 if (props.defaultUpload) {
                     submit();
                 }

package/lib/upload/src/UploadProgress.d.ts

@@ -9,10 +9,6 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<"error" | "info" | "success">;
         required: true;
     };
-    delay: {
-        type: NumberConstructor;
-        default: number;
-    };
 }, {
     mergedTheme: import("vue").Ref<{
         common: {
@@ -368,14 +364,11 @@ declare const _default: import("vue").DefineComponent<{
     show?: unknown;
     percentage?: unknown;
     status?: unknown;
-    delay?: unknown;
 } & {
     show: boolean;
-    delay: number;
     percentage: number;
     status: "error" | "info" | "success";
 } & {}>, {
     show: boolean;
-    delay: number;
 }>;
 export default _default;

package/lib/upload/src/UploadProgress.js

@@ -15,13 +15,9 @@ exports.default = (0, vue_1.defineComponent)({
         status: {
             type: String,
             required: true
-        },
-        delay: {
-            type: Number,
-            default: 900
         }
     },
-    setup(props) {
+    setup() {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const NUpload = (0, vue_1.inject)(interface_1.uploadInjectionKey);
         return {

package/lib/upload/src/styles/index.cssr.js

@@ -23,7 +23,7 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('upload', [(0, cssr_1.cM)('dragg
  padding: 24px;
  opacity: 1;
  transition:
- opacity: .3s var(--bezier),
+ opacity .3s var(--bezier),
  border-color .3s var(--bezier),
  background-color .3s var(--bezier);
  background-color: var(--dragger-color);
@@ -41,7 +41,10 @@ exports.default = (0, cssr_1.c)([(0, cssr_1.cB)('upload', [(0, cssr_1.cM)('dragg
  `, [(0, cssr_1.cM)('disabled', `
  opacity: var(--item-disabled-opacity);
  cursor: not-allowed;
- `), (0, cssr_1.cM)('image-card', [(0, cssr_1.cB)('upload-dragger', `
+ `), (0, cssr_1.cM)('image-card', `
+ width: 96px;
+ height: 96px;
+ `, [(0, cssr_1.cB)('upload-dragger', `
  padding: 0;
  height: 100%;
  width: 100%;

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.19.0";
+declare const _default: "2.19.1";
 export default _default;

package/lib/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '2.19.0';
+exports.default = '2.19.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "description": "A Vue 3 Component Library. Fairly Complete, Customizable Themes, Uses TypeScript, Not Too Slow",
   "main": "lib/index.js",
   "module": "es/index.js",

package/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "naive-ui",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "contributions": {
     "html": {
       "tags": [