antd-mobile 5.36.0 → 5.37.0

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

@@ -1,13 +1,13 @@
-import React, { useRef, useMemo } from 'react';
-import classNames from 'classnames';
+import { useMemoizedFn } from 'ahooks';
 import { DownOutline, TextDeletionOutline } from 'antd-mobile-icons';
-import { mergeProps } from '../../utils/with-default-props';
+import classNames from 'classnames';
+import React, { useMemo, useRef } from 'react';
+import { withNativeProps } from '../../utils/native-props';
 import { shuffle } from '../../utils/shuffle';
+import { mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
 import Popup from '../popup';
-import { withNativeProps } from '../../utils/native-props';
 import SafeArea from '../safe-area';
-import { useMemoizedFn } from 'ahooks';
-import { useConfig } from '../config-provider';
 const classPrefix = 'adm-number-keyboard';
 const defaultProps = {
   defaultVisible: false,
@@ -57,13 +57,13 @@ export const NumberKeyboard = p => {
     var _a;
     (_a = props.onDelete) === null || _a === void 0 ? void 0 : _a.call(props);
   });
-  const onBackspacePressStart = () => {
+  const startContinueClear = () => {
     timeoutRef.current = window.setTimeout(() => {
       onDelete();
       intervalRef.current = window.setInterval(onDelete, 150);
     }, 700);
   };
-  const onBackspacePressEnd = () => {
+  const stopContinueClear = () => {
     clearTimeout(timeoutRef.current);
     clearInterval(intervalRef.current);
   };
@@ -122,14 +122,15 @@ export const NumberKeyboard = p => {
       key: key,
       className: className,
       onTouchStart: () => {
+        stopContinueClear();
         if (key === 'BACKSPACE') {
-          onBackspacePressStart();
+          startContinueClear();
         }
       },
       onTouchEnd: e => {
         onKeyPress(e, key);
         if (key === 'BACKSPACE') {
-          onBackspacePressEnd();
+          stopContinueClear();
         }
       }
     }, ariaProps), key === 'BACKSPACE' ? React.createElement(TextDeletionOutline, null) : key);
@@ -161,11 +162,11 @@ export const NumberKeyboard = p => {
   }, React.createElement("div", {
     className: `${classPrefix}-key ${classPrefix}-key-extra ${classPrefix}-key-bs`,
     onTouchStart: () => {
-      onBackspacePressStart();
+      startContinueClear();
     },
     onTouchEnd: e => {
       onKeyPress(e, 'BACKSPACE');
-      onBackspacePressEnd();
+      stopContinueClear();
     },
     onContextMenu: e => {
       // Long press should not trigger native context menu

package/es/components/popup/popup-base-props.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
-import type { CSSProperties } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 import { GetContainer } from '../../utils/render-to-container';
 import { MaskProps } from '../mask';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
@@ -9,6 +8,7 @@ export declare type PopupBaseProps = {
     bodyClassName?: string;
     bodyStyle?: CSSProperties;
     closeOnMaskClick?: boolean;
+    closeIcon?: ReactNode;
     destroyOnClose?: boolean;
     disableBodyScroll?: boolean;
     forceRender?: boolean;
@@ -25,6 +25,7 @@ export declare type PopupBaseProps = {
 };
 export declare const defaultPopupBaseProps: {
     closeOnMaskClick: boolean;
+    closeIcon: React.JSX.Element;
     destroyOnClose: boolean;
     disableBodyScroll: boolean;
     forceRender: boolean;

package/es/components/popup/popup-base-props.js

@@ -1,5 +1,8 @@
+import React from 'react';
+import { CloseOutline } from 'antd-mobile-icons';
 export const defaultPopupBaseProps = {
   closeOnMaskClick: false,
+  closeIcon: React.createElement(CloseOutline, null),
   destroyOnClose: false,
   disableBodyScroll: true,
   forceRender: false,

package/es/components/popup/popup.js

@@ -9,7 +9,6 @@ import { renderToContainer } from '../../utils/render-to-container';
 import { useSpring, animated } from '@react-spring/web';
 import { withStopPropagation } from '../../utils/with-stop-propagation';
 import { ShouldRender } from '../../utils/should-render';
-import { CloseOutline } from 'antd-mobile-icons';
 import { defaultPopupBaseProps } from './popup-base-props';
 import { useInnerVisible } from '../../utils/use-inner-visible';
 import { useConfig } from '../config-provider';
@@ -20,11 +19,12 @@ const defaultProps = Object.assign(Object.assign({}, defaultPopupBaseProps), {
   position: 'bottom'
 });
 export const Popup = p => {
-  const props = mergeProps(defaultProps, p);
-  const bodyCls = classNames(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
   const {
-    locale
+    locale,
+    popup: componentConfig = {}
   } = useConfig();
+  const props = mergeProps(defaultProps, componentConfig, p);
+  const bodyCls = classNames(`${classPrefix}-body`, props.bodyClassName, `${classPrefix}-body-position-${props.position}`);
   const [active, setActive] = useState(props.visible);
   const ref = useRef(null);
   useLockScroll(ref, props.disableBodyScroll && active ? 'strict' : false);
@@ -119,7 +119,7 @@ export const Popup = p => {
     },
     role: 'button',
     "aria-label": locale.common.close
-  }, React.createElement(CloseOutline, null)), props.children))));
+  }, props.closeIcon), props.children))));
   return React.createElement(ShouldRender, {
     active: active,
     forceRender: props.forceRender,

package/es/components/result/result.js

@@ -1,16 +1,9 @@
 import React from 'react';
 import classNames from 'classnames';
-import { CheckCircleFill, CloseCircleFill, InformationCircleFill, ClockCircleFill, ExclamationCircleFill } from 'antd-mobile-icons';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
+import { useResultIcon } from './use-result-icon';
 const classPrefix = `adm-result`;
-const iconRecord = {
-  success: CheckCircleFill,
-  error: CloseCircleFill,
-  info: InformationCircleFill,
-  waiting: ClockCircleFill,
-  warning: ExclamationCircleFill
-};
 const defaultProps = {
   status: 'info'
 };
@@ -22,13 +15,13 @@ export const Result = p => {
     description,
     icon
   } = props;
+  const fallbackIcon = useResultIcon(status);
   if (!status) return null;
-  const resultIcon = icon || React.createElement(iconRecord[status]);
   return withNativeProps(props, React.createElement("div", {
     className: classNames(classPrefix, `${classPrefix}-${status}`)
   }, React.createElement("div", {
     className: `${classPrefix}-icon`
-  }, resultIcon), React.createElement("div", {
+  }, icon || fallbackIcon), React.createElement("div", {
     className: `${classPrefix}-title`
   }, title), !!description && React.createElement("div", {
     className: `${classPrefix}-description`

package/es/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/es/components/result/use-result-icon.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import { CheckCircleFill, CloseCircleFill, InformationCircleFill, ClockCircleFill, ExclamationCircleFill } from 'antd-mobile-icons';
+import { useConfig } from '../config-provider';
+export const useResultIcon = status => {
+  const {
+    result: componentConfig = {}
+  } = useConfig();
+  const {
+    successIcon = React.createElement(CheckCircleFill, null),
+    errorIcon = React.createElement(CloseCircleFill, null),
+    infoIcon = React.createElement(InformationCircleFill, null),
+    waitingIcon = React.createElement(ClockCircleFill, null),
+    warningIcon = React.createElement(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;
+  }
+};

package/es/components/result-page/result-page.js

@@ -1,18 +1,11 @@
 import React, { useState } from 'react';
-import { CheckCircleFill, CloseCircleFill, InformationCircleFill, ClockCircleFill, ExclamationCircleFill } from 'antd-mobile-icons';
 import classNames from 'classnames';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { isNodeWithContent } from '../../utils/is-node-with-content';
 import Button from '../button';
+import { useResultIcon } from '../result/use-result-icon';
 const classPrefix = `adm-result-page`;
-const iconRecord = {
-  success: CheckCircleFill,
-  error: CloseCircleFill,
-  info: InformationCircleFill,
-  waiting: ClockCircleFill,
-  warning: ExclamationCircleFill
-};
 const defaultProps = {
   status: 'info',
   details: []
@@ -30,7 +23,7 @@ export const ResultPage = p => {
     onPrimaryButtonClick,
     onSecondaryButtonClick
   } = props;
-  const resultIcon = icon || React.createElement(iconRecord[status]);
+  const fallbackIcon = useResultIcon(status);
   const [collapse, setCollapse] = useState(true);
   const showSecondaryButton = isNodeWithContent(secondaryButtonText);
   const showPrimaryButton = isNodeWithContent(primaryButtonText);
@@ -40,7 +33,7 @@ export const ResultPage = p => {
     className: `${classPrefix}-header`
   }, React.createElement("div", {
     className: `${classPrefix}-icon`
-  }, resultIcon), React.createElement("div", {
+  }, icon || fallbackIcon), React.createElement("div", {
     className: `${classPrefix}-title`
   }, title), isNodeWithContent(description) ? React.createElement("div", {
     className: `${classPrefix}-description`

package/es/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/es/components/search-bar/search-bar.js

@@ -1,29 +1,30 @@
-import React, { useState, useRef, forwardRef, useImperativeHandle } from 'react';
+import { SearchOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
-import Input from '../input';
-import Button from '../button';
+import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import { mergeProps } from '../../utils/with-default-props';
-import { SearchOutline } from 'antd-mobile-icons';
 import { usePropsValue } from '../../utils/use-props-value';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
+import Button from '../button';
 import { useConfig } from '../config-provider';
+import Input from '../input';
 const classPrefix = `adm-search-bar`;
 const defaultProps = {
   clearable: true,
   onlyShowClearWhenFocus: false,
   showCancelButton: false,
   defaultValue: '',
-  clearOnCancel: true,
-  icon: React.createElement(SearchOutline, null)
+  clearOnCancel: true
 };
-export const SearchBar = forwardRef((p, ref) => {
+export const SearchBar = forwardRef((props, ref) => {
   const {
-    locale
+    locale,
+    searchBar: componentConfig = {}
   } = useConfig();
-  const props = mergeProps(defaultProps, {
+  const mergedProps = mergeProps(defaultProps, componentConfig, {
     cancelText: locale.common.cancel
-  }, p);
-  const [value, setValue] = usePropsValue(props);
+  }, props);
+  const searchIcon = mergeProp(React.createElement(SearchOutline, null), componentConfig.searchIcon, props.icon, props.searchIcon);
+  const [value, setValue] = usePropsValue(mergedProps);
   const [hasFocus, setHasFocus] = useState(false);
   const inputRef = useRef(null);
   const composingRef = useRef(false);
@@ -47,10 +48,10 @@ export const SearchBar = 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.createElement("div", {
       className: `${classPrefix}-suffix`
@@ -59,66 +60,66 @@ export const SearchBar = 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 withNativeProps(props, React.createElement("div", {
+  return withNativeProps(mergedProps, React.createElement("div", {
     className: classNames(classPrefix, {
       [`${classPrefix}-active`]: hasFocus
     })
   }, React.createElement("div", {
     className: `${classPrefix}-input-box`
-  }, props.icon && React.createElement("div", {
+  }, searchIcon && React.createElement("div", {
     className: `${classPrefix}-input-box-icon`
-  }, props.icon), React.createElement(Input, {
+  }, searchIcon), React.createElement(Input, {
     ref: inputRef,
     className: classNames(`${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/es/components/toast/toast.css

@@ -27,7 +27,7 @@
 }
 .adm-toast-mask .adm-toast-main-text {
   padding: 12px;
-  min-width: 0px;
+  min-width: 0;
 }
 .adm-toast-mask .adm-toast-main-icon {
   padding: 35px 12px;

package/es/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/es/components/toast/toast.js

@@ -1,9 +1,9 @@
-import React, { useMemo } from 'react';
-import classNames from 'classnames';
 import { CheckOutline, CloseOutline } from 'antd-mobile-icons';
-import Mask from '../mask';
+import classNames from 'classnames';
+import React, { useMemo } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import AutoCenter from '../auto-center';
+import Mask from '../mask';
 import SpinLoading from '../spin-loading';
 const classPrefix = `adm-toast`;
 const defaultProps = {

package/es/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/es/components/virtual-input/virtual-input.js

@@ -1,24 +1,26 @@
+import { useIsomorphicLayoutEffect } from 'ahooks';
+import { CloseCircleFill } from 'antd-mobile-icons';
+import classNames from 'classnames';
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
-import classNames from 'classnames';
-import { CloseCircleFill } from 'antd-mobile-icons';
-import { useIsomorphicLayoutEffect } from 'ahooks';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
 const classPrefix = 'adm-virtual-input';
 const defaultProps = {
   defaultValue: ''
 };
-export const VirtualInput = forwardRef((p, ref) => {
-  const props = mergeProps(defaultProps, p);
-  const [value, setValue] = usePropsValue(props);
+export const VirtualInput = forwardRef((props, ref) => {
+  const {
+    locale,
+    input: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(defaultProps, componentConfig, props);
+  const [value, setValue] = usePropsValue(mergedProps);
   const rootRef = useRef(null);
   const contentRef = useRef(null);
   const [hasFocus, setHasFocus] = useState(false);
-  const {
-    locale
-  } = useConfig();
+  const clearIcon = mergeProp(React.createElement(CloseCircleFill, null), componentConfig.clearIcon, props.clearIcon);
   function scrollToEnd() {
     const root = rootRef.current;
     if (!root) return;
@@ -50,14 +52,14 @@ export const VirtualInput = 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.cloneElement(keyboard, {
     onInput: v => {
       var _a, _b;
@@ -84,36 +86,36 @@ export const VirtualInput = forwardRef((p, ref) => {
     },
     getContainer: null
   });
-  return withNativeProps(props, React.createElement("div", {
+  return withNativeProps(mergedProps, React.createElement("div", {
     ref: rootRef,
     className: classNames(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.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.createElement("div", {
     className: `${classPrefix}-caret-container`
   }, hasFocus && React.createElement("div", {
     className: `${classPrefix}-caret`
-  }))), props.clearable && !!value && hasFocus && React.createElement("div", {
+  }))), mergedProps.clearable && !!value && hasFocus && React.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.createElement(CloseCircleFill, null)), [undefined, null, ''].includes(value) && React.createElement("div", {
+  }, clearIcon), [undefined, null, ''].includes(value) && React.createElement("div", {
     className: `${classPrefix}-placeholder`
-  }, props.placeholder), keyboardElement));
+  }, mergedProps.placeholder), keyboardElement));
 });

package/es/locales/ar-SA.js

@@ -22,7 +22,7 @@ const arSA = mergeLocale(base, {
     'placeholder': 'اختر من فضلك'
   },
   'Dialog': {
-    'ok': 'عرفت'
+    'ok': 'فهمت'
   },
   'DatePicker': {
     'tillNow': 'إلى اليوم'
@@ -112,7 +112,7 @@ const arSA = mergeLocale(base, {
     'name': 'قناع الخلفية'
   },
   'Modal': {
-    'ok': 'عرفت'
+    'ok': 'فهمت'
   },
   'PasscodeInput': {
     'name': 'مربع إدخال كلمة المرور'

package/es/locales/de-DE.js

@@ -15,14 +15,14 @@ const deDE = mergeLocale(base, {
     'start': 'Starten',
     'end': 'Beenden',
     'today': 'Heute',
-    'markItems': ['Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Tag'],
+    'markItems': ['I', 'II', 'III', 'IV', 'V', 'Sechs', 'Tag'],
     'yearAndMonth': '${year}Jahr${month}Monat'
   },
   'Cascader': {
     'placeholder': 'Bitte auswählen'
   },
   'Dialog': {
-    'ok': 'OK'
+    'ok': 'Ich weiß.'
   },
   'DatePicker': {
     'tillNow': 'Bis heute'
@@ -112,7 +112,7 @@ const deDE = mergeLocale(base, {
     'name': 'Hintergrundmaske'
   },
   'Modal': {
-    'ok': 'OK'
+    'ok': 'Ich weiß.'
   },
   'PasscodeInput': {
     'name': 'Passwort-Eingabefeld'

package/es/locales/es-ES.js

@@ -16,7 +16,7 @@ const esES = mergeLocale(base, {
     placeholder: 'Seleccionando'
   },
   Dialog: {
-    ok: 'OK'
+    ok: 'Entendido'
   },
   ErrorBlock: {
     default: {
@@ -94,7 +94,7 @@ const esES = mergeLocale(base, {
     name: 'Máscara'
   },
   Modal: {
-    ok: 'OK'
+    ok: 'Entendido'
   },
   PullToRefresh: {
     pulling: 'Desplácese hacia abajo para refrescar',

package/es/locales/fr-FR.js

@@ -4,7 +4,7 @@ const typeTemplate = '${label}Pas un valide${type}';
 const frFR = mergeLocale(base, {
   locale: 'fr-FR',
   common: {
-    confirm: 'Valider',
+    confirm: 'Activer',
     cancel: 'Annuler',
     loading: 'Chargement'
   },