antd-mobile 5.11.2 → 5.12.0

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

@@ -1,11 +1,11 @@
 import { __rest } from "tslib";
-import React, { useContext, useCallback, useState } from 'react';
+import React, { useContext, useCallback, useState, useRef } from 'react';
 import classNames from 'classnames';
 import { Field } from 'rc-field-form';
 import FieldContext from 'rc-field-form/lib/FieldContext';
 import { devWarning } from '../../utils/dev-log';
 import { FormContext, NoStyleItemContext } from './context';
-import { toArray } from './utils';
+import { toArray, isSafeSetRefComponent } from './utils';
 import List from '../list';
 import Popover from '../popover';
 import { QuestionCircleOutline } from 'antd-mobile-icons';
@@ -147,7 +147,8 @@ export const FormItem = props => {
     validateTrigger: contextValidateTrigger
   } = useContext(FieldContext);
   const mergedValidateTrigger = undefinedFallback(validateTrigger, contextValidateTrigger, trigger);
-  const updateRef = React.useRef(0);
+  const widgetRef = useRef(null);
+  const updateRef = useRef(0);
   updateRef.current += 1;
   const [subMetas, setSubMetas] = useState({});
   const onSubMetaChange = useCallback((subMeta, namePath) => {
@@ -209,7 +210,7 @@ export const FormItem = props => {
       htmlFor: fieldId,
       errors: errors,
       warnings: warnings,
-      onClick: onClick,
+      onClick: onClick && (e => onClick(e, widgetRef)),
       hidden: hidden,
       layout: layout,
       childElementPosition: childElementPosition,
@@ -286,6 +287,24 @@ export const FormItem = props => {
 
       const childProps = Object.assign(Object.assign({}, children.props), control);
 
+      if (isSafeSetRefComponent(children)) {
+        childProps.ref = instance => {
+          const originRef = children.ref;
+
+          if (originRef) {
+            if (typeof originRef === 'function') {
+              originRef(instance);
+            }
+
+            if ('current' in originRef) {
+              originRef.current = instance;
+            }
+          }
+
+          widgetRef.current = instance;
+        };
+      }
+
       if (!childProps.id) {
         childProps.id = fieldId;
       } // We should keep user origin event handler

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

@@ -1 +1,2 @@
 export declare function toArray<T>(candidate?: T | T[] | false): T[];
+export declare function isSafeSetRefComponent(component: any): boolean;

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

@@ -1,4 +1,21 @@
+import { isMemo, isFragment } from 'react-is';
 export function toArray(candidate) {
   if (candidate === undefined || candidate === false) return [];
   return Array.isArray(candidate) ? candidate : [candidate];
+} // eslint-disable-next-line @typescript-eslint/ban-types
+
+function shouldConstruct(Component) {
+  const prototype = Component.prototype;
+  return !!(prototype && prototype.isReactComponent);
+} // https://github.com/facebook/react/blob/ce13860281f833de8a3296b7a3dad9caced102e9/packages/react-reconciler/src/ReactFiber.new.js#L225
+
+
+function isSimpleFunctionComponent(type) {
+  return typeof type === 'function' && !shouldConstruct(type) && type.defaultProps === undefined;
+}
+
+export function isSafeSetRefComponent(component) {
+  if (isFragment(component)) return false;
+  if (isMemo(component)) return isSafeSetRefComponent(component.type);
+  return !isSimpleFunctionComponent(component.type);
 }

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

@@ -65,6 +65,7 @@ export const ImageUploader = p => {
       } = e.target;
       if (!rawFiles) return;
       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 => {
@@ -94,8 +95,6 @@ export const ImageUploader = p => {
         file
       }));
       setTasks(prev => [...prev, ...newTasks]);
-      e.target.value = ''; // HACK: fix the same file doesn't trigger onChange
-
       yield Promise.all(newTasks.map(currentTask => __awaiter(this, void 0, void 0, function* () {
         try {
           const result = yield props.upload(currentTask.file);

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

@@ -1,7 +1,7 @@
 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' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -23,7 +23,7 @@ export declare type InputRef = {
     blur: () => void;
     nativeElement: HTMLInputElement | null;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "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"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;

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

@@ -116,6 +116,7 @@ export const Input = forwardRef((p, ref) => {
     pattern: props.pattern,
     inputMode: props.inputMode,
     type: props.type,
+    name: props.name,
     autoCapitalize: props.autoCapitalize,
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,

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

@@ -1,6 +1,7 @@
 .adm-jumbo-tabs {
   --gap: 16px;
   position: relative;
+  min-width: 0;
 }
 
 .adm-jumbo-tabs-header {

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

@@ -50,6 +50,7 @@
   padding-left: var(--padding-left);
   position: relative;
   background-color: #ffffff;
+  line-height: 1.5;
 }
 
 .adm-list-item-title,

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

@@ -75,7 +75,7 @@ export const Mask = p => {
       background,
       opacity
     }, props.style), {
-      display: active ? 'unset' : 'none'
+      display: active ? undefined : 'none'
     }),
     onClick: e => {
       var _a;

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

@@ -92,7 +92,7 @@ export const Modal = p => {
   const node = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
     className: cls(),
     style: {
-      display: active ? 'unset' : 'none'
+      display: active ? undefined : 'none'
     }
   }, React.createElement(Mask, {
     visible: props.visible,
@@ -103,7 +103,7 @@ export const Modal = p => {
   }), React.createElement("div", {
     className: cls('wrap'),
     style: {
-      pointerEvents: props.visible ? 'unset' : 'none'
+      pointerEvents: props.visible ? undefined : 'none'
     }
   }, React.createElement(animated.div, {
     style: style

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

@@ -1,9 +1,50 @@
-/// <reference types="react" />
 import './picker.less';
 import { prompt } from './prompt';
-export type { PickerProps } from './picker';
+export type { PickerProps, PickerRef, PickerActions } from './picker';
 export type { PickerValue, PickerColumnItem, PickerColumn, PickerValueExtend, } from '../picker-view';
-declare const _default: import("react").NamedExoticComponent<import("./picker").PickerProps> & {
+declare const _default: import("react").NamedExoticComponent<{
+    columns: import("../picker-view").PickerColumn[] | ((value: import("../picker-view").PickerValue[]) => import("../picker-view").PickerColumn[]);
+    value?: import("../picker-view").PickerValue[] | undefined;
+    defaultValue?: import("../picker-view").PickerValue[] | undefined;
+    onSelect?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
+    onConfirm?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
+    onCancel?: (() => void) | undefined;
+    onClose?: (() => void) | undefined;
+    closeOnMaskClick?: boolean | undefined;
+    visible?: boolean | undefined;
+    title?: import("react").ReactNode;
+    confirmText?: import("react").ReactNode;
+    cancelText?: import("react").ReactNode;
+    children?: ((items: (import("../picker-view").PickerColumnItem | null)[], actions: import("./picker").PickerActions) => import("react").ReactNode) | undefined;
+    renderLabel?: ((item: import("../picker-view").PickerColumnItem) => import("react").ReactNode) | undefined;
+    mouseWheel?: boolean | undefined;
+    popupClassName?: string | undefined;
+    popupStyle?: import("react").CSSProperties | undefined;
+    forceRender?: boolean | undefined;
+    destroyOnClose?: boolean | undefined;
+} & Pick<import("../popup").PopupProps, "onClick" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation"> & import("../../utils/native-props").NativeProps<"--item-height" | "--header-button-font-size" | "--title-font-size" | "--item-font-size"> & import("react").RefAttributes<import("./picker").PickerActions>> & {
+    readonly type: import("react").ForwardRefExoticComponent<{
+        columns: import("../picker-view").PickerColumn[] | ((value: import("../picker-view").PickerValue[]) => import("../picker-view").PickerColumn[]);
+        value?: import("../picker-view").PickerValue[] | undefined;
+        defaultValue?: import("../picker-view").PickerValue[] | undefined;
+        onSelect?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
+        onConfirm?: ((value: import("../picker-view").PickerValue[], extend: import("../picker-view").PickerValueExtend) => void) | undefined;
+        onCancel?: (() => void) | undefined;
+        onClose?: (() => void) | undefined;
+        closeOnMaskClick?: boolean | undefined;
+        visible?: boolean | undefined;
+        title?: import("react").ReactNode;
+        confirmText?: import("react").ReactNode;
+        cancelText?: import("react").ReactNode;
+        children?: ((items: (import("../picker-view").PickerColumnItem | null)[], actions: import("./picker").PickerActions) => import("react").ReactNode) | undefined;
+        renderLabel?: ((item: import("../picker-view").PickerColumnItem) => import("react").ReactNode) | undefined;
+        mouseWheel?: boolean | undefined;
+        popupClassName?: string | undefined;
+        popupStyle?: import("react").CSSProperties | undefined;
+        forceRender?: boolean | undefined;
+        destroyOnClose?: boolean | undefined;
+    } & Pick<import("../popup").PopupProps, "onClick" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation"> & import("../../utils/native-props").NativeProps<"--item-height" | "--header-button-font-size" | "--title-font-size" | "--item-font-size"> & import("react").RefAttributes<import("./picker").PickerActions>>;
+} & {
     prompt: typeof prompt;
 };
 export default _default;

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

@@ -2,6 +2,12 @@ import React, { ReactNode } from 'react';
 import { PopupProps } from '../popup';
 import { NativeProps } from '../../utils/native-props';
 import { PickerColumn, PickerColumnItem, PickerValue, PickerValueExtend } from './index';
+export declare type PickerActions = {
+    open: () => void;
+    close: () => void;
+    toggle: () => void;
+};
+export declare type PickerRef = PickerActions;
 export declare type PickerProps = {
     columns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]);
     value?: PickerValue[];
@@ -15,8 +21,32 @@ export declare type PickerProps = {
     title?: ReactNode;
     confirmText?: ReactNode;
     cancelText?: ReactNode;
-    children?: (items: (PickerColumnItem | null)[]) => ReactNode;
+    children?: (items: (PickerColumnItem | null)[], actions: PickerActions) => ReactNode;
     renderLabel?: (item: PickerColumnItem) => ReactNode;
     mouseWheel?: boolean;
+    popupClassName?: string;
+    popupStyle?: React.CSSProperties;
+    forceRender?: boolean;
+    destroyOnClose?: boolean;
 } & Pick<PopupProps, 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'stopPropagation'> & NativeProps<'--header-button-font-size' | '--title-font-size' | '--item-font-size' | '--item-height'>;
-export declare const Picker: React.NamedExoticComponent<PickerProps>;
+export declare const Picker: React.MemoExoticComponent<React.ForwardRefExoticComponent<{
+    columns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]);
+    value?: PickerValue[] | undefined;
+    defaultValue?: PickerValue[] | undefined;
+    onSelect?: ((value: PickerValue[], extend: PickerValueExtend) => void) | undefined;
+    onConfirm?: ((value: PickerValue[], extend: PickerValueExtend) => void) | undefined;
+    onCancel?: (() => void) | undefined;
+    onClose?: (() => void) | undefined;
+    closeOnMaskClick?: boolean | undefined;
+    visible?: boolean | undefined;
+    title?: ReactNode;
+    confirmText?: ReactNode;
+    cancelText?: ReactNode;
+    children?: ((items: (PickerColumnItem | null)[], actions: PickerActions) => ReactNode) | undefined;
+    renderLabel?: ((item: PickerColumnItem) => ReactNode) | undefined;
+    mouseWheel?: boolean | undefined;
+    popupClassName?: string | undefined;
+    popupStyle?: React.CSSProperties | undefined;
+    forceRender?: boolean | undefined;
+    destroyOnClose?: boolean | undefined;
+} & Pick<PopupProps, "onClick" | "getContainer" | "afterShow" | "afterClose" | "stopPropagation"> & NativeProps<"--item-height" | "--header-button-font-size" | "--title-font-size" | "--item-font-size"> & React.RefAttributes<PickerActions>>>;

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

@@ -1,4 +1,5 @@
-import React, { useState, useEffect, memo } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle, memo } from 'react';
+import classNames from 'classnames';
 import Popup from '../popup';
 import { mergeProps } from '../../utils/with-default-props';
 import { withNativeProps } from '../../utils/native-props';
@@ -9,13 +10,14 @@ import { useConfig } from '../config-provider';
 import { useMemoizedFn } from 'ahooks';
 import SafeArea from '../safe-area';
 import { defaultRenderLabel } from './picker-utils';
+import { useShouldRender } from '../../utils/should-render';
 const classPrefix = `adm-picker`;
 const defaultProps = {
   defaultValue: [],
   closeOnMaskClick: true,
   renderLabel: defaultRenderLabel
 };
-export const Picker = memo(p => {
+export const Picker = memo(forwardRef((p, ref) => {
   var _a;
 
   const {
@@ -25,6 +27,29 @@ export const Picker = memo(p => {
     confirmText: locale.common.confirm,
     cancelText: locale.common.cancel
   }, p);
+  const [visible, setVisible] = usePropsValue({
+    value: props.visible,
+    defaultValue: false,
+    onChange: v => {
+      var _a;
+
+      if (v === false) {
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      }
+    }
+  });
+  const actions = {
+    toggle: () => {
+      setVisible(v => !v);
+    },
+    open: () => {
+      setVisible(true);
+    },
+    close: () => {
+      setVisible(false);
+    }
+  };
+  useImperativeHandle(ref, () => actions);
   const [value, setValue] = usePropsValue(Object.assign(Object.assign({}, props), {
     onChange: val => {
       var _a;
@@ -39,9 +64,9 @@ export const Picker = memo(p => {
     if (innerValue !== value) {
       setInnerValue(value);
     }
-  }, [props.visible]);
+  }, [visible]);
   useEffect(() => {
-    if (!props.visible) {
+    if (!visible) {
       setInnerValue(value);
     }
   }, [value]);
@@ -50,10 +75,11 @@ export const Picker = memo(p => {
 
     setInnerValue(val);
 
-    if (props.visible) {
+    if (visible) {
       (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, val, ext);
     }
   });
+  const shouldRender = useShouldRender(visible, props.forceRender, props.destroyOnClose);
   const pickerElement = withNativeProps(props, React.createElement("div", {
     className: classPrefix
   }, React.createElement("div", {
@@ -61,20 +87,18 @@ export const Picker = memo(p => {
   }, React.createElement("a", {
     className: `${classPrefix}-header-button`,
     onClick: () => {
-      var _a, _b;
+      var _a;
 
       (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
-      (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
+      setVisible(false);
     }
   }, props.cancelText), React.createElement("div", {
     className: `${classPrefix}-header-title`
   }, props.title), React.createElement("a", {
     className: `${classPrefix}-header-button`,
     onClick: () => {
-      var _a;
-
       setValue(innerValue);
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      setVisible(false);
     }
   }, props.confirmText)), React.createElement("div", {
     className: `${classPrefix}-body`
@@ -86,15 +110,16 @@ export const Picker = memo(p => {
     onChange: onChange
   }))));
   const popupElement = React.createElement(Popup, {
-    className: `${classPrefix}-popup`,
-    visible: props.visible,
+    style: props.popupStyle,
+    className: classNames(`${classPrefix}-popup`, props.popupClassName),
+    visible: visible,
     position: 'bottom',
     onMaskClick: () => {
-      var _a, _b;
+      var _a;
 
       if (!props.closeOnMaskClick) return;
       (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
-      (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
+      setVisible(false);
     },
     getContainer: props.getContainer,
     destroyOnClose: true,
@@ -103,9 +128,9 @@ export const Picker = memo(p => {
     onClick: props.onClick,
     forceRender: true,
     stopPropagation: props.stopPropagation
-  }, pickerElement, React.createElement(SafeArea, {
+  }, shouldRender && pickerElement, React.createElement(SafeArea, {
     position: 'bottom'
   }));
-  return React.createElement(React.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, extend.items));
-});
+  return React.createElement(React.Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, extend.items, actions));
+}));
 Picker.displayName = 'Picker';

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

@@ -55,7 +55,7 @@ export const Popup = p => {
     className: classPrefix,
     onClick: props.onClick,
     style: {
-      display: active ? 'unset' : 'none'
+      display: active ? undefined : 'none'
     }
   }, props.mask && React.createElement(Mask, {
     visible: props.visible,

package/2x/es/components/swipe-action/swipe-action.js

@@ -185,7 +185,7 @@ export const SwipeAction = forwardRef((p, ref) => {
     }
   }, React.createElement(animated.div, {
     style: {
-      pointerEvents: x.to(v => v !== 0 && x.goal !== 0 ? 'none' : 'unset')
+      pointerEvents: x.to(v => v !== 0 && x.goal !== 0 ? 'none' : 'auto')
     }
   }, props.children)), withStopPropagation(props.stopPropagation, React.createElement("div", {
     className: 'adm-swipe-action-actions adm-swipe-action-actions-right',

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

@@ -4,6 +4,7 @@
   --active-line-height: 4px;
   --active-line-border-radius: var(--active-line-height);
   position: relative;
+  min-width: 0;
 }
 
 .adm-tabs-header {

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
-export declare type TextAreaProps = Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, 'autoComplete' | 'autoFocus' | 'disabled' | 'readOnly' | 'onFocus' | 'onBlur' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
+export declare type TextAreaProps = Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, 'autoComplete' | 'autoFocus' | 'disabled' | 'readOnly' | 'name' | 'onFocus' | 'onBlur' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
     onChange?: (val: string) => void;
     value?: string;
     defaultValue?: string;
@@ -20,7 +20,7 @@ export declare type TextAreaRef = {
     focus: () => void;
     blur: () => void;
 };
-export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoComplete" | "autoFocus" | "readOnly"> & {
+export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "name" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoComplete" | "autoFocus" | "readOnly"> & {
     onChange?: ((val: string) => void) | undefined;
     value?: string | undefined;
     defaultValue?: string | undefined;

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

@@ -1,4 +1,5 @@
-import React, { forwardRef, useLayoutEffect, useImperativeHandle, useRef } from 'react';
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
+import { useIsomorphicLayoutEffect } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
@@ -41,7 +42,7 @@ export const TextArea = forwardRef((p, ref) => {
       (_a = nativeTextAreaRef.current) === null || _a === void 0 ? void 0 : _a.blur();
     }
   }));
-  useLayoutEffect(() => {
+  useIsomorphicLayoutEffect(() => {
     if (!autoSize) return;
     const textArea = nativeTextAreaRef.current;
     if (!textArea) return;
@@ -114,6 +115,7 @@ export const TextArea = forwardRef((p, ref) => {
     autoFocus: props.autoFocus,
     disabled: props.disabled,
     readOnly: props.readOnly,
+    name: props.name,
     onFocus: props.onFocus,
     onBlur: props.onBlur,
     onClick: props.onClick

package/2x/es/components/toast/methods.js

@@ -1,12 +1,12 @@
 import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
 import { resolveContainer } from '../../utils/get-container';
-import ReactDOM from 'react-dom';
 import { InternalToast } from './toast';
 import { mergeProps } from '../../utils/with-default-props';
+import { render, unmount as reactUnmount } from '../../utils/render';
 const containers = [];
 
 function unmount(container) {
-  const unmountResult = ReactDOM.unmountComponentAtNode(container);
+  const unmountResult = reactUnmount(container);
 
   if (unmountResult && container.parentNode) {
     container.parentNode.removeChild(container);
@@ -64,7 +64,7 @@ export function show(p) {
     }));
   });
   const ref = createRef();
-  ReactDOM.render(React.createElement(TempToast, {
+  render(React.createElement(TempToast, {
     ref: ref
   }), container);
   return {

package/2x/es/utils/render-to-body.js

@@ -1,16 +1,16 @@
-import ReactDOM from 'react-dom';
+import { render, unmount as reactUnmount } from './render';
 export function renderToBody(element) {
   const container = document.createElement('div');
   document.body.appendChild(container);
 
   function unmount() {
-    const unmountResult = ReactDOM.unmountComponentAtNode(container);
+    const unmountResult = reactUnmount(container);
 
     if (unmountResult && container.parentNode) {
       container.parentNode.removeChild(container);
     }
   }
 
-  ReactDOM.render(element, container);
+  render(element, container);
   return unmount;
 }

package/2x/es/utils/render.d.ts

@@ -0,0 +1,9 @@
+import { ReactElement } from 'react';
+import type { Root } from 'react-dom/client';
+declare const MARK = "__antd_mobile_root__";
+declare type ContainerType = (Element | DocumentFragment) & {
+    [MARK]?: Root;
+};
+export declare function render(node: ReactElement, container: ContainerType): void;
+export declare function unmount(container: ContainerType): boolean | Promise<void>;
+export {};

package/2x/es/utils/render.js

@@ -0,0 +1,65 @@
+import { __awaiter } from "tslib";
+import * as ReactDOM from 'react-dom'; // Let compiler not to search module usage
+
+const fullClone = Object.assign({}, ReactDOM);
+const {
+  version,
+  render: reactRender,
+  unmountComponentAtNode
+} = fullClone;
+let createRoot;
+
+try {
+  const mainVersion = Number((version || '').split('.')[0]);
+
+  if (mainVersion >= 18) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    createRoot = require('react-dom/client').createRoot;
+  }
+} catch (e) {// Do nothing;
+}
+
+const MARK = '__antd_mobile_root__';
+
+function legacyRender(node, container) {
+  reactRender(node, container);
+}
+
+function concurrentRender(node, container) {
+  const root = container[MARK] || createRoot(container);
+  root.render(node);
+  container[MARK] = root;
+}
+
+export function render(node, container) {
+  if (createRoot) {
+    concurrentRender(node, container);
+    return;
+  }
+
+  legacyRender(node, container);
+} // ========================== Unmount =========================
+
+function legacyUnmount(container) {
+  return unmountComponentAtNode(container);
+}
+
+function concurrentUnmount(container) {
+  return __awaiter(this, void 0, void 0, function* () {
+    // Delay to unmount to avoid React 18 sync warning
+    return Promise.resolve().then(() => {
+      var _a;
+
+      (_a = container[MARK]) === null || _a === void 0 ? void 0 : _a.unmount();
+      delete container[MARK];
+    });
+  });
+}
+
+export function unmount(container) {
+  if (createRoot) {
+    return concurrentUnmount(container);
+  }
+
+  return legacyUnmount(container);
+}

package/2x/es/utils/use-drag-and-pinch.d.ts

@@ -1 +1 @@
-export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: {} | Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react").ReactDOMAttributes;
+export declare const useDragAndPinch: <Config extends import("@use-gesture/react").UserGestureConfig = import("@use-gesture/react").UserGestureConfig>(_handlers: Partial<import("@use-gesture/react").NativeHandlers<import("@use-gesture/react").EventTypes> & import("@use-gesture/react").UserHandlers<import("@use-gesture/react").EventTypes>>, _config?: Config | undefined) => Config["target"] extends object ? void : (...args: any[]) => import("@use-gesture/react").ReactDOMAttributes;

package/2x/es/utils/use-props-value.d.ts

@@ -4,5 +4,5 @@ declare type Options<T> = {
     defaultValue: T;
     onChange?: (v: T) => void;
 };
-export declare function usePropsValue<T>(options: Options<T>): readonly [T, (this: unknown, v: SetStateAction<T>) => void];
+export declare function usePropsValue<T>(options: Options<T>): readonly [T, (v: SetStateAction<T>) => void];
 export {};