@tarojs/taro-h5 4.2.3-beta.1 → 4.3.0

package/dist/index.esm.js

@@ -5756,9 +5756,6 @@ class TaroH5IntersectionObserver {
                 this._observerInst.unobserve(listener.element);
             }
             this._observerInst.disconnect();
-            // 置空，防止 disconnect 后 pending 的 observe 回调复活观察（原生 IO 允许 disconnect 后再次 observe）
-            this._observerInst = undefined;
-            this._isInited = false;
         }
     }
     observe(targetSelector, callback) {
@@ -5770,36 +5767,14 @@ class TaroH5IntersectionObserver {
             console.warn('Intersection observer will be ignored because no relative nodes are found.');
             return;
         }
+        const nodeList = this._options.observeAll
+            ? this.container.querySelectorAll(targetSelector)
+            : [this.container.querySelector(targetSelector)];
         Taro.nextTick(() => {
-            var _a;
-            // 已 disconnect（或 relativeTo 重建）时不再观察
-            if (!this._observerInst || this._listeners.length)
-                return;
-            const container = this.container;
-            const nodeList = this._options.observeAll
-                ? Array.from(container.querySelectorAll(targetSelector))
-                : [container.querySelector(targetSelector)];
-            // 特殊处理 - 选自己（同 SelectorQuery，querySelector 只查后代、不含容器自身）
-            if (container !== document) {
-                const $nodeList = (_a = container.parentNode) === null || _a === void 0 ? void 0 : _a.querySelectorAll(targetSelector);
-                if ($nodeList) {
-                    for (let i = 0, len = $nodeList.length; i < len; ++i) {
-                        if (container === $nodeList[i]) {
-                            nodeList.push(container);
-                            break;
-                        }
-                    }
-                }
-            }
-            // 查询时机已推迟到下一 tick，仍可能查不到（懒渲染等），或节点已脱离文档（页面被切走）
-            const elements = nodeList.filter((element) => !!element && document.contains(element));
-            if (!elements.length) {
-                console.warn(`IntersectionObserver.observe:fail cannot find the node for selector "${targetSelector}"`);
-                return;
-            }
-            elements.forEach(element => {
-                var _a;
-                (_a = this._observerInst) === null || _a === void 0 ? void 0 : _a.observe(element);
+            nodeList.forEach(element => {
+                if (!element)
+                    return;
+                this._observerInst.observe(element);
                 this._listeners.push({ element, callback });
             });
         });
@@ -5810,11 +5785,7 @@ class TaroH5IntersectionObserver {
             console.error('Relative nodes cannot be added after "observe" call in IntersectionObserver');
             return this;
         }
-        const root = this.container.querySelector(selector);
-        if (!root) {
-            console.warn(`IntersectionObserver.relativeTo:fail cannot find the node for selector "${selector}"`);
-        }
-        this._root = root || null;
+        this._root = this.container.querySelector(selector) || null;
         if (margins) {
             this._rootMargin = margins;
         }
@@ -5822,42 +5793,7 @@ class TaroH5IntersectionObserver {
         return this;
     }
     relativeToViewport(margins) {
-        var _a, _b, _c;
-        // 已设置observe监听后，重新关联节点
-        if (this._listeners.length) {
-            console.error('Relative nodes cannot be added after "observe" call in IntersectionObserver');
-            return this;
-        }
-        // 微信小程序语义：参照「页面显示区域」。
-        // 默认（容器滚动）模式参照当前页 .taro_page；usingWindowScroll 下 .taro_page 不是滚动容器，
-        // 参照节点与目标随文档同滚、相交比永不变化，必须参照浏览器视口（root 为 null）。
-        // 注意直接用 document 级查询：旧实现 relativeTo('.taro_page') 在 container 作用域内查，
-        // 多页栈时会命中首个已隐藏的 .taro_page（旧页不卸载、display:none），导致恒不可见。
-        const id = (_b = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path) === null || _b === void 0 ? void 0 : _b.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
-        let pageEl = id ? document.querySelector(`.taro_page#${id}`) : null;
-        if (!pageEl) {
-            // 当前页 = 最后一个非 shade 的已 show 页面（旧页保留 taro_page_show，被切走时追加 taro_page_shade）
-            const $pages = document.querySelectorAll('.taro_router > .taro_page.taro_page_show:not(.taro_page_shade)');
-            pageEl = $pages.length ? $pages[$pages.length - 1] : null;
-        }
-        // __taroAppConfig.usingWindowScroll 是页面级配置、mount 时按页写入，切换瞬间可能滞后，用当前页样式二次确认
-        const usingWindowScroll = ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll) === true ||
-            (!!pageEl && !/scroll|auto/.test(getComputedStyle(pageEl).overflowY));
-        if (usingWindowScroll) {
-            this._root = null;
-        }
-        else if (pageEl) {
-            this._root = pageEl;
-        }
-        else {
-            console.warn('IntersectionObserver.relativeToViewport:fail cannot find current page element');
-            this._root = null;
-        }
-        if (margins) {
-            this._rootMargin = margins;
-        }
-        this._observerInst = this.createInst();
-        return this;
+        return this.relativeTo('.taro_page', margins);
     }
     _getCallbackByElement(element) {
         const listener = this._listeners.find(listener => listener.element === element);