antd-mobile 5.12.1 → 5.12.4

package/es/components/error-block/images/busy.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const busyImage: JSX.Element;

package/es/components/error-block/images/default.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const defaultImage: JSX.Element;

package/es/components/error-block/images/disconnected.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const disconnectedImage: JSX.Element;

package/es/components/error-block/images/empty.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const emptyImage: JSX.Element;

package/es/components/image/broken-image-icon.d.ts

@@ -0,0 +1 @@
+export declare const BrokenImageIcon: () => JSX.Element;

package/es/components/image/broken-image-icon.js

@@ -0,0 +1,9 @@
+import React from 'react';
+export const BrokenImageIcon = () => React.createElement("svg", {
+  viewBox: '0 0 48 48',
+  xmlns: 'http://www.w3.org/2000/svg'
+}, React.createElement("path", {
+  d: 'M19.233 6.233 17.42 9.08l-10.817.001a.665.665 0 0 0-.647.562l-.007.096V34.9l5.989-8.707a2.373 2.373 0 0 1 1.801-1.005 2.415 2.415 0 0 1 1.807.625l.126.127 4.182 4.525 2.267-3.292 5.461 7.841-4.065 7.375H6.604c-1.86 0-3.382-1.47-3.482-3.317l-.005-.192V9.744c0-1.872 1.461-3.405 3.296-3.505l.19-.005h12.63Zm22.163 0c1.86 0 3.382 1.472 3.482 3.314l.005.192v29.14a3.507 3.507 0 0 1-3.3 3.505l-.191.006H27.789l3.63-6.587.06-.119a1.87 1.87 0 0 0-.163-1.853l-6.928-9.949 3.047-4.422a2.374 2.374 0 0 1 1.96-1.01 2.4 2.4 0 0 1 1.86.87l.106.14L42.05 34.89V9.74a.664.664 0 0 0-.654-.658H21.855l1.812-2.848h17.73Zm-28.305 5.611c.794 0 1.52.298 2.07.788l-.843 1.325-.067.114a1.87 1.87 0 0 0 .11 1.959l.848 1.217c-.556.515-1.3.83-2.118.83a3.122 3.122 0 0 1-3.117-3.116 3.119 3.119 0 0 1 3.117-3.117Z',
+  fill: '#DBDBDB',
+  fillRule: 'nonzero'
+}));

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

@@ -0,0 +1 @@
+export declare const ImageIcon: () => JSX.Element;

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

@@ -0,0 +1,9 @@
+import React from 'react';
+export const ImageIcon = () => React.createElement("svg", {
+  viewBox: '0 0 48 48',
+  xmlns: 'http://www.w3.org/2000/svg'
+}, React.createElement("path", {
+  d: 'M41.396 6.234c1.923 0 3.487 1.574 3.487 3.505v29.14c0 1.937-1.568 3.51-3.491 3.51H6.604c-1.923 0-3.487-1.573-3.487-3.51V9.745c0-1.936 1.564-3.51 3.487-3.51Zm0 2.847H6.604c-.355 0-.654.3-.654.658V34.9l5.989-8.707a2.373 2.373 0 0 1 1.801-1.005 2.405 2.405 0 0 1 1.933.752l4.182 4.525 7.58-11.005a2.374 2.374 0 0 1 1.96-1.01c.79 0 1.532.38 1.966 1.01L42.05 34.89V9.74a.664.664 0 0 0-.654-.658Zm-28.305 2.763a3.119 3.119 0 0 1 3.117 3.117 3.119 3.119 0 0 1-3.117 3.117 3.122 3.122 0 0 1-3.117-3.117 3.119 3.119 0 0 1 3.117-3.117Z',
+  fill: '#DBDBDB',
+  fillRule: 'nonzero'
+}));

package/es/components/image/image.css

@@ -12,12 +12,14 @@
 }
 .adm-image-tip {
   position: relative;
-  background-color: #f3f3f3;
+  background-color: #f5f5f5;
   height: 100%;
   min-height: 24px;
   min-width: 24px;
 }
