@tarojs/components-advanced 4.1.12-beta.7 → 4.1.12-beta.70

package/dist/components/list/hooks/useMeasureStartOffset.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMeasureStartOffset.js","sources":["../../../../src/components/list/hooks/useMeasureStartOffset.ts"],"sourcesContent":["import { useEffect, useState } from 'react'\n\nimport type { RefObject } from 'react'\n\n/**\n * 测量 scrollElement 内 content 节点之前所有兄弟的高度/宽度之和，作为 startOffset。\n * 用于 scrollElement 模式下无 Context 时自动计算上方内容高度（与下方 DOM stacking 对称）。\n * 用「累加前兄弟尺寸」替代 offsetTop/offsetLeft，避免 offsetParent 包含外部区域导致偏大。\n */\nexport function useMeasureStartOffset(\n  scrollElRef: RefObject<HTMLElement | null>,\n  contentRef: RefObject<HTMLElement | null>,\n  options: { enabled: boolean, isHorizontal?: boolean }\n): number {\n  const { enabled, isHorizontal = false } = options\n  const [measuredStartOffset, setMeasuredStartOffset] = useState(0)\n\n  useEffect(() => {\n    if (!enabled) return\n    const scrollEl = scrollElRef.current\n    const contentEl = contentRef.current\n    if (!scrollEl || !contentEl) return\n\n    const measure = () => {\n      const el = contentRef.current\n      if (!el || el.parentElement !== scrollEl) return\n      let offset = 0\n      let prev: Element | null = el.previousElementSibling\n      while (prev) {\n        offset += isHorizontal ? (prev as HTMLElement).offsetWidth : (prev as HTMLElement).offsetHeight\n        prev = prev.previousElementSibling\n      }\n      setMeasuredStartOffset((prevVal) => (Math.abs(prevVal - offset) < 1 ? prevVal : offset))\n    }\n    measure()\n    const ro = typeof ResizeObserver !== 'undefined' ? new ResizeObserver(measure) : null\n    if (ro) {\n      ro.observe(scrollEl)\n      // 同时观察 scrollEl 的直系子节点：图片加载、展开/收起等会改变兄弟高度，但 scrollEl 自身 clientHeight 不变，需观察子节点\n      Array.from(scrollEl.children).forEach((child) => ro.observe(child))\n      return () => ro.disconnect()\n    }\n  }, [enabled, scrollElRef, contentRef, isHorizontal])\n\n  return measuredStartOffset\n}\n"],"names":[],"mappings":";;AAIA;;;;AAIG;SACa,qBAAqB,CACnC,WAA0C,EAC1C,UAAyC,EACzC,OAAqD,EAAA;IAErD,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,KAAK,EAAE,GAAG,OAAO;IACjD,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IAEjE,SAAS,CAAC,MAAK;AACb,QAAA,IAAI,CAAC,OAAO;YAAE;AACd,QAAA,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO;AACpC,QAAA,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO;AACpC,QAAA,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS;YAAE;QAE7B,MAAM,OAAO,GAAG,MAAK;AACnB,YAAA,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO;AAC7B,YAAA,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,aAAa,KAAK,QAAQ;gBAAE;YAC1C,IAAI,MAAM,GAAG,CAAC;AACd,YAAA,IAAI,IAAI,GAAmB,EAAE,CAAC,sBAAsB;YACpD,OAAO,IAAI,EAAE;AACX,gBAAA,MAAM,IAAI,YAAY,GAAI,IAAoB,CAAC,WAAW,GAAI,IAAoB,CAAC,YAAY;AAC/F,gBAAA,IAAI,GAAG,IAAI,CAAC,sBAAsB;;YAEpC,sBAAsB,CAAC,CAAC,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC,CAAC;AAC1F,SAAC;AACD,QAAA,OAAO,EAAE;AACT,QAAA,MAAM,EAAE,GAAG,OAAO,cAAc,KAAK,WAAW,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,GAAG,IAAI;QACrF,IAAI,EAAE,EAAE;AACN,YAAA,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;;YAEpB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AACnE,YAAA,OAAO,MAAM,EAAE,CAAC,UAAU,EAAE;;KAE/B,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;AAEpD,IAAA,OAAO,mBAAmB;AAC5B;;;;"}
+{"version":3,"file":"useMeasureStartOffset.js","sources":["../../../../src/components/list/hooks/useMeasureStartOffset.ts"],"sourcesContent":["import { useEffect, useRef, useState } from 'react'\n\nimport type { RefObject } from 'react'\n\nconst WARNED_NESTED = new WeakSet<Element>()\nconst MAX_RETRY = 20\nconst RETRY_DELAY = 50\n\n/**\n * 测量 scrollElement 内 content 节点之前所有兄弟的高度/宽度之和，作为 startOffset。\n * 用于 scrollElement 模式下无 Context/props 时自动计算上方内容高度。\n * - 直接子节点：累加前兄弟尺寸（更稳定）\n * - 非直接子节点：getBoundingClientRect 回退，并 warning 建议传 startOffset\n * - ref 未就绪时自动重试，确保绑定到最外层滚动容器后能正确测量\n */\nexport function useMeasureStartOffset(\n  scrollElRef: RefObject<HTMLElement | null>,\n  contentRef: RefObject<HTMLElement | null>,\n  options: { enabled: boolean, isHorizontal?: boolean }\n): number {\n  const { enabled, isHorizontal = false } = options\n  const [measuredStartOffset, setMeasuredStartOffset] = useState(0)\n  const [retryTrigger, setRetryTrigger] = useState(0)\n  const retryCountRef = useRef(0)\n\n  useEffect(() => {\n    if (!enabled) {\n      retryCountRef.current = 0\n      return\n    }\n    const scrollEl = scrollElRef.current\n    const contentEl = contentRef.current\n\n    // ref 未就绪时重试（如 ScrollView 与 WaterFlow 异步挂载）\n    if (!scrollEl || !contentEl) {\n      if (retryCountRef.current < MAX_RETRY) {\n        retryCountRef.current += 1\n        const id = setTimeout(() => setRetryTrigger((t) => t + 1), RETRY_DELAY)\n        return () => clearTimeout(id)\n      }\n      return\n    }\n    retryCountRef.current = 0\n\n    const measure = () => {\n      const el = contentRef.current\n      const scroll = scrollElRef.current\n      if (!el || !scroll) return\n\n      if (el.parentElement === scroll) {\n        // 直接子节点：累加前兄弟尺寸\n        let offset = 0\n        let prev: Element | null = el.previousElementSibling\n        while (prev) {\n          offset += isHorizontal ? (prev as HTMLElement).offsetWidth : (prev as HTMLElement).offsetHeight\n          prev = prev.previousElementSibling\n        }\n        setMeasuredStartOffset((prevVal) => (Math.abs(prevVal - offset) < 1 ? prevVal : offset))\n        return\n      }\n\n      // 非直接子节点：getBoundingClientRect 回退\n      const scrollRect = scroll.getBoundingClientRect()\n      const contentRect = el.getBoundingClientRect()\n      const offset = isHorizontal\n        ? contentRect.left - scrollRect.left + scroll.scrollLeft\n        : contentRect.top - scrollRect.top + scroll.scrollTop\n      const value = Math.max(0, offset)\n      setMeasuredStartOffset((prevVal) => (Math.abs(prevVal - value) < 1 ? prevVal : value))\n\n      if (!WARNED_NESTED.has(el)) {\n        WARNED_NESTED.add(el)\n        // eslint-disable-next-line no-console\n        console.warn(\n          '[useMeasureStartOffset] content 不是 scrollElement 的直接子节点，使用 getBoundingClientRect 测量。' +\n            '建议通过 props 或 Context 传入 startOffset 以获得更稳定的布局。'\n        )\n      }\n    }\n\n    measure()\n    scrollEl.addEventListener('scroll', measure, { passive: true })\n    const ro = typeof ResizeObserver !== 'undefined' ? new ResizeObserver(measure) : null\n    if (ro) {\n      ro.observe(scrollEl)\n      Array.from(scrollEl.children).forEach((child) => ro.observe(child))\n      // 非直接子节点：content 自身或其祖先变化时也需重测\n      ro.observe(contentEl)\n    }\n    return () => {\n      scrollEl.removeEventListener('scroll', measure)\n      ro?.disconnect()\n    }\n  }, [enabled, scrollElRef, contentRef, isHorizontal, retryTrigger])\n\n  return measuredStartOffset\n}\n"],"names":[],"mappings":"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"}

package/dist/components/list/hooks/useMeasureStartOffsetWeapp.d.ts

@@ -0,0 +1,14 @@
+import type { MutableRefObject, RefObject } from 'react';
+/**
+ * 小程序版 startOffset：对外层 scroll-view 与带 `contentId` 的外包各执行一次 SelectorQuery（各自 `weappScope(ref)`），
+ * 再合并结果；避免二者不在同一自定义组件时，单次 `in` 链式 `select` 查不全。
+ *
+ * 公式：startOffset = contentRect.top - scrollRect.top + scrollTop
+ */
+export declare function useMeasureStartOffsetWeapp(scrollElRef: RefObject<HTMLElement | null>, contentId: string, options: {
+    enabled: boolean;
+    isHorizontal?: boolean;
+    startOffsetRef?: MutableRefObject<number>;
+    /** 挂载 `id={contentId}` 的嵌套内容外包 View；第二次 query 用其 ref 取 content 侧 `_scope` */
+    contentWrapperRef: RefObject<HTMLElement | null>;
+}): number;

package/dist/components/list/hooks/useMeasureStartOffsetWeapp.js

@@ -0,0 +1,87 @@
+import { useState, useRef, useEffect } from 'react';
+import { createSelectorQueryForRef } from '../utils.js';
+
+const MAX_RETRY = 20;
+const RETRY_DELAY = 50;
+/** 与 useListScrollElementAttachWeapp 容器测量间隔一致（H5 无 interval，用 ResizeObserver+scroll 事件驱动） */
+const MEASURE_INTERVAL = 150;
+/**
+ * 小程序版 startOffset：对外层 scroll-view 与带 `contentId` 的外包各执行一次 SelectorQuery（各自 `weappScope(ref)`），
+ * 再合并结果；避免二者不在同一自定义组件时，单次 `in` 链式 `select` 查不全。
+ *
+ * 公式：startOffset = contentRect.top - scrollRect.top + scrollTop
+ */
+function useMeasureStartOffsetWeapp(scrollElRef, contentId, options) {
+    const { enabled, isHorizontal = false, startOffsetRef, contentWrapperRef } = options;
+    const [measuredStartOffset, setMeasuredStartOffset] = useState(0);
+    const [retryTrigger, setRetryTrigger] = useState(0);
+    const retryCountRef = useRef(0);
+    const autoIdRef = useRef(`_ls_so_${Math.random().toString(36).slice(2, 9)}`);
+    useEffect(() => {
+        if (!enabled || !contentId) {
+            retryCountRef.current = 0;
+            return;
+        }
+        const applyRects = (scrollRect, scrollInfo, contentRect) => {
+            var _a, _b;
+            if (!scrollRect || !scrollInfo || !contentRect)
+                return;
+            const scrollTop = (_a = scrollInfo.scrollTop) !== null && _a !== void 0 ? _a : 0;
+            const scrollLeft = (_b = scrollInfo.scrollLeft) !== null && _b !== void 0 ? _b : 0;
+            const value = isHorizontal
+                ? Math.max(0, contentRect.left - scrollRect.left + scrollLeft)
+                : Math.max(0, contentRect.top - scrollRect.top + scrollTop);
+            if (startOffsetRef)
+                startOffsetRef.current = value;
+            setMeasuredStartOffset((prevVal) => (Math.abs(prevVal - value) < 1 ? prevVal : value));
+        };
+        const measure = () => {
+            const scrollEl = scrollElRef.current;
+            if (!scrollEl)
+                return;
+            if (!scrollEl.id) {
+                scrollEl.id = autoIdRef.current;
+            }
+            const scrollViewId = scrollEl.id;
+            createSelectorQueryForRef(scrollElRef)
+                .select(`#${scrollViewId}`)
+                .boundingClientRect()
+                .select(`#${scrollViewId}`)
+                .scrollOffset()
+                .exec((scrollRes) => {
+                const scrollRect = scrollRes === null || scrollRes === void 0 ? void 0 : scrollRes[0];
+                const scrollInfo = scrollRes === null || scrollRes === void 0 ? void 0 : scrollRes[1];
+                if (!scrollRect || !scrollInfo)
+                    return;
+                createSelectorQueryForRef(contentWrapperRef)
+                    .select(`#${contentId}`)
+                    .boundingClientRect()
+                    .exec((contentRes) => {
+                    const contentRect = contentRes === null || contentRes === void 0 ? void 0 : contentRes[0];
+                    applyRects(scrollRect, scrollInfo, contentRect);
+                });
+            });
+        };
+        const scrollEl = scrollElRef.current;
+        if (!scrollEl) {
+            if (retryCountRef.current < MAX_RETRY) {
+                retryCountRef.current += 1;
+                const id = setTimeout(() => setRetryTrigger((t) => t + 1), RETRY_DELAY);
+                return () => clearTimeout(id);
+            }
+            return;
+        }
+        retryCountRef.current = 0;
+        measure();
+        scrollEl.addEventListener('scroll', measure);
+        const interval = setInterval(measure, MEASURE_INTERVAL);
+        return () => {
+            scrollEl.removeEventListener('scroll', measure);
+            clearInterval(interval);
+        };
+    }, [enabled, scrollElRef, contentId, contentWrapperRef, isHorizontal, retryTrigger]);
+    return measuredStartOffset;
+}
+
+export { useMeasureStartOffsetWeapp };
+//# sourceMappingURL=useMeasureStartOffsetWeapp.js.map

package/dist/components/list/hooks/useMeasureStartOffsetWeapp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useMeasureStartOffsetWeapp.js","sources":["../../../../src/components/list/hooks/useMeasureStartOffsetWeapp.ts"],"sourcesContent":["import { useEffect, useRef, useState } from 'react'\n\nimport { createSelectorQueryForRef } from '../utils'\n\nimport type { MutableRefObject, RefObject } from 'react'\n\nconst MAX_RETRY = 20\nconst RETRY_DELAY = 50\n/** 与 useListScrollElementAttachWeapp 容器测量间隔一致（H5 无 interval，用 ResizeObserver+scroll 事件驱动） */\nconst MEASURE_INTERVAL = 150\n\n/**\n * 小程序版 startOffset：对外层 scroll-view 与带 `contentId` 的外包各执行一次 SelectorQuery（各自 `weappScope(ref)`），\n * 再合并结果；避免二者不在同一自定义组件时，单次 `in` 链式 `select` 查不全。\n *\n * 公式：startOffset = contentRect.top - scrollRect.top + scrollTop\n */\nexport function useMeasureStartOffsetWeapp(\n  scrollElRef: RefObject<HTMLElement | null>,\n  contentId: string,\n  options: {\n    enabled: boolean\n    isHorizontal?: boolean\n    startOffsetRef?: MutableRefObject<number>\n    /** 挂载 `id={contentId}` 的嵌套内容外包 View；第二次 query 用其 ref 取 content 侧 `_scope` */\n    contentWrapperRef: RefObject<HTMLElement | null>\n  }\n): number {\n  const { enabled, isHorizontal = false, startOffsetRef, contentWrapperRef } = options\n  const [measuredStartOffset, setMeasuredStartOffset] = useState(0)\n  const [retryTrigger, setRetryTrigger] = useState(0)\n  const retryCountRef = useRef(0)\n  const autoIdRef = useRef(`_ls_so_${Math.random().toString(36).slice(2, 9)}`)\n\n  useEffect(() => {\n    if (!enabled || !contentId) {\n      retryCountRef.current = 0\n      return\n    }\n\n    const applyRects = (scrollRect: any, scrollInfo: any, contentRect: any) => {\n      if (!scrollRect || !scrollInfo || !contentRect) return\n      const scrollTop = scrollInfo.scrollTop ?? 0\n      const scrollLeft = scrollInfo.scrollLeft ?? 0\n      const value = isHorizontal\n        ? Math.max(0, contentRect.left - scrollRect.left + scrollLeft)\n        : Math.max(0, contentRect.top - scrollRect.top + scrollTop)\n      if (startOffsetRef) startOffsetRef.current = value\n      setMeasuredStartOffset((prevVal) => (Math.abs(prevVal - value) < 1 ? prevVal : value))\n    }\n\n    const measure = () => {\n      const scrollEl = scrollElRef.current as any\n      if (!scrollEl) return\n\n      if (!scrollEl.id) {\n        scrollEl.id = autoIdRef.current\n      }\n      const scrollViewId = scrollEl.id\n\n      createSelectorQueryForRef(scrollElRef)\n        .select(`#${scrollViewId}`)\n        .boundingClientRect()\n        .select(`#${scrollViewId}`)\n        .scrollOffset()\n        .exec((scrollRes) => {\n          const scrollRect = scrollRes?.[0]\n          const scrollInfo = scrollRes?.[1]\n          if (!scrollRect || !scrollInfo) return\n          createSelectorQueryForRef(contentWrapperRef)\n            .select(`#${contentId}`)\n            .boundingClientRect()\n            .exec((contentRes) => {\n              const contentRect = contentRes?.[0]\n              applyRects(scrollRect, scrollInfo, contentRect)\n            })\n        })\n    }\n\n    const scrollEl = scrollElRef.current\n    if (!scrollEl) {\n      if (retryCountRef.current < MAX_RETRY) {\n        retryCountRef.current += 1\n        const id = setTimeout(() => setRetryTrigger((t) => t + 1), RETRY_DELAY)\n        return () => clearTimeout(id)\n      }\n      return\n    }\n    retryCountRef.current = 0\n    measure()\n    scrollEl.addEventListener('scroll', measure)\n    const interval = setInterval(measure, MEASURE_INTERVAL)\n    return () => {\n      scrollEl.removeEventListener('scroll', measure)\n      clearInterval(interval)\n    }\n  }, [enabled, scrollElRef, contentId, contentWrapperRef, isHorizontal, retryTrigger])\n\n  return measuredStartOffset\n}\n"],"names":[],"mappings":"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"}

package/dist/components/list/hooks/useRefresher.d.ts

@@ -27,7 +27,6 @@ export interface ListRefresherConfig {
         };
     }) => void;
 }
-/** 默认刷新层高度（对齐 Dynamic），无自定义 children 时使用 */
 export declare const DEFAULT_REFRESHER_HEIGHT = 50;
 /** 下拉刷新状态枚举（对齐微信小程序 RefreshStatus） */
 export declare const enum RefreshStatus {
@@ -65,10 +64,17 @@ interface UseRefresherReturn {
     };
     addImperativeTouchListeners?: (el: HTMLElement) => () => void;
     renderRefresherContent: () => React.ReactNode | null;
+    /**
+     * 刷新区几何高度：H5 等非小程序原生路径下与 List 绝对层 height / translateY 及本 hook 内下拉收尾动画一致。
+     * 小程序原生 refresher 由 ScrollView 负责展示与布局，List 侧槽位样式不依赖此字段。
+     */
+    slotHeight: number;
 }
 export declare function useRefresher(config: ListRefresherConfig | null, 
 /** 列表逻辑顶部对应的 scrollTop，用于触顶判断；H5「顶栏悬浮+只滚列表」时传 0，imperative 内以 DOM scrollTop 为准 */
 scrollTopAtLogicalTop: number, 
 /** scrollElement 模式下可选：下拉起始点须在 List 内才触发刷新；未传时默认 true（沿用原逻辑） */
-getIsTouchInListArea?: (ev: TouchEvent) => boolean): UseRefresherReturn;
+getIsTouchInListArea?: (ev: TouchEvent) => boolean, 
+/** H5 等：开启刷新区时是否测量自定义内容高度（与 List 侧 isH5 && refresher 一致） */
+enableH5SlotMeasure?: boolean): UseRefresherReturn;
 export {};

