@tarojs/runtime 4.0.6 → 4.0.7-alpha.0

package/dist/index.cjs.js

@@ -43,6 +43,7 @@ const SET_TIMEOUT = 'setTimeout';
 const COMPILE_MODE = 'compileMode';
 const CATCHMOVE = 'catchMove';
 const CATCH_VIEW = 'catch-view';
+const CLICK_VIEW = 'click-view';
 const COMMENT = 'comment';
 const ON_LOAD = 'onLoad';
 const ON_READY = 'onReady';
@@ -113,9 +114,9 @@ class MutationObserverImpl {
         return this.records.splice(0, this.records.length);
     }
 }
-/** Match two TaroNodes by sid. */
+/** Match two TaroNodes by [Shortcuts.Sid]. */
 const sidMatches = (observerTarget, target) => {
-    return !!observerTarget && observerTarget.sid === (target === null || target === void 0 ? void 0 : target.sid);
+    return !!observerTarget && observerTarget["s" /* Shortcuts.Sid */] === (target === null || target === void 0 ? void 0 : target["s" /* Shortcuts.Sid */]);
 };
 const isConcerned = (record, options) => {
     const { characterData, characterDataOldValue, attributes, attributeOldValue, childList } = options;
@@ -1175,7 +1176,7 @@ function shortcutAttr(key) {
         case ID:
             return UID;
         case CLASS:
-            return "cl" /* Shortcuts.Class */;
+            return "l" /* Shortcuts.Class */;
         default:
             return key;
     }
@@ -1292,7 +1293,7 @@ class ClassList {
 
 class EventSource extends Map {
     removeNode(child) {
-        const { sid, uid } = child;
+        const { ["s" /* Shortcuts.Sid */]: sid, uid } = child;
         this.delete(sid);
         if (uid !== sid && uid)
             this.delete(uid);
@@ -1323,24 +1324,27 @@ function hydrate(node) {
     let compileModeName = null;
     if (isText(node)) {
         return {
-            sid: node.sid,
+            ["s" /* Shortcuts.Sid */]: node["s" /* Shortcuts.Sid */],
             ["v" /* Shortcuts.Text */]: node.nodeValue,
-            ["nn" /* Shortcuts.NodeName */]: ((_a = componentsAlias[nodeName]) === null || _a === void 0 ? void 0 : _a._num) || '8'
+            ["n" /* Shortcuts.NodeName */]: ((_a = componentsAlias[nodeName]) === null || _a === void 0 ? void 0 : _a._num) || '8'
         };
     }
     const data = {
-        ["nn" /* Shortcuts.NodeName */]: nodeName,
-        sid: node.sid
+        ["n" /* Shortcuts.NodeName */]: nodeName,
+        ["s" /* Shortcuts.Sid */]: node["s" /* Shortcuts.Sid */]
     };
-    if (node.uid !== node.sid) {
+    if (node.uid !== node["s" /* Shortcuts.Sid */]) {
         data.uid = node.uid;
     }
     if (!node.isAnyEventBinded() && SPECIAL_NODES.indexOf(nodeName) > -1) {
-        data["nn" /* Shortcuts.NodeName */] = `static-${nodeName}`;
+        data["n" /* Shortcuts.NodeName */] = `static-${nodeName}`;
         if (nodeName === VIEW && !isHasExtractProp(node)) {
-            data["nn" /* Shortcuts.NodeName */] = PURE_VIEW;
+            data["n" /* Shortcuts.NodeName */] = PURE_VIEW;
         }
     }
+    if (nodeName === VIEW && node.isOnlyClickBinded()) {
+        data["n" /* Shortcuts.NodeName */] = CLICK_VIEW;
+    }
     const { props } = node;
     for (const prop in props) {
         const propInCamelCase = shared.toCamelCase(prop);
@@ -1356,26 +1360,26 @@ function hydrate(node) {
             nodeName === VIEW &&
             propInCamelCase === CATCHMOVE &&
             props[prop] !== false) {
-            data["nn" /* Shortcuts.NodeName */] = CATCH_VIEW;
+            data["n" /* Shortcuts.NodeName */] = CATCH_VIEW;
         }
         if (propInCamelCase === COMPILE_MODE) {
             compileModeName = props[prop];
         }
     }
     // Children
-    data["cn" /* Shortcuts.Childnodes */] = node.childNodes.filter(node => !isComment(node)).map(hydrate);
+    data["c" /* Shortcuts.Childnodes */] = node.childNodes.filter(node => !isComment(node)).map(hydrate);
     if (node.className !== '') {
-        data["cl" /* Shortcuts.Class */] = node.className;
+        data["l" /* Shortcuts.Class */] = node.className;
     }
     const cssText = node.cssText;
     if (cssText !== '' && nodeName !== 'swiper-item') {
         data["st" /* Shortcuts.Style */] = cssText;
     }
     shared.hooks.call('modifyHydrateData', data, node);
-    const nn = data["nn" /* Shortcuts.NodeName */];
-    const componentAlias = componentsAlias[nn];
+    const n = data["n" /* Shortcuts.NodeName */];
+    const componentAlias = componentsAlias[n];
     if (componentAlias) {
-        data["nn" /* Shortcuts.NodeName */] = componentAlias._num;
+        data["n" /* Shortcuts.NodeName */] = componentAlias._num;
         for (const prop in data) {
             if (prop in componentAlias) {
                 data[componentAlias[prop]] = data[prop];
@@ -1384,7 +1388,7 @@ function hydrate(node) {
         }
     }
     if (compileModeName !== null) {
-        data["nn" /* Shortcuts.NodeName */] = compileModeName;
+        data["n" /* Shortcuts.NodeName */] = compileModeName;
     }
     const resData = shared.hooks.call('transferHydrateData', data, node, componentAlias);
     return resData || data;
@@ -1462,9 +1466,14 @@ class TaroEventTarget {
         const isAnyEventBinded = Object.keys(handlers).find(key => handlers[key].length);
         return Boolean(isAnyEventBinded);
     }
+    isOnlyClickBinded() {
+        const handlers = this.__handlers;
+        const isOnlyClickBinded = handlers.tap && Object.keys(handlers).length === 1;
+        return Boolean(isOnlyClickBinded);
+    }
 }
 
-const CHILDNODES = "cn" /* Shortcuts.Childnodes */;
+const CHILDNODES = "c" /* Shortcuts.Childnodes */;
 const nodeId = incrementId();
 class TaroNode extends TaroEventTarget {
     constructor() {
@@ -1473,8 +1482,8 @@ class TaroNode extends TaroEventTarget {
         this.childNodes = [];
         this.hydrate = (node) => () => hydrate(node);
         this.uid = '_' + nodeId(); // dom 节点 id，开发者可修改
-        this.sid = this.uid; // dom 节点全局唯一 id，不可被修改
-        eventSource.set(this.sid, this);
+        this["s" /* Shortcuts.Sid */] = this.uid; // dom 节点全局唯一 id，不可被修改
+        eventSource.set(this["s" /* Shortcuts.Sid */], this);
     }
     updateChildNodes(isClean) {
         const cleanChildNodes = () => [];
@@ -1629,13 +1638,13 @@ class TaroNode extends TaroEventTarget {
                 // insertBefore 有两种更新模式
                 // 比方说有 A B C 三个节点，现在要在 C 前插入 D
                 // 1. 插入 D，然后更新整个父节点的 childNodes 数组
-                // setData({ cn: [A, B, D, C] })
+                // setData({ c: [A, B, D, C] })
                 // 2. 插入 D，然后更新 D 以及 D 之后每个节点的数据
                 // setData ({
-                //   cn.[2]: D,
-                //   cn.[3]: C,
+                //   c.[2]: D,
+                //   c.[3]: C,
                 // })
-                // 由于微信解析 ’cn.[2]‘ 这些路径的时候也需要消耗时间，
+                // 由于微信解析 ’c.[2]‘ 这些路径的时候也需要消耗时间，
                 // 所以根据 insertBefore 插入的位置来做不同的处理
                 const mark = childNodesLength * 2 / 3;
                 if (mark > index) {
@@ -2223,8 +2232,8 @@ class TaroElement extends TaroNode {
                 this.style.cssText = value;
                 break;
             case ID:
-                if (this.uid !== this.sid) {
-                    // eventSource[sid] 永远保留，直到组件卸载
+                if (this.uid !== this["s" /* Shortcuts.Sid */]) {
+                    // eventSource[Shortcuts.Sid] 永远保留，直到组件卸载
                     // eventSource[uid] 可变
                     eventSource.delete(this.uid);
                 }
@@ -2268,14 +2277,14 @@ class TaroElement extends TaroNode {
                 // catchMove = true: catch-view
                 // catchMove = false: view or static-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
                     value: value ? catchViewAlias : (this.isAnyEventBinded() ? viewAlias : staticViewAlias)
                 });
             }
             else if (isPureView && isHasExtractProp(this)) {
                 // pure-view => static-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
                     value: staticViewAlias
                 });
             }
@@ -2327,14 +2336,14 @@ class TaroElement extends TaroNode {
             if (qualifiedNameInCamelCase === CATCHMOVE) {
                 // catch-view => view or static-view or pure-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
                     value: this.isAnyEventBinded() ? viewAlias : (isHasExtractProp(this) ? staticViewAlias : pureViewAlias)
                 });
             }
             else if (isStaticView && !isHasExtractProp(this)) {
                 // static-view => pure-view
                 this.enqueueUpdate({
-                    path: `${_path}.${"nn" /* Shortcuts.NodeName */}`,
+                    path: `${_path}.${"n" /* Shortcuts.NodeName */}`,
                     value: pureViewAlias
                 });
             }
@@ -2403,7 +2412,7 @@ class TaroElement extends TaroNode {
             const componentsAlias = getComponentsAlias();
             const alias = componentsAlias[name]._num;
             this.enqueueUpdate({
-                path: `${this._path}.${"nn" /* Shortcuts.NodeName */}`,
+                path: `${this._path}.${"n" /* Shortcuts.NodeName */}`,
                 value: alias
             });
         }
@@ -2419,7 +2428,7 @@ class TaroElement extends TaroNode {
             const value = isHasExtractProp(this) ? `static-${name}` : `pure-${name}`;
             const valueAlias = componentsAlias[value]._num;
             this.enqueueUpdate({
-                path: `${this._path}.${"nn" /* Shortcuts.NodeName */}`,
+                path: `${this._path}.${"n" /* Shortcuts.NodeName */}`,
                 value: valueAlias
             });
         }
@@ -3383,9 +3392,9 @@ class TaroEvent {
         const cacheTarget = this.cacheTarget;
         if (!cacheTarget) {
             const target = Object.create(((_a = this.mpEvent) === null || _a === void 0 ? void 0 : _a.target) || null);
-            const currentEle = env.document.getElementById(((_b = target.dataset) === null || _b === void 0 ? void 0 : _b.sid) || target.id || null);
+            const currentEle = env.document.getElementById(((_b = target.dataset) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.Sid */]) || target.id || null);
             // Note：优先判断冒泡场景alipay的targetDataset的sid, 不然冒泡场景target属性吐出不对，其余拿取当前绑定id
-            const element = env.document.getElementById(((_c = target.targetDataset) === null || _c === void 0 ? void 0 : _c.sid) || ((_d = target.dataset) === null || _d === void 0 ? void 0 : _d.sid) || target.id || null);
+            const element = env.document.getElementById(((_c = target.targetDataset) === null || _c === void 0 ? void 0 : _c["s" /* Shortcuts.Sid */]) || ((_d = target.dataset) === null || _d === void 0 ? void 0 : _d["s" /* Shortcuts.Sid */]) || target.id || null);
             target.dataset = Object.assign(Object.assign({}, (currentEle !== null ? currentEle.dataset : shared.EMPTY_OBJ)), (element !== null ? element.dataset : shared.EMPTY_OBJ));
             for (const key in (_e = this.mpEvent) === null || _e === void 0 ? void 0 : _e.detail) {
                 target[key] = this.mpEvent.detail[key];
@@ -3403,8 +3412,8 @@ class TaroEvent {
         if (!cacheCurrentTarget) {
             const doc = env.document;
             const currentTarget = Object.create(((_a = this.mpEvent) === null || _a === void 0 ? void 0 : _a.currentTarget) || null);
-            const element = doc.getElementById(((_b = currentTarget.dataset) === null || _b === void 0 ? void 0 : _b.sid) || currentTarget.id || null);
-            const targetElement = doc.getElementById(((_e = (_d = (_c = this.mpEvent) === null || _c === void 0 ? void 0 : _c.target) === null || _d === void 0 ? void 0 : _d.dataset) === null || _e === void 0 ? void 0 : _e.sid) || ((_g = (_f = this.mpEvent) === null || _f === void 0 ? void 0 : _f.target) === null || _g === void 0 ? void 0 : _g.id) || null);
+            const element = doc.getElementById(((_b = currentTarget.dataset) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.Sid */]) || currentTarget.id || null);
+            const targetElement = doc.getElementById(((_e = (_d = (_c = this.mpEvent) === null || _c === void 0 ? void 0 : _c.target) === null || _d === void 0 ? void 0 : _d.dataset) === null || _e === void 0 ? void 0 : _e["s" /* Shortcuts.Sid */]) || ((_g = (_f = this.mpEvent) === null || _f === void 0 ? void 0 : _f.target) === null || _g === void 0 ? void 0 : _g.id) || null);
             if (element === null || (element && element === targetElement)) {
                 this.cacheCurrentTarget = this.target;
                 return this.target;
@@ -3462,7 +3471,7 @@ function eventHandler(event) {
     event.currentTarget = event.currentTarget || event.target || Object.assign({}, event);
     shared.hooks.call('modifyMpEventImpl', event);
     const currentTarget = event.currentTarget;
-    const id = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a.sid /** sid */) || currentTarget.id /** uid */ || ((_b = event.detail) === null || _b === void 0 ? void 0 : _b.id) || '';
+    const id = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a["s" /* Shortcuts.Sid */] /** sid */) || currentTarget.id /** uid */ || ((_b = event.detail) === null || _b === void 0 ? void 0 : _b.id) || '';
     const node = env.document.getElementById(id);
     if (node) {
         const dispatch = () => {
@@ -3572,7 +3581,7 @@ _Performance_instances = new WeakSet(), _Performance_parseTime = function _Perfo
 const perf = new Performance();
 
 function findCustomWrapper(root, dataPathArr) {
-    // ['root', 'cn', '[0]'] remove 'root' => ['cn', '[0]']
+    // ['root', 'c', '[0]'] remove 'root' => ['c', '[0]']
     const list = dataPathArr.slice(1);
     let currentData = root;
     let customWrapper;
@@ -3581,8 +3590,8 @@ function findCustomWrapper(root, dataPathArr) {
         const key = item
             // '[0]' => '0'
             .replace(/^\[(.+)\]$/, '$1')
-            // 'cn' => 'childNodes'
-            .replace(/\bcn\b/g, 'childNodes');
+            // 'c' => 'Shortcuts.Childnodes'
+            .replace(/\bc\b/g, 'childNodes');
         currentData = currentData[key];
         if (shared.isArray(currentData)) {
             currentData = currentData.filter(el => !isComment(el));
@@ -3590,7 +3599,7 @@ function findCustomWrapper(root, dataPathArr) {
         if (shared.isUndefined(currentData))
             return true;
         if (currentData.nodeName === CUSTOM_WRAPPER) {
-            const res = customWrapperCache.get(currentData.sid);
+            const res = customWrapperCache.get(currentData["s" /* Shortcuts.Sid */]);
             if (res) {
                 customWrapper = res;
                 splitedPath = dataPathArr.slice(i + 2).join('.');
@@ -3620,6 +3629,20 @@ class TaroRootElement extends TaroElement {
     get _root() {
         return this;
     }
+    scheduleTask(fn) {
+        if (shared.isFunction(Promise)) {
+            Promise.resolve()
+                .then(fn)
+                .catch((error) => {
+                setTimeout(() => {
+                    throw error;
+                });
+            });
+        }
+        else {
+            setTimeout(fn);
+        }
+    }
     enqueueUpdate(payload) {
         this.updatePayloads.push(payload);
         if (!this.pendingUpdate && this.ctx) {
@@ -3629,16 +3652,16 @@ class TaroRootElement extends TaroElement {
     performUpdate(initRender = false, prerender) {
         this.pendingUpdate = true;
         const ctx = shared.hooks.call('proxyToRaw', this.ctx);
-        setTimeout(() => {
+        this.scheduleTask(() => {
             const setDataMark = `${SET_DATA} 开始时间戳 ${Date.now()}`;
             perf.start(setDataMark);
             const data = Object.create(null);
             const resetPaths = new Set(initRender
-                ? ['root.cn.[0]', 'root.cn[0]']
+                ? [`root.${"c" /* Shortcuts.Childnodes */}.[0]`, `root.${"c" /* Shortcuts.Childnodes */}[0]`]
                 : []);
             while (this.updatePayloads.length > 0) {
                 const { path, value } = this.updatePayloads.shift();
-                if (path.endsWith("cn" /* Shortcuts.Childnodes */)) {
+                if (path.endsWith("c" /* Shortcuts.Childnodes */)) {
                     resetPaths.add(path);
                 }
                 data[path] = value;
@@ -3712,7 +3735,7 @@ class TaroRootElement extends TaroElement {
                 }
                 ctx.setData(normalUpdate, cb);
             }
-        }, 0);
+        });
     }
     enqueueUpdateCallback(cb, ctx) {
         this.updateCallbacks.push(() => {
@@ -4213,7 +4236,7 @@ function createRecursiveComponentConfig(componentName) {
         ? {
             [ATTACHED]() {
                 var _a, _b;
-                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);
+                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a["s" /* Shortcuts.Sid */]) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.Sid */]);
                 if (shared.isString(componentId)) {
                     customWrapperCache.set(componentId, this);
                     const el = env.document.getElementById(componentId);
@@ -4224,7 +4247,7 @@ function createRecursiveComponentConfig(componentName) {
             },
             [DETACHED]() {
                 var _a, _b;
-                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);
+                const componentId = ((_a = this.data.i) === null || _a === void 0 ? void 0 : _a["s" /* Shortcuts.Sid */]) || ((_b = this.props.i) === null || _b === void 0 ? void 0 : _b["s" /* Shortcuts.Sid */]);
                 if (shared.isString(componentId)) {
                     customWrapperCache.delete(componentId);
                     const el = env.document.getElementById(componentId);
@@ -4239,7 +4262,7 @@ function createRecursiveComponentConfig(componentName) {
             i: {
                 type: Object,
                 value: {
-                    ["nn" /* Shortcuts.NodeName */]: shared.getComponentsAlias(shared.internalComponents)[VIEW]._num
+                    ["n" /* Shortcuts.NodeName */]: shared.getComponentsAlias(shared.internalComponents)[VIEW]._num
                 }
             },
             l: {
@@ -5082,6 +5105,7 @@ exports.CATCHMOVE = CATCHMOVE;
 exports.CATCH_VIEW = CATCH_VIEW;
 exports.CHANGE = CHANGE;
 exports.CLASS = CLASS;
+exports.CLICK_VIEW = CLICK_VIEW;
 exports.COMMENT = COMMENT;
 exports.COMPILE_MODE = COMPILE_MODE;
 exports.CONFIRM = CONFIRM;