antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.92d6290f7

package/2x/es/components/index-bar/index-bar.d.ts

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type IndexBarProps = {
     sticky?: boolean;
+    onIndexChange?: (index: string) => void;
     children?: React.ReactNode;
 } & NativeProps<'--sticky-offset-top'>;
 export declare type IndexBarRef = {
@@ -9,5 +10,10 @@ export declare type IndexBarRef = {
 };
 export declare const IndexBar: React.ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
+    onIndexChange?: ((index: string) => void) | undefined;
     children?: React.ReactNode;
-} & NativeProps<"--sticky-offset-top"> & React.RefAttributes<IndexBarRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--sticky-offset-top", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<IndexBarRef>>;

package/2x/es/components/index-bar/index-bar.js

@@ -49,6 +49,8 @@ export const IndexBar = forwardRef((p, ref) => {
   }));
 
   function scrollTo(index) {
+    var _a;
+
     const body = bodyRef.current;
     if (!body) return;
     const children = body.children;
@@ -61,6 +63,7 @@ export const IndexBar = forwardRef((p, ref) => {
       if (panelIndex === index) {
         body.scrollTop = panel.offsetTop;
         setActiveIndex(index);
+        activeIndex !== index && ((_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, index));
         return;
       }
     }
@@ -69,6 +72,8 @@ export const IndexBar = forwardRef((p, ref) => {
   const {
     run: checkActiveIndex
   } = useThrottleFn(() => {
+    var _a;
+
     const body = bodyRef.current;
     if (!body) return;
     const scrollTop = body.scrollTop;
@@ -82,6 +87,7 @@ export const IndexBar = forwardRef((p, ref) => {
 
       if (panel.offsetTop + panel.clientHeight - titleHeight > scrollTop) {
         setActiveIndex(panelIndex);
+        activeIndex !== panelIndex && ((_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, panelIndex));
         return;
       }
     }

package/2x/es/components/index-bar/index.d.ts

@@ -4,8 +4,13 @@ export type { IndexBarProps, IndexBarRef } from './index-bar';
 export type { IndexBarPanelProps } from './panel';
 declare const _default: import("react").ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
+    onIndexChange?: ((index: string) => void) | undefined;
     children?: import("react").ReactNode;
-} & import("../../utils/native-props").NativeProps<"--sticky-offset-top"> & import("react").RefAttributes<import("./index-bar").IndexBarRef>> & {
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--sticky-offset-top", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./index-bar").IndexBarRef>> & {
     Panel: import("react").FC<import("./panel").IndexBarPanelProps>;
 };
 export default _default;

package/2x/es/components/infinite-scroll/infinite-scroll.css

@@ -4,5 +4,10 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  font-size: 26px;
+  font-size: var(--adm-font-size-main);
+}
+
+.adm-infinite-scroll-failed-text {
+  display: inline-block;
+  margin-right: 16px;
 }

package/2x/es/components/infinite-scroll/infinite-scroll.d.ts

@@ -1,9 +1,9 @@
 import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type InfiniteScrollProps = {
-    loadMore: () => Promise<void>;
+    loadMore: (isRetry: boolean) => Promise<void>;
     hasMore: boolean;
     threshold?: number;
-    children?: React.ReactNode;
+    children?: React.ReactNode | ((hasMore: boolean, failed: boolean, retry: () => void) => React.ReactNode);
 } & NativeProps;
 export declare const InfiniteScroll: FC<InfiniteScrollProps>;

package/2x/es/components/infinite-scroll/infinite-scroll.js

@@ -1,7 +1,7 @@
 import { __awaiter } from "tslib";
 import { mergeProps } from '../../utils/with-default-props';
 import React, { useEffect, useRef, useState } from 'react';
-import { useLockFn, useMemoizedFn } from 'ahooks';
+import { useLockFn, useThrottleFn } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { getScrollParent } from '../../utils/get-scroll-parent';
 import { useConfig } from '../config-provider';
@@ -12,31 +12,40 @@ function isWindow(element) {
 }
 
 const classPrefix = `adm-infinite-scroll`;
-
-const InfiniteScrollContent = ({
-  hasMore
-}) => {
-  const {
-    locale
-  } = useConfig();
-  return React.createElement(React.Fragment, null, hasMore ? React.createElement(React.Fragment, null, React.createElement("span", null, locale.common.loading), React.createElement(DotLoading, null)) : React.createElement("span", null, locale.InfiniteScroll.noMore));
+const defaultProps = {
+  threshold: 250,
+  children: (hasMore, failed, retry) => React.createElement(InfiniteScrollContent, {
+    hasMore: hasMore,
+    failed: failed,
+    retry: retry
+  })
 };
-
 export const InfiniteScroll = p => {
-  const props = mergeProps({
-    threshold: 250
-  }, p);
-  const doLoadMore = useLockFn(() => props.loadMore());
-  const elementRef = useRef(null);
+  const props = mergeProps(defaultProps, p);
+  const [failed, setFailed] = useState(false);
+  const doLoadMore = useLockFn(isRetry => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+      yield props.loadMore(isRetry);
+    } catch (e) {
+      setFailed(true);
+      throw e;
+    }
+  }));
+  const elementRef = useRef(null); // Prevent duplicated trigger of `check` function
+
   const [flag, setFlag] = useState({});
   const nextFlagRef = useRef(flag);
-  const check = useMemoizedFn(() => __awaiter(void 0, void 0, void 0, function* () {
+  const [scrollParent, setScrollParent] = useState();
+  const {
+    run: check
+  } = useThrottleFn(() => __awaiter(void 0, void 0, void 0, function* () {
     if (nextFlagRef.current !== flag) return;
     if (!props.hasMore) return;
     const element = elementRef.current;
     if (!element) return;
     if (!element.offsetParent) return;
     const parent = getScrollParent(element);
+    setScrollParent(parent);
     if (!parent) return;
     const rect = element.getBoundingClientRect();
     const elementTop = rect.top;
@@ -45,10 +54,14 @@ export const InfiniteScroll = p => {
     if (current >= elementTop - props.threshold) {
       const nextFlag = {};
       nextFlagRef.current = nextFlag;
-      yield doLoadMore();
+      yield doLoadMore(false);
       setFlag(nextFlag);
     }
-  })); // 确保在内容不足时会自动触发加载事件
+  }), {
+    wait: 100,
+    leading: true,
+    trailing: true
+  }); // Make sure to trigger `loadMore` when content changes
 
   useEffect(() => {
     check();
@@ -56,22 +69,50 @@ export const InfiniteScroll = p => {
   useEffect(() => {
     const element = elementRef.current;
     if (!element) return;
-    const parent = getScrollParent(element);
-    if (!parent) return;
+    if (!scrollParent) return;
 
     function onScroll() {
       check();
     }
 
-    parent.addEventListener('scroll', onScroll);
+    scrollParent.addEventListener('scroll', onScroll);
     return () => {
-      parent.removeEventListener('scroll', onScroll);
+      scrollParent.removeEventListener('scroll', onScroll);
     };
-  }, []);
+  }, [scrollParent]);
+
+  function retry() {
+    return __awaiter(this, void 0, void 0, function* () {
+      setFailed(false);
+      yield doLoadMore(true);
+      setFlag(nextFlagRef.current);
+    });
+  }
+
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix,
     ref: elementRef
-  }, props.children && props.children, !props.children && React.createElement(InfiniteScrollContent, {
-    hasMore: props.hasMore
-  })));
+  }, typeof props.children === 'function' ? props.children(props.hasMore, failed, retry) : props.children));
+};
+
+const InfiniteScrollContent = props => {
+  const {
+    locale
+  } = useConfig();
+
+  if (!props.hasMore) {
+    return React.createElement("span", null, locale.InfiniteScroll.noMore);
+  }
+
+  if (props.failed) {
+    return React.createElement("span", null, React.createElement("span", {
+      className: `${classPrefix}-failed-text`
+    }, locale.InfiniteScroll.failedToLoad), React.createElement("a", {
+      onClick: () => {
+        props.retry();
+      }
+    }, locale.InfiniteScroll.retry));
+  }
+
+  return React.createElement(React.Fragment, null, React.createElement("span", null, locale.common.loading), React.createElement(DotLoading, null));
 };

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

