antd-mobile 5.36.0 → 5.37.0

package/2x/es/components/collapse/collapse.js

@@ -1,14 +1,17 @@
-import React, { isValidElement, useRef } from 'react';
-import { withNativeProps } from '../../utils/native-props';
-import List from '../list';
+import { animated, useSpring } from '@react-spring/web';
+import { useMount } from 'ahooks';
 import { DownOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
-import { useSpring, animated } from '@react-spring/web';
-import { usePropsValue } from '../../utils/use-props-value';
-import { useMount } from 'ahooks';
+import React, { isValidElement, useRef } from 'react';
+import { withNativeProps } from '../../utils/native-props';
 import { useShouldRender } from '../../utils/should-render';
-import { useIsomorphicUpdateLayoutEffect } from '../../utils/use-isomorphic-update-layout-effect';
 import { traverseReactNode } from '../../utils/traverse-react-node';
+import { useIsomorphicUpdateLayoutEffect } from '../../utils/use-isomorphic-update-layout-effect';
+import { observe } from '../../utils/use-mutation-effect';
+import { usePropsValue } from '../../utils/use-props-value';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
+import List from '../list';
 const classPrefix = `adm-collapse`;
 export const CollapsePanel = () => {
   return null;
@@ -46,9 +49,25 @@ const CollapsePanelContent = props => {
     const inner = innerRef.current;
     if (!inner) return;
     if (visible) {
-      api.start({
-        height: inner.offsetHeight
-      });
+      let lastMotionId = 0;
+      let cancelObserve = () => {};
+      const handleMotion = () => {
+        lastMotionId += 1;
+        const motionId = lastMotionId;
+        api.start({
+          height: inner.offsetHeight
+        })[0].then(() => {
+          if (motionId === lastMotionId) {
+            cancelObserve();
+          }
+        });
+      };
+      cancelObserve = observe(inner, {
+        childList: true,
+        subtree: true
+      }, handleMotion);
+      handleMotion();
+      return cancelObserve;
     } else {
       api.start({
         height: inner.offsetHeight,
@@ -78,8 +97,12 @@ const CollapsePanelContent = props => {
   }, React.createElement(List.Item, null, shouldRender && props.children)));
 };
 export const Collapse = props => {
+  const {
+    collapse: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(componentConfig, props);
   const panels = [];
-  traverseReactNode(props.children, child => {
+  traverseReactNode(mergedProps.children, child => {
     if (!isValidElement(child)) return;
     const key = child.key;
     if (typeof key !== 'string') return;
@@ -87,11 +110,11 @@ export const Collapse = props => {
   });
   const handlePropsValue = () => {
     var _a;
-    if (!props.accordion) {
+    if (!mergedProps.accordion) {
       return {
-        value: props.activeKey,
-        defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
-        onChange: props.onChange
+        value: mergedProps.activeKey,
+        defaultValue: (_a = mergedProps.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
+        onChange: mergedProps.onChange
       };
     }
     const initValue = {
@@ -99,29 +122,29 @@ export const Collapse = props => {
       defaultValue: [],
       onChange: v => {
         var _a, _b;
-        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, (_b = v[0]) !== null && _b !== void 0 ? _b : null);
+        (_a = mergedProps.onChange) === null || _a === void 0 ? void 0 : _a.call(mergedProps, (_b = v[0]) !== null && _b !== void 0 ? _b : null);
       }
     };
-    if (props.activeKey === undefined) {
+    if (mergedProps.activeKey === undefined) {
       initValue.value = undefined;
-    } else if (props.activeKey !== null) {
-      initValue.value = [props.activeKey];
+    } else if (mergedProps.activeKey !== null) {
+      initValue.value = [mergedProps.activeKey];
     }
-    if (![null, undefined].includes(props.defaultActiveKey)) {
-      initValue.defaultValue = [props.defaultActiveKey];
+    if (![null, undefined].includes(mergedProps.defaultActiveKey)) {
+      initValue.defaultValue = [mergedProps.defaultActiveKey];
     }
     return initValue;
   };
   const [activeKey, setActiveKey] = usePropsValue(handlePropsValue());
   const activeKeyList = activeKey === null ? [] : Array.isArray(activeKey) ? activeKey : [activeKey];
-  return withNativeProps(props, React.createElement("div", {
+  return withNativeProps(mergedProps, React.createElement("div", {
     className: classPrefix
   }, React.createElement(List, null, panels.map(panel => {
     const key = panel.key;
     const active = activeKeyList.includes(key);
     function handleClick(event) {
       var _a, _b;
-      if (props.accordion) {
+      if (mergedProps.accordion) {
         if (active) {
           setActiveKey([]);
         } else {
@@ -136,27 +159,19 @@ export const Collapse = props => {
       }
       (_b = (_a = panel.props).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, event);
     }
-    const renderArrow = () => {
-      let arrow = React.createElement(DownOutline, null);
-      if (props.arrow !== undefined) {
-        arrow = props.arrow;
-      }
-      if (panel.props.arrow !== undefined) {
-        arrow = panel.props.arrow;
-      }
-      return typeof arrow === 'function' ? arrow(active) : React.createElement("div", {
-        className: classNames(`${classPrefix}-arrow`, {
-          [`${classPrefix}-arrow-active`]: active
-        })
-      }, arrow);
-    };
+    const arrow = mergeProp(React.createElement(DownOutline, null), mergedProps.arrow, mergedProps.arrowIcon, panel.props.arrow, panel.props.arrowIcon);
+    const arrowIcon = typeof arrow === 'function' ? arrow(active) : React.createElement("div", {
+      className: classNames(`${classPrefix}-arrow`, {
+        [`${classPrefix}-arrow-active`]: active
+      })
+    }, arrow);
     return React.createElement(React.Fragment, {
       key: key
     }, withNativeProps(panel.props, React.createElement(List.Item, {
       className: `${classPrefix}-panel-header`,
       onClick: handleClick,
       disabled: panel.props.disabled,
-      arrow: renderArrow()
+      arrowIcon: arrowIcon
     }, panel.props.title)), React.createElement(CollapsePanelContent, {
       visible: active,
       forceRender: !!panel.props.forceRender,

package/2x/es/components/config-provider/config-provider.d.ts

@@ -1,14 +1,52 @@
-import type { FC, ReactNode } from 'react';
+import { FC, ReactNode } from 'react';
 import { Locale } from '../../locales/base';
 declare type Config = {
     locale: Locale;
+    checkList?: {
+        activeIcon?: ReactNode;
+    };
+    collapse?: {
+        arrowIcon?: ReactNode | ((active: boolean) => ReactNode);
+    };
+    dropdown?: {
+        arrowIcon?: ReactNode;
+    };
+    form?: {
+        helpIcon?: ReactNode;
+    };
+    input?: {
+        clearIcon?: ReactNode;
+    };
+    list?: {
+        arrowIcon?: ReactNode;
+    };
+    navBar?: {
+        backIcon?: ReactNode;
+    };
+    noticeBar?: {
+        icon?: ReactNode;
+        closeIcon?: ReactNode;
+    };
+    popup?: {
+        closeIcon?: ReactNode;
+    };
+    result?: {
+        successIcon?: ReactNode;
+        errorIcon?: ReactNode;
+        infoIcon?: ReactNode;
+        waitingIcon?: ReactNode;
+        warningIcon?: ReactNode;
+    };
+    searchBar?: {
+        searchIcon?: ReactNode;
+    };
 };
 export declare const defaultConfigRef: {
     current: Config;
 };
 export declare function setDefaultConfig(config: Config): void;
 export declare function getDefaultConfig(): Config;
-export declare type ConfigProviderProps = Config & {
+export declare type ConfigProviderProps = Partial<Config> & {
     children?: ReactNode;
 };
 export declare const ConfigProvider: FC<ConfigProviderProps>;

package/2x/es/components/dropdown/context.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const IconContext: React.Context<React.ReactNode>;

package/2x/es/components/dropdown/context.js

@@ -0,0 +1,2 @@
+import React from 'react';
+export const IconContext = React.createContext(null);

package/2x/es/components/dropdown/dropdown.d.ts

@@ -1,13 +1,17 @@
-import React from 'react';
 import type { ReactNode } from 'react';
-import { PopupProps } from '../popup';
+import React from 'react';
 import { NativeProps } from '../../utils/native-props';
+import { PopupProps } from '../popup';
 export declare type DropdownProps = {
     activeKey?: string | null;
     defaultActiveKey?: string | null;
     closeOnMaskClick?: boolean;
     closeOnClickAway?: boolean;
     onChange?: (key: string | null) => void;
+    arrowIcon?: ReactNode;
+    /**
+     * @deprecated use `arrowIcon` instead
+     */
     arrow?: ReactNode;
     getContainer?: PopupProps['getContainer'];
 } & NativeProps;
@@ -20,6 +24,10 @@ declare const Dropdown: React.ForwardRefExoticComponent<{
     closeOnMaskClick?: boolean | undefined;
     closeOnClickAway?: boolean | undefined;
     onChange?: ((key: string | null) => void) | undefined;
+    arrowIcon?: ReactNode;
+    /**
+     * @deprecated use `arrowIcon` instead
+     */
     arrow?: ReactNode;
     getContainer?: PopupProps['getContainer'];
 } & {
@@ -27,6 +35,6 @@ declare const Dropdown: React.ForwardRefExoticComponent<{
     style?: (React.CSSProperties & Partial<Record<never, string>>) | undefined;
     tabIndex?: number | undefined;
 } & React.AriaAttributes & {
-    children?: React.ReactNode;
+    children?: ReactNode;
 } & React.RefAttributes<DropdownRef>>;
 export default Dropdown;

package/2x/es/components/dropdown/dropdown.js

@@ -1,12 +1,14 @@
 import { useClickAway } from 'ahooks';
 import classNames from 'classnames';
-import React, { cloneElement, useEffect, useRef, useState, forwardRef, useImperativeHandle, isValidElement } from 'react';
-import Popup from '../popup';
-import { ItemChildrenWrap } from './item';
+import React, { cloneElement, forwardRef, isValidElement, 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 { mergeProp, mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
+import Popup from '../popup';
 import { defaultPopupBaseProps } from '../popup/popup-base-props';
+import { IconContext } from './context';
+import { ItemChildrenWrap } from './item';
 const classPrefix = `adm-dropdown`;
 const defaultProps = {
   defaultActiveKey: null,
@@ -14,18 +16,22 @@ const defaultProps = {
   closeOnClickAway: false,
   getContainer: defaultPopupBaseProps['getContainer']
 };
-const Dropdown = forwardRef((p, ref) => {
-  const props = mergeProps(defaultProps, p);
+const Dropdown = forwardRef((props, ref) => {
+  const {
+    dropdown: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(defaultProps, componentConfig, props);
+  const arrowIcon = mergeProp(componentConfig.arrowIcon, props.arrow, props.arrowIcon);
   const [value, setValue] = usePropsValue({
-    value: props.activeKey,
-    defaultValue: props.defaultActiveKey,
-    onChange: props.onChange
+    value: mergedProps.activeKey,
+    defaultValue: mergedProps.defaultActiveKey,
+    onChange: mergedProps.onChange
   });
   const navRef = useRef(null);
   const contentRef = useRef(null);
   // 点击外部区域，关闭
   useClickAway(() => {
-    if (!props.closeOnClickAway) return;
+    if (!mergedProps.closeOnClickAway) return;
     setValue(null);
   }, [navRef, contentRef]);
   // 计算 navs 的 top 值
@@ -48,7 +54,7 @@ const Dropdown = forwardRef((p, ref) => {
   };
   let popupForceRender = false;
   const items = [];
-  const navs = React.Children.map(props.children, child => {
+  const navs = React.Children.map(mergedProps.children, child => {
     if (isValidElement(child)) {
       const childProps = Object.assign(Object.assign({}, child.props), {
         onClick: event => {
@@ -56,8 +62,7 @@ const Dropdown = forwardRef((p, ref) => {
           changeActive(child.key);
           (_b = (_a = child.props).onClick) === null || _b === void 0 ? void 0 : _b.call(_a, event);
         },
-        active: child.key === value,
-        arrow: child.props.arrow === undefined ? props.arrow : child.props.arrow
+        active: child.key === value
       });
       items.push(child);
       if (child.props.forceRender) popupForceRender = true;
@@ -71,18 +76,20 @@ const Dropdown = forwardRef((p, ref) => {
       setValue(null);
     }
   }), [setValue]);
-  return withNativeProps(props, React.createElement("div", {
+  return withNativeProps(mergedProps, React.createElement("div", {
     className: classNames(classPrefix, {
       [`${classPrefix}-open`]: !!value
     }),
     ref: containerRef
+  }, React.createElement(IconContext.Provider, {
+    value: arrowIcon
   }, React.createElement("div", {
     className: `${classPrefix}-nav`,
     ref: navRef
-  }, navs), React.createElement(Popup, {
+  }, navs)), React.createElement(Popup, {
     visible: !!value,
     position: 'top',
-    getContainer: props.getContainer,
+    getContainer: mergedProps.getContainer,
     className: `${classPrefix}-popup`,
     maskClassName: `${classPrefix}-popup-mask`,
     bodyClassName: `${classPrefix}-popup-body`,
@@ -90,7 +97,7 @@ const Dropdown = forwardRef((p, ref) => {
       top
     },
     forceRender: popupForceRender,
-    onMaskClick: props.closeOnMaskClick ? () => {
+    onMaskClick: mergedProps.closeOnMaskClick ? () => {
       changeActive(null);
     } : undefined
   }, React.createElement("div", {

package/2x/es/components/dropdown/index.d.ts

@@ -7,6 +7,7 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     closeOnMaskClick?: boolean | undefined;
     closeOnClickAway?: boolean | undefined;
     onChange?: ((key: string | null) => void) | undefined;
+    arrowIcon?: import("react").ReactNode;
     arrow?: import("react").ReactNode;
     getContainer?: import("../../utils/render-to-container").GetContainer | undefined;
 } & {

package/2x/es/components/dropdown/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 DropdownItemProps = {
     key: string;
@@ -9,6 +9,10 @@ export declare type DropdownItemProps = {
     forceRender?: boolean;
     destroyOnClose?: boolean;
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    arrowIcon?: ReactNode;
+    /**
+     * @deprecated use `arrowIcon` instead
+     */
     arrow?: ReactNode;
     children?: ReactNode;
 } & NativeProps;

package/2x/es/components/dropdown/item.js

@@ -1,27 +1,41 @@
+import { DownFill } from 'antd-mobile-icons';
 import classNames from 'classnames';
 import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { useShouldRender } from '../../utils/should-render';
-import { DownFill } from 'antd-mobile-icons';
+import { mergeProp, mergeProps } from '../../utils/with-default-props';
+import { useConfig } from '../config-provider';
+import { IconContext } from './context';
 const classPrefix = `adm-dropdown-item`;
 const Item = props => {
-  var _a;
+  const {
+    dropdown: componentConfig = {}
+  } = useConfig();
+  const mergedProps = mergeProps(componentConfig, props);
+  const {
+    active,
+    highlight,
+    onClick,
+    title
+  } = mergedProps;
   const cls = classNames(classPrefix, {
-    [`${classPrefix}-active`]: props.active,
-    [`${classPrefix}-highlight`]: (_a = props.highlight) !== null && _a !== void 0 ? _a : props.active
+    [`${classPrefix}-active`]: active,
+    [`${classPrefix}-highlight`]: highlight !== null && highlight !== void 0 ? highlight : active
   });
+  const contextArrowIcon = React.useContext(IconContext);
+  const mergedArrowIcon = mergeProp(React.createElement(DownFill, null), contextArrowIcon, mergedProps.arrow, mergedProps.arrowIcon);
   return withNativeProps(props, React.createElement("div", {
     className: cls,
-    onClick: props.onClick
+    onClick: onClick
   }, React.createElement("div", {
     className: `${classPrefix}-title`
   }, React.createElement("span", {
     className: `${classPrefix}-title-text`
-  }, props.title), React.createElement("span", {
+  }, title), React.createElement("span", {
     className: classNames(`${classPrefix}-title-arrow`, {
-      [`${classPrefix}-title-arrow-active`]: props.active
+      [`${classPrefix}-title-arrow-active`]: active
     })
-  }, props.arrow === undefined ? React.createElement(DownFill, null) : props.arrow))));
+  }, mergedArrowIcon))));
 };
 export default Item;
 export const ItemChildrenWrap = props => {

package/2x/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/2x/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/2x/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/2x/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/2x/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;