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

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

@@ -0,0 +1,410 @@
+import type { TaroAny, HarmonyStyle, TaroElement, TaroStyleType, TaroTextElement }  from '@tarojs/runtime'
+import { ObjectAssign }  from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
+import { computeBackgroundPosition, convertVp2Px } from './utils'
+import { getNormalAttributes } from './utils/helper'
+import { isMaxWidthView } from './utils/styles'
+import { FlexManager } from './utils/flexManager'
+
+class TextStyleModify implements AttributeModifier<TextAttribute> {
+  initStyle?: TaroStyleType
+  node: TaroTextElement | null = null
+  style: HarmonyStyle | null = null
+  overwriteStyle: Record<string, TaroAny> = {}
+  withNormal: boolean = false
+
+  setNode (node: TaroTextElement, initStyle?: HarmonyStyle) {
+    this.node = node
+    this.withNormal = false
+    this.overwriteStyle = {}
+    this.style = getNormalAttributes(this.node)
+    this.initStyle = initStyle
+    // 覆盖初始化样式
+    if (initStyle) {
+      Object.keys(initStyle).forEach(key => {
+        if (this.style && !this.style[key]) {
+          this.style[key] = initStyle[key]
+        }
+      })
+    }
+    return this
+  }
+
+  withNormalStyle () {
+    this.withNormal = true
+    return this
+  }
+
+  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
+    this.overwriteStyle = overwriteStyle
+    if (this.style && this.overwriteStyle && Object.keys(this.overwriteStyle).length) {
+      // 防止污染原始样式
+      this.style = ObjectAssign({}, this.style)
+      Object.keys(this.overwriteStyle).forEach(key => {
+        this.style![key] = this.overwriteStyle[key]
+      })
+    }
+    return this
+  }
+
+  applyNormalAttribute(instance: TextAttribute): void {
+    if (this.node && this.style) {
+      if (this.withNormal) {
+        setNormalAttributeIntoInstance(instance, this.style, this.node)
+        setTransformAttributeIntoInstance(instance, this.style || {})
+      }
+      setNormalTextAttributeIntoInstance(instance, this.style, this.node)
+      setSpecialTextAttributeIntoInstance(instance, this.style, this.node)
+    }
+
+  }
+}
+
+class CommonStyleModify implements AttributeModifier<CommonAttribute> {
+  initStyle?: TaroStyleType
+  node: TaroElement | null = null
+  style: TaroStyleType | null = null
+  overwriteStyle: TaroStyleType = {}
+
+  setNode (node: TaroElement, initStyle?: TaroStyleType) {
+    this.node = node
+    this.style = getNormalAttributes(this.node)
+    this.initStyle = initStyle
+    this.overwriteStyle = {}
+    // 覆盖初始化样式
+    if (initStyle) {
+      Object.keys(initStyle).forEach(key => {
+        if (this.style && !this.style[key]) {
+          this.style[key] = initStyle[key]
+        }
+      })
+    }
+    return this
+  }
+  
+  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
+    this.overwriteStyle = overwriteStyle
+    if (this.style && this.overwriteStyle && Object.keys(this.overwriteStyle).length) {
+      // 防止污染原始样式
+      this.style = ObjectAssign({}, this.style)
+      Object.keys(this.overwriteStyle).forEach(key => {
+        this.style![key] = this.overwriteStyle[key]
+      })
+    }
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.node && this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      setTransformAttributeIntoInstance(instance, this.style || {})
+    }
+  }
+}
+
+class PseudoStyleModify implements AttributeModifier<CommonAttribute> {
+  style: TaroStyleType | null = null
+
+  setStyle (style: HarmonyStyle) {
+    this.style = style
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style)
+      setTransformAttributeIntoInstance(instance, this.style || {})
+    }
+  }
+}
+
+class RowStyleModify extends CommonStyleModify {
+
+  applyNormalAttribute(instance: RowAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      instance.constraintSize({
+        minWidth: this.style.minWidth || this.style.width,
+        maxWidth: this.style.maxWidth,
+        minHeight: this.style.minHeight,
+        maxHeight: this.style.maxHeight
+      })
+      if (this.node) {
+        instance.alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
+        instance.justifyContent(FlexManager.justifyContent(this.node))
+      }
+      setTransformAttributeIntoInstance(instance, this.style || {})
+    }
+
+  }
+}
+
+class ColumnStyleModify extends CommonStyleModify {
+  applyNormalAttribute(instance: ColumnAttribute): void {
+    if (this.style) {
+      setNormalAttributeIntoInstance(instance, this.style, this.node)
+      instance.constraintSize({
+        minWidth: this.style.minWidth,
+        maxWidth: this.style.maxWidth,
+        minHeight: this.style.minHeight || this.style.height,
+        maxHeight: this.style.maxHeight
+      })
+      if (this.node) {
+        instance.alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
+        instance.justifyContent(FlexManager.justifyContent(this.node))
+      }
+      setTransformAttributeIntoInstance(instance, this.style || {})
+    }
+
+  }
+}
+
+export function setTransformAttributeIntoInstance(instance: CommonAttribute, style: TaroStyleType) {
+  // Animation 需要提前和 @State 变量绑定才能产生动画效果，因此不能做 if else 判断
+  instance.translate({
+    x: style.transform?.Translate?.x,
+    y: style.transform?.Translate?.y,
+    z: style.transform?.Translate?.z,
+  })
+  instance.scale({
+    x: style.transform?.Scale?.x,
+    y: style.transform?.Scale?.y,
+    z: style.transform?.Scale?.z,
+    centerX: style.transformOrigin?.x,
+    centerY: style.transformOrigin?.y,
+  })
+  instance.rotate({
+    x: style.transform?.Rotate?.x,
+    y: style.transform?.Rotate?.y,
+    z: style.transform?.Rotate?.z,
+    centerX: style.transformOrigin?.x,
+    centerY: style.transformOrigin?.y,
+    angle: style.transform?.Rotate?.angle || 0,
+  })
+}
+
+export function setNormalTextAttributeIntoInstance(instance: TextAttribute | SpanAttribute, style: HarmonyStyle, node?: TaroTextElement | null) {
+  if (!isUndefined(style.color)) {
+    instance.fontColor(style.color)
+  }
+  if (!isUndefined(style.fontSize)) {
+    instance.fontSize(style.fontSize)
+  }
+  if (!isUndefined(style.fontWeight)) {
+    instance.fontWeight(style.fontWeight)
+  }
+  if (!isUndefined(style.fontStyle)) {
+    instance.fontStyle(style.fontStyle)
+  }
+  if (!isUndefined(style.fontFamily)) {
+    instance.fontFamily(style.fontFamily)
+  }
+  if (!isUndefined(style.textDecoration)) {
+    instance.decoration({
+      type: style.textDecoration.type,
+      color: style.color
+    })
+  }
+}
+
+export function setSpecialTextAttributeIntoInstance(instance: TextAttribute, style: HarmonyStyle, node?: TaroTextElement | null) {
+  if (!isUndefined(style.textAlign)) {
+    instance.textAlign(style.textAlign)
+  }
+  if (!isUndefined(style.verticalAlign)) {
+    instance.align(style.verticalAlign)
+  }
+  if (!isUndefined(style.textOverflow)) {
+    instance.textOverflow(style.textOverflow)
+  }
+  if (!isUndefined(style.whiteSpace) && style.whiteSpace === 'nowrap') {
+    instance.maxLines(1)
+  }
+  if (!isUndefined(style.WebkitLineClamp)) {
+    instance.maxLines(style.WebkitLineClamp)
+    instance.textOverflow({overflow: TextOverflow.Ellipsis})
+  }
+  if (!isUndefined(style.letterSpacing)) {
+    instance.letterSpacing(style.letterSpacing)
+  }
+  if (!isUndefined(style.lineHeight)) {
+    instance.lineHeight(style.lineHeight)
+  }
+  if (!isUndefined(style.wordBreak)) {
+    if (style.wordBreak == 'break-all') {
+      instance.wordBreak(WordBreak.BREAK_ALL)
+    } else if (style.wordBreak == 'break-word') {
+      instance.wordBreak(WordBreak.BREAK_WORD)
+    } else if (style.wordBreak == 'normal') {
+      instance.wordBreak(WordBreak.NORMAL)
+    }
+  }
+}
+
+export function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroStyleType, node?: TaroElement | null) {
+  instance.renderFit(RenderFit.RESIZE_FILL)
+  if (!isUndefined(style.id)) {
+    instance.id(style.id)
+    instance.key(style.id)
+  }
+  if (!isUndefined(style.display) || !isUndefined(style.visibility)) {
+    instance.visibility(style.display === 'none' 
+      ? Visibility.None : 
+      !isUndefined(style.visibility) 
+        ? (style.visibility === 'hidden' ? Visibility.Hidden :  Visibility.Visible)
+        : Visibility.Visible
+    )
+  }
+  if (!isUndefined(style.flexGrow)) {
+    instance.flexGrow(style.flexGrow)
+  }
+  if (!isUndefined(style.flexShrink)) {
+    instance.flexShrink(style.flexShrink)
+  }
+  if (!isUndefined(style.flexBasis)) {
+    instance.flexBasis(style.flexBasis)
+  }
+  if (!isUndefined(style.alignSelf)) {
+    instance.alignSelf(style.alignSelf)
+  }
+  if (!isUndefined(style.paddingTop) || !isUndefined(style.paddingRight) || !isUndefined(style.paddingBottom) || !isUndefined(style.paddingLeft)) {
+    instance.padding({
+      top: style.paddingTop,
+      right: style.paddingRight,
+      bottom: style.paddingBottom,
+      left: style.paddingLeft
+    })
+  }
+  if (!isUndefined(style.marginTop) || !isUndefined(style.marginRight) || !isUndefined(style.marginBottom) || !isUndefined(style.marginLeft)) {
+    instance.margin({
+      top: style.marginTop,
+      right: style.marginRight,
+      bottom: style.marginBottom,
+      left: style.marginLeft
+    })
+  }
+  if (node) {
+    instance.width(isMaxWidthView(node as TaroElement) && isUndefined(style.width) ? '100%' : style.width)
+  } else {
+    if (!isUndefined(style.width)) {
+      instance.width(style.width)
+    }
+  }
+  if (!isUndefined(style.height)) {
+    instance.height(style.height)
+  }
+  if (!isUndefined(style.minWidth) || !isUndefined(style.maxWidth) || !isUndefined(style.minHeight) || !isUndefined(style.maxHeight)) {
+    instance.constraintSize({
+      minWidth: style.minWidth,
+      maxWidth: style.maxWidth,
+      minHeight: style.minHeight,
+      maxHeight: style.maxHeight
+    })
+  }
+  if (!isUndefined(style.backgroundColor)) {
+    instance.backgroundColor(style.backgroundColor)
+  }
+  if (!isUndefined(style.backgroundImage)) {
+    if (style.backgroundImage.center) {
+      // radialGradient
+      instance.radialGradient(style.backgroundImage)
+    } else if (style.backgroundImage.colors) {
+      // linearGradient
+      instance.linearGradient(style.backgroundImage)
+    } else {
+      instance.backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
+    }
+  }
+  if (!isUndefined(style.backgroundSize)) {
+    instance.backgroundImageSize(style.backgroundSize)
+  }
+  if (!isUndefined(style.backgroundPosition)) {
+    if (typeof style.backgroundPosition !== 'number') {
+      let pos = computeBackgroundPosition(style)
+      instance.backgroundImagePosition({
+        x: pos.offsetX,
+        y: pos.offsetY,
+      })
+    } else {
+      instance.backgroundImagePosition(style.backgroundPosition)
+    }
+  }
+  if (!isUndefined(style.borderTopStyle) || !isUndefined(style.borderRightStyle) || !isUndefined(style.borderBottomStyle) || !isUndefined(style.borderLeftStyle)) {
+    instance.borderStyle({
+      top: style.borderTopStyle,
+      right: style.borderRightStyle,
+      bottom: style.borderBottomStyle,
+      left: style.borderLeftStyle
+    })
+  }
+  if (!isUndefined(style.borderTopWidth) || !isUndefined(style.borderRightWidth) || !isUndefined(style.borderBottomWidth) || !isUndefined(style.borderLeftWidth)) {
+    instance.borderWidth({
+      top: style.borderTopWidth,
+      right: style.borderRightWidth,
+      bottom: style.borderBottomWidth,
+      left: style.borderLeftWidth
+    })
+  }
+  if (!isUndefined(style.borderTopColor) || !isUndefined(style.borderRightColor) || !isUndefined(style.borderBottomColor) || !isUndefined(style.borderLeftColor)) {
+    instance.borderColor({
+      top: style.borderTopColor,
+      right: style.borderRightColor,
+      bottom: style.borderBottomColor,
+      left: style.borderLeftColor
+    })
+  }
+  if (!isUndefined(style.borderTopLeftRadius) || !isUndefined(style.borderTopRightRadius) || !isUndefined(style.borderBottomLeftRadius) || !isUndefined(style.borderBottomRightRadius)) {
+    instance.borderRadius({
+      topLeft: style.borderTopLeftRadius,
+      topRight: style.borderTopRightRadius,
+      bottomLeft: style.borderBottomLeftRadius,
+      bottomRight: style.borderBottomRightRadius
+    })
+  }
+  if (!isUndefined(style.opacity)) {
+    instance.opacity(style.opacity)
+  }
+  if (!isUndefined(style.overflow)) {
+    instance.clip(style.overflow === 'hidden')
+  }
+  if (style.position === 'absolute' || style.position === 'fixed') {
+    instance.position({
+      left: style.left,
+      top: style.top,
+      right: style.right,
+      bottom: style.bottom,
+    })
+    // 绝对定位和固定定位在web上都会脱离文档流，因此需要设置zIndex让它相比正常流的元素更上层
+    instance.zIndex(1)
+  }
+  if (style.position === 'relative') {
+    instance.offset({
+      left: style.left,
+      top: style.top,
+      right: style.right,
+      bottom: style.bottom,
+    })
+    // 绝对定位和固定定位在web上都会脱离文档流，因此需要设置zIndex让它相比正常流的元素更上层
+    instance.zIndex(1)
+  }
+  if (!isUndefined(style.zIndex)) {
+    // 为了适应position不设置z-index也能高于同层级组件，估且让设置了z-index的会更高一级
+    instance.zIndex(style.zIndex + 1)
+  }
+  if (!isUndefined(style.boxShadow)) {
+    instance.shadow({
+      radius: convertVp2Px(style.boxShadow.radius),
+      color: style.boxShadow.color,
+      offsetX: convertVp2Px(style.boxShadow.offsetX),
+      offsetY: convertVp2Px(style.boxShadow.offsetY),
+      fill: style.boxShadow.fill,
+    })
+  }
+}
+
+export const pseudoModify = new PseudoStyleModify()
+export const rowModify = new RowStyleModify()
+export const columnModify = new ColumnStyleModify()
+export const textModify = new TextStyleModify()
+
+export default new CommonStyleModify()

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

