naive-ui 2.25.0 → 2.25.3

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

@@ -35,6 +35,10 @@ declare const cascaderProps: {
         readonly default: "click";
     };
     readonly clearable: BooleanConstructor;
+    readonly clearFilterAfterSelect: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
     readonly remote: BooleanConstructor;
     readonly onLoad: PropType<OnLoad>;
     readonly separator: {
@@ -178,7 +182,7 @@ declare const cascaderProps: {
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -189,7 +193,7 @@ declare const cascaderProps: {
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -198,7 +202,7 @@ declare const cascaderProps: {
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -362,7 +366,7 @@ declare const cascaderProps: {
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -373,7 +377,7 @@ declare const cascaderProps: {
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -382,7 +386,7 @@ declare const cascaderProps: {
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -546,7 +550,7 @@ declare const cascaderProps: {
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -557,7 +561,7 @@ declare const cascaderProps: {
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -566,7 +570,7 @@ declare const cascaderProps: {
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -673,6 +677,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: "click";
     };
     readonly clearable: BooleanConstructor;
+    readonly clearFilterAfterSelect: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
     readonly remote: BooleanConstructor;
     readonly onLoad: PropType<OnLoad>;
     readonly separator: {
@@ -816,7 +824,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -827,7 +835,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -836,7 +844,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -1000,7 +1008,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -1011,7 +1019,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -1020,7 +1028,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -1184,7 +1192,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -1195,7 +1203,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -1204,7 +1212,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -1534,7 +1542,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -1545,7 +1553,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -1554,7 +1562,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -1703,7 +1711,9 @@ declare const _default: import("vue").DefineComponent<{
         '--n-option-arrow-color': string;
         '--n-menu-mask-color': string;
         '--n-loading-color': string;
-    }>;
+    }> | undefined;
+    themeClass: import("vue").Ref<string> | undefined;
+    onRender: (() => void) | undefined;
     focus: () => void;
     blur: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -1737,6 +1747,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: "click";
     };
     readonly clearable: BooleanConstructor;
+    readonly clearFilterAfterSelect: {
+        readonly type: BooleanConstructor;
+        readonly default: true;
+    };
     readonly remote: BooleanConstructor;
     readonly onLoad: PropType<OnLoad>;
     readonly separator: {
@@ -1880,7 +1894,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -1891,7 +1905,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -1900,7 +1914,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -2064,7 +2078,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -2075,7 +2089,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -2084,7 +2098,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -2248,7 +2262,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHover: string;
             borderActive: string;
             borderFocus: string;
-            boxShadowHover: null;
+            boxShadowHover: string;
             boxShadowActive: string;
             boxShadowFocus: string;
             caretColor: string;
@@ -2259,7 +2273,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverWarning: string;
             borderActiveWarning: string;
             borderFocusWarning: string;
-            boxShadowHoverWarning: null;
+            boxShadowHoverWarning: string;
             boxShadowActiveWarning: string;
             boxShadowFocusWarning: string;
             colorActiveWarning: string;
@@ -2268,7 +2282,7 @@ declare const _default: import("vue").DefineComponent<{
             borderHoverError: string;
             borderActiveError: string;
             borderFocusError: string;
-            boxShadowHoverError: null;
+            boxShadowHoverError: string;
             boxShadowActiveError: string;
             boxShadowFocusError: string;
             colorActiveError: string;
@@ -2354,6 +2368,7 @@ declare const _default: import("vue").DefineComponent<{
     virtualScroll: boolean;
     filterable: boolean;
     clearable: boolean;
+    clearFilterAfterSelect: boolean;
     defaultValue: Value | null;
     remote: boolean;
     expandTrigger: ExpandTrigger;

package/es/cascader/src/Cascader.js

@@ -4,7 +4,7 @@ import { VBinder, VTarget, VFollower } from 'vueuc';
 import { depx, changeColor, happensIn } from 'seemly';
 import { useIsMounted, useMergedState } from 'vooks';
 import { NInternalSelection } from '../../_internal';
-import { useLocale, useTheme, useConfig, useFormItem } from '../../_mixins';
+import { useLocale, useTheme, useConfig, useFormItem, useThemeClass } from '../../_mixins';
 import { call, useAdjustedTo, warnOnce } from '../../_utils';
 import { cascaderLight } from '../styles';
 import { getPathLabel, getRawNodePath } from './utils';
@@ -27,7 +27,10 @@ const cascaderProps = Object.assign(Object.assign({}, useTheme.props), { to: use
     }, expandTrigger: {
         type: String,
         default: 'click'
-    }, clearable: Boolean, remote: Boolean, onLoad: Function, separator: {
+    }, clearable: Boolean, clearFilterAfterSelect: {
+        type: Boolean,
+        default: true
+    }, remote: Boolean, onLoad: Function, separator: {
         type: String,
         default: ' / '
     }, filter: Function, placement: {
@@ -60,7 +63,6 @@ const cascaderProps = Object.assign(Object.assign({}, useTheme.props), { to: use
     }, renderLabel: Function, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], 'onUpdate:show': [Function, Array], onUpdateShow: [Function, Array], onBlur: Function, onFocus: Function, 
     // deprecated
     onChange: [Function, Array] });
-// TODO refactor cascader menu keyboard scroll (use virtual list)
 export default defineComponent({
     name: 'Cascader',
     props: cascaderProps,
@@ -75,7 +77,7 @@ export default defineComponent({
                 }
             });
         }
-        const { mergedBorderedRef, mergedClsPrefixRef, namespaceRef } = useConfig(props);
+        const { mergedBorderedRef, mergedClsPrefixRef, namespaceRef, inlineThemeDisabled } = useConfig(props);
         const themeRef = useTheme('Cascader', '-cascader', style, cascaderLight, props, mergedClsPrefixRef);
         const { localeRef } = useLocale('Cascader');
         const uncontrolledValueRef = ref(props.defaultValue);
@@ -372,6 +374,10 @@ export default defineComponent({
                 return;
             handleCascaderMenuClickOutside(e);
         }
+        function clearPattern() {
+            if (props.clearFilterAfterSelect)
+                patternRef.value = '';
+        }
         // --- keyboard
         function move(direction) {
             var _a, _b, _c;
@@ -486,7 +492,7 @@ export default defineComponent({
                             if (selectMenuInstRef.value) {
                                 const hasCorrespondingOption = selectMenuInstRef.value.enter();
                                 if (hasCorrespondingOption)
-                                    patternRef.value = '';
+                                    clearPattern();
                             }
                         }
                     }
@@ -664,7 +670,8 @@ export default defineComponent({
             doUncheck,
             closeMenu,
             handleSelectMenuClickOutside,
-            handleCascaderMenuClickOutside
+            handleCascaderMenuClickOutside,
+            clearPattern
         });
         const exposedMethods = {
             focus: () => {
@@ -676,6 +683,31 @@ export default defineComponent({
                 (_a = triggerInstRef.value) === null || _a === void 0 ? void 0 : _a.blur();
             }
         };
+        const cssVarsRef = computed(() => {
+            const { self: { optionArrowColor, optionTextColor, optionTextColorActive, optionTextColorDisabled, optionCheckMarkColor, menuColor, menuBoxShadow, menuDividerColor, menuBorderRadius, menuHeight, optionColorHover, optionHeight, optionFontSize, loadingColor, columnWidth }, common: { cubicBezierEaseInOut } } = themeRef.value;
+            return {
+                '--n-bezier': cubicBezierEaseInOut,
+                '--n-menu-border-radius': menuBorderRadius,
+                '--n-menu-box-shadow': menuBoxShadow,
+                '--n-menu-height': menuHeight,
+                '--n-column-width': columnWidth,
+                '--n-menu-color': menuColor,
+                '--n-menu-divider-color': menuDividerColor,
+                '--n-option-height': optionHeight,
+                '--n-option-font-size': optionFontSize,
+                '--n-option-text-color': optionTextColor,
+                '--n-option-text-color-disabled': optionTextColorDisabled,
+                '--n-option-text-color-active': optionTextColorActive,
+                '--n-option-color-hover': optionColorHover,
+                '--n-option-check-mark-color': optionCheckMarkColor,
+                '--n-option-arrow-color': optionArrowColor,
+                '--n-menu-mask-color': changeColor(menuColor, { alpha: 0.75 }),
+                '--n-loading-color': loadingColor
+            };
+        });
+        const themeClassHandle = inlineThemeDisabled
+            ? useThemeClass('cascader', undefined, cssVarsRef, props)
+            : undefined;
         return Object.assign(Object.assign({}, exposedMethods), { mergedStatus: mergedStatusRef, selectMenuFollowerRef,
             cascaderMenuFollowerRef,
             triggerInstRef,
@@ -692,31 +724,10 @@ export default defineComponent({
             handleDeleteOption,
             handlePatternInput,
             handleKeyDown,
-            handleKeyUp, focused: focusedRef, optionHeight: optionHeightRef, mergedTheme: themeRef, cssVars: computed(() => {
-                const { self: { optionArrowColor, optionTextColor, optionTextColorActive, optionTextColorDisabled, optionCheckMarkColor, menuColor, menuBoxShadow, menuDividerColor, menuBorderRadius, menuHeight, optionColorHover, optionHeight, optionFontSize, loadingColor, columnWidth }, common: { cubicBezierEaseInOut } } = themeRef.value;
-                return {
-                    '--n-bezier': cubicBezierEaseInOut,
-                    '--n-menu-border-radius': menuBorderRadius,
-                    '--n-menu-box-shadow': menuBoxShadow,
-                    '--n-menu-height': menuHeight,
-                    '--n-column-width': columnWidth,
-                    '--n-menu-color': menuColor,
-                    '--n-menu-divider-color': menuDividerColor,
-                    '--n-option-height': optionHeight,
-                    '--n-option-font-size': optionFontSize,
-                    '--n-option-text-color': optionTextColor,
-                    '--n-option-text-color-disabled': optionTextColorDisabled,
-                    '--n-option-text-color-active': optionTextColorActive,
-                    '--n-option-color-hover': optionColorHover,
-                    '--n-option-check-mark-color': optionCheckMarkColor,
-                    '--n-option-arrow-color': optionArrowColor,
-                    '--n-menu-mask-color': changeColor(menuColor, { alpha: 0.75 }),
-                    '--n-loading-color': loadingColor
-                };
-            }) });
+            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 });
     },
     render() {
-        const { mergedClsPrefix, $slots } = this;
+        const { mergedClsPrefix } = this;
         return (h("div", { class: `${mergedClsPrefix}-cascader` },
             h(VBinder, null, {
                 default: () => [
@@ -724,10 +735,21 @@ export default defineComponent({
                         default: () => (h(NInternalSelection, { 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 }))
                     }),
                     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: () => (h(CascaderMenu, { ref: "cascaderMenuInstRef", value: this.mergedValue, show: this.mergedShow && !this.showSelectMenu, menuModel: this.menuModel, style: this.cssVars, onFocus: this.handleMenuFocus, onBlur: this.handleMenuBlur, onKeyup: this.handleMenuKeyUp, onMousedown: this.handleMenuMousedown, onTabout: this.handleMenuTabout }, $slots))
+                        default: () => {
+                            var _a;
+                            (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
+                            return (h(CascaderMenu, { ref: "cascaderMenuInstRef", class: this.themeClass, value: this.mergedValue, show: this.mergedShow && !this.showSelectMenu, menuModel: this.menuModel, style: this.cssVars, onFocus: this.handleMenuFocus, onBlur: this.handleMenuBlur, onKeyup: this.handleMenuKeyUp, 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); }
+                            }));
+                        }
                     }),
                     h(VFollower, { key: "selectMenu", ref: "selectMenuFollowerRef", show: this.mergedShow && this.showSelectMenu, containerClass: this.namespace, width: "target", placement: this.placement, to: this.adjustedTo, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey }, {
-                        default: () => (h(CascaderSelectMenu, { ref: "selectMenuInstRef", value: this.mergedValue, show: this.mergedShow && this.showSelectMenu, pattern: this.pattern, multiple: this.multiple, tmNodes: this.treeMate.treeNodes, filter: this.filter, labelField: this.labelField, separator: this.separator, style: this.cssVars }))
+                        default: () => {
+                            var _a;
+                            (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this);
+                            return (h(CascaderSelectMenu, { ref: "selectMenuInstRef", class: this.themeClass, value: this.mergedValue, show: this.mergedShow && this.showSelectMenu, pattern: this.pattern, multiple: this.multiple, tmNodes: this.treeMate.treeNodes, filter: this.filter, labelField: this.labelField, separator: this.separator, style: this.cssVars }));
+                        }
                     })
                 ]
             })));

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

@@ -238,7 +238,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -249,7 +249,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -258,7 +258,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;

package/es/cascader/src/CascaderMenu.js

@@ -1,10 +1,11 @@
 import { h, ref, defineComponent, watch, toRef, inject, nextTick, Transition, withDirectives } from 'vue';
 import { clickoutside } from 'vdirs';
+import FocusDetector from '../../_internal/focus-detector';
+import { resolveSlot, resolveWrappedSlot } from '../../_utils';
 import { NEmpty } from '../../empty';
 import { NBaseMenuMask } from '../../_internal';
 import NCascaderSubmenu from './CascaderSubmenu';
 import { cascaderInjectionKey } from './interface';
-import FocusDetector from '../../_internal/focus-detector';
 export default defineComponent({
     name: 'NCascaderMenu',
     props: {
@@ -97,7 +98,7 @@ export default defineComponent({
             handleClickOutside }, exposedRef);
     },
     render() {
-        const { submenuInstRefs, mergedClsPrefix, $slots, mergedTheme } = this;
+        const { submenuInstRefs, mergedClsPrefix, mergedTheme } = this;
         return (h(Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted }, {
             default: () => {
                 if (!this.show)
@@ -111,10 +112,10 @@ export default defineComponent({
                                     submenuInstRefs[index] = instance;
                                 }
                             }), key: index, tmNodes: submenuOptions, depth: index + 1 }))),
-                        h(NBaseMenuMask, { clsPrefix: mergedClsPrefix, ref: "maskInstRef" }))) : (h("div", { class: `${mergedClsPrefix}-cascader-menu__empty` }, $slots.empty ? ($slots.empty()) : (h(NEmpty, { theme: mergedTheme.peers.Empty, themeOverrides: mergedTheme.peerOverrides.Empty })))),
-                    $slots.action && (h("div", { class: `${mergedClsPrefix}-cascader-menu-action`, "data-action": true }, {
-                        default: $slots.action
-                    })),
+                        h(NBaseMenuMask, { clsPrefix: mergedClsPrefix, ref: "maskInstRef" }))) : (h("div", { class: `${mergedClsPrefix}-cascader-menu__empty` }, resolveSlot(this.$slots.empty, () => [
+                        h(NEmpty, { theme: mergedTheme.peers.Empty, themeOverrides: mergedTheme.peerOverrides.Empty })
+                    ]))),
+                    resolveWrappedSlot(this.$slots.action, (children) => children && (h("div", { class: `${mergedClsPrefix}-cascader-menu-action`, "data-action": true }, children))),
                     h(FocusDetector, { onFocus: this.onTabout })), [[clickoutside, this.handleClickOutside]]);
             }
         }));

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

@@ -214,7 +214,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -225,7 +225,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -234,7 +234,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;

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

@@ -226,7 +226,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -237,7 +237,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -246,7 +246,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;

package/es/cascader/src/CascaderSelectMenu.js

@@ -33,7 +33,7 @@ export default defineComponent({
         }
     },
     setup(props) {
-        const { isMountedRef, mergedValueRef, mergedClsPrefixRef, mergedThemeRef, mergedCheckStrategyRef, syncSelectMenuPosition, closeMenu, handleSelectMenuClickOutside, doUncheck: cascaderDoUncheck, doCheck: cascaderDoCheck
+        const { isMountedRef, mergedValueRef, mergedClsPrefixRef, mergedThemeRef, mergedCheckStrategyRef, syncSelectMenuPosition, closeMenu, handleSelectMenuClickOutside, doUncheck: cascaderDoUncheck, doCheck: cascaderDoCheck, clearPattern
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
          } = inject(cascaderInjectionKey);
         const menuInstRef = ref(null);
@@ -90,6 +90,7 @@ export default defineComponent({
                 else if (mergedValue === null) {
                     cascaderDoCheck(tmNode.key);
                 }
+                clearPattern();
             }
             else {
                 cascaderDoCheck(tmNode.key);

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

@@ -207,7 +207,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHover: string;
                 borderActive: string;
                 borderFocus: string;
-                boxShadowHover: null;
+                boxShadowHover: string;
                 boxShadowActive: string;
                 boxShadowFocus: string;
                 caretColor: string;
@@ -218,7 +218,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverWarning: string;
                 borderActiveWarning: string;
                 borderFocusWarning: string;
-                boxShadowHoverWarning: null;
+                boxShadowHoverWarning: string;
                 boxShadowActiveWarning: string;
                 boxShadowFocusWarning: string;
                 colorActiveWarning: string;
@@ -227,7 +227,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderHoverError: string;
                 borderActiveError: string;
                 borderFocusError: string;
-                boxShadowHoverError: null;
+                boxShadowHoverError: string;
                 boxShadowActiveError: string;
                 boxShadowFocusError: string;
                 colorActiveError: string;
@@ -364,6 +364,7 @@ declare const _default: import("vue").DefineComponent<{
         containerScrollTop: number;
         syncUnifiedContainer: () => void;
         scrollTo: import("../../_internal/scrollbar/src/ScrollBar").ScrollTo;
+        scrollBy: import("../../_internal/scrollbar/src/ScrollBar").ScrollBy;
         sync: () => void;
         handleMouseEnterWrapper: () => void;
         handleMouseLeaveWrapper: () => void;

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

@@ -53,6 +53,7 @@ export interface CascaderInjection {
     handleSelectMenuClickOutside: (e: MouseEvent) => void;
     handleCascaderMenuClickOutside: (e: MouseEvent) => void;
     renderLabelRef: Ref<((option: CascaderOption, checked: boolean) => VNodeChild) | undefined>;
+    clearPattern: () => void;
 }
 export interface CascaderSubmenuInstance {
     scroll: (index: number, elSize: number) => void;