antd-mobile 5.0.0-rc.22 → 5.0.0-rc.23

package/es/components/checkbox/check-icon.js

@@ -2,18 +2,9 @@ import React, { memo } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 export const CheckIcon = memo(props => {
   return withNativeProps(props, React.createElement("svg", {
-    viewBox: '0 0 24 16'
-  }, React.createElement("g", {
-    stroke: 'none',
-    strokeWidth: '1',
-    fill: 'none',
-    fillRule: 'evenodd'
-  }, React.createElement("g", {
-    transform: 'translate(-35.000000, -40.000000)',
-    fill: 'currentColor'
-  }, React.createElement("g", {
-    transform: 'translate(24.000000, 26.000000)'
+    viewBox: '0 0 40 40'
   }, React.createElement("path", {
-    d: 'M18.8574375,25.9363304 L14.4138058,21.4926987 C13.8001225,20.8790154 12.8051453,20.8790154 12.1914621,21.4926987 C11.5777807,22.10638 11.5777807,23.1013541 12.1914621,23.7150354 C12.1914632,23.7150366 12.1914644,23.7150377 12.1914656,23.7150389 L17.4442507,28.9677909 C18.225314,29.7488091 19.4916285,29.7488141 20.2726979,28.9678021 L21.0808125,28.1597054 L21.0808125,28.1597054 L32.5627182,16.6759191 C33.176366,16.0621709 33.1763252,15.0671824 32.5626272,14.4534844 C31.948944,13.8398011 30.9539668,13.8398011 30.3402835,14.4534844 L18.8574375,25.9363304 L18.8574375,25.9363304 Z'
-  }))))));
+    d: 'M31.5541766,15 L28.0892433,15 L28.0892434,15 C27.971052,15 27.8576674,15.044522 27.7740471,15.1239792 L18.2724722,24.1625319 L13.2248725,19.3630279 L13.2248725,19.3630279 C13.1417074,19.2834412 13.0287551,19.2384807 12.9107898,19.2380079 L9.44474455,19.2380079 L9.44474454,19.2380079 C9.19869815,19.2384085 8.99957935,19.4284738 9,19.66253 C9,19.7747587 9.04719253,19.8823283 9.13066188,19.9616418 L17.0907466,27.5338228 C17.4170809,27.8442545 17.8447695,28 18.2713393,28 L18.2980697,28 C18.7168464,27.993643 19.133396,27.8378975 19.4530492,27.5338228 L31.8693384,15.7236361 L31.8693384,15.7236361 C32.0434167,15.5582251 32.0435739,15.2898919 31.8696892,15.1242941 C31.7860402,15.0446329 31.6725052,15 31.5541421,15 L31.5541766,15 Z',
+    fill: 'currentColor'
+  })));
 });

package/es/components/checkbox/checkbox.css

@@ -16,16 +16,14 @@
   border: 1px solid var(--adm-color-light);
   border-radius: var(--icon-size);
   box-sizing: border-box;
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: var(--icon-size);
   height: var(--icon-size);
-  color: #ffffff;
+  color: var(--adm-color-white);
 }
