@tarojs/components-advanced 4.1.12-beta.2 → 4.1.12-beta.21

package/dist/utils/scrollParent.js

@@ -0,0 +1,88 @@
+import { document as document$1 } from '@tarojs/runtime';
+
+/**
+ * 查找元素的真实滚动父节点。
+ * 用于 nestedScroll 模式下无 props/Context 时自动获取 scrollElement。
+ *
+ * 策略：
+ * 1. 优先命中 Taro ScrollView 类名 .taro-scroll
+ * 2. 回退：向上遍历找通用可滚动祖先
+ *
+ * 严格条件（均需满足）：
+ * - overflow 为 auto | scroll | overlay
+ * - scrollHeight > clientHeight（纵向）或 scrollWidth > clientWidth（横向）
+ * - 在 document.body 前停止
+ */
+const SCROLLABLE_OVERFLOW = ['auto', 'scroll', 'overlay'];
+/** 小程序端 scroll-view 的 nodeName（Taro 虚拟 DOM） */
+const SCROLL_VIEW_NODE_NAME = 'scroll-view';
+/**
+ * 判断元素是否可滚动（严格：overflow 可滚动 + 实际有溢出）
+ */
+function isScrollableElement(el, vertical = true) {
+    if (!el || el === document.body)
+        return false;
+    const style = getComputedStyle(el);
+    const overflow = vertical ? style.overflowY : style.overflowX;
+    if (!SCROLLABLE_OVERFLOW.includes(overflow))
+        return false;
+    const hasOverflow = vertical
+        ? el.scrollHeight > el.clientHeight
+        : el.scrollWidth > el.clientWidth;
+    return hasOverflow;
+}
+/**
+ * 从给定元素向上查找最近的滚动父节点。
+ * 优先匹配 .taro-scroll，未命中则按通用可滚动条件查找。
+ */
+function findScrollParent(el, vertical = true) {
+    var _a;
+    if (!el)
+        return null;
+    // 1. 优先：Taro ScrollView 的 div（.taro-scroll）
+    const taroScroll = (_a = el.closest) === null || _a === void 0 ? void 0 : _a.call(el, '.taro-scroll');
+    if (taroScroll && taroScroll !== document.body && isScrollableElement(taroScroll, vertical)) {
+        return taroScroll;
+    }
+    // 2. 回退：通用可滚动祖先
+    let parent = el.parentElement;
+    while (parent !== null && parent !== document.body) {
+        if (isScrollableElement(parent, vertical))
+            return parent;
+        parent = parent.parentElement;
+    }
+    return null;
+}
+/**
+ * 小程序端：基于 Taro 虚拟 DOM 查找父级 scroll-view。
+ * 从 contentId 对应节点沿 parentNode 向上遍历，找到 nodeName === 'scroll-view' 的节点。
+ *
+ * 仅用于小程序环境，H5 请使用 findScrollParent。
+ *
+ * @param contentId - content 节点的 id（需在 eventSource 中已注册）
+ * @returns 找到的 TaroElement（scroll-view）或 null
+ */
+function findScrollParentTaro(contentId) {
+    var _a;
+    if (!contentId)
+        return null;
+    const doc = document$1;
+    const el = (_a = doc.getElementById) === null || _a === void 0 ? void 0 : _a.call(doc, contentId);
+    if (!el || !el.parentNode)
+        return null;
+    let node = el;
+    while (node) {
+        const parent = node.parentNode;
+        if (!parent)
+            break;
+        // NodeType.ELEMENT_NODE === 1
+        if (parent.nodeType === 1 && parent.nodeName === SCROLL_VIEW_NODE_NAME) {
+            return parent;
+        }
+        node = parent;
+    }
+    return null;
+}
+
+export { findScrollParent, findScrollParentTaro, isScrollableElement };
+//# sourceMappingURL=scrollParent.js.map