@@ -1,5 +1,5 @@
 .adm-input {
-  --font-size: 34px;
+  --font-size: var(--adm-font-size-9);
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
   --text-align: left;
@@ -34,11 +34,17 @@
   background: transparent;
   border: 0;
   outline: none;
+  -webkit-appearance: none;
   appearance: none;
   min-height: 1.5em;
   text-align: var(--text-align);
 }
 
+.adm-input-element::-webkit-input-placeholder {
+  color: var(--placeholder-color);
+  font-family: inherit;
+}
+
 .adm-input-element::placeholder {
   color: var(--placeholder-color);
   font-family: inherit;
@@ -60,6 +66,10 @@
   display: none;
 }
 
+.adm-input-element::-ms-reveal {
+  display: none;
+}
+
 .adm-input-element::-webkit-search-cancel-button {
   display: none;
 }
@@ -100,5 +110,5 @@
 
 .adm-input-clear .antd-mobile-icon {
   display: block;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
 }

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

@@ -1,7 +1,10 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
+declare type AriaProps = {
+    role?: string;
+};
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick' | 'step'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -16,14 +19,14 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
     min?: number;
     max?: number;
-} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--text-align'>;
+} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--text-align'> & AriaProps;
 export declare type InputRef = {
     clear: () => void;
     focus: () => void;
     blur: () => void;
     nativeElement: HTMLInputElement | null;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "name" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "autoFocus" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "name" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "autoFocus" | "maxLength" | "minLength" | "step"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -38,5 +41,9 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProp
     enterKeyHint?: "search" | "enter" | "done" | "go" | "next" | "previous" | "send" | undefined;
     min?: number | undefined;
     max?: number | undefined;
-} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align"> & React.RefAttributes<InputRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & AriaProps & React.RefAttributes<InputRef>>;
 export {};

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

