@tarojs/runtime 3.3.12 → 3.3.16

package/dist/dom/element.d.ts

@@ -27,7 +27,8 @@ export declare class TaroElement extends TaroNode {
     set textContent(text: string);
     hasAttribute(qualifiedName: string): boolean;
     hasAttributes(): boolean;
-    focus(): void;
+    get focus(): () => void;
+    set focus(value: () => void);
     blur(): void;
     setAttribute(qualifiedName: string, value: any): void;
     removeAttribute(qualifiedName: string): void;

package/dist/runtime.esm.js

@@ -1234,7 +1234,6 @@ const TIME_STAMP = 'timeStamp';
 const KEY_CODE = 'keyCode';
 const TOUCHMOVE = 'touchmove';
 const DATE = 'Date';
-const SET_TIMEOUT = 'setTimeout';
 const CATCHMOVE = 'catchMove';
 const CATCH_VIEW = 'catch-view';
 const COMMENT = 'comment';
@@ -2103,8 +2102,14 @@ let TaroElement = class TaroElement extends TaroNode {
     hasAttributes() {
         return this.attributes.length > 0;
     }
-    focus() {
-        this.setAttribute(FOCUS, true);
+    get focus() {
+        return function () {
+            this.setAttribute(FOCUS, true);
+        };
+    }
+    // 兼容 Vue3，详情请见：https://github.com/NervJS/taro/issues/10579
+    set focus(value) {
+        this.setAttribute(FOCUS, value);
     }
     blur() {
         this.setAttribute(FOCUS, false);
@@ -4212,9 +4217,9 @@ function format(children, document, styleOptions, parent) {
         .map((child) => {
         // 文本节点
         if (child.type === 'text') {
-            const text = document.createTextNode(child.content);
+            let text = document.createTextNode(child.content);
             if (isFunction$1(options.html.transformText)) {
-                return options.html.transformText(text, child);
+                text = options.html.transformText(text, child);
             }
             parent === null || parent === void 0 ? void 0 : parent.appendChild(text);
             return text;
@@ -5013,9 +5018,12 @@ if (process.env.TARO_ENV && process.env.TARO_ENV !== 'h5') {
     if (!(DATE in window$1)) {
         window$1.Date = Date;
     }
-    if (!(SET_TIMEOUT in window$1)) {
-        window$1.setTimeout = setTimeout;
-    }
+    window$1.setTimeout = function (cb, delay) {
+        setTimeout(cb, delay);
+    };
+    window$1.clearTimeout = function (seed) {
+        clearTimeout(seed);
+    };
 }
 
 const Current = {
@@ -5178,8 +5186,11 @@ function createPageConfig(component, pageName, data, pageConfig) {
     let pageElement = null;
     let unmounting = false;
     let prepareMountList = [];
+    let loadResolver;
+    let hasLoaded;
     const config = {
         onLoad(options, cb) {
+            hasLoaded = new Promise(resolve => { loadResolver = resolve; });
             perf.start(PAGE_INIT);
             Current.page = this;
             this.config = pageConfig || {};
@@ -5203,6 +5214,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
                     pageElement = document$2.getElementById(this.$taroPath);
                     ensure(pageElement !== null, '没有找到页面实例。');
                     safeExecute(this.$taroPath, 'onLoad', this.$taroParams);
+                    loadResolver();
                     if (!isBrowser) {
                         pageElement.ctx = this;
                         pageElement.performUpdate(true, cb);
@@ -5241,20 +5253,22 @@ function createPageConfig(component, pageName, data, pageConfig) {
             });
         },
         onShow() {
-            Current.page = this;
-            this.config = pageConfig || {};
-            const router = isBrowser ? this.$taroPath : this.route || this.__route__;
-            Current.router = {
-                params: this.$taroParams,
-                path: addLeadingSlash(router),
-                onReady: getOnReadyEventKey(id),
-                onShow: getOnShowEventKey(id),
-                onHide: getOnHideEventKey(id)
-            };
-            raf(() => {
-                eventCenter.trigger(getOnShowEventKey(id));
+            hasLoaded.then(() => {
+                Current.page = this;
+                this.config = pageConfig || {};
+                const router = isBrowser ? this.$taroPath : this.route || this.__route__;
+                Current.router = {
+                    params: this.$taroParams,
+                    path: addLeadingSlash(router),
+                    onReady: getOnReadyEventKey(id),
+                    onShow: getOnShowEventKey(id),
+                    onHide: getOnHideEventKey(id)
+                };
+                raf(() => {
+                    eventCenter.trigger(getOnShowEventKey(id));
+                });
+                safeExecute(this.$taroPath, 'onShow');
             });
-            safeExecute(this.$taroPath, 'onShow');
         },
         onHide() {
             Current.page = null;