@tarojs/plugin-html 3.5.0-canary.1 → 3.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/index.js +124 -126
  2. package/dist/index.js.map +1 -1
  3. package/dist/runtime.js +304 -301
  4. package/dist/runtime.js.map +1 -1
  5. package/index.js +1 -0
  6. package/package.json +12 -13
  7. package/src/index.ts +6 -6
  8. package/src/runtime.ts +114 -119
  9. package/src/utils.ts +6 -4
package/dist/runtime.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.js","sources":["../src/constant.ts","../src/utils.ts","../src/runtime.ts"],"sourcesContent":["import { isString } from '@tarojs/shared'\n\ninterface SpecialMaps {\n mapName: string | SpecialMaps.MapNameFn\n mapNameCondition?: string[]\n mapAttr?: SpecialMaps.MapAttrFn\n}\n\nexport namespace SpecialMaps {\n export interface MapNameFn {\n (props: Record<string, any>): string\n }\n export interface MapAttrFn {\n (key: string, value: any, props: Record<string, any>): [string, any]\n }\n}\n\nfunction genAttrMapFnFromDir (dir: Record<string, string | [string, Record<string, any>]>): SpecialMaps.MapAttrFn {\n const fn: SpecialMaps.MapAttrFn = function (key, value) {\n const lowerKey = key.toLowerCase()\n if (lowerKey in dir) {\n const res = dir[lowerKey]\n if (isString(res)) {\n key = res\n } else {\n key = res[0]\n value = res[1][value] || value\n }\n }\n return [key, value]\n }\n return fn\n}\n\nexport const inlineElements = new Set<string>([])\nexport const blockElements = new Set<string>([])\nexport const specialElements = new Map<string, string | SpecialMaps>([\n ['slot', 'slot'],\n ['form', 'form'],\n ['iframe', 'web-view'],\n ['img', 'image'],\n ['audio', 'audio'],\n ['video', 'video'],\n ['canvas', 'canvas'],\n ['a', {\n mapName (props) {\n return !props.href || (/^javascript/.test(props.href)) ? 'view' : 'navigator'\n },\n mapNameCondition: ['href'],\n mapAttr: genAttrMapFnFromDir({\n href: 'url',\n target: ['openType', {\n _blank: 'navigate',\n _self: 'redirect'\n }]\n })\n }],\n ['input', {\n mapName (props) {\n if (props.type === 'checkbox') {\n return 'checkbox'\n } else if (props.type === 'radio') {\n return 'radio'\n }\n return 'input'\n },\n mapNameCondition: ['type'],\n mapAttr (key, value, props) {\n const htmlKey = key.toLowerCase()\n if (htmlKey === 'autofocus') {\n key = 'focus'\n } else if (htmlKey === 'readonly') {\n if (props.disabled === true) {\n value = true\n }\n key = 'disabled'\n } else if (htmlKey === 'type') {\n if (value === 'password') {\n key = 'password'\n value = true\n } else if (value === 'tel') {\n value = 'number'\n }\n }\n return [key, value]\n }\n }],\n ['label', {\n mapName: 'label',\n mapAttr: genAttrMapFnFromDir({\n htmlfor: 'for'\n })\n }],\n ['textarea', {\n mapName: 'textarea',\n mapAttr: genAttrMapFnFromDir({\n autofocus: 'focus',\n readonly: 'disabled'\n })\n }],\n ['progress', {\n mapName: 'progress',\n mapAttr (key, value, props) {\n if (key === 'value') {\n const max = props.max || 1\n key = 'percent'\n value = Math.round(value / max * 100)\n }\n return [key, value]\n }\n }],\n ['button', {\n mapName: 'button',\n mapAttr (key, value) {\n if (key === 'type' && (value === 'submit' || value === 'reset')) {\n key = 'formType'\n }\n return [key, value]\n }\n }]\n])\n","import { isFunction, isString, Shortcuts } from '@tarojs/shared'\nimport {\n inlineElements,\n blockElements,\n specialElements,\n SpecialMaps\n} from './constant'\n\nexport function isHtmlTags (nodeName: string): boolean {\n if (inlineElements.has(nodeName) || blockElements.has(nodeName) || specialElements.has(nodeName)) {\n return true\n }\n return false\n}\n\nexport function getMappedType (nodeName: string, rawProps: Record<string, any>): string {\n if (inlineElements.has(nodeName)) {\n return 'text'\n } else if (specialElements.has(nodeName)) {\n const mapping = specialElements.get(nodeName)!\n if (isString(mapping)) {\n return mapping\n }\n const { mapName } = mapping\n return isFunction(mapName) ? mapName(rawProps) : mapName\n } else {\n return 'view'\n }\n}\n\nexport function getAttrMapFn (nodeName): SpecialMaps.MapAttrFn | undefined {\n const mapping = specialElements.get(nodeName)\n if (!isString(mapping)) {\n return mapping?.mapAttr\n }\n}\n\nfunction getMapNameByCondition (nodeName: string, attr: string, props: Record<string, any>): string | undefined {\n const mapping = specialElements.get(nodeName)\n if (!mapping || isString(mapping)) return\n\n const { mapName, mapNameCondition } = mapping\n if (!mapNameCondition) return\n\n if (mapNameCondition.indexOf(attr) > -1 && !isString(mapName)) {\n return mapName(props)\n }\n}\n\nexport function mapNameByContion (nodeName: string, key: string, element: any) {\n const mapName = getMapNameByCondition(nodeName, key, element.props)\n if (mapName) {\n element.enqueueUpdate({\n path: `${element._path}.${Shortcuts.NodeName}`,\n value: mapName\n })\n }\n}\n\nexport function ensureHtmlClass (tagName: string, className = ''): string {\n const classList = className.split(' ')\n const htmlClass = `h5-${tagName}`\n if (classList.indexOf(htmlClass) === -1) {\n classList.push(htmlClass)\n }\n return classList.join(' ')\n}\n\nexport function ensureRect (props: Record<string, any>, style = ''): string {\n let cssText = style\n const { width, height } = props\n if (width) {\n cssText = `width: ${width};${cssText}`\n }\n if (height) {\n cssText = `height: ${height};${cssText}`\n }\n return cssText\n}\n\nexport function defineMappedProp (obj, propName, mapName) {\n Object.defineProperty(obj, propName, {\n enumerable: true,\n configurable: true,\n get () {\n return obj[mapName]\n },\n set (val) {\n obj[mapName] = val\n }\n })\n}\n","import { mergeReconciler, Shortcuts, warn } from '@tarojs/shared'\nimport {\n isHtmlTags,\n getMappedType,\n getAttrMapFn,\n ensureHtmlClass,\n ensureRect,\n mapNameByContion,\n defineMappedProp\n} from './utils'\n\nimport type { ModifyHydrateData, ModifyRmAttrPayload, ModifySetAttrPayload, ModifyTaroEvent, OnAddEvent, TaroElement } from '@tarojs/runtime'\n\ninterface IHostConfig {\n modifyHydrateData: ModifyHydrateData\n modifySetAttrPayload: ModifySetAttrPayload\n modifyRmAttrPayload: ModifyRmAttrPayload\n onAddEvent: OnAddEvent<TaroElement>\n modifyTaroEvent: ModifyTaroEvent\n}\n\nconst hostConfig: IHostConfig = {\n modifyHydrateData (data) {\n const nodeName = data[Shortcuts.NodeName]\n if (!isHtmlTags(nodeName)) return\n\n process.env.NODE_ENV !== 'production' && warn(data[Shortcuts.NodeName] === 'select', '请使用 Picker 组件代替 <select>')\n\n // map nodeName\n data[Shortcuts.NodeName] = getMappedType(nodeName, data)\n\n // map attr Key/Value\n const attrMapFn = getAttrMapFn(nodeName)\n if (attrMapFn) {\n for (const key in data) {\n const value = data[key]\n const [mapKey, mapValue] = attrMapFn(key, value, data)\n if (key !== mapKey) {\n delete data[key]\n data[mapKey] = mapValue\n } else if (value !== mapValue) {\n data[key] = mapValue\n }\n }\n }\n\n if (nodeName === 'br') {\n data[Shortcuts.Childnodes] = [{\n [Shortcuts.NodeName]: '#text',\n v: '\\n'\n }]\n }\n\n data[Shortcuts.Class] = ensureHtmlClass(nodeName, data[Shortcuts.Class])\n data[Shortcuts.Style] = ensureRect(data, data[Shortcuts.Style])\n },\n\n modifySetAttrPayload (element, key, payload) {\n const { nodeName, _path, props } = element\n if (!isHtmlTags(nodeName)) return\n\n // map nodeName\n mapNameByContion(nodeName, key, element)\n\n // map attr Key/Value\n const attrMapFn = getAttrMapFn(nodeName)\n if (attrMapFn) {\n const value = payload.value\n const [mapKey, mapValue] = attrMapFn(key, value, props)\n payload.path = `${_path}.${mapKey}`\n payload.value = mapValue\n }\n\n if (key === Shortcuts.Class) {\n payload.value = ensureHtmlClass(nodeName, payload.value as string)\n } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {\n payload.path = `${_path}.${Shortcuts.Style}`\n payload.value = ensureRect(props, element.style.cssText)\n }\n },\n\n modifyRmAttrPayload (element, key, payload) {\n const { nodeName, _path, props } = element\n if (!isHtmlTags(nodeName)) return\n\n // map nodeName\n mapNameByContion(nodeName, key, element)\n\n // map attr Key/Value\n const attrMapFn = getAttrMapFn(nodeName)\n if (attrMapFn) {\n const value = payload[key]\n const [mapKey] = attrMapFn(key, value, props)\n payload.path = `${_path}.${mapKey}`\n }\n\n if (key === Shortcuts.Class) {\n payload.value = ensureHtmlClass(nodeName, payload.value as string)\n } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {\n payload.path = `${_path}.${Shortcuts.Style}`\n payload.value = ensureRect(props, element.style.cssText)\n }\n },\n\n onAddEvent (type, _handler, _options, node) {\n if (!isHtmlTags(node.nodeName)) return\n if (type === 'click') {\n defineMappedProp(node.__handlers, type, 'tap')\n } else if (node.nodeName === 'input') {\n if (type === 'change') {\n if (node.props.type === 'checkbox' || node.props.type === 'radio') {\n defineMappedProp(node.__handlers, type, 'tap')\n } else {\n defineMappedProp(node.__handlers, type, 'input')\n }\n } else if (type === 'keypress') {\n defineMappedProp(node.__handlers, type, 'confirm')\n }\n }\n },\n\n modifyTaroEvent (event, element) {\n const { nodeName, props } = element\n if (nodeName === 'input' && event.type === 'tap') {\n if (props.type === 'checkbox') {\n props.checked = !props.checked\n } else if (props.type === 'radio' && !props.checked) {\n props.checked = true\n }\n if (event.mpEvent) {\n const { currentTarget, target } = event.mpEvent\n currentTarget.checked = props.checked\n if (target.id === currentTarget.id) {\n target.checked = props.checked\n }\n }\n }\n }\n}\n\nmergeReconciler(hostConfig)\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runtime.js","sources":["../src/constant.ts","../src/utils.ts","../src/runtime.ts"],"sourcesContent":["import { isString } from '@tarojs/shared'\n\ninterface SpecialMaps {\n mapName: string | SpecialMaps.MapNameFn\n mapNameCondition?: string[]\n mapAttr?: SpecialMaps.MapAttrFn\n}\n\nexport namespace SpecialMaps {\n export interface MapNameFn {\n (props: Record<string, any>): string\n }\n export interface MapAttrFn {\n (key: string, value: any, props: Record<string, any>): [string, any]\n }\n}\n\nfunction genAttrMapFnFromDir (dir: Record<string, string | [string, Record<string, any>]>): SpecialMaps.MapAttrFn {\n const fn: SpecialMaps.MapAttrFn = function (key, value) {\n const lowerKey = key.toLowerCase()\n if (lowerKey in dir) {\n const res = dir[lowerKey]\n if (isString(res)) {\n key = res\n } else {\n key = res[0]\n value = res[1][value] || value\n }\n }\n return [key, value]\n }\n return fn\n}\n\nexport const inlineElements = new Set<string>([])\nexport const blockElements = new Set<string>([])\nexport const specialElements = new Map<string, string | SpecialMaps>([\n ['slot', 'slot'],\n ['form', 'form'],\n ['iframe', 'web-view'],\n ['img', 'image'],\n ['audio', 'audio'],\n ['video', 'video'],\n ['canvas', 'canvas'],\n ['a', {\n mapName (props) {\n return !props.href || (/^javascript/.test(props.href)) ? 'view' : 'navigator'\n },\n mapNameCondition: ['href'],\n mapAttr: genAttrMapFnFromDir({\n href: 'url',\n target: ['openType', {\n _blank: 'navigate',\n _self: 'redirect'\n }]\n })\n }],\n ['input', {\n mapName (props) {\n if (props.type === 'checkbox') {\n return 'checkbox'\n } else if (props.type === 'radio') {\n return 'radio'\n }\n return 'input'\n },\n mapNameCondition: ['type'],\n mapAttr (key, value, props) {\n const htmlKey = key.toLowerCase()\n if (htmlKey === 'autofocus') {\n key = 'focus'\n } else if (htmlKey === 'readonly') {\n if (props.disabled === true) {\n value = true\n }\n key = 'disabled'\n } else if (htmlKey === 'type') {\n if (value === 'password') {\n key = 'password'\n value = true\n } else if (value === 'tel') {\n value = 'number'\n }\n }\n return [key, value]\n }\n }],\n ['label', {\n mapName: 'label',\n mapAttr: genAttrMapFnFromDir({\n htmlfor: 'for'\n })\n }],\n ['textarea', {\n mapName: 'textarea',\n mapAttr: genAttrMapFnFromDir({\n autofocus: 'focus',\n readonly: 'disabled'\n })\n }],\n ['progress', {\n mapName: 'progress',\n mapAttr (key, value, props) {\n if (key === 'value') {\n const max = props.max || 1\n key = 'percent'\n value = Math.round(value / max * 100)\n }\n return [key, value]\n }\n }],\n ['button', {\n mapName: 'button',\n mapAttr (key, value) {\n if (key === 'type' && (value === 'submit' || value === 'reset')) {\n key = 'formType'\n }\n return [key, value]\n }\n }]\n])\n","import { isFunction, isString, Shortcuts } from '@tarojs/shared'\n\nimport {\n blockElements,\n inlineElements,\n specialElements,\n SpecialMaps\n} from './constant'\n\nexport function isHtmlTags (nodeName: string): boolean {\n if (inlineElements.has(nodeName) || blockElements.has(nodeName) || specialElements.has(nodeName)) {\n return true\n }\n return false\n}\n\nexport function getMappedType (nodeName: string, rawProps: Record<string, any>): string {\n if (inlineElements.has(nodeName)) {\n return 'text'\n } else if (specialElements.has(nodeName)) {\n const mapping = specialElements.get(nodeName)!\n if (isString(mapping)) {\n return mapping\n }\n const { mapName } = mapping\n return isFunction(mapName) ? mapName(rawProps) : mapName\n } else {\n return 'view'\n }\n}\n\nexport function getAttrMapFn (nodeName): SpecialMaps.MapAttrFn | undefined {\n const mapping = specialElements.get(nodeName)\n if (!isString(mapping)) {\n return mapping?.mapAttr\n }\n}\n\nfunction getMapNameByCondition (nodeName: string, attr: string, props: Record<string, any>): string | undefined {\n const mapping = specialElements.get(nodeName)\n if (!mapping || isString(mapping)) return\n\n const { mapName, mapNameCondition } = mapping\n if (!mapNameCondition) return\n\n if (mapNameCondition.indexOf(attr) > -1 && !isString(mapName)) {\n return mapName(props)\n }\n}\n\nexport function mapNameByContion (nodeName: string, key: string, element: any, componentsAlias) {\n const mapName = getMapNameByCondition(nodeName, key, element.props)\n if (mapName) {\n const mapNameAlias = componentsAlias[mapName]._num\n element.enqueueUpdate({\n path: `${element._path}.${Shortcuts.NodeName}`,\n value: mapNameAlias\n })\n }\n}\n\nexport function ensureHtmlClass (tagName: string, className = ''): string {\n const classList = className.split(' ')\n const htmlClass = `h5-${tagName}`\n if (classList.indexOf(htmlClass) === -1) {\n classList.unshift(htmlClass)\n }\n return classList.join(' ')\n}\n\nexport function ensureRect (props: Record<string, any>, style = ''): string {\n let cssText = style\n const { width, height } = props\n if (width) {\n cssText = `width: ${width};${cssText}`\n }\n if (height) {\n cssText = `height: ${height};${cssText}`\n }\n return cssText\n}\n\nexport function defineMappedProp (obj, propName, mapName) {\n Object.defineProperty(obj, propName, {\n enumerable: true,\n configurable: true,\n get () {\n return obj[mapName]\n },\n set (val) {\n obj[mapName] = val\n }\n })\n}\n","import { TaroElement } from '@tarojs/runtime'\nimport { hooks, Shortcuts, warn } from '@tarojs/shared'\n\nimport {\n defineMappedProp,\n ensureHtmlClass,\n ensureRect,\n getAttrMapFn,\n getMappedType,\n isHtmlTags,\n mapNameByContion\n} from './utils'\n\nhooks.tap('modifyHydrateData', data => {\n const nodeName = data[Shortcuts.NodeName]\n if (!isHtmlTags(nodeName)) return\n\n process.env.NODE_ENV !== 'production' && warn(data[Shortcuts.NodeName] === 'select', '请使用 Picker 组件代替 <select>')\n\n // map nodeName\n data[Shortcuts.NodeName] = getMappedType(nodeName, data)\n\n // map attr Key/Value\n const attrMapFn = getAttrMapFn(nodeName)\n if (attrMapFn) {\n for (const key in data) {\n const value = data[key]\n const [mapKey, mapValue] = attrMapFn(key, value, data)\n if (key !== mapKey) {\n delete data[key]\n data[mapKey] = mapValue\n } else if (value !== mapValue) {\n data[key] = mapValue\n }\n }\n }\n\n if (nodeName === 'br') {\n data[Shortcuts.Childnodes] = [{\n [Shortcuts.NodeName]: '#text',\n v: '\\n'\n }]\n }\n\n data[Shortcuts.Class] = ensureHtmlClass(nodeName, data[Shortcuts.Class])\n data[Shortcuts.Style] = ensureRect(data, data[Shortcuts.Style])\n})\n\nhooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {\n const { nodeName, _path, props } = element\n if (!isHtmlTags(nodeName)) return\n\n // map nodeName\n mapNameByContion(nodeName, key, element, componentsAlias)\n\n const mapName = getMappedType(nodeName, props)\n const alias = componentsAlias[mapName]\n\n // map attr Key/Value\n const attrMapFn = getAttrMapFn(nodeName)\n if (attrMapFn) {\n const value = payload.value\n const [mapKey, mapValue] = attrMapFn(key, value, props)\n payload.path = `${_path}.${alias[mapKey] || mapKey}`\n payload.value = mapValue\n }\n\n if (key === Shortcuts.Class) {\n payload.value = ensureHtmlClass(nodeName, payload.value as string)\n } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {\n payload.path = `${_path}.${Shortcuts.Style}`\n payload.value = ensureRect(props, element.style.cssText)\n }\n})\n\nhooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {\n const { nodeName, _path, props } = element\n if (!isHtmlTags(nodeName)) return\n\n // map nodeName\n mapNameByContion(nodeName, key, element, componentsAlias)\n\n const mapName = getMappedType(nodeName, props)\n const alias = componentsAlias[mapName]\n\n // map attr Key/Value\n const attrMapFn = getAttrMapFn(nodeName)\n if (attrMapFn) {\n const value = payload[key]\n const [mapKey] = attrMapFn(key, value, props)\n payload.path = `${_path}.${alias[mapKey] || mapKey}`\n }\n\n if (key === Shortcuts.Class) {\n payload.value = ensureHtmlClass(nodeName, payload.value as string)\n } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {\n payload.path = `${_path}.${Shortcuts.Style}`\n payload.value = ensureRect(props, element.style.cssText)\n }\n})\n\nhooks.tap('onAddEvent', (type, _handler, _options, node) => {\n node = node as TaroElement\n if (!isHtmlTags(node.nodeName)) return\n if (type === 'click') {\n defineMappedProp(node.__handlers, type, 'tap')\n } else if (node.nodeName === 'input') {\n if (type === 'change') {\n if (node.props.type === 'checkbox' || node.props.type === 'radio') {\n defineMappedProp(node.__handlers, type, 'tap')\n } else {\n defineMappedProp(node.__handlers, type, 'input')\n }\n } else if (type === 'keypress') {\n defineMappedProp(node.__handlers, type, 'confirm')\n }\n }\n})\n\nhooks.tap('modifyTaroEvent', (event, element) => {\n const { nodeName, props } = element\n if (nodeName === 'input' && event.type === 'tap') {\n if (props.type === 'checkbox') {\n props.checked = !props.checked\n } else if (props.type === 'radio' && !props.checked) {\n props.checked = true\n }\n if (event.mpEvent) {\n const { currentTarget, target } = event.mpEvent\n currentTarget.checked = props.checked\n if (target.id === currentTarget.id) {\n target.checked = props.checked\n }\n }\n }\n})\n"],"names":[],"mappings":"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"}
package/index.js CHANGED
@@ -1,2 +1,3 @@
1
1
  module.exports = require('./dist/index.js').default
2
+
2
3
  module.exports.default = module.exports
package/package.json CHANGED
@@ -1,14 +1,8 @@
1
1
  {
2
2
  "name": "@tarojs/plugin-html",
3
- "version": "3.5.0-canary.1",
3
+ "version": "3.5.0",
4
4
  "description": "Taro 小程序端支持使用 HTML 标签的插件",
5
5
  "main": "index.js",
6
- "scripts": {
7
- "dev": "rollup -c -w",
8
- "build": "rollup -c",
9
- "test": "jest",
10
- "test:dev": "jest --watch"
11
- },
12
6
  "files": [
13
7
  "src",
14
8
  "dist",
@@ -28,10 +22,15 @@
28
22
  "url": "https://github.com/NervJS/taro/issues"
29
23
  },
30
24
  "homepage": "https://github.com/NervJS/taro#readme",
31
- "devDependencies": {
32
- "@tarojs/runtime": "3.5.0-canary.1",
33
- "@tarojs/service": "3.5.0-canary.1",
34
- "@tarojs/shared": "3.5.0-canary.1"
25
+ "dependencies": {
26
+ "@tarojs/runtime": "3.5.0",
27
+ "@tarojs/service": "3.5.0",
28
+ "@tarojs/shared": "3.5.0"
35
29
  },
36
- "gitHead": "c61624d2f763e6d31e67d6cf9c564efc8b0d0887"
37
- }
30
+ "scripts": {
31
+ "dev": "rollup -c -w",
32
+ "build": "rollup -c",
33
+ "test": "jest",
34
+ "test:dev": "jest --watch"
35
+ }
36
+ }
package/src/index.ts CHANGED
@@ -1,11 +1,11 @@
1
1
 
2
- import type { IPluginContext, TaroPlatformBase } from '@tarojs/service'
3
- import { isArray, isString } from '@tarojs/shared'
4
- import * as path from 'path'
2
+ import generator from '@babel/generator'
5
3
  import * as parser from '@babel/parser'
6
4
  import traverse from '@babel/traverse'
7
5
  import * as t from '@babel/types'
8
- import generator from '@babel/generator'
6
+ import type { IPluginContext, TaroPlatformBase } from '@tarojs/service'
7
+ import { isArray, isString } from '@tarojs/shared'
8
+ import * as path from 'path'
9
9
 
10
10
  interface IOptions {
11
11
  pxtransformBlackList?: any[]
@@ -23,7 +23,7 @@ interface OnParseCreateElementArgs {
23
23
  }
24
24
 
25
25
  interface ModifyComponentConfigArgs {
26
- componentConfig: IComponentConfig,
26
+ componentConfig: IComponentConfig
27
27
  config: Record<string, any>
28
28
  }
29
29
 
@@ -104,7 +104,7 @@ function modifyPostcssConfigs (config: Record<string, any>, options: IOptions, i
104
104
  const postcssConfig = config.postcss
105
105
 
106
106
  if (!isH5) {
107
- postcssConfig.htmltransform = {
107
+ postcssConfig.htmltransform ||= {
108
108
  enable: true
109
109
  }
110
110
  }
package/src/runtime.ts CHANGED
@@ -1,141 +1,136 @@
1
- import { mergeReconciler, Shortcuts, warn } from '@tarojs/shared'
1
+ import { TaroElement } from '@tarojs/runtime'
2
+ import { hooks, Shortcuts, warn } from '@tarojs/shared'
3
+
2
4
  import {
3
- isHtmlTags,
4
- getMappedType,
5
- getAttrMapFn,
5
+ defineMappedProp,
6
6
  ensureHtmlClass,
7
7
  ensureRect,
8
- mapNameByContion,
9
- defineMappedProp
8
+ getAttrMapFn,
9
+ getMappedType,
10
+ isHtmlTags,
11
+ mapNameByContion
10
12
  } from './utils'
11
13
 
12
- import type { ModifyHydrateData, ModifyRmAttrPayload, ModifySetAttrPayload, ModifyTaroEvent, OnAddEvent, TaroElement } from '@tarojs/runtime'
13
-
14
- interface IHostConfig {
15
- modifyHydrateData: ModifyHydrateData
16
- modifySetAttrPayload: ModifySetAttrPayload
17
- modifyRmAttrPayload: ModifyRmAttrPayload
18
- onAddEvent: OnAddEvent<TaroElement>
19
- modifyTaroEvent: ModifyTaroEvent
20
- }
21
-
22
- const hostConfig: IHostConfig = {
23
- modifyHydrateData (data) {
24
- const nodeName = data[Shortcuts.NodeName]
25
- if (!isHtmlTags(nodeName)) return
26
-
27
- process.env.NODE_ENV !== 'production' && warn(data[Shortcuts.NodeName] === 'select', '请使用 Picker 组件代替 <select>')
28
-
29
- // map nodeName
30
- data[Shortcuts.NodeName] = getMappedType(nodeName, data)
31
-
32
- // map attr Key/Value
33
- const attrMapFn = getAttrMapFn(nodeName)
34
- if (attrMapFn) {
35
- for (const key in data) {
36
- const value = data[key]
37
- const [mapKey, mapValue] = attrMapFn(key, value, data)
38
- if (key !== mapKey) {
39
- delete data[key]
40
- data[mapKey] = mapValue
41
- } else if (value !== mapValue) {
42
- data[key] = mapValue
43
- }
14
+ hooks.tap('modifyHydrateData', data => {
15
+ const nodeName = data[Shortcuts.NodeName]
16
+ if (!isHtmlTags(nodeName)) return
17
+
18
+ process.env.NODE_ENV !== 'production' && warn(data[Shortcuts.NodeName] === 'select', '请使用 Picker 组件代替 <select>')
19
+
20
+ // map nodeName
21
+ data[Shortcuts.NodeName] = getMappedType(nodeName, data)
22
+
23
+ // map attr Key/Value
24
+ const attrMapFn = getAttrMapFn(nodeName)
25
+ if (attrMapFn) {
26
+ for (const key in data) {
27
+ const value = data[key]
28
+ const [mapKey, mapValue] = attrMapFn(key, value, data)
29
+ if (key !== mapKey) {
30
+ delete data[key]
31
+ data[mapKey] = mapValue
32
+ } else if (value !== mapValue) {
33
+ data[key] = mapValue
44
34
  }
45
35
  }
36
+ }
46
37
 
47
- if (nodeName === 'br') {
48
- data[Shortcuts.Childnodes] = [{
49
- [Shortcuts.NodeName]: '#text',
50
- v: '\n'
51
- }]
52
- }
38
+ if (nodeName === 'br') {
39
+ data[Shortcuts.Childnodes] = [{
40
+ [Shortcuts.NodeName]: '#text',
41
+ v: '\n'
42
+ }]
43
+ }
53
44
 
54
- data[Shortcuts.Class] = ensureHtmlClass(nodeName, data[Shortcuts.Class])
55
- data[Shortcuts.Style] = ensureRect(data, data[Shortcuts.Style])
56
- },
45
+ data[Shortcuts.Class] = ensureHtmlClass(nodeName, data[Shortcuts.Class])
46
+ data[Shortcuts.Style] = ensureRect(data, data[Shortcuts.Style])
47
+ })
57
48
 
58
- modifySetAttrPayload (element, key, payload) {
59
- const { nodeName, _path, props } = element
60
- if (!isHtmlTags(nodeName)) return
49
+ hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {
50
+ const { nodeName, _path, props } = element
51
+ if (!isHtmlTags(nodeName)) return
61
52
 
62
- // map nodeName
63
- mapNameByContion(nodeName, key, element)
53
+ // map nodeName
54
+ mapNameByContion(nodeName, key, element, componentsAlias)
64
55
 
65
- // map attr Key/Value
66
- const attrMapFn = getAttrMapFn(nodeName)
67
- if (attrMapFn) {
68
- const value = payload.value
69
- const [mapKey, mapValue] = attrMapFn(key, value, props)
70
- payload.path = `${_path}.${mapKey}`
71
- payload.value = mapValue
72
- }
56
+ const mapName = getMappedType(nodeName, props)
57
+ const alias = componentsAlias[mapName]
73
58
 
74
- if (key === Shortcuts.Class) {
75
- payload.value = ensureHtmlClass(nodeName, payload.value as string)
76
- } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {
77
- payload.path = `${_path}.${Shortcuts.Style}`
78
- payload.value = ensureRect(props, element.style.cssText)
79
- }
80
- },
59
+ // map attr Key/Value
60
+ const attrMapFn = getAttrMapFn(nodeName)
61
+ if (attrMapFn) {
62
+ const value = payload.value
63
+ const [mapKey, mapValue] = attrMapFn(key, value, props)
64
+ payload.path = `${_path}.${alias[mapKey] || mapKey}`
65
+ payload.value = mapValue
66
+ }
81
67
 
82
- modifyRmAttrPayload (element, key, payload) {
83
- const { nodeName, _path, props } = element
84
- if (!isHtmlTags(nodeName)) return
68
+ if (key === Shortcuts.Class) {
69
+ payload.value = ensureHtmlClass(nodeName, payload.value as string)
70
+ } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {
71
+ payload.path = `${_path}.${Shortcuts.Style}`
72
+ payload.value = ensureRect(props, element.style.cssText)
73
+ }
74
+ })
85
75
 
86
- // map nodeName
87
- mapNameByContion(nodeName, key, element)
76
+ hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {
77
+ const { nodeName, _path, props } = element
78
+ if (!isHtmlTags(nodeName)) return
88
79
 
89
- // map attr Key/Value
90
- const attrMapFn = getAttrMapFn(nodeName)
91
- if (attrMapFn) {
92
- const value = payload[key]
93
- const [mapKey] = attrMapFn(key, value, props)
94
- payload.path = `${_path}.${mapKey}`
95
- }
80
+ // map nodeName
81
+ mapNameByContion(nodeName, key, element, componentsAlias)
96
82
 
97
- if (key === Shortcuts.Class) {
98
- payload.value = ensureHtmlClass(nodeName, payload.value as string)
99
- } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {
100
- payload.path = `${_path}.${Shortcuts.Style}`
101
- payload.value = ensureRect(props, element.style.cssText)
102
- }
103
- },
104
-
105
- onAddEvent (type, _handler, _options, node) {
106
- if (!isHtmlTags(node.nodeName)) return
107
- if (type === 'click') {
108
- defineMappedProp(node.__handlers, type, 'tap')
109
- } else if (node.nodeName === 'input') {
110
- if (type === 'change') {
111
- if (node.props.type === 'checkbox' || node.props.type === 'radio') {
112
- defineMappedProp(node.__handlers, type, 'tap')
113
- } else {
114
- defineMappedProp(node.__handlers, type, 'input')
115
- }
116
- } else if (type === 'keypress') {
117
- defineMappedProp(node.__handlers, type, 'confirm')
83
+ const mapName = getMappedType(nodeName, props)
84
+ const alias = componentsAlias[mapName]
85
+
86
+ // map attr Key/Value
87
+ const attrMapFn = getAttrMapFn(nodeName)
88
+ if (attrMapFn) {
89
+ const value = payload[key]
90
+ const [mapKey] = attrMapFn(key, value, props)
91
+ payload.path = `${_path}.${alias[mapKey] || mapKey}`
92
+ }
93
+
94
+ if (key === Shortcuts.Class) {
95
+ payload.value = ensureHtmlClass(nodeName, payload.value as string)
96
+ } else if (key === Shortcuts.Style || key === 'width' || key === 'height') {
97
+ payload.path = `${_path}.${Shortcuts.Style}`
98
+ payload.value = ensureRect(props, element.style.cssText)
99
+ }
100
+ })
101
+
102
+ hooks.tap('onAddEvent', (type, _handler, _options, node) => {
103
+ node = node as TaroElement
104
+ if (!isHtmlTags(node.nodeName)) return
105
+ if (type === 'click') {
106
+ defineMappedProp(node.__handlers, type, 'tap')
107
+ } else if (node.nodeName === 'input') {
108
+ if (type === 'change') {
109
+ if (node.props.type === 'checkbox' || node.props.type === 'radio') {
110
+ defineMappedProp(node.__handlers, type, 'tap')
111
+ } else {
112
+ defineMappedProp(node.__handlers, type, 'input')
118
113
  }
114
+ } else if (type === 'keypress') {
115
+ defineMappedProp(node.__handlers, type, 'confirm')
119
116
  }
120
- },
121
-
122
- modifyTaroEvent (event, element) {
123
- const { nodeName, props } = element
124
- if (nodeName === 'input' && event.type === 'tap') {
125
- if (props.type === 'checkbox') {
126
- props.checked = !props.checked
127
- } else if (props.type === 'radio' && !props.checked) {
128
- props.checked = true
129
- }
130
- if (event.mpEvent) {
131
- const { currentTarget, target } = event.mpEvent
132
- currentTarget.checked = props.checked
133
- if (target.id === currentTarget.id) {
134
- target.checked = props.checked
135
- }
117
+ }
118
+ })
119
+
120
+ hooks.tap('modifyTaroEvent', (event, element) => {
121
+ const { nodeName, props } = element
122
+ if (nodeName === 'input' && event.type === 'tap') {
123
+ if (props.type === 'checkbox') {
124
+ props.checked = !props.checked
125
+ } else if (props.type === 'radio' && !props.checked) {
126
+ props.checked = true
127
+ }
128
+ if (event.mpEvent) {
129
+ const { currentTarget, target } = event.mpEvent
130
+ currentTarget.checked = props.checked
131
+ if (target.id === currentTarget.id) {
132
+ target.checked = props.checked
136
133
  }
137
134
  }
138
135
  }
139
- }
140
-
141
- mergeReconciler(hostConfig)
136
+ })
package/src/utils.ts CHANGED
@@ -1,7 +1,8 @@
1
1
  import { isFunction, isString, Shortcuts } from '@tarojs/shared'
2
+
2
3
  import {
3
- inlineElements,
4
4
  blockElements,
5
+ inlineElements,
5
6
  specialElements,
6
7
  SpecialMaps
7
8
  } from './constant'
@@ -47,12 +48,13 @@ function getMapNameByCondition (nodeName: string, attr: string, props: Record<st
47
48
  }
48
49
  }
49
50
 
50
- export function mapNameByContion (nodeName: string, key: string, element: any) {
51
+ export function mapNameByContion (nodeName: string, key: string, element: any, componentsAlias) {
51
52
  const mapName = getMapNameByCondition(nodeName, key, element.props)
52
53
  if (mapName) {
54
+ const mapNameAlias = componentsAlias[mapName]._num
53
55
  element.enqueueUpdate({
54
56
  path: `${element._path}.${Shortcuts.NodeName}`,
55
- value: mapName
57
+ value: mapNameAlias
56
58
  })
57
59
  }
58
60
  }
@@ -61,7 +63,7 @@ export function ensureHtmlClass (tagName: string, className = ''): string {
61
63
  const classList = className.split(' ')
62
64
  const htmlClass = `h5-${tagName}`
63
65
  if (classList.indexOf(htmlClass) === -1) {
64
- classList.push(htmlClass)
66
+ classList.unshift(htmlClass)
65
67
  }
66
68
  return classList.join(' ')
67
69
  }