@@ -6,6 +6,8 @@ import { mergeProps } from '../../utils/with-default-props';
 import classNames from 'classnames';
 import { useIsomorphicLayoutEffect } from 'ahooks';
 import { bound } from '../../utils/bound';
+import { isIOS } from '../../utils/validate';
+import { useConfig } from '../config-provider';
 const classPrefix = `adm-input`;
 const defaultProps = {
   defaultValue: '',
@@ -15,7 +17,11 @@ export const Input = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
   const [value, setValue] = usePropsValue(props);
   const [hasFocus, setHasFocus] = useState(false);
+  const compositionStartRef = useRef(false);
   const nativeInputRef = useRef(null);
+  const {
+    locale
+  } = useConfig();
   useImperativeHandle(ref, () => ({
     clear: () => {
       setValue('');
@@ -121,19 +127,40 @@ export const Input = forwardRef((p, ref) => {
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,
     onKeyUp: props.onKeyUp,
-    onCompositionStart: props.onCompositionStart,
-    onCompositionEnd: props.onCompositionEnd,
-    onClick: props.onClick
+    onCompositionStart: e => {
+      var _a;
+
+      compositionStartRef.current = true;
+      (_a = props.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    },
+    onCompositionEnd: e => {
+      var _a;
+
+      compositionStartRef.current = false;
+      (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    },
+    onClick: props.onClick,
+    role: props.role,
+    "aria-valuenow": props['aria-valuenow'],
+    "aria-valuemax": props['aria-valuemax'],
+    "aria-valuemin": props['aria-valuemin'],
+    "aria-label": props['aria-label']
   }), shouldShowClear && React.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();
     },
     onClick: () => {
-      var _a;
+      var _a, _b;
 
       setValue('');
-      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
-    }
+      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props); // https://github.com/ant-design/ant-design-mobile/issues/5212
+
+      if (isIOS() && compositionStartRef.current) {
+        compositionStartRef.current = false;
+        (_b = nativeInputRef.current) === null || _b === void 0 ? void 0 : _b.blur();
+      }
+    },
+    "aria-label": locale.Input.clear
   }, React.createElement(CloseCircleFill, null))));
 });

package/2x/es/components/jumbo-tabs/jumbo-tabs.css

@@ -6,7 +6,7 @@
 
 .adm-jumbo-tabs-header {
   position: relative;
-  border-bottom: solid 2px var(--adm-border-color);
+  border-bottom: solid 2px var(--adm-color-border);
 }
 
 .adm-jumbo-tabs-tab-list {
@@ -35,11 +35,12 @@
   flex-direction: column;
   align-items: center;
   position: relative;
+  width: -webkit-min-content;
   width: min-content;
   margin: 0 auto;
   padding: 24px 0;
   cursor: pointer;
-  font-size: 34px;
+  font-size: var(--adm-font-size-9);
   white-space: nowrap;
 }
 
