@tarojs/plugin-platform-harmony-ets 3.7.0-alpha.27 → 4.0.0-alpha.10

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

@@ -1,59 +1,18 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo,
-  TaroElement,
-  TaroAny,
-  TaroEvent
-} from '@tarojs/runtime'
-
-import { createNode } from './render'
-import TaroComponentWrapper from './base'
-import { AttributeManager } from './utils/AttributeManager'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
+
+import commonStyleModify, { rowModify, columnModify } from './style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { createTaroEvent } from './utils/events'
-import { FlexManager } from './utils/FlexManager'
-import { shouldBindEvent, getNormalAttributes, getNodeThresholds, bindAnimation } from './utils/helper'
+import { FlexManager } from './utils/flexManager'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroRadioGroupElement, TaroRadioElement } from './element'
-import type { TaroStyleType, HarmonyType } from '@tarojs/runtime'
+import { TaroEvent, TaroAny, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
 
-interface RadioOptions {
-  group: string
-  value: string
-}
 interface RadioAttrs {
   radioStyle?: HarmonyType.RadioStyle
   themeStyles?: boolean
 }
 
-@Extend(Radio)
-function style (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)
-  .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(Radio)
 function radioAttr (attr: RadioAttrs) {
   .radioStyle(attr.radioStyle)
@@ -76,148 +35,119 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export struct TaroRadio {
-  nodeInfoMap: TaroAny = {}
-
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroRadioElement) => void = this.customBuilder
   @ObjectLink node: TaroRadioElement
-
-  @State checked: boolean = false
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-
-    this.checked = !!this.node._attrs.checked
-  }
-
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-    }))
+    if (this.node && !this.node._isInit) {
+      this.node._isInit = true
+      this.node._instance = this
+      this.node._reset = this.node.checked || false
+    }
   }
 
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      Stack() {
-        Row() {
-          Radio({
-            group: this.node.group || this.node.parentNode?._nid || '',
-            value: this.node._attrs.value || '',
-          })
-            .checked(this.checked)
-            .defaultEvent()
-            .style(getNormalAttributes(this.node))
-            .radioAttr(getAttributes(this.node))
-            .onChange((value: boolean) => {
-              if (!!this.node._attrs.disabled) {
-                // FIXME 找下文档是否有强制刷新方法
-                this.checked = !this.checked
-                this.checked = !this.checked
+  build () {
+    Stack() {
+      Row() {
+        Radio({
+          group: this.node.group || this.node.parentNode?._nid || '',
+          value: this.node.value || '',
+        })
+          .checked(this.node.checked)
+          .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+          .radioAttr(getAttributes(this.node))
+          .onChange((value: boolean) => {
+            if (this.node) {
+              if (!!this.node?._attrs.disabled) {
+                this.node.updateComponent()
               } else {
-                this.checked = value
-                if (this.checked) {
-                  const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node._attrs.value } }, this.node)
+                this.node.updateCheckedValue(value)
+
+                if (value) {
+                  const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, this.node)
                   eventHandler(event, 'change', this.node)
                 }
               }
-            })
-          Text(this.node.textContent)
-            .textAlign(TextAlign.Center)
-            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
-        }
-        .onClick(() => {
-          if (!this.checked) {
-            this.checked = !this.checked
-          }
-        })
+            }
+          })
+          .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+          .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+            if (this.node) {
+              this.node._nodeInfo.areaInfo = res[1]
+            }
+          }))
+          .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        Text(this.node.textContent)
+          .textAlign(TextAlign.Center)
+          .opacity(!!this.node?._attrs.disabled ? 0.4 : 1)
       }
+      .onClick(() => {
+        if (this.node) {
+          if (!this.node._checked && !this.node?._attrs.disabled) {
+            this.node.checked = !this.node.checked
+          }
+        }
+      })
     }
   }
 }
 
-@Extend(Flex)
-function radioGroupAttrs (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)
-  .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)
-}
-
 
 @Component
 export struct TaroRadioGroup {
-  nodeInfoMap: TaroAny = {}
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroRadioGroupElement) => void = this.customBuilder
+  @ObjectLink node: TaroRadioGroupElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   @Styles visibleChangeEvent () {
     .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
   }
 