-.adm-checkbox .adm-checkbox-icon-checked {
-  width: 65%;
-  height: 65%;
+.adm-checkbox .adm-checkbox-icon > svg {
+  display: block;
+  width: 100%;
+  height: 100%;
 }
 .adm-checkbox.adm-checkbox-block {
   display: flex;
@@ -52,12 +50,6 @@
   background-color: #ffffff;
   color: var(--adm-color-primary);
 }
-.adm-checkbox.adm-checkbox-indeterminate .adm-checkbox-indeterminate-checked {
-  width: 60%;
-  height: 60%;
-  border-radius: 100%;
-  background-color: currentColor;
-}
 .adm-checkbox-content {
   flex: 0 1 auto;
   font-size: var(--font-size);

package/es/components/checkbox/checkbox.js

@@ -6,6 +6,7 @@ import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
 import { devWarning } from '../../utils/dev-log';
 import { CheckIcon } from './check-icon';
+import { IndeterminateIcon } from './indeterminate-icon';
 const classPrefix = `adm-checkbox`;
 const defaultProps = {
   defaultChecked: false,
@@ -63,11 +64,7 @@ export const Checkbox = p => {
 
     return React.createElement("div", {
       className: `${classPrefix}-icon`
-    }, props.indeterminate ? React.createElement("div", {
-      className: `${classPrefix}-indeterminate-checked`
-    }) : checked && React.createElement(CheckIcon, {
-      className: `${classPrefix}-icon-checked`
-    }));
+    }, props.indeterminate ? React.createElement(IndeterminateIcon, null) : checked && React.createElement(CheckIcon, null));
   };
 
   return withNativeProps(props, React.createElement("label", {

package/es/components/checkbox/indeterminate-icon.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare const IndeterminateIcon: React.NamedExoticComponent<NativeProps<never>>;

package/es/components/checkbox/indeterminate-icon.js

@@ -0,0 +1,10 @@
+import React, { memo } from 'react';
+import { withNativeProps } from '../../utils/native-props';
+export const IndeterminateIcon = memo(props => {
+  return withNativeProps(props, React.createElement("svg", {
+    viewBox: '0 0 40 40'
+  }, React.createElement("path", {
+    d: 'M20,9 C26.0752953,9 31,13.9247047 31,20 C31,26.0752953 26.0752953,31 20,31 C13.9247047,31 9,26.0752953 9,20 C9,13.9247047 13.9247047,9 20,9 Z',
+    fill: 'currentColor'
+  })));
+});

package/es/components/image-viewer/image-viewer.d.ts

@@ -1,5 +1,6 @@
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { GetContainer } from '../../utils/render-to-container';
+import { SlidesRef } from './slides';
 export declare type ImageViewerProps = {
     image?: string;
     maxZoom?: number;
@@ -9,9 +10,14 @@ export declare type ImageViewerProps = {
     afterClose?: () => void;
 };
 export declare const ImageViewer: FC<ImageViewerProps>;
+export declare type MultiImageViewerRef = SlidesRef;
 export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image'> & {
     images?: string[];
     defaultIndex?: number;
     onIndexChange?: (index: number) => void;
 };
-export declare const MultiImageViewer: FC<MultiImageViewerProps>;
+export declare const MultiImageViewer: React.ForwardRefExoticComponent<Pick<ImageViewerProps, "visible" | "onClose" | "afterClose" | "getContainer" | "maxZoom"> & {
+    images?: string[] | undefined;
+    defaultIndex?: number | undefined;
+    onIndexChange?: ((index: number) => void) | undefined;
+} & React.RefAttributes<SlidesRef>>;

package/es/components/image-viewer/image-viewer.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { forwardRef } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { renderToContainer } from '../../utils/render-to-container';
 import Mask from '../mask';
@@ -33,7 +33,7 @@ export const ImageViewer = p => {
 const multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
   defaultIndex: 0
 });
-export const MultiImageViewer = p => {
+export const MultiImageViewer = forwardRef((p, ref) => {
   const props = mergeProps(multiDefaultProps, p);
   const node = React.createElement(Mask, {
     visible: props.visible,
@@ -43,6 +43,7 @@ export const MultiImageViewer = p => {
   }, React.createElement("div", {
     className: `${classPrefix}-content`
   }, props.images && React.createElement(Slides, {
+    ref: ref,
     defaultIndex: props.defaultIndex,
     onIndexChange: props.onIndexChange,
     images: props.images,
@@ -54,4 +55,4 @@ export const MultiImageViewer = p => {
     maxZoom: props.maxZoom
   })));
   return renderToContainer(props.getContainer, node);
-};
+});

package/es/components/image-viewer/index.d.ts

@@ -1,10 +1,14 @@
 /// <reference types="react" />
 import './image-viewer.less';
 import { showMultiImageViewer, showImageViewer, clearImageViewer } from './methods';
-export type { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
+export type { ImageViewerProps, MultiImageViewerProps, MultiImageViewerRef, } from './image-viewer';
 export type { ImageViewerHandler } from './methods';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
-    Multi: import("react").FC<import("./image-viewer").MultiImageViewerProps> & {
+    Multi: import("react").ForwardRefExoticComponent<Pick<import("./image-viewer").ImageViewerProps, "visible" | "onClose" | "afterClose" | "getContainer" | "maxZoom"> & {
+        images?: string[] | undefined;
+        defaultIndex?: number | undefined;
+        onIndexChange?: ((index: number) => void) | undefined;
+    } & import("react").RefAttributes<import("./slides").SlidesRef>> & {
         show: typeof showMultiImageViewer;
     };
     show: typeof showImageViewer;

package/es/components/image-viewer/slides.d.ts

@@ -1,8 +1,12 @@
-import { FC } from 'react';
-export declare const Slides: FC<{
+import React from 'react';
+export declare type SlidesType = {
     images: string[];
     onTap: () => void;
     maxZoom: number;
     defaultIndex: number;
     onIndexChange?: (index: number) => void;
-}>;
+};
+export declare type SlidesRef = {
+    swipeTo: (index: number, immediate: boolean) => void;
+};
+export declare const Slides: React.ForwardRefExoticComponent<SlidesType & React.RefAttributes<SlidesRef>>;

package/es/components/image-viewer/slides.js

@@ -1,11 +1,11 @@
-import React, { useRef } from 'react';
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import { useDrag } from '@use-gesture/react';
 import { useSpring, animated } from '@react-spring/web';
 import { Slide } from './slide';
 import { convertPx } from '../../utils/convert-px';
 import { bound } from '../../utils/bound';
 const classPrefix = `adm-image-viewer`;
-export const Slides = props => {
+export const Slides = forwardRef((props, ref) => {
   const slideWidth = window.innerWidth + convertPx(16);
   const [{
     x
@@ -17,10 +17,23 @@ export const Slides = props => {
     }
   }));
   const count = props.images.length;
-  const dragLockRef = useRef(false);
-  const bind = useDrag(state => {
+
+  function swipeTo(index, immediate = false) {
     var _a;
 
+    const i = bound(index, 0, count - 1);
+    (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, i);
+    api.start({
+      x: i * slideWidth,
+      immediate
+    });
+  }
+
+  useImperativeHandle(ref, () => ({
+    swipeTo
+  }));
+  const dragLockRef = useRef(false);
+  const bind = useDrag(state => {
     if (dragLockRef.current) return;
     const [offsetX] = state.offset;
 
@@ -28,11 +41,7 @@ export const Slides = props => {
       const minIndex = Math.floor(offsetX / slideWidth);
       const maxIndex = minIndex + 1;
       const velocityOffset = Math.min(state.velocity[0] * 2000, slideWidth) * state.direction[0];
-      const index = bound(bound(Math.round((offsetX + velocityOffset) / slideWidth), minIndex, maxIndex), 0, count - 1);
-      (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, index);
-      api.start({
-        x: index * slideWidth
-      });
+      swipeTo(bound(Math.round((offsetX + velocityOffset) / slideWidth), minIndex, maxIndex));
     } else {
       api.start({
         x: offsetX,
@@ -81,4 +90,4 @@ export const Slides = props => {
     },
     dragLockRef: dragLockRef
   }))));
-};
+});

package/es/components/modal/modal.css

@@ -19,10 +19,12 @@
 .adm-modal-main {
   width: 100%;
   max-height: 70vh;
+  box-sizing: border-box;
   font-size: 14px;
   background-color: white;
   border-radius: 8px;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
   display: flex;
   flex-direction: column;
 }
@@ -34,13 +36,11 @@
 }
 .adm-modal-main .adm-modal-body {
   padding: 20px 12px 12px;
+  display: flex;
+  flex-direction: column;
 }
-.adm-modal-main .adm-modal-body .adm-modal-close {
-  position: absolute;
-  right: 12px;
-  top: 12px;
-  color: var(--adm-color-weak);
-  padding: 2px;
+.adm-modal-main .adm-modal-body > * + * {
+  margin-top: 8px;
 }
 .adm-modal-main .adm-modal-body-header-wrapper {
   display: flex;
@@ -53,33 +53,37 @@
   text-align: center;
 }
 .adm-modal-main .adm-modal-body-content {
-  max-height: 70vh;
-  overflow-x: hidden;
-  overflow-y: auto;
   font-size: 15px;
   line-height: 1.4;
   color: #333;
 }
-.adm-modal-main .adm-modal-footer {
+.adm-modal-main .adm-modal-close {
+  position: absolute;
+  right: 8px;
+  top: 8px;
+  color: var(--adm-color-weak);
+  padding: 4px;
+  font-size: 18px;
+}
+.adm-modal-footer {
   user-select: none;
   padding: 8px 12px 12px;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button {
+.adm-modal-footer.adm-space {
+  --gap-vertical: 20px;
+}
+.adm-modal-footer .adm-modal-button {
   font-size: 18px;
   line-height: 25px;
-  border-right: solid 0.5px var(--adm-border-color);
-}
-.adm-modal-main .adm-modal-footer .adm-modal-button:last-child {
-  border-right: none;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
   padding-top: 0;
   padding-bottom: 0;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
   display: none;
 }
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
 }
 .adm-modal-image-container {

package/es/components/modal/modal.js

@@ -71,7 +71,10 @@ export const Modal = p => {
     style: Object.assign({}, style),
     onClick: e => e.stopPropagation(),
     className: `${classPrefix}-main`
-  }, !!props.image && React.createElement("div", {
+  }, props.showCloseButton && React.createElement("a", {
+    className: classNames(`${classPrefix}-close`, 'adm-plain-anchor'),
+    onClick: props.onClose
+  }, React.createElement(CloseOutline, null)), !!props.image && React.createElement("div", {
     className: `${classPrefix}-image-container`
   }, React.createElement(Image, {
     src: props.image,
@@ -80,12 +83,6 @@ export const Modal = p => {
   })), React.createElement("div", {
     style: props.bodyStyle,
     className: classNames(`${classPrefix}-body`, props.bodyClassName)
-  }, props.showCloseButton && React.createElement("a", {
-    className: classNames(`${classPrefix}-close`, 'adm-plain-anchor'),
-    onClick: props.onClose
-  }, React.createElement(CloseOutline, null)), React.createElement(Space, {
-    direction: 'vertical',
-    block: true
   }, !!props.header && React.createElement("div", {
     className: `${classPrefix}-body-header-wrapper`
   }, React.createElement("div", {
@@ -94,11 +91,10 @@ export const Modal = p => {
     className: `${classPrefix}-body-title`
   }, props.title), !!props.content && React.createElement("div", {
     className: `${classPrefix}-body-content`
-  }, typeof props.content === 'string' ? React.createElement(AutoCenter, null, props.content) : props.content))), React.createElement("div", {
-    className: `${classPrefix}-footer`
-  }, React.createElement(Space, {
+  }, typeof props.content === 'string' ? React.createElement(AutoCenter, null, props.content) : props.content)), React.createElement(Space, {
     direction: 'vertical',
-    block: true
+    block: true,
+    className: `${classPrefix}-footer`
   }, props.actions.map((action, index) => {
     return React.createElement(ModalActionButton, {
       key: action.key,
@@ -113,6 +109,6 @@ export const Modal = p => {
         }
       })
     });
-  }))))))));
+  })))))));
   return renderToContainer(props.getContainer, node);
 };