-.adm-image-tip > .antd-mobile-icon {
+.adm-image-tip > svg {
+  width: 24px;
+  height: 24px;
   position: absolute;
   left: 50%;
   top: 50%;

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

@@ -1,7 +1,7 @@
 import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type ImageProps = {
-    src: string;
+    src?: string;
     alt?: string;
     width?: number | string;
     height?: number | string;

package/es/components/image/image.js

@@ -1,20 +1,21 @@
 import { mergeProps } from '../../utils/with-default-props';
 import React, { useState, useRef } from 'react';
 import { withNativeProps } from '../../utils/native-props';
-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 { useIsomorphicUpdateLayoutEffect } from '../../utils/use-isomorphic-update-layout-effect';
+import { ImageIcon } from './image-icon';
+import { BrokenImageIcon } from './broken-image-icon';
 const classPrefix = `adm-image`;
 const defaultProps = {
   fit: 'fill',
   placeholder: React.createElement("div", {
     className: `${classPrefix}-tip`
-  }, React.createElement(PictureOutline, null)),
+  }, React.createElement(ImageIcon, null)),
   fallback: React.createElement("div", {
     className: `${classPrefix}-tip`
-  }, React.createElement(PictureWrongOutline, null)),
+  }, React.createElement(BrokenImageIcon, null)),
   lazy: false
 };
 export const Image = staged(p => {

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

@@ -5,7 +5,7 @@ import { mergeProps } from '../../utils/with-default-props';
 import ImageViewer from '../image-viewer';
 import PreviewItem from './preview-item';
 import { usePropsValue } from '../../utils/use-props-value';
-import { useIsomorphicLayoutEffect, useMemoizedFn, useUnmount } from 'ahooks';
+import { useIsomorphicLayoutEffect, useUnmount } from 'ahooks';
 import Space from '../space';
 import { withNativeProps } from '../../utils/native-props';
 import { useConfig } from '../config-provider';
@@ -28,9 +28,6 @@ export const ImageUploader = p => {
   } = useConfig();
   const props = mergeProps(defaultProps, p);
   const [value, setValue] = usePropsValue(props);
-  const updateValue = useMemoizedFn(updater => {
-    setValue(updater(value));
-  });
   const [tasks, setTasks] = useState([]);
   useIsomorphicLayoutEffect(() => {
     setTasks(prev => prev.filter(task => {
@@ -109,7 +106,7 @@ export const ImageUploader = p => {
               return task;
             });
           });
-          updateValue(prev => {
+          setValue(prev => {
             const newVal = Object.assign({}, result);
             return [...prev, newVal];
           });

package/es/components/infinite-scroll/infinite-scroll.js

@@ -27,9 +27,11 @@ export const InfiniteScroll = p => {
     threshold: 250
   }, p);
   const doLoadMore = useLockFn(() => props.loadMore());
-  const elementRef = useRef(null);
+  const elementRef = useRef(null); // Prevent duplicated trigger of `check` function
+
   const [flag, setFlag] = useState({});
   const nextFlagRef = useRef(flag);
+  const [scrollParent, setScrollParent] = useState();
   const check = useMemoizedFn(() => __awaiter(void 0, void 0, void 0, function* () {
     if (nextFlagRef.current !== flag) return;
     if (!props.hasMore) return;
@@ -37,6 +39,7 @@ export const InfiniteScroll = p => {
     if (!element) return;
     if (!element.offsetParent) return;
     const parent = getScrollParent(element);
+    setScrollParent(parent);
     if (!parent) return;
     const rect = element.getBoundingClientRect();
     const elementTop = rect.top;
@@ -56,18 +59,17 @@ export const InfiniteScroll = p => {
   useEffect(() => {
     const element = elementRef.current;
     if (!element) return;
-    const parent = getScrollParent(element);
-    if (!parent) return;
+    if (!scrollParent) return;
 
     function onScroll() {
       check();
     }
 
-    parent.addEventListener('scroll', onScroll);
+    scrollParent.addEventListener('scroll', onScroll);
     return () => {
-      parent.removeEventListener('scroll', onScroll);
+      scrollParent.removeEventListener('scroll', onScroll);
     };
-  }, []);
+  }, [scrollParent]);
   return withNativeProps(props, React.createElement("div", {
     className: classPrefix,
     ref: elementRef

package/es/components/modal/modal.d.ts

@@ -1,4 +1,5 @@
 import React, { FC, ReactNode } from 'react';
+import type { MaskProps } from '../mask';
 import { Action } from './modal-action-button';
 import { GetContainer } from '../../utils/render-to-container';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
@@ -19,7 +20,7 @@ export declare type ModalProps = {
     getContainer?: GetContainer;
     bodyStyle?: React.CSSProperties;
     bodyClassName?: string;
-    maskStyle?: React.CSSProperties;
+    maskStyle?: MaskProps['style'];
     maskClassName?: string;
     stopPropagation?: PropagationEvent[];
     showCloseButton?: boolean;

package/es/components/popup/popup.d.ts

@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
+import type { MaskProps } from '../mask';
 import { GetContainer } from '../../utils/render-to-container';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
 export declare type PopupProps = {
@@ -15,7 +16,7 @@ export declare type PopupProps = {
     bodyClassName?: string;
     bodyStyle?: React.CSSProperties;
     maskClassName?: string;
-    maskStyle?: React.CSSProperties;
+    maskStyle?: MaskProps['style'];
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
     stopPropagation?: PropagationEvent[];
     children?: React.ReactNode;

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

@@ -52,7 +52,7 @@ export const SearchBar = forwardRef((p, ref) => {
   }));
 
   const renderCancelButton = () => {
-    let isShowCancel = false;
+    let isShowCancel;
 
     if (typeof props.showCancelButton === 'function') {
       isShowCancel = props.showCancelButton(hasFocus, value);
@@ -61,13 +61,7 @@ export const SearchBar = forwardRef((p, ref) => {
     }
 
     return isShowCancel && React.createElement("div", {
-      className: `${classPrefix}-suffix`,
-      onMouseDown: e => {
-        e.preventDefault();
-      },
-      onTouchStart: e => {
-        e.preventDefault();
-      }
+      className: `${classPrefix}-suffix`
     }, React.createElement(Button, {
       fill: 'none',
       className: `${classPrefix}-cancel-button`,
@@ -80,6 +74,9 @@ export const SearchBar = forwardRef((p, ref) => {
 
         (_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.blur();
         (_c = props.onCancel) === null || _c === void 0 ? void 0 : _c.call(props);
+      },
+      onMouseDown: e => {
+        e.preventDefault();
       }
     }, props.cancelText));
   };

package/es/components/side-bar/side-bar.d.ts

@@ -1,10 +1,11 @@
 import { FC, ReactNode } from 'react';
 import React from 'react';
+import { BadgeProps } from '../badge';
 import { NativeProps } from '../../utils/native-props';
 export declare type SideBarItemProps = {
     title?: ReactNode;
     disabled?: boolean;
-    badge?: ReactNode;
+    badge?: BadgeProps['content'];
 } & NativeProps;
 export declare const SideBarItem: FC<SideBarItemProps>;
 export declare type SideBarProps = {

package/es/components/tabs/tabs.css

@@ -3,6 +3,8 @@
   --content-padding: 12px;
   --active-line-height: 2px;
   --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;
 }
@@ -38,7 +40,7 @@
   cursor: pointer;
 }
 .adm-tabs-tab-active {
-  color: var(--adm-color-primary);
+  color: var(--active-title-color);
 }
 .adm-tabs-tab-disabled {
   opacity: 0.5;
@@ -48,8 +50,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);
 }
 .adm-tabs-content {

package/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/es/components/toast/toast.css

@@ -13,7 +13,7 @@
   transform: translate(-50%, -50%);
   width: auto;
   min-width: 96px;
-  max-width: 70%;
+  max-width: 200px;
   max-height: 70%;
   overflow: auto;
   color: white;

package/es/components/toast/toast.d.ts

@@ -1,9 +1,10 @@
 import React, { ReactNode } from 'react';
+import type { MaskProps } from '../mask';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
 import { GetContainer } from '../../utils/render-to-container';
 export interface ToastProps {
     afterClose?: () => void;
-    maskStyle?: React.CSSProperties;
+    maskStyle?: MaskProps['style'];
     maskClassName?: string;
     maskClickable?: boolean;
     content?: ReactNode;

package/es/utils/get-scroll-parent.js

@@ -19,7 +19,7 @@ export function getScrollParent(el, root = defaultRoot) {
       overflowY
     } = window.getComputedStyle(node);
 
-    if (overflowStylePatterns.includes(overflowY)) {
+    if (overflowStylePatterns.includes(overflowY) && node.scrollHeight > node.clientHeight) {
       return node;
     }
 

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "antd-mobile",
-  "version": "5.12.1",
+  "version": "5.12.4",
   "dependencies": {
     "@floating-ui/dom": "^0.4.5",
     "@react-spring/web": "^9.4.5",
-    "@types/big.js": "^6.1.3",
-    "@types/react-is": "^17.0.3",
-    "@types/react-virtualized": "^9.21.21",
-    "@types/resize-observer-browser": "^0.1.7",
-    "@use-gesture/react": "^10.2.12",
+    "@use-gesture/react": "10.2.14",
     "ahooks": "^3.3.10",
     "antd-mobile-icons": "^0.2.2",
     "antd-mobile-v5-count": "^1.0.1",
@@ -43,6 +39,5 @@
     "url": "git+https://github.com/ant-design/ant-design-mobile.git",
     "branch": "master",
     "platform": "github"
-  },
-  "packageManager": "yarn@3.2.0"
+  }
 }