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

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

@@ -9,12 +9,16 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _web = require("@react-spring/web");
 
+var _ahooks = require("ahooks");
+
 var _rubberband = require("../../utils/rubberband");
 
 var _useDragAndPinch = require("../../utils/use-drag-and-pinch");
 
 var _bound = require("../../utils/bound");
 
+var mat = _interopRequireWildcard(require("../../utils/matrix"));
+
 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; }
@@ -28,54 +32,71 @@ const Slide = props => {
   const controlRef = (0, _react.useRef)(null);
   const imgRef = (0, _react.useRef)(null);
   const [{
-    zoom,
-    x,
-    y
+    matrix
   }, api] = (0, _web.useSpring)(() => ({
-    zoom: 1,
-    x: 0,
-    y: 0,
+    matrix: mat.create(),
     config: {
       tension: 200
     }
   }));
+  const controlSize = (0, _ahooks.useSize)(controlRef);
+  const imgSize = (0, _ahooks.useSize)(imgRef);
   const pinchLockRef = (0, _react.useRef)(false);
 
-  function boundXY([x, y], rubberband) {
-    const currentZoom = zoom.get();
-    let xOffset = 0,
-        yOffset = 0;
+  const boundMatrix = (nextMatrix, type, last = false) => {
+    if (!controlSize || !imgSize) return nextMatrix;
+    const controlLeft = -controlSize.width / 2;
+    const controlTop = -controlSize.height / 2;
+    const imgLeft = -imgSize.width / 2;
+    const imgTop = -imgSize.height / 2;
+    const zoom = mat.getScaleX(nextMatrix);
+    const scaledImgWidth = zoom * imgSize.width;
+    const scaledImgHeight = zoom * imgSize.height;
+    const [x, y] = mat.apply(nextMatrix, [imgLeft, imgTop]);
+
+    if (type === 'translate') {
+      let boundedX = x;
+      let boundedY = y;
+
+      if (scaledImgWidth > controlSize.width) {
+        const minX = controlLeft - (scaledImgWidth - controlSize.width);
+        const maxX = controlLeft;
+        boundedX = last ? (0, _bound.bound)(x, minX, maxX) : (0, _rubberband.rubberbandIfOutOfBounds)(x, minX, maxX, zoom * 50);
+      } else {
+        boundedX = -scaledImgWidth / 2;
+      }
+
+      if (scaledImgHeight > controlSize.height) {
+        const minY = controlTop - (scaledImgHeight - controlSize.height);
+        const maxY = controlTop;
+        boundedY = last ? (0, _bound.bound)(y, minY, maxY) : (0, _rubberband.rubberbandIfOutOfBounds)(y, minY, maxY, zoom * 50);
+      } else {
+        boundedY = -scaledImgHeight / 2;
+      }
 
-    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;
+      return mat.translate(nextMatrix, boundedX - x, boundedY - y);
     }
 
-    xOffset = xOffset > 0 ? xOffset : 0;
-    yOffset = yOffset > 0 ? yOffset : 0;
-    const bounds = {
-      left: -xOffset,
-      right: xOffset,
-      top: -yOffset,
-      bottom: yOffset
-    };
-
-    if (rubberband) {
-      return [(0, _rubberband.rubberbandIfOutOfBounds)(x, bounds.left, bounds.right, currentZoom * 50), (0, _rubberband.rubberbandIfOutOfBounds)(y, bounds.top, bounds.bottom, currentZoom * 50)];
-    } else {
-      return [(0, _bound.bound)(x, bounds.left, bounds.right), (0, _bound.bound)(y, bounds.top, bounds.bottom)];
+    if (type === 'scale' && last) {
+      const [boundedX, boundedY] = [scaledImgWidth > controlSize.width ? (0, _bound.bound)(x, controlLeft - (scaledImgWidth - controlSize.width), controlLeft) : -scaledImgWidth / 2, scaledImgHeight > controlSize.height ? (0, _bound.bound)(y, controlTop - (scaledImgHeight - controlSize.height), controlTop) : -scaledImgHeight / 2];
+      return mat.translate(nextMatrix, boundedX - x, boundedY - y);
     }
-  }
+
+    return nextMatrix;
+  };
 
   (0, _useDragAndPinch.useDragAndPinch)({
     onDrag: state => {
+      if (state.first) return;
+      if (state.pinching) return state.cancel();
+
       if (state.tap && state.elapsedTime > 0 && state.elapsedTime < 1000) {
         // 判断点击时间>0是为了过滤掉非正常操作，例如用户长按选择图片之后的取消操作（也是一次点击）
         props.onTap();
         return;
       }
 
-      const currentZoom = zoom.get();
+      const currentZoom = mat.getScaleX(matrix.get());
 
       if (dragLockRef) {
         dragLockRef.current = currentZoom !== 1;
@@ -83,24 +104,16 @@ const Slide = props => {
 
       if (!pinchLockRef.current && currentZoom <= 1) {
         api.start({
-          x: 0,
-          y: 0
+          matrix: mat.create()
         });
       } else {
-        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
-          });
-        }
+        const currentMatrix = matrix.get();
+        const offset = [state.offset[0] - mat.getTranslateX(currentMatrix), state.offset[1] - mat.getTranslateY(currentMatrix)];
+        const nextMatrix = mat.translate(currentMatrix, ...(state.last ? [offset[0] + state.velocity[0] * state.direction[0] * 200, offset[1] + state.velocity[1] * state.direction[1] * 200] : offset));
+        api.start({
+          matrix: boundMatrix(nextMatrix, 'translate', state.last),
+          immediate: !state.last
+        });
       }
     },
     onPinch: state => {
@@ -110,22 +123,30 @@ const Slide = props => {
       const [d] = state.offset;
       if (d < 0) return;
       const nextZoom = state.last ? (0, _bound.bound)(d, 1, props.maxZoom) : d;
-      api.start({
-        zoom: nextZoom,
-        immediate: !state.last
-      });
       (_a = props.onZoomChange) === null || _a === void 0 ? void 0 : _a.call(props, nextZoom);
 
       if (state.last && nextZoom <= 1) {
         api.start({
-          x: 0,
-          y: 0
+          matrix: mat.create()
         });
 
         if (dragLockRef) {
           dragLockRef.current = false;
         }
       } else {
+        if (!controlSize) return;
+        const currentMatrix = matrix.get();
+        const currentZoom = mat.getScaleX(currentMatrix);
+        const originOffsetX = state.origin[0] - controlSize.width / 2;
+        const originOffsetY = state.origin[1] - controlSize.height / 2;
+        let nextMatrix = mat.translate(currentMatrix, -originOffsetX, -originOffsetY);
+        nextMatrix = mat.scale(nextMatrix, nextZoom / currentZoom);
+        nextMatrix = mat.translate(nextMatrix, originOffsetX, originOffsetY);
+        api.start({
+          matrix: boundMatrix(nextMatrix, 'scale', state.last),
+          immediate: !state.last
+        });
+
         if (dragLockRef) {
           dragLockRef.current = true;
         }
@@ -135,13 +156,13 @@ const Slide = props => {
     target: controlRef,
     drag: {
       // filterTaps: true,
-      from: () => [x.get(), y.get()],
+      from: () => [mat.getTranslateX(matrix.get()), mat.getTranslateY(matrix.get())],
       pointer: {
         touch: true
       }
     },
     pinch: {
-      from: () => [zoom.get(), 0],
+      from: () => [mat.getScaleX(matrix.get()), 0],
       pointer: {
         touch: true
       }
@@ -150,7 +171,7 @@ const Slide = props => {
   return _react.default.createElement("div", {
     className: `${classPrefix}-slide`,
     onPointerMove: e => {
-      if (zoom.get() !== 1) {
+      if (mat.getScaleX(matrix.get()) !== 1) {
         e.stopPropagation();
       }
     }
@@ -160,9 +181,7 @@ const Slide = props => {
   }, _react.default.createElement(_web.animated.div, {
     className: `${classPrefix}-image-wrapper`,
     style: {
-      translateX: x,
-      translateY: y,
-      scale: zoom
+      matrix
     }
   }, _react.default.createElement("img", {
     ref: imgRef,

package/2x/cjs/components/index-bar/index-bar.css

@@ -24,8 +24,8 @@
   height: 70px;
   padding: 0 24px;
   color: var(--adm-color-weak);
-  font-size: 26px;
-  background-color: #f5f5f5;
+  font-size: var(--adm-font-size-main);
+  background-color: var(--adm-color-box);
 }
 
 .adm-index-bar-sidebar {
@@ -36,7 +36,8 @@
   z-index: 910;
   overflow: visible;
   color: var(--adm-color-weak);
-  font-size: 24px;
+  font-size: var(--adm-font-size-4);
+  -webkit-user-select: none;
   user-select: none;
   touch-action: none;
 }
@@ -78,7 +79,7 @@
 }
 
 .adm-index-bar-sidebar-item-active {
-  color: #fff;
+  color: var(--adm-color-white);
   background-color: var(--adm-color-primary);
   border-radius: 50%;
 }
@@ -88,6 +89,7 @@
 }
 
 .adm-index-bar-sticky .adm-index-bar-anchor-title {
+  position: -webkit-sticky;
   position: sticky;
   z-index: 900;
   top: var(--sticky-offset-top);

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

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type IndexBarProps = {
     sticky?: boolean;
+    onIndexChange?: (index: string) => void;
     children?: React.ReactNode;
 } & NativeProps<'--sticky-offset-top'>;
 export declare type IndexBarRef = {
@@ -9,5 +10,10 @@ export declare type IndexBarRef = {
 };
 export declare const IndexBar: React.ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
+    onIndexChange?: ((index: string) => void) | undefined;
     children?: React.ReactNode;
-} & NativeProps<"--sticky-offset-top"> & React.RefAttributes<IndexBarRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--sticky-offset-top", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & React.RefAttributes<IndexBarRef>>;

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

@@ -72,6 +72,8 @@ const IndexBar = (0, _react.forwardRef)((p, ref) => {
   }));
 
   function scrollTo(index) {
+    var _a;
+
     const body = bodyRef.current;
     if (!body) return;
     const children = body.children;
@@ -84,6 +86,7 @@ const IndexBar = (0, _react.forwardRef)((p, ref) => {
       if (panelIndex === index) {
         body.scrollTop = panel.offsetTop;
         setActiveIndex(index);
+        activeIndex !== index && ((_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, index));
         return;
       }
     }
@@ -92,6 +95,8 @@ const IndexBar = (0, _react.forwardRef)((p, ref) => {
   const {
     run: checkActiveIndex
   } = (0, _ahooks.useThrottleFn)(() => {
+    var _a;
+
     const body = bodyRef.current;
     if (!body) return;
     const scrollTop = body.scrollTop;
@@ -105,6 +110,7 @@ const IndexBar = (0, _react.forwardRef)((p, ref) => {
 
       if (panel.offsetTop + panel.clientHeight - titleHeight > scrollTop) {
         setActiveIndex(panelIndex);
+        activeIndex !== panelIndex && ((_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, panelIndex));
         return;
       }
     }

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

@@ -4,8 +4,13 @@ export type { IndexBarProps, IndexBarRef } from './index-bar';
 export type { IndexBarPanelProps } from './panel';
 declare const _default: import("react").ForwardRefExoticComponent<{
     sticky?: boolean | undefined;
+    onIndexChange?: ((index: string) => void) | undefined;
     children?: import("react").ReactNode;
-} & import("../../utils/native-props").NativeProps<"--sticky-offset-top"> & import("react").RefAttributes<import("./index-bar").IndexBarRef>> & {
+} & {
+    className?: string | undefined;
+    style?: (import("react").CSSProperties & Partial<Record<"--sticky-offset-top", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & import("react").AriaAttributes & import("react").RefAttributes<import("./index-bar").IndexBarRef>> & {
     Panel: import("react").FC<import("./panel").IndexBarPanelProps>;
 };
 export default _default;

package/2x/cjs/components/infinite-scroll/infinite-scroll.css

@@ -4,5 +4,10 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  font-size: 26px;
+  font-size: var(--adm-font-size-main);
+}
+
+.adm-infinite-scroll-failed-text {
+  display: inline-block;
+  margin-right: 16px;
 }

package/2x/cjs/components/infinite-scroll/infinite-scroll.d.ts

@@ -1,9 +1,9 @@
 import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type InfiniteScrollProps = {
-    loadMore: () => Promise<void>;
+    loadMore: (isRetry: boolean) => Promise<void>;
     hasMore: boolean;
     threshold?: number;
-    children?: React.ReactNode;
+    children?: React.ReactNode | ((hasMore: boolean, failed: boolean, retry: () => void) => React.ReactNode);
 } & NativeProps;
 export declare const InfiniteScroll: FC<InfiniteScrollProps>;

package/2x/cjs/components/infinite-scroll/infinite-scroll.js

@@ -32,31 +32,41 @@ function isWindow(element) {
 }
 
 const classPrefix = `adm-infinite-scroll`;
-
-const InfiniteScrollContent = ({
-  hasMore
-}) => {
-  const {
-    locale
-  } = (0, _configProvider.useConfig)();
-  return _react.default.createElement(_react.default.Fragment, null, hasMore ? _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", null, locale.common.loading), _react.default.createElement(_dotLoading.default, null)) : _react.default.createElement("span", null, locale.InfiniteScroll.noMore));
+const defaultProps = {
+  threshold: 250,
+  children: (hasMore, failed, retry) => _react.default.createElement(InfiniteScrollContent, {
+    hasMore: hasMore,
+    failed: failed,
+    retry: retry
+  })
 };
 
 const InfiniteScroll = p => {
-  const props = (0, _withDefaultProps.mergeProps)({
-    threshold: 250
-  }, p);
-  const doLoadMore = (0, _ahooks.useLockFn)(() => props.loadMore());
-  const elementRef = (0, _react.useRef)(null);
+  const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+  const [failed, setFailed] = (0, _react.useState)(false);
+  const doLoadMore = (0, _ahooks.useLockFn)(isRetry => (0, _tslib.__awaiter)(void 0, void 0, void 0, function* () {
+    try {
+      yield props.loadMore(isRetry);
+    } catch (e) {
+      setFailed(true);
+      throw e;
+    }
+  }));
+  const elementRef = (0, _react.useRef)(null); // Prevent duplicated trigger of `check` function
+
   const [flag, setFlag] = (0, _react.useState)({});
   const nextFlagRef = (0, _react.useRef)(flag);
-  const check = (0, _ahooks.useMemoizedFn)(() => (0, _tslib.__awaiter)(void 0, void 0, void 0, function* () {
+  const [scrollParent, setScrollParent] = (0, _react.useState)();
+  const {
+    run: check
+  } = (0, _ahooks.useThrottleFn)(() => (0, _tslib.__awaiter)(void 0, void 0, void 0, function* () {
     if (nextFlagRef.current !== flag) return;
     if (!props.hasMore) return;
     const element = elementRef.current;
     if (!element) return;
     if (!element.offsetParent) return;
     const parent = (0, _getScrollParent.getScrollParent)(element);
+    setScrollParent(parent);
     if (!parent) return;
     const rect = element.getBoundingClientRect();
     const elementTop = rect.top;
@@ -65,10 +75,14 @@ const InfiniteScroll = p => {
     if (current >= elementTop - props.threshold) {
       const nextFlag = {};
       nextFlagRef.current = nextFlag;
-      yield doLoadMore();
+      yield doLoadMore(false);
       setFlag(nextFlag);
     }
-  })); // 确保在内容不足时会自动触发加载事件
+  }), {
+    wait: 100,
+    leading: true,
+    trailing: true
+  }); // Make sure to trigger `loadMore` when content changes
 
   (0, _react.useEffect)(() => {
     check();
@@ -76,24 +90,52 @@ const InfiniteScroll = p => {
   (0, _react.useEffect)(() => {
     const element = elementRef.current;
     if (!element) return;
-    const parent = (0, _getScrollParent.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]);
+
+  function retry() {
+    return (0, _tslib.__awaiter)(this, void 0, void 0, function* () {
+      setFailed(false);
+      yield doLoadMore(true);
+      setFlag(nextFlagRef.current);
+    });
+  }
+
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix,
     ref: elementRef
-  }, props.children && props.children, !props.children && _react.default.createElement(InfiniteScrollContent, {
-    hasMore: props.hasMore
-  })));
+  }, typeof props.children === 'function' ? props.children(props.hasMore, failed, retry) : props.children));
 };
 
-exports.InfiniteScroll = InfiniteScroll;
+exports.InfiniteScroll = InfiniteScroll;
+
+const InfiniteScrollContent = props => {
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
+
+  if (!props.hasMore) {
+    return _react.default.createElement("span", null, locale.InfiniteScroll.noMore);
+  }
+
+  if (props.failed) {
+    return _react.default.createElement("span", null, _react.default.createElement("span", {
+      className: `${classPrefix}-failed-text`
+    }, locale.InfiniteScroll.failedToLoad), _react.default.createElement("a", {
+      onClick: () => {
+        props.retry();
+      }
+    }, locale.InfiniteScroll.retry));
+  }
+
+  return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", null, locale.common.loading), _react.default.createElement(_dotLoading.default, null));
+};

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

@@ -1,5 +1,5 @@
 .adm-input {
-  --font-size: 34px;
+  --font-size: var(--adm-font-size-9);
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
   --text-align: left;
@@ -34,11 +34,17 @@
   background: transparent;
   border: 0;
   outline: none;
+  -webkit-appearance: none;
   appearance: none;
   min-height: 1.5em;
   text-align: var(--text-align);
 }
 
+.adm-input-element::-webkit-input-placeholder {
+  color: var(--placeholder-color);
+  font-family: inherit;
+}
+
 .adm-input-element::placeholder {
   color: var(--placeholder-color);
   font-family: inherit;
@@ -60,6 +66,10 @@
   display: none;
 }
 
+.adm-input-element::-ms-reveal {
+  display: none;
+}
+
 .adm-input-element::-webkit-search-cancel-button {
   display: none;
 }
@@ -100,5 +110,5 @@
 
 .adm-input-clear .antd-mobile-icon {
   display: block;
-  font-size: 30px;
+  font-size: var(--adm-font-size-7);
 }

package/2x/cjs/components/input/input.d.ts

@@ -1,7 +1,10 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick'> & {
+declare type AriaProps = {
+    role?: string;
+};
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'autoComplete' | 'autoFocus' | 'pattern' | 'inputMode' | 'type' | 'name' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd' | 'onClick' | 'step'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -16,14 +19,14 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
     min?: number;
     max?: number;
-} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--text-align'>;
+} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--text-align'> & AriaProps;
 export declare type InputRef = {
     clear: () => void;
     focus: () => void;
     blur: () => void;
     nativeElement: HTMLInputElement | null;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "name" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "autoFocus" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "onClick" | "name" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "autoFocus" | "maxLength" | "minLength" | "step"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -38,5 +41,9 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProp
     enterKeyHint?: "search" | "enter" | "done" | "go" | "next" | "previous" | "send" | undefined;
     min?: number | undefined;
     max?: number | undefined;
-} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align"> & React.RefAttributes<InputRef>>;
+} & {
+    className?: string | undefined;
+    style?: (React.CSSProperties & Partial<Record<"--color" | "--font-size" | "--placeholder-color" | "--text-align", string>>) | undefined;
+    tabIndex?: number | undefined;
+} & React.AriaAttributes & AriaProps & React.RefAttributes<InputRef>>;
 export {};

package/2x/cjs/components/input/input.js

@@ -21,6 +21,10 @@ var _ahooks = require("ahooks");
 
 var _bound = require("../../utils/bound");
 
+var _validate = require("../../utils/validate");
+
+var _configProvider = require("../config-provider");
+
 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); }
@@ -36,7 +40,11 @@ const Input = (0, _react.forwardRef)((p, ref) => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const [value, setValue] = (0, _usePropsValue.usePropsValue)(props);
   const [hasFocus, setHasFocus] = (0, _react.useState)(false);
+  const compositionStartRef = (0, _react.useRef)(false);
   const nativeInputRef = (0, _react.useRef)(null);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
   (0, _react.useImperativeHandle)(ref, () => ({
     clear: () => {
       setValue('');
@@ -142,20 +150,41 @@ const Input = (0, _react.forwardRef)((p, ref) => {
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,
     onKeyUp: props.onKeyUp,
-    onCompositionStart: props.onCompositionStart,
-    onCompositionEnd: props.onCompositionEnd,
-    onClick: props.onClick
+    onCompositionStart: e => {
+      var _a;
+
+      compositionStartRef.current = true;
+      (_a = props.onCompositionStart) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    },
+    onCompositionEnd: e => {
+      var _a;
+
+      compositionStartRef.current = false;
+      (_a = props.onCompositionEnd) === null || _a === void 0 ? void 0 : _a.call(props, e);
+    },
+    onClick: props.onClick,
+    role: props.role,
+    "aria-valuenow": props['aria-valuenow'],
+    "aria-valuemax": props['aria-valuemax'],
+    "aria-valuemin": props['aria-valuemin'],
+    "aria-label": props['aria-label']
   }), shouldShowClear && _react.default.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();
     },
     onClick: () => {
-      var _a;
+      var _a, _b;
 
       setValue('');
-      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props);
-    }
+      (_a = props.onClear) === null || _a === void 0 ? void 0 : _a.call(props); // https://github.com/ant-design/ant-design-mobile/issues/5212
+
+      if ((0, _validate.isIOS)() && compositionStartRef.current) {
+        compositionStartRef.current = false;
+        (_b = nativeInputRef.current) === null || _b === void 0 ? void 0 : _b.blur();
+      }
+    },
+    "aria-label": locale.Input.clear
   }, _react.default.createElement(_antdMobileIcons.CloseCircleFill, null))));
 });
 exports.Input = Input;