@tarojs/plugin-platform-harmony-ets 4.0.0-beta.7 → 4.0.0-beta.70

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

@@ -1,12 +1,12 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
-import { createLazyChildren } from './render'
-import { FlexManager } from './utils/FlexManager'
+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
@@ -49,79 +49,83 @@ 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)
 }
 
-@Extend(Row)
-function rowAttrs (style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-}
+@Component
+export default struct TaroScrollView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroScrollViewElement) => void = this.customBuilder
+  @ObjectLink node: TaroScrollViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
-@Extend(Column)
-function columnAttrs (style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    maxHeight: style.maxHeight
-  })
-}
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
 
-@Builder
-export default function TaroScrollView (node: TaroScrollViewElement) {
-    Scroll(node.scroller) {
-      if (node._attrs.scrollX) {
+  isScrollX() {
+    return this.node._attrs.scrollX || getStyleAttr(this.node, 'overflow') === 'scroll' && getStyleAttr(this.node, 'flexDirection') === FlexDirection.Row
+  }
+
+  build () {
+    Scroll(this.node.scroller) {
+      if (this.isScrollX()) {
         Row() {
-          createLazyChildren(node)
+          if (this.node._pseudo_before || this.node._pseudo_after) {
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+          } else {
+            this.createLazyChildren(this.node)
+          }
         }
-        .attributeModifier(commonStyleModify.setNode(node))
-        .rowAttrs(getNormalAttributes(node))
+        .alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
+        .justifyContent(FlexManager.justifyContent(this.node))
+        .height(getStyleAttr(this.node, 'height'))
         .width(null)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
-        .alignItems(FlexManager.flexOptions(node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(node).justifyContent)
+          this.node._nodeInfo._scroll = areaResult
+        }, this.node, ['scroll', 'scrollstart', 'scrollend']))
         .flexGrow(0).flexShrink(0)
       } else {
         Column() {
-          createLazyChildren(node)
+          if (this.node._pseudo_before || this.node._pseudo_after) {
+            PseduoChildren({ node: this.node, createLazyChildren: this.createLazyChildren })
+          } else {
+            this.createLazyChildren(this.node)
+          }
         }
-        .attributeModifier(commonStyleModify.setNode(node))
-        .columnAttrs(getNormalAttributes(node))
+        .alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
+        .justifyContent(FlexManager.justifyContent(this.node))
+        .width(getStyleAttr(this.node, 'width'))
         .height(null)
-        .alignItems(HorizontalAlign.Start)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          node._scroll = areaResult
-        }, node, ['scroll', 'scrollstart', 'scrollend']))
-        .alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(node).justifyContent)
+          this.node._nodeInfo._scroll = areaResult
+        }, this.node, ['scroll', 'scrollstart', 'scrollend']))
         .flexGrow(0).flexShrink(0)
       }
     }
-    .width(getNormalAttributes(node).width)
-    .height(getNormalAttributes(node).height)
-    .flexGrow(getNormalAttributes(node).flexGrow)
-    .flexShrink(getNormalAttributes(node).flexShrink)
-    .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]
+    .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]
     }))
-    .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))
+    .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

@@ -37,9 +37,12 @@ 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
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node) {
@@ -62,7 +65,7 @@ export default struct TaroSlider {
       style: SliderStyle.OutSet,
       direction: Axis.Horizontal
     })
-      .attributeModifier(commonStyleModify.setNode(node))
+      .attributeModifier(commonStyleModify.setNode(node).setAnimationStyle(this.overwriteStyle))
       .attrs(getAttributes(node))
       .width(!!node._attrs.showValue ? '90%' : '100%')
       .themeStyles(!!node._attrs.disabled)
@@ -74,7 +77,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)
@@ -94,18 +97,16 @@ export default struct TaroSlider {
   }
 
   build() {
-    if (this.node) {
-      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 {
+    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))
+  }
+}