@tarojs/plugin-platform-harmony-ets 4.0.0-canary.9 → 4.0.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 (135) hide show
  1. package/dist/apis/base/system.ts +73 -20
  2. package/dist/apis/canvas/index.ts +10 -1
  3. package/dist/apis/device/clipboard.ts +23 -8
  4. package/dist/apis/framework/index.ts +1 -5
  5. package/dist/apis/index.ts +27 -17
  6. package/dist/apis/media/image/index.ts +169 -17
  7. package/dist/apis/network/request.ts +5 -5
  8. package/dist/apis/route/index.ts +15 -0
  9. package/dist/apis/storage/index.ts +146 -78
  10. package/dist/apis/ui/animation/animation.ts +71 -29
  11. package/dist/apis/ui/background.ts +2 -1
  12. package/dist/apis/ui/interaction/index.ts +58 -59
  13. package/dist/apis/ui/navigation-bar/index.ts +1 -1
  14. package/dist/apis/ui/pull-down-refresh.ts +9 -3
  15. package/dist/apis/ui/scroll/index.ts +5 -5
  16. package/dist/apis/ui/tab-bar.ts +3 -3
  17. package/dist/apis/utils/index.ts +21 -2
  18. package/dist/apis/utils/permissions.ts +6 -0
  19. package/dist/apis/wxml/IntersectionObserver.ts +18 -10
  20. package/dist/apis/wxml/index.ts +2 -0
  21. package/dist/apis/wxml/selectorQuery.ts +26 -13
  22. package/dist/components-harmony-ets/button.ets +64 -34
  23. package/dist/components-harmony-ets/canvas.ets +51 -0
  24. package/dist/components-harmony-ets/checkbox.ets +73 -62
  25. package/dist/components-harmony-ets/form.ets +51 -29
  26. package/dist/components-harmony-ets/icon.ets +31 -19
  27. package/dist/components-harmony-ets/image.ets +34 -14
  28. package/dist/components-harmony-ets/index.ets +92 -0
  29. package/dist/components-harmony-ets/innerHtml.ets +11 -6
  30. package/dist/components-harmony-ets/input.ets +63 -41
  31. package/dist/components-harmony-ets/label.ets +71 -44
  32. package/dist/components-harmony-ets/listView.ets +31 -0
  33. package/dist/components-harmony-ets/movableArea.ets +126 -0
  34. package/dist/components-harmony-ets/movableView.ets +93 -0
  35. package/dist/components-harmony-ets/navigationBar.ets +65 -0
  36. package/dist/components-harmony-ets/pageMeta.ets +94 -0
  37. package/dist/components-harmony-ets/picker.ets +43 -39
  38. package/dist/components-harmony-ets/progress.ets +52 -0
  39. package/dist/components-harmony-ets/pseudo.ets +80 -0
  40. package/dist/components-harmony-ets/radio.ets +78 -68
  41. package/dist/components-harmony-ets/richText.ets +14 -30
  42. package/dist/components-harmony-ets/scrollList.ets +108 -0
  43. package/dist/components-harmony-ets/scrollView.ets +69 -30
  44. package/dist/components-harmony-ets/slider.ets +19 -15
  45. package/dist/components-harmony-ets/stickySection.ets +42 -0
  46. package/dist/components-harmony-ets/style.ets +386 -130
  47. package/dist/components-harmony-ets/swiper.ets +61 -20
  48. package/dist/components-harmony-ets/switch.ets +36 -32
  49. package/dist/components-harmony-ets/{index.ts → tag.ts} +6 -0
  50. package/dist/components-harmony-ets/text.ets +112 -50
  51. package/dist/components-harmony-ets/textArea.ets +50 -35
  52. package/dist/components-harmony-ets/utils/AttributeManager.ets +2 -2
  53. package/dist/components-harmony-ets/utils/DynamicCenter.ts +2 -2
  54. package/dist/components-harmony-ets/utils/flexManager.ets +50 -19
  55. package/dist/components-harmony-ets/utils/helper.ets +20 -8
  56. package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts +1 -2
  57. package/dist/components-harmony-ets/utils/htmlParser/index.ts +1 -1
  58. package/dist/components-harmony-ets/utils/index.ts +54 -50
  59. package/dist/components-harmony-ets/utils/styles.ets +172 -92
  60. package/dist/components-harmony-ets/video.ets +34 -21
  61. package/dist/components-harmony-ets/view.ets +62 -29
  62. package/dist/components-harmony-ets/webView.ets +40 -34
  63. package/dist/index.d.ts +152 -0
  64. package/dist/index.js +102 -56
  65. package/dist/index.js.map +1 -1
  66. package/dist/runtime-ets/bom/document.ts +6 -4
  67. package/dist/runtime-ets/bom/getComputedStyle.ts +2 -2
  68. package/dist/runtime-ets/bom/window.ts +7 -0
  69. package/dist/runtime-ets/current.ts +5 -1
  70. package/dist/runtime-ets/dom/bind.ts +28 -12
  71. package/dist/runtime-ets/dom/class-list.ts +2 -2
  72. package/dist/runtime-ets/dom/cssNesting.ts +419 -0
  73. package/dist/runtime-ets/dom/cssStyleDeclaration.ts +28 -42
  74. package/dist/runtime-ets/dom/document.ts +22 -8
  75. package/dist/runtime-ets/dom/element/canvas.ts +136 -0
  76. package/dist/runtime-ets/dom/element/element.ts +376 -57
  77. package/dist/runtime-ets/dom/element/form.ts +31 -26
  78. package/dist/runtime-ets/dom/element/index.ts +30 -2
  79. package/dist/runtime-ets/dom/element/movableArea.ts +11 -0
  80. package/dist/runtime-ets/dom/element/movableView.ts +248 -0
  81. package/dist/runtime-ets/dom/element/normal.ts +35 -8
  82. package/dist/runtime-ets/dom/element/progress.ts +11 -0
  83. package/dist/runtime-ets/dom/element/scrollView.ts +1 -0
  84. package/dist/runtime-ets/dom/element/text.ts +1 -8
  85. package/dist/runtime-ets/dom/element/video.ts +5 -4
  86. package/dist/runtime-ets/dom/element/webView.ts +12 -5
  87. package/dist/runtime-ets/dom/event.ts +3 -5
  88. package/dist/runtime-ets/dom/eventTarget.ts +2 -3
  89. package/dist/runtime-ets/dom/node.ts +65 -32
  90. package/dist/runtime-ets/dom/stylesheet/covertWeb2Hm.ts +418 -237
  91. package/dist/runtime-ets/dom/stylesheet/index.ts +29 -311
  92. package/dist/runtime-ets/dom/stylesheet/type.ts +53 -11
  93. package/dist/runtime-ets/dom/stylesheet/util.ts +33 -27
  94. package/dist/runtime-ets/index.ts +2 -2
  95. package/dist/runtime-ets/interface/event.ts +1 -1
  96. package/dist/runtime-ets/utils/index.ts +74 -13
  97. package/dist/runtime-ets/utils/info.ts +2 -2
  98. package/dist/runtime-framework/react/app.ts +15 -10
  99. package/dist/runtime-framework/react/hooks.ts +0 -1
  100. package/dist/runtime-framework/react/index.ts +0 -2
  101. package/dist/runtime-framework/react/native-page.ts +217 -80
  102. package/dist/runtime-framework/react/page.ts +4 -9
  103. package/dist/runtime-framework/react/utils/index.ts +3 -3
  104. package/dist/runtime-framework/solid/app.ts +30 -46
  105. package/dist/runtime-framework/solid/connect.ts +21 -3
  106. package/dist/runtime-framework/solid/hooks.ts +16 -11
  107. package/dist/runtime-framework/solid/index.ts +6 -2
  108. package/dist/runtime-framework/solid/page.ts +85 -31
  109. package/dist/runtime-framework/solid/reconciler/props.ts +70 -25
  110. package/dist/runtime-framework/solid/reconciler/render.ts +16 -6
  111. package/dist/runtime-framework/solid/reconciler/use.ts +0 -1
  112. package/dist/runtime-framework/solid/utils/index.ts +3 -5
  113. package/dist/runtime-utils.d.ts +827 -0
  114. package/dist/runtime-utils.js +618 -245
  115. package/dist/runtime-utils.js.map +1 -1
  116. package/dist/runtime.d.ts +1 -0
  117. package/dist/runtime.js +618 -245
  118. package/dist/runtime.js.map +1 -1
  119. package/index.js +3 -1
  120. package/package.json +14 -15
  121. package/static/media/cancel.svg +1 -1
  122. package/static/media/circle.svg +1 -1
  123. package/static/media/clear.svg +1 -1
  124. package/static/media/download.svg +1 -1
  125. package/static/media/info.svg +1 -1
  126. package/static/media/info_circle.svg +1 -1
  127. package/static/media/search.svg +1 -1
  128. package/static/media/success.svg +1 -1
  129. package/static/media/success_no_circle.svg +1 -1
  130. package/static/media/warn.svg +1 -1
  131. package/types/harmony.d.ts +5 -0
  132. package/types/index.d.ts +4 -0
  133. package/types/runtime.d.ts +1 -1
  134. package/dist/runtime-ets/utils/bind.ts +0 -24
  135. /package/dist/runtime-framework/solid/{contant.ts → constant.ts} +0 -0
