antd-mobile 5.31.1 → 5.32.1

package/es/components/center-popup/center-popup.js

@@ -12,6 +12,7 @@ import { ShouldRender } from '../../utils/should-render';
 import { useLockScroll } from '../../utils/use-lock-scroll';
 import { CloseOutline } from 'antd-mobile-icons';
 import { defaultPopupBaseProps } from '../popup/popup-base-props';
+const classPrefix = 'adm-center-popup';
 const defaultProps = Object.assign(Object.assign({}, defaultPopupBaseProps), {
   getContainer: null
 });
@@ -48,11 +49,11 @@ export const CenterPopup = p => {
   useLockScroll(ref, props.disableBodyScroll && active);
   const maskVisible = useInnerVisible(active && props.visible);
   const body = React.createElement("div", {
-    className: classNames('adm-center-popup-body', props.bodyClassName),
+    className: classNames(`${classPrefix}-body`, props.bodyClassName),
     style: props.bodyStyle
   }, props.children);
   const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
-    className: 'adm-center-popup',
+    className: classPrefix,
     style: {
       display: active ? undefined : 'none',
       pointerEvents: active ? undefined : 'none'
@@ -69,18 +70,18 @@ export const CenterPopup = p => {
       }
     },
     style: props.maskStyle,
-    className: classNames('adm-center-popup-mask', props.maskClassName),
+    className: classNames(`${classPrefix}-mask`, props.maskClassName),
     disableBodyScroll: false,
     stopPropagation: props.stopPropagation
   }), React.createElement("div", {
-    className: 'adm-center-popup-wrap',
+    className: `${classPrefix}-wrap`,
     role: props.role,
     "aria-label": props['aria-label']
   }, React.createElement(animated.div, {
     style: style,
     ref: ref
   }, props.showCloseButton && React.createElement("a", {
-    className: classNames('adm-center-popup-close', 'adm-plain-anchor'),
+    className: classNames(`${classPrefix}-close`, 'adm-plain-anchor'),
     onClick: () => {
       var _a;
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);

package/es/components/checkbox/checkbox.d.ts

@@ -12,6 +12,7 @@ export declare type CheckboxProps = {
     id?: string;
     icon?: (checked: boolean, indeterminate: boolean) => React.ReactNode;
     children?: React.ReactNode;
+    onClick?: (event: React.MouseEvent<HTMLLabelElement, MouseEvent>) => void;
 } & NativeProps<'--icon-size' | '--font-size' | '--gap'>;
 export declare type CheckboxRef = {
     check: () => void;
@@ -29,6 +30,7 @@ export declare const Checkbox: React.ForwardRefExoticComponent<{
     id?: string | undefined;
     icon?: ((checked: boolean, indeterminate: boolean) => React.ReactNode) | undefined;
     children?: React.ReactNode;
+    onClick?: ((event: React.MouseEvent<HTMLLabelElement, MouseEvent>) => void) | undefined;
 } & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--font-size" | "--icon-size" | "--gap", string>>) | undefined;

package/es/components/checkbox/checkbox.js

@@ -69,6 +69,7 @@ export const Checkbox = forwardRef((p, ref) => {
     }, props.indeterminate ? React.createElement(IndeterminateIcon, null) : checked && React.createElement(CheckIcon, null));
   };
   return withNativeProps(props, React.createElement("label", {
+    onClick: props.onClick,
     className: classNames(classPrefix, {
       [`${classPrefix}-checked`]: checked && !props.indeterminate,
       [`${classPrefix}-indeterminate`]: props.indeterminate,

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

@@ -12,6 +12,7 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     id?: string | undefined;
     icon?: ((checked: boolean, indeterminate: boolean) => import("react").ReactNode) | undefined;
     children?: import("react").ReactNode;
+    onClick?: ((event: import("react").MouseEvent<HTMLLabelElement, MouseEvent>) => void) | undefined;
 } & {
     className?: string | undefined;
     style?: (import("react").CSSProperties & Partial<Record<"--font-size" | "--icon-size" | "--gap", string>>) | undefined;

package/es/components/collapse/collapse.js

@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React, { isValidElement, useRef } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import List from '../list';
 import { DownOutline } from 'antd-mobile-icons';
@@ -78,26 +78,41 @@ const CollapsePanelContent = props => {
   }, React.createElement(List.Item, null, shouldRender && props.children)));
 };
 export const Collapse = props => {
-  var _a;
   const panels = [];
   traverseReactNode(props.children, child => {
-    if (!React.isValidElement(child)) return;
+    if (!isValidElement(child)) return;
     const key = child.key;
     if (typeof key !== 'string') return;
     panels.push(child);
   });
-  const [activeKey, setActiveKey] = usePropsValue(props.accordion ? {
-    value: props.activeKey === undefined ? undefined : props.activeKey === null ? [] : [props.activeKey],
-    defaultValue: props.defaultActiveKey === undefined || props.defaultActiveKey === null ? [] : [props.defaultActiveKey],
-    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);
+  const handlePropsValue = () => {
+    var _a;
+    if (!props.accordion) {
+      return {
+        value: props.activeKey,
+        defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
+        onChange: props.onChange
+      };
     }
-  } : {
-    value: props.activeKey,
-    defaultValue: (_a = props.defaultActiveKey) !== null && _a !== void 0 ? _a : [],
-    onChange: props.onChange
-  });
+    const initValue = {
+      value: [],
+      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);
+      }
+    };
+    if (props.activeKey === undefined) {
+      initValue.value = undefined;
+    } else if (props.activeKey !== null) {
+      initValue.value = [props.activeKey];
+    }
+    if (![null, undefined].includes(props.defaultActiveKey)) {
+      initValue.defaultValue = [props.defaultActiveKey];
+    }
+    return initValue;
+  };
+  const [activeKey, setActiveKey] = usePropsValue(handlePropsValue());
   const activeKeyList = activeKey === null ? [] : Array.isArray(activeKey) ? activeKey : [activeKey];
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix

package/es/components/date-picker/date-picker-date-utils.js

@@ -66,67 +66,55 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
     const lower = minYear;
     const upper = maxYear;
     const years = generateColumn(lower, upper, 'year');
-    ret.push(years.map(v => {
-      return {
-        label: renderLabel('year', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(years.map(v => ({
+      label: renderLabel('year', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord.month) {
     const lower = isInMinYear ? minMonth : 1;
     const upper = isInMaxYear ? maxMonth : 12;
     const months = generateColumn(lower, upper, 'month');
-    ret.push(months.map(v => {
-      return {
-        label: renderLabel('month', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(months.map(v => ({
+      label: renderLabel('month', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord.day) {
     const lower = isInMinMonth ? minDay : 1;
     const upper = isInMaxMonth ? maxDay : firstDayInSelectedMonth.daysInMonth();
     const days = generateColumn(lower, upper, 'day');
-    ret.push(days.map(v => {
-      return {
-        label: renderLabel('day', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(days.map(v => ({
+      label: renderLabel('day', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord.hour) {
     const lower = isInMinDay ? minHour : 0;
     const upper = isInMaxDay ? maxHour : 23;
     const hours = generateColumn(lower, upper, 'hour');
-    ret.push(hours.map(v => {
-      return {
-        label: renderLabel('hour', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(hours.map(v => ({
+      label: renderLabel('hour', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord.minute) {
     const lower = isInMinHour ? minMinute : 0;
     const upper = isInMaxHour ? maxMinute : 59;
     const minutes = generateColumn(lower, upper, 'minute');
-    ret.push(minutes.map(v => {
-      return {
-        label: renderLabel('minute', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(minutes.map(v => ({
+      label: renderLabel('minute', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord.second) {
     const lower = isInMinMinute ? minSecond : 0;
     const upper = isInMaxMinute ? maxSecond : 59;
     const seconds = generateColumn(lower, upper, 'second');
-    ret.push(seconds.map(v => {
-      return {
-        label: renderLabel('second', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(seconds.map(v => ({
+      label: renderLabel('second', v),
+      value: v.toString()
+    })));
   }
   // Till Now
   if (tillNow) {

package/es/components/date-picker/date-picker-week-utils.js

@@ -49,34 +49,28 @@ export function generateDatePickerColumns(selected, min, max, precision, renderL
     const lower = minYear;
     const upper = maxYear;
     const years = generateColumn(lower, upper, 'year');
-    ret.push(years.map(v => {
-      return {
-        label: renderLabel('year', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(years.map(v => ({
+      label: renderLabel('year', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord.week) {
     const lower = isInMinYear ? minWeek : 1;
     const upper = isInMaxYear ? maxWeek : selectedYearWeeks;
     const weeks = generateColumn(lower, upper, 'week');
-    ret.push(weeks.map(v => {
-      return {
-        label: renderLabel('week', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(weeks.map(v => ({
+      label: renderLabel('week', v),
+      value: v.toString()
+    })));
   }
   if (rank >= precisionRankRecord['week-day']) {
     const lower = isInMinWeek ? minWeekday : 1;
     const upper = isInMaxWeek ? maxWeekday : 7;
     const weeks = generateColumn(lower, upper, 'week-day');
-    ret.push(weeks.map(v => {
-      return {
-        label: renderLabel('week-day', v),
-        value: v.toString()
-      };
-    }));
+    ret.push(weeks.map(v => ({
+      label: renderLabel('week-day', v),
+      value: v.toString()
+    })));
   }
   return ret;
 }

package/es/components/date-picker-view/date-picker-view.d.ts

@@ -2,15 +2,17 @@ import { FC, ReactNode } from 'react';
 import type { PickerViewProps } from '../picker-view';
 import { NativeProps } from '../../utils/native-props';
 import type { Precision, DatePickerFilter } from '../date-picker/date-picker-utils';
+import type { PickerDate } from '../date-picker/util';
 export declare type RenderLabel = (type: Precision | 'now', data: number) => ReactNode;
 export declare type DatePickerViewProps = Pick<PickerViewProps, 'style' | 'mouseWheel' | 'loading' | 'loadingContent'> & {
-    value?: Date;
-    defaultValue?: Date;
-    onChange?: (value: Date) => void;
-    min?: Date;
-    max?: Date;
+    value?: PickerDate;
+    defaultValue?: PickerDate;
+    onChange?: (value: PickerDate) => void;
+    min?: PickerDate;
+    max?: PickerDate;
     precision?: Precision;
     renderLabel?: RenderLabel;
     filter?: DatePickerFilter;
+    tillNow?: boolean;
 } & NativeProps;
 export declare const DatePickerView: FC<DatePickerViewProps>;

package/es/components/date-picker-view/date-picker-view.js

@@ -5,6 +5,7 @@ import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { generateDatePickerColumns, convertDateToStringArray, convertStringArrayToDate } from '../date-picker/date-picker-utils';
 import useRenderLabel from './useRenderLabel';
+import { TILL_NOW } from '../date-picker/util';
 const thisYear = new Date().getFullYear();
 const defaultProps = {
   min: new Date(new Date().setFullYear(thisYear - 10)),
@@ -22,7 +23,12 @@ export const DatePickerView = p => {
     defaultValue: (_a = props.defaultValue) !== null && _a !== void 0 ? _a : null
   });
   const mergedRenderLabel = useRenderLabel(renderLabel);
-  const pickerValue = useMemo(() => convertDateToStringArray(value, props.precision), [value, props.precision]);
+  const pickerValue = useMemo(() => {
+    if (value === null || value === void 0 ? void 0 : value.tillNow) {
+      return [TILL_NOW, null, null];
+    }
+    return convertDateToStringArray(value, props.precision);
+  }, [value, props.precision]);
   const onChange = useCallback(val => {
     var _a;
     const date = convertStringArrayToDate(val, props.precision);
@@ -32,7 +38,7 @@ export const DatePickerView = p => {
     }
   }, [props.onChange, props.precision]);
   return withNativeProps(props, React.createElement(PickerView, {
-    columns: selected => generateDatePickerColumns(selected, props.min, props.max, props.precision, mergedRenderLabel, props.filter),
+    columns: selected => generateDatePickerColumns(selected, props.min, props.max, props.precision, mergedRenderLabel, props.filter, props.tillNow),
     loading: props.loading,
     loadingContent: props.loadingContent,
     value: pickerValue,

package/es/components/dropdown/dropdown.js

@@ -1,6 +1,6 @@
 import { useClickAway } from 'ahooks';
 import classNames from 'classnames';
-import React, { cloneElement, useEffect, useRef, useState, forwardRef, useImperativeHandle } from 'react';
+import React, { cloneElement, useEffect, useRef, useState, forwardRef, useImperativeHandle, isValidElement } from 'react';
 import Popup from '../popup';
 import { ItemChildrenWrap } from './item';
 import { withNativeProps } from '../../utils/native-props';
@@ -49,7 +49,7 @@ const Dropdown = forwardRef((p, ref) => {
   let popupForceRender = false;
   const items = [];
   const navs = React.Children.map(props.children, child => {
-    if (React.isValidElement(child)) {
+    if (isValidElement(child)) {
       const childProps = Object.assign(Object.assign({}, child.props), {
         onClick: () => {
           changeActive(child.key);

package/es/components/ellipsis/ellipsis.js

@@ -118,18 +118,18 @@ export const Ellipsis = p => {
   useIsomorphicLayoutEffect(() => {
     calcEllipsised();
   }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
-  const expandActionElement = exceeded && props.expandText ? withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
+  const expandActionElement = !!props.expandText && withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
     ref: expandElRef,
     onClick: () => {
       setExpanded(true);
     }
-  }, props.expandText)) : null;
-  const collapseActionElement = exceeded && props.collapseText ? withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
+  }, props.expandText));
+  const collapseActionElement = !!props.collapseText && withStopPropagation(props.stopPropagationForActionButtons, React.createElement("a", {
     ref: collapseElRef,
     onClick: () => {
       setExpanded(false);
     }
-  }, props.collapseText)) : null;
+  }, props.collapseText));
   const renderContent = () => {
     if (!exceeded) return props.content;
     if (expanded) return React.createElement(React.Fragment, null, props.content, collapseActionElement);

package/es/components/error-block/create-error-block.js

@@ -15,7 +15,7 @@ export function createErrorBlock(imageRecord) {
       locale
     } = useConfig();
     const contentPack = locale.ErrorBlock[props.status];
-    const des = 'description' in props ? props.description : contentPack.description;
+    const desc = 'description' in props ? props.description : contentPack.description;
     const title = 'title' in props ? props.title : contentPack.title;
     const image = (_a = props.image) !== null && _a !== void 0 ? _a : imageRecord[props.status];
     const imageNode = typeof image === 'string' ? React.createElement("img", {
@@ -30,11 +30,11 @@ export function createErrorBlock(imageRecord) {
       className: `${classPrefix}-image`
     }, imageNode), React.createElement("div", {
       className: `${classPrefix}-description`
-    }, title && React.createElement("div", {
+    }, ![undefined, null].includes(title) && React.createElement("div", {
       className: `${classPrefix}-description-title`
-    }, title), des && React.createElement("div", {
+    }, title), ![undefined, null].includes(desc) && React.createElement("div", {
       className: `${classPrefix}-description-subtitle`
-    }, des)), props.children && React.createElement("div", {
+    }, desc)), props.children && React.createElement("div", {
       className: `${classPrefix}-content`
     }, props.children)));
   };

package/es/components/error-block/error-block.css

@@ -18,7 +18,7 @@
 }
 .adm-error-block-description {
   font-size: var(--adm-font-size-4);
-  color: #999;
+  color: var(--adm-color-weak);
   line-height: 1.4;
   margin-top: 12px;
 }

package/es/components/floating-panel/floating-panel.js

@@ -7,6 +7,7 @@ import { nearest } from '../../utils/nearest';
 import { mergeProps } from '../../utils/with-default-props';
 import { useLockScroll } from '../../utils/use-lock-scroll';
 import { useMemoizedFn } from 'ahooks';
+const classPrefix = 'adm-floating-panel';
 const defaultProps = {
   handleDraggingOfContent: true
 };
@@ -65,7 +66,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
     const {
       event
     } = state;
-    if (event.cancelable) {
+    if (event.cancelable && supportsPassive) {
       event.preventDefault();
     }
     event.stopPropagation();
@@ -89,7 +90,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
     target: elementRef,
     eventOptions: supportsPassive ? {
       passive: false
-    } : false
+    } : undefined
   });
   useImperativeHandle(ref, () => ({
     setHeight: (height, options) => {
@@ -102,23 +103,23 @@ export const FloatingPanel = forwardRef((p, ref) => {
   useLockScroll(elementRef, true);
   return withNativeProps(props, React.createElement(animated.div, {
     ref: elementRef,
-    className: 'adm-floating-panel',
+    className: classPrefix,
     style: {
       height: Math.round(maxHeight),
       translateY: y.to(y => `calc(100% + (${Math.round(y)}px))`)
     }
   }, React.createElement("div", {
-    className: 'adm-floating-panel-mask',
+    className: `${classPrefix}-mask`,
     style: {
       display: pulling ? 'block' : 'none'
     }
   }), React.createElement("div", {
-    className: 'adm-floating-panel-header',
+    className: `${classPrefix}-header`,
     ref: headerRef
   }, React.createElement("div", {
-    className: 'adm-floating-panel-bar'
+    className: `${classPrefix}-bar`
   })), React.createElement("div", {
-    className: 'adm-floating-panel-content',
+    className: `${classPrefix}-content`,
     ref: contentRef
   }, props.children)));
 });

package/es/components/footer/footer.js

@@ -35,29 +35,25 @@ export const Footer = p => {
     className: classNames(classPrefix)
   }, label && React.createElement("div", {
     className: `${classPrefix}-label`
-  }, React.createElement(Divider, null, label)), links && links.length > 0 && React.createElement("div", {
+  }, React.createElement(Divider, null, label)), !!(links === null || links === void 0 ? void 0 : links.length) && React.createElement("div", {
     className: `${classPrefix}-links`
-  }, links.map((link, index) => {
-    return React.createElement(React.Fragment, {
-      key: index
-    }, React.createElement("a", {
-      href: link.href,
-      rel: 'noopener noreferrer',
-      onClick: event => clickLinkItem(link, index, event)
-    }, link.text), index !== links.length - 1 && React.createElement(Divider, {
-      direction: 'vertical'
-    }));
-  })), content && React.createElement("div", {
+  }, links.map((link, index) => React.createElement(React.Fragment, {
+    key: index
+  }, React.createElement("a", {
+    href: link.href,
+    rel: 'noopener noreferrer',
+    onClick: event => clickLinkItem(link, index, event)
+  }, link.text), index !== links.length - 1 && React.createElement(Divider, {
+    direction: 'vertical'
+  })))), content && React.createElement("div", {
     className: `${classPrefix}-content`
   }, content), chips && chips.length > 0 && React.createElement("div", {
     className: `${classPrefix}-chips`
-  }, chips.map((chip, index) => {
-    return React.createElement("div", {
-      key: index,
-      onClick: () => clickChipItem(chip, index),
-      className: classNames(`${classPrefix}-chip`, {
-        [`${classPrefix}-chip-link`]: chip.type === 'link'
-      })
-    }, chip.text);
-  }))));
+  }, chips.map((chip, index) => React.createElement("div", {
+    key: index,
+    onClick: () => clickChipItem(chip, index),
+    className: classNames(`${classPrefix}-chip`, {
+      [`${classPrefix}-chip-link`]: chip.type === 'link'
+    })
+  }, chip.text)))));
 };

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

@@ -2,8 +2,8 @@ import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { FormInstance } from 'rc-field-form';
 import type { FieldProps } from 'rc-field-form/lib/Field';
-import { ListItemProps } from '../list';
 import type { FormLayout } from './index';
+import { ListItemProps } from '../list';
 declare type RenderChildren<Values = any> = (form: FormInstance<Values>) => React.ReactNode;
 declare type ChildrenType<Values = any> = RenderChildren<Values> | React.ReactNode;
 declare type RcFieldProps = Omit<FieldProps, 'children'>;

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

@@ -20,7 +20,6 @@ const MemoInput = React.memo(({
 const FormItemLayout = props => {
   var _a;
   const {
-    className,
     style,
     extra,
     label,
@@ -62,7 +61,7 @@ const FormItemLayout = props => {
         return null;
     }
   })();
-  const labelElement = label ? React.createElement("label", {
+  const labelElement = !!label && React.createElement("label", {
     className: `${classPrefix}-label`,
     htmlFor: htmlFor
   }, label, requiredMark, help && React.createElement(Popover, {
@@ -74,21 +73,21 @@ const FormItemLayout = props => {
     onClick: e => {
       e.preventDefault();
     }
-  }, React.createElement(QuestionCircleOutline, null)))) : 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", {
+  }, 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`
   }, error)), props.warnings.map((warning, index) => React.createElement("div", {
     key: `warning-${index}`,
     className: `${classPrefix}-feedback-warning`
-  }, warning)))) : null;
+  }, warning))));
   return withNativeProps(props, React.createElement(List.Item, {
     style: style,
     title: layout === 'vertical' && labelElement,
     prefix: layout === 'horizontal' && labelElement,
     extra: extra,
     description: description,
-    className: classNames(classPrefix, className, `${classPrefix}-${layout}`, {
+    className: classNames(classPrefix, `${classPrefix}-${layout}`, {
       [`${classPrefix}-hidden`]: hidden,
       [`${classPrefix}-has-error`]: props.errors.length
     }),
@@ -105,7 +104,6 @@ const FormItemLayout = props => {
 export const FormItem = props => {
   const {
       // 样式相关
-      className,
       style,
       // FormItem 相关
       label,
@@ -132,7 +130,7 @@ export const FormItem = props => {
       clickable,
       arrow
     } = props,
-    fieldProps = __rest(props, ["className", "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", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "childElementPosition", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "clickable", "arrow"]);
   const {
     name: formName
   } = useContext(FormContext);
@@ -180,7 +178,6 @@ export const FormItem = props => {
       return subWarnings;
     }, curWarnings);
     return withNativeProps(props, React.createElement(FormItemLayout, {
-      className: className,
       style: style,
       label: label,
       extra: extra,

package/es/components/form/form.css

@@ -23,5 +23,5 @@
 }
 .adm-form-list-operation {
   text-align: center;
-  color: #1677ff;
+  color: var(--adm-color-primary);
 }

package/es/components/form/index.css

@@ -23,7 +23,7 @@
 }
 .adm-form-list-operation {
   text-align: center;
-  color: #1677ff;
+  color: var(--adm-color-primary);
 }
 .adm-form-item + .adm-form-item {
   border-top: none;

package/es/components/image-uploader/image-uploader.css

@@ -76,7 +76,7 @@
   display: block;
 }
 .adm-image-uploader-upload-button-wrap .adm-image-uploader-upload-button-icon {
-  color: #999999;
+  color: var(--adm-color-weak);
   font-size: 32px;
 }
 .adm-image-uploader-upload-button-wrap .adm-image-uploader-input {

package/es/components/image-uploader/image-uploader.js

@@ -95,9 +95,7 @@ export const ImageUploader = p => {
       let files = [].slice.call(rawFiles);
       e.target.value = ''; // HACK: fix the same file doesn't trigger onChange
       if (props.beforeUpload) {
-        const postFiles = files.map(file => {
-          return processFile(file, files);
-        });
+        const postFiles = files.map(file => processFile(file, files));
         yield Promise.all(postFiles).then(filesList => {
           files = filesList.filter(Boolean);
         });