antd-mobile 5.0.0-beta.9 → 5.0.0-rc.3

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

@@ -1,32 +1,51 @@
 .adm-stepper {
+  --height: 44px;
+  --input-width: 80px;
+  --input-font-size: var(--adm-font-size-main);
+  --input-font-color: var(--adm-color-text);
+  --border-radius: 4px;
+  --border: 2px solid #e5e5e5;
+  --border-inner: var(--border);
+  --active-border: var(--border);
+  --button-font-size: 20px;
+  --button-text-color: var(--adm-color-primary);
+  --button-background-color: transparent;
+  --button-width: var(--height);
   display: flex;
   align-items: center;
   box-sizing: border-box;
   position: relative;
-  width: 160px;
+  overflow: hidden;
+  width: calc(var(--input-width) + 2 * var(--button-width));
+  border: var(--border);
+  border-radius: var(--border-radius);
+}
+
+.adm-stepper-active {
+  border: var(--active-border);
 }
 
 .adm-stepper .adm-stepper-input {
-  position: relative;
   flex: 1;
-  height: 44px;
-  border-top: 2px solid #e5e5e5;
-  border-bottom: 2px solid #e5e5e5;
-  --font-size: var(--adm-font-size-main);
+  height: var(--height);
+  border-left: var(--border-inner);
+  border-right: var(--border-inner);
 }
 
 .adm-stepper .adm-stepper-input > input {
   text-align: center;
+  font-size: var(--input-font-size);
+  color: var(--input-font-color);
 }
 
 .adm-stepper-minus,
 .adm-stepper-plus {
-  width: 44px;
-  height: 44px;
+  width: var(--button-width);
+  height: var(--height);
   padding: 0;
-  border: 2px solid #e5e5e5;
-  border-radius: 4px;
-  font-size: 20px;
+  color: var(--button-text-color);
+  background-color: var(--button-background-color);
+  font-size: var(--button-font-size);
 }
 
 .adm-stepper-minus:disabled,
@@ -35,10 +54,18 @@
   opacity: 1;
 }
 
