naive-ui 2.30.3 → 2.30.4

package/es/_utils/vue/index.js

@@ -11,3 +11,4 @@ export { createDataKey } from './create-data-key';
 export { createRefSetter } from './create-ref-setter';
 export { createInjectionKey } from './create-injection-key';
 export { resolveSlot, resolveWrappedSlot, resolveSlotWithProps, isSlotEmpty } from './resolve-slot';
+export { mergeEventHandlers } from './merge-handlers';

package/es/_utils/vue/merge-handlers.d.ts

@@ -0,0 +1 @@
+export declare function mergeEventHandlers<T>(handlers: Array<undefined | ((e: T) => void)>): undefined | ((e: T) => void);

package/es/_utils/vue/merge-handlers.js

@@ -0,0 +1,15 @@
+export function mergeEventHandlers(handlers) {
+    const filteredHandlers = handlers.filter((handler) => handler !== undefined);
+    if (filteredHandlers.length === 0)
+        return undefined;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    if (filteredHandlers.length === 1)
+        return filteredHandlers[0];
+    return (e) => {
+        handlers.forEach((handler) => {
+            if (handler) {
+                handler(e);
+            }
+        });
+    };
+}

package/es/button/src/Button.js

@@ -77,11 +77,16 @@ const Button = defineComponent({
         });
         const handleMousedown = (e) => {
             var _a;
-            if (props.disabled || props.nativeFocusBehavior) {
+            if (props.nativeFocusBehavior) {
+                return;
+            }
+            e.preventDefault();
+            // normally this won't be called if disabled (when tag is button)
+            // if not, we try to make it behave like a button
+            if (props.disabled) {
                 return;
             }
             if (mergedFocusableRef.value) {
-                e.preventDefault();
                 (_a = selfElRef.value) === null || _a === void 0 ? void 0 : _a.focus({ preventScroll: true });
             }
         };

package/es/cascader/src/Cascader.d.ts

@@ -1357,7 +1357,7 @@ declare const _default: import("vue").DefineComponent<{
     handleMenuTabout: () => void;
     handleMenuFocus: (e: FocusEvent) => void;
     handleMenuBlur: (e: FocusEvent) => void;
-    handleMenuKeyUp: (e: KeyboardEvent) => void;
+    handleMenuKeydown: (e: KeyboardEvent) => void;
     handleMenuMousedown: (e: MouseEvent) => void;
     handleTriggerFocus: (e: FocusEvent) => void;
     handleTriggerBlur: (e: FocusEvent) => void;
@@ -1365,8 +1365,7 @@ declare const _default: import("vue").DefineComponent<{
     handleClear: (e: MouseEvent) => void;
     handleDeleteOption: (option: SelectBaseOption) => void;
     handlePatternInput: (e: InputEvent) => void;
-    handleKeyDown: (e: KeyboardEvent) => void;
-    handleKeyUp: (e: KeyboardEvent) => void;
+    handleKeydown: (e: KeyboardEvent) => void;
     focused: import("vue").Ref<boolean>;
     optionHeight: import("vue").ComputedRef<string>;
     mergedTheme: import("vue").ComputedRef<{

package/es/cascader/src/Cascader.js

@@ -5,7 +5,7 @@ import { depx, changeColor, happensIn } from 'seemly';
 import { useIsMounted, useMergedState } from 'vooks';
 import { NInternalSelection } from '../../_internal';
 import { useLocale, useTheme, useConfig, useFormItem, useThemeClass } from '../../_mixins';
-import { call, useAdjustedTo, warnOnce } from '../../_utils';
+import { call, markEventEffectPerformed, useAdjustedTo, warnOnce } from '../../_utils';
 import { cascaderLight } from '../styles';
 import { getPathLabel, getRawNodePath } from './utils';
 import CascaderMenu from './CascaderMenu';
@@ -210,6 +210,8 @@ export default defineComponent({
                     doUpdateValue(checkedKeys, checkedKeys.map((checkedKey) => { var _a; return ((_a = getNode(checkedKey)) === null || _a === void 0 ? void 0 : _a.rawNode) || null; }), checkedKeys.map((checkedKey) => { var _a; return getRawNodePath((_a = getPath(checkedKey)) === null || _a === void 0 ? void 0 : _a.treeNodePath); }));
                     if (filterable)
                         focusSelectionInput();
+                    keyboardKeyRef.value = key;
+                    hoverKeyRef.value = key;
                 }
                 catch (err) {
                     if (err instanceof SubtreeNotLoadedError) {
@@ -252,6 +254,8 @@ export default defineComponent({
                     allowNotLoaded: props.allowCheckingNotLoaded
                 });
                 doUpdateValue(checkedKeys, checkedKeys.map((checkedKey) => { var _a; return ((_a = getNode(checkedKey)) === null || _a === void 0 ? void 0 : _a.rawNode) || null; }), checkedKeys.map((checkedKey) => { var _a; return getRawNodePath((_a = getPath(checkedKey)) === null || _a === void 0 ? void 0 : _a.treeNodePath); }));
+                keyboardKeyRef.value = key;
+                hoverKeyRef.value = key;
             }
         }
         const selectedOptionsRef = computed(() => {
@@ -491,8 +495,18 @@ export default defineComponent({
                     break;
             }
         }
-        function handleKeyUp(e) {
+        function handleKeydown(e) {
             var _a, _b;
+            switch (e.key) {
+                case ' ':
+                case 'ArrowDown':
+                case 'ArrowUp':
+                    if (props.filterable && mergedShowRef.value) {
+                        break;
+                    }
+                    e.preventDefault();
+                    break;
+            }
             if (happensIn(e, 'action'))
                 return;
             switch (e.key) {
@@ -568,11 +582,14 @@ export default defineComponent({
                     }
                     break;
                 case 'Escape':
-                    closeMenu(true);
+                    if (mergedShowRef.value) {
+                        markEventEffectPerformed(e);
+                        closeMenu(true);
+                    }
             }
         }
-        function handleMenuKeyUp(e) {
-            handleKeyUp(e);
+        function handleMenuKeydown(e) {
+            handleKeydown(e);
         }
         // --- search
         function handleClear(e) {
@@ -652,18 +669,6 @@ export default defineComponent({
                 doUpdateValue(null, null, null);
             }
         }
-        function handleKeyDown(e) {
-            switch (e.key) {
-                case ' ':
-                case 'ArrowDown':
-                case 'ArrowUp':
-                    if (props.filterable && mergedShowRef.value) {
-                        return;
-                    }
-                    e.preventDefault();
-                    break;
-            }
-        }
         // sync position
         function syncSelectMenuPosition() {
             var _a;
@@ -760,7 +765,7 @@ export default defineComponent({
             cascaderMenuInstRef, mergedBordered: mergedBorderedRef, mergedClsPrefix: mergedClsPrefixRef, namespace: namespaceRef, mergedValue: mergedValueRef, mergedShow: mergedShowRef, showSelectMenu: showSelectMenuRef, pattern: patternRef, treeMate: treeMateRef, mergedSize: mergedSizeRef, mergedDisabled: mergedDisabledRef, localizedPlaceholder: localizedPlaceholderRef, selectedOption: selectedOptionRef, selectedOptions: selectedOptionsRef, adjustedTo: adjustedToRef, menuModel: menuModelRef, handleMenuTabout,
             handleMenuFocus,
             handleMenuBlur,
-            handleMenuKeyUp,
+            handleMenuKeydown,
             handleMenuMousedown,
             handleTriggerFocus,
             handleTriggerBlur,
@@ -768,8 +773,7 @@ export default defineComponent({
             handleClear,
             handleDeleteOption,
             handlePatternInput,
-            handleKeyDown,
-            handleKeyUp, focused: focusedRef, optionHeight: optionHeightRef, mergedTheme: themeRef, cssVars: inlineThemeDisabled ? undefined : cssVarsRef, themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass, onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender });
+            handleKeydown, focused: focusedRef, optionHeight: optionHeightRef, mergedTheme: themeRef, cssVars: inlineThemeDisabled ? undefined : cssVarsRef, themeClass: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.themeClass, onRender: themeClassHandle === null || themeClassHandle === void 0 ? void 0 : themeClassHandle.onRender });
     },
     render() {
         const { mergedClsPrefix } = this;
@@ -777,7 +781,7 @@ export default defineComponent({
             h(VBinder, null, {
                 default: () => [
                     h(VTarget, null, {
-                        default: () => (h(NInternalSelection, { onResize: this.handleTriggerResize, ref: "triggerInstRef", status: this.mergedStatus, clsPrefix: mergedClsPrefix, maxTagCount: this.maxTagCount, bordered: this.mergedBordered, size: this.mergedSize, theme: this.mergedTheme.peers.InternalSelection, themeOverrides: this.mergedTheme.peerOverrides.InternalSelection, active: this.mergedShow, pattern: this.pattern, placeholder: this.localizedPlaceholder, selectedOption: this.selectedOption, selectedOptions: this.selectedOptions, multiple: this.multiple, filterable: this.filterable, clearable: this.clearable, disabled: this.mergedDisabled, focused: this.focused, onFocus: this.handleTriggerFocus, onBlur: this.handleTriggerBlur, onClick: this.handleTriggerClick, onClear: this.handleClear, onDeleteOption: this.handleDeleteOption, onPatternInput: this.handlePatternInput, onKeydown: this.handleKeyDown, onKeyup: this.handleKeyUp }))
+                        default: () => (h(NInternalSelection, { onResize: this.handleTriggerResize, ref: "triggerInstRef", status: this.mergedStatus, clsPrefix: mergedClsPrefix, maxTagCount: this.maxTagCount, bordered: this.mergedBordered, size: this.mergedSize, theme: this.mergedTheme.peers.InternalSelection, themeOverrides: this.mergedTheme.peerOverrides.InternalSelection, active: this.mergedShow, pattern: this.pattern, placeholder: this.localizedPlaceholder, selectedOption: this.selectedOption, selectedOptions: this.selectedOptions, multiple: this.multiple, filterable: this.filterable, clearable: this.clearable, disabled: this.mergedDisabled, focused: this.focused, onFocus: this.handleTriggerFocus, onBlur: this.handleTriggerBlur, onClick: this.handleTriggerClick, onClear: this.handleClear, onDeleteOption: this.handleDeleteOption, onPatternInput: this.handlePatternInput, onKeydown: this.handleKeydown }))
                     }),
                     h(VFollower, { key: "cascaderMenu", ref: "cascaderMenuFollowerRef", show: this.mergedShow && !this.showSelectMenu, containerClass: this.namespace, placement: this.placement, width: !this.options.length ? 'target' : undefined, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey, to: this.adjustedTo }, {
                         default: () => {
@@ -787,7 +791,7 @@ export default defineComponent({
                             return (h(CascaderMenu, Object.assign({}, menuProps, { ref: "cascaderMenuInstRef", class: [this.themeClass, menuProps === null || menuProps === void 0 ? void 0 : menuProps.class], value: this.mergedValue, show: this.mergedShow && !this.showSelectMenu, menuModel: this.menuModel, style: [
                                     this.cssVars,
                                     menuProps === null || menuProps === void 0 ? void 0 : menuProps.style
-                                ], onFocus: this.handleMenuFocus, onBlur: this.handleMenuBlur, onKeyup: this.handleMenuKeyUp, onMousedown: this.handleMenuMousedown, onTabout: this.handleMenuTabout }), {
+                                ], onFocus: this.handleMenuFocus, onBlur: this.handleMenuBlur, onKeydown: this.handleMenuKeydown, onMousedown: this.handleMenuMousedown, onTabout: this.handleMenuTabout }), {
                                 action: () => { var _a, _b; return (_b = (_a = this.$slots).action) === null || _b === void 0 ? void 0 : _b.call(_a); },
                                 empty: () => { var _a, _b; return (_b = (_a = this.$slots).empty) === null || _b === void 0 ? void 0 : _b.call(_a); }
                             }));

package/es/cascader/src/CascaderMenu.d.ts

@@ -21,7 +21,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<(e: FocusEvent) => void>;
         required: true;
     };
-    onKeyup: {
+    onKeydown: {
         type: PropType<(e: KeyboardEvent) => void>;
         required: true;
     };
@@ -416,7 +416,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<(e: FocusEvent) => void>;
         required: true;
     };
-    onKeyup: {
+    onKeydown: {
         type: PropType<(e: KeyboardEvent) => void>;
         required: true;
     };

package/es/cascader/src/CascaderMenu.js

@@ -28,7 +28,7 @@ export default defineComponent({
             type: Function,
             required: true
         },
-        onKeyup: {
+        onKeydown: {
             type: Function,
             required: true
         },
@@ -97,9 +97,7 @@ export default defineComponent({
             default: () => {
                 if (!this.show)
                     return null;
-                return withDirectives(h("div", { tabindex: "0", ref: "selfElRef", class: `${mergedClsPrefix}-cascader-menu`, onMousedown: this.onMousedown, onFocusin: this.handleFocusin, onFocusout: this.handleFocusout, onKeyup: this.onKeyup, style: {
-                        '--n-col-count': this.menuModel.length
-                    } },
+                return withDirectives(h("div", { tabindex: "0", ref: "selfElRef", class: `${mergedClsPrefix}-cascader-menu`, onMousedown: this.onMousedown, onFocusin: this.handleFocusin, onFocusout: this.handleFocusout, onKeydown: this.onKeydown },
                     this.menuModel[0].length ? (h("div", { class: `${mergedClsPrefix}-cascader-submenu-wrapper` },
                         this.menuModel.map((submenuOptions, index) => (h(NCascaderSubmenu, { ref: ((instance) => {
                                 if (instance) {