@tarojs/runtime 3.6.7 → 3.6.9-alpha.1

package/dist/runtime.esm.js

@@ -2661,7 +2661,7 @@ class TaroRootElement extends TaroElement {
     }
     performUpdate(initRender = false, prerender) {
         this.pendingUpdate = true;
-        const ctx = this.ctx;
+        const ctx = hooks.call('proxyToRaw', this.ctx);
         setTimeout(() => {
             const setDataMark = `${SET_DATA} 开始时间戳 ${Date.now()}`;
             perf.start(setDataMark);
@@ -3896,7 +3896,7 @@ function getOnHideEventKey(path) {
 function createPageConfig(component, pageName, data, pageConfig) {
     // 小程序 Page 构造器是一个傲娇小公主，不能把复杂的对象挂载到参数上
     const id = pageName !== null && pageName !== void 0 ? pageName : `taro_page_${pageId()}`;
-    const [ONLOAD, ONUNLOAD, ONREADY, ONSHOW, ONHIDE, LIFECYCLES, SIDE_EFFECT_LIFECYCLES] = hooks.call('getMiniLifecycleImpl').page;
+    const [ONLOAD, ONUNLOAD, ONREADY, ONSHOW, ONHIDE, LIFECYCLES, SIDE_EFFECT_LIFECYCLES,] = hooks.call('getMiniLifecycleImpl').page;
     let pageElement = null;
     let unmounting = false;
     let prepareMountList = [];
@@ -4031,7 +4031,8 @@ function createPageConfig(component, pageName, data, pageConfig) {
         var _a;
         if (component[lifecycle] ||
             ((_a = component.prototype) === null || _a === void 0 ? void 0 : _a[lifecycle]) ||
-            component[lifecycle.replace(/^on/, 'enable')]) {
+            component[lifecycle.replace(/^on/, 'enable')] ||
+            (pageConfig === null || pageConfig === void 0 ? void 0 : pageConfig[lifecycle.replace(/^on/, 'enable')])) {
             config[lifecycle] = function (...args) {
                 var _a;
                 const target = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.target;
@@ -4143,18 +4144,27 @@ function createRecursiveComponentConfig(componentName) {
         } }, lifeCycles);
 }
 
+const TIMEOUT = 100;
 const nextTick = (cb, ctx) => {
-    var _a, _b, _c;
+    const beginTime = Date.now();
     const router = Current.router;
     const timerFunc = () => {
         setTimeout(function () {
             ctx ? cb.call(ctx) : cb();
         }, 1);
     };
-    if (router !== null) {
-        let pageElement = null;
-        const path = router.$taroPath;
-        pageElement = env.document.getElementById(path);
+    if (router === null)
+        return timerFunc();
+    const path = router.$taroPath;
+    /**
+     * 三种情况
+     *   1. 调用 nextTick 时，pendingUpdate 已经从 true 变为 false（即已更新完成），那么需要光等 100ms
+     *   2. 调用 nextTick 时，pendingUpdate 为 true，那么刚好可以搭上便车
+     *   3. 调用 nextTick 时，pendingUpdate 还是 false，框架仍未启动更新逻辑，这时最多轮询 100ms，等待 pendingUpdate 变为 true。
+     */
+    function next() {
+        var _a, _b, _c;
+        const pageElement = env.document.getElementById(path);
         if (pageElement === null || pageElement === void 0 ? void 0 : pageElement.pendingUpdate) {
             if (isWebPlatform()) {
                 // eslint-disable-next-line dot-notation
@@ -4166,13 +4176,14 @@ const nextTick = (cb, ctx) => {
                 pageElement.enqueueUpdateCallback(cb, ctx);
             }
         }
-        else {
+        else if (Date.now() - beginTime > TIMEOUT) {
             timerFunc();
         }
+        else {
+            setTimeout(() => next(), 20);
+        }
     }
-    else {
-        timerFunc();
-    }
+    next();
 };
 
 export { Current, FormElement, History, Location, MutationObserver, SVGElement, Style, TaroElement, TaroEvent, TaroNode, TaroRootElement, TaroText, URL, URLSearchParams, addLeadingSlash, _caf as cancelAnimationFrame, createComponentConfig, createEvent, createPageConfig, createRecursiveComponentConfig, document$1 as document, eventCenter, eventHandler, eventSource, getComputedStyle, getCurrentInstance, getPageInstance, getPath, history, hydrate, incrementId, injectPageInstance, location, nav as navigator, nextTick, now, options, parseUrl, removePageInstance, _raf as requestAnimationFrame, safeExecute, stringify, window$1 as window };