naive-ui 2.30.3 → 2.30.4

package/es/data-table/styles/light.d.ts

@@ -626,6 +626,77 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
             paddingLarge: string;
             clearSize: string;
         }, any>;
+        Popselect: import("../../_mixins").Theme<"Popselect", {
+            menuBoxShadow: string;
+        }, {
+            Popover: import("../../_mixins").Theme<"Popover", {
+                fontSize: string;
+                borderRadius: string;
+                color: string;
+                dividerColor: string;
+                textColor: string;
+                boxShadow: string;
+                space: string;
+                spaceArrow: string;
+                arrowOffset: string;
+                arrowOffsetVertical: string;
+                arrowHeight: string;
+                padding: string;
+            }, any>;
+            InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
+                optionFontSizeSmall: string;
+                optionFontSizeMedium: string;
+                optionFontSizeLarge: string;
+                optionFontSizeHuge: string;
+                optionHeightSmall: string;
+                optionHeightMedium: string;
+                optionHeightLarge: string;
+                optionHeightHuge: string;
+                borderRadius: string;
+                color: string;
+                groupHeaderTextColor: string;
+                actionDividerColor: string;
+                optionTextColor: string;
+                optionTextColorPressed: string;
+                optionTextColorDisabled: string;
+                optionTextColorActive: string;
+                optionOpacityDisabled: string;
+                optionCheckColor: string;
+                optionColorPending: string;
+                optionColorActive: string;
+                optionColorActivePending: string;
+                actionTextColor: string;
+                loadingColor: string;
+                height: string;
+                paddingSmall: string;
+                paddingMedium: string;
+                paddingLarge: string;
+                paddingHuge: string;
+                optionPaddingSmall: string;
+                optionPaddingMedium: string;
+                optionPaddingLarge: string;
+                optionPaddingHuge: string;
+                loadingSize: string;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    color: string;
+                    colorHover: string;
+                }, any>;
+                Empty: import("../../_mixins").Theme<"Empty", {
+                    fontSizeSmall: string;
+                    fontSizeMedium: string;
+                    fontSizeLarge: string;
+                    fontSizeHuge: string;
+                    textColor: string;
+                    iconColor: string;
+                    extraTextColor: string;
+                    iconSizeSmall: string;
+                    iconSizeMedium: string;
+                    iconSizeLarge: string;
+                    iconSizeHuge: string;
+                }, any>;
+            }>;
+        }>;
     }>;
     Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
         color: string;

package/es/date-picker/src/DatePicker.d.ts