+.adm-stepper-minus svg,
+.adm-stepper-plus svg {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
 .adm-stepper-minus {
-  left: 2px;
+  border-radius: 0;
 }
 
 .adm-stepper-plus {
-  left: -2px;
+  border-radius: 0;
 }

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

@@ -1,6 +1,7 @@
-import React from 'react';
+import { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
-export declare type StepperProps = {
+import { InputProps } from '../input';
+export declare type StepperProps = Pick<InputProps, 'onFocus' | 'onBlur'> & {
     value?: number;
     defaultValue?: number;
     min?: number;
@@ -9,5 +10,5 @@ export declare type StepperProps = {
     digits?: number;
     disabled?: boolean;
     onChange?: (value: number) => void;
-} & NativeProps;
-export declare const Stepper: React.FC<StepperProps>;
+} & NativeProps<'--height' | '--input-width' | '--input-font-size' | '--border-radius' | '--border' | '--border-inner' | '--active-border' | '--button-font-size' | '--button-background-color' | '--button-width' | '--input-font-color' | '--button-text-color'>;
+export declare const Stepper: FC<StepperProps>;

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

@@ -1,9 +1,9 @@
 import classNames from 'classnames';
 import React, { useEffect, useState } from 'react';
-import { PlusOutlined, MinusOutlined } from '@ant-design/icons';
+import { MinusOutline, AddOutline } from 'antd-mobile-icons';
 import { withNativeProps } from '../../utils/native-props';
-import { useNewControllableValue } from '../../utils/use-controllable-value';
-import { withDefaultProps } from '../../utils/with-default-props';
+import { usePropsValue } from '../../utils/use-props-value';
+import { mergeProps } from '../../utils/with-default-props';
 import { bound } from '../../utils/bound';
 import Input from '../input';
 import Button from '../button';
@@ -13,17 +13,18 @@ var defaultProps = {
   step: 1,
   disabled: false
 };
-export var Stepper = withDefaultProps(defaultProps)(function (props) {
+export var Stepper = function Stepper(p) {
   var _classNames;
 
+  var props = mergeProps(defaultProps, p);
   var disabled = props.disabled,
       step = props.step,
       max = props.max,
       min = props.min;
 
-  var _useNewControllableVa = useNewControllableValue(props),
-      value = _useNewControllableVa[0],
-      setValue = _useNewControllableVa[1];
+  var _usePropsValue = usePropsValue(props),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1];
 
   var _useState = useState(function () {
     return value.toString();
@@ -40,10 +41,6 @@ export var Stepper = withDefaultProps(defaultProps)(function (props) {
     }
 
     setValue(target);
-
-    if (!hasFocus) {
-      setInputValue(target.toString());
-    }
   }
 
   var _useState2 = useState(false),
@@ -55,6 +52,11 @@ export var Stepper = withDefaultProps(defaultProps)(function (props) {
       setInputValue(value.toString());
     }
   }, [hasFocus]);
+  useEffect(function () {
+    if (!hasFocus) {
+      setInputValue(value.toString());
+    }
+  }, [value]);
 
   var handleInputChange = function handleInputChange(v) {
     setInputValue(v);
@@ -86,25 +88,31 @@ export var Stepper = withDefaultProps(defaultProps)(function (props) {
   };
 
   return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
-    className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-disabled"] = disabled, _classNames))
+    className: classNames(classPrefix, (_classNames = {}, _classNames[classPrefix + "-disabled"] = disabled, _classNames[classPrefix + "-active"] = hasFocus, _classNames))
   }, /*#__PURE__*/React.createElement(Button, {
     className: classPrefix + "-minus",
     onClick: handleMinus,
     disabled: minusDisabled(),
     fill: 'none',
     color: 'primary'
-  }, /*#__PURE__*/React.createElement(MinusOutlined, null)), /*#__PURE__*/React.createElement(Input, {
+  }, /*#__PURE__*/React.createElement(MinusOutline, null)), /*#__PURE__*/React.createElement(Input, {
     className: classPrefix + "-input",
-    onFocus: function onFocus() {
+    onFocus: function onFocus(e) {
+      var _a;
+
       setHasFocus(true);
+      (_a = props.onFocus) === null || _a === void 0 ? void 0 : _a.call(props, e);
     },
     value: inputValue,
     onChange: function onChange(val) {
       disabled || handleInputChange(val);
     },
     disabled: disabled,
-    onBlur: function onBlur() {
+    onBlur: function onBlur(e) {
+      var _a;
+
       setHasFocus(false);
+      (_a = props.onBlur) === null || _a === void 0 ? void 0 : _a.call(props, e);
     }
   }), /*#__PURE__*/React.createElement(Button, {
     className: classPrefix + "-plus",
@@ -112,5 +120,5 @@ export var Stepper = withDefaultProps(defaultProps)(function (props) {
     disabled: plusDisabled(),
     fill: 'none',
     color: 'primary'
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null))));
-});
+  }, /*#__PURE__*/React.createElement(AddOutline, null))));
+};

package/2x/es/components/steps/step.d.ts

@@ -1,8 +1,9 @@
 import React, { FC } from 'react';
-export interface StepProps {
+import { NativeProps } from '../../utils/native-props';
+export declare type StepProps = {
     title?: React.ReactNode;
     description?: React.ReactNode;
     icon?: React.ReactNode;
     status?: 'wait' | 'process' | 'finish' | 'error';
-}
+} & NativeProps;
 export declare const Step: FC<StepProps>;

package/2x/es/components/steps/step.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
+import { withNativeProps } from '../../utils/native-props';
 var classPrefix = "adm-step";
 export var Step = function Step(props) {
   var title = props.title,
@@ -7,7 +8,7 @@ export var Step = function Step(props) {
       icon = props.icon,
       _props$status = props.status,
       status = _props$status === void 0 ? 'wait' : _props$status;
-  return /*#__PURE__*/React.createElement("div", {
+  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
     className: classNames("" + classPrefix, classPrefix + "-status-" + status)
   }, /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-indicator"
@@ -19,5 +20,5 @@ export var Step = function Step(props) {
     className: classPrefix + "-title"
   }, title), !!description && /*#__PURE__*/React.createElement("div", {
     className: classPrefix + "-description"
-  }, description)));
+  }, description))));
 };

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