-  @ObjectLink node: TaroRadioGroupElement
-
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-    const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
-    childList.forEach(element => {
-      element.group = this.node._attrs.name || this.node._nid
-    })
-    // 阻止事件冒泡传递上去
-    this.node.addEventListener('change', (e: TaroEvent) => e.stopPropagation())
-  }
-
-  // Element使用的获取器
-  getValue (): string | undefined {
-    const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
-    for (let i = 0; i < childList.length; i++) {
-      if (childList[i]._instance.checked) {
-        return childList[i]._attrs.value
-      }
+    if (this.node) {
+      this.node._instance = this
+      const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
+      childList.forEach(element => {
+        element.group = this.node?._attrs.name || this.node?._nid
+      })
+      // 阻止事件冒泡传递上去
+      this.node.addEventListener('change', (e: TaroEvent) => e.stopPropagation())
     }
-    return undefined
   }
 
   @Styles defaultEvent () {
     .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 => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
+    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      if (this.node) {
+        this.node._nodeInfo.areaInfo = res[1]
+      }
     }))
   }
 
   build() {
-    TaroComponentWrapper({ node: this.node }) {
+    if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
-        ForEach(this.node.childNodes, (item: TaroElement) => {
-          createNode(item)
-        }, (item: TaroElement) => item._nid)
+        this.createLazyChildren(this.node)
+      }
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .defaultEvent()
+      .visibleChangeEvent()
+    } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
+      Row() {
+        this.createLazyChildren(this.node)
+      }
+      .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .defaultEvent()
+      .visibleChangeEvent()
+    } else {
+      Column() {
+        this.createLazyChildren(this.node)
       }
-      .radioGroupAttrs(getNormalAttributes(this.node))
+      .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .defaultEvent()
       .visibleChangeEvent()
     }

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

@@ -1,97 +1,25 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo, TaroAny } from '@tarojs/runtime'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-import TaroComponentWrapper from './base'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent, bindAnimation } from './utils/helper'
+import commonStyleModify from './style'
+import { generateText } from './utils'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { RichTextProps } from '@tarojs/components/types/RichText'
-import type { TaroRichTextElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
-
-@Extend(RichText)
-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)
-  .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)
-}
+import type { TaroAny, TaroRichTextElement } from '@tarojs/runtime'
 
 @Component
 export default struct TaroRichText {
-  nodeInfoMap: TaroAny = {}
-
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroRichTextElement) => void = this.customBuilder
   @ObjectLink node: TaroRichTextElement
 
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
-  
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-  }
-
-  @Styles defaultEvent () {
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, res => {
-      const eventResult: TaroAny = res.eventResult
-      this.nodeInfoMap[this.node._nid].areaInfo = eventResult[1]
-    }))
-  }
-
-  generateText (): string {
-    return parseHtmlNode(this.node._attrs.nodes || '')
+  build () {
+    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))
   }
-
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      RichText(this.generateText())
-        .attrs(getNormalAttributes(this.node))
-        .defaultEvent()
-        .visibleChangeEvent()
-    }
-  }
-}
-
-
-// 将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>`
-}

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

@@ -0,0 +1,94 @@
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
+
+import commonStyleModify from './style'
+import { TOUCH_EVENT_MAP } from './utils/constant/event'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
+
+import type { TaroScrollViewElement, TaroAny, TaroEvent } from '@tarojs/runtime'
+
+interface ScrollViewAttrs {
+  scrollBar: BarState
+}
+interface ScrollViewCurrentOffset {
+  xOffset: number
+  yOffset: number
+}
+interface ScrollViewEvent {
+  deltaX: number
+  deltaY: number
+  scrollLeft: number
+  scrollTop: number
+  scrollWidth: number
+  scrollHeight: number
+}
+
+function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
+  const _attrs = node._attrs
+  const scrollAttrs: ScrollViewAttrs = {
+    scrollBar: typeof _attrs.showScrollbar === 'boolean'
+      ? _attrs.showScrollbar ? BarState.On : BarState.Off
+      : BarState.Auto
+  }
+  return scrollAttrs
+}
+
+function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', scrollOffset?: number) {
+  const currentOffset = node.scroller.currentOffset() as ScrollViewCurrentOffset
+  const currentXOffset = currentOffset?.xOffset || 0
+  const currentYOffset = currentOffset?.yOffset || 0
+  const value: ScrollViewEvent = {
+    deltaX: vp2px(node._attrs.scrollX ? scrollOffset : 0),
+    deltaY: vp2px(node._attrs.scrollX ? 0 : scrollOffset),
+    scrollLeft: vp2px(currentXOffset),
+    scrollTop: vp2px(currentYOffset),
+    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)
+}
+
+@Component
+export default struct TaroScrollList {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroScrollViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  handleScroll = (scrollOffset: number) => { 
+    handleScrollEvent(this.node, 'scroll', scrollOffset)
+  }
+
+  build() {
+    List({
+      scroller: this.node.scroller
+    }) {
+      this.createLazyChildren(this.node)
+    }
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .sticky(StickyStyle.Header)
+    .listDirection(this.node.getAttribute('scrollX') ? Axis.Horizontal: Axis.Vertical)
+    .align(Alignment.TopStart)
+    .clip(true)
+    .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]
+    }))
+    .onDidScroll(shouldBindEvent((scrollOffset: number) => { handleScrollEvent(this.node, 'scroll', scrollOffset) }, 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']))
+  }
+}
+
+