@tarojs/plugin-platform-harmony-ets 4.0.0-beta.3 → 4.0.0-beta.4

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

@@ -1,76 +1,10 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
 
-
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
 import type { RichTextProps } from '@tarojs/components/types/RichText'
-import type { TaroAny, TaroStyleType, TaroRichTextElement } from '@tarojs/runtime'
-
-@Extend(RichText)
-function attrs (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)
-}
-
+import type { TaroAny, TaroRichTextElement } from '@tarojs/runtime'
 
 function generateText (node: TaroRichTextElement): string {
   return parseHtmlNode(node._attrs.nodes || '')
@@ -79,7 +13,7 @@ function generateText (node: TaroRichTextElement): string {
 @Builder
 export default function TaroRichText (node: TaroRichTextElement) {
   RichText(generateText(node))
-    .attrs(getNormalAttributes(node))
+    .attributeModifier(commonStyleModify.setNode(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]

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

@@ -1,10 +1,11 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { getNodeThresholds, getNormalAttributes, 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
@@ -22,135 +23,6 @@ interface ScrollViewEvent {
   scrollHeight: number
 }
 
-@Extend(Row)
-function rowAttrs (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
-  })
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    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)
-}
-
-@Extend(Column)
-function columnAttrs (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)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    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)
-}
-
-
 function getAttributes (node: TaroScrollViewElement): ScrollViewAttrs {
   const _attrs = node._attrs
   const scrollAttrs: ScrollViewAttrs = {
@@ -192,7 +64,7 @@ export default function TaroScrollView (node: TaroScrollViewElement) {
           createLazyChildren(node)
         }
         .width(null)
-        .rowAttrs(getNormalAttributes(node))
+        .attributeModifier(commonStyleModify.setNode(node))
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
           node._scroll = areaResult
         }, node, ['scroll', 'scrollstart', 'scrollend']))
@@ -201,7 +73,7 @@ export default function TaroScrollView (node: TaroScrollViewElement) {
           createLazyChildren(node)
         }
         .height(null)
-        .columnAttrs(getNormalAttributes(node))
+        .attributeModifier(commonStyleModify.setNode(node))
         .alignItems(HorizontalAlign.Start)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
           node._scroll = areaResult

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

@@ -1,8 +1,9 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroSliderElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroSliderElement, TaroEvent } from '@tarojs/runtime'
 
 interface SliderAttrs {
   selectedColor?: ResourceColor
@@ -11,71 +12,6 @@ interface SliderAttrs {
   blockColor?: ResourceColor
 }
 
-@Extend(Slider)
-function style (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)
-}
-
 @Extend(Slider)
 function attrs (attr: SliderAttrs) {
   .selectedColor(attr.selectedColor)
@@ -126,7 +62,7 @@ export default struct TaroSlider {
       style: SliderStyle.OutSet,
       direction: Axis.Horizontal
     })
-      .style(getNormalAttributes(node))
+      .attributeModifier(commonStyleModify.setNode(node))
       .attrs(getAttributes(node))
       .width(!!node._attrs.showValue ? '90%' : '100%')
       .themeStyles(!!node._attrs.disabled)

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

