antd-mobile 0.0.0-dev-626cbf51f → 0.0.0-dev.bc248f5c7

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

@@ -6,6 +6,7 @@ import Button from '../button';
 import { nearest } from '../../utils/nearest';
 import { withNativeProps } from '../../utils/native-props';
 import { withStopPropagation } from '../../utils/with-stop-propagation';
+const classPrefix = `adm-swipe-action`;
 const defaultProps = {
   rightActions: [],
   leftActions: [],
@@ -44,6 +45,8 @@ export const SwipeAction = forwardRef((p, ref) => {
   }), []);
   const draggingRef = useRef(false);
   const bind = useDrag(state => {
+    var _a;
+
     draggingRef.current = true;
     const [offsetX] = state.offset;
 
@@ -60,9 +63,15 @@ export const SwipeAction = forwardRef((p, ref) => {
         position = 0;
       }
 
+      const targetX = nearest([-rightWidth, 0, leftWidth], position);
       api.start({
-        x: nearest([-rightWidth, 0, leftWidth], position)
+        x: targetX
       });
+
+      if (targetX !== 0) {
+        (_a = p.onActionsReveal) === null || _a === void 0 ? void 0 : _a.call(p, targetX > 0 ? 'left' : 'right');
+      }
+
       window.setTimeout(() => {
         draggingRef.current = false;
       });
@@ -98,6 +107,8 @@ export const SwipeAction = forwardRef((p, ref) => {
 
   useImperativeHandle(ref, () => ({
     show: (side = 'right') => {
+      var _a;
+
       if (side === 'right') {
         api.start({
           x: -getRightWidth()
@@ -107,6 +118,8 @@ export const SwipeAction = forwardRef((p, ref) => {
           x: getLeftWidth()
         });
       }
+
+      (_a = p.onActionsReveal) === null || _a === void 0 ? void 0 : _a.call(p, side);
     },
     close
   }));
@@ -137,7 +150,7 @@ export const SwipeAction = forwardRef((p, ref) => {
     const color = (_a = action.color) !== null && _a !== void 0 ? _a : 'light';
     return React.createElement(Button, {
       key: action.key,
-      className: 'adm-swipe-action-action-button',
+      className: `${classPrefix}-action-button`,
       style: {
         '--background-color': (_b = colorRecord[color]) !== null && _b !== void 0 ? _b : color
       },
@@ -155,7 +168,7 @@ export const SwipeAction = forwardRef((p, ref) => {
   }
 
   return withNativeProps(props, React.createElement("div", Object.assign({
-    className: 'adm-swipe-action'
+    className: classPrefix
   }, bind(), {
     ref: rootRef,
     onClickCapture: e => {
@@ -165,15 +178,15 @@ export const SwipeAction = forwardRef((p, ref) => {
       }
     }
   }), React.createElement(animated.div, {
-    className: 'adm-swipe-action-track',
+    className: `${classPrefix}-track`,
     style: {
       x
     }
   }, withStopPropagation(props.stopPropagation, React.createElement("div", {
-    className: 'adm-swipe-action-actions adm-swipe-action-actions-left',
+    className: `${classPrefix}-actions ${classPrefix}-actions-left`,
     ref: leftRef
   }, props.leftActions.map(renderAction))), React.createElement("div", {
-    className: 'adm-swipe-action-content',
+    className: `${classPrefix}-content`,
     onClickCapture: e => {
       if (x.goal !== 0) {
         e.preventDefault();
@@ -188,7 +201,7 @@ export const SwipeAction = forwardRef((p, ref) => {
       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',
+    className: `${classPrefix}-actions ${classPrefix}-actions-right`,
     ref: rightRef
   }, props.rightActions.map(renderAction))))));
 });

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

@@ -16,10 +16,18 @@ declare const _default: import("react").ForwardRefExoticComponent<{
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     children?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>[] | undefined;
-} & import("../../utils/native-props").NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./swiper").SwiperRef>> & {
     Item: import("react").FC<{
         onClick?: ((e: import("react").MouseEvent<HTMLDivElement, MouseEvent>) => void) | undefined;
         children?: import("react").ReactNode;
-    } & import("../../utils/native-props").NativeProps<never>>;
+    } & {
+        className?: string | undefined;
+        style?: (import("react").CSSProperties & Partial<Record<never, string>>) | undefined;
+        tabIndex?: number | undefined;
+    } & import("react").AriaAttributes>;
 };
 export default _default;

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

@@ -22,6 +22,7 @@
 }
 
 .adm-swiper-track-allow-touch-move {
+  cursor: -webkit-grab;
   cursor: grab;
 }
 

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

@@ -37,4 +37,8 @@ export declare const Swiper: React.ForwardRefExoticComponent<{
     stuckAtBoundary?: boolean | undefined;
     rubberband?: boolean | undefined;
     children?: React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactElement<any, string | React.JSXElementConstructor<any>>[] | undefined;
-} & NativeProps<"--border-radius" | "--width" | "--height" | "--track-padding"> & React.RefAttributes<SwiperRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--width" | "--height" | "--border-radius" | "--track-padding", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<SwiperRef>>;

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

@@ -11,6 +11,7 @@ import { staged } from 'staged-components';
 import { useRefState } from '../../utils/use-ref-state';
 import { bound } from '../../utils/bound';
 import { useIsomorphicLayoutEffect, useUpdateEffect } from 'ahooks';
+const classPrefix = `adm-swiper`;
 const defaultProps = {
   defaultIndex: 0,
   allowTouchMove: true,
@@ -112,7 +113,14 @@ export const Swiper = forwardRef(staged((p, ref) => {
         });
       }
     }), [count]);
+    const forceDragCancelRef = useRef(() => {});
     const bind = useDrag(state => {
+      forceDragCancelRef.current = () => {
+        state.cancel();
+        setDragging(false);
+      };
+
+      if (!state.intentional) return;
       const slidePixels = getSlidePixels();
       if (!slidePixels) return;
       const paramIndex = isVertical ? 1 : 0;
@@ -141,6 +149,7 @@ export const Swiper = forwardRef(staged((p, ref) => {
         const slidePixels = getSlidePixels();
         return [position.get() / 100 * slidePixels, position.get() / 100 * slidePixels];
       },
+      triggerAllEvents: true,
       bounds: () => {
         if (loop) return {};
         const slidePixels = getSlidePixels();
@@ -209,10 +218,10 @@ export const Swiper = forwardRef(staged((p, ref) => {
     function renderTrackInner() {
       if (loop) {
         return React.createElement("div", {
-          className: 'adm-swiper-track-inner'
+          className: `${classPrefix}-track-inner`
         }, React.Children.map(validChildren, (child, index) => {
           return React.createElement(animated.div, {
-            className: 'adm-swiper-slide',
+            className: `${classPrefix}-slide`,
             style: {
               [isVertical ? 'y' : 'x']: position.to(position => {
                 let finalPosition = -position + index * 100;
@@ -227,13 +236,13 @@ export const Swiper = forwardRef(staged((p, ref) => {
         }));
       } else {
         return React.createElement(animated.div, {
-          className: 'adm-swiper-track-inner',
+          className: `${classPrefix}-track-inner`,
           style: {
             [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
           }
         }, React.Children.map(validChildren, child => {
           return React.createElement("div", {
-            className: 'adm-swiper-slide'
+            className: `${classPrefix}-slide`
           }, child);
         }));
       }
@@ -244,20 +253,22 @@ export const Swiper = forwardRef(staged((p, ref) => {
       '--track-offset': `${props.trackOffset}%`
     };
     return withNativeProps(props, React.createElement("div", {
-      className: classNames('adm-swiper', `adm-swiper-${props.direction}`),
+      className: classNames(classPrefix, `${classPrefix}-${props.direction}`),
       style: style
     }, React.createElement("div", Object.assign({
       ref: trackRef,
-      className: classNames('adm-swiper-track', {
-        'adm-swiper-track-allow-touch-move': props.allowTouchMove
+      className: classNames(`${classPrefix}-track`, {
+        [`${classPrefix}-track-allow-touch-move`]: props.allowTouchMove
       }),
       onClickCapture: e => {
         if (draggingRef.current) {
           e.stopPropagation();
         }
+
+        forceDragCancelRef.current();
       }
     }, props.allowTouchMove ? bind() : {}), renderTrackInner()), props.indicator === undefined ? React.createElement("div", {
-      className: 'adm-swiper-indicator'
+      className: `${classPrefix}-indicator`
     }, React.createElement(PageIndicator, Object.assign({}, props.indicatorProps, {
       total: count,
       current: current,

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

@@ -0,0 +1,26 @@
+.adm-swiper {
+  display: block;
+  width: 100%;
+  height: auto;
+  border-radius: 0;
+}
+
+.adm-swiper-track {
+  padding: 0;
+}
+
+.adm-swiper-horizontal .adm-swiper-track {
+  transform: translateX(0%);
+}
+
+.adm-swiper-horizontal .adm-swiper-track-inner {
+  width: 100%;
+}
+
+.adm-swiper-vertical .adm-swiper-track {
+  transform: translateY(0%);
+}
+
+.adm-swiper-vertical .adm-swiper-track-inner {
+  height: 100%;
+}

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

@@ -29,7 +29,7 @@
   height: var(--height);
   box-sizing: border-box;
   border-radius: 62px;
-  background: #e5e5e5;
+  background: var(--adm-color-border);
   z-index: 0;
   overflow: hidden;
   line-height: var(--height);
@@ -44,7 +44,7 @@
   height: calc(var(--height) - 2 * var(--border-width));
   border-radius: calc(var(--height) - 2 * var(--border-width));
   box-sizing: border-box;
-  background: #fff;
+  background: var(--adm-color-background);
   z-index: 1;
   transition: all 200ms;
   transform: scale(1);
@@ -57,7 +57,7 @@
   width: calc(var(--height) - 2 * var(--border-width));
   height: calc(var(--height) - 2 * var(--border-width));
   border-radius: calc(var(--height) - 2 * var(--border-width));
-  background: #fff;
+  background: var(--adm-color-white);
   position: absolute;
   z-index: 2;
   top: var(--border-width);
@@ -76,7 +76,7 @@
   height: 100%;
   color: var(--adm-color-weak);
   transition: margin 200ms;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
 }
 
 .adm-switch.adm-switch-checked .adm-switch-checkbox {

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

@@ -5,8 +5,9 @@ export declare type SwitchProps = {
     disabled?: boolean;
     checked?: boolean;
     defaultChecked?: boolean;
+    /** @deprecated use `onChange` instead */
     beforeChange?: (val: boolean) => Promise<void>;
-    onChange?: (checked: boolean) => void;
+    onChange?: (checked: boolean) => void | Promise<void>;
     checkedText?: ReactNode;
     uncheckedText?: ReactNode;
 } & NativeProps<'--checked-color' | '--width' | '--height' | '--border-width'>;

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

@@ -5,6 +5,8 @@ import { withNativeProps } from '../../utils/native-props';
 import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
 import { SpinIcon } from './spin-icon';
+import { useConfig } from '../config-provider';
+import { isPromise } from '../../utils/validate';
 const classPrefix = `adm-switch`;
 const defaultProps = {
   defaultChecked: false
@@ -13,6 +15,9 @@ export const Switch = p => {
   const props = mergeProps(defaultProps, p);
   const disabled = props.disabled || props.loading || false;
   const [changing, setChanging] = useState(false);
+  const {
+    locale
+  } = useConfig();
   const [checked, setChecked] = usePropsValue({
     value: props.checked,
     defaultValue: props.defaultChecked,
@@ -32,14 +37,25 @@ export const Switch = p => {
 
         try {
           yield props.beforeChange(nextChecked);
-          setChecked(nextChecked);
           setChanging(false);
         } catch (e) {
           setChanging(false);
           throw e;
         }
-      } else {
-        setChecked(nextChecked);
+      }
+
+      const result = setChecked(nextChecked);
+
+      if (isPromise(result)) {
+        setChanging(true);
+
+        try {
+          yield result;
+          setChanging(false);
+        } catch (e) {
+          setChanging(false);
+          throw e;
+        }
       }
     });
   }
@@ -49,7 +65,11 @@ export const Switch = p => {
     className: classNames(classPrefix, {
       [`${classPrefix}-checked`]: checked,
       [`${classPrefix}-disabled`]: disabled || changing
-    })
+    }),
+    role: 'switch',
+    "aria-label": locale.Switch.name,
+    "aria-checked": checked,
+    "aria-disabled": disabled
   }, React.createElement("div", {
     className: `${classPrefix}-checkbox`
   }, React.createElement("div", {

package/2x/es/components/tab-bar/tab-bar.css

@@ -4,7 +4,7 @@
   justify-content: flex-start;
   align-items: stretch;
   overflow: hidden;
-  min-height: 100px;
+  min-height: 96px;
 }
 
 .adm-tab-bar-item {
@@ -12,6 +12,7 @@
   color: var(--adm-color-weak);
   white-space: nowrap;
   padding: 8px 16px;
+  width: -webkit-min-content;
   width: min-content;
   position: relative;
   cursor: pointer;
@@ -22,17 +23,20 @@
 }
 
 .adm-tab-bar-item-icon {
-  font-size: 40px;
-  height: 44px;
+  font-size: 48px;
+  height: 48px;
   line-height: 1;
-  margin: 8px 0 2px;
 }
 
 .adm-tab-bar-item-title {
-  font-size: 22px;
+  font-size: var(--adm-font-size-3);
   line-height: 30px;
 }
 
+.adm-tab-bar-item-title-with-icon {
+  margin-top: 4px;
+}
+
 .adm-tab-bar-item-active {
   color: var(--adm-color-primary);
 }

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

@@ -6,6 +6,8 @@ import Badge from '../badge';
 import SafeArea from '../safe-area';
 import { usePropsValue } from '../../utils/use-props-value';
 import { traverseReactNode } from '../../utils/traverse-react-node';
+/* istanbul ignore next */
+
 export const TabBarItem = () => {
   return null;
 };
@@ -52,7 +54,7 @@ export const TabBar = p => {
         className: `${classPrefix}-item-icon`
       }, typeof item.props.icon === 'function' ? item.props.icon(active) : item.props.icon);
       const titleElement = item.props.title && React.createElement("div", {
-        className: `${classPrefix}-item-title`
+        className: classNames(`${classPrefix}-item-title`, Boolean(iconElement) && `${classPrefix}-item-title-with-icon`)
       }, typeof item.props.title === 'function' ? item.props.title(active) : item.props.title);
 
       if (iconElement) {

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

@@ -1,15 +1,17 @@
 .adm-tabs {
-  --title-font-size: 34px;
+  --title-font-size: var(--adm-font-size-9);
   --content-padding: 24px;
   --active-line-height: 4px;
   --active-line-border-radius: var(--active-line-height);
+  --active-line-color: var(--adm-color-primary);
+  --active-title-color: var(--adm-color-primary);
   position: relative;
   min-width: 0;
 }
 
 .adm-tabs-header {
   position: relative;
-  border-bottom: solid 2px var(--adm-border-color);
+  border-bottom: solid 2px var(--adm-color-border);
 }
 
 .adm-tabs-tab-list {
@@ -37,6 +39,7 @@
 .adm-tabs-tab {
   white-space: nowrap;
   padding: 16px 0 20px;
+  width: -webkit-min-content;
   width: min-content;
   margin: 0 auto;
   font-size: var(--title-font-size);
@@ -45,7 +48,7 @@
 }
 
 .adm-tabs-tab-active {
-  color: var(--adm-color-primary);
+  color: var(--active-title-color);
 }
 
 .adm-tabs-tab-disabled {
@@ -57,8 +60,7 @@
   position: absolute;
   bottom: 0;
   height: var(--active-line-height);
-  color: var(--adm-color-primary);
-  background: var(--adm-color-primary);
+  background: var(--active-line-color);
   border-radius: var(--active-line-border-radius);
 }
 
@@ -78,10 +80,10 @@
 
 .adm-tabs-header-mask-left {
   left: 0;
-  background: linear-gradient(to right, #fff, rgba(255, 255, 255, 0));
+  background: linear-gradient(to right, var(--adm-color-background), rgba(255, 255, 255, 0));
 }
 
 .adm-tabs-header-mask-right {
   right: 0;
-  background: linear-gradient(to left, #fff, rgba(255, 255, 255, 0));
+  background: linear-gradient(to left, var(--adm-color-background), rgba(255, 255, 255, 0));
 }

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

@@ -15,5 +15,5 @@ export declare type TabsProps = {
     stretch?: boolean;
     onChange?: (key: string) => void;
     children?: React.ReactNode;
-} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding'>;
+} & NativeProps<'--fixed-active-line-width' | '--active-line-height' | '--active-line-border-radius' | '--title-font-size' | '--content-padding' | '--active-title-color' | '--active-line-color'>;
 export declare const Tabs: FC<TabsProps>;

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

@@ -0,0 +1,29 @@
+.adm-tabs-header {
+  border-bottom: solid 2px #eeeeee;
+}
+
+.adm-tabs-tab {
+  font-size: 34px;
+}
+
+.adm-tabs-tab-active {
+  color: #1677ff;
+}
+
+.adm-tabs-tab-line {
+  height: 4px;
+  background: #1677ff;
+  border-radius: 4px;
+}
+
+.adm-tabs-content {
+  padding: 24px;
+}
+
+.adm-tabs-header-mask-left {
+  background: linear-gradient(to right, #ffffff, rgba(255, 255, 255, 0));
+}
+
+.adm-tabs-header-mask-right {
+  background: linear-gradient(to left, #ffffff, rgba(255, 255, 255, 0));
+}

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

@@ -1,7 +1,7 @@
 .adm-tag {
   --border-radius: var(--adm-tag-border-radius, 4px);
   padding: 4px 8px;
-  font-size: 22px;
+  font-size: var(--adm-font-size-3);
   line-height: 1;
   font-weight: normal;
   background: var(--background-color);

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

@@ -1,5 +1,5 @@
 .adm-text-area {
-  --font-size: 34px;
+  --font-size: var(--adm-font-size-9);
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
   --disabled-color: var(--adm-color-weak);
@@ -27,11 +27,17 @@
   background: transparent;
   border: 0;
   outline: none;
+  -webkit-appearance: none;
   appearance: none;
   min-height: 1.5em;
   text-align: var(--text-align);
 }
 
+.adm-text-area-element::-webkit-input-placeholder {
+  color: var(--placeholder-color);
+  font-family: inherit;
+}
+
 .adm-text-area-element::placeholder {
   color: var(--placeholder-color);
   font-family: inherit;
@@ -67,6 +73,6 @@
 .adm-text-area-count {
   text-align: var(--count-text-align);
   color: var(--adm-color-weak);
-  font-size: 34px;
+  font-size: var(--adm-font-size-9);
   padding-top: 16px;
 }

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

@@ -19,6 +19,7 @@ export declare type TextAreaRef = {
     clear: () => void;
     focus: () => void;
     blur: () => void;
+    nativeElement: HTMLTextAreaElement | null;
 };
 export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>, "onClick" | "disabled" | "name" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "autoComplete" | "autoFocus" | "readOnly"> & {
     onChange?: ((val: string) => void) | undefined;
@@ -33,4 +34,8 @@ export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.Detail
         maxRows?: number | undefined;
     } | undefined;
     id?: string | undefined;
-} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--count-text-align"> & React.RefAttributes<TextAreaRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--count-text-align", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<TextAreaRef>>;

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

@@ -40,7 +40,12 @@ export const TextArea = forwardRef((p, ref) => {
       var _a;
 
       (_a = nativeTextAreaRef.current) === null || _a === void 0 ? void 0 : _a.blur();
+    },
+
+    get nativeElement() {
+      return nativeTextAreaRef.current;
     }
+
   }));
   useIsomorphicLayoutEffect(() => {
     if (!autoSize) return;
@@ -106,7 +111,8 @@ export const TextArea = forwardRef((p, ref) => {
       compositingRef.current = false;
 
       if (maxLength) {
-        setValue([...value].slice(0, maxLength).join(''));
+        const v = e.target.value;
+        setValue([...v].slice(0, maxLength).join(''));
       }
 
       (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);