antd-mobile 5.36.0 → 5.37.0

package/es/components/form/form-item.d.ts

@@ -1,16 +1,17 @@
-import React from 'react';
-import type { FC, ReactNode, MutableRefObject } from 'react';
-import { NativeProps } from '../../utils/native-props';
 import { FormInstance } from 'rc-field-form';
 import type { FieldProps } from 'rc-field-form/lib/Field';
-import type { FormLayout } from './index';
+import type { FC, MutableRefObject, ReactNode } from 'react';
+import React from 'react';
+import { NativeProps } from '../../utils/native-props';
 import { ListItemProps } from '../list';
+import type { FormLayout } from './index';
 declare type RenderChildren<Values = any> = (form: FormInstance<Values>) => ReactNode;
 declare type ChildrenType<Values = any> = RenderChildren<Values> | ReactNode;
 declare type RcFieldProps = Omit<FieldProps, 'children'>;
-export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePropName' | 'name' | 'rules' | 'messageVariables' | 'trigger' | 'validateTrigger' | 'shouldUpdate' | 'initialValue' | 'getValueFromEvent' | 'getValueProps' | 'normalize' | 'preserve' | 'validateFirst'> & Pick<ListItemProps, 'style' | 'extra' | 'clickable' | 'arrow' | 'description'> & {
+export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePropName' | 'name' | 'rules' | 'messageVariables' | 'trigger' | 'validateTrigger' | 'shouldUpdate' | 'initialValue' | 'getValueFromEvent' | 'getValueProps' | 'normalize' | 'preserve' | 'validateFirst'> & Pick<ListItemProps, 'style' | 'extra' | 'clickable' | 'arrow' | 'arrowIcon' | 'description'> & {
     label?: ReactNode;
     help?: ReactNode;
+    helpIcon?: ReactNode;
     hasFeedback?: boolean;
     required?: boolean;
     noStyle?: boolean;

package/es/components/form/form-item.js

@@ -1,17 +1,18 @@
 import { __rest } from "tslib";