package/dist/components/list/hooks/useRefresher.js

@@ -1,41 +1,65 @@
 import { jsx } from 'react/jsx-runtime';
 import { Slot, View } from '@tarojs/components';
-import React, { useState, useRef, useCallback } from 'react';
+import React, { useState, useRef, useCallback, useMemo, useLayoutEffect } from 'react';
 import { supportsNativeRefresher } from '../utils.js';
 
 /**
- * useRefresher - 平台适配的下拉刷新
+ * 下拉刷新（List 内部）
  *
- * - 小程序：weapp / jd / tt 使用 ScrollView 原生 refresher-*
- * - H5：对齐 taro-components-react pull-down-refresh（2.x 同源）逻辑：触顶 + 增量拖拽 + 阻尼 + 释放保持高度再回弹
+ * - 小程序：ScrollView 原生 refresher-*；业务 Promise reject 时补发 Failed(4)（原生不派发）
+ * - H5：触顶 + touch 拖拽；最大行程 / 阻尼停拉线为视口高的 0.9 / 0.8（innerHeight）；收尾仅依赖 onRefresherRefresh 的 Promise
+ * - 动画时间戳用 nowMs()：小程序部分环境无 performance，避免抛错中断回弹
+ * - rafRef 与受控 refresherTriggered→false 的 effect 共用：effect 内 cancel 可能打断 H5 成功回弹，须在 effect 动画结束处释放 refreshingLockRef
+ * - H5 reject：onRefresherStatusChange 顺序 Failed(4) → Completed(3) → Idle(0)
+ * - emitStatusChange：仅 status 变化时回调（同 status 不重复）
  */
 const BOUNCE_MS = 300;
 const AT_TOP_THRESHOLD = 3;