@@ -21,7 +21,7 @@
   color: var(--icon-color);
 }
 
-.adm-step .adm-step-indicator .adm-step-icon-container > .anticon {
+.adm-step .adm-step-indicator .adm-step-icon-container > .antd-mobile-icon {
   display: block;
 }
 

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

@@ -1,8 +1,9 @@
-import React from 'react';
+import { FC } from 'react';
+import { NativeProps } from '../../utils/native-props';
 declare type Direction = 'horizontal' | 'vertical';
-export interface StepsProps {
+export declare type StepsProps = {
     current?: number;
     direction?: Direction;
-}
-export declare const Steps: React.FC<StepsProps>;
+} & NativeProps;
+export declare const Steps: FC<StepsProps>;
 export {};

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
-import { withDefaultProps } from '../../utils/with-default-props';
+import { mergeProps } from '../../utils/with-default-props';
+import { withNativeProps } from '../../utils/native-props';
 var classPrefix = "adm-steps";
 var stepClassPrefix = "adm-step";
 var defaultIcon = /*#__PURE__*/React.createElement("span", {
@@ -10,11 +11,12 @@ var defaultProps = {
   current: 0,
   direction: 'horizontal'
 };
-export var Steps = withDefaultProps(defaultProps)(function (props) {
+export var Steps = function Steps(p) {
+  var props = mergeProps(defaultProps, p);
   var direction = props.direction,
       current = props.current;
   var classString = classNames(classPrefix, classPrefix + "-" + direction);
-  return /*#__PURE__*/React.createElement("div", {
+  return withNativeProps(props, /*#__PURE__*/React.createElement("div", {
     className: classString
   }, React.Children.map(props.children, function (child, index) {
     var _a;
@@ -37,5 +39,5 @@ export var Steps = withDefaultProps(defaultProps)(function (props) {
       status: status,
       icon: icon
     });
-  }));
-});
+  })));
+};

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

@@ -3,6 +3,7 @@
   background: var(--background);
   cursor: grab;
   overflow: hidden;
+  touch-action: pan-y;
 }
 
 .adm-swipe-action-track {

package/2x/es/components/swipe-action/swipe-action.d.ts

@@ -9,13 +9,13 @@ export declare type Action = {
     key: string | number;
     text: ReactNode;
     color?: ActionColor | string;
-    onClick?: () => void;
+    onClick?: (e: React.MouseEvent) => void;
 };
 export declare type SwipeActionProps = {
     rightActions?: Action[];
     leftActions?: Action[];
     onAction?: (action: Action) => void;
-    closeOnTouchAway?: boolean;
+    closeOnTouchOutside?: boolean;
     closeOnAction?: boolean;
     children: ReactNode;
 } & NativeProps<'--background'>;
@@ -23,7 +23,7 @@ export declare const SwipeAction: React.ForwardRefExoticComponent<{
     rightActions?: Action[] | undefined;
     leftActions?: Action[] | undefined;
     onAction?: ((action: Action) => void) | undefined;
-    closeOnTouchAway?: boolean | undefined;
+    closeOnTouchOutside?: boolean | undefined;
     closeOnAction?: boolean | undefined;
     children: ReactNode;
 } & NativeProps<"--background"> & React.RefAttributes<SwipeActionRef>>;

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

@@ -1,14 +1,14 @@
 import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { useSpring, animated } from '@react-spring/web';
-import { useDrag } from 'react-use-gesture';
+import { useDrag } from '@use-gesture/react';
 import Button from '../button';
 import { nearest } from '../../utils/nearest';
 import { withNativeProps } from '../../utils/native-props';
 var defaultProps = {
   rightActions: [],
   leftActions: [],
-  closeOnTouchAway: true,
+  closeOnTouchOutside: true,
   closeOnAction: true
 };
 export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
@@ -46,17 +46,17 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
   var draggingRef = useRef(false);
   var bind = useDrag(function (state) {
     draggingRef.current = true;
-    var _state$movement = state.movement,
-        mx = _state$movement[0];
+    var _state$offset = state.offset,
+        offsetX = _state$offset[0];
 
     if (state.last) {
       var leftWidth = getLeftWidth();
       var rightWidth = getRightWidth();
-      var position = mx + state.vxvy[0] * 50;
+      var position = offsetX + state.velocity[0] * state.direction[0] * 50;
 
-      if (mx > 0) {
+      if (offsetX > 0) {
         position = Math.max(0, position);
-      } else if (mx < 0) {
+      } else if (offsetX < 0) {
         position = Math.min(0, position);
       } else {
         position = 0;
@@ -70,12 +70,12 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
       });
     } else {
       api.start({
-        x: mx,
+        x: offsetX,
         immediate: true
       });
     }
   }, {
-    initial: function initial() {
+    from: function from() {
       return [x.get(), 0];
     },
     bounds: function bounds() {
@@ -88,7 +88,10 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
     },
     // rubberband: true,
     axis: 'x',
-    experimental_preventWindowScrollY: true
+    preventScroll: true,
+    pointer: {
+      touch: true
+    }
   });
 
   function close() {
@@ -106,7 +109,7 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
 
         if (side === 'right') {
           api.start({
-            x: getRightWidth()
+            x: -getRightWidth()
           });
         } else if (side === 'left') {
           api.start({
@@ -118,7 +121,7 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
     };
   });
   useEffect(function () {
-    if (!props.closeOnTouchAway) return;
+    if (!props.closeOnTouchOutside) return;
 
     function handle(e) {
       if (x.get() === 0) {
@@ -132,11 +135,11 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
       }
     }
 
-    document.addEventListener('pointerdown', handle);
+    document.addEventListener('touchstart', handle);
     return function () {
-      document.removeEventListener('pointerdown', handle);
+      document.removeEventListener('touchstart', handle);
     };
-  }, [props.closeOnTouchAway]);
+  }, [props.closeOnTouchOutside]);
 
   function renderAction(action) {
     var _a, _b;
@@ -148,14 +151,14 @@ export var SwipeAction = /*#__PURE__*/forwardRef(function (p, ref) {
       style: {
         '--background-color': (_b = colorRecord[color]) !== null && _b !== void 0 ? _b : color
       },
-      onClick: function onClick() {
+      onClick: function onClick(e) {
         var _a, _b;
 
         if (props.closeOnAction) {
           close();
         }
 
-        (_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action);
+        (_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action, e);
         (_b = props.onAction) === null || _b === void 0 ? void 0 : _b.call(props, action);
       }
     }, action.text);

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

@@ -7,11 +7,16 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     autoplay?: boolean | undefined;
     autoplayInterval?: number | undefined;
     loop?: boolean | undefined;
+    direction?: "horizontal" | "vertical" | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
-    indicatorProps?: Pick<import("../page-indicator").PageIndicatorProps, "color" | "style" | "className"> | undefined;
+    indicatorProps?: Pick<import("../page-indicator").PageIndicatorProps, "style" | "color" | "className"> | undefined;
     indicator?: ((total: number, current: number) => import("react").ReactNode) | undefined;
+    slideSize?: number | undefined;
+    trackOffset?: number | undefined;
+    stuckAtBoundary?: boolean | undefined;
+    rubberband?: boolean | undefined;
     children?: import("react").ReactElement<any, string | ((props: any) => import("react").ReactElement<any, any> | null) | (new (props: any) => import("react").Component<any, any, any>)> | import("react").ReactElement<any, string | ((props: any) => import("react").ReactElement<any, any> | null) | (new (props: any) => import("react").Component<any, any, any>)>[] | undefined;
-} & import("../../utils/native-props").NativeProps<"--border-radius" | "--height" | "--width" | "--slide-width" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
+} & import("../../utils/native-props").NativeProps<"--border-radius" | "--height" | "--width" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
     } & import("../../utils/native-props").NativeProps<never>>;

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

@@ -1,20 +1,22 @@
 .adm-swiper {
   --height: auto;
   --width: 100%;
-  --slide-width: 100%;
   --border-radius: 0;
   --track-padding: 0;
+  --slide-size: 100%;
+  --track-offset: 0%;
   display: block;
   width: var(--width);
   height: var(--height);
   position: relative;
   border-radius: var(--border-radius);
   z-index: 0;
+  overflow: hidden;
 }
 
 .adm-swiper-track {
   width: 100%;
-  overflow: hidden;
+  height: 100%;
   white-space: nowrap;
   padding: var(--track-padding);
 }
@@ -24,20 +26,14 @@
 }
 
 .adm-swiper-track-inner {
-  width: var(--slide-width);
+  width: 100%;
+  height: 100%;
   overflow: visible;
   position: relative;
   display: flex;
   flex-wrap: nowrap;
 }
 
