antd-mobile 5.10.2 → 5.11.0

package/2x/es/components/error-block/error-block.d.ts

@@ -1,4 +1,4 @@
-import { FC, ReactElement, ReactNode } from 'react';
+import React, { FC, ReactElement, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ErrorBlockProps = {
     status?: 'default' | 'disconnected' | 'empty' | 'busy';
@@ -6,5 +6,6 @@ export declare type ErrorBlockProps = {
     image?: string | ReactElement;
     description?: ReactNode;
     fullPage?: boolean;
+    children?: React.ReactNode;
 } & NativeProps<'--image-height' | '--image-height-full-page' | '--image-width' | '--image-width-full-page'>;
 export declare const ErrorBlock: FC<ErrorBlockProps>;

package/2x/es/components/floating-bubble/floating-bubble.d.ts

@@ -4,5 +4,6 @@ export declare type FloatingBubbleProps = {
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     axis?: 'x' | 'y' | 'xy' | 'lock';
     magnetic?: 'x' | 'y';
+    children?: React.ReactNode;
 } & NativeProps<'--initial-position-left' | '--initial-position-right' | '--initial-position-top' | '--initial-position-bottom' | '--z-index' | '--edge-distance' | '--size' | '--border-radius' | '--background'>;
 export declare const FloatingBubble: FC<FloatingBubbleProps>;

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

@@ -37,7 +37,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
       tension: 300
     },
     onChange: result => {
-      onHeightChange(result.value.y, y.isAnimating);
+      onHeightChange(-result.value.y, y.isAnimating);
     }
   }));
   useDrag(state => {

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

@@ -6,6 +6,7 @@ export declare type FormContextType = {
     hasFeedback: boolean;
     layout: FormLayout;
     requiredMarkStyle: 'asterisk' | 'text-required' | 'text-optional';
+    disabled: boolean;
 };
 export declare const defaultFormContext: FormContextType;
 export declare const FormContext: React.Context<FormContextType>;

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

@@ -3,7 +3,8 @@ export const defaultFormContext = {
   name: undefined,
   hasFeedback: true,
   layout: 'vertical',
-  requiredMarkStyle: 'asterisk'
+  requiredMarkStyle: 'asterisk',
+  disabled: false
 };
 export const FormContext = React.createContext(defaultFormContext);
 export const NoStyleItemContext = React.createContext(null);

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

@@ -43,7 +43,7 @@
 }
 
 .adm-form-item-child-position-right {
-  justify-content: right;
+  justify-content: flex-end;
 }
 
 .adm-form-item-child-position-right > * {
@@ -66,7 +66,7 @@
 
 .adm-form-item.adm-form-item-horizontal.adm-list-item {
   --align-items: stretch;
-  --prefix-width: 6em;
+  --prefix-width: 6.8em;
 }
 
 .adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {

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

@@ -18,6 +18,8 @@ const MemoInput = React.memo(({
 }) => children, (prev, next) => prev.value === next.value && prev.update === next.update);
 
 const FormItemLayout = props => {
+  var _a;
+
   const {
     className,
     style,
@@ -25,7 +27,6 @@ const FormItemLayout = props => {
     label,
     help,
     required,
-    disabled,
     children,
     htmlFor,
     hidden,
@@ -38,6 +39,7 @@ const FormItemLayout = props => {
   } = useConfig();
   const hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   const layout = props.layout || context.layout;
+  const disabled = (_a = props.disabled) !== null && _a !== void 0 ? _a : context.disabled;
 
   const requiredMark = (() => {
     const {
@@ -92,7 +94,8 @@ const FormItemLayout = props => {
     extra: extra,
     description: description,
     className: classNames(classPrefix, className, `${classPrefix}-${layout}`, {
-      [`${classPrefix}-hidden`]: hidden
+      [`${classPrefix}-hidden`]: hidden,
+      [`${classPrefix}-has-error`]: props.errors.length
     }),
     disabled: disabled,
     onClick: props.onClick,

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

@@ -3,15 +3,12 @@ import { NativeProps } from '../../utils/native-props';
 import { ListProps } from '../list';
 import type { FormProps as RcFormProps, FormInstance as RCFormInstance } from 'rc-field-form';
 import { FormContextType } from './context';
-import type { FormLayout } from '.';
 export declare type FormInstance = Pick<RCFormInstance, 'getFieldValue' | 'getFieldsValue' | 'getFieldError' | 'getFieldsError' | 'isFieldTouched' | 'isFieldsTouched' | 'resetFields' | 'setFields' | 'setFieldsValue' | 'submit' | 'validateFields'>;
 export declare type FormProps = Pick<RcFormProps, 'form' | 'initialValues' | 'name' | 'preserve' | 'validateMessages' | 'validateTrigger' | 'onFieldsChange' | 'onFinish' | 'onFinishFailed' | 'onValuesChange' | 'children'> & NativeProps<'--border-inner' | '--border-top' | '--border-bottom'> & Partial<FormContextType> & {
     footer?: ReactNode;
-    layout?: FormLayout;
     mode?: ListProps['mode'];
 };
 export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<FormContextType> & {
     footer?: ReactNode;
-    layout?: FormLayout | undefined;
     mode?: ListProps['mode'];
 } & React.RefAttributes<FormInstance>>;

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

@@ -23,9 +23,10 @@ export const Form = forwardRef((p, ref) => {
     layout,
     footer,
     mode,
+    disabled,
     requiredMarkStyle
   } = props,
-        formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "requiredMarkStyle"]);
+        formProps = __rest(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "disabled", "requiredMarkStyle"]);
 
   const {
     locale
@@ -76,7 +77,8 @@ export const Form = forwardRef((p, ref) => {
       name: formProps.name,
       hasFeedback,
       layout,
-      requiredMarkStyle
+      requiredMarkStyle,
+      disabled: disabled
     }
   }, lists), footer && React.createElement("div", {
     className: `${classPrefix}-footer`

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

@@ -1,2 +1,4 @@
-import { FC } from 'react';
-export declare const Header: FC;
+import { FC, ReactNode } from 'react';
+export declare const Header: FC<{
+    children?: ReactNode;
+}>;

package/2x/es/components/form/index.css

@@ -69,7 +69,7 @@
 }
 
 .adm-form-item-child-position-right {
-  justify-content: right;
+  justify-content: flex-end;
 }
 
 .adm-form-item-child-position-right > * {
@@ -92,7 +92,7 @@
 
 .adm-form-item.adm-form-item-horizontal.adm-list-item {
   --align-items: stretch;
-  --prefix-width: 6em;
+  --prefix-width: 6.8em;
 }
 
 .adm-form-item.adm-form-item-horizontal .adm-list-item-content-prefix {

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import './index.less';
-import { useForm } from 'rc-field-form';
+import { useWatch, useForm } from 'rc-field-form';
 export declare type FormLayout = 'vertical' | 'horizontal';
 export type { FormProps, FormInstance } from './form';
 export type { FormItemProps } from './form-item';
@@ -9,13 +9,15 @@ export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/in
 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"> & import("../../utils/native-props").NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
-    layout?: FormLayout | undefined;
     mode?: "default" | "card" | undefined;
 } & import("react").RefAttributes<import("./form").FormInstance>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
     Subscribe: import("react").VFC<import("./form-subscribe").FormSubscribeProps>;
-    Header: import("react").FC<{}>;
+    Header: import("react").FC<{
+        children?: import("react").ReactNode;
+    }>;
     Array: import("react").FC<import("./form-array").FormArrayProps>;
     useForm: typeof useForm;
+    useWatch: typeof useWatch;
 };
 export default _default;

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

@@ -3,7 +3,7 @@ import { Form } from './form';
 import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
 import { FormItem } from './form-item';
 import { Header } from './header';
-import { useForm } from 'rc-field-form';
+import { useWatch, useForm } from 'rc-field-form';
 import { FormSubscribe } from './form-subscribe';
 import { FormArray } from './form-array';
 export default attachPropertiesToComponent(Form, {
@@ -11,5 +11,6 @@ export default attachPropertiesToComponent(Form, {
   Subscribe: FormSubscribe,
   Header,
   Array: FormArray,
-  useForm
+  useForm,
+  useWatch
 });

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

@@ -3,10 +3,12 @@ import { NativeProps } from '../../utils/native-props';
 export declare type GridProps = {
     columns: number;
     gap?: number | string | [number | string, number | string];
+    children?: React.ReactNode;
 } & NativeProps<'--gap' | '--gap-vertical' | '--gap-horizontal'>;
 export declare const Grid: FC<GridProps>;
 export declare type GridItemProps = {
     span?: number;
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    children?: React.ReactNode;
 } & NativeProps;
 export declare const GridItem: FC<GridItemProps>;

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

@@ -1,4 +1,4 @@
-import { FC, InputHTMLAttributes } from 'react';
+import React, { FC, InputHTMLAttributes } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import type { ImageProps } from '../image';
 export declare type TaskStatus = 'pending' | 'fail';
@@ -27,5 +27,6 @@ export declare type ImageUploaderProps = {
     preview?: boolean;
     showFailed?: boolean;
     imageFit?: ImageProps['fit'];
+    children?: React.ReactNode;
 } & NativeProps<'--cell-size'>;
 export declare const ImageUploader: FC<ImageUploaderProps>;

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

@@ -4,5 +4,6 @@ export declare type IndexBarPanelProps = {
     index: string;
     title?: ReactNode;
     brief?: ReactNode;
+    children?: ReactNode;
 } & NativeProps;
 export declare const Panel: FC<IndexBarPanelProps>;

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

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

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

@@ -4,6 +4,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { useLockFn, useMemoizedFn } from 'ahooks';
 import { withNativeProps } from '../../utils/native-props';
 import { getScrollParent } from '../../utils/get-scroll-parent';
+import { useConfig } from '../config-provider';
 import DotLoading from '../dot-loading';
 
 function isWindow(element) {
@@ -15,7 +16,10 @@ const classPrefix = `adm-infinite-scroll`;
 const InfiniteScrollContent = ({
   hasMore
 }) => {
-  return React.createElement(React.Fragment, null, hasMore ? React.createElement(React.Fragment, null, React.createElement("span", null, "\u52A0\u8F7D\u4E2D"), React.createElement(DotLoading, null)) : React.createElement("span", null, "\u6CA1\u6709\u66F4\u591A\u4E86"));
+  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));
 };
 
 export const InfiniteScroll = p => {

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

@@ -68,6 +68,10 @@
   display: none;
 }
 
+.adm-input-element:disabled {
+  opacity: 1;
+}
+
 .adm-input-element[type='date'],
 .adm-input-element[type='time'],
 .adm-input-element[type='datetime-local'] {

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'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -9,6 +9,7 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     disabled?: boolean;
     readOnly?: boolean;
     clearable?: boolean;
+    onlyShowClearWhenFocus?: boolean;
     onClear?: () => void;
     id?: string;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
@@ -22,7 +23,7 @@ export declare type InputRef = {
     blur: () => void;
     nativeElement: HTMLInputElement | null;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "autoFocus" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "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;
@@ -30,6 +31,7 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProp
     disabled?: boolean | undefined;
     readOnly?: boolean | undefined;
     clearable?: boolean | undefined;
+    onlyShowClearWhenFocus?: boolean | undefined;
     onClear?: (() => void) | undefined;
     id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;

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

@@ -8,7 +8,8 @@ import { useIsomorphicLayoutEffect } from 'ahooks';
 import { bound } from '../../utils/bound';
 const classPrefix = `adm-input`;
 const defaultProps = {
-  defaultValue: ''
+  defaultValue: '',
+  onlyShowClearWhenFocus: true
 };
 export const Input = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
@@ -70,6 +71,16 @@ export const Input = forwardRef((p, ref) => {
     }
   }
 
+  const shouldShowClear = (() => {
+    if (!props.clearable || !value || props.readOnly) return false;
+
+    if (props.onlyShowClearWhenFocus) {
+      return hasFocus;
+    } else {
+      return true;
+    }
+  })();
+
   return withNativeProps(props, React.createElement("div", {
     className: classNames(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
   }, React.createElement("input", {
@@ -110,8 +121,9 @@ export const Input = forwardRef((p, ref) => {
     onKeyDown: handleKeydown,
     onKeyUp: props.onKeyUp,
     onCompositionStart: props.onCompositionStart,
-    onCompositionEnd: props.onCompositionEnd
-  }), props.clearable && !!value && !props.readOnly && hasFocus && React.createElement("div", {
+    onCompositionEnd: props.onCompositionEnd,
+    onClick: props.onClick
+  }), shouldShowClear && React.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();

package/2x/es/components/jumbo-tabs/jumbo-tabs.d.ts

@@ -1,4 +1,4 @@
-import { FC, ReactNode } from 'react';
+import React, { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type JumboTabProps = {
     title: ReactNode;
@@ -6,11 +6,13 @@ export declare type JumboTabProps = {
     disabled?: boolean;
     forceRender?: boolean;
     destroyOnClose?: boolean;
+    children?: React.ReactNode;
 } & NativeProps;
 export declare const JumboTab: FC<JumboTabProps>;
 export declare type JumboTabsProps = {
     activeKey?: string | null;
     defaultActiveKey?: string | null;
     onChange?: (key: string) => void;
+    children?: React.ReactNode;
 } & NativeProps;
 export declare const JumboTabs: FC<JumboTabsProps>;

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

@@ -49,6 +49,7 @@
   display: block;
   padding-left: var(--padding-left);
   position: relative;
+  background-color: #ffffff;
 }
 
 .adm-list-item-title,

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

@@ -3,5 +3,6 @@ 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>;

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

@@ -14,5 +14,6 @@ export declare type MaskProps = {
     afterShow?: () => void;
     afterClose?: () => void;
     stopPropagation?: PropagationEvent[];
+    children?: React.ReactNode;
 } & NativeProps<'--z-index'>;
 export declare const Mask: React.FC<MaskProps>;

package/2x/es/components/modal/modal-action-button.js

@@ -1,5 +1,4 @@
-import { __awaiter } from "tslib";
-import React, { useState } from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import Button from '../button';
 import { withNativeProps } from '../../utils/native-props';
@@ -7,26 +6,9 @@ export const ModalActionButton = props => {
   const {
     action
   } = props;
-  const [loading, setLoading] = useState(false);
-
-  function handleClick() {
-    return __awaiter(this, void 0, void 0, function* () {
-      setLoading(true);
-
-      try {
-        const promise = props.onAction();
-        yield promise;
-        setLoading(false);
-      } catch (e) {
-        setLoading(false);
-        throw e;
-      }
-    });
-  }
-
   return withNativeProps(props.action, React.createElement(Button, {
     key: action.key,
-    onClick: handleClick,
+    onClick: props.onAction,
     className: classNames('adm-modal-button', {
       'adm-modal-button-primary': props.action.primary
     }),
@@ -34,7 +16,7 @@ export const ModalActionButton = props => {
     size: props.action.primary ? 'large' : 'middle',
     block: true,
     color: action.danger ? 'danger' : 'primary',
-    loading: loading,
+    loading: 'auto',
     disabled: action.disabled
   }, action.text));
 };

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

@@ -1,4 +1,4 @@
-import { FC, ReactNode } from 'react';
+import React, { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type NavBarProps = {
     back?: string | null;
@@ -6,5 +6,6 @@ export declare type NavBarProps = {
     left?: ReactNode;
     right?: ReactNode;
     onBack?: () => void;
+    children?: React.ReactNode;
 } & NativeProps<'--height' | '--border-bottom'>;
 export declare const NavBar: FC<NavBarProps>;

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

@@ -17,5 +17,6 @@ export declare type PickerProps = {
     cancelText?: ReactNode;
     children?: (items: (PickerColumnItem | null)[]) => ReactNode;
     renderLabel?: (item: PickerColumnItem) => ReactNode;
+    mouseWheel?: 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>;

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

@@ -82,6 +82,7 @@ export const Picker = memo(p => {
     columns: props.columns,
     renderLabel: props.renderLabel,
     value: innerValue,
+    mouseWheel: props.mouseWheel,
     onChange: onChange
   }))));
   const popupElement = React.createElement(Popup, {

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

@@ -16,6 +16,7 @@ export declare type PickerViewProps = {
     columns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]);
     value?: PickerValue[];
     defaultValue?: PickerValue[];
+    mouseWheel?: boolean;
     onChange?: (value: PickerValue[], extend: PickerValueExtend) => void;
 } & Pick<PickerProps, 'renderLabel'> & NativeProps<'--height' | '--item-height' | '--item-font-size'>;
 export declare const PickerView: React.NamedExoticComponent<PickerViewProps>;

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

@@ -8,7 +8,8 @@ import { defaultRenderLabel } from '../picker/picker-utils';
 const classPrefix = `adm-picker-view`;
 const defaultProps = {
   defaultValue: [],
-  renderLabel: defaultRenderLabel
+  renderLabel: defaultRenderLabel,
+  mouseWheel: false
 };
 export const PickerView = memo(p => {
   const props = mergeProps(defaultProps, p);
@@ -58,7 +59,8 @@ export const PickerView = memo(p => {
     column: column,
     value: innerValue[index],
     onSelect: handleSelect,
-    renderLabel: props.renderLabel
+    renderLabel: props.renderLabel,
+    mouseWheel: props.mouseWheel
   })), React.createElement("div", {
     className: `${classPrefix}-mask`
   }, React.createElement("div", {

package/2x/es/components/picker-view/wheel.d.ts

@@ -6,6 +6,7 @@ declare type Props = {
     value: PickerValue;
     onSelect: (value: PickerValue, index: number) => void;
     renderLabel: (item: PickerColumnItem) => ReactNode;
+    mouseWheel: boolean;
 };
 export declare const Wheel: React.NamedExoticComponent<Props>;
 export {};

package/2x/es/components/picker-view/wheel.js

@@ -1,11 +1,12 @@
 import React, { memo, useRef } from 'react';
 import { useSpring, animated } from '@react-spring/web';
-import { useDrag } from '@use-gesture/react';
+import { useDrag, useWheel } from '@use-gesture/react';
 import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
 import { bound } from '../../utils/bound';
 import isEqual from 'lodash/isEqual';
 import { useIsomorphicLayoutEffect } from 'ahooks';
 import { measureCSSLength } from '../../utils/measure-css-length';
+import { supportsPassive } from '../../utils/supports-passive';
 const classPrefix = `adm-picker-view`;
 export const Wheel = memo(props => {
   const {
@@ -71,7 +72,7 @@ export const Wheel = memo(props => {
     onSelect(item.value);
   }
 
-  const bind = useDrag(state => {
+  const handleDrag = state => {
     draggingRef.current = true;
     const min = -((column.length - 1) * itemHeight.current);
     const max = 0;
@@ -87,13 +88,31 @@ export const Wheel = memo(props => {
         y: rubberbandIfOutOfBounds(position, min, max, itemHeight.current * 50, 0.2)
       });
     }
+  };
+
+  useDrag(state => {
+    state.event.stopPropagation();
+    handleDrag(state);
   }, {
     axis: 'y',
     from: () => [0, y.get()],
     filterTaps: true,
     pointer: {
       touch: true
-    }
+    },
+    target: rootRef
+  });
+  useWheel(state => {
+    state.event.stopPropagation();
+    handleDrag(state);
+  }, {
+    axis: 'y',
+    from: () => [0, y.get()],
+    preventDefault: true,
+    target: props.mouseWheel ? rootRef : undefined,
+    eventOptions: supportsPassive ? {
+      passive: false
+    } : false
   });
   let selectedIndex = null;
 
@@ -130,10 +149,10 @@ export const Wheel = memo(props => {
     }, "-")));
   }
 
-  return React.createElement("div", Object.assign({
+  return React.createElement("div", {
     ref: rootRef,
     className: `${classPrefix}-column`
-  }, bind()), React.createElement(animated.div, {
+  }, React.createElement(animated.div, {
     style: {
       translateY: y
     },

package/2x/es/components/popover/wrapper.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
-export declare class Wrapper extends React.Component<{}, {}> {
+export declare class Wrapper extends React.Component<{
+    children?: React.ReactNode;
+}, {}> {
     element: Element | null;
     componentDidMount(): void;
     componentDidUpdate(): void;

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

@@ -18,5 +18,6 @@ export declare type PopupProps = {
     maskStyle?: React.CSSProperties;
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     stopPropagation?: PropagationEvent[];
+    children?: React.ReactNode;
 } & NativeProps<'--z-index'>;
 export declare const Popup: FC<PopupProps>;

package/2x/es/components/pull-to-refresh/pull-to-refresh.d.ts

@@ -1,4 +1,4 @@
-import { FC, ReactNode } from 'react';
+import React, { FC, ReactNode } from 'react';
 export declare type PullStatus = 'pulling' | 'canRelease' | 'refreshing' | 'complete';
 export declare type PullToRefreshProps = {
     onRefresh?: () => Promise<any>;
@@ -11,6 +11,7 @@ export declare type PullToRefreshProps = {
     threshold?: number;
     disabled?: boolean;
     renderText?: (status: PullStatus) => ReactNode;
+    children?: React.ReactNode;
 };
 export declare const defaultProps: {
     pullingText: string;