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

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

@@ -1,14 +1,12 @@
-import { bindScrollTo, bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo,
-  TaroEvent, TaroAny } from '@tarojs/runtime'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { createNode } from './render'
-import TaroComponentWrapper from './base'
+import commonStyleModify from './style'
+import PseduoChildren from './pseudo'
+import { FlexManager } from './utils/flexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { createTaroEvent } from './utils/events'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent, bindAnimation } from './utils/helper'
+import { getNodeThresholds, getStyleAttr, shouldBindEvent } from './utils/helper'
 
-import type { TaroScrollViewElement, TaroElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroScrollViewElement, TaroEvent } from '@tarojs/runtime'
 
 interface ScrollViewAttrs {
   scrollBar: BarState
@@ -26,67 +24,6 @@ interface ScrollViewEvent {
   scrollHeight: number
 }
 
-@Extend(Row)
-function rowAttrs (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(Column)
-function columnAttrs (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)
-}
-
-
 function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
   const _attrs = node._attrs
   const scrollAttrs: ScrollViewAttrs = {
@@ -97,103 +34,98 @@ function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
   return scrollAttrs
 }
 
+function getScrollable (node: TaroScrollViewElement) {
+  const _attrs = node._attrs
 
-@Component
-export default struct TaroScrollView {
-  nodeInfoMap: TaroAny = {}
-
-  wrapper?: Area
+  return _attrs.scrollX ? ScrollDirection.Horizontal : ScrollDirection.Vertical
+}
 
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', xOffset?: number, yOffset?: number) {
+  const currentOffset = node.scroller.currentOffset() as ScrollViewCurrentOffset
+  const currentXOffset = currentOffset.xOffset
+  const currentYOffset = currentOffset.yOffset
+  const value: ScrollViewEvent = {
+    deltaX: vp2px(xOffset),
+    deltaY: vp2px(yOffset),
+    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)
 
-  scroller: Scroller = new Scroller()
+  eventHandler(event, eventName, node)
+}
 
+@Component
+export default struct TaroScrollView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
   @ObjectLink node: TaroScrollViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
-  aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
-    // 绑定动画
-    bindAnimation(this.node)
-    bindScrollTo(this.node, this)
-  }
-
-  @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]
-    }))
-  }
-
-  @Styles defaultContainerEvent () {
-    .onAreaChange(shouldBindEvent((areaResult: Area) => {
-      this.wrapper = areaResult
-    }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
   }
 
-
-  handleScrollEvent (eventName = 'scroll', xOffset?: number, yOffset?: number) {
-    const currentOffset: ScrollViewCurrentOffset = this.scroller.currentOffset()
-    const currentXOffset = currentOffset.xOffset
-    const currentYOffset = currentOffset.yOffset
-    const value: ScrollViewEvent = {
-      deltaX: vp2px(xOffset),
-      deltaY: vp2px(yOffset),
-      scrollLeft: vp2px(currentXOffset),
-      scrollTop: vp2px(currentYOffset),
-      scrollWidth: vp2px(Number(this.wrapper?.width)),
-      scrollHeight: vp2px(Number(this.wrapper?.height)),
-    }
-    const event: TaroEvent = createTaroEvent(eventName, { detail: value }, this.node)
-    eventHandler(event, eventName, this.node)
+  isScrollX() {
+    return this.node._attrs.scrollX || getStyleAttr(this.node, 'overflow') === 'scroll' && getStyleAttr(this.node, 'flexDirection') === FlexDirection.Row
   }
 
-  build() {
-    TaroComponentWrapper({ node: this.node }) {
-      // Copy 额外增加visibleChangeEvent
-      if (this.node._attrs.scrollX) {
-        Scroll(this.scroller) {
-          Row() {
-            ForEach(this.node.childNodes, (item: TaroElement) => {
-              createNode(item)
-            }, (item: TaroElement) => item._nid)
+  build () {
+    Scroll(this.node.scroller) {
+      if (this.isScrollX()) {
+        Row() {
+          if (this.node._pseudo_before || this.node._pseudo_after) {
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+          } else {
+            this.createLazyChildren(this.node)
           }
-          .rowAttrs(getNormalAttributes(this.node))
-          .width(null)
-          .defaultContainerEvent()
         }
-        .flexGrow(getNormalAttributes(this.node).flexGrow)
-        .scrollable(ScrollDirection.Horizontal)
-        .scrollBar(getAttributes(this.node).scrollBar)
-        .defaultEvent()
-        .onScroll(shouldBindEvent(() => { this.handleScrollEvent('scroll') }, this.node, ['scroll']))
-        .onScrollStart(shouldBindEvent(() => { this.handleScrollEvent('scrollstart') }, this.node, ['scrollstart']))
-        .onScrollStop(shouldBindEvent(() => { this.handleScrollEvent('scrollend') }, this.node, ['scrollend']))
-        .visibleChangeEvent()
+        .alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
+        .justifyContent(FlexManager.justifyContent(this.node))
+        .height(getStyleAttr(this.node, 'height'))
+        .width(null)
+        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+          this.node._nodeInfo._scroll = areaResult
+        }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+        .flexGrow(0).flexShrink(0)
       } else {
-        Scroll(this.scroller) {
-          Column() {
-            ForEach(this.node.childNodes, (item: TaroElement) => {
-              createNode(item)
-            }, (item: TaroElement) => item._nid)
+        Column() {
+          if (this.node._pseudo_before || this.node._pseudo_after) {
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+          } else {
+            this.createLazyChildren(this.node)
           }
-          .columnAttrs(getNormalAttributes(this.node))
-          .height(null)
-          .defaultContainerEvent()
         }
-        .flexGrow(getNormalAttributes(this.node).flexGrow)
-        .scrollable(ScrollDirection.Vertical)
-        .scrollBar(getAttributes(this.node).scrollBar)
-        .defaultEvent()
-        .onScroll(shouldBindEvent(() => { this.handleScrollEvent('scroll') }, this.node, ['scroll']))
-        .onScrollStart(shouldBindEvent(() => { this.handleScrollEvent('scrollstart') }, this.node, ['scrollstart']))
-        .onScrollStop(shouldBindEvent(() => { this.handleScrollEvent('scrollend') }, this.node, ['scrollend']))
-        .visibleChangeEvent()
+        .alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
+        .justifyContent(FlexManager.justifyContent(this.node))
+        .width(getStyleAttr(this.node, 'width'))
+        .height(null)
+        .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
+          this.node._nodeInfo._scroll = areaResult
+        }, this.node, ['scroll', 'scrollstart', 'scrollend']))
+        .flexGrow(0).flexShrink(0)
       }
     }
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .width(this.isScrollX() ? getStyleAttr(this.node, 'width') : undefined)
+    .height(!this.isScrollX() ? getStyleAttr(this.node, 'height') : undefined)
+    .align(Alignment.TopStart)
+    .clip(true)
+    .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]
+    }))
+    .onDidScroll(shouldBindEvent((xOffset: number, yOffset: number) => { handleScrollEvent(this.node, 'scroll', xOffset, yOffset) }, 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']))
   }
 }

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

@@ -1,60 +1,16 @@
-import { bindInstanceToNode, eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, initComponentNodeInfo,
-  TaroEvent, TaroAny } from '@tarojs/runtime'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import TaroComponentWrapper from './base'
-import { createTaroEvent } from './utils/events'
-import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroSliderElement } from './element'
-import type { TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroSliderElement, TaroEvent } from '@tarojs/runtime'
 
-interface SliderOptions {
-  min?: number
-  max?: number
-  value?: number
-  step?: number
-  style?: SliderStyle
-  direction?: Axis
-}
 interface SliderAttrs {
   selectedColor?: ResourceColor
   trackColor?: ResourceColor
   trackThickness?: Length
   blockColor?: ResourceColor
 }
-interface SliderParams {
-  width: string
-}
-
-@Extend(Slider)
-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(Slider)
 function attrs (attr: SliderAttrs) {
@@ -81,79 +37,76 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export default struct TaroSlider {
-  nodeInfoMap: TaroAny = {}
-
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroSliderElement) => void = this.customBuilder
   @ObjectLink node: TaroSliderElement
 
   @State value: number = 0
-
-  @Styles visibleChangeEvent () {
-    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-  }
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
-    initComponentNodeInfo(this, this.node)
-    bindInstanceToNode(this.node, this)
+    if (this.node) {
+      this.value = this.node.value
+      this.node._instance = this
 
-    this.value = Number(this.node._attrs.value || 0)
-  }
-
-  @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._isInit) {
+        this.node._isInit = true
+        this.node._reset = this.node.value || 0
+      }
+    }
   }
 
