@tarojs/runtime 4.2.1-beta.1 → 4.2.1-beta.3

package/dist/index.cjs.js

@@ -1473,53 +1473,6 @@ class TaroEventTarget {
     }
 }
 
-const nearestCtxCache = new WeakMap();
-function isNearestCtxEnv() {
-    return process.env.TARO_ENV === 'weapp' || process.env.TARO_ENV === 'jd';
-}
-function getNearestCtx(node) {
-    if (!isNearestCtxEnv()) {
-        return undefined;
-    }
-    const root = node._root;
-    if (root == null) {
-        return null;
-    }
-    const cached = nearestCtxCache.get(node);
-    if (cached && cached.nearestCtxEpoch === root.nearestCtxEpoch) {
-        return cached.value;
-    }
-    const value = resolveNearestCtxValue(node, root);
-    nearestCtxCache.set(node, { value, nearestCtxEpoch: root.nearestCtxEpoch });
-    return value;
-}
-function resolveNearestCtxValue(node, root) {
-    var _a;
-    if (node.nodeType === 1 /* NodeType.ELEMENT_NODE */) {
-        const ctx = node.ctx;
-        if (ctx != null)
-            return ctx;
-    }
-    let current = node.parentNode;
-    while (current) {
-        if (current.nodeType === 1 /* NodeType.ELEMENT_NODE */) {
-            const ctx = current.ctx;
-            if (ctx != null)
-                return ctx;
-        }
-        current = current.parentNode;
-    }
-    return (_a = root.ctx) !== null && _a !== void 0 ? _a : null;
-}
-function bumpNearestCtxEpochForRoot(root) {
-    if (!isNearestCtxEnv() || root == null) {
-        return;
-    }
-    if (typeof root.bumpNearestCtxEpoch === 'function') {
-        root.bumpNearestCtxEpoch();
-    }
-}
-
 const CHILDNODES = "cn" /* Shortcuts.Childnodes */;
 const nodeId = incrementId();
 class TaroNode extends TaroEventTarget {
@@ -1559,9 +1512,6 @@ class TaroNode extends TaroEventTarget {
         var _a;
         return ((_a = this.parentNode) === null || _a === void 0 ? void 0 : _a._root) || null;
     }
-    get _scope() {
-        return getNearestCtx(this);
-    }
     findIndex(refChild) {
         const index = this.childNodes.indexOf(refChild);
         shared.ensure(index !== -1, 'The node to be replaced is not a child of this node.');
@@ -1707,9 +1657,6 @@ class TaroNode extends TaroEventTarget {
                 }
             }
         }
