@tarojs/runtime 3.6.33 → 3.6.35-alpha.6

package/dist/runtime.esm.js

@@ -2104,15 +2104,30 @@ const specialMiniElements = {
     img: 'image',
     iframe: 'web-view'
 };
+const specialElements = new Map([
+    ['a', {
+            mapName(props) {
+                if (props.as && isString(props.as))
+                    return props.as.toLowerCase();
+                return !props.href || isString(props.href) && (/^javascript/.test(props.href)) ? 'view' : 'navigator';
+            }
+        }],
+]);
+const getSpecialElementMapping = (tag, expectsLowerCase = true) => {
+    tag = expectsLowerCase ? tag.toLowerCase() : tag;
+    return specialElements.get(tag);
+};
 const internalCompsList = Object.keys(internalComponents)
     .map(i => i.toLowerCase())
     .join(',');
 // https://developers.weixin.qq.com/miniprogram/dev/component
 const isMiniElements = makeMap(internalCompsList, true);
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Inline_elements
-const isInlineElements = makeMap('a,i,abbr,iframe,select,acronym,slot,small,span,bdi,kbd,strong,big,map,sub,sup,br,mark,mark,meter,template,canvas,textarea,cite,object,time,code,output,u,data,picture,tt,datalist,var,dfn,del,q,em,s,embed,samp,b', true);
+const isInlineElements = makeMap('i,abbr,iframe,select,acronym,slot,small,span,bdi,kbd,strong,big,map,sub,sup,br,mark,mark,meter,template,canvas,textarea,cite,object,time,code,output,u,data,picture,tt,datalist,var,dfn,del,q,em,s,embed,samp,b', true);
 // https://developer.mozilla.org/en-US/docs/Web/HTML/Block-level_elements
 const isBlockElements = makeMap('address,fieldset,li,article,figcaption,main,aside,figure,nav,blockquote,footer,ol,details,form,p,dialog,h1,h2,h3,h4,h5,h6,pre,dd,header,section,div,hgroup,table,dl,hr,ul,dt', true);
+// specialElements
+const isSpecialElements = makeMap('a', true);
 
 const closingTagAncestorBreakers = {
     li: ['ul', 'ol', 'menu'],
@@ -2141,7 +2156,21 @@ function hasTerminalParent(tagName, stack) {
     }
     return false;
 }
-function getTagName(tag) {
+/**
+ * 将属性数组转换为属性对象
+ * @param attributes 字符串数组，包含属性信息
+ * @returns 属性对象，键为属性名，值为属性值或true
+ */
+function attributesArray2Props(attributes) {
+    const props = {};
+    for (let i = 0; i < attributes.length; i++) {
+        const attr = attributes[i];
+        const [key, value] = splitEqual(attr);
+        props[key] = value == null ? true : unquote(value);
+    }
+    return props;
+}
+function getTagName(tag, attributes) {
     if (options.html.renderHTMLTag) {
         return tag;
     }
@@ -2157,6 +2186,14 @@ function getTagName(tag) {
     else if (isInlineElements(tag)) {
         return 'text';
     }
+    else if (isSpecialElements(tag)) {
+        // if it's special tag, the real tag is determined by the config mapping
+        const mapping = getSpecialElementMapping(tag);
+        const props = attributesArray2Props(attributes);
+        if (mapping) {
+            return mapping.mapName(props);
+        }
+    }
     return 'view';
 }
 function splitEqual(str) {
@@ -2190,7 +2227,26 @@ function format(children, document, styleOptions, parent) {
             parent === null || parent === void 0 ? void 0 : parent.appendChild(text);
             return text;
         }
-        const el = document.createElement(getTagName(child.tagName));
+        // img标签,把width和height写入style,删除原有的width、height和style属性
+        if (child.tagName === 'img') {
+            let styleText = '';
+            const toBeRemovedIndexs = [];
+            for (let i = 0; i < child.attributes.length; i++) {
+                const attr = child.attributes[i];
+                const [key, value] = splitEqual(attr);
+                if (key === 'width' || key === 'height') {
+                    styleText += `${key}:${value};`;
+                    toBeRemovedIndexs.push(i);
+                }
+                else if (key === 'style') {
+                    styleText = `${styleText}${value};`;
+                    toBeRemovedIndexs.push(i);
+                }
+            }
+            child.attributes = child.attributes.filter((_, index) => !toBeRemovedIndexs.includes(index));
+            child.attributes.push(`style=${styleText.replace(/['"]/g, '')}`);
+        }
+        const el = document.createElement(getTagName(child.tagName, child.attributes));
         el.h5tagName = child.tagName;
         parent === null || parent === void 0 ? void 0 : parent.appendChild(el);
         if (!options.html.renderHTMLTag) {
@@ -2496,14 +2552,15 @@ class TaroEvent {
         this.defaultPrevented = true;
     }
     get target() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         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);
             // Note：优先判断冒泡场景alipay的targetDataset的sid, 不然冒泡场景target属性吐出不对，其余拿取当前绑定id
-            const element = env.document.getElementById(((_b = target.targetDataset) === null || _b === void 0 ? void 0 : _b.sid) || ((_c = target.dataset) === null || _c === void 0 ? void 0 : _c.sid) || target.id || null);
-            target.dataset = element !== null ? element.dataset : EMPTY_OBJ;
-            for (const key in (_d = this.mpEvent) === null || _d === void 0 ? void 0 : _d.detail) {
+            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);
+            target.dataset = Object.assign(Object.assign({}, (currentEle !== null ? currentEle.dataset : EMPTY_OBJ)), (element !== null ? element.dataset : EMPTY_OBJ));
+            for (const key in (_e = this.mpEvent) === null || _e === void 0 ? void 0 : _e.detail) {
                 target[key] = this.mpEvent.detail[key];
             }
             this.cacheTarget = target;