-  @Builder createSlider () {
+  @Builder createSlider (node: TaroSliderElement) {
     Slider({
-      min: Number(this.node._attrs.min || 0),
-      max: Number(this.node._attrs.max || 100),
+      min: Number(node._attrs.min || 0),
+      max: Number(node._attrs.max || 100),
       value: this.value,
-      step: Number(this.node._attrs.step || 1),
+      step: Number(node._attrs.step || 1),
       style: SliderStyle.OutSet,
       direction: Axis.Horizontal
     })
-      .defaultEvent()
-      .style(getNormalAttributes(this.node))
-      .attrs(getAttributes(this.node))
-      .width(!!this.node._attrs.showValue ? '90%' : '100%')
-      .themeStyles(!!this.node._attrs.disabled)
+      .attributeModifier(commonStyleModify.setNode(node).setAnimationStyle(this.overwriteStyle))
+      .attrs(getAttributes(node))
+      .width(!!node._attrs.showValue ? '90%' : '100%')
+      .themeStyles(!!node._attrs.disabled)
       .onChange((value: number, mode: SliderChangeMode) => {
-        if (!!this.node._attrs.disabled) {
+        if (!!node._attrs.disabled) {
           if (mode === SliderChangeMode.End) {
-            // FIXME 找下文档是否有强制刷新方法
-            this.value = this.value + 0.01
-            this.value = this.value - 0.01
+            this.node?.updateComponent()
           }
         } else {
           this.value = value
+          this.node?.updateFormWidgetValue(value)
+
           if (mode === SliderChangeMode.End) {
-            const event: TaroEvent = createTaroEvent('change', { detail: { value: this.value } }, this.node)
-            eventHandler(event, 'change', this.node)
+            const event: TaroEvent = createTaroEvent('change', { detail: { value: this.value } }, node)
+            eventHandler(event, 'change', node)
           } else if (mode === SliderChangeMode.Moving) {
-            const event: TaroEvent = createTaroEvent('changing', { detail: { value: this.value } }, this.node)
-            eventHandler(event, 'changing', this.node)
+            const event: TaroEvent = createTaroEvent('changing', { detail: { value: this.value } }, node)
+            eventHandler(event, 'changing', node)
           }
         }
       })
-      .visibleChangeEvent()
+      .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))
   }
 
   build() {
-    TaroComponentWrapper({ node: this.node }) {
-      if (!!this.node._attrs.showValue) {
-        Row() {
-          this.createSlider()
-          Text(Number(this.value).toFixed(0))
-            .width('10%')
-            .textAlign(TextAlign.Center)
-            .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
-        }
-      } else {
-        this.createSlider()
+    if (!!this.node._attrs.showValue) {
+      Row() {
+        this.createSlider(this.node)
+        Text(Number(this.value).toFixed(0))
+          .width('10%')
+          .textAlign(TextAlign.Center)
+          .opacity(!!this.node._attrs.disabled ? 0.4 : 1)
       }
+    } else {
+      this.createSlider(this.node)
     }
   }
 }

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

@@ -0,0 +1,42 @@
+import commonStyleModify from './style'
+
+import type { TaroViewElement, TaroElement, TaroAny } from '@tarojs/runtime'
+
+@Component
+export default struct TaroStickySection {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  @Builder
+  itemHead(header: TaroViewElement) {
+    Stack() {
+      LazyForEach(header, (item: TaroElement) => {
+        if (item.tagName === 'STICKY-HEADER') {
+          this.createLazyChildren(item as TaroViewElement)
+        }
+      }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`)
+    }
+  }
+
+  build() {
+    ListItemGroup({
+      header: this.itemHead(this.node)
+    }) {
+      ForEach(this.node.children, (item: TaroElement) => {
+        if (item.tagName === 'LIST-VIEW') {
+          this.createLazyChildren(item as TaroViewElement)
+        }
+      }, (item: TaroElement) => `${item._nid}-${item._nodeInfo?.layer || 0}`)
+
+    }
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+  }
+}