@@ -3948,8 +3948,9 @@ declare const _default: import("vue").DefineComponent<{
     isValueInvalid: import("vue").ComputedRef<boolean>;
     isStartValueInvalid: import("vue").ComputedRef<boolean>;
     isEndValueInvalid: import("vue").ComputedRef<boolean>;
+    handleInputKeydown: (e: KeyboardEvent) => void;
     handleClickOutside: (e: MouseEvent) => void;
-    handleKeyDown: (e: KeyboardEvent) => void;
+    handleKeydown: (e: KeyboardEvent) => void;
     handleClear: () => void;
     handlePanelClear: () => void;
     handleTriggerClick: (e: MouseEvent) => void;

package/es/date-picker/src/DatePicker.js

@@ -8,7 +8,7 @@ import { DateIcon, ToIcon } from '../../_internal/icons';
 import { NInput } from '../../input';
 import { NBaseIcon } from '../../_internal';
 import { useFormItem, useTheme, useConfig, useLocale, useThemeClass } from '../../_mixins';
-import { warn, call, useAdjustedTo, createKey, warnOnce, resolveSlot } from '../../_utils';
+import { warn, call, useAdjustedTo, createKey, warnOnce, resolveSlot, markEventEffectPerformed } from '../../_utils';
 import { datePickerLight } from '../styles';
 import { strictParse } from './utils';
 import { uniCalendarValidation, dualCalendarValidation } from './validation-utils';
@@ -302,11 +302,14 @@ export default defineComponent({
                 call(onUpdateShow, show);
             uncontrolledShowRef.value = show;
         }
-        function handleKeyDown(e) {
+        function handleKeydown(e) {
             if (e.key === 'Escape') {
-                closeCalendar({
-                    returnFocus: true
-                });
+                if (mergedShowRef.value) {
+                    markEventEffectPerformed(e);
+                    closeCalendar({
+                        returnFocus: true
+                    });
+                }
             }
             // We need to handle the conflict with normal date value input
             // const { value: mergedValue } = mergedValueRef
@@ -315,6 +318,12 @@ export default defineComponent({
             //   doUpdateValue(nextValue)
             // }
         }
+        function handleInputKeydown(e) {
+            if (e.key === 'Escape' && mergedShowRef.value) {
+                markEventEffectPerformed(e);
+                // closeCalendar will be called in handleDeactivated
+            }
+        }
         function handleClear() {
             var _a;
             doUpdateShow(false);
@@ -595,8 +604,9 @@ export default defineComponent({
             : undefined;
         return Object.assign(Object.assign({}, exposedMethods), { mergedStatus: mergedStatusRef, mergedClsPrefix: mergedClsPrefixRef, mergedBordered: mergedBorderedRef, namespace: namespaceRef, uncontrolledValue: uncontrolledValueRef, pendingValue: pendingValueRef, panelInstRef,
             triggerElRef,
-            inputInstRef, isMounted: useIsMounted(), displayTime: singleInputValueRef, displayStartTime: rangeStartInputValueRef, displayEndTime: rangeEndInputValueRef, mergedShow: mergedShowRef, adjustedTo: useAdjustedTo(props), isRange: isRangeRef, localizedStartPlaceholder: localizedStartPlaceholderRef, localizedEndPlaceholder: localizedEndPlaceholderRef, mergedSize: mergedSizeRef, mergedDisabled: mergedDisabledRef, localizedPlacehoder: localizedPlacehoderRef, isValueInvalid: uniVaidation.isValueInvalidRef, isStartValueInvalid: dualValidation.isStartValueInvalidRef, isEndValueInvalid: dualValidation.isEndValueInvalidRef, handleClickOutside,
-            handleKeyDown,
+            inputInstRef, isMounted: useIsMounted(), displayTime: singleInputValueRef, displayStartTime: rangeStartInputValueRef, displayEndTime: rangeEndInputValueRef, mergedShow: mergedShowRef, adjustedTo: useAdjustedTo(props), isRange: isRangeRef, localizedStartPlaceholder: localizedStartPlaceholderRef, localizedEndPlaceholder: localizedEndPlaceholderRef, mergedSize: mergedSizeRef, mergedDisabled: mergedDisabledRef, localizedPlacehoder: localizedPlacehoderRef, isValueInvalid: uniVaidation.isValueInvalidRef, isStartValueInvalid: dualValidation.isStartValueInvalidRef, isEndValueInvalid: dualValidation.isEndValueInvalidRef, handleInputKeydown,
+            handleClickOutside,
+            handleKeydown,
             handleClear,
             handlePanelClear,
             handleTriggerClick,
@@ -618,7 +628,7 @@ export default defineComponent({
             onTabOut: this.handlePanelTabOut,
             onClose: this.handlePanelClose,
             onClear: this.handlePanelClear,
-            onKeydown: this.handleKeyDown,
+            onKeydown: this.handleKeydown,
             onConfirm: this.handlePanelConfirm,
             ref: 'panelInstRef',
             value: this.pendingValue,
@@ -648,6 +658,7 @@ export default defineComponent({
             clearable,
             onClear: this.handleClear,
             onClick: this.handleTriggerClick,
+            onKeydown: this.handleInputKeydown,
             onActivate: this.handleInputActivate,
             onDeactivate: this.handleInputDeactivate,
             onFocus: this.handleInputFocus,
@@ -658,7 +669,7 @@ export default defineComponent({
                 this.mergedDisabled && `${mergedClsPrefix}-date-picker--disabled`,
                 this.isRange && `${mergedClsPrefix}-date-picker--range`,
                 this.triggerThemeClass
-            ], style: this.triggerCssVars, onKeydown: this.handleKeyDown },
+            ], style: this.triggerCssVars, onKeydown: this.handleKeydown },
             h(VBinder, null, {
                 default: () => [
                     h(VTarget, null, {

package/es/date-picker/src/panel/month.js

@@ -30,6 +30,7 @@ export default defineComponent({
                     return `Q ${item.dateObject.quarter}`;
             }
         };
+        const { useAsQuickJump } = props;
         const renderItem = (item, i, mergedClsPrefix) => {
             const { mergedIsDateDisabled, handleDateClick, handleQuickMonthClick } = useCalendarRef;
             return (h("div", { "data-n-date": true, key: i, class: [
@@ -37,10 +38,10 @@ export default defineComponent({
                     {
                         [`${mergedClsPrefix}-date-panel-month-calendar__picker-col-item--current`]: item.isCurrent,
                         [`${mergedClsPrefix}-date-panel-month-calendar__picker-col-item--selected`]: item.selected,
-                        [`${mergedClsPrefix}-date-panel-month-calendar__picker-col-item--disabled`]: mergedIsDateDisabled(item.ts)
+                        [`${mergedClsPrefix}-date-panel-month-calendar__picker-col-item--disabled`]: !useAsQuickJump && mergedIsDateDisabled(item.ts)
                     }
                 ], onClick: () => {
-                    props.useAsQuickJump
+                    useAsQuickJump
                         ? handleQuickMonthClick(item, (value) => props.onUpdateValue(value, false))
                         : handleDateClick(item);
                 } }, getRenderContent(item)));

package/es/drawer/src/Drawer.d.ts

@@ -295,7 +295,7 @@ declare const _default: import("vue").DefineComponent<{
     namespace: import("vue").ComputedRef<string | undefined>;
     mergedBodyStyle: import("vue").ComputedRef<(string | CSSProperties)[]>;
     handleMaskClick: (e: MouseEvent) => void;
-    handleEsc: () => void;
+    handleEsc: (e: KeyboardEvent) => void;
     mergedTheme: import("vue").ComputedRef<{
         common: {
             baseColor: string;

package/es/drawer/src/Drawer.js

@@ -3,7 +3,7 @@ import { VLazyTeleport } from 'vueuc';
 import { zindexable } from 'vdirs';
 import { useIsMounted } from 'vooks';
 import { useTheme, useConfig, useThemeClass } from '../../_mixins';
-import { formatLength, call, warnOnce, useIsComposing } from '../../_utils';
+import { formatLength, call, warnOnce, useIsComposing, eventEffectNotPerformed } from '../../_utils';
 import { drawerLight } from '../styles';
 import NDrawerBodyWrapper from './DrawerBodyWrapper';
 import { drawerInjectionKey } from './interface';
@@ -103,10 +103,10 @@ export default defineComponent({
                 onMaskClick(e);
         }
         const isComposingRef = useIsComposing();
-        function handleEsc() {
+        function handleEsc(e) {
             var _a;
             (_a = props.onEsc) === null || _a === void 0 ? void 0 : _a.call(props);
-            if (props.closeOnEsc) {
+            if (props.show && props.closeOnEsc && eventEffectNotPerformed(e)) {
                 !isComposingRef.value && doUpdateShow(false);
             }
         }

package/es/drawer/src/DrawerBodyWrapper.d.ts

@@ -36,7 +36,7 @@ declare const _default: import("vue").DefineComponent<{
     onClickoutside: PropType<(e: MouseEvent) => void>;
     onAfterLeave: PropType<() => void>;
     onAfterEnter: PropType<() => void>;
-    onEsc: PropType<() => void>;
+    onEsc: PropType<(e: KeyboardEvent) => void>;
 }, {
     bodyRef: import("vue").Ref<HTMLElement | null>;
     mergedClsPrefix: import("vue").Ref<string>;
@@ -222,7 +222,7 @@ declare const _default: import("vue").DefineComponent<{
     onClickoutside: PropType<(e: MouseEvent) => void>;
     onAfterLeave: PropType<() => void>;
     onAfterEnter: PropType<() => void>;
-    onEsc: PropType<() => void>;
+    onEsc: PropType<(e: KeyboardEvent) => void>;
 }>>, {
     show: boolean | undefined;
     autoFocus: boolean;

package/es/dropdown/src/Dropdown.d.ts

@@ -323,6 +323,7 @@ declare const dropdownProps: {
     readonly onClickoutside: PropType<(e: MouseEvent) => void>;
     readonly 'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     readonly onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
+    readonly internalDeactivateImmediately: BooleanConstructor;
     readonly internalSyncTargetWithParent: BooleanConstructor;
     readonly internalInheritedEventHandlers: {
         type: PropType<import("../../popover/src/Popover").TriggerEventHandlers[]>;
@@ -646,6 +647,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly onClickoutside: PropType<(e: MouseEvent) => void>;
     readonly 'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     readonly onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
+    readonly internalDeactivateImmediately: BooleanConstructor;
     readonly internalSyncTargetWithParent: BooleanConstructor;
     readonly internalInheritedEventHandlers: {
         type: PropType<import("../../popover/src/Popover").TriggerEventHandlers[]>;
@@ -1160,6 +1162,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly onClickoutside: PropType<(e: MouseEvent) => void>;
     readonly 'onUpdate:show': PropType<MaybeArray<(value: boolean) => void>>;
     readonly onUpdateShow: PropType<MaybeArray<(value: boolean) => void>>;
+    readonly internalDeactivateImmediately: BooleanConstructor;
     readonly internalSyncTargetWithParent: BooleanConstructor;
     readonly internalInheritedEventHandlers: {
         type: PropType<import("../../popover/src/Popover").TriggerEventHandlers[]>;
@@ -1199,6 +1202,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly arrowPointToCenter: boolean;
     readonly displayDirective: "show" | "if";
     readonly keepAliveOnHover: boolean;
+    readonly internalDeactivateImmediately: boolean;
     readonly animated: boolean;
     readonly internalTrapFocus: boolean;
     readonly defaultShow: boolean;

package/es/dynamic-tags/src/DynamicTags.js

@@ -87,7 +87,7 @@ export default defineComponent({
             const nextValue = externalValue !== null && externalValue !== void 0 ? externalValue : inputValueRef.value;
             if (nextValue) {
                 const tags = mergedValueRef.value.slice(0);
-                tags.push(nextValue);
+                tags.push(props.onCreate(nextValue));
                 doChange(tags);
             }
             showInputRef.value = false;

package/es/input/src/Input.d.ts

@@ -61,6 +61,7 @@ declare const inputProps: {
         type: BooleanConstructor;
         default: undefined;
     };
+    allowInput: PropType<(value: string) => boolean>;
     onMousedown: PropType<(e: MouseEvent) => void>;
     onKeydown: PropType<(e: KeyboardEvent) => void>;
     onKeyup: PropType<(e: KeyboardEvent) => void>;
@@ -330,6 +331,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    allowInput: PropType<(value: string) => boolean>;
     onMousedown: PropType<(e: MouseEvent) => void>;
     onKeydown: PropType<(e: KeyboardEvent) => void>;
     onKeyup: PropType<(e: KeyboardEvent) => void>;
@@ -587,7 +589,7 @@ declare const _default: import("vue").DefineComponent<{
     handleCompositionEnd: (e: CompositionEvent) => void;
     handleInput: (e: InputEvent | CompositionEvent | Event, index?: 0 | 1, event?: string) => void;
     handleInputBlur: (e: FocusEvent) => void;
-    handleInputFocus: (e: FocusEvent) => void;
+    handleInputFocus: (e: FocusEvent, index: number) => void;
     handleWrapperBlur: (e: FocusEvent) => void;
     handleWrapperFocus: (e: FocusEvent) => void;
     handleMouseEnter: () => void;
@@ -598,7 +600,7 @@ declare const _default: import("vue").DefineComponent<{
     handleClear: (e: MouseEvent) => void;
     handlePasswordToggleClick: () => void;
     handlePasswordToggleMousedown: (e: MouseEvent) => void;
-    handleWrapperKeyDown: (e: KeyboardEvent) => void;
+    handleWrapperKeydown: (e: KeyboardEvent) => void;
     handleTextAreaMirrorResize: () => void;
     getTextareaScrollContainer: () => HTMLTextAreaElement | null;
     mergedTheme: import("vue").ComputedRef<{
@@ -655,7 +657,7 @@ declare const _default: import("vue").DefineComponent<{
             scrollbarWidth: string;
             scrollbarHeight: string;
             scrollbarBorderRadius: string;
-            progressRailColor: string; /** deprecated */
+            progressRailColor: string;
             railColor: string;
             popoverColor: string;
             tableColor: string;
@@ -887,6 +889,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: undefined;
     };
+    allowInput: PropType<(value: string) => boolean>;
     onMousedown: PropType<(e: MouseEvent) => void>;
     onKeydown: PropType<(e: KeyboardEvent) => void>;
     onKeyup: PropType<(e: KeyboardEvent) => void>;

package/es/input/src/Input.js

@@ -4,15 +4,15 @@ import { getPadding } from 'seemly';
 import { VResizeObserver } from 'vueuc';
 import { off, on } from 'evtd';
 import { EyeIcon, EyeOffIcon } from '../../_internal/icons';
+import useRtl from '../../_mixins/use-rtl';
 import { NBaseClear, NBaseIcon, NBaseSuffix, NScrollbar } from '../../_internal';
 import { useTheme, useLocale, useFormItem, useConfig, useThemeClass } from '../../_mixins';
 import { call, createKey, resolveSlot, resolveWrappedSlot, warnOnce } from '../../_utils';
 import { inputLight } from '../styles';
 import { inputInjectionKey } from './interface';
-import { isEmptyValue } from './utils';
+import { isEmptyInputValue, useCursor } from './utils';
 import WordCount from './WordCount';
 import style from './styles/input.cssr';
-import useRtl from '../../_mixins/use-rtl';
 const inputProps = Object.assign(Object.assign({}, useTheme.props), { bordered: {
         type: Boolean,
         default: undefined
@@ -43,7 +43,7 @@ const inputProps = Object.assign(Object.assign({}, useTheme.props), { bordered:
     }, showCount: Boolean, loading: {
         type: Boolean,
         default: undefined
-    }, onMousedown: Function, onKeydown: Function, onKeyup: Function, onInput: [Function, Array], onFocus: [Function, Array], onBlur: [Function, Array], onClick: [Function, Array], onChange: [Function, Array], onClear: [Function, Array], status: String, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], 
+    }, allowInput: Function, onMousedown: Function, onKeydown: Function, onKeyup: Function, onInput: [Function, Array], onFocus: [Function, Array], onBlur: [Function, Array], onClick: [Function, Array], onChange: [Function, Array], onClear: [Function, Array], status: String, 'onUpdate:value': [Function, Array], onUpdateValue: [Function, Array], 
     /** private */
     textDecoration: [String, Array], attrSize: {
         type: Number,
@@ -71,6 +71,8 @@ export default defineComponent({
         const inputMirrorElRef = ref(null);
         const inputElRef = ref(null);
         const inputEl2Ref = ref(null);
+        const currentFocusedInputRef = ref(null);
+        const focusedInputCursorControl = useCursor(currentFocusedInputRef);
         const textareaScrollbarInstRef = ref(null);
         // local
         const { localeRef } = useLocale('Input');
@@ -111,8 +113,8 @@ export default defineComponent({
             const { value: mergedValue } = mergedValueRef;
             const { value: mergedPlaceholder } = mergedPlaceholderRef;
             return (!isComposing &&
-                (isEmptyValue(mergedValue) ||
-                    (Array.isArray(mergedValue) && isEmptyValue(mergedValue[0]))) &&
+                (isEmptyInputValue(mergedValue) ||
+                    (Array.isArray(mergedValue) && isEmptyInputValue(mergedValue[0]))) &&
                 mergedPlaceholder[0]);
         });
         const showPlaceholder2Ref = computed(() => {
@@ -121,8 +123,8 @@ export default defineComponent({
             const { value: mergedPlaceholder } = mergedPlaceholderRef;
             return (!isComposing &&
                 mergedPlaceholder[1] &&
-                (isEmptyValue(mergedValue) ||
-                    (Array.isArray(mergedValue) && isEmptyValue(mergedValue[1]))));
+                (isEmptyInputValue(mergedValue) ||
+                    (Array.isArray(mergedValue) && isEmptyInputValue(mergedValue[1]))));
         });
         // focus
         const mergedFocusRef = useMemo(() => {
@@ -320,24 +322,37 @@ export default defineComponent({
             syncSource = targetValue;
             if (isComposingRef.value)
                 return;
-            const changedValue = targetValue;
-            if (!props.pair) {
-                event === 'input' ? doUpdateValue(changedValue) : doChange(changedValue);
-            }
-            else {
-                let { value } = mergedValueRef;
-                if (!Array.isArray(value)) {
-                    value = ['', ''];
+            focusedInputCursorControl.recordCursor();
+            const isIncomingValueValid = allowInput(targetValue);
+            if (isIncomingValueValid) {
+                if (!props.pair) {
+                    event === 'input' ? doUpdateValue(targetValue) : doChange(targetValue);
                 }
                 else {
-                    value = [...value];
+                    let { value } = mergedValueRef;
+                    if (!Array.isArray(value)) {
+                        value = ['', ''];
+                    }
+                    else {
+                        value = [value[0], value[1]];
+                    }
+                    value[index] = targetValue;
+                    event === 'input' ? doUpdateValue(value) : doChange(value);
                 }
-                value[index] = changedValue;
-                event === 'input' ? doUpdateValue(value) : doChange(value);
             }
             // force update to sync input's view with value
             // if not set, after input, input value won't sync with dom input value
             vm.$forceUpdate();
+            if (!isIncomingValueValid) {
+                void nextTick(focusedInputCursorControl.restoreCursor);
+            }
+        }
+        function allowInput(value) {
+            const { allowInput } = props;
+            if (typeof allowInput === 'function') {
+                return allowInput(value);
+            }
+            return true;
         }
         function handleInputBlur(e) {
             doUpdateValueBlur(e);
@@ -351,13 +366,23 @@ export default defineComponent({
                 activatedRef.value = false;
             }
             dealWithEvent(e, 'blur');
+            currentFocusedInputRef.value = null;
         }
-        function handleInputFocus(e) {
+        function handleInputFocus(e, index) {
             doUpdateValueFocus(e);
             focusedRef.value = true;
             activatedRef.value = true;
             doActivate();
             dealWithEvent(e, 'focus');
+            if (index === 0) {
+                currentFocusedInputRef.value = inputElRef.value;
+            }
+            else if (index === 1) {
+                currentFocusedInputRef.value = inputEl2Ref.value;
+            }
+            else if (index === 2) {
+                currentFocusedInputRef.value = textareaElRef.value;
+            }
         }
         function handleWrapperBlur(e) {
             if (props.passivelyActivated) {
@@ -477,25 +502,25 @@ export default defineComponent({
             };
             on('mouseup', document, hidePassword);
         }
-        function handleWrapperKeyDown(e) {
+        function handleWrapperKeydown(e) {
             var _a;
             (_a = props.onKeydown) === null || _a === void 0 ? void 0 : _a.call(props, e);
             switch (e.key) {
                 case 'Escape':
-                    handleWrapperKeyDownEsc();
+                    handleWrapperKeydownEsc();
                     break;
                 case 'Enter':
-                    handleWrapperKeyDownEnter(e);
+                    handleWrapperKeydownEnter(e);
                     break;
             }
         }
-        function handleWrapperKeyDownEnter(e) {
+        function handleWrapperKeydownEnter(e) {
             var _a, _b;
             if (props.passivelyActivated) {
                 const { value: focused } = activatedRef;
                 if (focused) {
                     if (props.internalDeactivateOnEnter) {
-                        handleWrapperKeyDownEsc();
+                        handleWrapperKeydownEsc();
                     }
                     return;
                 }
@@ -508,7 +533,7 @@ export default defineComponent({
                 }
             }
         }
-        function handleWrapperKeyDownEsc() {
+        function handleWrapperKeydownEsc() {
             if (props.passivelyActivated) {
                 activatedRef.value = false;
                 void nextTick(() => {
@@ -553,7 +578,7 @@ export default defineComponent({
             const { value: wrapperEl } = wrapperElRef;
             if ((wrapperEl === null || wrapperEl === void 0 ? void 0 : wrapperEl.contains(document.activeElement)) &&
                 wrapperEl !== document.activeElement) {
-                handleWrapperKeyDownEsc();
+                handleWrapperKeydownEsc();
             }
         }
         function syncMirror(value) {
@@ -726,7 +751,7 @@ export default defineComponent({
             handleClear,
             handlePasswordToggleClick,
             handlePasswordToggleMousedown,
-            handleWrapperKeyDown,
+            handleWrapperKeydown,
             handleTextAreaMirrorResize, getTextareaScrollContainer: () => {
                 return textareaElRef.value;
             }, 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 });
@@ -753,7 +778,7 @@ export default defineComponent({
                 }
             ], style: this.cssVars, tabindex: !this.mergedDisabled && this.passivelyActivated && !this.activated
                 ? 0
-                : undefined, onFocus: this.handleWrapperFocus, onBlur: this.handleWrapperBlur, onClick: this.handleClick, onMousedown: this.handleMouseDown, onMouseenter: this.handleMouseEnter, onMouseleave: this.handleMouseLeave, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd, onKeyup: this.onKeyup, onKeydown: this.handleWrapperKeyDown },
+                : undefined, onFocus: this.handleWrapperFocus, onBlur: this.handleWrapperBlur, onClick: this.handleClick, onMousedown: this.handleMouseDown, onMouseenter: this.handleMouseEnter, onMouseleave: this.handleMouseLeave, onCompositionstart: this.handleCompositionStart, onCompositionend: this.handleCompositionEnd, onKeyup: this.onKeyup, onKeydown: this.handleWrapperKeydown },
             h("div", { class: `${mergedClsPrefix}-input-wrapper` },
                 resolveWrappedSlot($slots.prefix, (children) => children && (h("div", { class: `${mergedClsPrefix}-input__prefix` }, children))),
                 this.type === 'textarea' ? (h(NScrollbar, { ref: "textareaScrollbarInstRef", class: `${mergedClsPrefix}-input__textarea`, container: this.getTextareaScrollContainer, triggerDisplayManually: true, useUnifiedContainer: true }, {
@@ -775,7 +800,7 @@ export default defineComponent({
                                     this.textDecorationStyle[0],
                                     (_b = this.inputProps) === null || _b === void 0 ? void 0 : _b.style,
                                     scrollContainerWidthStyle
-                                ], onBlur: this.handleInputBlur, onFocus: this.handleInputFocus, onInput: this.handleInput, onChange: this.handleChange, onScroll: this.handleTextAreaScroll })),
+                                ], onBlur: this.handleInputBlur, onFocus: (e) => this.handleInputFocus(e, 2), onInput: this.handleInput, onChange: this.handleChange, onScroll: this.handleTextAreaScroll })),
                             this.showPlaceholder1 ? (h("div", { class: `${mergedClsPrefix}-input__placeholder`, style: [
                                     this.placeholderStyle,
                                     scrollContainerWidthStyle
@@ -797,7 +822,7 @@ export default defineComponent({
                             (_b = this.inputProps) === null || _b === void 0 ? void 0 : _b.style
                         ], tabindex: this.passivelyActivated && !this.activated ? -1 : undefined, placeholder: this.mergedPlaceholder[0], disabled: this.mergedDisabled, maxlength: this.maxlength, minlength: this.minlength, value: Array.isArray(this.mergedValue)
                             ? this.mergedValue[0]
-                            : this.mergedValue, readonly: this.readonly, autofocus: this.autofocus, size: this.attrSize, onBlur: this.handleInputBlur, onFocus: this.handleInputFocus, onInput: (e) => this.handleInput(e, 0), onChange: (e) => this.handleChange(e, 0) })),
+                            : this.mergedValue, readonly: this.readonly, autofocus: this.autofocus, size: this.attrSize, onBlur: this.handleInputBlur, onFocus: (e) => this.handleInputFocus(e, 0), onInput: (e) => this.handleInput(e, 0), onChange: (e) => this.handleChange(e, 0) })),
                     this.showPlaceholder1 ? (h("div", { class: `${mergedClsPrefix}-input__placeholder` },
                         h("span", null, this.mergedPlaceholder[0]))) : null,
                     this.autosize ? (h("div", { class: `${mergedClsPrefix}-input__input-mirror`, key: "mirror", ref: "inputMirrorElRef" }, "\u00A0")) : null)),
@@ -834,7 +859,7 @@ export default defineComponent({
                 h("div", { class: `${mergedClsPrefix}-input__input` },
                     h("input", { ref: "inputEl2Ref", type: this.type, class: `${mergedClsPrefix}-input__input-el`, tabindex: this.passivelyActivated && !this.activated ? -1 : undefined, placeholder: this.mergedPlaceholder[1], disabled: this.mergedDisabled, maxlength: this.maxlength, minlength: this.minlength, value: Array.isArray(this.mergedValue)
                             ? this.mergedValue[1]
-                            : undefined, readonly: this.readonly, style: this.textDecorationStyle[1], onBlur: this.handleInputBlur, onFocus: this.handleInputFocus, onInput: (e) => this.handleInput(e, 1), onChange: (e) => this.handleChange(e, 1) }),
+                            : undefined, readonly: this.readonly, style: this.textDecorationStyle[1], onBlur: this.handleInputBlur, onFocus: (e) => this.handleInputFocus(e, 1), onInput: (e) => this.handleInput(e, 1), onChange: (e) => this.handleChange(e, 1) }),
                     this.showPlaceholder2 ? (h("div", { class: `${mergedClsPrefix}-input__placeholder` },
                         h("span", null, this.mergedPlaceholder[1]))) : null),
                 resolveWrappedSlot($slots.suffix, (children) => {

package/es/input/src/utils.d.ts

@@ -1,2 +1,8 @@
+import type { Ref } from 'vue';
 export declare function len(s: string): number;
-export declare function isEmptyValue(value: any): boolean;
+export declare function isEmptyInputValue(value: unknown): boolean;
+export interface UseCursorControl {
+    recordCursor: () => void;
+    restoreCursor: () => void;
+}
+export declare function useCursor(inputElRef: Ref<HTMLInputElement | HTMLTextAreaElement | null>): UseCursorControl;

package/es/input/src/utils.js

@@ -1,3 +1,4 @@
+import { ref, watch } from 'vue';
 export function len(s) {
     let count = 0;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -6,6 +7,60 @@ export function len(s) {
     }
     return count;
 }
-export function isEmptyValue(value) {
-    return ['', undefined, null].includes(value);
+export function isEmptyInputValue(value) {
+    return value === '' || value == null;
+}
+export function useCursor(inputElRef) {
+    const selectionRef = ref(null);
+    function recordCursor() {
+        const { value: input } = inputElRef;
+        if (!input || !input.focus) {
+            reset();
+            return;
+        }
+        const { selectionStart, selectionEnd, value } = input;
+        if (selectionStart == null || selectionEnd == null) {
+            reset();
+            return;
+        }
+        selectionRef.value = {
+            start: selectionStart,
+            end: selectionEnd,
+            beforeText: value.slice(0, selectionStart),
+            afterText: value.slice(selectionEnd)
+        };
+    }
+    function restoreCursor() {
+        var _a;
+        const { value: selection } = selectionRef;
+        const { value: inputEl } = inputElRef;
+        if (!selection || !inputEl) {
+            return;
+        }
+        const { value } = inputEl;
+        const { start, beforeText, afterText } = selection;
+        let startPos = value.length;
+        if (value.endsWith(afterText)) {
+            startPos = value.length - afterText.length;
+        }
+        else if (value.startsWith(beforeText)) {
+            startPos = beforeText.length;
+        }
+        else {
+            const beforeLastChar = beforeText[start - 1];
+            const newIndex = value.indexOf(beforeLastChar, start - 1);
+            if (newIndex !== -1) {
+                startPos = newIndex + 1;
+            }
+        }
+        (_a = inputEl.setSelectionRange) === null || _a === void 0 ? void 0 : _a.call(inputEl, startPos, startPos);
+    }
+    function reset() {
+        selectionRef.value = null;
+    }
+    watch(inputElRef, reset);
+    return {
+        recordCursor,
+        restoreCursor
+    };
 }