@tarojs/plugin-platform-harmony-ets 4.0.0-beta.2 → 4.0.0-beta.21

package/dist/components-harmony-ets/textArea.ets

@@ -1,72 +1,12 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, getNormalAttributes, getFontAttributes, shouldBindEvent, parseStyles } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, getFontAttributes, shouldBindEvent, parseStyles } from './utils/helper'
 
 import type { TaroAny, TaroStyleType, TaroTextStyleType, TaroTextAreaElement, TaroEvent } from '@tarojs/runtime'
 
 @Extend(TextArea)
 function textStyle (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
   .fontColor(style.color)
   .fontSize(style.fontSize)
   .fontWeight(style.fontWeight)
@@ -90,7 +30,9 @@ function getPlaceholderColor (node: TaroTextAreaElement): string {
 export default struct TaroTextArea {
   @State value: string = ''
 
-  node: TaroTextAreaElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroTextAreaElement) => void = this.customBuilder
+  @ObjectLink node: TaroTextAreaElement
 
   aboutToAppear () {
     if (this.node) {
@@ -105,16 +47,17 @@ export default struct TaroTextArea {
   }
 
   build () {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       TextArea({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
         .key(this.node._nid)
         .maxLength(Number(this.node._attrs?.maxlength) || null)
         .placeholderColor(getPlaceholderColor(this.node))
-        .textStyle(getNormalAttributes(this.node))
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .textStyle(this.node?.hmStyle)
         .textAttr(getFontAttributes(this.node))
         .onChange((value: string) => {
           const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
-          
+
           this.value = value
           this.node?.updateFormWidgetValue(value)
           eventHandler(event, 'input', this.node)
@@ -126,7 +69,7 @@ export default struct TaroTextArea {
         })
         .onFocus(() => {
           const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
-    
+
           eventHandler(event, 'focus', this.node)
         })
         .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {

package/dist/components-harmony-ets/utils/AttributeManager.ets

@@ -60,7 +60,7 @@ class AttributeManager {
     const dataValue: string = AttributeManager.getNodeStyle(style, 'animation')
 
     if (dataValue) {
-      let values: string[] = dataValue.trim().split(new RegExp("/\s+/"))
+      let values: string[] = dataValue.toString().trim().split(new RegExp("/\s+/"))
       switch (values.length) {
         case 4:
           res = { duration: values[0], curve: values[1], delay: values[2] }

package/dist/components-harmony-ets/utils/DynamicCenter.ts

@@ -36,4 +36,4 @@ export class DynamicCenter {
       this.bindComponentToNodeWithDFS(node.childNodes[i] as TaroElement, component)
     }
   }
-}
+}

package/dist/components-harmony-ets/utils/flexManager.ets

@@ -1,4 +1,5 @@
 import type { TaroElement } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
 
 interface IFlexOptions {
   direction: FlexDirection,
@@ -17,21 +18,21 @@ class FlexManager {
   static convertFlexAlignItemsToColumnOrRow (direction: FlexDirection, alignItems: ItemAlign | undefined): 	VerticalAlign | HorizontalAlign {
     if (direction === FlexDirection.Column) {
       switch (alignItems) {
-        case ItemAlign.Start:
-          return HorizontalAlign.Start
+        case ItemAlign.Center:
+          return HorizontalAlign.Center
         case ItemAlign.End:
           return HorizontalAlign.End
         default:
-          return HorizontalAlign.Center
+          return HorizontalAlign.Start
       }
     } else {
       switch (alignItems) {
-        case ItemAlign.Start:
-          return VerticalAlign.Top
+        case ItemAlign.Center:
+          return VerticalAlign.Center
         case ItemAlign.End:
           return VerticalAlign.Bottom
         default:
-          return VerticalAlign.Center
+          return VerticalAlign.Top
       }
     }
   }
@@ -39,7 +40,7 @@ class FlexManager {
   static flexOptions (node: TaroElement): IFlexOptions {
     const hmStyle = node.hmStyle
     const isFlex = FlexManager.isFlexNode(node)
-    const justifyContent: FlexAlign = isFlex ? (hmStyle.justifyContent || FlexAlign.Center) : FlexAlign.Start
+    const justifyContent: FlexAlign = isFlex ? (isUndefined(hmStyle.justifyContent) ? FlexAlign.Start : hmStyle.justifyContent) : FlexAlign.Start
 
     let flexDirection = hmStyle.flexDirection
     if (!flexDirection && flexDirection !== 0) {

package/dist/components-harmony-ets/utils/helper.ets

@@ -1,6 +1,6 @@
-import { getNormalAttributes, getFontAttributes } from './styles'
+import { getNormalAttributes, getFontAttributes, getStyleAttr } from './styles'
 
-import type { Func } from '@tarojs/runtime/dist/runtime.esm'
+import type { TFunc } from '@tarojs/runtime/dist/runtime.esm'
 import type { TaroElement } from '@tarojs/runtime'
 
 export const parseStyles = (styles = ''): Record<string, string> => {
@@ -20,7 +20,7 @@ export const parseStyles = (styles = ''): Record<string, string> => {
   return styleObj
 }
 
-export function shouldBindEvent (cb: Func, node: TaroElement | null, eventNames: string[], disabled = false) {
+export function shouldBindEvent (cb: TFunc, node: TaroElement | null, eventNames: string[], disabled = false) {
   if (!node || node._attrs?.disabled || disabled) return null
   if (!node.__listeners) {
     return null
@@ -36,4 +36,5 @@ export function getNodeThresholds (node: TaroElement): number[] | null {
   return node?._nodeInfo.thresholds || null
 }
 
-export { getNormalAttributes, getFontAttributes }
+
+export { getNormalAttributes, getFontAttributes, getStyleAttr }

package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts

@@ -99,5 +99,4 @@ function parseTag(htmlString, startIndex) {
   return tag
 }
 
-
-export default parseHTML
+export default parseHTML

package/dist/components-harmony-ets/utils/index.ts

@@ -1,5 +1,8 @@
 import { convertNumber2VP } from '@tarojs/runtime'
-import { isNumber } from '@tarojs/shared'
+import { isNumber, isUndefined } from '@tarojs/shared'
+
+import type { RichTextProps } from '@tarojs/components/types/RichText'
+import type { TaroRichTextElement } from '@tarojs/runtime'
 
 export function getSingleSelector(range, rangeKey): any[] {
   return range.map((data) => data[rangeKey])
@@ -30,7 +33,7 @@ export function getUnit (val) {
 function handleNodeStyleData (dataValue: string, handler: (values: string[]) => { [key: string]: string } | void) {
   let res: any = {}
   if (dataValue) {
-    const values = dataValue.trim().split(/\s+/)
+    const values = dataValue.toString().trim().split(/\s+/)
     const data = handler(values)
 
     if (!data) return res
@@ -81,3 +84,53 @@ export function getNodeMarginOrPaddingData (dataValue: string) {
     }
   })
 }
+
+export function generateText (node: TaroRichTextElement): string {
+  return parseHtmlNode(node._attrs.nodes || '')
+}
+
+// 将nodeTree转换成harmony需要的string结构
+function nodeToHtml(node: RichTextProps.Text | RichTextProps.HTMLElement): string {
+  if (node.type === 'text') {
+    return node.text
+  }
+  if (node.attrs) {
+    const attributes = Object.entries(node.attrs)
+      .map((item: [string, string]) => `${item[0]}="${item[1]}"`)
+      .join(' ')
+    const childrenHtml: string = typeof node.children === 'string' ? node.children : (node.children || []).map((child: RichTextProps.Text | RichTextProps.HTMLElement) => nodeToHtml(child)).join('')
+    return `<${node.name}${attributes ? ' ' + attributes : ''}>${childrenHtml}</${node.name}>`
+  }
+  return ''
+}
+
+function parseHtmlNode (nodes: Array<RichTextProps.Text | RichTextProps.HTMLElement> | string) {
+  return typeof nodes === 'string' ? nodes: `<div>${nodes.map(node => nodeToHtml(node)).join('')}</div>`
+}
+
+// 背景偏移算法：https://developer.mozilla.org/zh-CN/docs/Web/CSS/background-position
+export function computeBackgroundPosition(style) {
+  let offsetX = 0
+  let offsetY = 0
+  if (style.backgroundSize && typeof style.backgroundSize !== 'number') {
+    if (!isUndefined(style.backgroundSize.width) && style.width) {
+      if (typeof style.backgroundPosition.x === 'string' && style.backgroundPosition.x.indexOf('%') > 0) {
+        // (container width - image width) * (position x%) = (x offset value)
+        const width = parseFloat(style.width)
+        const bgWidth = parseFloat(style.backgroundSize.width)
+        const bgOffsetX = parseFloat(style.backgroundPosition.x)
+        offsetX = Number((width - bgWidth) * (bgOffsetX) / 100) || 0
+      }
+    }
+    if (!isUndefined(style.backgroundSize.height) && style.height) {
+      if (typeof style.backgroundPosition.y === 'string' && style.backgroundPosition.y.indexOf('%') > 0) {
+        // (container height - image height) * (position y%) = (y offset value)
+        const height = parseFloat(style.height)
+        const bgHeight = parseFloat(style.backgroundSize.height)
+        const bgOffsetY = parseFloat(style.backgroundPosition.y)
+        offsetY = Number((height - bgHeight) * (bgOffsetY) / 100) || 0
+      }
+    }
+  }
+  return { offsetX: isNaN(offsetX) ? style.backgroundPosition.x : offsetX, offsetY: isNaN(offsetY) ? style.backgroundPosition.y: offsetY }
+}

package/dist/components-harmony-ets/utils/styles.ets

@@ -1,125 +1,85 @@
 import { isUndefined } from '@tarojs/shared'
 import { ObjectAssign } from '@tarojs/runtime'
 
-import { FlexManager } from './FlexManager'
-import { TEXT_DEFAULT_STYLE } from './constant/style'
+import { FlexManager } from './flexManager'
 
 import type { StandardProps, TextProps } from '@tarojs/components/types'
-import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyType, HarmonyStyle } from '@tarojs/runtime'
+import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime'
 
 export function getFontAttributes (node: TaroElement): TaroTextStyleType {
   const hmStyle = node.hmStyle
   const attrs: TextProps = node._attrs || {}
 
+  if (!hmStyle) return {}
+
+  let lineHeight = hmStyle.lineHeight
+  if (!isUndefined(hmStyle.verticalAlign)) {
+    lineHeight = 0
+  }
+
+  let WebkitLineClamp = attrs.maxLines || hmStyle.WebkitLineClamp || Infinity
+  if (hmStyle.textOverflow && !isUndefined(hmStyle.textOverflow.overflow)) {
+    switch (hmStyle.textOverflow.overflow) {
+      case TextOverflow.Clip: 
+      case TextOverflow.Ellipsis:
+      case TextOverflow.None: WebkitLineClamp = WebkitLineClamp || 1; break
+      default: break
+    }
+  }
+
   const attributes: TaroAny = {
-    WebkitLineClamp: attrs.maxLines || hmStyle.WebkitLineClamp || Infinity,
+    WebkitLineClamp: WebkitLineClamp,
     // 已做处理的属性
     letterSpacing: hmStyle.letterSpacing,
     textAlign: hmStyle.textAlign,
-    textOverflow: hmStyle.textOverflow
+    textOverflow: hmStyle.textOverflow,
+    verticalAlign: hmStyle.verticalAlign,
+    lineHeight: lineHeight
   }
 
   return attributes
 }
 
 // 模拟 div 自动撑满父元素的情况
-function isMaxWidthView (node: TaroElement) {
+export function isMaxWidthView (node: TaroElement) {
   const parentNode: TaroElement = node.parentNode as TaroElement
-  
-  return node.tagName === 'VIEW' && parentNode.tagName === 'VIEW' &&
+
+  return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' &&
     !(FlexManager.isFlexNode(parentNode) && FlexManager.flexOptions(parentNode).direction !== FlexDirection.Column)
 }
 
-export function getNormalAttributes (node: TaroElement): TaroStyleType {
+export function getNormalAttributes (node: TaroElement): HarmonyStyle {
   const hmStyle = node.hmStyle
+  
+  if (!hmStyle) return {}
 
   const _nid = node._nid
   const _attrs: StandardProps = node._attrs || {}
 
-  let linearGradient: HarmonyType.LinearGradient | undefined = undefined
-  // 渐变
-  if (hmStyle.backgroundImage?.colors) {
-    linearGradient = hmStyle.backgroundImage
-  }
+  let normalAttributes = hmStyle
 
-  let normalAttributes: HarmonyStyle = {
-    // Flex相关
-    flexBasis: hmStyle.flexBasis,
-    flexGrow: hmStyle.flexGrow,
-    flexShrink: hmStyle.flexShrink,
-    alignSelf: hmStyle.alignSelf,
-    // 尺寸相关
-    width: isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width,
-    height: hmStyle.height,
-    minHeight: hmStyle.minHeight,
-    maxHeight: hmStyle.maxHeight,
-    minWidth: hmStyle.minWidth,
-    maxWidth: hmStyle.maxWidth,
-    marginTop: hmStyle.marginTop,
-    marginRight: hmStyle.marginRight,
-    marginBottom: hmStyle.marginBottom,
-    marginLeft: hmStyle.marginLeft,
-    paddingTop: hmStyle.paddingTop,
-    paddingRight: hmStyle.paddingRight,
-    paddingBottom: hmStyle.paddingBottom,
-    paddingLeft: hmStyle.paddingLeft,
-    // 边框相关
-    borderStyle: hmStyle.borderStyle,
-    borderTopStyle: hmStyle.borderTopStyle,
-    borderRightStyle: hmStyle.borderRightStyle,
-    borderBottomStyle: hmStyle.borderBottomStyle,
-    borderLeftStyle: hmStyle.borderLeftStyle,
-    borderWidth: hmStyle.borderWidth,
-    borderTopWidth: hmStyle.borderTopWidth,
-    borderRightWidth: hmStyle.borderRightWidth,
-    borderBottomWidth: hmStyle.borderBottomWidth,
-    borderLeftWidth: hmStyle.borderLeftWidth,
-    borderColor: hmStyle.borderColor,
-    borderTopColor: hmStyle.borderTopColor,
-    borderRightColor: hmStyle.borderRightColor,
-    borderBottomColor: hmStyle.borderBottomColor,
-    borderLeftColor: hmStyle.borderLeftColor,
-    borderRadius: hmStyle.borderRadius,
-    borderTopLeftRadius: hmStyle.borderTopLeftRadius,
-    borderTopRightRadius: hmStyle.borderTopRightRadius,
-    borderBottomRightRadius: hmStyle.borderBottomRightRadius,
-    borderBottomLeftRadius: hmStyle.borderBottomLeftRadius,
-    // 背景相关
-    backgroundColor: hmStyle.backgroundColor,
-    backgroundImage: hmStyle.backgroundImage,
-    backgroundSize: hmStyle.backgroundSize,
-    backgroundRepeat: hmStyle.backgroundRepeat,
-    backgroundPosition: hmStyle.backgroundPosition,
-    linearGradient,
-    // 变换相关
-    transform: hmStyle.transform,
-    transformOrigin: {
-      x: hmStyle.transformOrigin?.x || 0,
-      y: hmStyle.transformOrigin?.y || 0
-    },
-    // 通用文本相关
-    color: hmStyle.color,
-    fontSize: hmStyle.fontSize,
-    fontStyle: hmStyle.fontStyle,
-    fontWeight: hmStyle.fontWeight,
-    fontFamily: hmStyle.fontFamily || TEXT_DEFAULT_STYLE.FONT_FAMILY,
-    lineHeight: hmStyle.lineHeight,
-    textDecoration: hmStyle.textDecoration,
-    // 其他
-    overflow: hmStyle.overflow,
-    id: _attrs.id || _nid,
-    opacity: hmStyle.opacity,
-    // focus: _attrs.focus || false,
-  }
+  // 覆盖属性
+  normalAttributes.id =  _attrs.id || _nid
 
   // taro_page 等写死在运行时里的节点，没有 _nodeInfo
   if (node._nodeInfo) {
     const overwriteStyle: TaroStyleType = node._nodeInfo?.overwriteStyle
-
     // 处理覆盖属性：如动画的覆盖
     if (overwriteStyle) {
-      normalAttributes = ObjectAssign(normalAttributes, overwriteStyle)
+      normalAttributes = ObjectAssign({}, normalAttributes, overwriteStyle)
     }
   }
   return normalAttributes
 }
+
+
+export function getStyleAttr(node: TaroElement | null, key: string): TaroAny {
+  if (!node) return null
+  const hmStyle = node.hmStyle
+  if (!hmStyle) return null
+  // 覆盖属性
+  if (key === 'width') {
+    return isMaxWidthView(node) && isUndefined(hmStyle.width) ? '100%' : hmStyle.width
+  }
+  return hmStyle[key]
+}

package/dist/components-harmony-ets/video.ets

@@ -1,9 +1,10 @@
 import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroStyleType, TaroAny, TaroVideoElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroVideoElement, TaroEvent } from '@tarojs/runtime'
 
 export interface VideoOptions {
   src?: string | Resource
@@ -21,71 +22,6 @@ export interface VideoUpdateEvent {
   time: number
 }
 
-@Extend(Video)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .borderWidth({
-    top: style.borderTopWidth,
-    right: style.borderRightWidth,
-    bottom: style.borderBottomWidth,
-    left: style.borderLeftWidth
-  })
-  .borderColor({
-    top: style.borderTopColor,
-    right: style.borderRightColor,
-    bottom: style.borderBottomColor,
-    left: style.borderLeftColor
-  })
-  .borderRadius({
-    topLeft: style.borderTopLeftRadius,
-    topRight: style.borderTopRightRadius,
-    bottomLeft: style.borderBottomLeftRadius,
-    bottomRight: style.borderBottomRightRadius
-  })
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
 @Extend(Video)
 function props(attr: VideoAttrs) {
   .muted(attr.muted)
@@ -142,25 +78,34 @@ function handleUpdate (node: TaroVideoElement, e: VideoUpdateEvent) {
   emitEvent(node, 'timeUpdate', { currentTime: e.time})
 }
 
-@Builder
-export default function TaroVideo (node: TaroVideoElement) {
-  Video(getVideoData(node))
-    .attrs(getNormalAttributes(node))
-    .props(getVideoProps(node))
-    .aspectRatio(4 / 3)
-    .onStart(shouldBindEvent(() => { emitEvent(node, 'play') }, node, ['play']))
-    .onPause(shouldBindEvent(() => { emitEvent(node, 'pause') }, node, ['pause']))
-    .onFinish(shouldBindEvent(() => { emitEvent(node, 'ended') }, node, ['ended']))
-    .onError(shouldBindEvent(() => { emitEvent(node, 'error') }, node, ['error']))
-    .onUpdate((e) => { handleUpdate(node, e) })
-    .onPrepared(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'loadedMetaData', { duration: e.duration }) }, node, ['loadedmetadata']))
-    .onSeeking(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'seeking', { duration: e.time }) }, node, ['seeking']))
-    .onSeeked(shouldBindEvent(() => { emitEvent(node, 'seeked') }, node, ['seeked']))
-    .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, node, ['fullscreenchange']))
-    .onClick((e: ClickEvent) => { eventHandler(e, 'click', node) })
-    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+@Component
+export default struct TaroVideo {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroVideoElement) => void = this.customBuilder
+  @ObjectLink node: TaroVideoElement
+
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      Video(getVideoData(this.node))
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .props(getVideoProps(this.node))
+      .aspectRatio(4 / 3)
+      .onStart(shouldBindEvent(() => { emitEvent(this.node, 'play') }, this.node, ['play']))
+      .onPause(shouldBindEvent(() => { emitEvent(this.node, 'pause') }, this.node, ['pause']))
+      .onFinish(shouldBindEvent(() => { emitEvent(this.node, 'ended') }, this.node, ['ended']))
+      .onError(shouldBindEvent(() => { emitEvent(this.node, 'error') }, this.node, ['error']))
+      .onUpdate((e) => { handleUpdate(this.node, e) })
+      .onPrepared(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'loadedMetaData', { duration: e.duration }) }, this.node, ['loadedmetadata']))
+      .onSeeking(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'seeking', { duration: e.time }) }, this.node, ['seeking']))
+      .onSeeked(shouldBindEvent(() => { emitEvent(this.node, 'seeked') }, this.node, ['seeked']))
+      .onFullscreenChange(shouldBindEvent((e: TaroAny) => { emitEvent(this.node, 'fullScreenChange', { fullScreen: e.fullscreen}) }, this.node, ['fullscreenchange']))
+      .onClick((e: ClickEvent) => { eventHandler(e, 'click', this.node) })
+      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+    }
+  }
+
 }