@@ -49,12 +50,13 @@
 }
 
 .adm-jumbo-tabs-tab-description {
+  width: -webkit-min-content;
   width: min-content;
   padding: 0 16px;
   border-radius: 20px;
   color: var(--adm-color-weak);
   font-size: var(--adm-font-size-main);
-  background-color: #f5f5f5;
+  background-color: var(--adm-color-box);
 }
 
 .adm-jumbo-tabs-tab-active {
@@ -62,7 +64,7 @@
 }
 
 .adm-jumbo-tabs-tab-active .adm-jumbo-tabs-tab-description {
-  color: #fff;
+  color: var(--adm-color-white);
   background-color: var(--adm-color-primary);
 }
 
@@ -73,24 +75,4 @@
 
 .adm-jumbo-tabs-content {
   padding: 24px;
-}
-
-.adm-jumbo-tabs-header-mask {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  z-index: 1;
-  width: 60px;
-  height: 100%;
-  pointer-events: none;
-}
-
-.adm-jumbo-tabs-header-mask-left {
-  left: 0;
-  background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
-}
-
-.adm-jumbo-tabs-header-mask-right {
-  right: 0;
-  background: linear-gradient(to left, #fff, rgba(255, 255, 255, 0));
 }

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

@@ -1,8 +1,16 @@
 /// <reference types="react" />
 import './list.less';
-export type { ListProps } from './list';
+export type { ListProps, ListRef } from './list';
 export type { ListItemProps } from './list-item';
-declare const _default: import("react").FC<import("./list").ListProps> & {
+declare const _default: import("react").ForwardRefExoticComponent<{
+    header?: import("react").ReactNode;
+    mode?: "default" | "card" | undefined;
+    children?: import("react").ReactNode;
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--active-background-color" | "--align-items" | "--border-bottom" | "--border-inner" | "--border-top" | "--extra-max-width" | "--font-size" | "--header-font-size" | "--padding-left" | "--padding-right" | "--prefix-padding-right" | "--prefix-width", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./list").ListRef>> & {
     Item: import("react").FC<import("./list-item").ListItemProps>;
 };
 export default _default;

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

@@ -1,15 +1,16 @@
 .adm-list {
-  --header-font-size: 30px;
+  --header-font-size: var(--adm-font-size-7);
   --prefix-width: 'auto';
   --prefix-padding-right: 24px;
   --align-items: center;
-  --active-background-color: var(--adm-border-color);
-  --border-inner: solid 2px var(--adm-border-color);
-  --border-top: solid 2px var(--adm-border-color);
-  --border-bottom: solid 2px var(--adm-border-color);
+  --active-background-color: var(--adm-color-border);
+  --border-inner: solid 2px var(--adm-color-border);
+  --border-top: solid 2px var(--adm-color-border);
+  --border-bottom: solid 2px var(--adm-color-border);
   --padding-left: 24px;
   --padding-right: 24px;
-  --font-size: 34px;
+  --font-size: var(--adm-font-size-9);
+  --extra-max-width: 70%;
 }
 
 .adm-list-header {
@@ -19,7 +20,7 @@
 }
 
 .adm-list-body {
-  background-color: #ffffff;
+  background-color: var(--adm-color-background);
   overflow: hidden;
   font-size: var(--font-size);
 }
@@ -49,14 +50,14 @@
   display: block;
   padding-left: var(--padding-left);
   position: relative;
-  background-color: #ffffff;
+  background-color: var(--adm-color-background);
   line-height: 1.5;
 }
 
 .adm-list-item-title,
 .adm-list-item-description {
   color: var(--adm-color-weak);
-  font-size: 26px;
+  font-size: var(--adm-font-size-main);
 }
 
 .adm-list-item-content {
@@ -81,8 +82,9 @@
 .adm-list-item-content-extra {
   flex: none;
   padding-left: 24px;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
   color: var(--adm-color-weak);
+  max-width: var(--extra-max-width);
 }
 
 .adm-list-item-content-arrow {

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

@@ -1,8 +1,19 @@
-import { FC, ReactNode } from 'react';
+import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ListProps = {
     header?: ReactNode;
     mode?: 'default' | 'card';
     children?: ReactNode;
-} & NativeProps<'--header-font-size' | '--prefix-width' | '--prefix-padding-right' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left' | '--padding-right' | '--font-size'>;
-export declare const List: FC<ListProps>;
+} & NativeProps<'--active-background-color' | '--align-items' | '--border-bottom' | '--border-inner' | '--border-top' | '--extra-max-width' | '--font-size' | '--header-font-size' | '--padding-left' | '--padding-right' | '--prefix-padding-right' | '--prefix-width'>;
+export declare type ListRef = {
+    nativeElement: HTMLDivElement | null;
+};
+export declare const List: React.ForwardRefExoticComponent<{
+    header?: ReactNode;
+    mode?: "default" | "card" | undefined;
+    children?: ReactNode;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--active-background-color" | "--align-items" | "--border-bottom" | "--border-inner" | "--border-top" | "--extra-max-width" | "--font-size" | "--header-font-size" | "--padding-left" | "--padding-right" | "--prefix-padding-right" | "--prefix-width", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<ListRef>>;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import classNames from 'classnames';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
@@ -6,10 +6,18 @@ const classPrefix = `adm-list`;
 const defaultProps = {
   mode: 'default'
 };
-export const List = p => {
+export const List = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
+  const nativeElementRef = useRef(null);
+  useImperativeHandle(ref, () => ({
+    get nativeElement() {
+      return nativeElementRef.current;
+    }
+
+  }));
   return withNativeProps(props, React.createElement("div", {
-    className: classNames(classPrefix, `${classPrefix}-${props.mode}`)
+    className: classNames(classPrefix, `${classPrefix}-${props.mode}`),
+    ref: nativeElementRef
   }, props.header && React.createElement("div", {
     className: `${classPrefix}-header`
   }, props.header), React.createElement("div", {
@@ -17,4 +25,4 @@ export const List = p => {
   }, React.createElement("div", {
     className: `${classPrefix}-body-inner`
   }, props.children))));
-};
+});

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

@@ -6,7 +6,7 @@ import { useSpring, animated } from '@react-spring/web';
 import { renderToContainer } from '../../utils/render-to-container';
 import { mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
-import { useShouldRender } from '../../utils/should-render';
+import { ShouldRender } from '../../utils/should-render';
 import { withStopPropagation } from '../../utils/with-stop-propagation';
 const classPrefix = `adm-mask`;
 const opacityRecord = {
@@ -47,7 +47,7 @@ export const Mask = p => {
     config: {
       precision: 0.01,
       mass: 1,
-      tension: 200,
+      tension: 250,
       friction: 30,
       clamp: true
     },
@@ -67,14 +67,12 @@ export const Mask = p => {
       }
     }
   });
-  const shouldRender = useShouldRender(active, props.forceRender, props.destroyOnClose);
   const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement(animated.div, {
     className: classPrefix,
     ref: ref,
-    style: Object.assign(Object.assign({
+    style: Object.assign(Object.assign({}, props.style), {
       background,
-      opacity
-    }, props.style), {
+      opacity,
       display: active ? undefined : 'none'
     }),
     onClick: e => {
@@ -91,6 +89,10 @@ export const Mask = p => {
     onClick: props.onMaskClick
   }), React.createElement("div", {
     className: `${classPrefix}-content`
-  }, shouldRender && props.children))));
-  return renderToContainer(props.getContainer, node);
+  }, props.children))));
+  return React.createElement(ShouldRender, {
+    active: active,
+    forceRender: props.forceRender,
+    destroyOnClose: props.destroyOnClose
+  }, renderToContainer(props.getContainer, node));
 };

package/2x/es/components/mask/mask.patch.css

@@ -0,0 +1,3 @@
+.adm-mask {
+  z-index: 1000;
+}

package/2x/es/components/modal/modal-action-button.d.ts

@@ -1,8 +1,8 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type Action = {
     key: string | number;
-    text: string;
+    text: ReactNode;
     disabled?: boolean;
     danger?: boolean;
     primary?: boolean;