antd-mobile 5.29.1 → 5.31.0

package/2x/cjs/components/pull-to-refresh/pull-to-refresh.js

@@ -49,6 +49,7 @@ const PullToRefresh = p => {
     config: {
       tension: 300,
       friction: 30,
+      round: true,
       clamp: true
     }
   }));
@@ -108,7 +109,8 @@ const PullToRefresh = p => {
       return;
     }
     const [, y] = state.movement;
-    if (state.first && y > 0) {
+    const parsedY = Math.ceil(y);
+    if (state.first && parsedY > 0) {
       const target = state.event.target;
       if (!target || !(target instanceof Element)) return;
       let scrollParent = (0, _getScrollParent.getScrollParent)(target);
@@ -133,7 +135,7 @@ const PullToRefresh = p => {
       event.preventDefault();
     }
     event.stopPropagation();
-    const height = Math.max((0, _rubberband.rubberbandIfOutOfBounds)(y, 0, 0, headHeight * 5, 0.5), 0);
+    const height = Math.max((0, _rubberband.rubberbandIfOutOfBounds)(parsedY, 0, 0, headHeight * 5, 0.5), 0);
     api.start({
       height
     });

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

@@ -2,7 +2,7 @@ import React, { ReactNode } from 'react';
 import { InputRef, InputProps } from '../input';
 import { NativeProps } from '../../utils/native-props';
 export declare type SearchBarRef = InputRef;
-export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'onClear'> & {
+export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'onClear' | 'onCompositionStart' | 'onCompositionEnd'> & {
     value?: string;
     defaultValue?: string;
     maxLength?: number;
@@ -17,7 +17,7 @@ export declare type SearchBarProps = Pick<InputProps, 'onFocus' | 'onBlur' | 'on
     onChange?: (val: string) => void;
     onCancel?: () => void;
 } & NativeProps<'--background' | '--border-radius' | '--placeholder-color' | '--height' | '--padding-left'>;
-export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps, "onFocus" | "onBlur" | "onClear"> & {
+export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps, "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onClear"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     maxLength?: number | undefined;

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

@@ -119,11 +119,15 @@ const SearchBar = (0, _react.forwardRef)((p, ref) => {
       }
     },
     "aria-label": locale.SearchBar.name,
-    onCompositionStart: () => {
+    onCompositionStart: e => {
+      var _a;
       composingRef.current = true;
+      (_a = props.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
-    onCompositionEnd: () => {
+    onCompositionEnd: e => {
+      var _a;
       composingRef.current = false;
+      (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
     }
   })), renderCancelButton()));
 });

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

@@ -87,13 +87,14 @@ const Slider = p => {
   const pointList = (0, _react.useMemo)(() => {
     if (marks) {
       return Object.keys(marks).map(parseFloat).sort((a, b) => a - b);
-    } else {
+    } else if (ticks) {
       const points = [];
       for (let i = (0, _miniDecimal.default)(min); i.lessEquals((0, _miniDecimal.default)(max)); i = i.add(step)) {
         points.push(i.toNumber());
       }
       return points;
     }
+    return [];
   }, [marks, ticks, step, min, max]);
   function getValueByPosition(position) {
     const newPosition = position < min ? min : position > max ? max : position;
@@ -102,9 +103,10 @@ const Slider = p => {
     if (pointList.length) {
       value = (0, _nearest.nearest)(pointList, newPosition);
     } else {
-      const lengthPerStep = 100 / ((max - min) / step);
-      const steps = Math.round(newPosition / lengthPerStep);
-      value = steps * lengthPerStep * (max - min) * 0.01 + min;
+      // 使用 MiniDecimal 避免精度问题
+      const cell = Math.round((newPosition - min) / step);
+      const nextVal = (0, _miniDecimal.default)(cell).multi(step);
+      value = (0, _miniDecimal.default)(min).add(nextVal.toString()).toNumber();
     }
     return value;
   }

package/2x/cjs/components/steps/steps.css

@@ -1,6 +1,8 @@
 .adm-step {
   --line-to-next-color: #e5e5e5;
   --icon-color: #e5e5e5;
+  position: relative;
+  z-index: 0;
 }
 
 .adm-step .adm-step-indicator {

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

@@ -44,6 +44,7 @@ let currentUid;
 const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const [uid] = (0, _react.useState)({});
+  const timeoutRef = (0, _react.useRef)(null);
   const isVertical = props.direction === 'vertical';
   const slideRatio = props.slideSize / 100;
   const offsetRatio = props.trackOffset / 100;
@@ -82,11 +83,7 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       const trackPixels = isVertical ? track.offsetHeight : track.offsetWidth;
       return trackPixels * props.slideSize / 100;
     }
-    const [current, setCurrent] = (0, _react.useState)(props.defaultIndex);
-    (0, _ahooks.useUpdateEffect)(() => {
-      var _a;
-      (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, current);
-    }, [current]);
+    const [current, setCurrent, getCurrent] = (0, _ahooks.useGetState)(props.defaultIndex);
     const [dragging, setDragging, draggingRef] = (0, _useRefState.useRefState)(false);
     function boundIndex(current) {
       let min = 0;
@@ -181,9 +178,13 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       }
     });
     function swipeTo(index, immediate = false) {
+      var _a;
       const roundedIndex = Math.round(index);
       const targetIndex = loop ? modulus(roundedIndex, count) : (0, _bound.bound)(roundedIndex, 0, count - 1);
       setCurrent(targetIndex);
+      if (targetIndex !== getCurrent()) {
+        (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, targetIndex);
+      }
       api.start({
         position: (loop ? roundedIndex : boundIndex(roundedIndex)) * 100,
         immediate
@@ -210,16 +211,17 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
       autoplay,
       autoplayInterval
     } = props;
+    const runTimeSwiper = () => {
+      timeoutRef.current = window.setTimeout(() => {
+        swipeNext();
+        runTimeSwiper();
+      }, autoplayInterval);
+    };
     (0, _react.useEffect)(() => {
       if (!autoplay || dragging) return;
-      let interval;
-      function tick() {
-        interval = window.setTimeout(tick, autoplayInterval);
-        swipeNext();
-      }
-      interval = window.setTimeout(tick, autoplayInterval);
+      runTimeSwiper();
       return () => {
-        if (interval) window.clearTimeout(interval);
+        if (timeoutRef.current) window.clearTimeout(timeoutRef.current);
       };
     }, [autoplay, autoplayInterval, dragging, count]);
     function renderTrackInner() {
@@ -228,7 +230,9 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
           className: `${classPrefix}-track-inner`
         }, _react.default.Children.map(validChildren, (child, index) => {
           return _react.default.createElement(_web.animated.div, {
-            className: `${classPrefix}-slide`,
+            className: (0, _classnames.default)(`${classPrefix}-slide`, {
+              [`${classPrefix}-slide-active`]: current === index
+            }),
             style: {
               [isVertical ? 'y' : 'x']: position.to(position => {
                 let finalPosition = -position + index * 100;
@@ -247,9 +251,11 @@ const Swiper = (0, _react.forwardRef)((0, _stagedComponents.staged)((p, ref) =>
           style: {
             [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
           }
-        }, _react.default.Children.map(validChildren, child => {
+        }, _react.default.Children.map(validChildren, (child, index) => {
           return _react.default.createElement("div", {
-            className: `${classPrefix}-slide`
+            className: (0, _classnames.default)(`${classPrefix}-slide`, {
+              [`${classPrefix}-slide-active`]: current === index
+            })
           }, child);
         }));
       }

package/2x/cjs/components/text-area/text-area.d.ts

@@ -21,7 +21,7 @@ export declare type TextAreaRef = {
     blur: () => void;
     nativeElement: HTMLTextAreaElement | null;
 };
-export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "name" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoFocus" | "autoComplete" | "readOnly"> & {
+export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoFocus" | "name" | "readOnly" | "autoComplete"> & {
     onChange?: ((val: string) => void) | undefined;
     value?: string | undefined;
     defaultValue?: string | undefined;

package/2x/cjs/components/text-area/text-area.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.TextArea = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
+var _runes = _interopRequireDefault(require("runes2"));
 var _nativeProps = require("../../utils/native-props");
 var _usePropsValue = require("../../utils/use-props-value");
 var _withDefaultProps = require("../../utils/with-default-props");
 var _devLog = require("../../utils/dev-log");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const classPrefix = 'adm-text-area';
@@ -76,7 +78,7 @@ const TextArea = (0, _react.forwardRef)((p, ref) => {
   }, [value, autoSize]);
   const compositingRef = (0, _react.useRef)(false);
   let count;
-  const valueLength = [...value].length;
+  const valueLength = (0, _runes.default)(value).length;
   if (typeof showCount === 'function') {
     count = showCount(valueLength, maxLength);
   } else if (showCount) {
@@ -95,7 +97,7 @@ const TextArea = (0, _react.forwardRef)((p, ref) => {
     onChange: e => {
       let v = e.target.value;
       if (maxLength && !compositingRef.current) {
-        v = [...v].slice(0, maxLength).join('');
+        v = (0, _runes.default)(v).slice(0, maxLength).join('');
       }
       setValue(v);
     },
@@ -110,7 +112,7 @@ const TextArea = (0, _react.forwardRef)((p, ref) => {
       compositingRef.current = false;
       if (maxLength) {
         const v = e.target.value;
-        setValue([...v].slice(0, maxLength).join(''));
+        setValue((0, _runes.default)(v).slice(0, maxLength).join(''));
       }
       (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },

package/2x/cjs/utils/reduce-and-restore-motion.js

@@ -40,5 +40,5 @@ function subscribe(onStoreChange) {
   };
 }
 function useMotionReduced() {
-  return (0, _shim.useSyncExternalStore)(subscribe, isMotionReduced);
+  return (0, _shim.useSyncExternalStore)(subscribe, isMotionReduced, isMotionReduced);
 }

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
-import Image from '../image';
 import { mergeProps } from '../../utils/with-default-props';
 import { Fallback } from './fallback';
+import Image from '../image';
 const classPrefix = 'adm-avatar';
 const defaultProps = {
   fallback: React.createElement(Fallback, null),

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

@@ -14,7 +14,7 @@ export declare type ButtonProps = {
     type?: 'submit' | 'reset' | 'button';
     shape?: 'default' | 'rounded' | 'rectangular';
     children?: React.ReactNode;
-} & Pick<NativeButtonProps, 'onMouseDown' | 'onMouseUp' | 'onTouchStart' | 'onTouchEnd'> & NativeProps<'--text-color' | '--background-color' | '--border-radius' | '--border-width' | '--border-style' | '--border-color'>;
+} & Pick<NativeButtonProps, 'onMouseDown' | 'onMouseUp' | 'onTouchStart' | 'onTouchEnd' | 'id'> & NativeProps<'--text-color' | '--background-color' | '--border-radius' | '--border-width' | '--border-style' | '--border-color'>;
 export declare type ButtonRef = {
     nativeElement: HTMLButtonElement | null;
 };
@@ -31,7 +31,7 @@ export declare const Button: React.ForwardRefExoticComponent<{
     type?: "reset" | "submit" | "button" | undefined;
     shape?: "default" | "rounded" | "rectangular" | undefined;
     children?: React.ReactNode;
-} & Pick<NativeButtonProps, "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & {
+} & Pick<NativeButtonProps, "id" | "onMouseDown" | "onMouseUp" | "onTouchEnd" | "onTouchStart"> & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<"--border-radius" | "--text-color" | "--background-color" | "--border-width" | "--border-style" | "--border-color", string>>) | undefined;
     tabIndex?: number | undefined;

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

@@ -56,12 +56,7 @@ export const Cascader = forwardRef((p, ref) => {
     if (!visible) {
       setInnerValue(value);
     }
-  }, [visible]);
-  useEffect(() => {
-    if (!visible) {
-      setInnerValue(value);
-    }
-  }, [value]);
+  }, [visible, value]);
   const cascaderElement = withNativeProps(props, React.createElement("div", {
     className: classPrefix
   }, React.createElement("div", {

package/2x/es/components/cascader-view/cascader-view.d.ts

@@ -19,5 +19,6 @@ export declare type CascaderViewProps = {
     placeholder?: string | ((index: number) => string);
     onTabsChange?: (index: number) => void;
     activeIcon?: ReactNode;
+    loading?: boolean;
 } & NativeProps<'--height'>;
 export declare const CascaderView: FC<CascaderViewProps>;

package/2x/es/components/cascader-view/cascader-view.js

@@ -72,6 +72,7 @@ export const CascaderView = p => {
     }
     setValue(next);
   };
+  const whetherLoading = options => props.loading || options === optionSkeleton;
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix
   }, React.createElement(Tabs, {
@@ -92,7 +93,7 @@ export const CascaderView = p => {
       forceRender: true
     }, React.createElement("div", {
       className: `${classPrefix}-content`
-    }, level.options === optionSkeleton ? React.createElement("div", {
+    }, whetherLoading(level.options) ? React.createElement("div", {
       className: `${classPrefix}-skeleton`
     }, React.createElement(Skeleton, {
       className: `${classPrefix}-skeleton-line-1`,

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

@@ -60,7 +60,9 @@ const CollapsePanelContent = props => {
     }
   }, [visible]);
   return React.createElement(animated.div, {
-    className: `${classPrefix}-panel-content`,
+    className: classNames(`${classPrefix}-panel-content`, {
+      [`${classPrefix}-panel-content-active`]: visible
+    }),
     style: {
       height: height.to(v => {
         if (height.idle && visible) {

package/2x/es/components/date-picker/date-picker-date-utils.d.ts

@@ -4,4 +4,4 @@ import { RenderLabel } from '../date-picker-view/date-picker-view';
 export declare type DatePrecision = 'year' | 'month' | 'day' | 'hour' | 'minute' | 'second';
 export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: DatePrecision, renderLabel: RenderLabel, filter: DatePickerFilter | undefined, tillNow?: boolean): PickerColumn[];
 export declare function convertDateToStringArray(date: Date | undefined | null): string[];
-export declare function convertStringArrayToDate(value: (string | null | undefined)[]): Date;
+export declare function convertStringArrayToDate<T extends string | number | null | undefined>(value: T[]): Date;

package/2x/es/components/date-picker/date-picker-utils.d.ts

@@ -6,5 +6,5 @@ export declare type DatePickerFilter = Partial<Record<Precision, (val: number, e
     date: Date;
 }) => boolean>>;
 export declare const convertDateToStringArray: (date: Date | undefined | null, precision: Precision) => string[];
-export declare const convertStringArrayToDate: (value: (string | null | undefined)[], precision: Precision) => Date;
+export declare const convertStringArrayToDate: <T extends string | number | null | undefined>(value: T[], precision: Precision) => Date;
 export declare const generateDatePickerColumns: (selected: string[], min: Date, max: Date, precision: Precision, renderLabel: RenderLabel, filter: DatePickerFilter | undefined, tillNow?: boolean | undefined) => import("../picker-view").PickerColumn[];

package/2x/es/components/date-picker/date-picker-week-utils.d.ts

@@ -4,4 +4,4 @@ import type { DatePickerFilter } from './date-picker-utils';
 export declare type WeekPrecision = 'year' | 'week' | 'week-day';
 export declare function generateDatePickerColumns(selected: string[], min: Date, max: Date, precision: WeekPrecision, renderLabel: (type: WeekPrecision, data: number) => ReactNode, filter: DatePickerFilter | undefined): PickerColumn[];
 export declare function convertDateToStringArray(date: Date | undefined | null): string[];
-export declare function convertStringArrayToDate(value: (string | null | undefined)[]): Date;
+export declare function convertStringArrayToDate<T extends string | number | null | undefined>(value: T[]): Date;

package/2x/es/components/date-picker/date-picker.d.ts

@@ -18,7 +18,7 @@ export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' |
     filter?: DatePickerFilter;
     tillNow?: boolean;
 } & NativeProps;
-export declare const DatePicker: React.ForwardRefExoticComponent<Pick<PickerProps, "style" | "title" | "onClick" | "visible" | "destroyOnClose" | "forceRender" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation" | "onCancel" | "onClose" | "loading" | "closeOnMaskClick" | "cancelText" | "mouseWheel" | "loadingContent" | "confirmText"> & {
+export declare const DatePicker: React.ForwardRefExoticComponent<Pick<PickerProps, "style" | "title" | "onClick" | "visible" | "destroyOnClose" | "forceRender" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation" | "closeOnMaskClick" | "onClose" | "cancelText" | "loading" | "mouseWheel" | "loadingContent" | "onCancel" | "confirmText"> & {
     value?: PickerDate | null | undefined;
     defaultValue?: PickerDate | null | undefined;
     onSelect?: ((value: PickerDate) => void) | undefined;

package/2x/es/components/date-picker/index.d.ts

@@ -2,7 +2,7 @@ import './date-picker.less';
 import { prompt } from './prompt';
 export type { DatePickerProps, DatePickerRef } from './date-picker';
 export type { DatePickerFilter } from './date-picker-utils';
-declare const _default: import("react").ForwardRefExoticComponent<Pick<import("../picker").PickerProps, "style" | "title" | "onClick" | "visible" | "destroyOnClose" | "forceRender" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation" | "onCancel" | "onClose" | "loading" | "closeOnMaskClick" | "cancelText" | "mouseWheel" | "loadingContent" | "confirmText"> & {
+declare const _default: import("react").ForwardRefExoticComponent<Pick<import("../picker").PickerProps, "style" | "title" | "onClick" | "visible" | "destroyOnClose" | "forceRender" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation" | "closeOnMaskClick" | "onClose" | "cancelText" | "loading" | "mouseWheel" | "loadingContent" | "onCancel" | "confirmText"> & {
     value?: import("./util").PickerDate | null | undefined;
     defaultValue?: import("./util").PickerDate | null | undefined;
     onSelect?: ((value: import("./util").PickerDate) => void) | undefined;

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { PopupProps } from '../popup';
 import { NativeProps } from '../../utils/native-props';
 export declare type DropdownProps = {
     activeKey?: string | null;
@@ -7,6 +8,7 @@ export declare type DropdownProps = {
     closeOnClickAway?: boolean;
     onChange?: (key: string | null) => void;
     arrow?: React.ReactNode;
+    getContainer?: PopupProps['getContainer'];
 } & NativeProps;
 export declare type DropdownRef = {
     close: () => void;
@@ -18,6 +20,7 @@ declare const Dropdown: React.ForwardRefExoticComponent<{
     closeOnClickAway?: boolean | undefined;
     onChange?: ((key: string | null) => void) | undefined;
     arrow?: React.ReactNode;
+    getContainer?: PopupProps['getContainer'];
 } & {
     className?: string | undefined;
     style?: (React.CSSProperties & Partial<Record<never, string>>) | undefined;

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

@@ -6,11 +6,13 @@ import { ItemChildrenWrap } from './item';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import { usePropsValue } from '../../utils/use-props-value';
+import { defaultPopupBaseProps } from '../popup/popup-base-props';
 const classPrefix = `adm-dropdown`;
 const defaultProps = {
   defaultActiveKey: null,
   closeOnMaskClick: true,
-  closeOnClickAway: false
+  closeOnClickAway: false,
+  getContainer: defaultPopupBaseProps['getContainer']
 };
 const Dropdown = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
@@ -78,6 +80,7 @@ const Dropdown = forwardRef((p, ref) => {
   }, navs), React.createElement(Popup, {
     visible: !!value,
     position: 'top',
+    getContainer: props.getContainer,
     className: `${classPrefix}-popup`,
     maskClassName: `${classPrefix}-popup-mask`,
     bodyClassName: `${classPrefix}-popup-body`,

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

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

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

@@ -5,8 +5,8 @@ export declare type EllipsisProps = {
     content: string;
     direction?: 'start' | 'end' | 'middle';
     rows?: number;
-    expandText?: string;
-    collapseText?: string;
+    expandText?: React.ReactNode;
+    collapseText?: React.ReactNode;
     stopPropagationForActionButtons?: PropagationEvent[];
     onContentClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     defaultExpanded?: boolean;

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

@@ -1,5 +1,5 @@
 import React, { useMemo, useRef, useState } from 'react';
-import runes from 'runes';
+import runes from 'runes2';
 import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
 import { useResizeEffect } from '../../utils/use-resize-effect';
@@ -19,6 +19,8 @@ const defaultProps = {
 export const Ellipsis = p => {
   const props = mergeProps(defaultProps, p);
   const rootRef = useRef(null);
+  const expandElRef = useRef(null);
+  const collapseElRef = useRef(null);
   const [ellipsised, setEllipsised] = useState({});
   const [expanded, setExpanded] = useState(props.defaultExpanded);
   const [exceeded, setExceeded] = useState(false);
@@ -27,19 +29,18 @@ export const Ellipsis = p => {
     return chars.slice(start, end).join('');
   }
   function calcEllipsised() {
+    var _a, _b;
     const root = rootRef.current;
     if (!root) return;
-    if (!root.offsetParent) return;
+    const originDisplay = root.style.display;
+    root.style.display = 'block';
     const originStyle = window.getComputedStyle(root);
     const container = document.createElement('div');
     const styleNames = Array.prototype.slice.apply(originStyle);
     styleNames.forEach(name => {
       container.style.setProperty(name, originStyle.getPropertyValue(name));
     });
-    container.style.position = 'fixed';
-    container.style.left = '999999px';
-    container.style.top = '999999px';
-    container.style.zIndex = '-1000';
+    root.style.display = originDisplay;
     container.style.height = 'auto';
     container.style.minHeight = 'auto';
     container.style.maxHeight = 'auto';
@@ -56,7 +57,9 @@ export const Ellipsis = p => {
     } else {
       setExceeded(true);
       const end = props.content.length;
-      const actionText = expanded ? props.collapseText : props.expandText;
+      const collapseEl = typeof props.collapseText === 'string' ? props.collapseText : (_a = collapseElRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML;
+      const expandEl = typeof props.expandText === 'string' ? props.expandText : (_b = expandElRef.current) === null || _b === void 0 ? void 0 : _b.innerHTML;
+      const actionText = expanded ? collapseEl : expandEl;
       function check(left, right) {
         if (right - left <= 1) {
           if (props.direction === 'end') {
@@ -71,9 +74,9 @@ export const Ellipsis = p => {
         }
         const middle = Math.round((left + right) / 2);
         if (props.direction === 'end') {
-          container.innerText = getSubString(0, middle) + '...' + actionText;
+          container.innerHTML = getSubString(0, middle) + '...' + actionText;
         } else {
-          container.innerText = actionText + '...' + getSubString(middle, end);
+          container.innerHTML = actionText + '...' + getSubString(middle, end);
         }
         if (container.offsetHeight <= maxHeight) {
           if (props.direction === 'end') {
@@ -98,7 +101,7 @@ export const Ellipsis = p => {
         }
         const leftPartMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
         const rightPartMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
-        container.innerText = getSubString(0, leftPartMiddle) + '...' + actionText + '...' + getSubString(rightPartMiddle, end);
+        container.innerHTML = getSubString(0, leftPartMiddle) + '...' + actionText + '...' + getSubString(rightPartMiddle, end);
         if (container.offsetHeight <= maxHeight) {
           return checkMiddle([leftPartMiddle, leftPart[1]], [rightPart[0], rightPartMiddle]);
         } else {
@@ -116,24 +119,21 @@ export const Ellipsis = p => {
     calcEllipsised();
   }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
   const expandActionElement = exceeded && 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", {
+    ref: collapseElRef,
     onClick: () => {
       setExpanded(false);
     }
   }, props.collapseText)) : null;
   const renderContent = () => {
-    if (!exceeded) {
-      return props.content;
-    }
-    if (expanded) {
-      return React.createElement(React.Fragment, null, props.content, collapseActionElement);
-    } else {
-      return React.createElement(React.Fragment, null, ellipsised.leading, expandActionElement, ellipsised.tailing);
-    }
+    if (!exceeded) return props.content;
+    if (expanded) return React.createElement(React.Fragment, null, props.content, collapseActionElement);
+    return React.createElement(React.Fragment, null, ellipsised.leading, expandActionElement, ellipsised.tailing);
   };
   return withNativeProps(props, React.createElement("div", {
     ref: rootRef,

package/2x/es/components/footer/footer.css

@@ -43,7 +43,7 @@
   white-space: nowrap;
   margin-right: 40px;
   font-size: 24px;
-  background-color: var(--adm-color-box);
+  background-color: var(--adm-color-fill-content);
   color: var(--adm-color-weak);
   padding: 8px 24px;
   border-radius: 200px;

package/2x/es/components/form/form-subscribe.js

@@ -5,7 +5,10 @@ import { useIsomorphicUpdateLayoutEffect } from '../../utils/use-isomorphic-upda
 export const FormSubscribe = props => {
   const update = useUpdate();
   const form = useContext(FieldContext);
-  return React.createElement(React.Fragment, null, props.children(form.getFieldsValue(props.to), form), props.to.map(namePath => React.createElement(Watcher, {
+  const value = form.getFieldsValue(props.to);
+  // Memo to avoid useless render
+  const childNode = React.useMemo(() => props.children(value, form), [JSON.stringify(value)]);
+  return React.createElement(React.Fragment, null, childNode, props.to.map(namePath => React.createElement(Watcher, {
     key: namePath.toString(),
     form: form,
     namePath: namePath,

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

@@ -72,7 +72,7 @@ export const Form = forwardRef((p, ref) => {
       hasFeedback,
       layout,
       requiredMarkStyle,
-      disabled: disabled
+      disabled
     }
   }, lists), footer && React.createElement("div", {
     className: `${classPrefix}-footer`

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

@@ -4,7 +4,7 @@ export declare type FormLayout = 'vertical' | 'horizontal';
 export type { FormProps, FormInstance } from './form';
 export type { FormItemProps } from './form-item';
 export type { FormSubscribeProps } from './form-subscribe';
-export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/interface';
+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"> & {
     className?: string | undefined;

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

@@ -14,5 +14,5 @@ export declare type ImageProps = {
     onError?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
     onLoad?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
     onContainerClick?: (event: React.MouseEvent<HTMLDivElement, Event>) => void;
-} & NativeProps<'--width' | '--height'> & Pick<React.ImgHTMLAttributes<HTMLImageElement>, 'crossOrigin' | 'decoding' | 'loading' | 'referrerPolicy' | 'sizes' | 'srcSet' | 'useMap'>;
+} & NativeProps<'--width' | '--height'> & Pick<React.ImgHTMLAttributes<HTMLImageElement>, 'crossOrigin' | 'decoding' | 'loading' | 'referrerPolicy' | 'sizes' | 'srcSet' | 'useMap' | 'id'>;
 export declare const Image: React.FC<ImageProps>;

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

@@ -1,5 +1,5 @@
 import { mergeProps } from '../../utils/with-default-props';
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { staged } from 'staged-components';
 import { toCSSLength } from '../../utils/to-css-length';
@@ -24,6 +24,7 @@ export const Image = staged(p => {
   const [loaded, setLoaded] = useState(false);
   const [failed, setFailed] = useState(false);
   const ref = useRef(null);
+  const imgRef = useRef(null);
   let src = props.src;
   let srcSet = props.srcSet;
   const [initialized, setInitialized] = useState(!props.lazy);
@@ -33,11 +34,20 @@ export const Image = staged(p => {
     setLoaded(false);
     setFailed(false);
   }, [src]);
+  useEffect(() => {
+    var _a;
+    // for nextjs ssr
+    if ((_a = imgRef.current) === null || _a === void 0 ? void 0 : _a.complete) {
+      setLoaded(true);
+    }
+  }, []);
   function renderInner() {
     if (failed) {
       return React.createElement(React.Fragment, null, props.fallback);
     }
     const img = React.createElement("img", {
+      ref: imgRef,
+      id: props.id,
       className: `${classPrefix}-img`,
       src: src,
       alt: props.alt,