naive-ui 2.30.3 → 2.30.4

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

@@ -10,7 +10,7 @@ import { TimeIcon } from '../../_internal/icons';
 import { NInput } from '../../input';
 import { NBaseIcon } from '../../_internal';
 import { useConfig, useTheme, useLocale, useFormItem, useThemeClass } from '../../_mixins';
-import { call, useAdjustedTo, warnOnce } from '../../_utils';
+import { call, markEventEffectPerformed, useAdjustedTo, warnOnce } from '../../_utils';
 import { timePickerLight } from '../styles';
 import Panel from './Panel';
 import { timePickerInjectionKey } from './interface';
@@ -294,13 +294,22 @@ export default defineComponent({
                 returnFocus: true
             });
         }
-        function handleMenuKeyDown(e) {
+        function handleInputKeydown(e) {
+            if (e.key === 'Escape' && mergedShowRef.value) {
+                markEventEffectPerformed(e);
+                // closePanel will be called in onDeactivated
+            }
+        }
+        function handleMenuKeydown(e) {
             var _a;
             switch (e.key) {
                 case 'Escape':
-                    closePanel({
-                        returnFocus: true
-                    });
+                    if (mergedShowRef.value) {
+                        markEventEffectPerformed(e);
+                        closePanel({
+                            returnFocus: true
+                        });
+                    }
                     break;
                 case 'Tab':
                     if (keyboardState.shift && e.target === ((_a = panelInstRef.value) === null || _a === void 0 ? void 0 : _a.$el)) {
@@ -624,6 +633,7 @@ export default defineComponent({
             minuteValue: minuteValueRef,
             secondValue: secondValueRef,
             amPmValue: amPmValueRef,
+            handleInputKeydown,
             handleTimeInputFocus,
             handleTimeInputBlur,
             handleNowClick,
@@ -640,7 +650,7 @@ export default defineComponent({
             handleAmPmClick,
             handleTimeInputClear,
             handleFocusDetectorFocus,
-            handleMenuKeyDown,
+            handleMenuKeydown,
             handleTriggerClick,
             mergedTheme: themeRef,
             triggerCssVars: inlineThemeDisabled ? undefined : triggerCssVarsRef,
@@ -658,7 +668,7 @@ export default defineComponent({
             h(VBinder, null, {
                 default: () => [
                     h(VTarget, null, {
-                        default: () => (h(NInput, { ref: "inputInstRef", status: this.mergedStatus, value: this.displayTimeString, bordered: this.mergedBordered, passivelyActivated: true, attrSize: this.mergedAttrSize, theme: this.mergedTheme.peers.Input, themeOverrides: this.mergedTheme.peerOverrides.Input, stateful: this.stateful, size: this.mergedSize, placeholder: this.localizedPlaceholder, clearable: this.clearable, disabled: this.mergedDisabled, textDecoration: this.isValueInvalid ? 'line-through' : undefined, onFocus: this.handleTimeInputFocus, onBlur: this.handleTimeInputBlur, onActivate: this.handleTimeInputActivate, onDeactivate: this.handleTimeInputDeactivate, onUpdateValue: this.handleTimeInputUpdateValue, onClear: this.handleTimeInputClear, internalDeactivateOnEnter: true, internalForceFocus: this.mergedShow, readonly: this.inputReadonly || this.mergedDisabled, onClick: this.handleTriggerClick }, this.showIcon
+                        default: () => (h(NInput, { ref: "inputInstRef", status: this.mergedStatus, value: this.displayTimeString, bordered: this.mergedBordered, passivelyActivated: true, attrSize: this.mergedAttrSize, theme: this.mergedTheme.peers.Input, themeOverrides: this.mergedTheme.peerOverrides.Input, stateful: this.stateful, size: this.mergedSize, placeholder: this.localizedPlaceholder, clearable: this.clearable, disabled: this.mergedDisabled, textDecoration: this.isValueInvalid ? 'line-through' : undefined, onFocus: this.handleTimeInputFocus, onBlur: this.handleTimeInputBlur, onActivate: this.handleTimeInputActivate, onDeactivate: this.handleTimeInputDeactivate, onUpdateValue: this.handleTimeInputUpdateValue, onClear: this.handleTimeInputClear, internalDeactivateOnEnter: true, internalForceFocus: this.mergedShow, readonly: this.inputReadonly || this.mergedDisabled, onClick: this.handleTriggerClick, onKeydown: this.handleInputKeydown }, this.showIcon
                             ? {
                                 [this.clearable
                                     ? 'clear-icon-placeholder'
@@ -674,7 +684,7 @@ export default defineComponent({
                                 var _a;
                                 if (this.mergedShow) {
                                     (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
-                                    return withDirectives(h(Panel, { ref: "panelInstRef", actions: this.actions, class: this.themeClass, style: this.cssVars, seconds: this.seconds, minutes: this.minutes, hours: this.hours, transitionDisabled: this.transitionDisabled, hourValue: this.hourValue, showHour: this.hourInFormat, isHourInvalid: this.isHourInvalid, isHourDisabled: this.isHourDisabled, minuteValue: this.minuteValue, showMinute: this.minuteInFormat, isMinuteInvalid: this.isMinuteInvalid, isMinuteDisabled: this.isMinuteDisabled, secondValue: this.secondValue, amPmValue: this.amPmValue, showSecond: this.secondInFormat, isSecondInvalid: this.isSecondInvalid, isSecondDisabled: this.isSecondDisabled, isValueInvalid: this.isValueInvalid, nowText: this.localizedNow, confirmText: this.localizedPositiveText, use12Hours: this.use12Hours, onFocusout: this.handleMenuFocusOut, onKeydown: this.handleMenuKeyDown, onHourClick: this.handleHourClick, onMinuteClick: this.handleMinuteClick, onSecondClick: this.handleSecondClick, onAmPmClick: this.handleAmPmClick, onNowClick: this.handleNowClick, onConfirmClick: this.handleConfirmClick, onFocusDetectorFocus: this.handleFocusDetectorFocus }), [
+                                    return withDirectives(h(Panel, { ref: "panelInstRef", actions: this.actions, class: this.themeClass, style: this.cssVars, seconds: this.seconds, minutes: this.minutes, hours: this.hours, transitionDisabled: this.transitionDisabled, hourValue: this.hourValue, showHour: this.hourInFormat, isHourInvalid: this.isHourInvalid, isHourDisabled: this.isHourDisabled, minuteValue: this.minuteValue, showMinute: this.minuteInFormat, isMinuteInvalid: this.isMinuteInvalid, isMinuteDisabled: this.isMinuteDisabled, secondValue: this.secondValue, amPmValue: this.amPmValue, showSecond: this.secondInFormat, isSecondInvalid: this.isSecondInvalid, isSecondDisabled: this.isSecondDisabled, isValueInvalid: this.isValueInvalid, nowText: this.localizedNow, confirmText: this.localizedPositiveText, use12Hours: this.use12Hours, onFocusout: this.handleMenuFocusOut, onKeydown: this.handleMenuKeydown, onHourClick: this.handleHourClick, onMinuteClick: this.handleMinuteClick, onSecondClick: this.handleSecondClick, onAmPmClick: this.handleAmPmClick, onNowClick: this.handleNowClick, onConfirmClick: this.handleConfirmClick, onFocusDetectorFocus: this.handleFocusDetectorFocus }), [
                                         [
                                             clickoutside,
                                             this.handleClickOutside,

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

@@ -132,6 +132,7 @@ 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>>;
+    internalDeactivateImmediately: BooleanConstructor;
     internalSyncTargetWithParent: BooleanConstructor;
     internalInheritedEventHandlers: {
         type: import("vue").PropType<import("../../popover/src/Popover").TriggerEventHandlers[]>;
@@ -283,6 +284,7 @@ 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>>;
+    internalDeactivateImmediately: BooleanConstructor;
     internalSyncTargetWithParent: BooleanConstructor;
     internalInheritedEventHandlers: {
         type: import("vue").PropType<import("../../popover/src/Popover").TriggerEventHandlers[]>;
@@ -583,6 +585,7 @@ 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>>;
+    internalDeactivateImmediately: BooleanConstructor;
     internalSyncTargetWithParent: BooleanConstructor;
     internalInheritedEventHandlers: {
         type: import("vue").PropType<import("../../popover/src/Popover").TriggerEventHandlers[]>;
@@ -618,6 +621,7 @@ declare const _default: import("vue").DefineComponent<{
     arrowPointToCenter: boolean;
     displayDirective: "show" | "if";
     keepAliveOnHover: boolean;
+    internalDeactivateImmediately: boolean;
     animated: boolean;
     internalTrapFocus: boolean;
     defaultShow: boolean;

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

@@ -1097,7 +1097,6 @@ declare const _default: import("vue").DefineComponent<{
     handleAfterEnter: () => void;
     handleResize: () => void;
     handleKeydown: (e: KeyboardEvent) => void;
-    handleKeyup: (e: KeyboardEvent) => void;
     cssVars: import("vue").ComputedRef<{
         '--n-arrow-color': string;
         '--n-loading-color': string;
@@ -1425,7 +1424,9 @@ declare const _default: import("vue").DefineComponent<{
     readonly virtualScroll: boolean;
     readonly checkable: boolean;
     readonly animated: boolean;
+    readonly cancelable: boolean;
     readonly childrenField: string;
+    readonly defaultExpandAll: boolean;
     readonly allowCheckingNotLoaded: boolean;
     readonly cascade: boolean;
     readonly indent: number;
@@ -1433,8 +1434,6 @@ declare const _default: import("vue").DefineComponent<{
     readonly checkStrategy: CheckStrategy;
     readonly leafOnly: boolean;
     readonly defaultExpandedKeys: Key[];
-    readonly defaultExpandAll: boolean;
-    readonly cancelable: boolean;
     readonly selectable: boolean;
     readonly expandOnClick: boolean;
     readonly blockLine: boolean;

package/es/tree/src/Tree.js

@@ -231,7 +231,7 @@ export default defineComponent({
         const controlledExpandedKeysRef = toRef(props, 'expandedKeys');
         const mergedExpandedKeysRef = useMergedState(controlledExpandedKeysRef, uncontrolledExpandedKeysRef);
         const fNodesRef = computed(() => displayTreeMateRef.value.getFlattenedNodes(mergedExpandedKeysRef.value));
-        const { pendingNodeKeyRef, handleKeyup, handleKeydown } = useKeyboard({
+        const { pendingNodeKeyRef, handleKeydown } = useKeyboard({
             mergedSelectedKeysRef,
             fNodesRef,
             mergedExpandedKeysRef,
@@ -1042,8 +1042,7 @@ export default defineComponent({
             handleCheck
         });
         const exposedMethods = {
-            handleKeydown,
-            handleKeyup
+            handleKeydown
         };
         const cssVarsRef = computed(() => {
             const { common: { cubicBezierEaseInOut }, self: { fontSize, nodeBorderRadius, nodeColorHover, nodeColorPressed, nodeColorActive, arrowColor, loadingColor, nodeTextColor, nodeTextColorDisabled, dropMarkColor } } = themeRef.value;
@@ -1080,7 +1079,6 @@ export default defineComponent({
             handleAfterEnter,
             handleResize,
             handleKeydown: exposedMethods.handleKeydown,
-            handleKeyup: exposedMethods.handleKeyup,
             cssVars: inlineThemeDisabled ? undefined : cssVarsRef,
             themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass,
             onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender
@@ -1092,7 +1090,7 @@ export default defineComponent({
         if (!fNodes.length && internalRenderEmpty) {
             return internalRenderEmpty();
         }
-        const { mergedClsPrefix, blockNode, blockLine, draggable, disabled, internalFocusable, checkable, handleKeyup, handleKeydown, handleFocusout } = this;
+        const { mergedClsPrefix, blockNode, blockLine, draggable, disabled, internalFocusable, checkable, handleKeydown, handleFocusout } = this;
         const mergedFocusable = internalFocusable && !disabled;
         const tabindex = mergedFocusable ? '0' : undefined;
         const treeClass = [
@@ -1107,7 +1105,7 @@ export default defineComponent({
         if (this.virtualScroll) {
             const { mergedTheme, internalScrollablePadding } = this;
             const padding = getPadding(internalScrollablePadding || '0');
-            return (h(NxScrollbar, { ref: "scrollbarInstRef", onDragleave: draggable ? this.handleDragLeaveTree : undefined, container: this.getScrollContainer, content: this.getScrollContent, class: treeClass, theme: mergedTheme.peers.Scrollbar, themeOverrides: mergedTheme.peerOverrides.Scrollbar, tabindex: tabindex, onKeyup: mergedFocusable ? handleKeyup : undefined, onKeydown: mergedFocusable ? handleKeydown : undefined, onFocusout: mergedFocusable ? handleFocusout : undefined }, {
+            return (h(NxScrollbar, { ref: "scrollbarInstRef", onDragleave: draggable ? this.handleDragLeaveTree : undefined, container: this.getScrollContainer, content: this.getScrollContent, class: treeClass, theme: mergedTheme.peers.Scrollbar, themeOverrides: mergedTheme.peerOverrides.Scrollbar, tabindex: tabindex, onKeydown: mergedFocusable ? handleKeydown : undefined, onFocusout: mergedFocusable ? handleFocusout : undefined }, {
                 default: () => {
                     var _a;
                     (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -1127,12 +1125,12 @@ export default defineComponent({
         treeClass.push(this.themeClass);
         (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
         if (internalScrollable) {
-            return (h(NxScrollbar, { class: treeClass, tabindex: tabindex, onKeyup: mergedFocusable ? handleKeyup : undefined, onKeydown: mergedFocusable ? handleKeydown : undefined, onFocusout: mergedFocusable ? handleFocusout : undefined, style: this.cssVars, contentStyle: { padding: this.internalScrollablePadding } }, {
+            return (h(NxScrollbar, { class: treeClass, tabindex: tabindex, onKeydown: mergedFocusable ? handleKeydown : undefined, onFocusout: mergedFocusable ? handleFocusout : undefined, style: this.cssVars, contentStyle: { padding: this.internalScrollablePadding } }, {
                 default: () => (h("div", { onDragleave: draggable ? this.handleDragLeaveTree : undefined, ref: "selfElRef" }, this.fNodes.map(createNode)))
             }));
         }
         else {
-            return (h("div", { class: treeClass, tabindex: tabindex, ref: "selfElRef", style: this.cssVars, onKeyup: mergedFocusable ? handleKeyup : undefined, onKeydown: mergedFocusable ? handleKeydown : undefined, onFocusout: mergedFocusable ? handleFocusout : undefined, onDragleave: draggable ? this.handleDragLeaveTree : undefined }, !fNodes.length
+            return (h("div", { class: treeClass, tabindex: tabindex, ref: "selfElRef", style: this.cssVars, onKeydown: mergedFocusable ? handleKeydown : undefined, onFocusout: mergedFocusable ? handleFocusout : undefined, onDragleave: draggable ? this.handleDragLeaveTree : undefined }, !fNodes.length
                 ? resolveSlot(this.$slots.empty, () => {
                     var _a, _b, _c, _d;
                     return [

package/es/tree/src/TreeNode.js

@@ -44,6 +44,9 @@ const TreeNode = defineComponent({
                 if (!NTree.loadingKeysRef.value.has(tmNode.key)) {
                     NTree.loadingKeysRef.value.add(tmNode.key);
                 }
+                else {
+                    return;
+                }
                 const { onLoadRef: { value: onLoad } } = NTree;
                 if (onLoad) {
                     void onLoad(tmNode.rawNode)
@@ -78,7 +81,7 @@ const TreeNode = defineComponent({
                 NTree.handleSelect(tmNode);
             }
             if (expandOnClick && !tmNode.isLeaf) {
-                NTree.handleSwitcherClick(tmNode);
+                handleSwitcherClick();
             }
         }
         function handleContentClick(e) {

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

@@ -110,7 +110,6 @@ export interface MotionData {
     nodes: TmNode[];
 }
 export interface InternalTreeInst {
-    handleKeyup: (e: KeyboardEvent) => void;
     handleKeydown: (e: KeyboardEvent) => void;
 }
 export {};

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

@@ -9,6 +9,5 @@ export declare function useKeyboard({ fNodesRef, mergedExpandedKeysRef, mergedSe
     handleSwitcherClick: (node: TmNode) => void;
 }): {
     pendingNodeKeyRef: Ref<null | Key>;
-    handleKeyup: (e: KeyboardEvent) => void;
     handleKeydown: (e: KeyboardEvent) => void;
 };

package/es/tree/src/keyboard.js

@@ -9,9 +9,12 @@ export function useKeyboard({ fNodesRef, mergedExpandedKeysRef, mergedSelectedKe
         : ref(mergedSelectedKeys.length
             ? mergedSelectedKeys[mergedSelectedKeys.length - 1]
             : null);
-    function handleKeyup(e) {
+    function handleKeydown(e) {
         const { value: pendingNodeKey } = pendingNodeKeyRef;
         if (pendingNodeKey === null) {
+            if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
+                e.preventDefault();
+            }
             if (['ArrowDown', 'ArrowUp', 'ArrowLeft', 'ArrowRight'].includes(e.key)) {
                 if (pendingNodeKey === null) {
                     const { value: fNodes } = fNodesRef;
@@ -35,6 +38,7 @@ export function useKeyboard({ fNodesRef, mergedExpandedKeysRef, mergedSelectedKe
                 handleSelect(fNodes[fIndex]);
             }
             else if (e.key === 'ArrowDown') {
+                e.preventDefault();
                 fIndex += 1;
                 while (fIndex < fNodes.length) {
                     if (!fNodes[fIndex].disabled) {
@@ -45,6 +49,7 @@ export function useKeyboard({ fNodesRef, mergedExpandedKeysRef, mergedSelectedKe
                 }
             }
             else if (e.key === 'ArrowUp') {
+                e.preventDefault();
                 fIndex -= 1;
                 while (fIndex >= 0) {
                     if (!fNodes[fIndex].disabled) {
@@ -88,16 +93,8 @@ export function useKeyboard({ fNodesRef, mergedExpandedKeysRef, mergedSelectedKe
             }
         }
     }
-    function handleKeydown(e) {
-        switch (e.key) {
-            case 'ArrowUp':
-            case 'ArrowDown':
-                e.preventDefault();
-        }
-    }
     return {
         pendingNodeKeyRef,
-        handleKeyup,
         handleKeydown
     };
 }

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

@@ -1133,7 +1133,6 @@ declare const _default: import("vue").DefineComponent<{
         syncPosition: () => void;
     } | null>;
     treeInstRef: import("vue").Ref<{
-        handleKeyup: (e: KeyboardEvent) => void;
         handleKeydown: (e: KeyboardEvent) => void;
     } | null>;
     mergedClsPrefix: import("vue").ComputedRef<string>;
@@ -1171,7 +1170,6 @@ declare const _default: import("vue").DefineComponent<{
     handleDeleteOption: (option: SelectBaseOption) => void;
     handlePatternInput: (e: InputEvent) => void;
     handleKeydown: (e: KeyboardEvent) => void;
-    handleKeyup: (e: KeyboardEvent) => void;
     handleTabOut: () => void;
     handleMenuMousedown: (e: MouseEvent) => void;
     mergedTheme: import("vue").ComputedRef<{
@@ -2097,12 +2095,12 @@ declare const _default: import("vue").DefineComponent<{
     readonly defaultValue: string | number | (string | number)[] | null;
     readonly consistentMenuWidth: boolean;
     readonly childrenField: string;
+    readonly defaultExpandAll: boolean;
     readonly allowCheckingNotLoaded: boolean;
     readonly cascade: boolean;
     readonly checkStrategy: CheckStrategy;
     readonly leafOnly: boolean;
     readonly showPath: boolean;
     readonly defaultExpandedKeys: Key[];
-    readonly defaultExpandAll: boolean;
 }>;
 export default _default;

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

@@ -9,7 +9,7 @@ import { NInternalSelection, NBaseFocusDetector } from '../../_internal';
 import { NTree } from '../../tree';
 import { NEmpty } from '../../empty';
 import { useConfig, useFormItem, useLocale, useTheme, useThemeClass } from '../../_mixins';
-import { call, resolveSlot, resolveWrappedSlot, useAdjustedTo, useOnResize, warnOnce } from '../../_utils';
+import { call, markEventEffectPerformed, resolveSlot, resolveWrappedSlot, useAdjustedTo, useOnResize, warnOnce } from '../../_utils';
 import { treeSelectLight } from '../styles';
 import { treeSelectInjectionKey } from './interface';
 import { treeOption2SelectOption, treeOption2SelectOptionWithPath } from './utils';
@@ -385,16 +385,16 @@ export default defineComponent({
             const { value } = e.target;
             patternRef.value = value;
         }
-        function handleKeydown(e) {
+        function treeHandleKeydown(e) {
             const { value: treeInst } = treeInstRef;
             if (treeInst) {
                 treeInst.handleKeydown(e);
             }
         }
-        function handleKeyup(e) {
+        function handleKeydown(e) {
             if (e.key === 'Enter') {
                 if (mergedShowRef.value) {
-                    treeHandleKeyup(e);
+                    treeHandleKeydown(e);
                     if (!props.multiple) {
                         closeMenu();
                         focusSelection();
@@ -406,24 +406,21 @@ export default defineComponent({
                 e.preventDefault();
             }
             else if (e.key === 'Escape') {
-                closeMenu();
-                focusSelection();
+                if (mergedShowRef.value) {
+                    markEventEffectPerformed(e);
+                    closeMenu();
+                    focusSelection();
+                }
             }
             else {
                 if (mergedShowRef.value) {
-                    treeHandleKeyup(e);
+                    treeHandleKeydown(e);
                 }
                 else if (e.key === 'ArrowDown') {
                     openMenu();
                 }
             }
         }
-        function treeHandleKeyup(e) {
-            const { value: treeInst } = treeInstRef;
-            if (treeInst) {
-                treeInst.handleKeyup(e);
-            }
-        }
         function handleTabOut() {
             closeMenu();
             focusSelection();
@@ -503,7 +500,6 @@ export default defineComponent({
             handleDeleteOption,
             handlePatternInput,
             handleKeydown,
-            handleKeyup,
             handleTabOut,
             handleMenuMousedown,
             mergedTheme: themeRef,
@@ -518,7 +514,9 @@ export default defineComponent({
             h(VBinder, null, {
                 default: () => [
                     h(VTarget, null, {
-                        default: () => (h(NInternalSelection, { ref: "triggerInstRef", onResize: this.handleTriggerOrMenuResize, status: this.mergedStatus, focused: this.focused, clsPrefix: mergedClsPrefix, theme: mergedTheme.peers.InternalSelection, themeOverrides: mergedTheme.peerOverrides.InternalSelection, selectedOption: this.selectedOption, selectedOptions: this.selectedOptions, size: this.mergedSize, bordered: this.bordered, placeholder: this.mergedPlaceholder, disabled: this.mergedDisabled, active: this.mergedShow, loading: this.loading, multiple: this.multiple, maxTagCount: this.maxTagCount, showArrow: true, filterable: this.filterable, clearable: this.clearable, pattern: this.pattern, onPatternInput: this.handlePatternInput, onClear: this.handleClear, onClick: this.handleTriggerClick, onFocus: this.handleTriggerFocus, onBlur: this.handleTriggerBlur, onDeleteOption: this.handleDeleteOption, onKeydown: this.handleKeydown, onKeyup: this.handleKeyup }))
+                        default: () => (h(NInternalSelection, { ref: "triggerInstRef", onResize: this.handleTriggerOrMenuResize, status: this.mergedStatus, focused: this.focused, clsPrefix: mergedClsPrefix, theme: mergedTheme.peers.InternalSelection, themeOverrides: mergedTheme.peerOverrides.InternalSelection, selectedOption: this.selectedOption, selectedOptions: this.selectedOptions, size: this.mergedSize, bordered: this.bordered, placeholder: this.mergedPlaceholder, disabled: this.mergedDisabled, active: this.mergedShow, loading: this.loading, multiple: this.multiple, maxTagCount: this.maxTagCount, showArrow: true, filterable: this.filterable, clearable: this.clearable, pattern: this.pattern, onPatternInput: this.handlePatternInput, onClear: this.handleClear, onClick: this.handleTriggerClick, onFocus: this.handleTriggerFocus, onBlur: this.handleTriggerBlur, onDeleteOption: this.handleDeleteOption, onKeydown: this.handleKeydown }, {
+                            arrow: () => { var _a, _b; return [(_b = (_a = this.$slots).arrow) === null || _b === void 0 ? void 0 : _b.call(_a)]; }
+                        }))
                     }),
                     h(VFollower, { ref: "followerInstRef", show: this.mergedShow, placement: this.placement, to: this.adjustedTo, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey, containerClass: this.namespace, width: this.consistentMenuWidth ? 'target' : undefined, minWidth: "target" }, {
                         default: () => (h(Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted, onLeave: this.handleMenuLeave }, {
@@ -535,7 +533,7 @@ export default defineComponent({
                                     ], ref: "menuElRef", style: [
                                         (menuProps === null || menuProps === void 0 ? void 0 : menuProps.style) || '',
                                         this.cssVars
-                                    ], tabindex: 0, onMousedown: this.handleMenuMousedown, onKeyup: this.handleKeyup, onKeydown: this.handleKeydown, onFocusin: this.handleMenuFocusin, onFocusout: this.handleMenuFocusout }),
+                                    ], tabindex: 0, onMousedown: this.handleMenuMousedown, onKeydown: this.handleKeydown, onFocusin: this.handleMenuFocusin, onFocusout: this.handleMenuFocusout }),
                                     h(NTree, { ref: "treeInstRef", blockLine: true, allowCheckingNotLoaded: this.allowCheckingNotLoaded, showIrrelevantNodes: false, animated: false, pattern: this.pattern, filter: this.mergedFilter, data: options, cancelable: multiple, labelField: this.labelField, keyField: this.keyField, childrenField: this.childrenField, 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, internalTreeSelect: true, internalUnifySelectCheck: true, internalScrollable: true, internalScrollablePadding: this.menuPadding, internalFocusable: false, internalCheckboxFocusable: false, internalRenderEmpty: () => (h("div", { class: `${mergedClsPrefix}-tree-select-menu__empty` }, resolveSlot($slots.empty, () => [
                                             h(NEmpty, { theme: mergedTheme.peers.Empty, themeOverrides: mergedTheme.peerOverrides.Empty })
                                         ]))), onLoad: this.onLoad, onUpdateCheckedKeys: this.handleUpdateCheckedKeys, onUpdateIndeterminateKeys: this.handleUpdateIndeterminateKeys, onUpdateExpandedKeys: this.doUpdateExpandedKeys }),

package/es/upload/src/UploadDragger.js

@@ -11,10 +11,10 @@ export default defineComponent({
             throwError('upload-dragger', '`n-upload-dragger` must be placed inside `n-upload`.');
         }
         return () => {
-            const { mergedClsPrefixRef: { value: mergedClsPrefix }, mergedDisabledRef: { value: mergedDisabled } } = NUpload;
+            const { mergedClsPrefixRef: { value: mergedClsPrefix }, mergedDisabledRef: { value: mergedDisabled }, maxReachedRef: { value: maxReached } } = NUpload;
             return (h("div", { class: [
                     `${mergedClsPrefix}-upload-dragger`,
-                    mergedDisabled && `${mergedClsPrefix}-upload-dragger--disabled`
+                    (mergedDisabled || maxReached) && `${mergedClsPrefix}-upload-dragger--disabled`
                 ] }, slots));
         };
     }

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

@@ -138,7 +138,7 @@ declare const _default: import("vue").DefineComponent<{
             itemBorderImageCard: string;
         };
         peers: {
-            Button: import("../../_mixins").Theme<"Button", {
+            Button: import("../../_mixins/use-theme").Theme<"Button", {
                 heightTiny: string;
                 heightSmall: string;
                 heightMedium: string;
@@ -342,7 +342,7 @@ declare const _default: import("vue").DefineComponent<{
                 iconSizeLarge: string;
                 rippleDuration: string;
             }, any>;
-            Progress: import("../../_mixins").Theme<"Progress", {
+            Progress: import("../../_mixins/use-theme").Theme<"Progress", {
                 fontSize: string;
                 fontSizeCircle: string;
                 fontWeightCircle: string;

package/es/upload/src/UploadFile.js

@@ -17,6 +17,11 @@ import NUploadProgress from './UploadProgress';
 import { uploadInjectionKey } from './interface';
 import { imageIcon, documentIcon } from './icons';
 import { environmentSupportFile, isImageFile } from './utils';
+const buttonThemeOverrides = {
+    paddingMedium: '0 3px',
+    heightMedium: '24px',
+    iconSizeMedium: '18px'
+};
 export default defineComponent({
     name: 'UploadFile',
     props: {
@@ -219,19 +224,19 @@ export default defineComponent({
                         `${clsPrefix}-upload-file-info__action`,
                         `${clsPrefix}-upload-file-info__action--${listType}-type`
                     ] },
-                    this.showPreviewButton ? (h(NButton, { key: "preview", text: true, type: this.buttonType, onClick: this.handlePreviewClick, theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button }, {
+                    this.showPreviewButton ? (h(NButton, { key: "preview", quaternary: true, type: this.buttonType, onClick: this.handlePreviewClick, theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, builtinThemeOverrides: buttonThemeOverrides }, {
                         icon: () => (h(NBaseIcon, { clsPrefix: clsPrefix }, { default: () => h(EyeIcon, null) }))
                     })) : null,
                     (this.showRemoveButton || this.showCancelButton) &&
-                        !this.disabled && (h(NButton, { key: "cancelOrTrash", theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, text: true, type: this.buttonType, onClick: this.handleRemoveOrCancelClick }, {
+                        !this.disabled && (h(NButton, { key: "cancelOrTrash", theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, quaternary: true, builtinThemeOverrides: buttonThemeOverrides, type: this.buttonType, onClick: this.handleRemoveOrCancelClick }, {
                         icon: () => (h(NIconSwitchTransition, null, {
                             default: () => this.showRemoveButton ? (h(NBaseIcon, { clsPrefix: clsPrefix, key: "trash" }, { default: () => h(TrashIcon, null) })) : (h(NBaseIcon, { clsPrefix: clsPrefix, key: "cancel" }, { default: () => h(CancelIcon, null) }))
                         }))
                     })),
-                    this.showRetryButton && !this.disabled && (h(NButton, { key: "retry", text: true, type: this.buttonType, onClick: this.handleRetryClick, theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button }, {
+                    this.showRetryButton && !this.disabled && (h(NButton, { key: "retry", quaternary: true, type: this.buttonType, onClick: this.handleRetryClick, theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, builtinThemeOverrides: buttonThemeOverrides }, {
                         icon: () => (h(NBaseIcon, { clsPrefix: clsPrefix }, { default: () => h(RetryIcon, null) }))
                     })),
-                    this.showDownloadButton ? (h(NButton, { key: "download", text: true, type: this.buttonType, onClick: this.handleDownloadClick, theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button }, {
+                    this.showDownloadButton ? (h(NButton, { key: "download", quaternary: true, type: this.buttonType, onClick: this.handleDownloadClick, theme: mergedTheme.peers.Button, themeOverrides: mergedTheme.peerOverrides.Button, builtinThemeOverrides: buttonThemeOverrides }, {
                         icon: () => (h(NBaseIcon, { clsPrefix: clsPrefix }, { default: () => h(DownloadIcon, null) }))
                     })) : null)),
             !isImageType && progress));

package/es/upload/src/UploadTrigger.js

@@ -1,7 +1,7 @@
 import { h, defineComponent, inject, computed } from 'vue';
 import { AddIcon } from '../../_internal/icons';
 import { NBaseIcon } from '../../_internal';
-import { throwError } from '../../_utils';
+import { resolveSlot, throwError } from '../../_utils';
 import { uploadInjectionKey } from './interface';
 import { getFilesFromEntries } from './utils';
 import NUploadDragger from './UploadDragger';
@@ -73,8 +73,9 @@ export default defineComponent({
                     isImageCardTypeRef.value &&
                         `${mergedClsPrefix}-upload-trigger--image-card`
                 ], style: triggerStyleRef.value, onClick: handleTriggerClick, onDrop: handleTriggerDrop, onDragover: handleTriggerDragOver, onDragenter: handleTriggerDragEnter, onDragleave: handleTriggerDragLeave }, isImageCardTypeRef.value ? (h(NUploadDragger, null, {
-                default: slots.default ||
-                    (() => (h(NBaseIcon, { clsPrefix: mergedClsPrefix }, { default: () => h(AddIcon, null) })))
+                default: () => resolveSlot(slots.default, () => [
+                    h(NBaseIcon, { clsPrefix: mergedClsPrefix }, { default: () => h(AddIcon, null) })
+                ])
             })) : (slots)));
         };
     }

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

@@ -22,7 +22,6 @@ export default c([cB('upload', 'width: 100%;', [cM('dragger-inside', [cB('upload
  `, [c('&:hover', `
  border: var(--n-dragger-border-hover);
  `), cM('disabled', `
- opacity: var(--n-item-disabled-opacity);
  cursor: not-allowed;
  `)]), cB('upload-trigger', `
  display: inline-block;
@@ -48,7 +47,7 @@ export default c([cB('upload', 'width: 100%;', [cM('dragger-inside', [cB('upload
  line-height: var(--n-line-height);
  opacity: 1;
  transition: opacity .3s var(--n-bezier);
- `, [cM('disabled', `
+ `, [c('a, img', 'outline: none;'), cM('disabled', `
  opacity: var(--n-item-disabled-opacity);
  cursor: not-allowed;
  `, [cB('upload-file', 'cursor: not-allowed;')]), cM('grid', `
@@ -112,6 +111,7 @@ export default c([cB('upload', 'width: 100%;', [cM('dragger-inside', [cB('upload
  justify-content: center;
  transition: border-color .3s var(--n-bezier), background-color .3s var(--n-bezier);
  border-radius: var(--n-border-radius);
+ overflow: hidden;
  `, [cB('progress', `
  position: absolute;
  left: 8px;

package/es/upload/src/utils.js

@@ -40,21 +40,7 @@ export function createImageDataUrl(file) {
                 resolve('');
                 return;
             }
-            const img = new Image();
-            img.src = window.URL.createObjectURL(file);
-            img.onload = () => {
-                const { width, height } = img;
-                const canvas = document.createElement('canvas');
-                const ctx = canvas.getContext('2d');
-                canvas.width = width;
-                canvas.height = height;
-                canvas.style.cssText = `position: fixed; left: 0; top: 0; width: ${width}px; height: ${height}px; z-index: 9999; display: none;`;
-                document.body.appendChild(canvas);
-                ctx === null || ctx === void 0 ? void 0 : ctx.drawImage(img, 0, 0, width, height);
-                const dataURL = canvas.toDataURL();
-                document.body.removeChild(canvas);
-                resolve(dataURL);
-            };
+            resolve(window.URL.createObjectURL(file));
         });
     });
 }

package/es/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.30.3";
+declare const _default: "2.30.4";
 export default _default;

package/es/version.js

@@ -1 +1 @@
-export default '2.30.3';
+export default '2.30.4';

package/lib/_internal/scrollbar/src/Scrollbar.js

@@ -9,6 +9,7 @@ const evtd_1 = require("evtd");
 const vueuc_1 = require("vueuc");
 const vooks_1 = require("vooks");
 const _mixins_1 = require("../../../_mixins");
+const _utils_1 = require("../../../_utils");
 const styles_1 = require("../styles");
 const Wrapper_1 = require("./Wrapper");
 const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
@@ -165,14 +166,7 @@ const Scrollbar = (0, vue_1.defineComponent)({
                 return content();
             return contentRef.value;
         });
-        let isDeactivated = false;
-        let activateStateInitialized = false;
-        (0, vue_1.onActivated)(() => {
-            isDeactivated = false;
-            if (!activateStateInitialized) {
-                activateStateInitialized = true;
-                return;
-            }
+        const activateState = (0, _utils_1.useReactivated)(() => {
             // Only restore for builtin container & content
             if (!props.container) {
                 // remount
@@ -182,20 +176,14 @@ const Scrollbar = (0, vue_1.defineComponent)({
                 });
             }
         });
-        (0, vue_1.onDeactivated)(() => {
-            isDeactivated = true;
-            if (!activateStateInitialized) {
-                activateStateInitialized = true;
-            }
-        });
         // methods
         const handleContentResize = () => {
-            if (isDeactivated)
+            if (activateState.isDeactivated)
                 return;
             sync();
         };
         const handleContainerResize = (e) => {
-            if (isDeactivated)
+            if (activateState.isDeactivated)
                 return;
             const { onResize } = props;
             if (onResize)

package/lib/_internal/select-menu/src/SelectGroupHeader.d.ts

@@ -13,6 +13,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, {
     labelField: Ref<string>;
+    nodeProps: Ref<import("./interface").NodeProps | undefined>;
     renderLabel: Ref<RenderLabelImpl | undefined>;
     renderOption: Ref<RenderOptionImpl | undefined>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/lib/_internal/select-menu/src/SelectGroupHeader.js

@@ -16,21 +16,23 @@ exports.default = (0, vue_1.defineComponent)({
         }
     },
     setup() {
-        const { renderLabelRef, renderOptionRef, labelFieldRef
+        const { renderLabelRef, renderOptionRef, labelFieldRef, nodePropsRef
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
          } = (0, vue_1.inject)(interface_1.internalSelectionMenuInjectionKey);
         return {
             labelField: labelFieldRef,
+            nodeProps: nodePropsRef,
             renderLabel: renderLabelRef,
             renderOption: renderOptionRef
         };
     },
     render() {
-        const { clsPrefix, renderLabel, renderOption, tmNode: { rawNode } } = this;
+        const { clsPrefix, renderLabel, renderOption, nodeProps, tmNode: { rawNode } } = this;
+        const attrs = nodeProps === null || nodeProps === void 0 ? void 0 : nodeProps(rawNode);
         const children = renderLabel
             ? renderLabel(rawNode, false)
             : (0, _utils_1.render)(rawNode[this.labelField], rawNode, false);
-        const node = ((0, vue_1.h)("div", { class: `${clsPrefix}-base-select-group-header` }, children));
+        const node = ((0, vue_1.h)("div", Object.assign({}, attrs, { class: [`${clsPrefix}-base-select-group-header`, attrs === null || attrs === void 0 ? void 0 : attrs.class] }), children));
         return rawNode.render
             ? rawNode.render({ node, option: rawNode })
             : renderOption