antd-mobile 5.42.0-alpha.0 → 5.42.0-alpha.2

package/2x/cjs/components/image-viewer/image-viewer.d.ts

@@ -18,6 +18,9 @@ export declare type ImageViewerProps = {
         mask?: string;
         body?: string;
     };
+    mask?: {
+        onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    };
 };
 export declare const ImageViewer: FC<ImageViewerProps>;
 export declare type MultiImageViewerRef = SlidesRef;

package/2x/cjs/components/image-viewer/image-viewer.js

@@ -22,17 +22,18 @@ const defaultProps = {
   visible: false
 };
 const ImageViewer = p => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const node = _react.default.createElement(_mask.default, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: 'thick',
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, _react.default.createElement("div", {
-    className: (0, _classnames.default)(`${classPrefix}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: (0, _classnames.default)(`${classPrefix}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, (props.image || typeof props.imageRender === 'function') && _react.default.createElement(_slide.Slide, {
     image: props.image,
     onTap: props.onClose,
@@ -40,7 +41,7 @@ const ImageViewer = p => {
     imageRender: props.imageRender
   })), props.image && _react.default.createElement("div", {
     className: `${classPrefix}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.image), _react.default.createElement(_safeArea.default, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.image), _react.default.createElement(_safeArea.default, {
     position: 'bottom'
   })));
   return (0, _renderToContainer.renderToContainer)(props.getContainer, node);
@@ -50,7 +51,7 @@ const multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
   defaultIndex: 0
 });
 const MultiImageViewer = (0, _react.forwardRef)((p, ref) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = (0, _withDefaultProps.mergeProps)(multiDefaultProps, p);
   const [index, setIndex] = (0, _react.useState)(props.defaultIndex);
   const slidesRef = (0, _react.useRef)(null);
@@ -69,13 +70,14 @@ const MultiImageViewer = (0, _react.forwardRef)((p, ref) => {
   }, [props.onIndexChange, index]);
   const node = _react.default.createElement(_mask.default, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: 'thick',
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, _react.default.createElement("div", {
-    className: (0, _classnames.default)(`${classPrefix}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: (0, _classnames.default)(`${classPrefix}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, props.images && _react.default.createElement(_slides.Slides, {
     ref: slidesRef,
     defaultIndex: index,
@@ -86,7 +88,7 @@ const MultiImageViewer = (0, _react.forwardRef)((p, ref) => {
     imageRender: props.imageRender
   })), props.images && _react.default.createElement("div", {
     className: `${classPrefix}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.images[index], index), _react.default.createElement(_safeArea.default, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.images[index], index), _react.default.createElement(_safeArea.default, {
     position: 'bottom'
   })));
   return (0, _renderToContainer.renderToContainer)(props.getContainer, node);

package/2x/cjs/components/number-keyboard/number-keyboard.d.ts

@@ -1,11 +1,15 @@
 import type { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { PopupProps } from '../popup';
+declare type CustomKeyType = string | {
+    key: string;
+    title: string;
+};
 export declare type NumberKeyboardProps = {
     visible?: boolean;
     title?: string;
     confirmText?: string | null;
-    customKey?: string | [string, string];
+    customKey?: CustomKeyType | CustomKeyType[];
     randomOrder?: boolean;
     showCloseButton?: boolean;
     onInput?: (v: string) => void;
@@ -16,3 +20,4 @@ export declare type NumberKeyboardProps = {
     safeArea?: boolean;
 } & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps<'--adm-safe-area-multiple'>;
 export declare const NumberKeyboard: FC<NumberKeyboardProps>;
+export {};

package/2x/cjs/components/number-keyboard/number-keyboard.js

@@ -124,20 +124,27 @@ const NumberKeyboard = p => {
     onKeyPress(e, 'BACKSPACE');
   };
   const renderKey = (key, index) => {
-    const isNumberKey = /^\d$/.test(key);
-    const isBackspace = key === 'BACKSPACE';
+    const keyConfig = typeof key === 'string' ? {
+      key,
+      title: key
+    } : key;
+    const realKey = keyConfig.key;
+    const isNumberKey = /^\d$/.test(realKey);
+    const isBackspace = realKey === 'BACKSPACE';
+    const title = isBackspace ? locale.Input.clear : keyConfig.title;
     const className = (0, _classnames.default)(`${classPrefix}-key`, {
       [`${classPrefix}-key-number`]: isNumberKey,
-      [`${classPrefix}-key-sign`]: !isNumberKey && key,
+      [`${classPrefix}-key-sign`]: !isNumberKey && realKey,
       [`${classPrefix}-key-mid`]: index === 9 && !!confirmText && keys.length < 12
     });
-    const ariaProps = key ? {
+    const ariaProps = realKey ? {
       role: 'button',
-      title: isBackspace ? locale.Input.clear : key,
+      title,
+      'aria-label': title,
       tabIndex: -1
     } : undefined;
     return _react.default.createElement("div", Object.assign({
-      key: key,
+      key: realKey,
       className: className,
       // 仅为  backspace 绑定，支持长按快速删除
       onTouchStart: isBackspace ? onBackspaceTouchStart : undefined,
@@ -149,9 +156,9 @@ const NumberKeyboard = p => {
       // backspace touchend 时会 preventDefault 阻止其后续 click 事件
       onClick: e => {
         stopContinueClear();
-        onKeyPress(e, key);
+        onKeyPress(e, realKey);
       }
-    }, ariaProps), isBackspace ? _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null) : key);
+    }, ariaProps), isBackspace ? _react.default.createElement(_antdMobileIcons.TextDeletionOutline, null) : realKey);
   };
   return _react.default.createElement(_popup.default, {
     visible: visible,

package/2x/cjs/components/virtual-input/virtual-input.js

@@ -142,6 +142,7 @@ const VirtualInput = (0, _react.forwardRef)((props, ref) => {
       (_b = (_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.onMove) === null || _b === void 0 ? void 0 : _b.call(_a, value.length);
     }
     (_c = mergedProps.onClick) === null || _c === void 0 ? void 0 : _c.call(mergedProps, e);
+    setHasFocus(true);
   };
   // 点击单个字符时，根据点击位置置于字符前或后
   const changeCaretPosition = index => e => {
@@ -217,7 +218,7 @@ const VirtualInput = (0, _react.forwardRef)((props, ref) => {
     className: `${classPrefix}-content`,
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
-    "aria-label": value || mergedProps.placeholder,
+    "aria-label": value ? undefined : mergedProps.placeholder,
     role: 'textbox',
     tabIndex: mergedProps.disabled ? undefined : 0,
     // note: 这里增加 onFocus 有两个目的：

package/2x/es/components/image-viewer/image-viewer.d.ts

@@ -18,6 +18,9 @@ export declare type ImageViewerProps = {
         mask?: string;
         body?: string;
     };
+    mask?: {
+        onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    };
 };
 export declare const ImageViewer: FC<ImageViewerProps>;
 export declare type MultiImageViewerRef = SlidesRef;

package/2x/es/components/image-viewer/image-viewer.js

@@ -13,17 +13,18 @@ const defaultProps = {
   visible: false
 };
 export const ImageViewer = p => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = mergeProps(defaultProps, p);
   const node = React.createElement(Mask, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: 'thick',
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, React.createElement("div", {
-    className: classNames(`${classPrefix}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: classNames(`${classPrefix}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, (props.image || typeof props.imageRender === 'function') && React.createElement(Slide, {
     image: props.image,
     onTap: props.onClose,
@@ -31,7 +32,7 @@ export const ImageViewer = p => {
     imageRender: props.imageRender
   })), props.image && React.createElement("div", {
     className: `${classPrefix}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.image), React.createElement(SafeArea, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.image), React.createElement(SafeArea, {
     position: 'bottom'
   })));
   return renderToContainer(props.getContainer, node);
@@ -40,7 +41,7 @@ const multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
   defaultIndex: 0
 });
 export const MultiImageViewer = forwardRef((p, ref) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = mergeProps(multiDefaultProps, p);
   const [index, setIndex] = useState(props.defaultIndex);
   const slidesRef = useRef(null);
@@ -59,13 +60,14 @@ export const MultiImageViewer = forwardRef((p, ref) => {
   }, [props.onIndexChange, index]);
   const node = React.createElement(Mask, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: 'thick',
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, React.createElement("div", {
-    className: classNames(`${classPrefix}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: classNames(`${classPrefix}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, props.images && React.createElement(Slides, {
     ref: slidesRef,
     defaultIndex: index,
@@ -76,7 +78,7 @@ export const MultiImageViewer = forwardRef((p, ref) => {
     imageRender: props.imageRender
   })), props.images && React.createElement("div", {
     className: `${classPrefix}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.images[index], index), React.createElement(SafeArea, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.images[index], index), React.createElement(SafeArea, {
     position: 'bottom'
   })));
   return renderToContainer(props.getContainer, node);

package/2x/es/components/number-keyboard/number-keyboard.d.ts

@@ -1,11 +1,15 @@
 import type { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { PopupProps } from '../popup';
+declare type CustomKeyType = string | {
+    key: string;
+    title: string;
+};
 export declare type NumberKeyboardProps = {
     visible?: boolean;
     title?: string;
     confirmText?: string | null;
-    customKey?: string | [string, string];
+    customKey?: CustomKeyType | CustomKeyType[];
     randomOrder?: boolean;
     showCloseButton?: boolean;
     onInput?: (v: string) => void;
@@ -16,3 +20,4 @@ export declare type NumberKeyboardProps = {
     safeArea?: boolean;
 } & Pick<PopupProps, 'afterClose' | 'afterShow' | 'getContainer' | 'destroyOnClose' | 'forceRender' | 'stopPropagation'> & NativeProps<'--adm-safe-area-multiple'>;
 export declare const NumberKeyboard: FC<NumberKeyboardProps>;
+export {};

package/2x/es/components/number-keyboard/number-keyboard.js

@@ -115,20 +115,27 @@ export const NumberKeyboard = p => {
     onKeyPress(e, 'BACKSPACE');
   };
   const renderKey = (key, index) => {
-    const isNumberKey = /^\d$/.test(key);
-    const isBackspace = key === 'BACKSPACE';
+    const keyConfig = typeof key === 'string' ? {
+      key,
+      title: key
+    } : key;
+    const realKey = keyConfig.key;
+    const isNumberKey = /^\d$/.test(realKey);
+    const isBackspace = realKey === 'BACKSPACE';
+    const title = isBackspace ? locale.Input.clear : keyConfig.title;
     const className = classNames(`${classPrefix}-key`, {
       [`${classPrefix}-key-number`]: isNumberKey,
-      [`${classPrefix}-key-sign`]: !isNumberKey && key,
+      [`${classPrefix}-key-sign`]: !isNumberKey && realKey,
       [`${classPrefix}-key-mid`]: index === 9 && !!confirmText && keys.length < 12
     });
-    const ariaProps = key ? {
+    const ariaProps = realKey ? {
       role: 'button',
-      title: isBackspace ? locale.Input.clear : key,
+      title,
+      'aria-label': title,
       tabIndex: -1
     } : undefined;
     return React.createElement("div", Object.assign({
-      key: key,
+      key: realKey,
       className: className,
       // 仅为  backspace 绑定，支持长按快速删除
       onTouchStart: isBackspace ? onBackspaceTouchStart : undefined,
@@ -140,9 +147,9 @@ export const NumberKeyboard = p => {
       // backspace touchend 时会 preventDefault 阻止其后续 click 事件
       onClick: e => {
         stopContinueClear();
-        onKeyPress(e, key);
+        onKeyPress(e, realKey);
       }
-    }, ariaProps), isBackspace ? React.createElement(TextDeletionOutline, null) : key);
+    }, ariaProps), isBackspace ? React.createElement(TextDeletionOutline, null) : realKey);
   };
   return React.createElement(Popup, {
     visible: visible,

package/2x/es/components/virtual-input/virtual-input.js

@@ -133,6 +133,7 @@ export const VirtualInput = forwardRef((props, ref) => {
       (_b = (_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.onMove) === null || _b === void 0 ? void 0 : _b.call(_a, value.length);
     }
     (_c = mergedProps.onClick) === null || _c === void 0 ? void 0 : _c.call(mergedProps, e);
+    setHasFocus(true);
   };
   // 点击单个字符时，根据点击位置置于字符前或后
   const changeCaretPosition = index => e => {
@@ -208,7 +209,7 @@ export const VirtualInput = forwardRef((props, ref) => {
     className: `${classPrefix}-content`,
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
-    "aria-label": value || mergedProps.placeholder,
+    "aria-label": value ? undefined : mergedProps.placeholder,
     role: 'textbox',
     tabIndex: mergedProps.disabled ? undefined : 0,
     // note: 这里增加 onFocus 有两个目的：

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.42.0-alpha.0",
+  "version": "5.42.0-alpha.2",
   "homepage": "https://github.com/ant-design/ant-design-mobile#readme",
   "bugs": {
     "url": "https://github.com/ant-design/ant-design-mobile/issues"

package/bundle/antd-mobile.cjs.development.js

@@ -21904,17 +21904,18 @@ const defaultProps$z = {
   visible: false
 };
 const ImageViewer$1 = (p) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = mergeProps(defaultProps$z, p);
   const node = React$3.createElement(Mask, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: "thick",
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, React$3.createElement("div", {
-    className: classNames(`${classPrefix$I}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: classNames(`${classPrefix$I}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, (props.image || typeof props.imageRender === "function") && React$3.createElement(Slide, {
     image: props.image,
     onTap: props.onClose,
@@ -21922,7 +21923,7 @@ const ImageViewer$1 = (p) => {
     imageRender: props.imageRender
   })), props.image && React$3.createElement("div", {
     className: `${classPrefix$I}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.image), React$3.createElement(SafeArea, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.image), React$3.createElement(SafeArea, {
     position: "bottom"
   })));
   return renderToContainer(props.getContainer, node);
@@ -21931,7 +21932,7 @@ const multiDefaultProps = Object.assign(Object.assign({}, defaultProps$z), {
   defaultIndex: 0
 });
 const MultiImageViewer = React$3.forwardRef((p, ref2) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const props = mergeProps(multiDefaultProps, p);
   const [index2, setIndex] = React$3.useState(props.defaultIndex);
   const slidesRef = React$3.useRef(null);
@@ -21951,13 +21952,14 @@ const MultiImageViewer = React$3.forwardRef((p, ref2) => {
   }, [props.onIndexChange, index2]);
   const node = React$3.createElement(Mask, {
     visible: props.visible,
+    afterClose: props === null || props === void 0 ? void 0 : props.afterClose,
+    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask,
+    onMaskClick: (_b = props.mask) === null || _b === void 0 ? void 0 : _b.onClick,
     disableBodyScroll: false,
     opacity: "thick",
-    afterClose: props.afterClose,
-    destroyOnClose: true,
-    className: (_a = props === null || props === void 0 ? void 0 : props.classNames) === null || _a === void 0 ? void 0 : _a.mask
+    destroyOnClose: true
   }, React$3.createElement("div", {
-    className: classNames(`${classPrefix$I}-content`, (_b = props === null || props === void 0 ? void 0 : props.classNames) === null || _b === void 0 ? void 0 : _b.body)
+    className: classNames(`${classPrefix$I}-content`, (_c = props === null || props === void 0 ? void 0 : props.classNames) === null || _c === void 0 ? void 0 : _c.body)
   }, props.images && React$3.createElement(Slides, {
     ref: slidesRef,
     defaultIndex: index2,
@@ -21968,7 +21970,7 @@ const MultiImageViewer = React$3.forwardRef((p, ref2) => {
     imageRender: props.imageRender
   })), props.images && React$3.createElement("div", {
     className: `${classPrefix$I}-footer`
-  }, (_c = props.renderFooter) === null || _c === void 0 ? void 0 : _c.call(props, props.images[index2], index2), React$3.createElement(SafeArea, {
+  }, (_d = props.renderFooter) === null || _d === void 0 ? void 0 : _d.call(props, props.images[index2], index2), React$3.createElement(SafeArea, {
     position: "bottom"
   })));
   return renderToContainer(props.getContainer, node);
@@ -23254,20 +23256,27 @@ const NumberKeyboard = (p) => {
     onKeyPress(e2, "BACKSPACE");
   };
   const renderKey = (key, index2) => {
-    const isNumberKey = /^\d$/.test(key);
-    const isBackspace = key === "BACKSPACE";
+    const keyConfig = typeof key === "string" ? {
+      key,
+      title: key
+    } : key;
+    const realKey = keyConfig.key;
+    const isNumberKey = /^\d$/.test(realKey);
+    const isBackspace = realKey === "BACKSPACE";
+    const title2 = isBackspace ? locale.Input.clear : keyConfig.title;
     const className = classNames(`${classPrefix$x}-key`, {
       [`${classPrefix$x}-key-number`]: isNumberKey,
-      [`${classPrefix$x}-key-sign`]: !isNumberKey && key,
+      [`${classPrefix$x}-key-sign`]: !isNumberKey && realKey,
       [`${classPrefix$x}-key-mid`]: index2 === 9 && !!confirmText && keys2.length < 12
     });
-    const ariaProps = key ? {
+    const ariaProps = realKey ? {
       role: "button",
-      title: isBackspace ? locale.Input.clear : key,
+      title: title2,
+      "aria-label": title2,
       tabIndex: -1
     } : void 0;
     return React$3.createElement("div", Object.assign({
-      key,
+      key: realKey,
       className,
       // 仅为  backspace 绑定，支持长按快速删除
       onTouchStart: isBackspace ? onBackspaceTouchStart : void 0,
@@ -23279,9 +23288,9 @@ const NumberKeyboard = (p) => {
       // backspace touchend 时会 preventDefault 阻止其后续 click 事件
       onClick: (e2) => {
         stopContinueClear();
-        onKeyPress(e2, key);
+        onKeyPress(e2, realKey);
       }
-    }, ariaProps), isBackspace ? React$3.createElement(TextDeletionOutline, null) : key);
+    }, ariaProps), isBackspace ? React$3.createElement(TextDeletionOutline, null) : realKey);
   };
   return React$3.createElement(Popup, {
     visible,
@@ -27730,6 +27739,7 @@ const VirtualInput = React$3.forwardRef((props, ref2) => {
       (_b = (_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.onMove) === null || _b === void 0 ? void 0 : _b.call(_a, value.length);
     }
     (_c = mergedProps.onClick) === null || _c === void 0 ? void 0 : _c.call(mergedProps, e2);
+    setHasFocus(true);
   };
   const changeCaretPosition = (index2) => (e2) => {
     var _a, _b, _c;
@@ -27803,7 +27813,7 @@ const VirtualInput = React$3.forwardRef((props, ref2) => {
     className: `${classPrefix$2}-content`,
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
-    "aria-label": value || mergedProps.placeholder,
+    "aria-label": value ? void 0 : mergedProps.placeholder,
     role: "textbox",
     tabIndex: mergedProps.disabled ? void 0 : 0,
     // note: 这里增加 onFocus 有两个目的：