@@ -1,9 +1,9 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { createLazyChildren } from './render'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroStyleType, TaroSwiperElement, TaroEvent, TaroAny } from '@tarojs/runtime'
+import type { TaroSwiperElement, TaroEvent, TaroAny } from '@tarojs/runtime'
 
 interface SwiperAttrs {
   index?: number
@@ -13,71 +13,8 @@ interface SwiperAttrs {
   vertical?: boolean
   autoPlay?: boolean
   indicator?: boolean
-}
-
-@Extend(Swiper)
-function swiperStyle (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)
+  nextMargin?: Length
+  prevMargin?: Length
 }
 
 @Extend(Swiper)
@@ -89,6 +26,8 @@ function swiperAttr (attr: SwiperAttrs) {
   .vertical(attr.vertical)
   .autoPlay(attr.autoPlay)
   .indicator(attr.indicator)
+  .nextMargin(attr.nextMargin)
+  .prevMargin(attr.prevMargin)
 }
 
 function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
@@ -101,27 +40,65 @@ function getSwiperAttributes (node: TaroSwiperElement): SwiperAttrs {
   swiperAttrs.vertical = _attrs.vertical || false
   swiperAttrs.autoPlay = _attrs.autoplay || false
   swiperAttrs.indicator = _attrs.indicatorDots || false
+  swiperAttrs.nextMargin = _attrs.nextMargin || 0
+  swiperAttrs.prevMargin = _attrs.previousMargin || 0
   return swiperAttrs
 }
 