package/es/components/passcode-input/passcode-input.d.ts

@@ -14,7 +14,7 @@ export declare type PasscodeInputProps = {
     onFocus?: () => void;
     keyboard?: ReactElement<NumberKeyboardProps>;
     onFill?: (val: string) => void;
-} & NativeProps<'--cell-gap' | '--cell-size'>;
+} & NativeProps<'--cell-gap' | '--cell-size' | '--dot-size' | '--border-color' | '--border-radius'>;
 export declare type PasscodeInputRef = {
     focus: () => void;
     blur: () => void;
@@ -32,4 +32,4 @@ export declare const PasscodeInput: React.ForwardRefExoticComponent<{
     onFocus?: (() => void) | undefined;
     keyboard?: React.ReactElement<NumberKeyboardProps, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined;
     onFill?: ((val: string) => void) | undefined;
-} & NativeProps<"--cell-size" | "--cell-gap"> & React.RefAttributes<PasscodeInputRef>>;
+} & NativeProps<"--border-radius" | "--border-color" | "--cell-size" | "--dot-size" | "--cell-gap"> & React.RefAttributes<PasscodeInputRef>>;

package/es/components/picker-view/picker-view.css

@@ -59,6 +59,7 @@
   display: flex;
   flex-direction: column;
   position: relative;
