@tarojs/plugin-platform-harmony-ets 4.0.0-beta.0 → 4.0.0-beta.1

package/dist/runtime-ets/dom/stylesheet/index.ts

@@ -1,7 +1,7 @@
 /* eslint-disable accessor-pairs */
 // @ts-nocheck
-import { ObjectAssign, TaroAny } from '../../'
-import { FlexManager, getNodeMarginOrPaddingData, getUnit } from './util'
+import { TaroAny } from '../../'
+import { BORDER_STYLE_MAP, FlexManager, getTransform } from './util'
 
 import type { HarmonyStyle, HarmonyType, TaroStyleType, TaroTextStyleType } from './type'
 
@@ -28,103 +28,81 @@ export default class StyleSheet {
   }
 
   get padding () {
-    const { top = 0, right = 0, bottom = 0, left = 0 } = this.hmStyle.padding || {}
-    return `${top} ${right} ${bottom} ${left}`
-  }
-
-  set padding (value: string) {
-    this.hmStyle.padding = getNodeMarginOrPaddingData(value)
-  }
-
-  set _padding (value: Margin) {
-    this.hmStyle.padding = value
+    return `${this.hmStyle.paddingTop} ${this.hmStyle.paddingRight} ${this.hmStyle.paddingBottom} ${this.hmStyle.paddingLeft}`
   }
 
   get paddingTop () {
-    return this.hmStyle.padding?.top
+    return this.hmStyle.paddingTop
   }
 
