@tarojs/shared 3.7.0-canary.1 → 3.7.0-canary.2

package/dist/template.js

@@ -48,7 +48,7 @@ const Text = {
     space: NO_DEFAULT_VALUE,
     decode: DEFAULT_FALSE
 };
-const Button = Object.assign({ size: singleQuote('default'), type: NO_DEFAULT_VALUE, plain: DEFAULT_FALSE, disabled: NO_DEFAULT_VALUE, loading: DEFAULT_FALSE, 'form-type': NO_DEFAULT_VALUE, 'open-type': NO_DEFAULT_VALUE, 'hover-class': singleQuote('button-hover'), 'hover-stop-propagation': DEFAULT_FALSE, 'hover-start-time': '20', 'hover-stay-time': '70', name: NO_DEFAULT_VALUE }, touchEvents);
+const Button = Object.assign({ size: singleQuote('default'), type: NO_DEFAULT_VALUE, plain: DEFAULT_FALSE, disabled: NO_DEFAULT_VALUE, loading: DEFAULT_FALSE, 'form-type': NO_DEFAULT_VALUE, 'open-type': NO_DEFAULT_VALUE, 'hover-class': singleQuote('button-hover'), 'hover-stop-propagation': DEFAULT_FALSE, 'hover-start-time': '20', 'hover-stay-time': '70', name: NO_DEFAULT_VALUE, bindagreeprivacyauthorization: NO_DEFAULT_VALUE }, touchEvents);
 const Checkbox = {
     value: NO_DEFAULT_VALUE,
     disabled: NO_DEFAULT_VALUE,
@@ -489,7 +489,7 @@ const defaultMiniLifecycle = {
             'onReachBottom',
             'onPageScroll',
             'onResize',
-            'onTabItemTap',
+            'defer:onTabItemTap',
             'onTitleClick',
             'onOptionMenuClick',
             'onPopMenuClick',
@@ -576,6 +576,7 @@ new TaroHooks({
         return this.call('getMiniLifecycle', defaultMiniLifecycle);
     }),
     getLifecycle: TaroHook(HOOK_TYPE.SINGLE, (instance, lifecycle) => instance[lifecycle]),
+    modifyRecursiveComponentConfig: TaroHook(HOOK_TYPE.SINGLE, (defaultConfig) => defaultConfig),
     getPathIndex: TaroHook(HOOK_TYPE.SINGLE, indexOfNode => `[${indexOfNode}]`),
     getEventCenter: TaroHook(HOOK_TYPE.SINGLE, Events => new Events()),
     isBubbleEvents: TaroHook(HOOK_TYPE.SINGLE, eventName => {
@@ -607,6 +608,7 @@ new TaroHooks({
     createPullDownComponent: TaroHook(HOOK_TYPE.SINGLE),
     getDOMNode: TaroHook(HOOK_TYPE.SINGLE),
     modifyHydrateData: TaroHook(HOOK_TYPE.SINGLE),
+    transferHydrateData: TaroHook(HOOK_TYPE.SINGLE),
     modifySetAttrPayload: TaroHook(HOOK_TYPE.SINGLE),
     modifyRmAttrPayload: TaroHook(HOOK_TYPE.SINGLE),
     onAddEvent: TaroHook(HOOK_TYPE.SINGLE),
@@ -631,7 +633,9 @@ new TaroHooks({
     dispatchTaroEventFinish: TaroHook(HOOK_TYPE.MULTI),
     modifyDispatchEvent: TaroHook(HOOK_TYPE.MULTI),
     initNativeApi: TaroHook(HOOK_TYPE.MULTI),
-    patchElement: TaroHook(HOOK_TYPE.MULTI)
+    patchElement: TaroHook(HOOK_TYPE.MULTI),
+    modifyAddEventListener: TaroHook(HOOK_TYPE.SINGLE),
+    modifyRemoveEventListener: TaroHook(HOOK_TYPE.SINGLE),
 });
 
 function toDashed(s) {
@@ -759,24 +763,32 @@ class BaseTemplate {
         this.voidElements = voidElements;
         /** 可以递归调用自身的组件 */
         this.nestElements = nestElements;
-        this.buildPageTemplate = (baseTempPath) => {
+        this.buildPageTemplate = (baseTempPath, _page) => {
             const template = `<import src="${baseTempPath}"/>
 <template is="taro_tmpl" data="{{${this.dataKeymap('root:root')}}}" />`;
             return template;
         };
         this.buildBaseComponentTemplate = (ext) => {
-            const data = this.supportXS
-                ? this.dataKeymap('i:i,l:l')
-                : this.dataKeymap('i:i');
+            const data = !this.isSupportRecursive && this.supportXS
+                ? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${"nn" /* Shortcuts.NodeName */})`)
+                : this.isSupportRecursive
+                    ? this.dataKeymap('i:i')
+                    : this.dataKeymap('i:i,c:1');
+            // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
             return `<import src="./base${ext}" />
+${this.buildXsTemplate()}
 <template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`;
         };
         this.buildCustomComponentTemplate = (ext) => {
             const Adapter = this.Adapter;
             const data = !this.isSupportRecursive && this.supportXS
-                ? `${this.dataKeymap('i:item,l:\'\'')}`
-                : this.dataKeymap('i:item');
+                ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"nn" /* Shortcuts.NodeName */})`)}`
+                : this.isSupportRecursive
+                    ? this.dataKeymap('i:item')
+                    : this.dataKeymap('i:item,c:1');
+            // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
             return `<import src="./base${ext}" />
+  ${this.buildXsTemplate()}
   <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
     <template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
   </block>`;
@@ -904,10 +916,14 @@ class BaseTemplate {
     buildBaseTemplate() {
         const Adapter = this.Adapter;
         const data = !this.isSupportRecursive && this.supportXS
-            ? `${this.dataKeymap('i:item,l:\'\'')}`
-            : this.dataKeymap('i:item');
+            ? `${this.dataKeymap(`i:item,c:1,l:xs.f('',item.${"nn" /* Shortcuts.NodeName */})`)}`
+            : this.isSupportRecursive
+                ? this.dataKeymap('i:item')
+                : this.dataKeymap('i:item,c:1');
         const xs = this.supportXS
-            ? `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`
+            ? (this.isSupportRecursive
+                ? `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`
+                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */}, '')`)
             : "'tmpl_0_' + item.nn";
         return `${this.buildXsTemplate()}
 <template name="taro_tmpl">
@@ -925,10 +941,10 @@ class BaseTemplate {
                 if (value.indexOf('-') > -1) {
                     value = `:${value}`;
                 }
-                return str + `bind${value}="eh" `;
+                return str + ` bind${value}="eh"`;
             }
             else if (attr.startsWith('bind')) {
-                return str + `${attr}="eh" `;
+                return str + ` ${attr}="eh"`;
             }
             else if (attr.startsWith('on')) {
                 // react, vue3
@@ -937,22 +953,22 @@ class BaseTemplate {
                     // 兼容如 vant 某些组件的 bind:a-b 这类属性
                     value = `:${value}`;
                 }
-                return str + `bind${value}="eh" `;
+                return str + ` bind${value}="eh"`;
             }
             else if (attr === 'class') {
-                return str + `class="{{i.${"cl" /* Shortcuts.Class */}}}" `;
+                return str + ` class="{{i.${"cl" /* Shortcuts.Class */}}}"`;
             }
             else if (attr === 'style') {
-                return str + `style="{{i.${"st" /* Shortcuts.Style */}}}" `;
+                return str + ` style="{{i.${"st" /* Shortcuts.Style */}}}"`;
             }
             const patchValue = patcher[attr];
             if (isBooleanStringLiteral(patchValue) || isNumber(patchValue) || isString(patchValue)) {
                 const propValue = this.supportXS
                     ? `xs.b(i.${toCamelCase(attr)},${patchValue})`
                     : `i.${toCamelCase(attr)}===undefined?${patchValue}:i.${toCamelCase(attr)}`;
-                return str + `${attr}="{{${propValue}}}" `;
+                return str + ` ${attr}="{{${propValue}}}"`;
             }
-            return str + `${attr}="{{i.${toCamelCase(attr)}}}" `;
+            return str + ` ${attr}="{{i.${toCamelCase(attr)}}}"`;
         }, '');
     }
     buildComponentTemplate(comp, level) {
@@ -966,22 +982,30 @@ class BaseTemplate {
         const isUseXs = !this.isSupportRecursive && this.supportXS;
         if (isLastRecursiveComp) {
             const data = isUseXs
-                ? `${this.dataKeymap('i:item,l:l')}`
-                : this.dataKeymap('i:item');
+                ? `${this.dataKeymap('i:item,c:c,l:l')}`
+                : this.isSupportRecursive
+                    ? this.dataKeymap('i:item')
+                    : this.dataKeymap('i:item,c:c');
             return supportXS
                 ? `<template is="{{xs.e(${level})}}" data="{{${data}}}" />`
                 : `<template is="tmpl_${level}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
         }
         else {
             const data = isUseXs
-                ? `${this.dataKeymap(`i:item,l:xs.f(l,item.${"nn" /* Shortcuts.NodeName */})`)}`
-                : `${this.dataKeymap('i:item')}`;
+                // TODO: 此处直接 c+1，不是最优解，变量 c 的作用是监测组件嵌套的层级是否大于 baselevel
+                // 但目前的监测方法用于所有组件嵌套的总和，应该分开组件计算，单个组件嵌套层级大于 baselevel 时，再进入 comp 组件中进行新的嵌套
+                ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"nn" /* Shortcuts.NodeName */})`)}`
+                : this.isSupportRecursive
+                    ? `${this.dataKeymap('i:item')}`
+                    : `${this.dataKeymap('i:item,c:c+1')}`;
             const xs = !this.isSupportRecursive
-                ? `xs.a(${level}, item.${"nn" /* Shortcuts.NodeName */}, l)`
-                : `xs.a(${level}, item.${"nn" /* Shortcuts.NodeName */})`;
+                ? `xs.a(c, item.${"nn" /* Shortcuts.NodeName */}, l)`
+                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`;
             return supportXS
                 ? `<template is="{{${xs}}}" data="{{${data}}}" />`
-                : `<template is="{{'tmpl_' + ${level} + '_' + item.nn}}" data="{{${data}}}" />`;
+                : isSupportRecursive
+                    ? `<template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />`
+                    : `<template is="{{'tmpl_' + c + '_' + item.nn}}" data="{{${data}}}" />`;
         }
     }
     getChildren(comp, level) {
@@ -1014,7 +1038,7 @@ class BaseTemplate {
         delete attrs.focus;
         let res = `
 <template name="tmpl_${level}_${nodeAlias}">
-  <template is="{{${templateName}}}" data="{{${this.dataKeymap('i:i')}}}" />
+  <template is="{{${templateName}}}" data="{{${this.isSupportRecursive ? this.dataKeymap('i:i') : this.dataKeymap('i:i,c:c')}}}" />
 </template>
 
 <template name="tmpl_${level}_${nodeAlias}_focus">
@@ -1092,13 +1116,16 @@ class BaseTemplate {
                 if (isFunction(this.modifyThirdPartyLoopBody)) {
                     child = this.modifyThirdPartyLoopBody(child, compName);
                 }
-                template += `
-<template name="tmpl_${level}_${compName}">
-  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">
+                const children = this.voidElements.has(compName)
+                    ? ''
+                    : `
     <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
       ${child}
     </block>
-  </${compName}>
+  `;
+                template += `
+<template name="tmpl_${level}_${compName}">
+  <${compName} ${this.buildThirdPartyAttr(attrs, this.thirdPartyPatcher[compName] || {})} id="{{i.uid||i.sid}}" data-sid="{{i.sid}}">${children}</${compName}>
 </template>
   `;
             }
@@ -1107,8 +1134,8 @@ class BaseTemplate {
     }
     // 最后一层的 comp 需要引用 container 进行重新的模版循环，其他情况不需要 container
     buildContainerTemplate(level) {
-        const tmpl = `<block ${this.Adapter.if}="{{i.nn === '#text'}}">
-    <template is="tmpl_0_#text" data="{{${this.dataKeymap('i:i')}}}" />
+        const tmpl = `<block ${this.Adapter.if}="{{i.nn === '${this.componentsAlias['#text']._num}'}}">
+    <template is="tmpl_0_${this.componentsAlias['#text']._num}" data="{{${this.dataKeymap('i:i')}}}" />
   </block>
   <block ${this.Adapter.else}>
     ${!this.isSupportRecursive && this.supportXS ? '<comp i="{{i}}" l="{{l}}" />' : '<comp i="{{i}}" />'}
@@ -1254,6 +1281,8 @@ class UnRecursiveTemplate extends BaseTemplate {
         const componentsAlias = this.componentsAlias;
         const listA = Array.from(isLoopCompsSet).map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
         const listB = hasMaxComps.map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
+        const containerLevel = this.baseLevel - 1;
+        // l >= containerLevel 是为了避免 baselevel 倒数两三层几层组件恰好不是 listA 中的组件，而最后一个组件又刚好是 listA 的组件，导致出现 l >= baselevel 却没有走入新的嵌套循环的问题 #14883
         return `function (l, n, s) {
     var a = ${JSON.stringify(listA)}
     var b = ${JSON.stringify(listB)}
@@ -1268,6 +1297,9 @@ class UnRecursiveTemplate extends BaseTemplate {
       }
       l = depth
     }
+    if (l >= ${containerLevel}) {
+      return 'tmpl_${containerLevel}_${"container" /* Shortcuts.Container */}'
+    }
     return 'tmpl_' + l + '_' + n
   }`;
     }