@tarojs/runtime 3.3.14 → 3.3.18

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/dsl/react.d.ts

@@ -5,7 +5,7 @@ import type { AppInstance, ReactPageComponent, PageProps } from './instance';
 export declare let R: typeof React;
 export declare let PageContext: React.Context<string>;
 export declare function connectReactPage(R: typeof React, id: string): (component: ReactPageComponent) => React.ComponentClass<PageProps>;
-export declare function createReactApp(App: React.ComponentClass, react: typeof React, reactdom: any, config: AppConfig): AppInstance;
+export declare function createReactApp(App: React.ComponentClass, react: typeof React, dom: any, config: AppConfig): AppInstance;
 export declare function createNativeComponentConfig(Component: any, react: typeof React, reactdom: any, componentConfig: any): {
     properties: {
         props: {

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);
@@ -2136,7 +2141,7 @@ let TaroElement = class TaroElement extends TaroNode {
         qualifiedName = shortcutAttr(qualifiedName);
         const payload = {
             path: `${this._path}.${toCamelCase(qualifiedName)}`,
-            value
+            value: isFunction$1(value) ? () => value : value
         };
         (_b = (_a = this.hooks).modifySetAttrPayload) === null || _b === void 0 ? void 0 : _b.call(_a, this, qualifiedName, payload);
         this.enqueueUpdate(payload);
@@ -3966,8 +3971,12 @@ class StyleTagParser {
         // console.log('res this.styles: ', this.styles)
     }
     parseSelector(src) {
-        // todo: 属性选择器里可以带空格：[a = "b"]，这里的 split(' ') 需要作兼容
-        const list = src.trim().replace(/ *([>~+]) */g, ' $1').replace(/ +/g, ' ').split(' ');
+        const list = src
+            .trim()
+            .replace(/ *([>~+]) */g, ' $1')
+            .replace(/ +/g, ' ')
+            .replace(/\[\s*([^[\]=\s]+)\s*=\s*([^[\]=\s]+)\s*\]/g, '[$1=$2]')
+            .split(' ');
         const selectors = list.map(item => {
             const firstChar = item.charAt(0);
             const selector = {
@@ -5013,9 +5022,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 = {
@@ -5181,7 +5193,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
     let loadResolver;
     let hasLoaded;
     const config = {
-        onLoad(options, cb) {
+        onLoad(options = {}, cb) {
             hasLoaded = new Promise(resolve => { loadResolver = resolve; });
             perf.start(PAGE_INIT);
             Current.page = this;
@@ -5499,9 +5511,10 @@ function setReconciler() {
     }
 }
 const pageKeyId = incrementId();
-function createReactApp(App, react, reactdom, config) {
+function createReactApp(App, react, dom, config) {
+    var _a;
     R = react;
-    ReactDOM = reactdom;
+    ReactDOM = dom;
     ensure(!!ReactDOM, '构建 React/Nerv 项目请把 process.env.FRAMEWORK 设置为 \'react\'/\'nerv\' ');
     const ref = R.createRef();
     const isReactComponent = isClassComponent(R, App);
@@ -5543,8 +5556,7 @@ function createReactApp(App, react, reactdom, config) {
     }
     let wrapper;
     if (!isBrowser) {
-        // eslint-disable-next-line react/no-render-return-value
-        wrapper = ReactDOM.render(R.createElement(AppWrapper), document$2.getElementById('app'));
+        wrapper = (_a = ReactDOM.render) === null || _a === void 0 ? void 0 : _a.call(ReactDOM, R.createElement(AppWrapper), document$2.getElementById('app'));
     }
     const app = Object.create({
         render(cb) {
@@ -5568,11 +5580,11 @@ function createReactApp(App, react, reactdom, config) {
             enumerable: true,
             writable: true,
             value(options) {
+                var _a;
                 Current.router = Object.assign({ params: options === null || options === void 0 ? void 0 : options.query }, options);
                 if (isBrowser) {
                     // 由于 H5 路由初始化的时候会清除 app 下的 dom 元素，所以需要在路由初始化后执行 render
-                    // eslint-disable-next-line react/no-render-return-value
-                    wrapper = ReactDOM.render(R.createElement(AppWrapper), document$2.getElementById('app'));
+                    wrapper = (_a = ReactDOM.render) === null || _a === void 0 ? void 0 : _a.call(ReactDOM, R.createElement(AppWrapper), document$2.getElementById((config === null || config === void 0 ? void 0 : config.appId) || 'app'));
                 }
                 const app = ref.current;
                 // For taroize
@@ -5927,7 +5939,7 @@ function createVueApp(App, vue, config) {
                 Current.router = Object.assign({ params: options === null || options === void 0 ? void 0 : options.query }, options);
                 if (isBrowser) {
                     // 由于 H5 路由初始化的时候会清除 app 下的 dom 元素，所以需要在路由初始化后再执行 render
-                    wrapper.$mount(document$2.getElementById('app'));
+                    wrapper.$mount(document$2.getElementById((config === null || config === void 0 ? void 0 : config.appId) || 'app'));
                 }
                 appInstance = wrapper.$refs.app;
                 if (appInstance != null && isFunction$1(appInstance.$options.onLaunch)) {
@@ -5968,10 +5980,6 @@ function createVue3Page(h, id) {
             },
             created() {
                 injectPageInstance(this, id);
-                // vue3 组件 created 时机比小程序页面 onShow 慢，因此在 created 后再手动触发一次 onShow。
-                this.$nextTick(() => {
-                    safeExecute(id, 'onShow');
-                });
             }
         };
         if (isArray$1(component.mixins)) {
@@ -6075,7 +6083,7 @@ function createVue3App(app, h, config) {
                 var _a;
                 Current.router = Object.assign({ params: options === null || options === void 0 ? void 0 : options.query }, options);
                 if (isBrowser) {
-                    appInstance = app.mount('#app');
+                    appInstance = app.mount('#' + config.appId || 'app');
                 }
                 // 把 App Class 上挂载的额外属性同步到全局 app 对象中
                 // eslint-disable-next-line dot-notation