@tarojs/runtime 3.6.6-alpha.1 → 3.6.6-alpha.3

package/dist/bom/history.d.ts

@@ -18,7 +18,7 @@ export declare class History extends Events {
     #private;
     constructor(location: LocationType.Location, options: Options);
     get length(): number;
-    get state(): HistoryState;
+    get state(): Record<string, any> | null;
     go(delta: number): void;
     back(): void;
     forward(): void;

package/dist/dom/class-list.d.ts

@@ -1,14 +1,16 @@
 import type { TaroElement } from './element';
-export declare class ClassList extends Set<string> {
+export declare class ClassList {
     private el;
+    private tokenList;
     constructor(className: string, el: TaroElement);
     get value(): string;
-    add(s: string): this;
     get length(): number;
-    remove(s: string): void;
-    toggle(s: string): void;
-    replace(s1: string, s2: string): void;
-    contains(s: string): boolean;
+    add(): void;
+    remove(): void;
+    contains(token: string): boolean;
+    toggle(token: string, force: boolean): boolean;
+    replace(token: string, replacement_token: string): void;
     toString(): string;
+    private checkTokenIsValid;
     private _update;
 }

package/dist/dom/form.d.ts

@@ -1,6 +1,8 @@
 import { TaroElement } from './element';
 import type { TaroEvent } from './event';
 export declare class FormElement extends TaroElement {
+    get type(): string;
+    set type(val: string);
     get value(): string | boolean | number | any[];
     set value(val: string | boolean | number | any[]);
     dispatchEvent(event: TaroEvent): boolean;

package/dist/dsl/instance.d.ts

@@ -65,6 +65,8 @@ export interface PageInstance extends PageLifeCycle {
     path?: string;
     /** 页面的组件选项 */
     options?: Record<string, unknown>;
+    /** 页面渲染引擎类型 */
+    renderer?: 'webview' | 'skyline';
 }
 interface Show {
     componentDidShow?(): void;

package/dist/runtime.esm.d.ts

@@ -6,17 +6,19 @@ import { Component as Vue3Component } from "@vue/runtime-core";
 import { Component, ComponentClass } from "react";
 import { CombinedVueInstance } from "vue/types/vue";
 declare let document: any;
-declare class ClassList extends Set<string> {
+declare class ClassList {
     private el;
+    private tokenList;
     constructor(className: string, el: TaroElement);
     get value(): string;
-    add(s: string): this;
     get length(): number;
-    remove(s: string): void;
-    toggle(s: string): void;
-    replace(s1: string, s2: string): void;
-    contains(s: string): boolean;
+    add(): void;
+    remove(): void;
+    contains(token: string): boolean;
+    toggle(token: string, force: boolean): boolean;
+    replace(token: string, replacement_token: string): void;
     toString(): string;
+    private checkTokenIsValid;
     private _update;
 }
 interface Attributes {
@@ -129,6 +131,8 @@ declare function createEvent(event: MpEvent | string, node?: TaroElement): TaroE
 // 小程序的事件代理回调函数
 declare function eventHandler(event: MpEvent): any;
 declare class FormElement extends TaroElement {
+    get type(): string;
+    set type(val: string);
     get value(): string | boolean | number | any[];
     set value(val: string | boolean | number | any[]);
     dispatchEvent(event: TaroEvent): boolean;
@@ -405,7 +409,7 @@ declare class History extends Events {
     constructor(location: LocationType.Location, options: Options$0);
     /* public property */
     get length(): number;
-    get state(): HistoryState;
+    get state(): Record<string, any> | null;
     /* public method */
     go(delta: number): void;
     back(): void;
@@ -639,6 +643,8 @@ interface PageInstance extends PageLifeCycle {
     path?: string;
     /** 页面的组件选项 */
     options?: Record<string, unknown>;
+    /** 页面渲染引擎类型 */
+    renderer?: "webview" | "skyline";
 }
 interface Show {
     componentDidShow?(): void;

package/dist/runtime.esm.js

@@ -283,46 +283,90 @@ function getComponentsAlias() {
     return componentsAlias$1;
 }
 
-class ClassList extends Set {
+class ClassList {
     constructor(className, el) {
-        super();
-        className.trim().split(/\s+/).forEach(super.add.bind(this));
+        this.tokenList = [];
         this.el = el;
+        className.trim().split(/\s+/).forEach(token => this.tokenList.push(token));
     }
     get value() {
-        return [...this].filter(v => v !== '').join(' ');
-    }
-    add(s) {
-        super.add(s);
-        this._update();
-        return this;
+        return this.toString();
     }
     get length() {
-        return this.size;
+        return this.tokenList.length;
+    }
+    add() {
+        let index = 0;
+        let updated = false;
+        const tokens = arguments;
+        const length = tokens.length;
+        const tokenList = this.tokenList;
+        do {
+            const token = tokens[index];
+            if (this.checkTokenIsValid(token) && !~tokenList.indexOf(token)) {
+                tokenList.push(token);
+                updated = true;
+            }
+        } while (++index < length);
+        if (updated) {
+            this._update();
+        }
+    }
+    remove() {
+        let i = 0;
+        let updated = false;
+        const tokens = arguments;
+        const length = tokens.length;
+        const tokenList = this.tokenList;
+        do {
+            const token = tokens[i] + '';
+            if (!this.checkTokenIsValid(token))
+                continue;
+            const index = tokenList.indexOf(token);
+            if (~tokenList.indexOf(token)) {
+                tokenList.splice(index, 1);
+                updated = true;
+            }
+        } while (++i < length);
+        if (updated) {
+            this._update();
+        }
     }
-    remove(s) {
-        super.delete(s);
-        this._update();
+    contains(token) {
+        if (!this.checkTokenIsValid(token))
+            return false;
+        return !!~this.tokenList.indexOf(token);
     }
-    toggle(s) {
-        if (super.has(s)) {
-            super.delete(s);
+    toggle(token, force) {
+        const result = this.contains(token);
+        const method = result ? force !== true && 'remove' : force !== false && 'add';
+        if (method) {
+            // @ts-ignore
+            this[method](token);
+        }
+        if (force === true || force === false) {
+            return force;
         }
         else {
-            super.add(s);
+            return !result;
         }
-        this._update();
-    }
-    replace(s1, s2) {
-        super.delete(s1);
-        super.add(s2);
-        this._update();
     }
-    contains(s) {
-        return super.has(s);
+    replace(token, replacement_token) {
+        if (!this.checkTokenIsValid(token) || !this.checkTokenIsValid(replacement_token))
+            return;
+        const index = this.tokenList.indexOf(token);
+        if (~index) {
+            this.tokenList.splice(index, 1, replacement_token);
+            this._update();
+        }
     }
     toString() {
-        return this.value;
+        return this.tokenList.filter(v => v !== '').join(' ');
+    }
+    checkTokenIsValid(token) {
+        if (token === '' || /\s/.test(token))
+            return false;
+        return true;
     }
     _update() {
         this.el.className = this.value;
@@ -803,7 +847,8 @@ const styleProperties = [
     'widows',
     'width',
     'zIndex',
-    'pointerEvents'
+    'pointerEvents',
+    'aspectRatio'
     /** 非常用 style */
     // 'azimuth',
     // 'backfaceVisibility',
@@ -971,10 +1016,12 @@ function setStyle(newVal, styleKey) {
     }
     !this._pending && enqueueUpdate(this);
 }
-function initStyle(ctor) {
+function initStyle(ctor, styleProperties) {
     const properties = {};
     for (let i = 0; i < styleProperties.length; i++) {
         const styleKey = styleProperties[i];
+        if (ctor[styleKey])
+            return;
         properties[styleKey] = {
             get() {
                 const val = this._value[styleKey];
@@ -1085,7 +1132,17 @@ class Style {
         return value;
     }
 }
-initStyle(Style);
+initStyle(Style, styleProperties);
+hooks.tap('injectNewStyleProperties', (newStyleProperties) => {
+    if (isArray(newStyleProperties)) {
+        initStyle(Style, newStyleProperties);
+    }
+    else {
+        if (typeof newStyleProperties !== 'string')
+            return;
+        initStyle(Style, [newStyleProperties]);
+    }
+});
 
 function returnTrue() {
     return true;
@@ -1104,7 +1161,9 @@ function treeToArray(root, predict) {
 }
 function following(el, root) {
     const firstChild = el.firstChild;
-    if (firstChild) {
+    const isElmentTypeValid = el.nodeType === 1 /* NodeType.ELEMENT_NODE */ || el.nodeType === 9 /* NodeType.DOCUMENT_NODE */;
+    // 如果当前 el 不是 element 或 document 元素，则可以直接不递归他的子元素了
+    if (firstChild && isElmentTypeValid) {
         return firstChild;
     }
     let current = el;
@@ -1345,10 +1404,10 @@ class TaroElement extends TaroNode {
         });
     }
     getElementsByClassName(className) {
+        const classNames = className.trim().split(/\s+/);
         return treeToArray(this, (el) => {
             const classList = el.classList;
-            const classNames = className.trim().split(/\s+/);
-            return classNames.every(c => classList.has(c));
+            return classNames.every(c => classList.contains(c));
         });
     }
     dispatchEvent(event) {
@@ -2458,7 +2517,8 @@ function eventHandler(event) {
         const dispatch = () => {
             const e = createEvent(event, node);
             hooks.call('modifyTaroEvent', e, node);
-            node.dispatchEvent(e);
+            hooks.call('dispatchTaroEvent', e, node);
+            hooks.call('dispatchTaroEventFinish', e, node);
         };
         if (hooks.isExist('batchedEventUpdates')) {
             const type = event.type;
@@ -2488,6 +2548,13 @@ function eventHandler(event) {
 }
 
 class FormElement extends TaroElement {
+    get type() {
+        var _a;
+        return (_a = this.props[TYPE]) !== null && _a !== void 0 ? _a : '';
+    }
+    set type(val) {
+        this.setAttribute(TYPE, val);
+    }
     get value() {
         // eslint-disable-next-line dot-notation
         const val = this.props[VALUE];
@@ -3333,7 +3400,7 @@ class History extends Events {
         return __classPrivateFieldGet(this, _History_stack, "f").length;
     }
     get state() {
-        return __classPrivateFieldGet(this, _History_stack, "f")[__classPrivateFieldGet(this, _History_cur, "f")];
+        return __classPrivateFieldGet(this, _History_stack, "f")[__classPrivateFieldGet(this, _History_cur, "f")].state;
     }
     /* public method */
     go(delta) {