@tarojs/runtime 4.2.1-beta.2 → 4.2.1

package/dist/index.d.ts

@@ -12,7 +12,6 @@ export { taroHistoryProvider as history, taroLocationProvider as location, taroW
 export { TaroElement } from './dom/element.js';
 export { TaroEvent, createEvent, eventHandler, eventHandlerTTDom } from './dom/event.js';
 export { FormElement } from './dom/form.js';
-export { bumpNearestCtxEpochForRoot, getNearestCtx, isNearestCtxEnv } from './dom/nearest-ctx.js';
 export { TaroNode } from './dom/node.js';
 export { TaroRootElement } from './dom/root.js';
 export { Style } from './dom/style.js';

package/dist/index.js

@@ -13,7 +13,6 @@ export { taroHistoryProvider as history, taroLocationProvider as location, taroW
 export { TaroElement } from './dom/element.js';
 export { TaroEvent, createEvent, eventHandler, eventHandlerTTDom } from './dom/event.js';
 export { FormElement } from './dom/form.js';
-export { bumpNearestCtxEpochForRoot, getNearestCtx, isNearestCtxEnv } from './dom/nearest-ctx.js';
 export { TaroNode } from './dom/node.js';
 export { TaroRootElement } from './dom/root.js';
 export { Style } from './dom/style.js';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/runtime.esm.d.ts

@@ -242,11 +242,9 @@ declare class TaroRootElement extends TaroElement {
     private updateCallbacks;
     pendingUpdate: boolean;
     ctx: null | MpInstance;
-    nearestCtxEpoch: number;
     constructor();
     get _path(): string;
     get _root(): TaroRootElement;
-    bumpNearestCtxEpoch(): void;
     scheduleTask(fn: TFunc): void;
     enqueueUpdate(payload: UpdatePayload): void;
     performUpdate(initRender?: boolean, prerender?: TFunc): void;
@@ -270,7 +268,6 @@ declare class TaroNode extends TaroEventTarget {
     private updateChildNodes;
     private updateSingleChild;
     get _root(): TaroRootElement | null;
-    get _scope(): MpInstance | null | undefined;
     protected findIndex(refChild: TaroNode): number;
     get _path(): string;
     get nextSibling(): TaroNode | null;
@@ -594,10 +591,6 @@ declare const taroWindowProvider: TaroWindow;
 declare const taroLocationProvider: TaroLocation;
 declare const taroHistoryProvider: TaroHistory;
 
-declare function isNearestCtxEnv(): boolean;
-declare function getNearestCtx(node: TaroNode): MpInstance | null | undefined;
-declare function bumpNearestCtxEpochForRoot(root: TaroRootElement | null | undefined): void;
-
 declare class SVGElement extends TaroElement {
 }
 
@@ -868,7 +861,7 @@ declare function getOnShowEventKey(path: string): string;
 declare function getOnHideEventKey(path: string): string;
 declare function createPageConfig(component: any, pageName?: string, data?: Record<string, unknown>, pageConfig?: PageConfig): PageInstance;
 declare function createComponentConfig(component: React.ComponentClass, componentName?: string, data?: Record<string, unknown>): any;
-declare function createRecursiveComponentConfig(componentName?: string, forceCustomWrapper?: boolean): any;
+declare function createRecursiveComponentConfig(componentName?: string): any;
 
 /**
  * React also has a fancy function's name for this: `hydrate()`.
@@ -924,5 +917,5 @@ declare function convertNumber2PX(value: number): string;
 
 declare function handlePolyfill(): void;
 
-export { A, APP, BEHAVIORS, BODY, CATCHMOVE, CATCH_VIEW, CHANGE, CLASS, CLICK_VIEW, COMMENT, COMPILE_MODE, CONFIRM, CONTAINER, CONTEXT_ACTIONS, CURRENT_TARGET, CUSTOM_WRAPPER, Current, DATASET, DATE, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, EXTERNAL_CLASSES, FOCUS, FormElement, HEAD, HOOKS_APP_ID, HTML, History, ID, INPUT, KEY_CODE, Location, MutationObserver, OBJECT, ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, SVGElement, Style, TARGET, TARO_RUNTIME, TIME_STAMP, TOUCHMOVE, TYPE, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, UID, TaroURLProvider as URL, URLSearchParams$1 as URLSearchParams, VALUE, VIEW, addLeadingSlash, bumpNearestCtxEpochForRoot, _caf as cancelAnimationFrame, convertNumber2PX, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, customWrapperCache, debounce, taroDocumentProvider as document, env, eventCenter, eventHandler, eventHandlerTTDom, eventSource, extend, getComponentsAlias, taroGetComputedStyleProvider as getComputedStyle, getCurrentInstance, getCurrentPage, getHomePage, getNearestCtx, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, handlePolyfill, hasBasename, taroHistoryProvider as history, hydrate, incrementId, injectPageInstance, isComment, isElement, isHasExtractProp, isNearestCtxEnv, isParentBound, isText, taroLocationProvider as location, nav as navigator, nextTick, now, options, parseUrl, perf, removePageInstance, _raf as requestAnimationFrame, safeExecute, setInnerHTML, shortcutAttr, stringify, stripBasename, stripSuffix, stripTrailing, throttle, taroWindowProvider as window };
+export { A, APP, BEHAVIORS, BODY, CATCHMOVE, CATCH_VIEW, CHANGE, CLASS, CLICK_VIEW, COMMENT, COMPILE_MODE, CONFIRM, CONTAINER, CONTEXT_ACTIONS, CURRENT_TARGET, CUSTOM_WRAPPER, Current, DATASET, DATE, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, EXTERNAL_CLASSES, FOCUS, FormElement, HEAD, HOOKS_APP_ID, HTML, History, ID, INPUT, KEY_CODE, Location, MutationObserver, OBJECT, ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, SVGElement, Style, TARGET, TARO_RUNTIME, TIME_STAMP, TOUCHMOVE, TYPE, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, UID, TaroURLProvider as URL, URLSearchParams$1 as URLSearchParams, VALUE, VIEW, addLeadingSlash, _caf as cancelAnimationFrame, convertNumber2PX, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, customWrapperCache, debounce, taroDocumentProvider as document, env, eventCenter, eventHandler, eventHandlerTTDom, eventSource, extend, getComponentsAlias, taroGetComputedStyleProvider as getComputedStyle, getCurrentInstance, getCurrentPage, getHomePage, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, handlePolyfill, hasBasename, taroHistoryProvider as history, hydrate, incrementId, injectPageInstance, isComment, isElement, isHasExtractProp, isParentBound, isText, taroLocationProvider as location, nav as navigator, nextTick, now, options, parseUrl, perf, removePageInstance, _raf as requestAnimationFrame, safeExecute, setInnerHTML, shortcutAttr, stringify, stripBasename, stripSuffix, stripTrailing, throttle, taroWindowProvider as window };
 export type { AddEventListenerOptions, AppInstance, Attributes, DataTree, EventHandler, EventListenerOptions, EventOptions, EventsType, HydratedData, Instance, KeyFrame, MiniData, MiniElementData, MiniTextData, MpEvent, MpInstance, Options$2 as Options, PageConfig, PageInstance, PageLifeCycle, PageProps, ReactAppInstance, ReactPageComponent, ReactPageInstance, ScrollTimelineOption, TFunc, UpdatePayload, UpdatePayloadValue };

package/dist/runtime.esm.js

@@ -1472,53 +1472,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 {
@@ -1558,9 +1511,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);
         ensure(index !== -1, 'The node to be replaced is not a child of this node.');
@@ -1706,9 +1656,6 @@ class TaroNode extends TaroEventTarget {
                 }
             }
         }
-        if (this._root) {
-            bumpNearestCtxEpochForRoot(this._root);
-        }
         MutationObserver$1.record({
             type: "childList" /* MutationRecordType.CHILD_LIST */,
             target: this,
@@ -1785,9 +1732,6 @@ class TaroNode extends TaroEventTarget {
         if (this._root && doUpdate !== false) {
             this.updateChildNodes();
         }
-        if (this._root) {
-            bumpNearestCtxEpochForRoot(this._root);
-        }
         return child;
     }
     remove(options) {
@@ -3699,7 +3643,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();
     }
@@ -3709,9 +3652,6 @@ class TaroRootElement extends TaroElement {
     get _root() {
         return this;
     }
-    bumpNearestCtxEpoch() {
-        this.nearestCtxEpoch++;
-    }
     scheduleTask(fn) {
         // 这里若使用微任务可略微提前setData的执行时机，但在部分场景下可能会出现连续setData两次，造成更大的性能问题
         setTimeout(fn);
@@ -4083,8 +4023,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;
             };
@@ -4303,7 +4248,6 @@ function createPageConfig(component, pageName, data, pageConfig) {
                 unmounting = false;
                 instances.delete($taroPath);
                 if (pageElement) {
-                    bumpNearestCtxEpochForRoot(pageElement);
                     pageElement.ctx = null;
                     pageElement = null;
                 }
@@ -4466,10 +4410,10 @@ function createComponentConfig(component, componentName, data) {
     });
     return config;
 }
-function createRecursiveComponentConfig(componentName, forceCustomWrapper = false) {
+function createRecursiveComponentConfig(componentName) {
     const isCustomWrapper = componentName === CUSTOM_WRAPPER;
     const [ATTACHED, DETACHED] = hooks.call('getMiniLifecycleImpl').component;
-    const lifeCycles = isCustomWrapper || forceCustomWrapper
+    const lifeCycles = isCustomWrapper
         ? {
             [ATTACHED]() {
                 var _a, _b;
@@ -4478,13 +4422,10 @@ function createRecursiveComponentConfig(componentName, forceCustomWrapper = fals
                 }
                 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 (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);
                     }
                 }
             },
@@ -4495,13 +4436,10 @@ function createRecursiveComponentConfig(componentName, forceCustomWrapper = fals
                 }
                 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 (isString(componentId)) {
-                    if (isCustomWrapper) {
-                        customWrapperCache.delete(componentId);
-                    }
+                    customWrapperCache.delete(componentId);
                     const el = env.document.getElementById(componentId);
                     if (el) {
                         el.ctx = null;
-                        bumpNearestCtxEpochForRoot(el._root);
                     }
                 }
             }
@@ -4525,7 +4463,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;
@@ -5337,5 +5275,5 @@ if (process.env.SUPPORT_TARO_POLYFILL !== 'disabled' && process.env.TARO_PLATFOR
     handlePolyfill();
 }
 
-export { A, APP, BEHAVIORS, BODY, CATCHMOVE, CATCH_VIEW, CHANGE, CLASS, CLICK_VIEW, COMMENT, COMPILE_MODE, CONFIRM, CONTAINER, CONTEXT_ACTIONS, CURRENT_TARGET, CUSTOM_WRAPPER, Current, DATASET, DATE, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, EXTERNAL_CLASSES, FOCUS, FormElement, HEAD, HOOKS_APP_ID, HTML, History, ID, INPUT, KEY_CODE, Location, MutationObserver$1 as MutationObserver, OBJECT, ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, SVGElement, Style, TARGET, TARO_RUNTIME, TIME_STAMP, TOUCHMOVE, TYPE, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, UID, TaroURLProvider as URL, URLSearchParams, VALUE, VIEW, addLeadingSlash, bumpNearestCtxEpochForRoot, _caf as cancelAnimationFrame, convertNumber2PX, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, customWrapperCache, debounce, taroDocumentProvider as document, env, eventCenter, eventHandler, eventHandlerTTDom, eventSource, extend, getComponentsAlias, taroGetComputedStyleProvider as getComputedStyle, getCurrentInstance, getCurrentPage, getHomePage, getNearestCtx, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, handlePolyfill, hasBasename, taroHistoryProvider as history, hydrate, incrementId, injectPageInstance, isComment, isElement, isHasExtractProp, isNearestCtxEnv, isParentBound, isText, taroLocationProvider as location, nav as navigator, nextTick, now, options, parseUrl, perf, removePageInstance, _raf as requestAnimationFrame, safeExecute, setInnerHTML, shortcutAttr, stringify, stripBasename, stripSuffix, stripTrailing, throttle, taroWindowProvider as window };
+export { A, APP, BEHAVIORS, BODY, CATCHMOVE, CATCH_VIEW, CHANGE, CLASS, CLICK_VIEW, COMMENT, COMPILE_MODE, CONFIRM, CONTAINER, CONTEXT_ACTIONS, CURRENT_TARGET, CUSTOM_WRAPPER, Current, DATASET, DATE, DOCUMENT_ELEMENT_NAME, DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT, EXTERNAL_CLASSES, FOCUS, FormElement, HEAD, HOOKS_APP_ID, HTML, History, ID, INPUT, KEY_CODE, Location, MutationObserver$1 as MutationObserver, OBJECT, ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, OPTIONS, PAGE_INIT, PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR, SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE, SVGElement, Style, TARGET, TARO_RUNTIME, TIME_STAMP, TOUCHMOVE, TYPE, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, UID, TaroURLProvider as URL, URLSearchParams, VALUE, VIEW, addLeadingSlash, _caf as cancelAnimationFrame, convertNumber2PX, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, customWrapperCache, debounce, taroDocumentProvider as document, env, eventCenter, eventHandler, eventHandlerTTDom, eventSource, extend, getComponentsAlias, taroGetComputedStyleProvider as getComputedStyle, getCurrentInstance, getCurrentPage, getHomePage, getOnHideEventKey, getOnReadyEventKey, getOnShowEventKey, getPageInstance, getPath, handlePolyfill, hasBasename, taroHistoryProvider as history, hydrate, incrementId, injectPageInstance, isComment, isElement, isHasExtractProp, isParentBound, isText, taroLocationProvider as location, nav as navigator, nextTick, now, options, parseUrl, perf, removePageInstance, _raf as requestAnimationFrame, safeExecute, setInnerHTML, shortcutAttr, stringify, stripBasename, stripSuffix, stripTrailing, throttle, taroWindowProvider as window };
 //# sourceMappingURL=runtime.esm.js.map