antd-mobile 5.0.0 → 5.1.0

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

@@ -11,8 +11,6 @@ var _web = require("@react-spring/web");
 
 var _react2 = require("@use-gesture/react");
 
-var _convertPx = require("../../utils/convert-px");
-
 var _rubberband = require("../../utils/rubberband");
 
 var _bound = require("../../utils/bound");
@@ -21,6 +19,8 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 var _ahooks = require("ahooks");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -29,7 +29,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const classPrefix = `adm-picker-view`;
 const Wheel = (0, _react.memo)(props => {
-  const itemHeight = (0, _convertPx.convertPx)(34);
   const {
     value,
     column
@@ -51,12 +50,23 @@ const Wheel = (0, _react.memo)(props => {
     }
   }));
   const draggingRef = (0, _react.useRef)(false);
+  const dummyItemRef = (0, _react.useRef)(null);
+  const itemHeight = (0, _react.useRef)(34);
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
+    const dummyItem = dummyItemRef.current;
+    if (!dummyItem) return;
+    const rect = dummyItem.getBoundingClientRect();
+
+    if (rect.height > 0) {
+      itemHeight.current = rect.height;
+    }
+  });
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     if (draggingRef.current) return;
     if (!value) return;
     const targetIndex = column.findIndex(item => item.value === value);
     if (targetIndex < 0) return;