-        if (this._root) {
-            bumpNearestCtxEpochForRoot(this._root);
-        }
         MutationObserver$1.record({
             type: "childList" /* MutationRecordType.CHILD_LIST */,
             target: this,
@@ -1786,9 +1733,6 @@ class TaroNode extends TaroEventTarget {
         if (this._root && doUpdate !== false) {
             this.updateChildNodes();
         }
-        if (this._root) {
-            bumpNearestCtxEpochForRoot(this._root);
-        }
         return child;
     }
     remove(options) {
@@ -3700,7 +3644,6 @@ class TaroRootElement extends TaroElement {
         this.updateCallbacks = [];
         this.pendingUpdate = false;
         this.ctx = null;
-        this.nearestCtxEpoch = 0;
         this.nodeName = ROOT_STR;
         this.tagName = ROOT_STR.toUpperCase();
     }
@@ -3710,9 +3653,6 @@ class TaroRootElement extends TaroElement {
     get _root() {
         return this;
     }
-    bumpNearestCtxEpoch() {
-        this.nearestCtxEpoch++;
-    }
     scheduleTask(fn) {
         // 这里若使用微任务可略微提前setData的执行时机，但在部分场景下可能会出现连续setData两次，造成更大的性能问题
         setTimeout(fn);
@@ -4084,8 +4024,13 @@ function createTTDomDocument() {
             el.setAttribute = function (name, value) {
                 const result = originalSetAttribute(name, value);
                 // 处理 catchMove 属性
-                if (name === 'catchMove' && value) {
-                    el.addEventListener('catchtouchmove', emptyFunction);
+                if (name === 'catchMove') {
+                    if (value) {
+                        el.addEventListener('catchtouchmove', emptyFunction);
+                    }
+                    else {
+                        el.removeEventListener('catchtouchmove', emptyFunction);
+                    }
                 }
                 return result;
             };
@@ -4276,7 +4221,6 @@ function createPageConfig(component, pageName, data, pageConfig) {
                             pageElement.sync();
                         }
                         else {
-                            bumpNearestCtxEpochForRoot(pageElement);
                             pageElement.performUpdate(true, cb);
                         }
                     }
@@ -4305,7 +4249,6 @@ function createPageConfig(component, pageName, data, pageConfig) {
                 unmounting = false;
                 instances.delete($taroPath);
                 if (pageElement) {
-                    bumpNearestCtxEpochForRoot(pageElement);
                     pageElement.ctx = null;
                     pageElement = null;
                 }
@@ -4468,42 +4411,36 @@ function createComponentConfig(component, componentName, data) {
     });
     return config;
 }
-function createRecursiveComponentConfig(componentName, forceCustomWrapper = false) {
+function createRecursiveComponentConfig(componentName) {
     const isCustomWrapper = componentName === CUSTOM_WRAPPER;
     const [ATTACHED, DETACHED] = shared.hooks.call('getMiniLifecycleImpl').component;
-    const lifeCycles = isCustomWrapper || forceCustomWrapper
+    const lifeCycles = isCustomWrapper
         ? {
             [ATTACHED]() {
-                var _a, _b, _c, _d;
+                var _a, _b;
                 if (process.env.TARO_ENV === 'tt' && shared.isEnableTTDom()) {
                     return;
                 }
-                const componentId = ((_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.i) === null || _b === void 0 ? void 0 : _b.sid) || ((_d = (_c = this.props) === null || _c === void 0 ? void 0 : _c.i) === null || _d === void 0 ? void 0 : _d.sid);
+                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a.sid) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b.sid);
                 if (shared.isString(componentId)) {
-                    if (isCustomWrapper) {
-                        customWrapperCache.set(componentId, this);
-                    }
+                    customWrapperCache.set(componentId, this);
                     const el = env.document.getElementById(componentId);
                     if (el) {
                         el.ctx = this;
-                        bumpNearestCtxEpochForRoot(el._root);
                     }
                 }
             },
             [DETACHED]() {
-                var _a, _b, _c, _d;
+                var _a, _b;
                 if (process.env.TARO_ENV === 'tt' && shared.isEnableTTDom()) {
                     return;
                 }
-                const componentId = ((_b = (_a = this.data) === null || _a === void 0 ? void 0 : _a.i) === null || _b === void 0 ? void 0 : _b.sid) || ((_d = (_c = this.props) === null || _c === void 0 ? void 0 : _c.i) === null || _d === void 0 ? void 0 : _d.sid);
+                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a.sid) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b.sid);
                 if (shared.isString(componentId)) {
-                    if (isCustomWrapper) {
-                        customWrapperCache.delete(componentId);
-                    }
+                    customWrapperCache.delete(componentId);
                     const el = env.document.getElementById(componentId);
                     if (el) {
                         el.ctx = null;
-                        bumpNearestCtxEpochForRoot(el._root);
                     }
                 }
             }
@@ -4527,7 +4464,7 @@ function createRecursiveComponentConfig(componentName, forceCustomWrapper = fals
             }
         }, options: Object.assign(Object.assign({}, extraOptions), { virtualHost: !isCustomWrapper }), methods: {
             eh: eventHandler
-        } }, lifeCycles), { isCustomWrapper, forceCustomWrapper });
+        } }, lifeCycles), { isCustomWrapper });
 }
 
 const TIMEOUT = 100;
@@ -5413,7 +5350,6 @@ exports.URLSearchParams = URLSearchParams;
 exports.VALUE = VALUE;
 exports.VIEW = VIEW;
 exports.addLeadingSlash = addLeadingSlash;
-exports.bumpNearestCtxEpochForRoot = bumpNearestCtxEpochForRoot;
 exports.cancelAnimationFrame = _caf;
 exports.convertNumber2PX = convertNumber2PX;
 exports.createComponentConfig = createComponentConfig;
@@ -5434,7 +5370,6 @@ exports.getComputedStyle = taroGetComputedStyleProvider;
 exports.getCurrentInstance = getCurrentInstance;
 exports.getCurrentPage = getCurrentPage;
 exports.getHomePage = getHomePage;
-exports.getNearestCtx = getNearestCtx;
 exports.getOnHideEventKey = getOnHideEventKey;
 exports.getOnReadyEventKey = getOnReadyEventKey;
 exports.getOnShowEventKey = getOnShowEventKey;
@@ -5449,7 +5384,6 @@ exports.injectPageInstance = injectPageInstance;
 exports.isComment = isComment;
 exports.isElement = isElement;
 exports.isHasExtractProp = isHasExtractProp;
-exports.isNearestCtxEnv = isNearestCtxEnv;
 exports.isParentBound = isParentBound;
 exports.isText = isText;
 exports.location = taroLocationProvider;