@@ -0,0 +1,154 @@
+import type { TaroElement, TaroStyleType } from '@tarojs/runtime'
+import { isUndefined } from '../shared'
+import { getNormalAttributes } from './utils/helper'
+
+function getTop (node: TaroElement): Length | number {
+  return node?.hmStyle?.top || 0
+}
+
+function getLeft (node: TaroElement): Length | number {
+  return node?.hmStyle?.left || 0
+}
+
+class CommonStyleModify implements AttributeModifier<CommonAttribute> {
+  node: TaroElement | null = null
+  style: TaroStyleType | null = null
+
+  setNode (node: TaroElement) {
+    this.node = node
+    this.style = getNormalAttributes(this.node)
+
+    return this
+  }
+
+  applyNormalAttribute(instance: CommonAttribute): void {
+    if (this.node && this.style) {
+
+      if (!isUndefined(this.style.id)) {
+        instance.id(this.style.id)
+        instance.key(this.style.id)
+      }
+      if (!isUndefined(this.style.flexGrow)) {
+        instance.flexGrow(this.style.flexGrow)
+      }
+      if (!isUndefined(this.style.flexShrink)) {
+        instance.flexShrink(this.style.flexShrink)
+      }
+      if (!isUndefined(this.style.flexBasis)) {
+        instance.flexBasis(this.style.flexBasis)
+      }
+      if (!isUndefined(this.style.alignSelf)) {
+        instance.alignSelf(this.style.alignSelf)
+      }
+      if (!isUndefined(this.style.paddingTop) || !isUndefined(this.style.paddingRight) || !isUndefined(this.style.paddingBottom) || !isUndefined(this.style.paddingLeft)) {
+        instance.padding({
+          top: this.style.paddingTop,
+          right: this.style.paddingRight,
+          bottom: this.style.paddingBottom,
+          left: this.style.paddingLeft
+        })
+      }
+      if (!isUndefined(this.style.marginTop) || !isUndefined(this.style.marginRight) || !isUndefined(this.style.marginBottom) || !isUndefined(this.style.marginLeft)) {
+        instance.margin({
+          top: this.style.marginTop,
+          right: this.style.marginRight,
+          bottom: this.style.marginBottom,
+          left: this.style.marginLeft
+        })
+      }
+      if (!isUndefined(this.style.width)) {
+        instance.width(this.style.width)
+      }
+      if (!isUndefined(this.style.height)) {
+        instance.height(this.style.height)
+      }
+      if (!isUndefined(this.style.minWidth) || !isUndefined(this.style.maxWidth) || !isUndefined(this.style.minHeight) || !isUndefined(this.style.maxHeight)) {
+        instance.constraintSize({
+          minWidth: this.style.minWidth,
+          maxWidth: this.style.maxWidth,
+          minHeight: this.style.minHeight,
+          maxHeight: this.style.maxHeight
+        })
+      }
+      if (!isUndefined(this.style.backgroundColor)) {
+        instance.backgroundColor(this.style.backgroundColor)
+      }
+      if (!isUndefined(this.style.backgroundImage)) {
+        instance.backgroundImage(this.style.backgroundImage?.src, this.style.backgroundRepeat)
+      }
+      if (!isUndefined(this.style.backgroundSize)) {
+        instance.backgroundImageSize(this.style.backgroundSize)
+      }
+      if (!isUndefined(this.style.backgroundPosition)) {
+        instance.backgroundImagePosition(this.style.backgroundPosition)
+      }
+      if (!isUndefined(this.style.borderTopStyle) || !isUndefined(this.style.borderRightStyle) || !isUndefined(this.style.borderBottomStyle) || !isUndefined(this.style.borderLeftStyle)) {
+        instance.borderStyle({
+          top: this.style.borderTopStyle,
+          right: this.style.borderRightStyle,
+          bottom: this.style.borderBottomStyle,
+          left: this.style.borderLeftStyle
+        })
+      }
+      if (!isUndefined(this.style.borderTopWidth) || !isUndefined(this.style.borderRightWidth) || !isUndefined(this.style.borderBottomWidth) || !isUndefined(this.style.borderLeftWidth)) {
+        instance.borderWidth({
+          top: this.style.borderTopWidth,
+          right: this.style.borderRightWidth,
+          bottom: this.style.borderBottomWidth,
+          left: this.style.borderLeftWidth
+        })
+      }
+      if (!isUndefined(this.style.borderTopColor) || !isUndefined(this.style.borderRightColor) || !isUndefined(this.style.borderBottomColor) || !isUndefined(this.style.borderLeftColor)) {
+        instance.borderColor({
+          top: this.style.borderTopColor,
+          right: this.style.borderRightColor,
+          bottom: this.style.borderBottomColor,
+          left: this.style.borderLeftColor
+        })
+      }
+      if (!isUndefined(this.style.borderTopLeftRadius) || !isUndefined(this.style.borderTopRightRadius) || !isUndefined(this.style.borderBottomLeftRadius) || !isUndefined(this.style.borderBottomRightRadius)) {
+        instance.borderRadius({
+          topLeft: this.style.borderTopLeftRadius,
+          topRight: this.style.borderTopRightRadius,
+          bottomLeft: this.style.borderBottomLeftRadius,
+          bottomRight: this.style.borderBottomRightRadius
+        })
+      }
+      if (!isUndefined(this.style.zIndex)) {
+        instance.zIndex(this.style.zIndex)
+      }
+      if (!isUndefined(this.style.opacity)) {
+        instance.opacity(this.style.opacity)
+      }
+      if (!isUndefined(this.style.linearGradient)) {
+        instance.linearGradient(this.style.linearGradient)
+      }
+      if (!isUndefined(this.style.overflow)) {
+        instance.clip(this.style.overflow)
+      }
+      if (!isUndefined(this.style.transformOrigin)) {
+        instance.rotate({ centerX: this.style.transformOrigin.x, centerY: this.style.transformOrigin.y, angle: 0 })
+        instance.scale({ centerX: this.style.transformOrigin.x, centerY: this.style.transformOrigin.y })
+      }
+      if (!isUndefined(this.style.transform)) {
+        instance.transform(this.style.transform)
+      }
+      if (this.node.hmStyle?.position === 'absolute' || this.node.hmStyle?.position === 'fixed') {
+        instance.position({
+          x: getLeft(this.node),
+          y: getTop(this.node)
+        })
+      }
+      if (this.node.hmStyle?.position === 'relative') {
+        instance.offset({
+          x: getLeft(this.node),
+          y: getTop(this.node)
+        })
+      }
+    }
+  }
+}
+
+const modify = new CommonStyleModify()
+
+export default modify

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