@@ -1,5 +1,8 @@
1
1
  import { convertNumber2VP } from '@tarojs/runtime'
2
- import { isNumber } from '@tarojs/shared'
2
+ import { isNumber, isUndefined } from '@tarojs/shared'
3
+
4
+ import type { RichTextProps } from '@tarojs/components/types/RichText'
5
+ import type { TaroRichTextElement } from '@tarojs/runtime'
3
6
 
4
7
  export function getSingleSelector(range, rangeKey): any[] {
5
8
  return range.map((data) => data[rangeKey])
@@ -18,66 +21,67 @@ export function getMultiSelector(ctx, range, rangeKey, value) {
18
21
  }))
19
22
  }
20
23
 
21
- export function getUnit (val) {
22
- if (/\d+(vp)$/.test(val)) {
24
+ export function getUnit (val: string | number): string {
25
+ if (isNumber(val) || /\d+px$/.test(val)) {
26
+ return convertNumber2VP(parseFloat(val as string))
27
+ } else if (/\d+(vp)$/.test(val)) {
23
28
  return val
24
- } else if (isNumber(val) || /\d+px$/.test(val)) {
25
- return convertNumber2VP(parseFloat(val))
26
29
  }
27
30
  return val
28
31
  }
29
32
 
30
- function handleNodeStyleData (dataValue: string, handler: (values: string[]) => { [key: string]: string } | void) {
31
- let res: any = {}
32
- if (dataValue) {
33
- const values = dataValue.trim().split(/\s+/)
34
- const data = handler(values)
35
-
36
- if (!data) return res
37
-
38
- res = data
33
+ export function generateText (node: TaroRichTextElement): string {
34
+ return parseHtmlNode(node._attrs.nodes || '')
35
+ }
39
36
 
40
- Object.keys(res).forEach(key => {
41
- const exec = `${res[key]}`.match(/(\d+)(px)$/)
42
- if (exec && values.length > 1) {
43
- res[key] = getUnit(+exec[1])
44
- }
45
- })
37
+ // 将nodeTree转换成harmony需要的string结构
38
+ function nodeToHtml(node: RichTextProps.Text | RichTextProps.HTMLElement): string {
39
+ if (node.type === 'text') {
40
+ return node.text
41
+ }
42
+ if (node.attrs) {
43
+ const attributes = Object.entries(node.attrs)
44
+ .map((item: [string, string]) => `${item[0]}="${item[1]}"`)
45
+ .join(' ')
46
+ const childrenHtml: string = typeof node.children === 'string' ? node.children : (node.children || []).map((child: RichTextProps.Text | RichTextProps.HTMLElement) => nodeToHtml(child)).join('')
47
+ return `<${node.name}${attributes ? ' ' + attributes : ''}>${childrenHtml}</${node.name}>`
46
48
  }
49
+ return ''
50
+ }
47
51
 
48
- return res
52
+ function parseHtmlNode (nodes: Array<RichTextProps.Text | RichTextProps.HTMLElement> | string) {
53
+ return typeof nodes === 'string' ? nodes : `<div>${nodes.map(node => nodeToHtml(node)).join('')}</div>`
49
54
  }
50
55
 
51
- export function getNodeBorderRadiusData (dataValue: string) {
52
- return handleNodeStyleData(dataValue, values => {
53
- switch (values.length) {
54
- case 1:
55
- return { topLeft: values[0], topRight: values[0], bottomRight: values[0], bottomLeft: values[0] }
56
- case 2:
57
- return { topLeft: values[0], topRight: values[1], bottomRight: values[0], bottomLeft: values[1] }
58
- case 3:
59
- return { topLeft: values[0], topRight: values[1], bottomRight: values[2], bottomLeft: values[1] }
60
- case 4:
61
- return { topLeft: values[0], topRight: values[1], bottomRight: values[2], bottomLeft: values[3] }
62
- default:
63
- break
56
+ // 背景偏移算法:https://developer.mozilla.org/zh-CN/docs/Web/CSS/background-position
57
+ export function computeBackgroundPosition(style) {
58
+ let offsetX = style.backgroundPosition?.x || 0
59
+ let offsetY = style.backgroundPosition?.y || 0
60
+ if (style.backgroundSize && typeof style.backgroundSize !== 'number') {
61
+ if (!isUndefined(style.backgroundSize.width) && style.width) {
62
+ if (typeof style.backgroundPosition.x === 'string' && style.backgroundPosition.x.indexOf('%') > 0) {
63
+ // (container width - image width) * (position x%) = (x offset value)
64
+ const width = parseFloat(style.width)
65
+ const bgWidth = parseFloat(style.backgroundSize.width)
66
+ const bgOffsetX = parseFloat(style.backgroundPosition.x)
67
+ offsetX = Number((width - bgWidth) * (bgOffsetX) / 100) || 0
68
+ }
69
+ }
70
+ if (!isUndefined(style.backgroundSize.height) && style.height) {
71
+ if (typeof style.backgroundPosition.y === 'string' && style.backgroundPosition.y.indexOf('%') > 0) {
72
+ // (container height - image height) * (position y%) = (y offset value)
73
+ const height = parseFloat(style.height)
74
+ const bgHeight = parseFloat(style.backgroundSize.height)
75
+ const bgOffsetY = parseFloat(style.backgroundPosition.y)
76
+ offsetY = Number((height - bgHeight) * (bgOffsetY) / 100) || 0
77
+ }
64
78
  }
65
- })
79
+ }
80
+
81
+ return { offsetX, offsetY }
66
82
  }
67
83
 
68
- export function getNodeMarginOrPaddingData (dataValue: string) {
69
- return handleNodeStyleData(dataValue, values => {
70
- switch (values.length) {
71
- case 1:
72
- return { top: values[0], right: values[0], bottom: values[0], left: values[0] }
73
- case 2:
74
- return { top: values[0], right: values[1], bottom: values[0], left: values[1] }
75
- case 3:
76
- return { top: values[0], right: values[1], bottom: values[2], left: values[1] }
77
- case 4:
78
- return { top: values[0], right: values[1], bottom: values[2], left: values[3] }
79
- default:
80
- break
81
- }
82
- })
84
+ export function convertVp2Px(val: string | number) {
85
+ const vp = parseFloat(`${val}`)
86
+ return vp2px(vp)
83
87
  }
@@ -1,125 +1,205 @@
1
1
  import { isUndefined } from '@tarojs/shared'
2
2
  import { ObjectAssign } from '@tarojs/runtime'
3
3
 
4
- import { FlexManager } from './FlexManager'
5
- import { TEXT_DEFAULT_STYLE } from './constant/style'
4
+ import { FlexManager } from './flexManager'
6
5
 
7
6
  import type { StandardProps, TextProps } from '@tarojs/components/types'
8
- import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyType, HarmonyStyle } from '@tarojs/runtime'
7
+ import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime'
9
8
 
10
9
  export function getFontAttributes (node: TaroElement): TaroTextStyleType {
11
- const hmStyle = node.hmStyle
10
+ let hmStyle = getNormalAttributes(node)
12
11
  const attrs: TextProps = node._attrs || {}
13
12
 
13
+ if (!hmStyle) return {}
14
+
15
+ let lineHeight = hmStyle.lineHeight
16
+ if (!isUndefined(hmStyle.verticalAlign)) {
17
+ lineHeight = 0
18
+ }
19
+
20
+ let WebkitLineClamp = attrs.maxLines || hmStyle.WebkitLineClamp || Infinity
21
+ if (hmStyle.textOverflow && !isUndefined(hmStyle.textOverflow.overflow)) {
22
+ switch (hmStyle.textOverflow.overflow) {
23
+ case TextOverflow.Clip:
24
+ case TextOverflow.Ellipsis:
25
+ case TextOverflow.None: WebkitLineClamp = WebkitLineClamp || 1; break
26
+ default: break
27
+ }
28
+ }
29
+
30
+ const isFlexText = hmStyle.display === 'flex'
31
+ let textAlign = hmStyle.textAlign
32
+ let verticalAlign = hmStyle.verticalAlign
33
+
34
+ // 按照 w3c 规范,一旦设置了 display: flex,textAlign 和 verticalAlign 都会直接失效
35
+ // 需要使用 justifyContent 和 alignItems
36
+ if (isFlexText) {
37
+ switch (hmStyle.justifyContent) {
38
+ case FlexAlign.Start:
39
+ textAlign = TextAlign.Start
40
+ break
41
+ case FlexAlign.Center:
42
+ textAlign = TextAlign.Center
43
+ break
44
+ case FlexAlign.End:
45
+ textAlign = TextAlign.End
46
+ break
47
+ case FlexAlign.SpaceBetween:
48
+ case FlexAlign.SpaceAround:
49
+ textAlign = TextAlign.JUSTIFY
50
+ break
51
+ default:
52
+ textAlign = TextAlign.Start
53
+ break
54
+ }
55
+ switch (hmStyle.alignItems) {
56
+ case ItemAlign.Start:
57
+ verticalAlign = Alignment.Top
58
+ break
59
+ case ItemAlign.Center:
60
+ verticalAlign = Alignment.Center
61
+ break
62
+ case ItemAlign.End:
63
+ verticalAlign = Alignment.End
64
+ break
65
+ default:
66
+ verticalAlign = Alignment.Top
67
+ break
68
+ }
69
+ }
70
+
14
71
  const attributes: TaroAny = {
15
- WebkitLineClamp: attrs.maxLines || hmStyle.WebkitLineClamp || Infinity,
72
+ textAlign,
73
+ verticalAlign,
74
+ WebkitLineClamp: WebkitLineClamp,
16
75
  // 已做处理的属性
17
76
  letterSpacing: hmStyle.letterSpacing,
18
- textAlign: hmStyle.textAlign,
19
- textOverflow: hmStyle.textOverflow
77
+ textOverflow: hmStyle.textOverflow,
78
+ lineHeight: lineHeight
20
79
  }
21
80
 
22
81
  return attributes
23
82
  }
24
83
 
25
84
  // 模拟 div 自动撑满父元素的情况
26
- function isMaxWidthView (node: TaroElement) {
85
+ export function isMaxWidthView (node: TaroElement) {
27
86
  const parentNode: TaroElement = node.parentNode as TaroElement
28
-
29
- return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' &&
30
- !(FlexManager.isFlexNode(parentNode) && FlexManager.flexOptions(parentNode).direction !== FlexDirection.Column)
87
+
88
+ return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' && !FlexManager.isFlexNode(parentNode)
31
89
  }
32
90
 
33
- export function getNormalAttributes (node: TaroElement): TaroStyleType {
91
+ export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle): HarmonyStyle {
92
+ if (!node) return {}
93
+
34
94
  const hmStyle = node.hmStyle
95
+
96
+ if (!hmStyle) return {}
35
97
 
36
98
  const _nid = node._nid
37
99
  const _attrs: StandardProps = node._attrs || {}
38
100
 
39
- let linearGradient: HarmonyType.LinearGradient | undefined = undefined
40
- // 渐变
41
- if (hmStyle.backgroundImage?.colors) {
42
- linearGradient = hmStyle.backgroundImage
43
- }
101
+ let normalAttributes = hmStyle
102
+
103
+ // 覆盖属性
104
+ normalAttributes.id = _attrs.id || _nid.toString()
44
105
 
45
- let normalAttributes: HarmonyStyle = {
46
- // Flex相关
47
- flexBasis: hmStyle.flexBasis,
48
- flexGrow: hmStyle.flexGrow,
49
- flexShrink: hmStyle.flexShrink,
50
- alignSelf: hmStyle.alignSelf,
51
- // 尺寸相关
52
- width: isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width,
53
- height: hmStyle.height,
54
- minHeight: hmStyle.minHeight,
55
- maxHeight: hmStyle.maxHeight,
56
- minWidth: hmStyle.minWidth,
57
- maxWidth: hmStyle.maxWidth,
58
- marginTop: hmStyle.marginTop,
59
- marginRight: hmStyle.marginRight,
60
- marginBottom: hmStyle.marginBottom,
61
- marginLeft: hmStyle.marginLeft,
62
- paddingTop: hmStyle.paddingTop,
63
- paddingRight: hmStyle.paddingRight,
64
- paddingBottom: hmStyle.paddingBottom,
65
- paddingLeft: hmStyle.paddingLeft,
66
- // 边框相关
67
- borderStyle: hmStyle.borderStyle,
68
- borderTopStyle: hmStyle.borderTopStyle,
69
- borderRightStyle: hmStyle.borderRightStyle,
70
- borderBottomStyle: hmStyle.borderBottomStyle,
71
- borderLeftStyle: hmStyle.borderLeftStyle,
72
- borderWidth: hmStyle.borderWidth,
73
- borderTopWidth: hmStyle.borderTopWidth,
74
- borderRightWidth: hmStyle.borderRightWidth,
75
- borderBottomWidth: hmStyle.borderBottomWidth,
76
- borderLeftWidth: hmStyle.borderLeftWidth,
77
- borderColor: hmStyle.borderColor,
78
- borderTopColor: hmStyle.borderTopColor,
79
- borderRightColor: hmStyle.borderRightColor,
80
- borderBottomColor: hmStyle.borderBottomColor,
81
- borderLeftColor: hmStyle.borderLeftColor,
82
- borderRadius: hmStyle.borderRadius,
83
- borderTopLeftRadius: hmStyle.borderTopLeftRadius,
84
- borderTopRightRadius: hmStyle.borderTopRightRadius,
85
- borderBottomRightRadius: hmStyle.borderBottomRightRadius,
86
- borderBottomLeftRadius: hmStyle.borderBottomLeftRadius,
87
- // 背景相关
88
- backgroundColor: hmStyle.backgroundColor,
89
- backgroundImage: hmStyle.backgroundImage,
90
- backgroundSize: hmStyle.backgroundSize,
91
- backgroundRepeat: hmStyle.backgroundRepeat,
92
- backgroundPosition: hmStyle.backgroundPosition,
93
- linearGradient,
94
- // 变换相关
95
- transform: hmStyle.transform,
96
- transformOrigin: {
97
- x: hmStyle.transformOrigin?.x || 0,
98
- y: hmStyle.transformOrigin?.y || 0
99
- },
100
- // 通用文本相关
101
- color: hmStyle.color,
102
- fontSize: hmStyle.fontSize,
103
- fontStyle: hmStyle.fontStyle,
104
- fontWeight: hmStyle.fontWeight,
105
- fontFamily: hmStyle.fontFamily || TEXT_DEFAULT_STYLE.FONT_FAMILY,
106
- lineHeight: hmStyle.lineHeight,
107
- textDecoration: hmStyle.textDecoration,
108
- // 其他
109
- overflow: hmStyle.overflow,
110
- id: _attrs.id || _nid,
111
- opacity: hmStyle.opacity,
112
- // focus: _attrs.focus || false,
106
+ let pseudoStylesheet = getPseudoClass(node)
107
+ if (pseudoStylesheet) {
108
+ normalAttributes = ObjectAssign({}, normalAttributes, pseudoStylesheet)
113
109
  }
114
110
 
115
- // taro_page 等写死在运行时里的节点,没有 _nodeInfo
116
- if (node._nodeInfo) {
117
- const overwriteStyle: TaroStyleType = node._nodeInfo?.overwriteStyle
111
+ // 初始化默认的值
112
+ if (initStyle) {
113
+ normalAttributes = ObjectAssign({}, initStyle, normalAttributes)
114
+ }
115
+ return normalAttributes
116
+ }
118
117
 
119
- // 处理覆盖属性:如动画的覆盖
120
- if (overwriteStyle) {
121
- normalAttributes = ObjectAssign(normalAttributes, overwriteStyle)
118
+ // 应用伪类样式
119
+ function getPseudoClass (node: TaroElement): HarmonyStyle | null {
120
+ // 伪类
121
+ const _pseudo_class = Object.keys(node._pseudo_class)
122
+ if (_pseudo_class.length) {
123
+ for (let i = 0; i < _pseudo_class.length; i++) {
124
+ const pseudoKey = _pseudo_class[i]
125
+ const pseudoStylesheet = node._pseudo_class[pseudoKey]
126
+ if (!pseudoStylesheet) continue
127
+ switch(pseudoKey) {
128
+ case "::first-child": {
129
+ if (node.parentNode?.firstChild?._nid === node._nid) {
130
+ return pseudoStylesheet.hmStyle
131
+ }
132
+ break
133
+ }
134
+ case "::last-child": {
135
+ if (node.parentNode?.lastChild?._nid === node._nid) {
136
+ return pseudoStylesheet.hmStyle
137
+ }
138
+ break
139
+ }
140
+ case "::empty": {
141
+ if (node.children?.length === 0) {
142
+ return pseudoStylesheet.hmStyle
143
+ }
144
+ break
145
+ }
146
+ default: {
147
+ // 解析nth-child()
148
+ // 找出当前节点在父节点中的位置
149
+ // 公式
150
+ let matchs: [number, number] | null = null
151
+ if (pseudoKey === '::nth-child(odd)') {
152
+ matchs = [2, 1]
153
+ } else if (pseudoKey === '::nth-child(even)') {
154
+ matchs = [2, 0]
155
+ } else {
156
+ matchs = parseNthChild(pseudoKey)
157
+ }
158
+ if (matchs) {
159
+ let index = node.parentNode?.childNodes.findIndex((child) => child._nid === node._nid)
160
+ if (isUndefined(index)) return null
161
+ else {
162
+ index = index + 1
163
+ if (matchs[0] === 0) {
164
+ if (index === matchs[1]) {
165
+ return pseudoStylesheet.hmStyle
166
+ }
167
+ } else {
168
+ if ((index - matchs[1]) % matchs[0] === 0) {
169
+ return pseudoStylesheet.hmStyle
170
+ }
171
+ }
172
+ }
173
+ }
174
+ }
175
+ }
122
176
  }
123
177
  }
124
- return normalAttributes
178
+ return null
179
+ }
180
+
181
+ // 正则匹配nth-child
182
+ function parseNthChild(selector: string): [number, number] | null {
183
+ const regex = /nth-child\((?:(-?\d*)n\s*)?([+-]?\s*\d+)?\)/;
184
+ const match = selector.match(regex);
185
+
186
+ if (match) {
187
+ const a = match[1] ? parseInt(match[1]) : 0;
188
+ const b = match[2] ? parseInt(match[2]) : 0;
189
+ return [a, b];
190
+ } else {
191
+ return null;
192
+ }
125
193
  }
194
+
195
+
196
+ export function getStyleAttr(node: TaroElement | null, key: string): TaroAny {
197
+ if (!node) return null
198
+ const hmStyle = node.hmStyle
199
+ if (!hmStyle) return null
200
+ // 覆盖属性
201
+ if (key === 'width') {
202
+ return isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width
203
+ }
204
+ return hmStyle[key]
205
+ }
@@ -73,30 +73,43 @@ function getVideoProps (node: TaroVideoElement): VideoAttrs {
73
73
  }
74
74
 
75
75
  function handleUpdate (node: TaroVideoElement, e: VideoUpdateEvent) {
76
- node._currentTime = e.time
76
+ node._nodeInfo._currentTime = e.time
77
77
 
78
78
  emitEvent(node, 'timeUpdate', { currentTime: e.time})
79
79
  }
80
80
 
81
- @Builder
82
- export default function TaroVideo (node: TaroVideoElement) {
83
- Video(getVideoData(node))
84
- .attributeModifier(commonStyleModify.setNode(node))
85
- .props(getVideoProps(node))
86
- .aspectRatio(4 / 3)
87
- .onStart(shouldBindEvent(() => { emitEvent(node, 'play') }, node, ['play']))
88
- .onPause(shouldBindEvent(() => { emitEvent(node, 'pause') }, node, ['pause']))
89
- .onFinish(shouldBindEvent(() => { emitEvent(node, 'ended') }, node, ['ended']))
90
- .onError(shouldBindEvent(() => { emitEvent(node, 'error') }, node, ['error']))
91
- .onUpdate((e) => { handleUpdate(node, e) })
92
- .onPrepared(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'loadedMetaData', { duration: e.duration }) }, node, ['loadedmetadata']))
93
- .onSeeking(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'seeking', { duration: e.time }) }, node, ['seeking']))
94
- .onSeeked(shouldBindEvent(() => { emitEvent(node, 'seeked') }, node, ['seeked']))
95
- .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, node, ['fullscreenchange']))
96
- .onClick((e: ClickEvent) => { eventHandler(e, 'click', node) })
97
- .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
98
- .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
99
- node._nodeInfo.areaInfo = res[1]
81
+ @Component
82
+ export default struct TaroVideo {
83
+ @Builder customBuilder() {}
84
+ @BuilderParam createLazyChildren: (node: TaroVideoElement, layer?: number) => void = this.customBuilder
85
+ @ObjectLink node: TaroVideoElement
86
+ @State overwriteStyle: Record<string, TaroAny> = {}
87
+
88
+ aboutToAppear(): void {
89
+ if (this.node) {
90
+ this.node._instance = this
91
+ }
92
+ }
93
+
94
+ build () {
95
+ Video(getVideoData(this.node))
96
+ .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
97
+ .props(getVideoProps(this.node))
98
+ .onStart(shouldBindEvent(() => { emitEvent(this.node, 'play') }, this.node, ['play']))
99
+ .onPause(shouldBindEvent(() => { emitEvent(this.node, 'pause') }, this.node, ['pause']))
100
+ .onFinish(shouldBindEvent(() => { emitEvent(this.node, 'ended') }, this.node, ['ended']))
101
+ .onError(shouldBindEvent(() => { emitEvent(this.node, 'error') }, this.node, ['error']))
102
+ .onUpdate((e) => { handleUpdate(this.node, e) })
103
+ .onPrepared(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'loadedMetaData', { duration: e.duration }) }, this.node, ['loadedmetadata']))
104
+ .onSeeking(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'seeking', { duration: e.time }) }, this.node, ['seeking']))
105
+ .onSeeked(shouldBindEvent(() => { emitEvent(this.node, 'seeked') }, this.node, ['seeked']))
106
+ .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, this.node, ['fullscreenchange']))
107
+ .onClick((e: ClickEvent) => { eventHandler(e, 'click', this.node) })
108
+ .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
109
+ .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
110
+ this.node._nodeInfo.areaInfo = res[1]
100
111
  }))
