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

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

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MultiImageViewer = exports.ImageViewer = void 0;
-exports.showImageViewer = showImageViewer;
-exports.showMultiImageViewer = showMultiImageViewer;
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
@@ -17,36 +17,32 @@ var _slide = require("./slide");
 
 var _slides = require("./slides");
 
-var _react = _interopRequireWildcard(require("react"));
-
-var _renderToBody = require("../../utils/render-to-body");
+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 _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+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); }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-var classPrefix = "adm-image-viewer";
-var defaultProps = {
+const classPrefix = `adm-image-viewer`;
+const defaultProps = {
   maxZoom: 3,
   getContainer: null,
   visible: false
 };
 
-var ImageViewer = function ImageViewer(p) {
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+const ImageViewer = p => {
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
 
-  var node = /*#__PURE__*/_react["default"].createElement(_mask["default"], {
+  const node = _react.default.createElement(_mask.default, {
     visible: props.visible,
     disableBodyScroll: false,
     opacity: 'thick',
     afterClose: props.afterClose
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-content"
-  }, props.image && /*#__PURE__*/_react["default"].createElement(_slide.Slide, {
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-content`
+  }, props.image && _react.default.createElement(_slide.Slide, {
     image: props.image,
-    onTap: function onTap() {
+    onTap: () => {
       var _a;
 
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
@@ -58,25 +54,25 @@ var ImageViewer = function ImageViewer(p) {
 };
 
 exports.ImageViewer = ImageViewer;
-var multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
+const multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
   defaultIndex: 0
 });
+const MultiImageViewer = (0, _react.forwardRef)((p, ref) => {
+  const props = (0, _withDefaultProps.mergeProps)(multiDefaultProps, p);
 
-var MultiImageViewer = function MultiImageViewer(p) {
-  var props = (0, _withDefaultProps.mergeProps)(multiDefaultProps, p);
-
-  var node = /*#__PURE__*/_react["default"].createElement(_mask["default"], {
+  const node = _react.default.createElement(_mask.default, {
     visible: props.visible,
     disableBodyScroll: false,
     opacity: 'thick',
     afterClose: props.afterClose
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-content"
-  }, props.images && /*#__PURE__*/_react["default"].createElement(_slides.Slides, {
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-content`
+  }, props.images && _react.default.createElement(_slides.Slides, {
+    ref: ref,
     defaultIndex: props.defaultIndex,
     onIndexChange: props.onIndexChange,
     images: props.images,
-    onTap: function onTap() {
+    onTap: () => {
       var _a;
 
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
@@ -85,96 +81,5 @@ var MultiImageViewer = function MultiImageViewer(p) {
   })));
 
   return (0, _renderToContainer.renderToContainer)(props.getContainer, node);
-};
-
-exports.MultiImageViewer = MultiImageViewer;
-
-function showImageViewer(props) {
-  var Wrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_, ref) {
-    var _useState = (0, _react.useState)(false),
-        visible = _useState[0],
-        setVisible = _useState[1];
-
-    (0, _react.useEffect)(function () {
-      setVisible(true);
-    }, []);
-    (0, _react.useImperativeHandle)(ref, function () {
-      return {
-        close: function close() {
-          setVisible(false);
-        }
-      };
-    });
-    return /*#__PURE__*/_react["default"].createElement(ImageViewer, Object.assign({}, props, {
-      visible: visible,
-      onClose: function onClose() {
-        var _a;
-
-        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        setVisible(false);
-      },
-      afterClose: function afterClose() {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  var ref = /*#__PURE__*/(0, _react.createRef)();
-  var unmount = (0, _renderToBody.renderToBody)( /*#__PURE__*/_react["default"].createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: function close() {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
-}
-
-function showMultiImageViewer(props) {
-  var Wrapper = /*#__PURE__*/(0, _react.forwardRef)(function (_, ref) {
-    var _useState2 = (0, _react.useState)(false),
-        visible = _useState2[0],
-        setVisible = _useState2[1];
-
-    (0, _react.useEffect)(function () {
-      setVisible(true);
-    }, []);
-    (0, _react.useImperativeHandle)(ref, function () {
-      return {
-        close: function close() {
-          setVisible(false);
-        }
-      };
-    });
-    return /*#__PURE__*/_react["default"].createElement(MultiImageViewer, Object.assign({}, props, {
-      visible: visible,
-      onClose: function onClose() {
-        var _a;
-
-        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        setVisible(false);
-      },
-      afterClose: function afterClose() {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  var ref = /*#__PURE__*/(0, _react.createRef)();
-  var unmount = (0, _renderToBody.renderToBody)( /*#__PURE__*/_react["default"].createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: function close() {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
-}
+});
+exports.MultiImageViewer = MultiImageViewer;

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

@@ -1,11 +1,17 @@
 /// <reference types="react" />
 import './image-viewer.less';
-import { showImageViewer, showMultiImageViewer } from './image-viewer';
-export type { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
+import { showMultiImageViewer, showImageViewer, clearImageViewer } from './methods';
+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;
+    clear: typeof clearImageViewer;
 };
 export default _default;

package/cjs/components/image-viewer/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.default = void 0;
 
 require("./image-viewer.css");
 
@@ -11,13 +11,16 @@ var _attachPropertiesToComponent = require("../../utils/attach-properties-to-com
 
 var _imageViewer2 = require("./image-viewer");
 
-var Multi = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_imageViewer2.MultiImageViewer, {
-  show: _imageViewer2.showMultiImageViewer
+var _methods = require("./methods");
+
+const Multi = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_imageViewer2.MultiImageViewer, {
+  show: _methods.showMultiImageViewer
 });
 
 var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_imageViewer2.ImageViewer, {
-  Multi: Multi,
-  show: _imageViewer2.showImageViewer
+  Multi,
+  show: _methods.showImageViewer,
+  clear: _methods.clearImageViewer
 });
 
-exports["default"] = _default;
+exports.default = _default;

package/cjs/components/image-viewer/methods.d.ts

@@ -1 +1,11 @@
-
+import { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
+export declare type ImageViewerHandler = {
+    close: () => void;
+};
+export declare function showImageViewer(props: Omit<ImageViewerProps, 'visible'>): {
+    close: () => void;
+};
+export declare function showMultiImageViewer(props: Omit<MultiImageViewerProps, 'visible'>): {
+    close: () => void;
+};
+export declare function clearImageViewer(): void;

package/cjs/components/image-viewer/methods.js

@@ -1 +1,119 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clearImageViewer = clearImageViewer;
+exports.showImageViewer = showImageViewer;
+exports.showMultiImageViewer = showMultiImageViewer;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _renderToBody = require("../../utils/render-to-body");
+
+var _imageViewer = require("./image-viewer");
+
+var _ahooks = require("ahooks");
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const handlerSet = new Set();
+
+function showImageViewer(props) {
+  clearImageViewer();
+  const Wrapper = (0, _react.forwardRef)((_, ref) => {
+    const [visible, setVisible] = (0, _react.useState)(false);
+    (0, _react.useEffect)(() => {
+      setVisible(true);
+    }, []);
+    const isUnmountedRef = (0, _ahooks.useUnmountedRef)();
+    (0, _react.useImperativeHandle)(ref, () => ({
+      close: () => {
+        if (isUnmountedRef.current) return;
+        setVisible(false);
+      }
+    }));
+    return _react.default.createElement(_imageViewer.ImageViewer, Object.assign({}, props, {
+      visible: visible,
+      onClose: () => {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        setVisible(false);
+      },
+      afterClose: () => {
+        var _a;
+
+        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        unmount();
+      }
+    }));
+  });
+  const ref = (0, _react.createRef)();
+  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
+    ref: ref
+  }));
+  const handler = {
+    close: () => {
+      var _a;
+
+      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+    }
+  };
+  handlerSet.add(handler);
+  return handler;
+}
+
+function showMultiImageViewer(props) {
+  clearImageViewer();
+  const Wrapper = (0, _react.forwardRef)((_, ref) => {
+    const [visible, setVisible] = (0, _react.useState)(false);
+    (0, _react.useEffect)(() => {
+      setVisible(true);
+    }, []);
+    const isUnmountedRef = (0, _ahooks.useUnmountedRef)();
+    (0, _react.useImperativeHandle)(ref, () => ({
+      close: () => {
+        if (isUnmountedRef.current) return;
+        setVisible(false);
+      }
+    }));
+    return _react.default.createElement(_imageViewer.MultiImageViewer, Object.assign({}, props, {
+      visible: visible,
+      onClose: () => {
+        var _a;
+
+        (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        setVisible(false);
+      },
+      afterClose: () => {
+        var _a;
+
+        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+        unmount();
+      }
+    }));
+  });
+  const ref = (0, _react.createRef)();
+  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
+    ref: ref
+  }));
+  const handler = {
+    close: () => {
+      var _a;
+
+      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+    }
+  };
+  handlerSet.add(handler);
+  return handler;
+}
+
+function clearImageViewer() {
+  handlerSet.forEach(handler => {
+    handler.close();
+  });
+  handlerSet.clear();
+}

package/cjs/components/image-viewer/slide.js

@@ -11,42 +11,39 @@ var _react2 = require("@use-gesture/react");
 
 var _web = require("@react-spring/web");
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var classPrefix = "adm-image-viewer";
-
-var Slide = function Slide(props) {
-  var dragLockRef = props.dragLockRef;
-  var controlRef = (0, _react.useRef)(null);
-
-  var _useSpring = (0, _web.useSpring)(function () {
-    return {
-      zoom: 1,
-      x: 0,
-      y: 0,
-      config: {
-        tension: 300
-      }
-    };
-  }),
-      _useSpring$ = _useSpring[0],
-      zoom = _useSpring$.zoom,
-      x = _useSpring$.x,
-      y = _useSpring$.y,
-      api = _useSpring[1];
-
-  var pinchLockRef = (0, _react.useRef)(false);
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const classPrefix = `adm-image-viewer`;
+
+const Slide = props => {
+  const {
+    dragLockRef
+  } = props;
+  const controlRef = (0, _react.useRef)(null);
+  const [{
+    zoom,
+    x,
+    y
+  }, api] = (0, _web.useSpring)(() => ({
+    zoom: 1,
+    x: 0,
+    y: 0,
+    config: {
+      tension: 300
+    }
+  }));
+  const pinchLockRef = (0, _react.useRef)(false);
   (0, _react2.useGesture)({
-    onDrag: function onDrag(state) {
+    onDrag: state => {
       if (state.tap && state.elapsedTime > 0) {
         // 判断点击时间>0是为了过滤掉非正常操作，例如用户长按选择图片之后的取消操作（也是一次点击）
         props.onTap();
         return;
       }
 
-      var currentZoom = zoom.get();
+      const currentZoom = zoom.get();
 
       if (dragLockRef) {
         dragLockRef.current = currentZoom !== 1;
@@ -58,27 +55,24 @@ var Slide = function Slide(props) {
           y: 0
         });
       } else {
-        var _state$offset = state.offset,
-            _x = _state$offset[0],
-            _y = _state$offset[1];
+        const [x, y] = state.offset;
         api.start({
-          x: _x,
-          y: _y,
+          x,
+          y,
           immediate: true
         });
       }
     },
-    onPinch: function onPinch(state) {
+    onPinch: state => {
       var _a;
 
       pinchLockRef.current = !state.last;
-      var _state$offset2 = state.offset,
-          d = _state$offset2[0];
+      const [d] = state.offset;
       if (d < 0) return; // pinch的rubberband不会自动弹回bound，这里手动实现了
 
-      var zoom = state.last ? Math.max(Math.min(d, props.maxZoom), 1) : d;
+      const zoom = state.last ? Math.max(Math.min(d, props.maxZoom), 1) : d;
       api.start({
-        zoom: zoom,
+        zoom,
         immediate: !state.last
       });
       (_a = props.onZoomChange) === null || _a === void 0 ? void 0 : _a.call(props, zoom);
@@ -102,42 +96,33 @@ var Slide = function Slide(props) {
     target: controlRef,
     drag: {
       // filterTaps: true,
-      from: function from() {
-        return [x.get(), y.get()];
-      }
+      from: () => [x.get(), y.get()]
     },
     pinch: {
-      transform: function transform(_ref) {
-        var d = _ref[0],
-            a = _ref[1];
-        return [d < 0 ? d * 0.5 : d * 2, 0];
-      },
-      from: function from() {
-        return [zoom.get(), 0];
-      }
+      from: () => [zoom.get(), 0]
     },
     pointer: {
       touch: true
     }
   });
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-slide",
-    onPointerMove: function onPointerMove(e) {
+  return _react.default.createElement("div", {
+    className: `${classPrefix}-slide`,
+    onPointerMove: e => {
       if (zoom.get() !== 1) {
         e.stopPropagation();
       }
     }
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-control",
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-control`,
     ref: controlRef
-  }, /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
-    className: classPrefix + "-image-wrapper",
+  }, _react.default.createElement(_web.animated.div, {
+    className: `${classPrefix}-image-wrapper`,
     style: {
       scale: zoom,
-      x: x,
-      y: y
+      x,
+      y
     }
-  }, /*#__PURE__*/_react["default"].createElement("img", {
+  }, _react.default.createElement("img", {
     src: props.image,
     draggable: false
   }))));

package/cjs/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>>;