-import React, { useContext, useCallback, useState, useRef } from 'react';
+import { QuestionCircleOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
-import { withNativeProps } from '../../utils/native-props';
 import { Field } from 'rc-field-form';
 import FieldContext from 'rc-field-form/lib/FieldContext';
+import React, { useCallback, useContext, useRef, useState } from 'react';
 import { devWarning } from '../../utils/dev-log';
-import { FormContext, NoStyleItemContext } from './context';
-import { toArray, isSafeSetRefComponent } from './utils';
+import { withNativeProps } from '../../utils/native-props';
+import { undefinedFallback } from '../../utils/undefined-fallback';
+import { mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
 import List from '../list';
 import Popover from '../popover';
-import { QuestionCircleOutline } from 'antd-mobile-icons';
-import { useConfig } from '../config-provider';
-import { undefinedFallback } from '../../utils/undefined-fallback';
+import { FormContext, NoStyleItemContext } from './context';
+import { isSafeSetRefComponent, toArray } from './utils';
 const NAME_SPLIT = '__SPLIT__';
 const classPrefix = `adm-form-item`;
 const MemoInput = React.memo(({
@@ -19,22 +20,25 @@ const MemoInput = React.memo(({
 }) => children, (prev, next) => prev.value === next.value && prev.update === next.update);
 const FormItemLayout = props => {
   var _a;
+  const {
+    locale,
+    form: componentConfig = {}
+  } = useConfig();
   const {
     style,
     extra,
     label,
     help,
+    helpIcon,
     required,
     children,
     htmlFor,
     hidden,
     arrow,
+    arrowIcon,
     childElementPosition = 'normal'
-  } = props;
+  } = mergeProps(componentConfig, props);
   const context = useContext(FormContext);
-  const {
-    locale
-  } = useConfig();
   const hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   const layout = props.layout || context.layout;
   const disabled = (_a = props.disabled) !== null && _a !== void 0 ? _a : context.disabled;
@@ -74,7 +78,7 @@ const FormItemLayout = props => {
       e.stopPropagation();
       e.preventDefault();
     }
-  }, React.createElement(QuestionCircleOutline, null))));
+  }, helpIcon || React.createElement(QuestionCircleOutline, null))));
   const description = (!!props.description || hasFeedback) && React.createElement(React.Fragment, null, props.description, hasFeedback && React.createElement(React.Fragment, null, props.errors.map((error, index) => React.createElement("div", {
     key: `error-${index}`,
     className: `${classPrefix}-feedback-error`
@@ -95,7 +99,7 @@ const FormItemLayout = props => {
     disabled: disabled,
     onClick: props.onClick,
     clickable: props.clickable,
-    arrow: arrow
+    arrowIcon: arrowIcon || arrow
   }, React.createElement("div", {
     className: classNames(`${classPrefix}-child`, `${classPrefix}-child-position-${childElementPosition}`)
   }, React.createElement("div", {
@@ -109,6 +113,7 @@ export const FormItem = props => {
       // FormItem 相关
       label,
       help,
+      helpIcon,
       extra,
       hasFeedback,
       name,
@@ -129,9 +134,10 @@ export const FormItem = props => {
       shouldUpdate,
       dependencies,
       clickable,
-      arrow
+      arrow,
+      arrowIcon
     } = props,
-    fieldProps = __rest(props, ["style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "childElementPosition", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "clickable", "arrow"]);
+    fieldProps = __rest(props, ["style", "label", "help", "helpIcon", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "childElementPosition", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "clickable", "arrow", "arrowIcon"]);
   const {
     name: formName
   } = useContext(FormContext);
@@ -183,6 +189,7 @@ export const FormItem = props => {
       label: label,
       extra: extra,
       help: help,
+      helpIcon: helpIcon,
       description: description,
       required: isRequired,
       disabled: disabled,
@@ -195,7 +202,8 @@ export const FormItem = props => {
       layout: layout,
       childElementPosition: childElementPosition,
       clickable: clickable,
-      arrow: arrow
+      arrow: arrow,
+      arrowIcon: arrowIcon
     }, React.createElement(NoStyleItemContext.Provider, {
       value: onSubMetaChange
     }, baseChildren)));

package/es/components/form/form.d.ts

@@ -9,7 +9,7 @@ export declare type FormProps = Pick<RcFormProps, 'form' | 'initialValues' | 'na
     footer?: ReactNode;
     mode?: ListProps['mode'];
 };
-export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & {
+export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "form" | "children" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--border-bottom" | "--border-inner" | "--border-top" | "--prefix-width", string>>) | undefined;
     tabIndex?: number | undefined;

package/es/components/form/index.d.ts

@@ -6,7 +6,7 @@ export type { FormItemProps } from './form-item';
 export type { FormSubscribeProps } from './form-subscribe';
 export type { ValidateMessages, FieldData, NamePath, Rule, RuleObject, RuleRender, } from 'rc-field-form/es/interface';
 export type { FormArrayField, FormArrayOperation, FormArrayProps, } from './form-array';
-declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & {
+declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "form" | "children" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & {
     className?: string | undefined;
     style?: (import("react").CSSProperties & Partial<Record<"--border-bottom" | "--border-inner" | "--border-top" | "--prefix-width", string>>) | undefined;
     tabIndex?: number | undefined;

package/es/components/input/input.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
 declare type AriaProps = {
@@ -9,6 +9,7 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     defaultValue?: string;
     onChange?: (val: string) => void;
     clearable?: boolean;
+    clearIcon?: ReactNode;
     onlyShowClearWhenFocus?: boolean;
     onClear?: () => void;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
@@ -26,6 +27,7 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProp
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
     clearable?: boolean | undefined;
+    clearIcon?: ReactNode;
     onlyShowClearWhenFocus?: boolean | undefined;
     onClear?: (() => void) | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;

package/es/components/input/input.js

@@ -1,32 +1,34 @@
-import React, { useState, forwardRef, useImperativeHandle, useRef } from 'react';
-import { usePropsValue } from '../../utils/use-props-value';
 import { CloseCircleFill } from 'antd-mobile-icons';
-import { withNativeProps } from '../../utils/native-props';
-import { mergeProps } from '../../utils/with-default-props';
 import classNames from 'classnames';
+import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 import { bound } from '../../utils/bound';
+import { withNativeProps } from '../../utils/native-props';
+import { usePropsValue } from '../../utils/use-props-value';
 import { isIOS } from '../../utils/validate';
+import { mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
 import useInputHandleKeyDown from './useInputHandleKeyDown';
 const classPrefix = `adm-input`;
 const defaultProps = {
   defaultValue: '',
+  clearIcon: React.createElement(CloseCircleFill, null),
   onlyShowClearWhenFocus: true
 };
-export const Input = forwardRef((p, ref) => {
-  const props = mergeProps(defaultProps, p);
-  const [value, setValue] = usePropsValue(props);
+export const Input = forwardRef((props, ref) => {
+  const {
+    locale,
+    input: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(defaultProps, componentConfig, props);
+  const [value, setValue] = usePropsValue(mergedProps);
   const [hasFocus, setHasFocus] = useState(false);
   const compositionStartRef = useRef(false);
   const nativeInputRef = useRef(null);
-  const {
-    locale
-  } = useConfig();
   const handleKeydown = useInputHandleKeyDown({
-    onEnterPress: props.onEnterPress,
-    onKeyDown: props.onKeyDown,
+    onEnterPress: mergedProps.onEnterPress,
+    onKeyDown: mergedProps.onKeyDown,
     nativeInputRef,
-    enterKeyHint: props.enterKeyHint
+    enterKeyHint: mergedProps.enterKeyHint
   });
   useImperativeHandle(ref, () => ({
     clear: () => {
@@ -46,8 +48,8 @@ export const Input = forwardRef((p, ref) => {
   }));
   function checkValue() {
     let nextValue = value;
-    if (props.type === 'number') {
-      const boundValue = nextValue && bound(parseFloat(nextValue), props.min, props.max).toString();
+    if (mergedProps.type === 'number') {
+      const boundValue = nextValue && bound(parseFloat(nextValue), mergedProps.min, mergedProps.max).toString();
       // fix the display issue of numbers starting with 0
       if (Number(nextValue) !== Number(boundValue)) {
         nextValue = boundValue;
@@ -58,15 +60,15 @@ export const Input = forwardRef((p, ref) => {
     }
   }
   const shouldShowClear = (() => {
-    if (!props.clearable || !value || props.readOnly) return false;
-    if (props.onlyShowClearWhenFocus) {
+    if (!mergedProps.clearable || !value || mergedProps.readOnly) return false;
+    if (mergedProps.onlyShowClearWhenFocus) {
       return hasFocus;
     } else {
       return true;
     }
   })();
-  return withNativeProps(props, React.createElement("div", {
-    className: classNames(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
+  return withNativeProps(mergedProps, React.createElement("div", {
+    className: classNames(`${classPrefix}`, mergedProps.disabled && `${classPrefix}-disabled`)
   }, React.createElement("input", {
     ref: nativeInputRef,
     className: `${classPrefix}-element`,
@@ -77,50 +79,50 @@ export const Input = forwardRef((p, ref) => {
     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);
       checkValue();
-      (_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);
     },
-    id: props.id,
-    placeholder: props.placeholder,
-    disabled: props.disabled,
-    readOnly: props.readOnly,
-    maxLength: props.maxLength,
-    minLength: props.minLength,
-    max: props.max,
-    min: props.min,
-    autoComplete: props.autoComplete,
-    enterKeyHint: props.enterKeyHint,
-    autoFocus: props.autoFocus,
-    pattern: props.pattern,
-    inputMode: props.inputMode,
-    type: props.type,
-    name: props.name,
-    autoCapitalize: props.autoCapitalize,
-    autoCorrect: props.autoCorrect,
+    id: mergedProps.id,
+    placeholder: mergedProps.placeholder,
+    disabled: mergedProps.disabled,
+    readOnly: mergedProps.readOnly,
+    maxLength: mergedProps.maxLength,
+    minLength: mergedProps.minLength,
+    max: mergedProps.max,
+    min: mergedProps.min,
+    autoComplete: mergedProps.autoComplete,
+    enterKeyHint: mergedProps.enterKeyHint,
+    autoFocus: mergedProps.autoFocus,
+    pattern: mergedProps.pattern,
+    inputMode: mergedProps.inputMode,
+    type: mergedProps.type,
+    name: mergedProps.name,
+    autoCapitalize: mergedProps.autoCapitalize,
+    autoCorrect: mergedProps.autoCorrect,
     onKeyDown: handleKeydown,
-    onKeyUp: props.onKeyUp,
+    onKeyUp: mergedProps.onKeyUp,
     onCompositionStart: e => {
       var _a;
       compositionStartRef.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;
       compositionStartRef.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);
     },
-    onClick: props.onClick,
-    step: props.step,
-    role: props.role,
-    "aria-valuenow": props['aria-valuenow'],
-    "aria-valuemax": props['aria-valuemax'],
-    "aria-valuemin": props['aria-valuemin'],
-    "aria-label": props['aria-label']
+    onClick: mergedProps.onClick,
+    step: mergedProps.step,
+    role: mergedProps.role,
+    "aria-valuenow": mergedProps['aria-valuenow'],
+    "aria-valuemax": mergedProps['aria-valuemax'],
+    "aria-valuemin": mergedProps['aria-valuemin'],
+    "aria-label": mergedProps['aria-label']
   }), shouldShowClear && React.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
@@ -129,7 +131,7 @@ export const Input = forwardRef((p, ref) => {
     onClick: () => {
       var _a, _b;
       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);
       // https://github.com/ant-design/ant-design-mobile/issues/5212
       if (isIOS() && compositionStartRef.current) {
         compositionStartRef.current = false;
@@ -137,5 +139,5 @@ export const Input = forwardRef((p, ref) => {
       }
     },
     "aria-label": locale.Input.clear
-  }, React.createElement(CloseCircleFill, null))));
+  }, mergedProps.clearIcon)));
 });

package/es/components/list/list-item.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { FC, ReactNode } from 'react';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ListItemProps = {
     title?: ReactNode;
@@ -8,8 +8,12 @@ export declare type ListItemProps = {
     prefix?: ReactNode;
     extra?: ReactNode;
     clickable?: boolean;
-    arrow?: boolean | ReactNode;
+    arrowIcon?: boolean | ReactNode;
     disabled?: boolean;
     onClick?: (e: React.MouseEvent<HTMLElement>) => void;
+    /**
+     * @deprecated use `arrowIcon` instead
+     */
+    arrow?: boolean | ReactNode;
 } & NativeProps<'--prefix-width' | '--align-items' | '--active-background-color'>;
 export declare const ListItem: FC<ListItemProps>;

package/es/components/list/list-item.js

@@ -1,13 +1,23 @@
-import React from 'react';
-import { withNativeProps } from '../../utils/native-props';
 import { RightOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
+import React from 'react';
 import { isNodeWithContent } from '../../utils/is-node-with-content';
+import { withNativeProps } from '../../utils/native-props';
+import { mergeProp } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
 const classPrefix = `adm-list-item`;
 export const ListItem = props => {
-  var _a;
+  var _a, _b;
+  const {
+    arrow,
+    arrowIcon
+  } = props;
+  const {
+    list: componentConfig = {}
+  } = useConfig();
   const clickable = (_a = props.clickable) !== null && _a !== void 0 ? _a : !!props.onClick;
-  const arrow = props.arrow === undefined ? clickable : props.arrow;
+  const showArrow = (_b = arrow !== null && arrow !== void 0 ? arrow : arrowIcon) !== null && _b !== void 0 ? _b : clickable;
+  const mergedArrowIcon = mergeProp(componentConfig.arrowIcon, arrow !== true ? arrow : null, arrowIcon !== true ? arrowIcon : null);
   const content = React.createElement("div", {
     className: `${classPrefix}-content`
   }, isNodeWithContent(props.prefix) && React.createElement("div", {
@@ -20,9 +30,9 @@ export const ListItem = props => {
     className: `${classPrefix}-description`
   }, props.description)), isNodeWithContent(props.extra) && React.createElement("div", {
     className: `${classPrefix}-content-extra`
-  }, props.extra), isNodeWithContent(arrow) && React.createElement("div", {
+  }, props.extra), showArrow && React.createElement("div", {
     className: `${classPrefix}-content-arrow`
-  }, arrow === true ? React.createElement(RightOutline, null) : arrow));
+  }, mergedArrowIcon || React.createElement(RightOutline, null)));
   return withNativeProps(props, React.createElement(clickable ? 'a' : 'div', {
     className: classNames(`${classPrefix}`, clickable ? ['adm-plain-anchor'] : [], props.disabled && `${classPrefix}-disabled`),
     onClick: props.disabled ? undefined : props.onClick

package/es/components/nav-bar/nav-bar.d.ts

@@ -2,6 +2,10 @@ import type { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type NavBarProps = {
     back?: ReactNode;
+    backIcon?: boolean | ReactNode;
+    /**
+     * @deprecated use `backIcon` instead
+     */
     backArrow?: boolean | ReactNode;
     left?: ReactNode;
     right?: ReactNode;

package/es/components/nav-bar/nav-bar.js

@@ -1,33 +1,38 @@
-import React from 'react';
-import classNames from 'classnames';
 import { LeftOutline } from 'antd-mobile-icons';
+import classNames from 'classnames';
+import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
 const classPrefix = `adm-nav-bar`;
 const defaultProps = {
-  backArrow: true
+  backIcon: true
 };
-export const NavBar = p => {
-  const props = mergeProps(defaultProps, p);
+export const NavBar = props => {
+  const {
+    navBar: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(defaultProps, componentConfig, props);
   const {
     back,
+    backIcon,
     backArrow
-  } = props;
-  return withNativeProps(props, React.createElement("div", {
+  } = mergedProps;
+  return withNativeProps(mergedProps, React.createElement("div", {
     className: classNames(classPrefix)
   }, React.createElement("div", {
     className: `${classPrefix}-left`,
     role: 'button'
   }, back !== null && React.createElement("div", {
     className: `${classPrefix}-back`,
-    onClick: props.onBack
-  }, backArrow && React.createElement("span", {
+    onClick: mergedProps.onBack
+  }, (backIcon || backArrow) && React.createElement("span", {
     className: `${classPrefix}-back-arrow`
-  }, backArrow === true ? React.createElement(LeftOutline, null) : backArrow), React.createElement("span", {
+  }, backIcon === true || backArrow === true ? componentConfig.backIcon || React.createElement(LeftOutline, null) : backIcon || backArrow), React.createElement("span", {
     "aria-hidden": 'true'
-  }, back)), props.left), React.createElement("div", {
+  }, back)), mergedProps.left), React.createElement("div", {
     className: `${classPrefix}-title`
-  }, props.children), React.createElement("div", {
+  }, mergedProps.children), React.createElement("div", {
     className: `${classPrefix}-right`
-  }, props.right)));
+  }, mergedProps.right)));
 };

package/es/components/notice-bar/notice-bar.css

@@ -70,8 +70,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-}
-.adm-notice-bar-close-icon {
   font-size: var(--adm-font-size-10);
 }
 .adm-notice-bar-wrap {

package/es/components/notice-bar/notice-bar.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
 import type { ReactNode } from 'react';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type NoticeBarProps = {
     /** The type of the NoticeBar */
@@ -12,6 +12,8 @@ export declare type NoticeBarProps = {
     content: ReactNode;
     /** Whether it can be closed */
     closeable?: boolean;
+    /** Custom close icon */
+    closeIcon?: ReactNode;
     /** Callback when closed */
     onClose?: () => void;
     /** Event when click */

package/es/components/notice-bar/notice-bar.js

@@ -1,29 +1,36 @@
-import React, { useState, useRef, memo } from 'react';
-import classNames from 'classnames';
-import { CloseOutline, SoundOutline } from 'antd-mobile-icons';
 import { useTimeout } from 'ahooks';
-import { mergeProps } from '../../utils/with-default-props';
+import { CloseOutline, SoundOutline } from 'antd-mobile-icons';
+import classNames from 'classnames';
+import React, { memo, useRef, useState } from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import { useResizeEffect } from '../../utils/use-resize-effect';
 import { useMutationEffect } from '../../utils/use-mutation-effect';
+import { useResizeEffect } from '../../utils/use-resize-effect';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
 const classPrefix = `adm-notice-bar`;
 const defaultProps = {
   color: 'default',
   delay: 2000,
   speed: 50,
-  wrap: false,
-  icon: React.createElement(SoundOutline, null)
+  icon: React.createElement(SoundOutline, null),
+  wrap: false
 };
-export const NoticeBar = memo(p => {
-  const props = mergeProps(defaultProps, p);
+export const NoticeBar = memo(props => {
+  const {
+    noticeBar: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(defaultProps, componentConfig, props);
+  const closeIcon = mergeProp(React.createElement(CloseOutline, {
+    className: `${classPrefix}-close-icon`
+  }), componentConfig.closeIcon, props.closeIcon);
   const containerRef = useRef(null);
   const textRef = useRef(null);
   const [visible, setVisible] = useState(true);
-  const speed = props.speed;
+  const speed = mergedProps.speed;
   const delayLockRef = useRef(true);
   const animatingRef = useRef(false);
   function start() {
-    if (delayLockRef.current || props.wrap) return;
+    if (delayLockRef.current || mergedProps.wrap) return;
     const container = containerRef.current;
     const text = textRef.current;
     if (!container || !text) return;
@@ -49,7 +56,7 @@ export const NoticeBar = memo(p => {
   useTimeout(() => {
     delayLockRef.current = false;
     start();
-  }, props.delay);
+  }, mergedProps.delay);
   useResizeEffect(() => {
     start();
   }, containerRef);
@@ -61,14 +68,14 @@ export const NoticeBar = memo(p => {
     characterData: true
   });
   if (!visible) return null;
-  return withNativeProps(props, React.createElement("div", {
-    className: classNames(classPrefix, `${classPrefix}-${props.color}`, {
-      [`${classPrefix}-wrap`]: props.wrap
+  return withNativeProps(mergedProps, React.createElement("div", {
+    className: classNames(classPrefix, `${classPrefix}-${mergedProps.color}`, {
+      [`${classPrefix}-wrap`]: mergedProps.wrap
     }),
-    onClick: props.onClick
-  }, props.icon && React.createElement("span", {
+    onClick: mergedProps.onClick
+  }, mergedProps.icon && React.createElement("span", {
     className: `${classPrefix}-left`
-  }, props.icon), React.createElement("span", {
+  }, mergedProps.icon), React.createElement("span", {
     ref: containerRef,
     className: `${classPrefix}-content`
   }, React.createElement("span", {
@@ -78,16 +85,14 @@ export const NoticeBar = memo(p => {
     },
     ref: textRef,
     className: `${classPrefix}-content-inner`
-  }, props.content)), (props.closeable || props.extra) && React.createElement("span", {
+  }, mergedProps.content)), (mergedProps.closeable || mergedProps.extra) && React.createElement("span", {
     className: `${classPrefix}-right`
-  }, props.extra, props.closeable && React.createElement("div", {
+  }, mergedProps.extra, mergedProps.closeable && React.createElement("div", {
     className: `${classPrefix}-close`,
     onClick: () => {
       var _a;
       setVisible(false);
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      (_a = mergedProps.onClose) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
     }
-  }, React.createElement(CloseOutline, {
-    className: `${classPrefix}-close-icon`
-  })))));
+  }, closeIcon))));
 });

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

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
-import { PopupProps } from '../popup';
 import { NativeProps } from '../../utils/native-props';
+import { PopupProps } from '../popup';
 export declare type NumberKeyboardProps = {
     visible?: boolean;
     title?: string;