-  set paddingTop (value: string) {
-    this.hmStyle.padding = ObjectAssign({}, this.hmStyle.padding, { top: getUnit(value) })
+  set _paddingTop (value: Length) {
+    this.hmStyle.paddingTop = value
   }
 
   get paddingBottom () {
-    return this.hmStyle.padding?.bottom
+    return this.hmStyle.paddingBottom
   }
 
-  set paddingBottom (value: string) {
-    this.hmStyle.padding = ObjectAssign({}, this.hmStyle.padding, { bottom: getUnit(value) })
-  }
-
-  get paddingRight () {
-    return this.hmStyle.padding?.right
-  }
-
-  set paddingRight (value: string) {
-    this.hmStyle.padding = ObjectAssign({}, this.hmStyle.padding, { right: getUnit(value) })
+  set _paddingBottom (value: Length) {
+    this.hmStyle.paddingBottom = value
   }
 
   get paddingLeft () {
-    return this.hmStyle.padding?.left
+    return this.hmStyle.paddingLeft
   }
 
-  set paddingLeft (value: string) {
-    this.hmStyle.padding = ObjectAssign({}, this.hmStyle.padding, { left: getUnit(value) })
+  set _paddingLeft (value: Length) {
+    this.hmStyle.paddingLeft = value
   }
 
-  get margin () {
-    const { top = 0, right = 0, bottom = 0, left = 0 } = this.hmStyle.margin || {}
-    return `${top} ${right} ${bottom} ${left}`
+  get paddingRight () {
+    return this.hmStyle.paddingRight
   }
 
-  set margin (value: string) {
-    this.hmStyle.margin = getNodeMarginOrPaddingData(value)
+  set _paddingRight (value: Length) {
+    this.hmStyle.paddingRight = value
   }
 
-  set _margin (value: Margin) {
-    this.hmStyle.margin = value
+  get margin () {
+    return `${this.hmStyle.marginTop} ${this.hmStyle.marginRight} ${this.hmStyle.marginBottom} ${this.hmStyle.marginLeft}`
   }
 
   get marginTop () {
-    return this.hmStyle.margin?.top
+    return this.hmStyle.marginTop
   }
 
-  set marginTop (value: string) {
-    this.hmStyle.margin = ObjectAssign({}, this.hmStyle.margin, { top: getUnit(value) })
+  set _marginTop (value: Length) {
+    this.hmStyle.marginTop = value
   }
 
   get marginBottom () {
-    return this.hmStyle.margin?.bottom
+    return this.hmStyle.marginBottom
   }
 
-  set marginBottom (value: string) {
-    this.hmStyle.margin = ObjectAssign({}, this.hmStyle.margin, { bottom: getUnit(value) })
+  set _marginBottom (value: Length) {
+    this.hmStyle.marginBottom = value
   }
 
-  get marginRight () {
-    return this.hmStyle.margin?.right
+  get marginLeft () {
+    return this.hmStyle.marginLeft
   }
 
-  set marginRight (value: string) {
-    this.hmStyle.margin = ObjectAssign({}, this.hmStyle.margin, { right: getUnit(value) })
+  set _marginLeft (value: Length) {
+    this.hmStyle.marginLeft = value
   }
 
-  get marginLeft () {
-    return this.hmStyle.margin?.left
+  get marginRight () {
+    return this.hmStyle.marginRight
   }
 
-  set marginLeft (value: string) {
-    this.hmStyle.margin = ObjectAssign({}, this.hmStyle.margin, { left: getUnit(value) })
+  set _marginRight (value: Length) {
+    this.hmStyle.marginRight = value
   }
 
   get top () {
     return this.hmStyle.top
   }
 
-  set top (value: string | number) {
-    this.hmStyle.top = getUnit(value)
-  }
-
   set _top (value: Length) {
     this.hmStyle.top = value
   }
@@ -133,48 +111,18 @@ export default class StyleSheet {
     return this.hmStyle.left
   }
 
-  set left (value: string | number) {
-    this.hmStyle.left = getUnit(value)
-  }
-
   set _left (value: Length) {
     this.hmStyle.left = value
   }
 
   get flex () {
-    return this.hmStyle.flex
-  }
-
-  set flex (value: string | number) {
-    let res: [number, number, number | string] = [0, 0, 'auto']
-
-    if (typeof value === 'number') {
-      res = [value, 1, 0]
-    } else if (value === 'auto') {
-      res = [1, 1, 'auto']
-    } else if (value === 'none') {
-      res = [0, 0, 'auto']
-    } else if (typeof value === 'string') {
-      const FlexList = value.replace(new RegExp('/\\s+/g'), ' ').split(' ')
-      FlexList.forEach((item, index) => {
-        res[index] = index < 2 ? Number(item) : item
-      })
-    }
-
-    this.flexGrow = res[0]
-    this.flexShrink = res[1]
-    this.flexBasis = res[2]
-    this.hmStyle.flex = value
+    return `${this.hmStyle.flexGrow} ${this.hmStyle.flexShrink} ${this.hmStyle.flexBasis}`
   }
 
   get flexBasis () {
     return this.hmStyle.flexBasis
   }
 
-  set flexBasis (value: string) {
-    this.hmStyle.flexBasis = getUnit(value)
-  }
-
   set _flexBasis (value: number | string) {
     this.hmStyle.flexBasis = value
   }
@@ -183,10 +131,6 @@ export default class StyleSheet {
     return Number(this.hmStyle.flexGrow)
   }
 
-  set flexGrow (value: number | string) {
-    this.hmStyle.flexGrow = Number(value)
-  }
-
   set _flexGrow (value: number) {
     this.hmStyle.flexGrow = value
   }
@@ -195,10 +139,6 @@ export default class StyleSheet {
     return Number(this.hmStyle.flexShrink)
   }
 
-  set flexShrink (value: number | string) {
-    this.hmStyle.flexShrink = Number(value)
-  }
-
   set _flexShrink (value: number) {
     this.hmStyle.flexShrink = value
   }
@@ -207,80 +147,55 @@ export default class StyleSheet {
     return FlexManager.reverseItemAlign(this.hmStyle.alignSelf)
   }
 
-  set alignSelf (value: string | number) {
-    this.hmStyle.alignSelf = FlexManager.itemAlign(value)
-  }
-
   set _alignSelf (value: ItemAlign) {
     this.hmStyle.alignSelf = value
   }
 
-  set _flexOptions (value) {
-    if (typeof value.direction !== 'undefined') {
-      this.hmStyle.direction = value.direction
-    }
-    if (typeof value.justifyContent !== 'undefined') {
-      this.hmStyle.justifyContent = value.justifyContent
-    }
-    if (typeof value.alignItems !== 'undefined') {
-      this.hmStyle.alignItems = value.alignItems
-    }
-    if (typeof value.wrap !== 'undefined') {
-      this.hmStyle.flexWrap = value.wrap
-    }
-    if (typeof value.alignContent !== 'undefined') {
-      this.hmStyle.alignContent = value.alignContent
-    }
-  }
-
   get flexDirection () {
-    return FlexManager.reverseDirection(this.hmStyle.direction)
+    return FlexManager.reverseDirection(this.hmStyle.flexDirection)
   }
 
-  set flexDirection (value: string) {
-    this.hmStyle.direction = FlexManager.direction(value)
+
+  set _flexDirection (value: FlexDirection) {
+    this.hmStyle.flexDirection = value
   }
 
   get justifyContent () {
     return FlexManager.reverseFlexAlign(this.hmStyle.justifyContent)
   }
 
-  set justifyContent (value: string) {
-    this.hmStyle.justifyContent = FlexManager.flexAlign(value)
+  set _justifyContent (value: FlexAlign) {
+    this.hmStyle.justifyContent = value
   }
 
   get alignItems () {
     return FlexManager.reverseItemAlign(this.hmStyle.alignItems)
   }
 
-  set alignItems (value: string) {
-    this.hmStyle.alignItems = FlexManager.itemAlign(value)
+  set _alignItems (value: ItemAlign) {
+    this.hmStyle.alignItems = value
   }
 
   get alignContent () {
     return FlexManager.reverseFlexAlign(this.hmStyle.alignContent)
   }
 
-  set alignContent (value: string) {
-    this.hmStyle.alignContent = FlexManager.flexAlign(value)
+  set _alignContent (value: FlexAlign) {
+    this.hmStyle.alignContent = value
   }
 
   get flexWrap () {
-    return FlexManager.reverseFlexWrap(this.hmStyle.wrap)
+    return FlexManager.reverseFlexWrap(this.hmStyle.flexWrap)
   }
 
-  set flexWrap (value: string) {
-    this.hmStyle.wrap = FlexManager.flexWrap(value)
+  set _flexWrap (value: FlexWrap) {
+    this.hmStyle.flexWrap = value
   }
 
   get width () {
     return this.hmStyle.width
   }
 
-  set width (value: string | number) {
-    this.hmStyle.width = getUnit(value)
-  }
-
   set _width (value: Length) {
     this.hmStyle.width = value
   }
@@ -289,59 +204,46 @@ export default class StyleSheet {
     return this.hmStyle.height
   }
 
-  set height (value: string | number) {
-    this.hmStyle.height = getUnit(value)
-  }
-
   set _height (value: Length) {
     this.hmStyle.height = value
   }
-  
-  set _constraintSize(value: ConstraintSizeOptions) {
-    this.hmStyle.constraintSize = value
-  }
 
   get minHeight () {
-    return this.hmStyle.constraintSize?.minHeight
+    return this.hmStyle.minHeight
   }
 
-  set minHeight (value: string | number) {
-    this._minHeight = getUnit(value)
+  set _minHeight (value: Length) {
+    this.hmStyle.minHeight = value
   }
 
   get maxHeight () {
-    return this.hmStyle.constraintSize?.maxHeight
+    return this.hmStyle.maxHeight
   }
 
-  set maxHeight (value: string | number) {
-    this._maxHeight = getUnit(value)
+  set _maxHeight (value: Length) {
+    this.hmStyle.maxHeight = value
   }
 
   get minWidth () {
-    return this.hmStyle.constraintSize?.minWidth
+    return this.hmStyle.minWidth
   }
 
-  set minWidth (value: string | number) {
-    this._minWidth = getUnit(value)
+  set _minWidth (value: Length) {
+    this.hmStyle.minWidth = value
   }
 
   get maxWidth () {
-    return this.hmStyle.constraintSize?.maxWidth
+    return this.hmStyle.maxWidth
   }
 
-  set maxWidth (value: string | number) {
-    this._maxWidth = getUnit(value)
+  set _maxWidth (value: Length) {
+    this.hmStyle.maxWidth = value
   }
 
   get background () {
     return `${this.backgroundColor} ${this.backgroundImage} ${this.backgroundRepeat} ${this.backgroundSize}`.trim()
   }
 
-  // TODO: 未实现
-  set background (value: string) {
-    
-  }
-
   set _background (value: TaroAny) {
     const _backgroundImage: HarmonyType.Background.backgroundImage = value?.image?.[0]
     if (_backgroundImage) {
@@ -361,7 +263,7 @@ export default class StyleSheet {
     return this.hmStyle.backgroundColor
   }
 
-  set backgroundColor (value: string) {
+  set _backgroundColor (value: ResourceColor) {
     this.hmStyle.backgroundColor = value
   }
 
@@ -369,14 +271,8 @@ export default class StyleSheet {
     return this.hmStyle.backgroundImage && `url(${this.hmStyle.backgroundImage})`
   }
 
-  set backgroundImage (value: string) {
-    if (typeof value === 'string' && value.indexOf('url(') !== -1 && value.indexOf(')') !== -1) {
-      // 如果包含 url()，则说明是 background-image 属性
-      const match = value.match(new RegExp('url\\([\'"]?(.*?)[\'"]?\\)'))
-      if (match) {
-        this.hmStyle.backgroundImage = match[1]
-      }
-    }
+  set _backgroundImage (value) {
+    this.hmStyle.backgroundImage = value?.[0]
   }
 
   get backgroundRepeat () {
@@ -390,37 +286,23 @@ export default class StyleSheet {
     }
   }
 
-  set backgroundRepeat (value: string) {
-    if (typeof value === 'string') {
-      switch (value) {
-        case 'repeat-x': this.hmStyle.backgroundRepeat = ImageRepeat.X; break
-        case 'repeat-y': this.hmStyle.backgroundRepeat = ImageRepeat.Y; break
-        case 'no-repeat': this.hmStyle.backgroundRepeat = ImageRepeat.NoRepeat; break
-        default: this.hmStyle.backgroundRepeat = ImageRepeat.XY; break
-      }
-    }
+  set _backgroundRepeat (value: ImageRepeat[]) {
+    this.hmStyle.backgroundRepeat = value?.[0]
   }
 
   get backgroundSize () {
     if (this.hmStyle.backgroundImage) {
-      return [this.hmStyle.backgroundImageSize.width, this.hmStyle.backgroundImageSize.height].join(' ')
+      return [this.hmStyle.backgroundSize.width, this.hmStyle.backgroundSize.height].join(' ')
     }
   }
 
-  set backgroundSize (value: string) {
-    if (typeof value === 'string') {
-      const sizes = value.split(' ')
-      if (sizes.length === 1) {
-        this.hmStyle.backgroundImageSize = { width: getUnit(sizes[0]) }
-      } else if (sizes.length === 2) {
-        this.hmStyle.backgroundImageSize = { width: getUnit(sizes[0]), height: getUnit(sizes[1]) }
-      }
-    }
+  set _backgroundSize (value: HarmonyType.Background.backgroundImageSize[]) {
+    this.hmStyle.backgroundSize = value?.[0]
   }
 
   get backgroundPosition () {
-    if (this.hmStyle.backgroundImagePosition) {
-      switch (this.hmStyle.backgroundImagePosition) {
+    if (this.hmStyle.backgroundPosition) {
+      switch (this.hmStyle.backgroundPosition) {
         case Alignment.TopStart: return 'left top'; break
         case Alignment.Top: return 'center top'; break
         case Alignment.TopEnd: return 'right top'; break
@@ -431,108 +313,182 @@ export default class StyleSheet {
         case Alignment.Bottom: return 'center bottom'; break
         case Alignment.BottomEnd: return 'right bottom'; break
         default: {
-          if (this.hmStyle.backgroundImagePosition) {
-            return [this.hmStyle.backgroundImagePosition, this.hmStyle.backgroundImagePosition.y].join(' ')
+          if (this.hmStyle.backgroundPosition) {
+            return [this.hmStyle.backgroundPosition, this.hmStyle.backgroundPosition.y].join(' ')
           }
         }
       }
     }
   }
-
-  set backgroundPosition (value: string) {
-    if (typeof value === 'string') {
-      const positions = backgroundImagePosition.split(' ')
-      const horizontal = positions[0].toLowerCase()
-      const vertical = positions[1].toLowerCase() || 'top'
-
-      if (horizontal === 'left' && vertical === 'top') {
-        this.hmStyle.backgroundImagePosition = Alignment.TopStart
-      } else if (horizontal === 'center' && vertical === 'top') {
-        this.hmStyle.backgroundImagePosition = Alignment.Top
-      } else if (horizontal === 'right' && vertical === 'top') {
-        this.hmStyle.backgroundImagePosition = Alignment.TopEnd
-      } else if (horizontal === 'left' && vertical === 'center') {
-        this.hmStyle.backgroundImagePosition = Alignment.Start
-      } else if (horizontal === 'center' && vertical === 'center') {
-        this.hmStyle.backgroundImagePosition = Alignment.Center
-      } else if (horizontal === 'right' && vertical === 'center') {
-        this.hmStyle.backgroundImagePosition = Alignment.End
-      } else if (horizontal === 'left' && vertical === 'bottom') {
-        this.hmStyle.backgroundImagePosition = Alignment.BottomStart
-      } else if (horizontal === 'center' && vertical === 'bottom') {
-        this.hmStyle.backgroundImagePosition = Alignment.Bottom
-      } else if (horizontal === 'right' && vertical === 'bottom') {
-        this.hmStyle.backgroundImagePosition = Alignment.BottomEnd
-      } else {
-        if (/^\d+(\.\d+)?(px|%|vw|vh)$/.test(horizontal)) {
-          this.hmStyle.backgroundImagePosition = { x: getUnit(horizontal) }
-          if (/^\d+(\.\d+)?(px|%|vw|vh)$/.test(vertical)) {
-            this.hmStyle.backgroundImagePosition = { x: getUnit(horizontal), y: getUnit(vertical) }
-          }
-        }
-      }
-    }
+  
+  set _backgroundPosition (value: HarmonyType.Background.backgroundImagePosition[]) {
+    this.hmStyle.backgroundPosition = value?.[0]
   }
 
   get border () {
     return [this.borderWidth, this.borderStyle, this.bordercolor].join(' ')
   }
 
-  set border (value: string) {
-    const [width, style, color] = value.split(' ')
-    this.hmStyle.borderWidth = getUnit(width)
-    this.hmStyle.borderStyle = BORDERhmStyleYLE_MAP.get(style)
-    this.hmStyle.borderColor = color
-  }
-
   get borderWidth () {
     return this.hmStyle.borderWidth
   }
 
-  set borderWidth (value: string) {
-    this.hmStyle.borderWidth = getUnit(value)
-  }
-
   set _borderWidth (value: Length | EdgeWidths) {
     this.hmStyle.borderWidth = value
   }
 
+  get borderLeftWidth () { 
+    return this.hmStyle.borderLeftWidth
+  }
+
+  set _borderLeftWidth (value: Length) {
+    this.hmStyle.borderLeftWidth = value
+  }
+
+  get borderRightWidth () {
+    return this.hmStyle.borderRightWidth
+  }
+
+  set _borderRightWidth (value: Length) {
+    this.hmStyle.borderRightWidth = value
+  }
+
+  get borderTopWidth () {
+    return this.hmStyle.borderTopWidth
+  }
+
+  set _borderTopWidth (value: Length) {
+    this.hmStyle.borderTopWidth = value
+  }
+
+  get borderBottomWidth () {
+    return this.hmStyle.borderBottomWidth
+  }
+
+  set _borderBottomWidth (value: Length) {
+    this.hmStyle.borderBottomWidth = value
+  }
+
   get borderColor () {
     return this.hmStyle.borderColor
   }
 
-  set borderColor (value: string) {
+  set _borderColor (value: ResourceColor | EdgeColors) {
     this.hmStyle.borderColor = value
   }
 
-  set _borderColor (value: ResourceColor | EdgeColors) {
-    this.hmStyle.borderColor = value
+  get borderLeftColor () {
+    return this.hmStyle.borderLeftColor
   }
 
-  get borderStyle () {
-    return BORDERhmStyleYLE_MAP.reverse(this.hmStyle.borderStyle)
+  set _borderLeftColor (value: ResourceColor) {
+    this.hmStyle.borderLeftColor = value
+  }
+
+  get borderRightColor () {
+    return this.hmStyle.borderRightColor
+  }
+
+  set _borderRightColor (value: ResourceColor) {
+    this.hmStyle.borderRightColor = value
+  }
+
+  get borderTopColor () {
+    return this.hmStyle.borderTopColor
   }
 
-  set borderStyle (value: string) {
-    this.hmStyle.borderStyle = BORDERhmStyleYLE_MAP.get(value)
+  set _borderTopColor (value: ResourceColor) {
+    this.hmStyle.borderTopColor = value
+  }
+
+  get borderBottomColor () {
+    return this.hmStyle.borderBottomColor
+  }
+
+  set _borderBottomColor (value: ResourceColor) {
+    this.hmStyle.borderBottomColor = value
+  }
+
+  get borderStyle () {
+    return BORDER_STYLE_MAP.reverse(this.hmStyle.borderStyle)
   }
 
   set _borderStyle (value: BorderStyle | EdgeStyles) {
     this.hmStyle.borderStyle = value
   }
-  
-  get borderRadius () {
-    return this.hmStyle.borderRadius
+
+  get borderLeftStyle () {
+    return BORDER_STYLE_MAP.reverse(this.hmStyle.borderLeftStyle)
+  }
+
+  set _borderLeftStyle (value: BorderStyle) {
+    this.hmStyle.borderLeftStyle = value
+  }
+
+  get borderRightStyle () {
+    return BORDER_STYLE_MAP.reverse(this.hmStyle.borderRightStyle)
+  }
+
+  set _borderRightStyle (value: BorderStyle) {
+    this.hmStyle.borderRightStyle = value
+  }
+
+  get borderTopStyle () {
+    return BORDER_STYLE_MAP.reverse(this.hmStyle.borderTopStyle)
+  }
+
+  set _borderTopStyle (value: BorderStyle) {
+    this.hmStyle.borderTopStyle = value
+  }
+
+  get borderBottomStyle () {
+    return BORDER_STYLE_MAP.reverse(this.hmStyle.borderBottomStyle)
+  }
+
+  set _borderBottomStyle (value: BorderStyle) {
+    this.hmStyle.borderBottomStyle = value
   }
 
-  set borderRadius (value: string) {
-    this.hmStyle.borderRadius = getUnit(value)
+  get borderRadius () {
+    return this.hmStyle.borderRadius
   }
 
   set _borderRadius (value: Length | BorderRadiuses) {
     this.hmStyle.borderRadius = value
   }
 
+  get borderTopLeftRadius () {
+    return this.hmStyle.borderTopLeftRadius
+  }
+
+  set _borderTopLeftRadius (value: Length) {
+    this.hmStyle.borderTopLeftRadius = value
+  }
+
+  get borderTopRightRadius () {
+    return this.hmStyle.borderTopRightRadius
+  }
+
+  set _borderTopRightRadius (value: Length) {
+    this.hmStyle.borderTopRightRadius = value
+  }
+
+  get borderBottomLeftRadius () {
+    return this.hmStyle.borderBottomLeftRadius
+  }
+
+  set _borderBottomLeftRadius (value: Length) {
+    this.hmStyle.borderBottomLeftRadius = value
+  }
+
+  get borderBottomRightRadius () {
+    return this.hmStyle.borderBottomRightRadius
+  }
+
+  set _borderBottomRightRadius (value: Length) {
+    this.hmStyle.borderBottomRightRadius = value
+  }
+  
   get zIndex (): number {
     return Number(this.hmStyle.zIndex)
   }
@@ -547,16 +503,15 @@ export default class StyleSheet {
 
   set opacity (value: string) {
     const val = Number(value)
-
     this.hmStyle.opacity = Number.isNaN(val) ? 1 : val
   }
 
   get overflow () {
-    return this.hmStyle.clip ? 'hidden' : 'visible'
+    return this.hmStyle.overflow ? 'hidden' : 'visible'
   }
 
   set overflow (value: string) {
-    this.hmStyle.clip = value === 'hidden'
+    this.hmStyle.overflow = value === 'hidden'
   }
 
   get focus () {
@@ -567,19 +522,11 @@ export default class StyleSheet {
     this.hmStyle.focus = value
   }
 
-  set _focus (value: boolean) {
-    this.hmStyle.focus = value
-  }
-
   // 文本相关
   get color () {
     return this.hmStyle.color
   }
 
-  set color (value: string) {
-    this.hmStyle.color = value
-  }
-
   set _color (value: ResourceColor) {
     this.hmStyle.color = value
   }
@@ -588,10 +535,6 @@ export default class StyleSheet {
     return this.hmStyle.fontSize
   }
 
-  set fontSize (value: string) {
-    this.hmStyle.fontSize = getUnit(value)
-  }
-
   set _fontSize (value: number | string | Resource) {
     this.hmStyle.fontSize = value
   }
@@ -600,10 +543,6 @@ export default class StyleSheet {
     return this.hmStyle.fontWeight
   }
 
-  set fontWeight (value: string) {
-    this.hmStyle.fontWeight = value
-  }
-
   set _fontWeight (value: number | FontWeight | string) {
     this.hmStyle.fontWeight = value
   }
@@ -616,15 +555,6 @@ export default class StyleSheet {
     }
   }
 
-  set fontStyle (value: string) {
-    switch (value) {
-      case 'italic':
-        return FontStyle.Italic
-      default:
-        return FontStyle.Normal
-    }
-  }
-
   set _fontStyle (value: FontStyle) {
     this.hmStyle.fontStyle = value
   }
@@ -636,10 +566,6 @@ export default class StyleSheet {
   set fontFamily (value: string) {
     this.hmStyle.fontFamily = value
   }
-
-  set _fontFamily (value: string | Resource) {
-    this.hmStyle.fontFamily = value
-  }
   
   get textAlign () {
     switch (this.hmStyle.textAlign) {
@@ -650,17 +576,6 @@ export default class StyleSheet {
     }
   }
 
-  set textAlign (value: string) {
-    switch (value) {
-      case 'right':
-        return TextAlign.End
-      case 'center':
-        return TextAlign.Center
-      default:
-        return TextAlign.Start
-    }
-  }
-
   set _textAlign (value: TextAlign) {
     this.hmStyle.textAlign = value
   }
@@ -669,10 +584,6 @@ export default class StyleSheet {
     return this.hmStyle.lineHeight
   }
 
-  set lineHeight (value: string) {
-    this.hmStyle.lineHeight = getUnit(value)
-  }
-
   set _lineHeight (value: string | number | Resource) {
     this.hmStyle.lineHeight = value
   }
@@ -681,10 +592,6 @@ export default class StyleSheet {
     return this.hmStyle.letterSpacing
   }
 
-  set letterSpacing (value: string) {
-    this.hmStyle.letterSpacing = getUnit(value)
-  }
-
   set _letterSpacing (value: number | string) {
     this.hmStyle.letterSpacing = value
   }
@@ -699,19 +606,8 @@ export default class StyleSheet {
     }
   }
 
-  set textDecoration (value: string) {
-    if (typeof value === 'string') {
-      switch (value) {
-        case 'underline': this.hmStyle.decoration = TextDecorationType.Underline; break
-        case 'overline': this.hmStyle.decoration = TextDecorationType.Overline; break
-        case 'line-through': this.hmStyle.decoration = TextDecorationType.LineThrough; break
-        default: this.hmStyle.decoration = TextDecorationType.None; break
-      }
-    }
-  }
-
   set _decoration (value: TextDecorationType) {
-    this.hmStyle.decoration = value
+    this.hmStyle.textDecoration = value
   }
 
   get textOverflow () {
@@ -725,76 +621,42 @@ export default class StyleSheet {
     }
   }
 
-  set textOverflow (value: string) {
-    if (typeof value === 'string') {
-      let overflow = TextOverflow.None
-      switch (value) {
-        case 'clip': overflow = TextOverflow.Clip; break
-        case 'ellipsis': overflow = TextOverflow.Ellipsis; break
-        case 'marquee': overflow = TextOverflow.MARQUEE; break
-      }
-      this.hmStyle.textOverflow = {
-        overflow
-      }
-    }
-  }
-
   set _textOverflow (value: TextOverflow) {
     switch (value.overflow) {
       case TextOverflow.Clip: 
       case TextOverflow.Ellipsis:
-      case TextOverflow.None: this.hmStyle.maxLines = this.hmStyle.maxLines || 1; break
+      case TextOverflow.None: this.hmStyle.WebkitLineClamp = this.hmStyle.WebkitLineClamp || 1; break
       default: break
     }
     this.hmStyle.textOverflow = value
   }
 
   get WebkitLineClamp () {
-    return Number(this.hmStyle.maxLines)
+    return Number(this.hmStyle.WebkitLineClamp)
   }
 
-  set WebkitLineClamp (value: string | number) {
-    this.hmStyle.maxLines = Number(value)
+  set WebkitLineClamp (value: number) {
+    this.hmStyle.WebkitLineClamp = value
   }
 
   set _WebkitLineClamp (value: number) {
-    this.hmStyle.maxLines = value
-  }
-
-  set _linearGradient (value: HarmonyType.LinearGradient[]) {
-    this.hmStyle.linearGradient = value?.[0]
+    this.hmStyle.WebkitLineClamp = value
   }
   
   get transform () {
     return this.hmStyle.transform
   }
 
-  set _tranform (value: HarmonyType.Transform.Transform) {
-    this.hmStyle.transform = value
+  set _transform (value: HarmonyType.Transform.Transform) {
+    this.hmStyle.transform = getTransform(value)
   }
-}
-
-
-class BORDERhmStyleYLE_MAP {
-  static solid = BorderStyle.Solid
-  static dotted = BorderStyle.Dotted
-  static dashed = BorderStyle.Dashed
 
-  static get(type: string): BorderStyle {
-    switch (type) {
-      case 'dotted': return BorderStyle.Dotted
-      case 'dashed': return BorderStyle.Dashed
-      default: return BorderStyle.Solid
-    }
+  get transformOrigin () {
+    return this.hmStyle.transformOrigin
   }
 
-  static reverse(type: BorderStyle): string {
-    switch (type) {
-      case BorderStyle.Dotted: return 'dotted'
-      case BorderStyle.Dashed: return 'dashed'
-      case BorderStyle.Solid: return 'solid'
-      default: return ''
-    }
-  
+  set _transformOrigin(value) {
+    this.hmStyle.transformOrigin = value
   }
 }
+