-@Builder
-export default function TaroSwiper (node: TaroSwiperElement) {
-  Swiper(node.controller) {
-    createLazyChildren(node)
+@Component
+export default struct TaroSwiper {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroSwiperElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroSwiperElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build () {
+    Swiper(this.node.controller) {
+      this.createLazyChildren(this.node, 0)
+    }
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .swiperAttr(getSwiperAttributes(this.node))
+      .indicatorStyle({
+        color: this.node.getAttribute('indicatorColor'),
+        selectedColor:  this.node.getAttribute('indicatorActiveColor')
+      })
+      .onChange((index: number) => {
+        const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, this.node)
+        eventHandler(event, 'change', 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))
+      .onGestureSwipe(shouldBindEvent((index: number, extraInfo: SwiperAnimationEvent) => {
+        const currentOffset = extraInfo.currentOffset || 0
+        // 判断设置的滚动方向
+        const isVertical = this.node._attrs.vertical || false
+        let event: TaroEvent
+        if (isVertical) {
+          event = createTaroEvent('transition', { detail: { dx: 0, dy: vp2px(currentOffset) } }, this.node)
+        } else {
+          event = createTaroEvent('transition', { detail: { dx: vp2px(currentOffset), dy: 0 } }, this.node)
+        }
+        eventHandler(event, 'transition', this.node)
+      }, this.node, ['transition']))
+      .onTouch(shouldBindEvent((event: TouchEvent) => {
+        if (event.type === TouchType.Down) {
+          eventHandler(event, 'touchStart', this.node)
+        }
+        if (event.type === TouchType.Up) {
+          eventHandler(event, 'touchEnd', this.node)
+        }
+        if (event.type === TouchType.Move) {
+          eventHandler(event, 'touchMove', this.node)
+        }
+      }, this.node, ['touchstart', 'touchmove', 'touchend']))
   }
-  .swiperStyle(getNormalAttributes(node))
-  .swiperAttr(getSwiperAttributes(node))
-  .indicatorStyle({
-    color: node.getAttribute('indicatorColor'),
-    selectedColor:  node.getAttribute('indicatorActiveColor')
-  })
-  .onChange((index: number) => {
-    const event: TaroEvent = createTaroEvent('change', { detail: { current: index } }, node)
-    eventHandler(event, 'change', 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))
 }