@tarojs/plugin-platform-harmony-ets 4.0.0-canary.8 → 4.0.0

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

@@ -1,143 +1,13 @@
 import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, TaroPickerElement, createTaroEvent } from '@tarojs/runtime'
-import { createLazyChildren } from './render'
+import commonStyleModify from './style'
 import { getSingleSelector, getMultiSelector } from './utils'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { FlexManager } from './utils/flexManager'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroEvent } from '@tarojs/runtime'
 
-import { PickerDateProps, PickerMultiSelectorProps, PickerSelectorProps, PickerTimeProps } from './types'
-
-@Extend(TextPicker)
-function textPickerAttrs (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 || '100%')
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor || '#fff')
-  .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(DatePicker)
-function datePickerAttrs (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 || '100%')
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundColor(style.backgroundColor || '#fff')
-  .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)
-}
+import { PickerDateProps, PickerMultiSelectorProps, PickerSelectorProps, PickerTimeProps } from '@tarojs/components/types'
 
 interface TimeRange {
   startHH: number
@@ -197,7 +67,7 @@ export struct PickerView {
         const left = generateNumberArray(timeRange.startHH, timeRange.endHH)
         const right =  generateNumberArray(timeRange.startMM, timeRange.endMM)
         const range = [left, right]
-        const _selected = _attrs.value.split(':')
+        const _selected = _attrs.value?.split(':') as string[]
         return {
           range: range,
           selected: [left.findIndex(i => parseInt(_selected[0]) === Number(i)), right.findIndex(i => parseInt(_selected[1]) === Number(i))],
@@ -275,7 +145,10 @@ export struct PickerView {
               color: '#000'
             })
             .canLoop(false)
-            .textPickerAttrs(getNormalAttributes(this.node))
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onChange((_, index) => {
               this.node?.updateFormWidgetValue(index)
             })
@@ -285,7 +158,10 @@ export struct PickerView {
               color: '#000'
             })
             .canLoop(false)
-            .textPickerAttrs(getNormalAttributes(this.node))
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onChange((_, index) => {
               if (index instanceof Array) {
                 this.node?.updateFormWidgetValue(index)
@@ -312,7 +188,10 @@ export struct PickerView {
             .selectedTextStyle({
               color: '#000'
             })
-            .datePickerAttrs(getNormalAttributes(this.node))
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onDateChange(value => {
               const data = value.toLocaleDateString().split('/')
               const day = data[1]
@@ -326,7 +205,10 @@ export struct PickerView {
               color: '#000'
             })
             .canLoop(false)
-            .textPickerAttrs(getNormalAttributes(this.node))
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onChange((value) => {
               this.node?.updateFormWidgetValue(`${('00'+value[0]).slice(-2)}:${('00'+value[1]).slice(-2)}`)
             })
@@ -340,9 +222,12 @@ export struct PickerView {
   }
 }
 
+
 @Component
 export default struct TaroPicker {
-  node: TaroPickerElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroPickerElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroPickerElement
 
   aboutToAppear () {
     this.node?.addEventListener('click', this.handleClick)
@@ -358,8 +243,8 @@ export default struct TaroPicker {
           break
         case 'time': {
           const hour = new Date().getHours()
-          const minute = new Date().getMinutes() 
-  
+          const minute = new Date().getMinutes()
+
           defaultResetValue = `${('00'+hour).slice(-2)}:${('00'+minute).slice(-2)}`
           break
         }
@@ -368,7 +253,7 @@ export default struct TaroPicker {
           const day = data[1]
           const month = data[0]
           const year = data[2]
-  
+
           defaultResetValue = `${year}-${month}-${day}`
           break
         }
@@ -376,7 +261,7 @@ export default struct TaroPicker {
           defaultResetValue = ''
           break
       }
-  
+
       this.node._isInit = true
       this.node._reset = this.node.value || defaultResetValue
     }
@@ -413,7 +298,7 @@ export default struct TaroPicker {
     .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()))
+    .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) => {
       if (this.node) {
         this.node._nodeInfo.areaInfo = res[1]
@@ -426,24 +311,22 @@ export default struct TaroPicker {
   }
 
   build() {
-    if (this.node) {
-      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
-        Row() {
-          createLazyChildren(this.node)
-        }
-        .defaultEvent()
-        .visibleChangeEvent()
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-      } else {
-        Column() {
-          createLazyChildren(this.node)
-        }
-        .defaultEvent()
-        .visibleChangeEvent()
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+    if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
+      Row() {
+        this.createLazyChildren(this.node, 0)
+      }
+      .defaultEvent()
+      .visibleChangeEvent()
+      .alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
+      .justifyContent(FlexManager.justifyContent(this.node))
+    } else {
+      Column() {
+        this.createLazyChildren(this.node, 0)
       }
+      .defaultEvent()
+      .visibleChangeEvent()
+      .alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
+      .justifyContent(FlexManager.justifyContent(this.node))
     }
   }
 }

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

@@ -0,0 +1,52 @@
+import type { TaroProgressElement, TaroAny } from '@tarojs/runtime'
+import commonStyleModify from './style'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
+
+const PROGRESS_ACTIVECOLOR = '#09BB07'
+const PROGRESS_BACKGROUNDCOLOR = '#EBEBEB'
+const PROGRESS_DEFAULTINFOFONTSIZE = 16
+
+@Component
+export default struct TaroProgress {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroProgressElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroProgressElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build() {
+    Row({ space: 5 }) {
+      Progress({
+        value: parseFloat(this.node.getAttribute('percent')),
+        type: ProgressType.Linear
+      })
+        .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+        .color(this.node.getAttribute('activeColor') ?? PROGRESS_ACTIVECOLOR)
+        .backgroundColor(this.node.getAttribute('backgroundColor') ?? PROGRESS_BACKGROUNDCOLOR)
+        .style({
+          strokeWidth: this.node.getAttribute('strokeWidth'),
+          strokeRadius: parseFloat(this.node.getAttribute('borderRadius')),
+          enableSmoothEffect: Boolean(this.node.getAttribute('active')),
+        })
+
+        .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          if (this.node) {
+            this.node._nodeInfo.areaInfo = res[1]
+          }
+        }))
+
+      if (this.node.getAttribute('showInfo')) {
+        Text(`${this.node.getAttribute('percent')}%`)
+          .fontSize(this.node.getAttribute('fontSize') ?? PROGRESS_DEFAULTINFOFONTSIZE)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,80 @@
+import { getFontAttributes } from './utils/helper'
+import { pseudoModify } from './style'
+
+import type { TaroViewElement, TaroStyleType, TaroTextStyleType, TaroAny } from '@tarojs/runtime'
+
+@Extend(Flex)
+function flexAttrs (style: TaroStyleType) {
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight || style.height,
+    maxHeight: style.maxHeight
+  })
+}
+
+
+@Extend(Text)
+function textNormalFontStyle (style: TaroStyleType) {
+  .id(style.id)
+  .key(style.id)
+  .opacity(style.opacity)
+  .fontColor(style.color)
+  .fontSize(style.fontSize)
+  .fontWeight(style.fontWeight)
+  .fontStyle(style.fontStyle)
+  .fontFamily(style.fontFamily)
+  .decoration({
+    type: style.textDecoration?.type || TextDecorationType.None,
+    color: style.color
+  })
+}
+
+@Extend(Text)
+function textSpecialFontStyle(attr: TaroTextStyleType) {
+  .textAlign(attr.textAlign)
+  .align(attr.verticalAlign)
+  .textOverflow(attr.textOverflow)
+  .maxLines(attr.WebkitLineClamp)
+  .letterSpacing(attr.letterSpacing)
+  .lineHeight(attr.lineHeight)
+}
+
+@Component
+export default struct PseduoChildren {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroAny, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroViewElement
+
+  build () {
+    if (true) {
+      // 伪类::Before
+      if (this.node._pseudo_before) {
+        if (this.node._pseudo_before?.hmStyle.content) {
+          Text(this.node._pseudo_before.hmStyle.content)
+            .attributeModifier(pseudoModify.setStyle(this.node._pseudo_before.hmStyle))
+            .textNormalFontStyle(this.node._pseudo_before.hmStyle || {})
+            .textSpecialFontStyle(getFontAttributes(this.node))
+        } else {
+          Flex() {}
+          .attributeModifier(pseudoModify.setStyle(this.node._pseudo_before.hmStyle || {}))
+          .flexAttrs(this.node._pseudo_before.hmStyle || {})
+        }
+      }
+      this.createLazyChildren(this.node, 0)
+      // 伪类::After
+      if (this.node._pseudo_after) {
+        if (this.node._pseudo_after?.hmStyle.content) {
+          Text(this.node._pseudo_after.hmStyle.content)
+            .attributeModifier(pseudoModify.setStyle(this.node._pseudo_after.hmStyle))
+            .textNormalFontStyle(this.node._pseudo_after.hmStyle || {})
+            .textSpecialFontStyle(getFontAttributes(this.node))
+        } else {
+          Flex() {}
+          .attributeModifier(pseudoModify.setStyle(this.node._pseudo_after.hmStyle || {}))
+          .flexAttrs(this.node._pseudo_after.hmStyle || {})
+        }
+      }
+    }
+  }
+}