-    const finalPosition = targetIndex * -itemHeight;
+    const finalPosition = targetIndex * -itemHeight.current;
     api.start({
       y: finalPosition,
       immediate: y.goal !== finalPosition
@@ -76,7 +86,7 @@ const Wheel = (0, _react.memo)(props => {
   }, [column, value]);
 
   function scrollSelect(index) {
-    const finalPosition = index * -itemHeight;
+    const finalPosition = index * -itemHeight.current;
     api.start({
       y: finalPosition
     });
@@ -87,18 +97,18 @@ const Wheel = (0, _react.memo)(props => {
 
   const bind = (0, _react2.useDrag)(state => {
     draggingRef.current = true;
-    const min = -((column.length - 1) * itemHeight);
+    const min = -((column.length - 1) * itemHeight.current);
     const max = 0;
 
     if (state.last) {
       draggingRef.current = false;
       const position = state.offset[1] + state.velocity[1] * state.direction[1] * 50;
-      const targetIndex = min < max ? -Math.round((0, _bound.bound)(position, min, max) / itemHeight) : 0;
+      const targetIndex = min < max ? -Math.round((0, _bound.bound)(position, min, max) / itemHeight.current) : 0;
       scrollSelect(targetIndex);
     } else {
       const position = state.offset[1];
       api.start({
-        y: (0, _rubberband.rubberbandIfOutOfBounds)(position, min, max, itemHeight * 50, 0.2)
+        y: (0, _rubberband.rubberbandIfOutOfBounds)(position, min, max, itemHeight.current * 50, 0.2)
       });
     }
   }, {
@@ -146,7 +156,11 @@ const Wheel = (0, _react.memo)(props => {
 
   return _react.default.createElement("div", Object.assign({
     className: `${classPrefix}-column`
-  }, bind()), _react.default.createElement(_web.animated.div, {
+  }, bind()), _react.default.createElement("div", {
+    ref: dummyItemRef,
+    className: (0, _classnames.default)(`${classPrefix}-column-item`, `${classPrefix}-column-item-dummy`),
+    "aria-hidden": true
+  }), _react.default.createElement(_web.animated.div, {
     style: {
       translateY: y
     },

package/2x/cjs/components/slider/slider.css

@@ -32,12 +32,13 @@
 
 .adm-slider-tick {
   position: absolute;
-  top: -7px;
+  top: 50%;
   width: 22px;
   height: 22px;
   margin-left: -10px;
   background-color: #f5f5f5;
   border-radius: 50%;
+  transform: translate(0, -50%);
 }
 
 .adm-slider-tick-active {

package/2x/cjs/components/toast/index.d.ts

@@ -1,6 +1,6 @@
 import './toast.less';
 import { clear, show, config } from './methods';
-export type { ToastShowProps } from './methods';
+export type { ToastShowProps, ToastHandler } from './methods';
 declare const Toast: {
     show: typeof show;
     clear: typeof clear;

package/2x/cjs/components/toast/methods.d.ts

@@ -1,5 +1,8 @@
 import { ToastProps } from './toast';
 export declare type ToastShowProps = Omit<ToastProps, 'visible'>;
-export declare function show(p: ToastShowProps | string): void;
+export declare type ToastHandler = {
+    close: () => void;
+};
+export declare function show(p: ToastShowProps | string): ToastHandler;
 export declare function clear(): void;
 export declare function config(val: Pick<ToastProps, 'duration' | 'position' | 'maskClickable'>): void;

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

@@ -52,8 +52,7 @@ function show(p) {
   bodyContainer.appendChild(container);
   clear();
   containers.push(container);
-
-  const TempToast = () => {
+  const TempToast = (0, _react.forwardRef)((_, ref) => {
     const [visible, setVisible] = (0, _react.useState)(true);
     (0, _react.useEffect)(() => {
       return () => {
@@ -74,6 +73,9 @@ function show(p) {
         window.clearTimeout(timer);
       };
     }, []);
+    (0, _react.useImperativeHandle)(ref, () => ({
+      close: () => setVisible(false)
+    }));
     return _react.default.createElement(_toast.InternalToast, Object.assign({}, props, {
       getContainer: () => container,
       visible: visible,
@@ -81,9 +83,20 @@ function show(p) {
         unmount(container);
       }
     }));
-  };
+  });
+  const ref = (0, _react.createRef)();
 
-  _reactDom.default.render(_react.default.createElement(TempToast, null), container);
+  _reactDom.default.render(_react.default.createElement(TempToast, {
+    ref: ref
+  }), container);
+
+  return {
+    close: () => {
+      var _a;
+
+      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+    }
+  };
 }
 
 function clear() {

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

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+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[]) => Pick<import("react").DOMAttributes<EventTarget>, "onClick" | "onChange" | "onPause" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDragCapture" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScrollCapture" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture">;

package/2x/cjs/utils/use-drag-and-pinch.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDragAndPinch = void 0;
+
+var _react = require("@use-gesture/react");
+
+const useDragAndPinch = (0, _react.createUseGesture)([_react.dragAction, _react.pinchAction]);
+exports.useDragAndPinch = useDragAndPinch;

package/2x/cjs/utils/use-isomorphic-update-layout-effect.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const useIsomorphicUpdateLayoutEffect: typeof import("react").useEffect | typeof import("react").useLayoutEffect;

package/2x/cjs/utils/use-isomorphic-update-layout-effect.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useIsomorphicUpdateLayoutEffect = void 0;
+
+var _createUpdateEffect = require("ahooks/lib/createUpdateEffect");
+
+var _ahooks = require("ahooks");
+
+const useIsomorphicUpdateLayoutEffect = (0, _createUpdateEffect.createUpdateEffect)(_ahooks.useIsomorphicLayoutEffect);
+exports.useIsomorphicUpdateLayoutEffect = useIsomorphicUpdateLayoutEffect;

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

@@ -7,11 +7,12 @@
   background: var(--adm-color-white);
   position: fixed;
   z-index: var(--z-index);
-  top: 100vh;
+  bottom: 0;
   left: 0;
   width: 100vw;
   display: flex;
   flex-direction: column;
+  touch-action: none;
 }
 
 .adm-floating-panel-mask {

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

@@ -10,10 +10,10 @@ export declare type FloatingPanelProps = {
     children: ReactNode;
     onHeightChange?: (height: number, animating: boolean) => void;
     handleDraggingOfContent?: boolean;
-} & NativeProps<'--border-radius' | '--z-index'>;
+} & NativeProps<'--border-radius' | '--z-index' | '--header-height'>;
 export declare const FloatingPanel: React.ForwardRefExoticComponent<{
     anchors: number[];
     children: ReactNode;
     onHeightChange?: ((height: number, animating: boolean) => void) | undefined;
     handleDraggingOfContent?: boolean | undefined;
-} & NativeProps<"--z-index" | "--border-radius"> & React.RefAttributes<FloatingPanelRef>>;
+} & NativeProps<"--z-index" | "--border-radius" | "--header-height"> & React.RefAttributes<FloatingPanelRef>>;

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

@@ -6,11 +6,12 @@ import { supportsPassive } from '../../utils/supports-passive';
 import { nearest } from '../../utils/nearest';
 import { mergeProps } from '../../utils/with-default-props';
 import { useLockScroll } from '../../utils/use-lock-scroll';
+import { useMemoizedFn } from 'ahooks';
 const defaultProps = {
   handleDraggingOfContent: true
 };
 export const FloatingPanel = forwardRef((p, ref) => {
-  var _a;
+  var _a, _b;
 
   const props = mergeProps(defaultProps, p);
   const {
@@ -27,6 +28,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
     top: possibles[possibles.length - 1],
     bottom: possibles[0]
   };
+  const onHeightChange = useMemoizedFn((_b = props.onHeightChange) !== null && _b !== void 0 ? _b : () => {});
   const [{
     y
   }, api] = useSpring(() => ({
@@ -35,9 +37,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
       tension: 300
     },
     onChange: result => {
-      var _a;
-
-      (_a = props.onHeightChange) === null || _a === void 0 ? void 0 : _a.call(props, result.value.y, y.isAnimating);
+      onHeightChange(result.value.y, y.isAnimating);
     }
   }));
   useDrag(state => {
@@ -114,7 +114,7 @@ export const FloatingPanel = forwardRef((p, ref) => {
     className: 'adm-floating-panel',
     style: {
       height: maxHeight,
-      y
+      translateY: y.to(y => `calc(100% + (${y}px))`)
     }
   }, React.createElement("div", {
     className: 'adm-floating-panel-mask',

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

@@ -0,0 +1,11 @@
+import React from 'react';
+import type { FormInstance } from 'rc-field-form';
+import type { NamePath } from 'rc-field-form/es/interface';
+declare type RenderChildren<Values = any> = (changedValues: Record<string, any>, form: FormInstance<Values>) => React.ReactNode;
+declare type ChildrenType<Values = any> = RenderChildren<Values>;
+export interface FormSubscribeProps {
+    to: NamePath[];
+    children: ChildrenType;
+}
+export declare const FormSubscribe: React.VFC<FormSubscribeProps>;
+export {};

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

@@ -0,0 +1,14 @@
+import React from 'react';
+import Form from '.';
+export const FormSubscribe = ({
+  children,
+  to
+}) => {
+  return React.createElement(Form.Item, {
+    noStyle: true,
+    dependencies: to
+  }, form => {
+    const changedValues = form.getFieldsValue(to);
+    return children(changedValues, form);
+  });
+};

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

@@ -4,6 +4,7 @@ import { useForm } from 'rc-field-form';
 export declare type FormLayout = 'vertical' | 'horizontal';
 export type { FormProps, FormInstance } from './form';
 export type { FormItemProps } from './form-item';
+export type { FormSubscribeProps } from './form-subscribe';
 export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/interface';
 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<never> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
@@ -11,6 +12,7 @@ declare const _default: import("react").ForwardRefExoticComponent<Pick<import("r
     mode?: "default" | "card" | undefined;
 } & import("react").RefAttributes<Pick<import("rc-field-form").FormInstance<any>, "submit" | "getFieldValue" | "getFieldsValue" | "getFieldError" | "getFieldsError" | "isFieldTouched" | "isFieldsTouched" | "resetFields" | "setFields" | "setFieldsValue" | "validateFields">>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
+    Subscribe: import("react").VFC<import("./form-subscribe").FormSubscribeProps>;
     Header: import("react").FC<{}>;
     useForm: typeof useForm;
 };

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

@@ -4,8 +4,10 @@ import { attachPropertiesToComponent } from '../../utils/attach-properties-to-co
 import { FormItem } from './form-item';
 import { Header } from './header';
 import { useForm } from 'rc-field-form';
+import { FormSubscribe } from './form-subscribe';
 export default attachPropertiesToComponent(Form, {
   Item: FormItem,
+  Subscribe: FormSubscribe,
   Header,
   useForm
 });

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

@@ -5,7 +5,7 @@ import { PictureOutline, PictureWrongOutline } from 'antd-mobile-icons';
 import { staged } from 'staged-components';
 import { toCSSLength } from '../../utils/to-css-length';
 import { LazyDetector } from './lazy-detector';
-import { useUpdateLayoutEffect } from 'ahooks';
+import { useIsomorphicUpdateLayoutEffect } from '../../utils/use-isomorphic-update-layout-effect';
 const classPrefix = `adm-image`;
 const defaultProps = {
   fit: 'fill',
@@ -27,7 +27,7 @@ export const Image = staged(p => {
   const [initialized, setInitialized] = useState(!props.lazy);
   src = initialized ? props.src : undefined;
   srcSet = initialized ? props.srcSet : undefined;
-  useUpdateLayoutEffect(() => {
+  useIsomorphicUpdateLayoutEffect(() => {
     setLoaded(false);
     setFailed(false);
   }, [src]);

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

@@ -24,5 +24,6 @@ export declare type ImageUploaderProps = {
     upload: (file: File) => Promise<ImageUploadItem>;
     onDelete?: (item: ImageUploadItem) => boolean | Promise<boolean> | void;
     preview?: boolean;
+    showFailed?: boolean;
 } & NativeProps<'--cell-size'>;
 export declare const ImageUploader: FC<ImageUploaderProps>;

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

@@ -17,7 +17,8 @@ const defaultProps = {
   maxCount: 0,
   defaultValue: [],
   accept: 'image/*',
-  preview: true
+  preview: true,
+  showFailed: true
 };
 export const ImageUploader = p => {
   const props = mergeProps(defaultProps, p);
@@ -154,15 +155,21 @@ export const ImageUploader = p => {
         setValue(value.filter((x, i) => i !== index));
       })
     });
-  }), tasks.map(task => React.createElement(PreviewItem, {
-    key: task.id,
-    file: task.file,
-    deletable: task.status !== 'pending',
-    status: task.status,
-    onDelete: () => {
-      setTasks(tasks.filter(x => x.id !== task.id));
+  }), tasks.map(task => {
+    if (!props.showFailed && task.status === 'fail') {
+      return null;
     }
-  })), showUpload && React.createElement("div", {
+
+    return React.createElement(PreviewItem, {
+      key: task.id,
+      file: task.file,
+      deletable: task.status !== 'pending',
+      status: task.status,
+      onDelete: () => {
+        setTasks(tasks.filter(x => x.id !== task.id));
+      }
+    });
+  }), showUpload && React.createElement("div", {
     className: `${classPrefix}-upload-button-wrap`
   }, props.children ? props.children : React.createElement("span", {
     className: `${classPrefix}-cell ${classPrefix}-upload-button`,

package/2x/es/components/image-viewer/slide.js

@@ -1,12 +1,15 @@
 import React, { useRef } from 'react';
-import { useGesture } from '@use-gesture/react';
 import { useSpring, animated } from '@react-spring/web';
+import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
+import { useDragAndPinch } from '../../utils/use-drag-and-pinch';
+import { bound } from '../../utils/bound';
 const classPrefix = `adm-image-viewer`;
 export const Slide = props => {
   const {
     dragLockRef
   } = props;
   const controlRef = useRef(null);
+  const imgRef = useRef(null);
   const [{
     zoom,
     x,
@@ -16,11 +19,38 @@ export const Slide = props => {
     x: 0,
     y: 0,
     config: {
-      tension: 300
+      tension: 200
     }
   }));
   const pinchLockRef = useRef(false);
-  useGesture({
+
+  function boundXY([x, y], rubberband) {
+    const currentZoom = zoom.get();
+    let xOffset = 0,
+        yOffset = 0;
+
+    if (imgRef.current && controlRef.current) {
+      xOffset = ((currentZoom * imgRef.current.width || 0) - controlRef.current.clientWidth) / 2;
+      yOffset = ((currentZoom * imgRef.current.height || 0) - controlRef.current.clientHeight) / 2;
+    }
+
+    xOffset = xOffset > 0 ? xOffset : 0;
+    yOffset = yOffset > 0 ? yOffset : 0;
+    const bounds = {
+      left: -xOffset,
+      right: xOffset,
+      top: -yOffset,
+      bottom: yOffset
+    };
+
+    if (rubberband) {
+      return [rubberbandIfOutOfBounds(x, bounds.left, bounds.right, currentZoom * 50), rubberbandIfOutOfBounds(y, bounds.top, bounds.bottom, currentZoom * 50)];
+    } else {
+      return [bound(x, bounds.left, bounds.right), bound(y, bounds.top, bounds.bottom)];
+    }
+  }
+
+  useDragAndPinch({
     onDrag: state => {
       if (state.tap && state.elapsedTime > 0 && state.elapsedTime < 1000) {
         // 判断点击时间>0是为了过滤掉非正常操作，例如用户长按选择图片之后的取消操作（也是一次点击）
@@ -40,12 +70,20 @@ export const Slide = props => {
           y: 0
         });
       } else {
-        const [x, y] = state.offset;
-        api.start({
-          x,
-          y,
-          immediate: true
-        });
+        if (state.last) {
+          const [x, y] = boundXY([state.offset[0] + state.velocity[0] * state.direction[0] * 200, state.offset[1] + state.velocity[1] * state.direction[1] * 200], false);
+          api.start({
+            x,
+            y
+          });
+        } else {
+          const [x, y] = boundXY(state.offset, true);
+          api.start({
+            x,
+            y,
+            immediate: true
+          });
+        }
       }
     },
     onPinch: state => {
@@ -53,16 +91,15 @@ export const Slide = props => {
 
       pinchLockRef.current = !state.last;
       const [d] = state.offset;
-      if (d < 0) return; // pinch的rubberband不会自动弹回bound，这里手动实现了
-
-      const zoom = state.last ? Math.max(Math.min(d, props.maxZoom), 1) : d;
+      if (d < 0) return;
+      const nextZoom = state.last ? bound(d, 1, props.maxZoom) : d;
       api.start({
-        zoom,
+        zoom: nextZoom,
         immediate: !state.last
       });
-      (_a = props.onZoomChange) === null || _a === void 0 ? void 0 : _a.call(props, zoom);
+      (_a = props.onZoomChange) === null || _a === void 0 ? void 0 : _a.call(props, nextZoom);
 
-      if (state.last && zoom <= 1) {
+      if (state.last && nextZoom <= 1) {
         api.start({
           x: 0,
           y: 0
@@ -106,11 +143,12 @@ export const Slide = props => {
   }, React.createElement(animated.div, {
     className: `${classPrefix}-image-wrapper`,
     style: {
-      scale: zoom,
-      x,
-      y
+      translateX: x,
+      translateY: y,
+      scale: zoom
     }
   }, React.createElement("img", {
+    ref: imgRef,
     src: props.image,
     draggable: false,
     alt: props.image

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type IndexBarProps = {
     sticky?: boolean;

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

@@ -15,9 +15,11 @@ export const IndexBar = forwardRef((p, ref) => {
   const props = mergeProps(defaultProps, p);
   const titleHeight = convertPx(35);
   const bodyRef = useRef(null);
-  const indexes = [];
+  const indexItems = [];
   const panels = [];
   React.Children.forEach(props.children, child => {
+    var _a;
+
     if (!React.isValidElement(child)) return;
 
     if (child.type !== Panel) {
@@ -25,7 +27,10 @@ export const IndexBar = forwardRef((p, ref) => {
       return;
     }
 
-    indexes.push(child.props.index);
+    indexItems.push({
+      index: child.props.index,
+      brief: (_a = child.props.brief) !== null && _a !== void 0 ? _a : child.props.index.charAt(0)
+    });
     panels.push(withNativeProps(child.props, React.createElement("div", {
       key: child.props.index,
       "data-index": child.props.index,
@@ -34,7 +39,10 @@ export const IndexBar = forwardRef((p, ref) => {
       className: `${classPrefix}-anchor-title`
     }, child.props.title || child.props.index), child.props.children)));
   });
-  const [activeIndex, setActiveIndex] = useState(indexes[0]);
+  const [activeIndex, setActiveIndex] = useState(() => {
+    const firstItem = indexItems[0];
+    return firstItem ? firstItem.index : null;
+  });
   useImperativeHandle(ref, () => ({
     scrollTo
   }));
@@ -86,7 +94,7 @@ export const IndexBar = forwardRef((p, ref) => {
       [`${classPrefix}-sticky`]: props.sticky
     })
   }, React.createElement(Sidebar, {
-    indexes: indexes,
+    indexItems: indexItems,
     activeIndex: activeIndex,
     onActive: index => {
       scrollTo(index);

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

@@ -1,10 +1,11 @@
 /// <reference types="react" />
 import './index-bar.less';
 export type { IndexBarProps, IndexBarRef } from './index-bar';
+export type { IndexBarPanelProps } from './panel';
 declare const _default: import("react").ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
     children?: import("react").ReactNode;
 } & import("../../utils/native-props").NativeProps<"--sticky-offset-top"> & import("react").RefAttributes<import("./index-bar").IndexBarRef>> & {
-    Panel: import("react").FC<import("./panel").IndexBarAnchorProps>;
+    Panel: import("react").FC<import("./panel").IndexBarPanelProps>;
 };
 export default _default;

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

@@ -1,7 +1,8 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
-export declare type IndexBarAnchorProps = {
+export declare type IndexBarPanelProps = {
     index: string;
-    title?: string;
+    title?: ReactNode;
+    brief?: ReactNode;
 } & NativeProps;
-export declare const Panel: FC<IndexBarAnchorProps>;
+export declare const Panel: FC<IndexBarPanelProps>;

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

@@ -1,7 +1,10 @@
-import { FC } from 'react';
+import { FC, ReactNode } from 'react';
 declare type SidebarProps = {
-    indexes: string[];
-    activeIndex: string;
+    indexItems: {
+        index: string;
+        brief: ReactNode;
+    }[];
+    activeIndex: string | null;
     onActive: (index: string) => void;
 };
 export declare const Sidebar: FC<SidebarProps>;

package/2x/es/components/index-bar/sidebar.js

@@ -33,7 +33,10 @@ export const Sidebar = props => {
         props.onActive(index);
       }
     }
-  }, props.indexes.map(index => {
+  }, props.indexItems.map(({
+    index,
+    brief
+  }) => {
     const active = index === props.activeIndex;
     return React.createElement("div", {
       className: `${classPrefix}-sidebar-row`,
@@ -52,11 +55,11 @@ export const Sidebar = props => {
       key: index
     }, interacting && active && React.createElement("div", {
       className: `${classPrefix}-sidebar-bubble`
-    }, index), React.createElement("div", {
+    }, brief), React.createElement("div", {
       className: classNames(`${classPrefix}-sidebar-item`, {
         [`${classPrefix}-sidebar-item-active`]: active
       }),
       "data-index": index
-    }, React.createElement("div", null, index)));
+    }, React.createElement("div", null, brief)));
   }));
 };