package/dist/utils/scrollParent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scrollParent.js","sources":["../../src/utils/scrollParent.ts"],"sourcesContent":["/**\n * 查找元素的真实滚动父节点。\n * 用于 nestedScroll 模式下无 props/Context 时自动获取 scrollElement。\n *\n * 策略：\n * 1. 优先命中 Taro ScrollView 类名 .taro-scroll\n * 2. 回退：向上遍历找通用可滚动祖先\n *\n * 严格条件（均需满足）：\n * - overflow 为 auto | scroll | overlay\n * - scrollHeight > clientHeight（纵向）或 scrollWidth > clientWidth（横向）\n * - 在 document.body 前停止\n */\n\nimport { document as taroDocument } from '@tarojs/runtime'\n\nimport type { TaroElement, TaroNode } from '@tarojs/runtime'\n\nconst SCROLLABLE_OVERFLOW = ['auto', 'scroll', 'overlay'] as const\n\n/** 小程序端 scroll-view 的 nodeName（Taro 虚拟 DOM） */\nconst SCROLL_VIEW_NODE_NAME = 'scroll-view'\n\n/**\n * 判断元素是否可滚动（严格：overflow 可滚动 + 实际有溢出）\n */\nexport function isScrollableElement(\n  el: HTMLElement | null,\n  vertical = true\n): el is HTMLElement {\n  if (!el || el === document.body) return false\n  const style = getComputedStyle(el)\n  const overflow = vertical ? style.overflowY : style.overflowX\n  if (!SCROLLABLE_OVERFLOW.includes(overflow as any)) return false\n  const hasOverflow = vertical\n    ? el.scrollHeight > el.clientHeight\n    : el.scrollWidth > el.clientWidth\n  return hasOverflow\n}\n\n/**\n * 从给定元素向上查找最近的滚动父节点。\n * 优先匹配 .taro-scroll，未命中则按通用可滚动条件查找。\n */\nexport function findScrollParent(\n  el: HTMLElement | null,\n  vertical = true\n): HTMLElement | null {\n  if (!el) return null\n\n  // 1. 优先：Taro ScrollView 的 div（.taro-scroll）\n  const taroScroll = el.closest?.('.taro-scroll')\n  if (taroScroll && taroScroll !== document.body && isScrollableElement(taroScroll as HTMLElement, vertical)) {\n    return taroScroll as HTMLElement\n  }\n\n  // 2. 回退：通用可滚动祖先\n  let parent: HTMLElement | null = el.parentElement\n  while (parent !== null && parent !== document.body) {\n    if (isScrollableElement(parent, vertical)) return parent\n    parent = (parent as HTMLElement).parentElement\n  }\n  return null\n}\n\n/**\n * 小程序端：基于 Taro 虚拟 DOM 查找父级 scroll-view。\n * 从 contentId 对应节点沿 parentNode 向上遍历，找到 nodeName === 'scroll-view' 的节点。\n *\n * 仅用于小程序环境，H5 请使用 findScrollParent。\n *\n * @param contentId - content 节点的 id（需在 eventSource 中已注册）\n * @returns 找到的 TaroElement（scroll-view）或 null\n */\nexport function findScrollParentTaro (contentId: string): TaroElement | null {\n  if (!contentId) return null\n  const doc = taroDocument as { getElementById: (id: string) => TaroElement | null }\n  const el = doc.getElementById?.(contentId)\n  if (!el || !el.parentNode) return null\n\n  let node: TaroNode | null = el\n  while (node) {\n    const parent = node.parentNode\n    if (!parent) break\n    // NodeType.ELEMENT_NODE === 1\n    if (parent.nodeType === 1 && (parent as TaroElement).nodeName === SCROLL_VIEW_NODE_NAME) {\n      return parent as TaroElement\n    }\n    node = parent\n  }\n  return null\n}\n\n"],"names":["taroDocument"],"mappings":";;AAAA;;;;;;;;;;;;AAYG;AAMH,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAU;AAElE;AACA,MAAM,qBAAqB,GAAG,aAAa;AAE3C;;AAEG;SACa,mBAAmB,CACjC,EAAsB,EACtB,QAAQ,GAAG,IAAI,EAAA;AAEf,IAAA,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,QAAQ,CAAC,IAAI;AAAE,QAAA,OAAO,KAAK;AAC7C,IAAA,MAAM,KAAK,GAAG,gBAAgB,CAAC,EAAE,CAAC;AAClC,IAAA,MAAM,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS;AAC7D,IAAA,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAe,CAAC;AAAE,QAAA,OAAO,KAAK;IAChE,MAAM,WAAW,GAAG;AAClB,UAAE,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC;UACrB,EAAE,CAAC,WAAW,GAAG,EAAE,CAAC,WAAW;AACnC,IAAA,OAAO,WAAW;AACpB;AAEA;;;AAGG;SACa,gBAAgB,CAC9B,EAAsB,EACtB,QAAQ,GAAG,IAAI,EAAA;;AAEf,IAAA,IAAI,CAAC,EAAE;AAAE,QAAA,OAAO,IAAI;;IAGpB,MAAM,UAAU,GAAG,CAAA,EAAA,GAAA,EAAE,CAAC,OAAO,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,EAAA,EAAG,cAAc,CAAC;AAC/C,IAAA,IAAI,UAAU,IAAI,UAAU,KAAK,QAAQ,CAAC,IAAI,IAAI,mBAAmB,CAAC,UAAyB,EAAE,QAAQ,CAAC,EAAE;AAC1G,QAAA,OAAO,UAAyB;;;AAIlC,IAAA,IAAI,MAAM,GAAuB,EAAE,CAAC,aAAa;IACjD,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,QAAQ,CAAC,IAAI,EAAE;AAClD,QAAA,IAAI,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC;AAAE,YAAA,OAAO,MAAM;AACxD,QAAA,MAAM,GAAI,MAAsB,CAAC,aAAa;;AAEhD,IAAA,OAAO,IAAI;AACb;AAEA;;;;;;;;AAQG;AACG,SAAU,oBAAoB,CAAE,SAAiB,EAAA;;AACrD,IAAA,IAAI,CAAC,SAAS;AAAE,QAAA,OAAO,IAAI;IAC3B,MAAM,GAAG,GAAGA,UAAsE;IAClF,MAAM,EAAE,GAAG,CAAA,EAAA,GAAA,GAAG,CAAC,cAAc,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,GAAA,EAAG,SAAS,CAAC;AAC1C,IAAA,IAAI,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,UAAU;AAAE,QAAA,OAAO,IAAI;IAEtC,IAAI,IAAI,GAAoB,EAAE;IAC9B,OAAO,IAAI,EAAE;AACX,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU;AAC9B,QAAA,IAAI,CAAC,MAAM;YAAE;;AAEb,QAAA,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAK,MAAsB,CAAC,QAAQ,KAAK,qBAAqB,EAAE;AACvF,YAAA,OAAO,MAAqB;;QAE9B,IAAI,GAAG,MAAM;;AAEf,IAAA,OAAO,IAAI;AACb;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "4.1.12-beta.2",
+  "version": "4.1.12-beta.21",
   "description": "",
   "author": "O2Team",
   "license": "MIT",
@@ -20,19 +20,20 @@
     "csstype": "^3.1.1",
     "memoize-one": "^6.0.0",
     "tslib": "^2.6.2",
-    "@tarojs/components": "4.1.12-beta.2"
+    "@tarojs/components": "4.1.12-beta.21",
+    "@tarojs/components-react": "4.1.12-beta.21"
   },
   "devDependencies": {
     "vue": "3.2.47",
-    "@tarojs/runtime": "4.1.12-beta.2",
-    "@tarojs/shared": "4.1.12-beta.2",
-    "@tarojs/taro": "4.1.12-beta.2"
+    "@tarojs/shared": "4.1.12-beta.21",
+    "@tarojs/runtime": "4.1.12-beta.21",
+    "@tarojs/taro": "4.1.12-beta.21"
   },
   "peerDependencies": {
     "react": ">=18",
-    "@tarojs/runtime": "~4.1.12-beta.2",
-    "@tarojs/taro": "~4.1.12-beta.2",
-    "@tarojs/shared": "~4.1.12-beta.2"
+    "@tarojs/runtime": "~4.1.12-beta.21",
+    "@tarojs/shared": "~4.1.12-beta.21",
+    "@tarojs/taro": "~4.1.12-beta.21"
   },
   "peerDependenciesMeta": {
     "react": {