@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.0 → 4.0.0-alpha.11

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])
@@ -18,66 +21,67 @@ export function getMultiSelector(ctx, range, rangeKey, value) {
   }))
 }
 
-export function getUnit (val) {
-  if (/\d+(vp)$/.test(val)) {
+export function getUnit (val: string | number): string {
+  if (isNumber(val) || /\d+px$/.test(val)) {
+    return convertNumber2VP(parseFloat(val as string))
+  } else if (/\d+(vp)$/.test(val)) {
     return val
-  } else if (isNumber(val) || /\d+px$/.test(val)) {
-    return convertNumber2VP(parseFloat(val))
   }
   return val
 }
 
-function handleNodeStyleData (dataValue: string, handler: (values: string[]) => { [key: string]: string } | void) {
-  let res: any = {}
-  if (dataValue) {
-    const values = dataValue.trim().split(/\s+/)
-    const data = handler(values)
-
-    if (!data) return res
-
-    res = data
+export function generateText (node: TaroRichTextElement): string {
+  return parseHtmlNode(node._attrs.nodes || '')
+}
 
-    Object.keys(res).forEach(key => {
-      const exec = `${res[key]}`.match(/(\d+)(px)$/)
-      if (exec && values.length > 1) {
-        res[key] = getUnit(+exec[1])
-      }
-    })
+// 将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 ''
+}
 
-  return res
+function parseHtmlNode (nodes: Array<RichTextProps.Text | RichTextProps.HTMLElement> | string) {
+  return typeof nodes === 'string' ? nodes : `<div>${nodes.map(node => nodeToHtml(node)).join('')}</div>`
 }
 
-export function getNodeBorderRadiusData (dataValue: string) {
-  return handleNodeStyleData(dataValue, values => {
-    switch (values.length) {
-      case 1:
-        return { topLeft: values[0], topRight: values[0], bottomRight: values[0], bottomLeft: values[0] }
-      case 2:
-        return { topLeft: values[0], topRight: values[1], bottomRight: values[0], bottomLeft: values[1] }
-      case 3:
-        return { topLeft: values[0], topRight: values[1], bottomRight: values[2], bottomLeft: values[1] }
-      case 4:
-        return { topLeft: values[0], topRight: values[1], bottomRight: values[2], bottomLeft: values[3] }
-      default:
-        break
+// 背景偏移算法：https://developer.mozilla.org/zh-CN/docs/Web/CSS/background-position
+export function computeBackgroundPosition(style) {
+  let offsetX = style.backgroundPosition?.x || 0
+  let offsetY = style.backgroundPosition?.y || 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, offsetY }
 }
 
-export function getNodeMarginOrPaddingData (dataValue: string) {
-  return handleNodeStyleData(dataValue, values => {
-    switch (values.length) {
-      case 1:
-        return { top: values[0], right: values[0], bottom: values[0], left: values[0] }
-      case 2:
-        return { top: values[0], right: values[1], bottom: values[0], left: values[1] }
-      case 3:
-        return { top: values[0], right: values[1], bottom: values[2], left: values[1] }
-      case 4:
-        return { top: values[0], right: values[1], bottom: values[2], left: values[3] }
-      default:
-        break
-    }
-  })
+export function convertVp2Px(val: string | number) {
+  const vp = parseFloat(`${val}`)
+  return vp2px(vp)
 }

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

@@ -1,88 +1,203 @@
+import { isUndefined } from '@tarojs/shared'
 import { ObjectAssign } from '@tarojs/runtime'
 
-import { TEXT_DEFAULT_STYLE } from './constant/style'
+import { FlexManager } from './flexManager'
 
-import type { StandardProps } from '@tarojs/components/types'
-import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyType, HarmonyStyle } from '@tarojs/runtime'
+import type { StandardProps, TextProps } from '@tarojs/components/types'
+import type { TaroAny, TaroElement, TaroStyleType, TaroTextStyleType, HarmonyStyle } from '@tarojs/runtime'
 
 export function getFontAttributes (node: TaroElement): TaroTextStyleType {
-  const hmStyle = node.hmStyle
+  let hmStyle = getNormalAttributes(node)
+  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 isFlexText = hmStyle.display === 'flex'
+  let textAlign = hmStyle.textAlign
+  let verticalAlign = hmStyle.verticalAlign
+
+  // 按照 w3c 规范，一旦设置了 display: flex，textAlign 和 verticalAlign 都会直接失效
+  // 需要使用 justifyContent 和 alignItems
+  if (isFlexText) {
+    switch (hmStyle.justifyContent) {
+      case FlexAlign.Start:
+        textAlign = TextAlign.Start
+        break
+      case FlexAlign.Center:
+        textAlign = TextAlign.Center
+        break
+      case FlexAlign.End:
+        textAlign = TextAlign.End
+        break
+      case FlexAlign.SpaceBetween:
+      case FlexAlign.SpaceAround:
+        textAlign = TextAlign.JUSTIFY
+        break
+      default:
+        textAlign = TextAlign.Start
+        break
+    }
+    switch (hmStyle.alignItems) {
+      case ItemAlign.Start:
+        verticalAlign = Alignment.Top
+        break
+      case ItemAlign.Center:
+        verticalAlign = Alignment.Center
+        break
+      case ItemAlign.End:
+        verticalAlign = Alignment.End
+        break
+      default:
+        verticalAlign = Alignment.Top
+        break
+    }
+  }
 
   const attributes: TaroAny = {
-    maxLines: hmStyle.maxLines || Infinity,
+    textAlign,
+    verticalAlign,
+    WebkitLineClamp: WebkitLineClamp,
     // 已做处理的属性
     letterSpacing: hmStyle.letterSpacing,
-    textAlign: hmStyle.textAlign,
-    textOverflow: hmStyle.textOverflow
+    textOverflow: hmStyle.textOverflow,
+    lineHeight: lineHeight
   }
 
   return attributes
 }
 
-export function getNormalAttributes (node: TaroElement): TaroStyleType {
+// 模拟 div 自动撑满父元素的情况
+export function isMaxWidthView (node: TaroElement) {
+  const parentNode: TaroElement = node.parentNode as TaroElement
+
+  return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' && !FlexManager.isFlexNode(parentNode)
+}
+
+export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle): HarmonyStyle {
   const hmStyle = node.hmStyle
+  
+  if (!hmStyle) return {}
 
   const _nid = node._nid
   const _attrs: StandardProps = node._attrs || {}
 
-  const transform: TaroAny = hmStyle.transform
-  const transformRotate: HarmonyType.Transform.Rotate = transform?.rotate?.[0]
-  const transformTranslate: HarmonyType.Transform.Translate = transform?.translate?.[0]
-  const transformScale: HarmonyType.Transform.Scale = transform?.scale?.[0]
-  const transformTransform: HarmonyType.Transform.Transform = transform?.transform?.[0]
-
-  let normalAttributes: HarmonyStyle = {
-    // Flex相关
-    flexBasis: hmStyle.flexBasis,
-    flexGrow: hmStyle.flexGrow,
-    flexShrink: hmStyle.flexShrink,
-    alignSelf: hmStyle.alignSelf,
-    // 尺寸相关
-    width: hmStyle.width,
-    height: hmStyle.height,
-    constraintSize: hmStyle.constraintSize,
-    margin: hmStyle.margin,
-    padding: hmStyle.padding,
-    // 边框相关
-    borderStyle: hmStyle.borderStyle,
-    borderWidth: hmStyle.borderWidth,
-    borderColor: hmStyle.borderColor,
-    borderRadius: hmStyle.borderRadius,
-    // 背景相关
-    backgroundColor: hmStyle.backgroundColor,
-    backgroundImage: hmStyle.backgroundImage,
-    backgroundImageSize: hmStyle.backgroundImageSize,
-    backgroundRepeat: hmStyle.backgroundRepeat,
-    backgroundImagePosition: hmStyle.backgroundImagePosition,
-    linearGradient: hmStyle.linearGradient,
-    // 变换相关
-    rotate: transformRotate,
-    translate: transformTranslate,
-    scale: transformScale,
-    transform: transformTransform,
-    // 通用文本相关
-    color: hmStyle.color,
-    fontSize: hmStyle.fontSize,
-    fontStyle: hmStyle.fontStyle,
-    fontWeight: hmStyle.fontWeight,
-    fontFamily: hmStyle.fontFamily || TEXT_DEFAULT_STYLE.FONT_FAMILY,
-    lineHeight: hmStyle.lineHeight,
-    decoration: hmStyle.decoration,
-    // 其他
-    clip: hmStyle.clip,
-    id: _attrs.id || _nid,
-    opacity: hmStyle.opacity,
-    // focus: _attrs.focus || false,
+  let normalAttributes = hmStyle
+
+  // 覆盖属性
+  normalAttributes.id =  _attrs.id || _nid
+
+  let pseudoStylesheet = getPseudoClass(node)
+  if (pseudoStylesheet) {
+    normalAttributes = ObjectAssign({}, normalAttributes, pseudoStylesheet)
   }
 
-  // taro_page 等写死在运行时里的节点，没有 _nodeInfo
-  if (node._nodeInfo) {
-    const overwriteStyle: TaroStyleType = node._nodeInfo?.overwriteStyle
+  // 初始化默认的值
+  if (initStyle) {
+    normalAttributes = ObjectAssign({}, initStyle, normalAttributes)
+  }
+  return normalAttributes
+}
 
-    // 处理覆盖属性：如动画的覆盖
-    if (overwriteStyle) {
-      normalAttributes = ObjectAssign(normalAttributes, overwriteStyle)
+// 应用伪类样式
+function getPseudoClass (node: TaroElement): HarmonyStyle | null {
+  // 伪类
+  const _pseudo_class = Object.keys(node._pseudo_class)
+  if (_pseudo_class.length) {
+    for (let i = 0; i < _pseudo_class.length; i++) {
+      const pseudoKey = _pseudo_class[i]
+      const pseudoStylesheet = node._pseudo_class[pseudoKey]
+      if (!pseudoStylesheet) continue
+      switch(pseudoKey) {
+        case "::first-child": {
+          if (node.parentNode?.firstChild?._nid === node._nid) {
+            return pseudoStylesheet.hmStyle
+          }
+          break
+        }
+        case "::last-child": {
+          if (node.parentNode?.lastChild?._nid === node._nid) {
+            return pseudoStylesheet.hmStyle
+          }
+          break
+        }
+        case "::empty": {
+          if (node.children?.length === 0) {
+            return pseudoStylesheet.hmStyle
+          }
+          break
+        }
+        default: {
+          // 解析nth-child()
+          // 找出当前节点在父节点中的位置
+          // 公式
+          let matchs: [number, number] | null = null
+          if (pseudoKey === '::nth-child(odd)') {
+            matchs = [2, 1]
+          } else if (pseudoKey === '::nth-child(even)') {
+            matchs = [2, 0]
+          } else {
+            matchs = parseNthChild(pseudoKey)
+          }
+          if (matchs) {
+            let index = node.parentNode?.childNodes.findIndex((child) => child._nid === node._nid)
+            if (isUndefined(index)) return null
+            else {
+              index = index + 1
+              if (matchs[0] === 0) {
+                if (index === matchs[1]) {
+                  return pseudoStylesheet.hmStyle
+                }
+              } else {
+                if ((index - matchs[1]) % matchs[0] === 0) {
+                  return pseudoStylesheet.hmStyle
+                }
+              }
+            }
+          }
+        }
+      }
     }
   }
-  return normalAttributes
+  return null
 }
+
+// 正则匹配nth-child
+function parseNthChild(selector: string): [number, number] | null {
+  const regex = /nth-child\((?:(-?\d*)n\s*)?([+-]?\s*\d+)?\)/;
+  const match = selector.match(regex);
+  
+  if (match) {
+      const a = match[1] ? parseInt(match[1]) : 0;
+      const b = match[2] ? parseInt(match[2]) : 0;
+      return [a, b];
+  } else {
+      return null;
+  }
+}
+
+
+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,37 +22,6 @@ export interface VideoUpdateEvent {
   time: number
 }
 
-@Extend(Video)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .padding(style.padding)
-  .margin(style.margin)
-  .width(style.width)
-  .height(style.height)
-  .constraintSize(style.constraintSize)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .backgroundColor(style.backgroundColor)
-  .backgroundImage(style.backgroundImage, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundImageSize)
-  .backgroundImagePosition(style.backgroundImagePosition)
-  .rotate(style.rotate)
-  .scale(style.scale)
-  .translate(style.translate)
-  .transform(style.transform)
-  .borderStyle(style.borderStyle)
-  .borderWidth(style.borderWidth)
-  .borderColor(style.borderColor)
-  .borderRadius(style.borderRadius)
-  .linearGradient(style.linearGradient)
-  .zIndex(style.zIndex)
-  .opacity(style.opacity)
-  .clip(style.clip)
-}
-
 @Extend(Video)
 function props(attr: VideoAttrs) {
   .muted(attr.muted)
@@ -103,30 +73,43 @@ function getVideoProps (node: TaroVideoElement): VideoAttrs {
 }
 
 function handleUpdate (node: TaroVideoElement, e: VideoUpdateEvent) {
-  node._currentTime = e.time
+  node._nodeInfo._currentTime = e.time
 
   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]
+@Component
+export default struct TaroVideo {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroVideoElement) => void = this.customBuilder
+  @ObjectLink node: TaroVideoElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build () {
+    Video(getVideoData(this.node))
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .props(getVideoProps(this.node))
+    .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(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+  }
+
 }