-/** 最大下拉距离（px） */
-const DISTANCE_Y_MAX_LIMIT = 150;
-/** 阻尼系数：超过此值不再累加位移，与 2.x default damping 一致 */
-const DAMPING = 100;
-/** 角度上限（度），小于此值才视为下拉意图 */
+const H5_PULL_DISTANCE_MAX_VH = 0.9;
+const H5_DAMPING_LIMIT_VH = 0.8;
+const VIEWPORT_HEIGHT_FALLBACK = 800;
 const DEG_LIMIT = 40;
-/** 默认刷新层高度（对齐 Dynamic），无自定义 children 时使用 */
 const DEFAULT_REFRESHER_HEIGHT = 50;
-/**
- * 单次位移的阻尼（与 2.x PullDownRefresh.damping 一致）
- * ratio = 已拖拽总距离 / 屏幕高度，damped = diff * (1 - ratio) * 0.6；且当已超过 DAMPING 时不再加
- */
-function dampIncrement(diff, totalMove, currentPull, screenHeight) {
+function resolveTaroMeasureElement(ref) {
+    var _a;
+    const n = ref.current;
+    if (!n)
+        return null;
+    if (typeof Element !== 'undefined' && n instanceof Element)
+        return n;
+    const el = (_a = n.$el) !== null && _a !== void 0 ? _a : n;
+    if (el && typeof Element !== 'undefined' && el instanceof Element)
+        return el;
+    return null;
+}
+function nowMs() {
+    if (typeof performance !== 'undefined' && typeof performance.now === 'function') {
+        return performance.now();
+    }
+    return Date.now();
+}
+function getViewportHeightPx() {
+    if (typeof window === 'undefined' || !Number.isFinite(window.innerHeight) || window.innerHeight <= 0) {
+        return VIEWPORT_HEIGHT_FALLBACK;
+    }
+    return window.innerHeight;
+}
+/** 阻尼增量：ratio=总下拉位移/视口高；超过 dampingLimit 后不再累加 */
+function dampIncrement(diff, totalMove, currentPull, viewportHeight, dampingLimit) {
     if (diff <= 0)
         return 0;
-    if (currentPull >= DAMPING)
+    if (currentPull >= dampingLimit)
         return 0;
-    const ratio = Math.min(totalMove / screenHeight, 1);
+    const ratio = Math.min(totalMove / viewportHeight, 1);
     return diff * (1 - ratio) * 0.6;
 }
 function useRefresher(config, 
 /** 列表逻辑顶部对应的 scrollTop，用于触顶判断；H5「顶栏悬浮+只滚列表」时传 0，imperative 内以 DOM scrollTop 为准 */
 scrollTopAtLogicalTop, 
 /** scrollElement 模式下可选：下拉起始点须在 List 内才触发刷新；未传时默认 true（沿用原逻辑） */
-getIsTouchInListArea) {
+getIsTouchInListArea, 
+/** H5 等：开启刷新区时是否测量自定义内容高度（与 List 侧 isH5 && refresher 一致） */
+enableH5SlotMeasure) {
     var _a, _b, _c, _d, _e, _f, _g;
     const [internalRefreshing, setInternalRefreshing] = useState(false);
     const [pullDistance, setPullDistance] = useState(0);
@@ -61,7 +85,6 @@ getIsTouchInListArea) {
     thresholdRef.current = (_c = config === null || config === void 0 ? void 0 : config.refresherThreshold) !== null && _c !== void 0 ? _c : 45;
     const configRef = useRef(config);
     configRef.current = config;
-    /** H5：触发 onRefresherStatusChange 回调（仅状态变化时触发） */
     const emitStatusChangeRef = useRef((status, dy) => {
         var _a, _b;
         if (refreshStatusRef.current !== status) {
@@ -78,9 +101,50 @@ getIsTouchInListArea) {
     topThresholdPxRef.current = topThresholdPx;
     const getIsTouchInListAreaRef = useRef(getIsTouchInListArea);
     getIsTouchInListAreaRef.current = getIsTouchInListArea;
-    // ========================================
-    // 小程序：原生 refresher-* API
-    // ========================================
+    const [measuredSlotHeight, setMeasuredSlotHeight] = useState(0);
+    const h5MeasureRef = useRef(null);
+    const setH5MeasureRef = useCallback((el) => {
+        h5MeasureRef.current = el;
+    }, []);
+    const hasCustomRefresherChildren = (config === null || config === void 0 ? void 0 : config.children) != null;
+    const slotHeight = useMemo(() => {
+        if (!config || config.refresherEnabled === false)
+            return DEFAULT_REFRESHER_HEIGHT;
+        if (!hasCustomRefresherChildren)
+            return DEFAULT_REFRESHER_HEIGHT;
+        if (supportsNativeRefresher)
+            return DEFAULT_REFRESHER_HEIGHT;
+        if (!enableH5SlotMeasure)
+            return DEFAULT_REFRESHER_HEIGHT;
+        return measuredSlotHeight > 0 ? measuredSlotHeight : DEFAULT_REFRESHER_HEIGHT;
+    }, [
+        config,
+        hasCustomRefresherChildren,
+        measuredSlotHeight,
+        enableH5SlotMeasure,
+    ]);
+    const slotHeightRef = useRef(slotHeight);
+    slotHeightRef.current = slotHeight;
+    useLayoutEffect(() => {
+        if (!enableH5SlotMeasure) {
+            setMeasuredSlotHeight(0);
+            return;
+        }
+        if (!hasCustomRefresherChildren)
+            return;
+        const node = resolveTaroMeasureElement(h5MeasureRef);
+        if (!node || typeof ResizeObserver === 'undefined')
+            return;
+        const ro = new ResizeObserver((entries) => {
+            const entry = entries[0];
+            if (!entry)
+                return;
+            const h = Math.max(1, Math.ceil(entry.contentRect.height));
+            setMeasuredSlotHeight(prev => (prev === h ? prev : h));
+        });
+        ro.observe(node);
+        return () => ro.disconnect();
+    }, [enableH5SlotMeasure, hasCustomRefresherChildren, config === null || config === void 0 ? void 0 : config.children]);
     const scrollViewRefresherProps = config && supportsNativeRefresher ? {
         refresherEnabled: (_d = config.refresherEnabled) !== null && _d !== void 0 ? _d : true,
         refresherThreshold: (_e = config.refresherThreshold) !== null && _e !== void 0 ? _e : 45,
@@ -94,12 +158,16 @@ getIsTouchInListArea) {
             (_a = config.onRefresherPulling) === null || _a === void 0 ? void 0 : _a.call(config, { detail: { deltaY: (_c = (_b = e.detail) === null || _b === void 0 ? void 0 : _b.deltaY) !== null && _c !== void 0 ? _c : 0 } });
         },
         onRefresherRefresh: async () => {
-            var _a;
+            var _a, _b;
             if (!isControlled)
                 setInternalRefreshing(true);
             try {
                 await ((_a = config.onRefresherRefresh) === null || _a === void 0 ? void 0 : _a.call(config));
             }
+            catch (_c) {
+                // 原生不派发 Failed(4)，补发便于与 H5 一致
+                (_b = config.onRefresherStatusChange) === null || _b === void 0 ? void 0 : _b.call(config, { detail: { status: 4 /* RefreshStatus.Failed */, dy: 0 } });
+            }
             finally {
                 if (!isControlled)
                     setInternalRefreshing(false);
@@ -115,11 +183,7 @@ getIsTouchInListArea) {
             (_a = config.onRefresherStatusChange) === null || _a === void 0 ? void 0 : _a.call(config, { detail: { status: (_b = e.detail) === null || _b === void 0 ? void 0 : _b.status, dy: (_c = e.detail) === null || _c === void 0 ? void 0 : _c.dy } });
         },
     } : {};
-    // ========================================
-    // H5：单一结构 + 原生 touch 监听（passive: false）；refresherEnabled=false 时不挂
-    // ========================================
     const addImperativeTouchListeners = React.useCallback((el) => {
-        var _a, _b;
         if (supportsNativeRefresher || !configRef.current || !h5RefresherEnabled)
             return () => { };
         const scrollEl = el;
@@ -134,7 +198,6 @@ getIsTouchInListArea) {
         /** 用于 onTouchEnd 判断是否触发刷新；刷新完成后必须置 0，否则下次点击（无 touchMove）会误用上次的 lastPull 再次触发 */
         const lastPullRef = { current: 0 };
         const pullAtReleaseRef = { current: 0 };
-        const screenHeight = typeof window !== 'undefined' ? (_b = (_a = window.screen) === null || _a === void 0 ? void 0 : _a.height) !== null && _b !== void 0 ? _b : 600 : 600;
         const setPull = (v) => {
             lastPull = v;
             lastPullRef.current = v;
@@ -143,9 +206,9 @@ getIsTouchInListArea) {
         const runBounceBack = (fromValue, onComplete) => {
             if (rafRef.current != null)
                 cancelAnimationFrame(rafRef.current);
-            const startTime = performance.now();
+            const startTime = nowMs();
             const animate = () => {
-                const t = Math.min((performance.now() - startTime) / BOUNCE_MS, 1);
+                const t = Math.min((nowMs() - startTime) / BOUNCE_MS, 1);
                 const ease = 1 - Math.pow(1 - t, 3);
                 const v = fromValue * (1 - ease);
                 setPullDistanceRef.current(v);
@@ -156,7 +219,6 @@ getIsTouchInListArea) {
                 }
                 else {
                     setPullDistanceRef.current(0);
-                    // 修复闭包问题：使用 ref 获取最新值
                     if (!isControlledRef.current)
                         setInternalRefreshingRef.current(false);
                     rafRef.current = null;
@@ -169,10 +231,10 @@ getIsTouchInListArea) {
         const runBounceBackAbort = (fromValue) => {
             if (rafRef.current != null)
                 cancelAnimationFrame(rafRef.current);
-            const startTime = performance.now();
+            const startTime = nowMs();
             const animate = () => {
                 var _a, _b;
-                const t = Math.min((performance.now() - startTime) / BOUNCE_MS, 1);
+                const t = Math.min((nowMs() - startTime) / BOUNCE_MS, 1);
                 const ease = 1 - Math.pow(1 - t, 3);
                 const v = fromValue * (1 - ease);
                 setPullDistanceRef.current(v);
@@ -186,19 +248,18 @@ getIsTouchInListArea) {
                     lastPullRef.current = 0;
                     lastPull = 0;
                     (_b = (_a = configRef.current) === null || _a === void 0 ? void 0 : _a.onRefresherAbort) === null || _b === void 0 ? void 0 : _b.call(_a);
-                    // 状态变化：回到 Idle
                     emitStatusChangeRef.current(0 /* RefreshStatus.Idle */, 0);
                 }
             };
             rafRef.current = requestAnimationFrame(animate);
         };
-        /** 先动画到 refresherHeight（加载中保持高度），再执行刷新，完成后回弹；与 2.x release 时 setContentStyle(distanceToRefresh+1) 一致 */
+        /** 收起到加载高度后再执行 onRefresherRefresh */
         const runBounceToLoading = (fromValue, toValue, onReach) => {
             if (rafRef.current != null)
                 cancelAnimationFrame(rafRef.current);
-            const startTime = performance.now();
+            const startTime = nowMs();
             const animate = () => {
-                const t = Math.min((performance.now() - startTime) / BOUNCE_MS, 1);
+                const t = Math.min((nowMs() - startTime) / BOUNCE_MS, 1);
                 const ease = 1 - Math.pow(1 - t, 3);
                 setPullDistanceRef.current(fromValue + (toValue - fromValue) * ease);
                 if (t < 1) {
@@ -292,8 +353,11 @@ getIsTouchInListArea) {
                 return;
             }
             lastY.current = currentY;
-            const damped = dampIncrement(dy, totalMove, lastPull, screenHeight);
-            const next = Math.min(lastPull + damped, DISTANCE_Y_MAX_LIMIT);
+            const vh = getViewportHeightPx();
+            const maxPull = vh * H5_PULL_DISTANCE_MAX_VH;
+            const dampingLimit = vh * H5_DAMPING_LIMIT_VH;
+            const damped = dampIncrement(dy, totalMove, lastPull, vh, dampingLimit);
+            const next = Math.min(lastPull + damped, maxPull);
             setPull(next);
             (_b = (_a = configRef.current) === null || _a === void 0 ? void 0 : _a.onRefresherPulling) === null || _b === void 0 ? void 0 : _b.call(_a, { detail: { deltaY: next } });
             if (next >= thresholdRef.current) {
@@ -310,11 +374,10 @@ getIsTouchInListArea) {
                 return;
             refreshingLockRef.current = true;
             const pullValue = lastPull;
-            const height = DEFAULT_REFRESHER_HEIGHT;
+            const height = slotHeightRef.current;
             pullAtReleaseRef.current = pullValue;
             if (!isControlledRef.current)
                 setInternalRefreshingRef.current(true);
-            // 状态变化：Refreshing
             emitStatusChangeRef.current(2 /* RefreshStatus.Refreshing */, pullValue);
             runBounceToLoading(pullValue, height, () => {
                 var _a, _b;
@@ -328,30 +391,26 @@ getIsTouchInListArea) {
                     lastPull = 0;
                     pullAtReleaseRef.current = 0;
                     (_b = (_a = configRef.current) === null || _a === void 0 ? void 0 : _a.onRefresherRestore) === null || _b === void 0 ? void 0 : _b.call(_a);
-                    // 状态变化：回到 Idle
                     emitStatusChangeRef.current(0 /* RefreshStatus.Idle */, 0);
                 };
-                const timeoutId = setTimeout(safeReset, BOUNCE_MS + 400);
                 Promise.resolve((_b = (_a = configRef.current) === null || _a === void 0 ? void 0 : _a.onRefresherRefresh) === null || _b === void 0 ? void 0 : _b.call(_a))
                     .then(() => {
-                    // 若已经通过 safeReset 提前结束刷新（例如超时），则不再执行回弹动画，避免二次「吐舌头」闪现
                     if (!refreshingLockRef.current)
                         return;
-                    // 状态变化：Completed
-                    emitStatusChangeRef.current(3 /* RefreshStatus.Completed */, DEFAULT_REFRESHER_HEIGHT);
-                    requestAnimationFrame(() => runBounceBack(DEFAULT_REFRESHER_HEIGHT, () => {
+                    const slotH = slotHeightRef.current;
+                    emitStatusChangeRef.current(3 /* RefreshStatus.Completed */, slotH);
+                    requestAnimationFrame(() => runBounceBack(slotH, () => {
                         var _a, _b;
-                        clearTimeout(timeoutId);
                         refreshingLockRef.current = false;
                         lastPullRef.current = 0;
                         lastPull = 0;
                         pullAtReleaseRef.current = 0;
                         (_b = (_a = configRef.current) === null || _a === void 0 ? void 0 : _a.onRefresherRestore) === null || _b === void 0 ? void 0 : _b.call(_a);
-                        // 状态变化：回到 Idle
                         emitStatusChangeRef.current(0 /* RefreshStatus.Idle */, 0);
                     }));
                 }, () => {
-                    clearTimeout(timeoutId);
+                    emitStatusChangeRef.current(4 /* RefreshStatus.Failed */, pullValue);
+                    emitStatusChangeRef.current(3 /* RefreshStatus.Completed */, slotHeightRef.current);
                     safeReset();
                 });
             });
@@ -423,7 +482,7 @@ getIsTouchInListArea) {
         const defaultText = showDefaultText
             ? (isRefreshing ? '加载中...' : pullDistance >= threshold ? '释放刷新' : '下拉刷新')
             : null;
-        return (jsx(View, { style: {
+        return (jsx(View, { ref: !supportsNativeRefresher && hasCustomChildren ? setH5MeasureRef : undefined, style: {
                 width: '100%',
                 minHeight: hasCustomChildren ? undefined : DEFAULT_REFRESHER_HEIGHT,
                 height: hasCustomChildren ? 'auto' : DEFAULT_REFRESHER_HEIGHT,
@@ -433,19 +492,19 @@ getIsTouchInListArea) {
                 alignItems: 'center',
                 background,
             }, children: hasCustomChildren ? config.children : (defaultText ? jsx(View, { style: textColor ? { color: textColor } : undefined, children: defaultText }) : null) }));
-    }, [config, pullDistance, isRefreshing]);
-    // 受控 refresherTriggered：设为 true 时立即展示顶部加载指示器（对齐小程序：无需下拉即显示、固定在顶部）
+    }, [config, pullDistance, isRefreshing, setH5MeasureRef]);
+    /** 受控 refresherTriggered=true：无下拉也显示加载条 */
     React.useEffect(() => {
         if (!isControlled || !config || config.refresherTriggered !== true)
             return;
-        if (pullDistanceRef.current >= DEFAULT_REFRESHER_HEIGHT)
+        const h = slotHeightRef.current;
+        if (pullDistanceRef.current >= h)
             return;
-        setPullDistanceRef.current(DEFAULT_REFRESHER_HEIGHT);
-        pullDistanceRef.current = DEFAULT_REFRESHER_HEIGHT;
-        // 触发 Refreshing 状态变化
-        emitStatusChangeRef.current(2 /* RefreshStatus.Refreshing */, DEFAULT_REFRESHER_HEIGHT);
-    }, [isControlled, config === null || config === void 0 ? void 0 : config.refresherTriggered]);
-    // 受控 refresherTriggered：父组件设为 false 时同步回弹并清零
+        setPullDistanceRef.current(h);
+        pullDistanceRef.current = h;
+        emitStatusChangeRef.current(2 /* RefreshStatus.Refreshing */, h);
+    }, [isControlled, config === null || config === void 0 ? void 0 : config.refresherTriggered, slotHeight]);
+    /** 受控 refresherTriggered=false：回弹清零；与 touch 共用 rafRef，cancel 时须在此释放 refreshingLockRef */
     const prevTriggeredRef = useRef(config === null || config === void 0 ? void 0 : config.refresherTriggered);
     React.useEffect(() => {
         if (!isControlled || !config || config.refresherTriggered !== false) {
@@ -457,13 +516,12 @@ getIsTouchInListArea) {
         if (prev === true && (pullDistanceRef.current > 0 || isRefreshingRef.current)) {
             if (rafRef.current != null)
                 cancelAnimationFrame(rafRef.current);
-            const from = pullDistanceRef.current > 0 ? pullDistanceRef.current : DEFAULT_REFRESHER_HEIGHT;
-            // 触发 Completed 状态变化
+            const from = pullDistanceRef.current > 0 ? pullDistanceRef.current : slotHeightRef.current;
             emitStatusChangeRef.current(3 /* RefreshStatus.Completed */, from);
-            const startTime = performance.now();
+            const startTime = nowMs();
             const animate = () => {
                 var _a;
-                const t = Math.min((performance.now() - startTime) / BOUNCE_MS, 1);
+                const t = Math.min((nowMs() - startTime) / BOUNCE_MS, 1);
                 const ease = 1 - Math.pow(1 - t, 3);
                 const v = from * (1 - ease);
                 setPullDistanceRef.current(v);
@@ -473,18 +531,17 @@ getIsTouchInListArea) {
                 else {
                     setPullDistanceRef.current(0);
                     pullDistanceRef.current = 0;
-                    // 修复闭包问题：使用 ref 获取最新值
                     if (!isControlledRef.current)
                         setInternalRefreshingRef.current(false);
                     rafRef.current = null;
+                    refreshingLockRef.current = false;
                     (_a = config.onRefresherRestore) === null || _a === void 0 ? void 0 : _a.call(config);
-                    // 触发 Idle 状态变化
                     emitStatusChangeRef.current(0 /* RefreshStatus.Idle */, 0);
                 }
             };
             rafRef.current = requestAnimationFrame(animate);
         }
-    }, [isControlled, config === null || config === void 0 ? void 0 : config.refresherTriggered]);
+    }, [isControlled, config === null || config === void 0 ? void 0 : config.refresherTriggered, slotHeight]);
     return {
         scrollViewRefresherProps,
         scrollViewRefresherHandlers,
@@ -496,6 +553,7 @@ getIsTouchInListArea) {
         },
         addImperativeTouchListeners: !supportsNativeRefresher && config && h5RefresherEnabled ? addImperativeTouchListeners : undefined,
         renderRefresherContent,
+        slotHeight,
     };
 }