101
- .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
112
+ .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
113
+ }
114
+
102
115
  }
@@ -1,40 +1,73 @@
1
1
  import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
2
2
 
3
- import commonStyleModify from './style'
4
- import { createLazyChildren } from './render'
3
+ import commonStyleModify, { rowModify, columnModify } from './style'
4
+ import PseduoChildren from './pseudo'
5
5
  import { TOUCH_EVENT_MAP } from './utils/constant/event'
6
- import { FlexManager } from './utils/FlexManager'
6
+ import { FlexManager } from './utils/flexManager'
7
7
  import { getNodeThresholds, shouldBindEvent } from './utils/helper'
8
8
 
9
9
  import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
10
+ import { isUndefined } from '@tarojs/shared'
10
11
 
11
- @Builder
12
- export default function TaroView (node: TaroViewElement) {
13
- if (FlexManager.isFlexNode(node) && FlexManager.flexOptions(node).direction !== FlexDirection.Column) {
14
- Row() {
15
- createLazyChildren(node)
12
+ @Component
13
+ export default struct TaroView {
14
+ @Builder customBuilder() {}
15
+ @BuilderParam createLazyChildren: (node: TaroViewElement, layer?: number) => void = this.customBuilder
16
+ @ObjectLink node: TaroViewElement
17
+ @State overwriteStyle: Record<string, TaroAny> = {}
18
+
19
+ aboutToAppear(): void {
20
+ if (this.node) {
21
+ this.node._instance = this
16
22
  }
17
- .attributeModifier(commonStyleModify.setNode(node))
18
- .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
19
- .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
20
- .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
21
- node._nodeInfo.areaInfo = res[1]
22
- }))
23
- .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
24
- .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
25
- .justifyContent(FlexManager.flexOptions(node).justifyContent)
26
- } else {
27
- Column() {
28
- createLazyChildren(node)
23
+ }
24
+
25
+ build () {
26
+ if (FlexManager.useFlexLayout(this.node)) {
27
+ Flex(FlexManager.flexOptions(this.node)) {
28
+ if (this.node._pseudo_before || this.node._pseudo_after) {
29
+ PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
30
+ } else {
31
+ this.createLazyChildren(this.node, 0)
32
+ }
33
+ }
34
+ .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
35
+ .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
36
+ .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
37
+ .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
38
+ this.node._nodeInfo.areaInfo = res[1]
39
+ }))
40
+ .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
41
+ } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
42
+ Row() {
43
+ if (this.node._pseudo_before || this.node._pseudo_after) {
44
+ PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
45
+ } else {
46
+ this.createLazyChildren(this.node, 0)
47
+ }
48
+ }
49
+ .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
50
+ .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
51
+ .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
52
+ .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
53
+ this.node._nodeInfo.areaInfo = res[1]
54
+ }))
55
+ .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
56
+ } else {
57
+ Column() {
58
+ if (this.node._pseudo_before || this.node._pseudo_after) {
59
+ PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
60
+ } else {
61
+ this.createLazyChildren(this.node, 0)
62
+ }
63
+ }
64
+ .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
65
+ .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
66
+ .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
67
+ .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
68
+ this.node._nodeInfo.areaInfo = res[1]
69
+ }))
70
+ .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
29
71
  }
30
- .attributeModifier(commonStyleModify.setNode(node))
31
- .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
32
- .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
33
- .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
34
- node._nodeInfo.areaInfo = res[1]
35
- }))
36
- .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
37
- .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
38
- .justifyContent(FlexManager.flexOptions(node).justifyContent)
39
72
  }
40
73
  }