+  z-index: 0;
 }
 .adm-picker-view-column-accessible > * {
   flex: 1;
@@ -75,7 +76,7 @@
 }
 .adm-picker-view-mask {
   position: absolute;
-  z-index: 100;
+  z-index: 10000;
   left: 0;
   top: 0;
   width: 100%;

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

@@ -126,7 +126,7 @@ export const Wheel = memo(props => {
     className: `${classPrefix}-column`
   }, bind()), React.createElement(animated.div, {
     style: {
-      y
+      translateY: y
     },
     className: `${classPrefix}-column-wheel`,
     "aria-hidden": true

package/es/components/radio/radio.css

@@ -16,17 +16,14 @@
   border: 1px solid var(--adm-color-light);
   border-radius: var(--icon-size);
   box-sizing: border-box;
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: var(--icon-size);
   height: var(--icon-size);
-  color: #ffffff;
+  color: var(--adm-color-white);
 }
-.adm-radio .adm-radio-icon-checked {
+.adm-radio .adm-radio-icon > svg {
   display: block;
-  width: 65%;
-  height: 65%;
+  width: 100%;
+  height: 100%;
 }
 .adm-radio.adm-radio-block {
   display: flex;

package/es/components/radio/radio.js

@@ -49,9 +49,7 @@ export const Radio = p => {
 
     return React.createElement("div", {
       className: `${classPrefix}-icon`
-    }, checked && React.createElement(CheckIcon, {
-      className: `${classPrefix}-icon-checked`
-    }));
+    }, checked && React.createElement(CheckIcon, null));
   };
 
   return withNativeProps(props, React.createElement("label", {

package/es/components/search-bar/search-bar.css

@@ -48,7 +48,7 @@
 .adm-search-bar .adm-search-bar-cancel-button.adm-button {
   padding: 3px 12px;
 }
-.adm-search-bar-active .adm-input.adm-input {
+.adm-search-bar-active .adm-input.adm-input.adm-input {
   --placeholder-color: var(--adm-color-light);
 }
 .adm-search-bar-active .adm-search-bar-input-box {

package/es/components/switch/switch.css

@@ -5,8 +5,8 @@
 }
 .adm-switch {
   --checked-color: var(--adm-color-primary);
-  --height: 30px;
-  --width: 50px;
+  --height: 31px;
+  --width: 51px;
   --border-width: 2px;
   display: inline-block;
   vertical-align: middle;
@@ -63,9 +63,14 @@
 .adm-switch-inner {
   position: relative;
   z-index: 1;
-  margin: 0 10px 0 calc(var(--height) - var(--border-width) + 5px);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 0 8px 0 calc(var(--height) - var(--border-width) + 4px);
+  height: 100%;
   color: var(--adm-color-weak);
   transition: margin 200ms;
+  font-size: 15px;
 }
 .adm-switch.adm-switch-checked .adm-switch-checkbox {
   background: var(--checked-color);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.0.0-rc.22",
+  "version": "5.0.0-rc.23",
   "dependencies": {
     "@react-spring/web": "^9.4.2",
     "@types/resize-observer-browser": "^0.1.6",