@@ -1,9 +1,10 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
+import commonStyleModify from './style'
 import { createLazyChildren } from './render'
-import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
+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
@@ -15,71 +16,6 @@ interface SwiperAttrs {
   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)
-}
-
 @Extend(Swiper)
 function swiperAttr (attr: SwiperAttrs) {
   .index(attr.index)
@@ -109,7 +45,7 @@ export default function TaroSwiper (node: TaroSwiperElement) {
   Swiper(node.controller) {
     createLazyChildren(node)
   }
-  .swiperStyle(getNormalAttributes(node))
+  .attributeModifier(commonStyleModify.setNode(node))
   .swiperAttr(getSwiperAttributes(node))
   .indicatorStyle({
     color: node.getAttribute('indicatorColor'),

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

@@ -1,78 +1,14 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import { getNodeThresholds, shouldBindEvent, getNormalAttributes } from './utils/helper'
+import commonStyleModify from './style'
+import { getNodeThresholds, shouldBindEvent } from './utils/helper'
 
-import type { TaroAny, TaroStyleType, TaroSwitchElement, TaroEvent } from '@tarojs/runtime'
+import type { TaroAny, TaroSwitchElement, TaroEvent } from '@tarojs/runtime'
 
 interface SwitchAttrs {
   selectedColor?: ResourceColor
 }
 
-@Extend(Toggle)
-function styles (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)
-}
-
 @Extend(Toggle)
 function attrs(attr: SwitchAttrs) {
   .selectedColor(attr.selectedColor)
@@ -107,7 +43,7 @@ export default struct TaroSwitch {
         type: this.node._attrs.type !== 'checkbox' ? ToggleType.Switch : ToggleType.Checkbox,
         isOn: this.node.checked,
       })
-        .styles(getNormalAttributes(this.node))
+        .attributeModifier(commonStyleModify.setNode(this.node))
         .attrs(getAttributes(this.node))
         .themeStyles(!!this.node._attrs.disabled)
         .onChange((isOn: boolean) => {