-.adm-swiper-indicator {
-  position: absolute;
-  bottom: 12px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
 .adm-swiper-slide {
   width: 100%;
   height: 100%;
@@ -50,5 +46,46 @@
 .adm-swiper-item {
   display: block;
   width: 100%;
-  height: auto;
+  height: 100%;
+  white-space: normal;
+}
+
+.adm-swiper-horizontal .adm-swiper-track-allow-touch-move {
+  touch-action: pan-y;
+}
+
+.adm-swiper-horizontal .adm-swiper-indicator {
+  position: absolute;
+  bottom: 12px;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.adm-swiper-horizontal .adm-swiper-track {
+  transform: translateX(var(--track-offset));
+}
+
+.adm-swiper-horizontal .adm-swiper-track-inner {
+  flex-direction: row;
+  width: var(--slide-size);
+}
+
+.adm-swiper-vertical .adm-swiper-track-allow-touch-move {
+  touch-action: pan-x;
+}
+
+.adm-swiper-vertical .adm-swiper-indicator {
+  position: absolute;
+  right: 12px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.adm-swiper-vertical .adm-swiper-track {
+  transform: translateY(var(--track-offset));
+}
+
+.adm-swiper-vertical .adm-swiper-track-inner {
+  flex-direction: column;
+  height: var(--slide-size);
 }

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

@@ -12,19 +12,29 @@ export declare type SwiperProps = {
     autoplay?: boolean;
     autoplayInterval?: number;
     loop?: boolean;
+    direction?: 'horizontal' | 'vertical';
     onIndexChange?: (index: number) => void;
     indicatorProps?: Pick<PageIndicatorProps, 'color' | 'style' | 'className'>;
     indicator?: (total: number, current: number) => ReactNode;
+    slideSize?: number;
+    trackOffset?: number;
+    stuckAtBoundary?: boolean;
+    rubberband?: boolean;
     children?: ReactElement | ReactElement[];
-} & NativeProps<'--height' | '--width' | '--slide-width' | '--border-radius' | '--track-padding'>;
+} & NativeProps<'--height' | '--width' | '--border-radius' | '--track-padding'>;
 export declare const Swiper: React.ForwardRefExoticComponent<{
     defaultIndex?: number | undefined;
     allowTouchMove?: boolean | undefined;
     autoplay?: boolean | undefined;
     autoplayInterval?: number | undefined;
     loop?: boolean | undefined;
+    direction?: "horizontal" | "vertical" | undefined;
     onIndexChange?: ((index: number) => void) | undefined;
-    indicatorProps?: Pick<PageIndicatorProps, "color" | "style" | "className"> | undefined;
+    indicatorProps?: Pick<PageIndicatorProps, "style" | "color" | "className"> | undefined;
     indicator?: ((total: number, current: number) => ReactNode) | undefined;
+    slideSize?: number | undefined;
+    trackOffset?: number | undefined;
+    stuckAtBoundary?: boolean | undefined;
+    rubberband?: boolean | undefined;
     children?: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)>[] | undefined;
-} & NativeProps<"--border-radius" | "--height" | "--width" | "--slide-width" | "--track-padding"> & React.RefAttributes<SwiperRef>>;
+} & NativeProps<"--border-radius" | "--height" | "--width" | "--track-padding"> & React.RefAttributes<SwiperRef>>;