antd-mobile 5.36.1 → 5.37.1

package/2x/cjs/components/result/use-result-icon.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare type ResultIconProps = {};
+export declare const useResultIcon: (status?: "error" | "waiting" | "success" | "warning" | "info" | undefined) => string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null;

package/2x/cjs/components/result/use-result-icon.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useResultIcon = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _antdMobileIcons = require("antd-mobile-icons");
+var _configProvider = require("../config-provider");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const useResultIcon = status => {
+  const {
+    result: componentConfig = {}
+  } = (0, _configProvider.useConfig)();
+  const {
+    successIcon = _react.default.createElement(_antdMobileIcons.CheckCircleFill, null),
+    errorIcon = _react.default.createElement(_antdMobileIcons.CloseCircleFill, null),
+    infoIcon = _react.default.createElement(_antdMobileIcons.InformationCircleFill, null),
+    waitingIcon = _react.default.createElement(_antdMobileIcons.ClockCircleFill, null),
+    warningIcon = _react.default.createElement(_antdMobileIcons.ExclamationCircleFill, null)
+  } = componentConfig || {};
+  switch (status) {
+    case 'success':
+      return successIcon;
+    case 'error':
+      return errorIcon;
+    case 'info':
+      return infoIcon;
+    case 'waiting':
+      return waitingIcon;
+    case 'warning':
+      return warningIcon;
+    default:
+      return null;
+  }
+};
+exports.useResultIcon = useResultIcon;

package/2x/cjs/components/result-page/result-page.js

