antd-mobile 5.40.0 → 5.41.0-alpha.0

package/2x/es/components/virtual-input/virtual-input.js

@@ -8,7 +8,10 @@ import { mergeProp, mergeProps } from '../../utils/with-default-props';
 import { useConfig } from '../config-provider';
 const classPrefix = 'adm-virtual-input';
 const defaultProps = {
-  defaultValue: ''
+  defaultValue: '',
+  cursor: {
+    movable: false
+  }
 };
 export const VirtualInput = forwardRef((props, ref) => {
   const {
@@ -21,6 +24,13 @@ export const VirtualInput = forwardRef((props, ref) => {
   const contentRef = useRef(null);
   const [hasFocus, setHasFocus] = useState(false);
   const [caretPosition, setCaretPosition] = useState(value.length); // 光标位置，从 0 开始，如值是 2 则表示光标在顺序下标为 2 的数字之前
+  const keyboardDataRef = useRef({}); // 临时记录虚拟键盘输入，在下次更新时用于判断光标位置如何调整
+  const touchDataRef = useRef(); // 记录上一次 touch 时的坐标位置
+  const charRef = useRef(null); // 第一个字符的 DOM
+  const charWidthRef = useRef(0); // 单个字符宽度
+  const caretRef = useRef(null); // 光标的 DOM
+  const [isCaretDragging, setIsCaretDragging] = useState(false);
+  const touchMoveTimeoutRef = useRef();
   const clearIcon = mergeProp(React.createElement(CloseCircleFill, null), componentConfig.clearIcon, props.clearIcon);
   function scrollToEnd() {
     const root = rootRef.current;
@@ -32,6 +42,24 @@ export const VirtualInput = forwardRef((props, ref) => {
     if (!content) return;
     content.scrollLeft = content.clientWidth;
   }
+  useEffect(() => {
+    // 记录单个字符的宽度，用于光标移动时的计算
+    if (charRef.current) {
+      charWidthRef.current = charRef.current.getBoundingClientRect().width;
+    }
+  }, [value]);
+  useEffect(() => {
+    // 经过外部受控逻辑后，再调整光标位置，如果受控逻辑改动了值则光标放到最后
+    if (value === keyboardDataRef.current.newValue) {
+      if (keyboardDataRef.current.mode === 'input') {
+        setCaretPosition(c => c + 1);
+      } else if (keyboardDataRef.current.mode === 'delete') {
+        setCaretPosition(c => c - 1);
+      }
+    } else {
+      setCaretPosition(value.length);
+    }
+  }, [value]);
   useIsomorphicLayoutEffect(() => {
     scrollToEnd();
   }, [value]);
@@ -65,16 +93,24 @@ export const VirtualInput = forwardRef((props, ref) => {
     onInput: v => {
       var _a, _b;
       const newValue = value.substring(0, caretPosition) + v + value.substring(caretPosition);
+      // 临时记录，用于后续光标位置
+      keyboardDataRef.current = {
+        newValue,
+        mode: 'input'
+      };
       setValue(newValue);
-      setCaretPosition(c => c + 1);
       (_b = (_a = keyboard.props).onInput) === null || _b === void 0 ? void 0 : _b.call(_a, v);
     },
     onDelete: () => {
       var _a, _b;
       if (caretPosition === 0) return;
       const newValue = value.substring(0, caretPosition - 1) + value.substring(caretPosition);
+      // 临时记录，用于后续光标位置
+      keyboardDataRef.current = {
+        newValue,
+        mode: 'delete'
+      };
       setValue(newValue);
-      setCaretPosition(caretPosition - 1);
       (_b = (_a = keyboard.props).onDelete) === null || _b === void 0 ? void 0 : _b.call(_a);
     },
     visible: hasFocus,
@@ -94,23 +130,80 @@ export const VirtualInput = forwardRef((props, ref) => {
   });
   // 点击输入框时，将光标置于最后
   const setCaretPositionToEnd = () => {
-    setCaretPosition(value.length);
+    var _a, _b;
+    if (caretPosition !== value.length) {
+      setCaretPosition(value.length);
+      (_b = (_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.onMove) === null || _b === void 0 ? void 0 : _b.call(_a, value.length);
+    }
   };
   // 点击单个字符时，根据点击位置置于字符前或后
   const changeCaretPosition = index => e => {
+    var _a, _b, _c;
+    if (mergedProps.disabled || !((_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.movable)) return;
     e.stopPropagation();
     const rect = e.target.getBoundingClientRect();
     const midX = rect.left + rect.width / 2;
     const clickX = e.clientX;
     // 点击区域是否偏右
     const isRight = clickX > midX;
-    setCaretPosition(isRight ? index + 1 : index);
+    const newCaretPosition = isRight ? index + 1 : index;
+    setCaretPosition(newCaretPosition);
+    (_c = (_b = mergedProps.cursor) === null || _b === void 0 ? void 0 : _b.onMove) === null || _c === void 0 ? void 0 : _c.call(_b, newCaretPosition);
+  };
+  // 在光标附近 touchmove 时也可以调整光标位置
+  const handleTouchStart = e => {
+    var _a;
+    if (mergedProps.disabled || !((_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.movable)) return;
+    if (!caretRef.current) return;
+    const touch = e.touches[0];
+    const caretRect = caretRef.current.getBoundingClientRect();
+    const distance = Math.abs(touch.clientX - (caretRect.left + caretRect.width / 2));
+    if (distance < 20) {
+      // 20px 阈值可调整
+      touchDataRef.current = {
+        startX: touch.clientX,
+        startCaretPosition: caretPosition
+      };
+    } else {
+      touchDataRef.current = null;
+    }
+  };
+  const handleTouchMove = e => {
+    var _a, _b, _c;
+    if (!touchDataRef.current || !((_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.movable)) return;
+    setIsCaretDragging(true);
+    const touch = e.touches[0];
+    const deltaX = touch.clientX - touchDataRef.current.startX;
+    const charWidth = charWidthRef.current;
+    const moveChars = Math.round(deltaX / charWidth);
+    let newCaretPosition = touchDataRef.current.startCaretPosition + moveChars;
+    // 边界处理
+    newCaretPosition = Math.max(0, Math.min(newCaretPosition, value.length));
+    setCaretPosition(newCaretPosition);
+    (_c = (_b = mergedProps.cursor) === null || _b === void 0 ? void 0 : _b.onMove) === null || _c === void 0 ? void 0 : _c.call(_b, newCaretPosition);
+    // 防止 touchend 不触发
+    if (touchMoveTimeoutRef.current) {
+      clearTimeout(touchMoveTimeoutRef.current);
+    }
+    touchMoveTimeoutRef.current = setTimeout(() => {
+      setIsCaretDragging(false);
+      touchMoveTimeoutRef.current = null;
+    }, 500);
+  };
+  const handleTouchEnd = () => {
+    touchDataRef.current = null;
+    setIsCaretDragging(false);
+    if (touchMoveTimeoutRef.current) {
+      clearTimeout(touchMoveTimeoutRef.current);
+      touchMoveTimeoutRef.current = null;
+    }
   };
   const chars = (value + '').split('');
   return withNativeProps(mergedProps, React.createElement("div", {
     ref: rootRef,
     className: classNames(classPrefix, {
-      [`${classPrefix}-disabled`]: mergedProps.disabled
+      [`${classPrefix}-disabled`]: mergedProps.disabled,
+      [`${classPrefix}-caret-dragging`]: isCaretDragging
     }),
     tabIndex: mergedProps.disabled ? undefined : 0,
     role: 'textbox',
@@ -122,13 +215,18 @@ export const VirtualInput = forwardRef((props, ref) => {
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
     "aria-label": mergedProps.placeholder,
-    onClick: setCaretPositionToEnd
+    onClick: setCaretPositionToEnd,
+    onTouchStart: handleTouchStart,
+    onTouchMove: handleTouchMove,
+    onTouchEnd: handleTouchEnd
   }, chars.slice(0, caretPosition).map((i, index) => React.createElement("span", {
+    ref: index === 0 ? charRef : undefined,
     key: index,
     onClick: changeCaretPosition(index)
   }, i)), React.createElement("div", {
     className: `${classPrefix}-caret-container`
   }, hasFocus && React.createElement("div", {
+    ref: caretRef,
     className: `${classPrefix}-caret`
   })), chars.slice(caretPosition).map((i, index) => React.createElement("span", {
     key: index,
@@ -139,7 +237,6 @@ export const VirtualInput = forwardRef((props, ref) => {
       var _a;
       e.stopPropagation();
       setValue('');
-      setCaretPosition(0);
       (_a = mergedProps.onClear) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
     },
     role: 'button',

package/2x/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mobile",
-  "version": "5.40.0",
+  "version": "5.41.0-alpha.0",
   "homepage": "https://github.com/ant-design/ant-design-mobile#readme",
   "bugs": {
     "url": "https://github.com/ant-design/ant-design-mobile/issues"
@@ -53,8 +53,8 @@
     "use-sync-external-store": "^1.2.0"
   },
   "peerDependencies": {
-    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+    "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "GravityCDN": "./umd/antd-mobile.js",
   "size-limit": [

package/bundle/antd-mobile.cjs.development.js

@@ -12250,6 +12250,7 @@ const Tabs$1 = (p) => {
   const props = mergeProps(defaultProps$S, p);
   const tabListContainerRef = React$2.useRef(null);
   const activeLineRef = React$2.useRef(null);
+  const tabRefs = React$2.useRef({});
   const keyToIndexRecord = {};
   let firstActiveKey = null;
   const panes = [];
@@ -12389,7 +12390,7 @@ const Tabs$1 = (p) => {
   });
   const {
     run: updateMask
-  } = useThrottleFn((immediate = false) => {
+  } = useThrottleFn((immediate) => {
     const container = tabListContainerRef.current;
     if (!container)
       return;
@@ -12416,6 +12417,35 @@ const Tabs$1 = (p) => {
   useIsomorphicLayoutEffect$3(() => {
     updateMask(true);
   }, []);
+  const handleKeyDown = (e2) => {
+    const keys2 = Object.keys(keyToIndexRecord);
+    const currentIndex = keyToIndexRecord[activeKey];
+    const isNext = isRTL2 ? e2.key === "ArrowLeft" : e2.key === "ArrowRight";
+    const isPrev = isRTL2 ? e2.key === "ArrowRight" : e2.key === "ArrowLeft";
+    const offsetDirection = isNext ? 1 : -1;
+    const findNextEnabledTab = (startIndex, direction) => {
+      const length = keys2.length;
+      for (let i2 = 0; i2 < length; i2++) {
+        const index2 = (startIndex + direction * (i2 + 1) + length) % length;
+        const key = keys2[index2];
+        const pane = panes.find((p2) => p2.key === key);
+        if (!(pane === null || pane === void 0 ? void 0 : pane.props.disabled))
+          return key;
+      }
+      return keys2[startIndex];
+    };
+    const currentKey = findNextEnabledTab(currentIndex, offsetDirection);
+    if (isNext || isPrev) {
+      e2.preventDefault();
+      setActiveKey(currentKey);
+    }
+  };
+  React$2.useEffect(() => {
+    var _a2;
+    if (activeKey && tabRefs.current[activeKey]) {
+      (_a2 = tabRefs.current[activeKey]) === null || _a2 === void 0 ? void 0 : _a2.focus();
+    }
+  }, [activeKey]);
   return withNativeProps(props, React$2.createElement("div", {
     className: classPrefix$15,
     style: {
@@ -12438,6 +12468,7 @@ const Tabs$1 = (p) => {
     ref: tabListContainerRef,
     scrollLeft,
     onScroll: updateMask,
+    onKeyDown: handleKeyDown,
     role: "tablist"
   }, React$2.createElement(animated.div, {
     ref: activeLineRef,
@@ -12452,6 +12483,10 @@ const Tabs$1 = (p) => {
       [`${classPrefix$15}-tab-wrapper-stretch`]: props.stretch
     })
   }, React$2.createElement("div", {
+    role: "tab",
+    "aria-selected": pane.key === activeKey,
+    tabIndex: pane.key === activeKey ? 0 : -1,
+    ref: (el) => tabRefs.current[pane.key] = el,
     onClick: () => {
       const {
         key
@@ -12466,9 +12501,7 @@ const Tabs$1 = (p) => {
     className: classNames(`${classPrefix$15}-tab`, {
       [`${classPrefix$15}-tab-active`]: pane.key === activeKey,
       [`${classPrefix$15}-tab-disabled`]: pane.props.disabled
-    }),
-    role: "tab",
-    "aria-selected": pane.key === activeKey
+    })
   }, pane.props.title)))))), panes.map((pane) => {
     if (pane.props.children === void 0) {
       return null;
@@ -13856,7 +13889,7 @@ function convertStringArrayToDate$1(value) {
   const yearString = (_a = value[0]) !== null && _a !== void 0 ? _a : "1900";
   const weekString = (_b = value[1]) !== null && _b !== void 0 ? _b : "1";
   const weekdayString = (_c = value[2]) !== null && _c !== void 0 ? _c : "1";
-  const day = dayjs(`${parseInt(yearString)}-01-01`).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
+  const day = dayjs(`${parseInt(yearString)}-01-04`).isoWeek(parseInt(weekString)).isoWeekday(parseInt(weekdayString)).hour(0).minute(0).second(0);
   return day.toDate();
 }
 const precisionLengthRecord = {
@@ -14583,13 +14616,21 @@ const Ellipsis = (p) => {
   const rootRef = React$2.useRef(null);
   const [expanded, setExpanded] = React$2.useState(defaultExpanded);
   const expandNode = expandText ? withStopPropagation(stopPropagationForActionButtons, React$2.createElement("a", {
-    onClick: () => {
+    onClick: (e2) => {
+      var _a;
       setExpanded(true);
+      (_a = props.onExpand) === null || _a === void 0 ? void 0 : _a.call(props, true, {
+        event: e2
+      });
     }
   }, expandText)) : null;
   const collapseNode = collapseText ? withStopPropagation(stopPropagationForActionButtons, React$2.createElement("a", {
-    onClick: () => {
+    onClick: (e2) => {
+      var _a;
       setExpanded(false);
+      (_a = props.onExpand) === null || _a === void 0 ? void 0 : _a.call(props, false, {
+        event: e2
+      });
     }
   }, collapseText)) : null;
   const [measureNodes, forceResize] = useMeasure(rootRef, content, rows, direction, expanded, expandNode, collapseNode);
@@ -26606,7 +26647,7 @@ const Swiper = React$2.forwardRef(staged_1((p, ref2) => {
         return React$2.createElement(React$2.Fragment, null, React$2.createElement("div", {
           className: `${classPrefix$a}-slide-placeholder`,
           style: {
-            width: `${startIndex * 100}%`
+            [isVertical ? "height" : "width"]: `${startIndex * 100}%`
           }
         }), items);
       }
@@ -27477,7 +27518,10 @@ const index = attachPropertiesToComponent(TreeSelect, {
 });
 const classPrefix$2 = "adm-virtual-input";
 const defaultProps$2 = {
-  defaultValue: ""
+  defaultValue: "",
+  cursor: {
+    movable: false
+  }
 };
 const VirtualInput = React$2.forwardRef((props, ref2) => {
   const {
@@ -27490,6 +27534,13 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
   const contentRef = React$2.useRef(null);
   const [hasFocus, setHasFocus] = React$2.useState(false);
   const [caretPosition, setCaretPosition] = React$2.useState(value.length);
+  const keyboardDataRef = React$2.useRef({});
+  const touchDataRef = React$2.useRef();
+  const charRef = React$2.useRef(null);
+  const charWidthRef = React$2.useRef(0);
+  const caretRef = React$2.useRef(null);
+  const [isCaretDragging, setIsCaretDragging] = React$2.useState(false);
+  const touchMoveTimeoutRef = React$2.useRef();
   const clearIcon = mergeProp(React$2.createElement(CloseCircleFill, null), componentConfig.clearIcon, props.clearIcon);
   function scrollToEnd() {
     const root2 = rootRef.current;
@@ -27503,6 +27554,22 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
       return;
     content.scrollLeft = content.clientWidth;
   }
+  React$2.useEffect(() => {
+    if (charRef.current) {
+      charWidthRef.current = charRef.current.getBoundingClientRect().width;
+    }
+  }, [value]);
+  React$2.useEffect(() => {
+    if (value === keyboardDataRef.current.newValue) {
+      if (keyboardDataRef.current.mode === "input") {
+        setCaretPosition((c) => c + 1);
+      } else if (keyboardDataRef.current.mode === "delete") {
+        setCaretPosition((c) => c - 1);
+      }
+    } else {
+      setCaretPosition(value.length);
+    }
+  }, [value]);
   useIsomorphicLayoutEffect$3(() => {
     scrollToEnd();
   }, [value]);
@@ -27536,8 +27603,11 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
     onInput: (v) => {
       var _a, _b;
       const newValue = value.substring(0, caretPosition) + v + value.substring(caretPosition);
+      keyboardDataRef.current = {
+        newValue,
+        mode: "input"
+      };
       setValue(newValue);
-      setCaretPosition((c) => c + 1);
       (_b = (_a = keyboard.props).onInput) === null || _b === void 0 ? void 0 : _b.call(_a, v);
     },
     onDelete: () => {
@@ -27545,8 +27615,11 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
       if (caretPosition === 0)
         return;
       const newValue = value.substring(0, caretPosition - 1) + value.substring(caretPosition);
+      keyboardDataRef.current = {
+        newValue,
+        mode: "delete"
+      };
       setValue(newValue);
-      setCaretPosition(caretPosition - 1);
       (_b = (_a = keyboard.props).onDelete) === null || _b === void 0 ? void 0 : _b.call(_a);
     },
     visible: hasFocus,
@@ -27563,21 +27636,78 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
     getContainer: null
   });
   const setCaretPositionToEnd = () => {
-    setCaretPosition(value.length);
+    var _a, _b;
+    if (caretPosition !== value.length) {
+      setCaretPosition(value.length);
+      (_b = (_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.onMove) === null || _b === void 0 ? void 0 : _b.call(_a, value.length);
+    }
   };
   const changeCaretPosition = (index2) => (e2) => {
+    var _a, _b, _c;
+    if (mergedProps.disabled || !((_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.movable))
+      return;
     e2.stopPropagation();
     const rect = e2.target.getBoundingClientRect();
     const midX = rect.left + rect.width / 2;
     const clickX = e2.clientX;
     const isRight = clickX > midX;
-    setCaretPosition(isRight ? index2 + 1 : index2);
+    const newCaretPosition = isRight ? index2 + 1 : index2;
+    setCaretPosition(newCaretPosition);
+    (_c = (_b = mergedProps.cursor) === null || _b === void 0 ? void 0 : _b.onMove) === null || _c === void 0 ? void 0 : _c.call(_b, newCaretPosition);
+  };
+  const handleTouchStart = (e2) => {
+    var _a;
+    if (mergedProps.disabled || !((_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.movable))
+      return;
+    if (!caretRef.current)
+      return;
+    const touch = e2.touches[0];
+    const caretRect = caretRef.current.getBoundingClientRect();
+    const distance = Math.abs(touch.clientX - (caretRect.left + caretRect.width / 2));
+    if (distance < 20) {
+      touchDataRef.current = {
+        startX: touch.clientX,
+        startCaretPosition: caretPosition
+      };
+    } else {
+      touchDataRef.current = null;
+    }
+  };
+  const handleTouchMove = (e2) => {
+    var _a, _b, _c;
+    if (!touchDataRef.current || !((_a = mergedProps.cursor) === null || _a === void 0 ? void 0 : _a.movable))
+      return;
+    setIsCaretDragging(true);
+    const touch = e2.touches[0];
+    const deltaX = touch.clientX - touchDataRef.current.startX;
+    const charWidth = charWidthRef.current;
+    const moveChars = Math.round(deltaX / charWidth);
+    let newCaretPosition = touchDataRef.current.startCaretPosition + moveChars;
+    newCaretPosition = Math.max(0, Math.min(newCaretPosition, value.length));
+    setCaretPosition(newCaretPosition);
+    (_c = (_b = mergedProps.cursor) === null || _b === void 0 ? void 0 : _b.onMove) === null || _c === void 0 ? void 0 : _c.call(_b, newCaretPosition);
+    if (touchMoveTimeoutRef.current) {
+      clearTimeout(touchMoveTimeoutRef.current);
+    }
+    touchMoveTimeoutRef.current = setTimeout(() => {
+      setIsCaretDragging(false);
+      touchMoveTimeoutRef.current = null;
+    }, 500);
+  };
+  const handleTouchEnd = () => {
+    touchDataRef.current = null;
+    setIsCaretDragging(false);
+    if (touchMoveTimeoutRef.current) {
+      clearTimeout(touchMoveTimeoutRef.current);
+      touchMoveTimeoutRef.current = null;
+    }
   };
   const chars = (value + "").split("");
   return withNativeProps(mergedProps, React$2.createElement("div", {
     ref: rootRef,
     className: classNames(classPrefix$2, {
-      [`${classPrefix$2}-disabled`]: mergedProps.disabled
+      [`${classPrefix$2}-disabled`]: mergedProps.disabled,
+      [`${classPrefix$2}-caret-dragging`]: isCaretDragging
     }),
     tabIndex: mergedProps.disabled ? void 0 : 0,
     role: "textbox",
@@ -27589,13 +27719,18 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
     ref: contentRef,
     "aria-disabled": mergedProps.disabled,
     "aria-label": mergedProps.placeholder,
-    onClick: setCaretPositionToEnd
+    onClick: setCaretPositionToEnd,
+    onTouchStart: handleTouchStart,
+    onTouchMove: handleTouchMove,
+    onTouchEnd: handleTouchEnd
   }, chars.slice(0, caretPosition).map((i2, index2) => React$2.createElement("span", {
+    ref: index2 === 0 ? charRef : void 0,
     key: index2,
     onClick: changeCaretPosition(index2)
   }, i2)), React$2.createElement("div", {
     className: `${classPrefix$2}-caret-container`
   }, hasFocus && React$2.createElement("div", {
+    ref: caretRef,
     className: `${classPrefix$2}-caret`
   })), chars.slice(caretPosition).map((i2, index2) => React$2.createElement("span", {
     key: index2,
@@ -27606,7 +27741,6 @@ const VirtualInput = React$2.forwardRef((props, ref2) => {
       var _a;
       e2.stopPropagation();
       setValue("");
-      setCaretPosition(0);
       (_a = mergedProps.onClear) === null || _a === void 0 ? void 0 : _a.call(mergedProps);
     },
     role: "button",