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

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

@@ -1,107 +1,27 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
-
-import type { RichTextProps } from '@tarojs/components/types/RichText'
-import type { TaroAny, TaroStyleType, TaroRichTextElement } from '@tarojs/runtime'
-
-@Extend(RichText)
-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)
-}
-
-
-function generateText (node: TaroRichTextElement): string {
-  return parseHtmlNode(node._attrs.nodes || '')
-}
-
-@Builder
-export default function TaroRichText (node: TaroRichTextElement) {
-  RichText(generateText(node))
-    .attrs(getNormalAttributes(node))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .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))
-}
-
-// 将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}>`;
+import commonStyleModify from './style'
+import { generateText } from './utils'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
+
+import type { TaroAny, TaroRichTextElement } from '@tarojs/runtime'
+
+@Component
+export default struct TaroRichText {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroRichTextElement) => void = this.customBuilder
+  @ObjectLink node: TaroRichTextElement
+
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      RichText(generateText(this.node))
+        .attributeModifier(commonStyleModify.setNode(this.node))
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .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))
+    }
   }
-  return ''
 }
 
-function parseHtmlNode (nodes: Array<RichTextProps.Text | RichTextProps.HTMLElement> | string) {
-  return typeof nodes === 'string' ? nodes: `<div>${nodes.map(node => nodeToHtml(node)).join('')}</div>`
-}

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

@@ -1,10 +1,12 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { createLazyChildren } from './render'
+import { rowModify, columnModify } from './style'
+import PseduoChildren from './pseudo'
+import { FlexManager } from './utils/FlexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import { getNodeThresholds, getStyleAttr, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroStyleType, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -22,135 +24,6 @@ interface ScrollViewEvent {
   scrollHeight: number
 }
 
-@Extend(Row)
-function rowAttrs (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
-  })
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    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(Column)
-function columnAttrs (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)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    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)
-}
-
-
 function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
   const _attrs = node._attrs
   const scrollAttrs: ScrollViewAttrs = {
@@ -176,50 +49,74 @@ function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', x
     deltaY: vp2px(yOffset),
     scrollLeft: vp2px(currentXOffset),
     scrollTop: vp2px(currentYOffset),
-    scrollWidth: vp2px(Number(node._scroll?.width)),
-    scrollHeight: vp2px(Number(node._scroll?.height)),
+    scrollWidth: vp2px(Number(node._nodeInfo?._scroll?.width)),
+    scrollHeight: vp2px(Number(node._nodeInfo?._scroll?.height)),
   }
   const event: TaroEvent = createTaroEvent(eventName, { detail: value }, node)
 
   eventHandler(event, eventName, node)
 }
 
-@Builder
-export default function TaroScrollView (node: TaroScrollViewElement) {
-    Scroll(node.scroller) {
-      if (node._attrs.scrollX) {
-        Row() {
-          createLazyChildren(node)
-        }
-        .width(null)
-        .rowAttrs(getNormalAttributes(node))
-        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
-      } else {
-        Column() {
-          createLazyChildren(node)
+@Component
+export default struct TaroScrollView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroScrollViewElement
+
+  build () {
+    if (this.node.hmStyle?.display !== 'none') {
+      Scroll(this.node.scroller) {
+        if (this.node._attrs.scrollX) {
+          Row() {
+            if (this.node._pseudo_before || this.node._pseudo_after) {
+              PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+            } else {
+              this.createLazyChildren(this.node)
+            }
+          }
+          .attributeModifier(rowModify.setNode(this.node))
+          .width(null)
+          .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+            this.node._nodeInfo._scroll = areaResult
+          }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+          .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+          .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+          .flexGrow(0).flexShrink(0)
+        } else {
+          Column() {
+            if (this.node._pseudo_before || this.node._pseudo_after) {
+              PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+            } else {
+              this.createLazyChildren(this.node)
+            }
+          }
+          .attributeModifier(columnModify.setNode(this.node))
+          .height(null)
+          .alignItems(HorizontalAlign.Start)
+          .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+            this.node._nodeInfo._scroll = areaResult
+          }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+          .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+          .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+          .flexGrow(0).flexShrink(0)
         }
-        .height(null)
-        .columnAttrs(getNormalAttributes(node))
-        .alignItems(HorizontalAlign.Start)
-        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
       }
+      .width(getStyleAttr(this.node, 'width'))
+      .height(getStyleAttr(this.node, 'height'))
+      .flexGrow(this.node.hmStyle?.flexGrow)
+      .flexShrink(this.node.hmStyle?.flexShrink)
+      .scrollable(getScrollable(this.node))
+      .scrollBar(getAttributes(this.node).scrollBar)
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .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]
+      }))
+      .onScroll(shouldBindEvent(() => { handleScrollEvent(this.node, 'scroll') }, this.node, ['scroll']))
+      .onScrollStart(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollstart') }, this.node, ['scrollstart']))
+      .onScrollStop(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollend') }, this.node, ['scrollend']))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+      .onReachEnd(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrolltolower') }, this.node, ['scrolltolower']))
     }
-    .width(getNormalAttributes(node).width)
-    .height(getNormalAttributes(node).height)
-    .flexGrow(getNormalAttributes(node).flexGrow)
-    .scrollable(getScrollable(node))
-    .scrollBar(getAttributes(node).scrollBar)
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .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]
-    }))
-    .onScroll(shouldBindEvent(() => { handleScrollEvent(node, 'scroll') }, node, ['scroll']))
-    .onScrollStart(shouldBindEvent(() => { handleScrollEvent(node, 'scrollstart') }, node, ['scrollstart']))
-    .onScrollStop(shouldBindEvent(() => { handleScrollEvent(node, 'scrollend') }, node, ['scrollend']))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+  }
 }

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

@@ -1,8 +1,9 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroSliderElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroSliderElement, TaroEvent } from '@tarojs/runtime'
 
 interface SliderAttrs {
   selectedColor?: ResourceColor
@@ -11,71 +12,6 @@ interface SliderAttrs {
   blockColor?: ResourceColor
 }
 
-@Extend(Slider)
-function style (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(Slider)
 function attrs (attr: SliderAttrs) {
   .selectedColor(attr.selectedColor)
@@ -101,7 +37,9 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSlider {
-  node: TaroSliderElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroSliderElement) => void = this.customBuilder
+  @ObjectLink node: TaroSliderElement
 
   @State value: number = 0
 
@@ -126,7 +64,7 @@ export default struct TaroSlider {
       style: SliderStyle.OutSet,
       direction: Axis.Horizontal
     })
-      .style(getNormalAttributes(node))
+      .attributeModifier(commonStyleModify.setNode(node))
       .attrs(getAttributes(node))
       .width(!!node._attrs.showValue ? '90%' : '100%')
       .themeStyles(!!node._attrs.disabled)
@@ -138,7 +76,7 @@ export default struct TaroSlider {
         } else {
           this.value = value
           this.node?.updateFormWidgetValue(value)
-          
+
           if (mode === SliderChangeMode.End) {
             const event: TaroEvent = createTaroEvent('change', { detail: { value: this.value } }, node)
             eventHandler(event, 'change', node)
@@ -158,7 +96,7 @@ export default struct TaroSlider {
   }
 
   build() {
-    if (this.node) {
+    if (this.node && this.node.hmStyle?.display !== 'none') {
       if (!!this.node._attrs.showValue) {
         Row() {
           this.createSlider(this.node)
@@ -172,4 +110,4 @@ export default struct TaroSlider {
       }
     }
   }
-}
+}