@@ -5,23 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ResultPage = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antdMobileIcons = require("antd-mobile-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _nativeProps = require("../../utils/native-props");
 var _withDefaultProps = require("../../utils/with-default-props");
 var _isNodeWithContent = require("../../utils/is-node-with-content");
 var _button = _interopRequireDefault(require("../button"));
+var _useResultIcon = require("../result/use-result-icon");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const classPrefix = `adm-result-page`;
-const iconRecord = {
-  success: _antdMobileIcons.CheckCircleFill,
-  error: _antdMobileIcons.CloseCircleFill,
-  info: _antdMobileIcons.InformationCircleFill,
-  waiting: _antdMobileIcons.ClockCircleFill,
-  warning: _antdMobileIcons.ExclamationCircleFill
-};
 const defaultProps = {
   status: 'info',
   details: []
@@ -39,7 +32,7 @@ const ResultPage = p => {
     onPrimaryButtonClick,
     onSecondaryButtonClick
   } = props;
-  const resultIcon = icon || _react.default.createElement(iconRecord[status]);
+  const fallbackIcon = (0, _useResultIcon.useResultIcon)(status);
   const [collapse, setCollapse] = (0, _react.useState)(true);
   const showSecondaryButton = (0, _isNodeWithContent.isNodeWithContent)(secondaryButtonText);
   const showPrimaryButton = (0, _isNodeWithContent.isNodeWithContent)(primaryButtonText);
@@ -49,7 +42,7 @@ const ResultPage = p => {
     className: `${classPrefix}-header`
   }, _react.default.createElement("div", {
     className: `${classPrefix}-icon`
-  }, resultIcon), _react.default.createElement("div", {
+  }, icon || fallbackIcon), _react.default.createElement("div", {
     className: `${classPrefix}-title`
   }, title), (0, _isNodeWithContent.isNodeWithContent)(description) ? _react.default.createElement("div", {
     className: `${classPrefix}-description`

package/2x/cjs/components/search-bar/search-bar.d.ts

@@ -1,7 +1,7 @@
-import React from 'react';
 import type { ReactNode } from 'react';
-import { InputRef, InputProps } from '../input';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
+import { InputProps, InputRef } from '../input';
 export declare type SearchBarRef = InputRef;
 export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'onClear' | 'onCompositionStart' | 'onCompositionEnd'> & {
     value?: string;
@@ -12,6 +12,10 @@ export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'on
     onlyShowClearWhenFocus?: boolean;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean);
     cancelText?: string;
+    searchIcon?: ReactNode;
+    /**
+     * @deprecated use `searchIcon` instead
+     */
     icon?: ReactNode;
     clearOnCancel?: boolean;
     onSearch?: (val: string) => void;
@@ -27,6 +31,10 @@ export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps,
     onlyShowClearWhenFocus?: boolean | undefined;
     showCancelButton?: boolean | ((focus: boolean, value: string) => boolean) | undefined;
     cancelText?: string | undefined;
+    searchIcon?: ReactNode;
+    /**
+     * @deprecated use `searchIcon` instead
+     */
     icon?: ReactNode;
     clearOnCancel?: boolean | undefined;
     onSearch?: ((val: string) => void) | undefined;

package/2x/cjs/components/search-bar/search-bar.js

@@ -4,35 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SearchBar = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _antdMobileIcons = require("antd-mobile-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _input = _interopRequireDefault(require("../input"));
-var _button = _interopRequireDefault(require("../button"));
+var _react = _interopRequireWildcard(require("react"));
 var _nativeProps = require("../../utils/native-props");
-var _withDefaultProps = require("../../utils/with-default-props");
-var _antdMobileIcons = require("antd-mobile-icons");
 var _usePropsValue = require("../../utils/use-props-value");
+var _withDefaultProps = require("../../utils/with-default-props");
+var _button = _interopRequireDefault(require("../button"));
 var _configProvider = require("../config-provider");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _input = _interopRequireDefault(require("../input"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-search-bar`;
 const defaultProps = {
   clearable: true,
   onlyShowClearWhenFocus: false,
   showCancelButton: false,
   defaultValue: '',
-  clearOnCancel: true,
-  icon: _react.default.createElement(_antdMobileIcons.SearchOutline, null)
+  clearOnCancel: true
 };
-const SearchBar = (0, _react.forwardRef)((p, ref) => {
+const SearchBar = (0, _react.forwardRef)((props, ref) => {
   const {
-    locale
+    locale,
+    searchBar: componentConfig = {}
   } = (0, _configProvider.useConfig)();
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, {
+  const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, {
     cancelText: locale.common.cancel
-  }, p);
-  const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
+  }, props);
+  const searchIcon = (0, _withDefaultProps.mergeProp)(_react.default.createElement(_antdMobileIcons.SearchOutline, null), componentConfig.searchIcon, props.icon, props.searchIcon);
+  const [value, setValue] = (0, _usePropsValue.usePropsValue)(mergedProps);
   const [hasFocus, setHasFocus] = (0, _react.useState)(false);
   const inputRef = (0, _react.useRef)(null);
   const composingRef = (0, _react.useRef)(false);
@@ -56,10 +57,10 @@ const SearchBar = (0, _react.forwardRef)((p, ref) => {
   }));
   const renderCancelButton = () => {
     let isShowCancel;
-    if (typeof props.showCancelButton === 'function') {
-      isShowCancel = props.showCancelButton(hasFocus, value);
+    if (typeof mergedProps.showCancelButton === 'function') {
+      isShowCancel = mergedProps.showCancelButton(hasFocus, value);
     } else {
-      isShowCancel = props.showCancelButton && hasFocus;
+      isShowCancel = mergedProps.showCancelButton && hasFocus;
     }
     return isShowCancel && _react.default.createElement("div", {
       className: `${classPrefix}-suffix`
@@ -68,66 +69,66 @@ const SearchBar = (0, _react.forwardRef)((p, ref) => {
       className: `${classPrefix}-cancel-button`,
       onClick: () => {
         var _a, _b, _c;
-        if (props.clearOnCancel) {
+        if (mergedProps.clearOnCancel) {
           (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.clear();
         }
         (_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.blur();
-        (_c = props.onCancel) === null || _c === void 0 ? void 0 : _c.call(props);
+        (_c = mergedProps.onCancel) === null || _c === void 0 ? void 0 : _c.call(mergedProps);
       },
       onMouseDown: e => {
         e.preventDefault();
       }
-    }, props.cancelText));
+    }, mergedProps.cancelText));
   };
-  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+  return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
     className: (0, _classnames.default)(classPrefix, {
       [`${classPrefix}-active`]: hasFocus
     })
   }, _react.default.createElement("div", {
     className: `${classPrefix}-input-box`
-  }, props.icon && _react.default.createElement("div", {
+  }, searchIcon && _react.default.createElement("div", {
     className: `${classPrefix}-input-box-icon`
-  }, props.icon), _react.default.createElement(_input.default, {
+  }, searchIcon), _react.default.createElement(_input.default, {
     ref: inputRef,
     className: (0, _classnames.default)(`${classPrefix}-input`, {
-      [`${classPrefix}-input-without-icon`]: !props.icon
+      [`${classPrefix}-input-without-icon`]: !searchIcon
     }),
     value: value,
     onChange: setValue,
-    maxLength: props.maxLength,
-    placeholder: props.placeholder,
-    clearable: props.clearable,
-    onlyShowClearWhenFocus: props.onlyShowClearWhenFocus,
+    maxLength: mergedProps.maxLength,
+    placeholder: mergedProps.placeholder,
+    clearable: mergedProps.clearable,
+    onlyShowClearWhenFocus: mergedProps.onlyShowClearWhenFocus,
     onFocus: e => {
       var _a;
       setHasFocus(true);
-      (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
+      (_a = mergedProps.onFocus) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
     },
     onBlur: e => {
       var _a;
       setHasFocus(false);
-      (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
+      (_a = mergedProps.onBlur) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
     },
-    onClear: props.onClear,
+    onClear: mergedProps.onClear,
     type: 'search',
     enterKeyHint: 'search',
     onEnterPress: () => {
       var _a, _b;
       if (!composingRef.current) {
         (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.blur();
-        (_b = props.onSearch) === null || _b === void 0 ? void 0 : _b.call(props, value);
+        (_b = mergedProps.onSearch) === null || _b === void 0 ? void 0 : _b.call(mergedProps, value);
       }
     },
     "aria-label": locale.SearchBar.name,
     onCompositionStart: e => {
       var _a;
       composingRef.current = true;
-      (_a = props.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(props, e);
+      (_a = mergedProps.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
     },
     onCompositionEnd: e => {
       var _a;
       composingRef.current = false;
-      (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
+      (_a = mergedProps.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(mergedProps, e);
     }
   })), renderCancelButton()));
 });

package/2x/cjs/components/toast/toast.d.ts

@@ -1,7 +1,7 @@
 import type { FC, ReactNode } from 'react';
-import type { MaskProps } from '../mask';
-import { PropagationEvent } from '../../utils/with-stop-propagation';
 import { GetContainer } from '../../utils/render-to-container';
+import { PropagationEvent } from '../../utils/with-stop-propagation';
+import type { MaskProps } from '../mask';
 export interface ToastProps {
     afterClose?: () => void;
     maskStyle?: MaskProps['style'];

package/2x/cjs/components/toast/toast.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InternalToast = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
 var _antdMobileIcons = require("antd-mobile-icons");
-var _mask = _interopRequireDefault(require("../mask"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
 var _withDefaultProps = require("../../utils/with-default-props");
 var _autoCenter = _interopRequireDefault(require("../auto-center"));
+var _mask = _interopRequireDefault(require("../mask"));
 var _spinLoading = _interopRequireDefault(require("../spin-loading"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = `adm-toast`;
 const defaultProps = {
   maskClickable: true,

package/2x/cjs/components/virtual-input/virtual-input.d.ts

@@ -1,7 +1,7 @@
-import React from 'react';
 import type { ReactElement } from 'react';
-import type { InputProps } from '../input';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
+import type { InputProps } from '../input';
 import { NumberKeyboardProps } from '../number-keyboard';
 export declare type VirtualInputProps = {
     onFocus?: () => void;
@@ -10,7 +10,7 @@ export declare type VirtualInputProps = {
     keyboard?: ReactElement<NumberKeyboardProps>;
     clearable?: boolean;
     onClear?: () => void;
-} & Pick<InputProps, 'value' | 'onChange' | 'placeholder' | 'disabled'> & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align' | '--caret-width' | '--caret-color'>;
+} & Pick<InputProps, 'value' | 'onChange' | 'placeholder' | 'disabled' | 'clearIcon'> & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align' | '--caret-width' | '--caret-color'>;
 export declare type VirtualInputRef = {
     focus: () => void;
     blur: () => void;
@@ -19,10 +19,10 @@ export declare const VirtualInput: React.ForwardRefExoticComponent<{
     onFocus?: (() => void) | undefined;
     onBlur?: (() => void) | undefined;
     onClick?: ((e: React.MouseEvent<HTMLDivElement>) => void) | undefined;
-    keyboard?: React.ReactElement<NumberKeyboardProps, string | React.JSXElementConstructor<any>> | undefined;
+    keyboard?: ReactElement<NumberKeyboardProps, string | React.JSXElementConstructor<any>> | undefined;
     clearable?: boolean | undefined;
     onClear?: (() => void) | undefined;
-} & Pick<InputProps, "value" | "onChange" | "disabled" | "placeholder"> & {
+} & Pick<InputProps, "value" | "onChange" | "disabled" | "placeholder" | "clearIcon"> & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--caret-width" | "--caret-color", string>>) | undefined;
     tabIndex?: number | undefined;

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

@@ -4,30 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.VirtualInput = void 0;
+var _ahooks = require("ahooks");
+var _antdMobileIcons = require("antd-mobile-icons");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _nativeProps = require("../../utils/native-props");
-var _withDefaultProps = require("../../utils/with-default-props");
 var _usePropsValue = require("../../utils/use-props-value");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _antdMobileIcons = require("antd-mobile-icons");
-var _ahooks = require("ahooks");
+var _withDefaultProps = require("../../utils/with-default-props");
 var _configProvider = require("../config-provider");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const classPrefix = 'adm-virtual-input';
 const defaultProps = {
   defaultValue: ''
 };
-const VirtualInput = (0, _react.forwardRef)((p, ref) => {
-  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
+const VirtualInput = (0, _react.forwardRef)((props, ref) => {
+  const {
+    locale,
+    input: componentConfig = {}
+  } = (0, _configProvider.useConfig)();
+  const mergedProps = (0, _withDefaultProps.mergeProps)(defaultProps, componentConfig, props);
+  const [value, setValue] = (0, _usePropsValue.usePropsValue)(mergedProps);
   const rootRef = (0, _react.useRef)(null);
   const contentRef = (0, _react.useRef)(null);
   const [hasFocus, setHasFocus] = (0, _react.useState)(false);
-  const {
-    locale
-  } = (0, _configProvider.useConfig)();
+  const clearIcon = (0, _withDefaultProps.mergeProp)(_react.default.createElement(_antdMobileIcons.CloseCircleFill, null), componentConfig.clearIcon, props.clearIcon);
   function scrollToEnd() {
     const root = rootRef.current;
     if (!root) return;
@@ -59,14 +61,14 @@ const VirtualInput = (0, _react.forwardRef)((p, ref) => {
   function onFocus() {
     var _a;
     setHasFocus(true);
-    (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props);
+    (_a = mergedProps.onFocus) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
   }
   function onBlur() {
     var _a;
     setHasFocus(false);
-    (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props);
+    (_a = mergedProps.onBlur) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
   }
-  const keyboard = props.keyboard;
+  const keyboard = mergedProps.keyboard;
   const keyboardElement = keyboard && _react.default.cloneElement(keyboard, {
     onInput: v => {
       var _a, _b;
@@ -93,37 +95,37 @@ const VirtualInput = (0, _react.forwardRef)((p, ref) => {
     },
     getContainer: null
   });
-  return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+  return (0, _nativeProps.withNativeProps)(mergedProps, _react.default.createElement("div", {
     ref: rootRef,
     className: (0, _classnames.default)(classPrefix, {
-      [`${classPrefix}-disabled`]: props.disabled
+      [`${classPrefix}-disabled`]: mergedProps.disabled
     }),
-    tabIndex: props.disabled ? undefined : 0,
+    tabIndex: mergedProps.disabled ? undefined : 0,
     role: 'textbox',
     onFocus: onFocus,
     onBlur: onBlur,
-    onClick: props.onClick
+    onClick: mergedProps.onClick
   }, _react.default.createElement("div", {
     className: `${classPrefix}-content`,
     ref: contentRef,
-    "aria-disabled": props.disabled,
-    "aria-label": props.placeholder
+    "aria-disabled": mergedProps.disabled,
+    "aria-label": mergedProps.placeholder
   }, value, _react.default.createElement("div", {
     className: `${classPrefix}-caret-container`
   }, hasFocus && _react.default.createElement("div", {
     className: `${classPrefix}-caret`
-  }))), props.clearable && !!value && hasFocus && _react.default.createElement("div", {
+  }))), mergedProps.clearable && !!value && hasFocus && _react.default.createElement("div", {
     className: `${classPrefix}-clear`,
     onClick: e => {
       var _a;
       e.stopPropagation();
       setValue('');
-      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
+      (_a = mergedProps.onClear) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
     },
     role: 'button',
     "aria-label": locale.Input.clear
-  }, _react.default.createElement(_antdMobileIcons.CloseCircleFill, null)), [undefined, null, ''].includes(value) && _react.default.createElement("div", {
+  }, clearIcon), [undefined, null, ''].includes(value) && _react.default.createElement("div", {
     className: `${classPrefix}-placeholder`
-  }, props.placeholder), keyboardElement));
+  }, mergedProps.placeholder), keyboardElement));
 });
 exports.VirtualInput = VirtualInput;

package/2x/cjs/utils/is-node-with-content.d.ts

@@ -1,4 +1,7 @@
 import type { ReactNode } from 'react';
 declare type Regulated<T> = T extends null | undefined | false ? never : T;
+/**
+ * Check if the `node` is visible Node (not null, undefined, or false)
+ */
 export declare function isNodeWithContent(node: ReactNode): node is Regulated<ReactNode>;
 export {};

package/2x/cjs/utils/is-node-with-content.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isNodeWithContent = isNodeWithContent;
+/**
+ * Check if the `node` is visible Node (not null, undefined, or false)
+ */
 function isNodeWithContent(node) {
   return node !== undefined && node !== null && node !== false;
 }

package/2x/cjs/utils/with-default-props.d.ts

@@ -1,2 +1,9 @@
 export declare function mergeProps<A, B>(a: A, b: B): B & A;
 export declare function mergeProps<A, B, C>(a: A, b: B, c: C): C & B & A;
+export declare function mergeProps<A, B, C, D>(a: A, b: B, c: C, d: D): D & C & B & A;
+/**
+ * Merge props and return the first non-undefined value.
+ * The later has higher priority. e.g. (10, 1, 5) => 5 wins.
+ * This is useful with legacy props that have been deprecated.
+ */
+export declare function mergeProp<T, DefaultT extends T = T>(defaultProp: DefaultT, ...propList: T[]): T | undefined;

package/2x/cjs/utils/with-default-props.js

@@ -3,15 +3,31 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.mergeProp = mergeProp;
 exports.mergeProps = mergeProps;
 function mergeProps(...items) {
   const ret = {};
   items.forEach(item => {
-    Object.keys(item).forEach(key => {
-      if (item[key] !== undefined) {
-        ret[key] = item[key];
-      }
-    });
+    if (item) {
+      Object.keys(item).forEach(key => {
+        if (item[key] !== undefined) {
+          ret[key] = item[key];
+        }
+      });
+    }
   });
   return ret;
+}
+/**
+ * Merge props and return the first non-undefined value.
+ * The later has higher priority. e.g. (10, 1, 5) => 5 wins.
+ * This is useful with legacy props that have been deprecated.
+ */
+function mergeProp(defaultProp, ...propList) {
+  for (let i = propList.length - 1; i >= 0; i -= 1) {
+    if (propList[i] !== undefined) {
+      return propList[i];
+    }
+  }
+  return defaultProp;
 }

package/2x/es/components/calendar-picker/calendar-picker.js

@@ -1,13 +1,14 @@
 import { __rest } from "tslib";
+import classNames from 'classnames';
 import React, { forwardRef, useRef } from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import classNames from 'classnames';
+import { mergeProps } from '../../utils/with-default-props';
 import Button from '../button';
+import CalendarPickerView from '../calendar-picker-view';
+import { Context } from '../calendar-picker-view/calendar-picker-view';
+import { useConfig } from '../config-provider';
 import Divider from '../divider';
 import Popup from '../popup';
-import { mergeProps } from '../../utils/with-default-props';
-import { useConfig } from '../config-provider';
-import CalendarPickerView from '../calendar-picker-view';
 const classPrefix = 'adm-calendar-picker';
 const defaultProps = {
   weekStartsOn: 'Sunday',
@@ -36,6 +37,9 @@ export const CalendarPicker = forwardRef((p, ref) => {
       getContainer
     } = props,
     calendarViewProps = __rest(props, ["visible", "confirmText", "popupClassName", "popupStyle", "popupBodyStyle", "forceRender", "closeOnMaskClick", "onClose", "onConfirm", "onMaskClick", "getContainer"]);
+  const viewContext = React.useMemo(() => ({
+    visible: !!visible
+  }), [visible]);
   const footer = React.createElement("div", {
     className: `${classPrefix}-footer`
   }, React.createElement(Divider, null), React.createElement("div", {
@@ -75,7 +79,9 @@ export const CalendarPicker = forwardRef((p, ref) => {
       }
     },
     getContainer: getContainer
+  }, React.createElement(Context.Provider, {
+    value: viewContext
   }, React.createElement(CalendarPickerView, Object.assign({
     ref: calendarRef
-  }, calendarViewProps)), footer)));
+  }, calendarViewProps))), footer)));
 });

package/2x/es/components/calendar-picker-view/calendar-picker-view.d.ts

@@ -1,6 +1,9 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { DateRange, Page } from './convert';
+export declare const Context: React.Context<{
+    visible: boolean;
+}>;
 export declare type CalendarPickerViewRef = {
     jumpTo: (page: Page | ((page: Page) => Page)) => void;
     jumpToToday: () => void;