@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.2 → 4.0.0-alpha.21

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

@@ -0,0 +1,65 @@
+import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+
+import { isTagFirstChild } from './utils/helper'
+
+import type { TaroAny, TaroNavigationBarElement } from '@tarojs/runtime'
+import type { IComponentAttributeUpdateEvents } from './pageMeta'
+
+@Component
+export default struct TaroNavigationBar {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroNavigationBarElement) => void = this.customBuilder
+  @ObjectLink node: TaroNavigationBarElement
+
+  aboutToAppear(): void {
+    if (!isTagFirstChild(this.node, 'page-meta')) {
+      console.error('NavigationBar 只能是 PageMeta 内的第一个节点。')
+    }
+    if (this.node) {
+      this.node._instance = this
+    }
+
+    // FIXME 在 Harmony 提供 @Watch 文档后，根据 node 实际使用更细粒度的监听
+    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
+    this.handleAttributes(this.node._attrs)
+  }
+
+  aboutToDisappear(): void {
+    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
+  }
+
+  handleAttributeUpdate = (opt: IComponentAttributeUpdateEvents) => {
+    if (opt.id === this.node._nid && opt.tagName === 'NAVIGATION-BAR') {
+      const attrs: Record<string, TaroAny> = {}
+      attrs[opt.attribute] = opt.value
+      this.handleAttributes(attrs)
+    }
+  }
+
+  handleAttributes (attrs: Record<string, TaroAny>) {
+    const options: Record<string, TaroAny> = {}
+
+    if (attrs.title) {
+      options.title = attrs.title
+    }
+    if (attrs.loading) {
+      options.loading = attrs.loading
+    }
+    if (attrs.backgroundColor) {
+      options.backgroundColor = attrs.backgroundColor
+    }
+    if (attrs.frontColor) {
+      options.frontColor = attrs.frontColor
+    }
+    eventCenter.trigger('__taroNavigationStyle', options)
+    // FIXME: 以下属性暂时不支持
+    // attrs.colorAnimationDuration
+    // attrs.colorAnimationTimingFunc
+  }
+
+  build() {
+    if (true) {
+      this.createLazyChildren(this.node)
+    }
+  }
+}

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

@@ -0,0 +1,94 @@
+import { APP, eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { getCurrentInstance, pageScrollTo } from '@tarojs/taro'
+
+import { isTagFirstChild } from './utils/helper'
+
+import type { TaroAny, TaroPageMetaElement } from '@tarojs/runtime'
+
+export interface IComponentAttributeUpdateEvents {
+  id: string
+  tagName: string
+  attribute: string
+  value: TaroAny
+}
+
+@Component
+export default struct TaroPageMeta {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroPageMetaElement) => void = this.customBuilder
+  @ObjectLink node: TaroPageMetaElement
+
+  page: TaroAny = {}
+
+  aboutToAppear(): void {
+    if (!isTagFirstChild(this.node, APP, 2)) {
+      // PageMeta 只能是页面内的第一个元素
+      console.error('PageMeta 只能是页面内的第一个元素。')
+    }
+
+    this.page = getCurrentInstance().page
+    if (this.node) {
+      this.node._instance = this
+    }
+
+    // FIXME 在 Harmony 提供 @Watch 文档后，根据 node 实际使用更细粒度的监听
+    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
+    this.handleAttributes(this.node._attrs)
+  }
+
+  aboutToDisappear(): void {
+    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
+  }
+
+  handleAttributeUpdate = (opt: IComponentAttributeUpdateEvents) => {
+    if (opt.id === this.node._nid && opt.tagName === 'PAGE-META') {
+      const attrs: Record<string, TaroAny> = {}
+      attrs[opt.attribute] = opt.value
+      this.handleAttributes(attrs)
+    }
+  }
+
+  handleAttributes (attrs: Record<string, TaroAny>) {
+    const options: Record<string, TaroAny> = {}
+    let triggerStyleEvent = false
+
+    // FIXME 更新类型支持度
+    if (attrs.backgroundColorTop || attrs.rootBackgroundColor || attrs.backgroundColor) {
+      options.backgroundColorContext = attrs.backgroundColorTop || attrs.rootBackgroundColor || attrs.backgroundColor
+      triggerStyleEvent = true
+    }
+    if (attrs.backgroundColorBottom || attrs.backgroundColor) {
+      options.backgroundColor = attrs.backgroundColorBottom || attrs.backgroundColor
+      triggerStyleEvent = true
+    }
+    if (attrs.backgroundTextStyle) {
+      options.backgroundTextStyle = attrs.backgroundTextStyle
+      triggerStyleEvent = true
+    }
+
+    if (this.page === getCurrentInstance().page) {
+      if (attrs.scrollTop || attrs.scrollDuration) {
+        pageScrollTo({
+          scrollTop: attrs.scrollTop || this.node._attrs.scrollTop,
+          duration: attrs.scrollDuration || this.node._attrs.scrollDuration,
+        } as TaroAny)
+      }
+    }
+    // pageStyle
+    // rootFontSize
+    // pageFontSize
+    // pageOrientation
+    if (triggerStyleEvent) {
+      eventCenter.trigger('__taroPageStyle', options)
+    }
+    // onResize
+    // onScroll
+    // onScrollDone
+  }
+
+  build() {
+    if (true) {
+      this.createLazyChildren(this.node)
+    }
+  }
+}

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

@@ -1,14 +1,13 @@
 import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, TaroPickerElement, createTaroEvent } from '@tarojs/runtime'
-import { createLazyChildren } from './render'
 import commonStyleModify from './style'
 import { getSingleSelector, getMultiSelector } from './utils'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
-import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { FlexManager } from './utils/flexManager'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroEvent } from '@tarojs/runtime'
 
-import { PickerDateProps, PickerMultiSelectorProps, PickerSelectorProps, PickerTimeProps } from './types'
+import { PickerDateProps, PickerMultiSelectorProps, PickerSelectorProps, PickerTimeProps } from '@tarojs/components/types'
 
 interface TimeRange {
   startHH: number
@@ -146,9 +145,10 @@ export struct PickerView {
               color: '#000'
             })
             .canLoop(false)
-            .attributeModifier(commonStyleModify.setNode(this.node))
-            .width(getNormalAttributes(this.node).width || '100%')
-            .backgroundColor(getNormalAttributes(this.node).backgroundColor || '#fff')
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onChange((_, index) => {
               this.node?.updateFormWidgetValue(index)
             })
@@ -158,9 +158,10 @@ export struct PickerView {
               color: '#000'
             })
             .canLoop(false)
-            .attributeModifier(commonStyleModify.setNode(this.node))
-            .width(getNormalAttributes(this.node).width || '100%')
-            .backgroundColor(getNormalAttributes(this.node).backgroundColor || '#fff')
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onChange((_, index) => {
               if (index instanceof Array) {
                 this.node?.updateFormWidgetValue(index)
@@ -187,9 +188,10 @@ export struct PickerView {
             .selectedTextStyle({
               color: '#000'
             })
-            .attributeModifier(commonStyleModify.setNode(this.node))
-            .width(getNormalAttributes(this.node).width || '100%')
-            .backgroundColor(getNormalAttributes(this.node).backgroundColor || '#fff')
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onDateChange(value => {
               const data = value.toLocaleDateString().split('/')
               const day = data[1]
@@ -203,9 +205,10 @@ export struct PickerView {
               color: '#000'
             })
             .canLoop(false)
-            .attributeModifier(commonStyleModify.setNode(this.node))
-            .width(getNormalAttributes(this.node).width || '100%')
-            .backgroundColor(getNormalAttributes(this.node).backgroundColor || '#fff')
+            .attributeModifier(commonStyleModify.setNode(this.node, {
+              width: '100%',
+              backgroundColor: '#fff'
+            }))
             .onChange((value) => {
               this.node?.updateFormWidgetValue(`${('00'+value[0]).slice(-2)}:${('00'+value[1]).slice(-2)}`)
             })
@@ -219,9 +222,12 @@ export struct PickerView {
   }
 }
 
+
 @Component
 export default struct TaroPicker {
-  node: TaroPickerElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroPickerElement) => void = this.customBuilder
+  @ObjectLink node: TaroPickerElement
 
   aboutToAppear () {
     this.node?.addEventListener('click', this.handleClick)
@@ -237,8 +243,8 @@ export default struct TaroPicker {
           break
         case 'time': {
           const hour = new Date().getHours()
-          const minute = new Date().getMinutes() 
-  
+          const minute = new Date().getMinutes()
+
           defaultResetValue = `${('00'+hour).slice(-2)}:${('00'+minute).slice(-2)}`
           break
         }
@@ -247,7 +253,7 @@ export default struct TaroPicker {
           const day = data[1]
           const month = data[0]
           const year = data[2]
-  
+
           defaultResetValue = `${year}-${month}-${day}`
           break
         }
@@ -255,7 +261,7 @@ export default struct TaroPicker {
           defaultResetValue = ''
           break
       }
-  
+
       this.node._isInit = true
       this.node._reset = this.node.value || defaultResetValue
     }
@@ -305,24 +311,22 @@ export default struct TaroPicker {
   }
 
   build() {
-    if (this.node) {
-      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
-        Row() {
-          createLazyChildren(this.node)
-        }
-        .defaultEvent()
-        .visibleChangeEvent()
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-      } else {
-        Column() {
-          createLazyChildren(this.node)
-        }
-        .defaultEvent()
-        .visibleChangeEvent()
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+    if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
+      Row() {
+        this.createLazyChildren(this.node)
+      }
+      .defaultEvent()
+      .visibleChangeEvent()
+      .alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
+      .justifyContent(FlexManager.justifyContent(this.node))
+    } else {
+      Column() {
+        this.createLazyChildren(this.node)
       }
+      .defaultEvent()
+      .visibleChangeEvent()
+      .alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
+      .justifyContent(FlexManager.justifyContent(this.node))
     }
   }
 }

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

@@ -0,0 +1,52 @@
+import type { TaroProgressElement, TaroAny } from '@tarojs/runtime'
+import commonStyleModify from './style'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
+
+const PROGRESS_ACTIVECOLOR = '#09BB07'
+const PROGRESS_BACKGROUNDCOLOR = '#EBEBEB'
+const PROGRESS_DEFAULTINFOFONTSIZE = 16
+
+@Component
+export default struct TaroProgress {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroProgressElement) => void = this.customBuilder
+  @ObjectLink node: TaroProgressElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  build() {
+    Row({ space: 5 }) {
+      Progress({
+        value: parseFloat(this.node.getAttribute('percent')),
+        type: ProgressType.Linear
+      })
+        .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+        .color(this.node.getAttribute('activeColor') ?? PROGRESS_ACTIVECOLOR)
+        .backgroundColor(this.node.getAttribute('backgroundColor') ?? PROGRESS_BACKGROUNDCOLOR)
+        .style({
+          strokeWidth: this.node.getAttribute('strokeWidth'),
+          strokeRadius: parseFloat(this.node.getAttribute('borderRadius')),
+          enableSmoothEffect: Boolean(this.node.getAttribute('active')),
+        })
+
+        .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+        .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+        .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+          if (this.node) {
+            this.node._nodeInfo.areaInfo = res[1]
+          }
+        }))
+
+      if (this.node.getAttribute('showInfo')) {
+        Text(`${this.node.getAttribute('percent')}%`)
+          .fontSize(this.node.getAttribute('fontSize') ?? PROGRESS_DEFAULTINFOFONTSIZE)
+      }
+    }
+  }
+}

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

@@ -0,0 +1,80 @@
+import { getFontAttributes } from './utils/helper'
+import { pseudoModify } from './style'
+
+import type { TaroViewElement, TaroStyleType, TaroTextStyleType, TaroAny } from '@tarojs/runtime'
+
+@Extend(Flex)
+function flexAttrs (style: TaroStyleType) {
+  .constraintSize({
+    minWidth: style.minWidth,
+    maxWidth: style.maxWidth,
+    minHeight: style.minHeight || style.height,
+    maxHeight: style.maxHeight
+  })
+}
+
+
+@Extend(Text)
+function textNormalFontStyle (style: TaroStyleType) {
+  .id(style.id)
+  .key(style.id)
+  .opacity(style.opacity)
+  .fontColor(style.color)
+  .fontSize(style.fontSize)
+  .fontWeight(style.fontWeight)
+  .fontStyle(style.fontStyle)
+  .fontFamily(style.fontFamily)
+  .decoration({
+    type: style.textDecoration?.type || TextDecorationType.None,
+    color: style.color
+  })
+}
+
+@Extend(Text)
+function textSpecialFontStyle(attr: TaroTextStyleType) {
+  .textAlign(attr.textAlign)
+  .align(attr.verticalAlign)
+  .textOverflow(attr.textOverflow)
+  .maxLines(attr.WebkitLineClamp)
+  .letterSpacing(attr.letterSpacing)
+  .lineHeight(attr.lineHeight)
+}
+
+@Component
+export default struct PseduoChildren {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroAny) => void = this.customBuilder
+  @ObjectLink node: TaroViewElement
+
+  build () {
+    if (true) {
+      // 伪类::Before
+      if (this.node._pseudo_before) {
+        if (this.node._pseudo_before?.hmStyle.content) {
+          Text(this.node._pseudo_before.hmStyle.content)
+            .attributeModifier(pseudoModify.setStyle(this.node._pseudo_before.hmStyle))
+            .textNormalFontStyle(this.node._pseudo_before.hmStyle || {})
+            .textSpecialFontStyle(getFontAttributes(this.node))
+        } else {
+          Flex() {}
+          .attributeModifier(pseudoModify.setStyle(this.node._pseudo_before.hmStyle || {}))
+          .flexAttrs(this.node._pseudo_before.hmStyle || {})
+        }
+      }
+      this.createLazyChildren(this.node)
+      // 伪类::After
+      if (this.node._pseudo_after) {
+        if (this.node._pseudo_after?.hmStyle.content) {
+          Text(this.node._pseudo_after.hmStyle.content)
+            .attributeModifier(pseudoModify.setStyle(this.node._pseudo_after.hmStyle))
+            .textNormalFontStyle(this.node._pseudo_after.hmStyle || {})
+            .textSpecialFontStyle(getFontAttributes(this.node))
+        } else {
+          Flex() {}
+          .attributeModifier(pseudoModify.setStyle(this.node._pseudo_after.hmStyle || {}))
+          .flexAttrs(this.node._pseudo_after.hmStyle || {})
+        }
+      }
+    }
+  }
+}

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

@@ -1,22 +1,24 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
-import commonStyleModify from './style'
-import { createLazyChildren } from './render'
+import commonStyleModify, { rowModify, columnModify } from './style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import { TaroEvent, TaroAny, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
 
 interface RadioAttrs {
   radioStyle?: HarmonyType.RadioStyle
   themeStyles?: boolean
+  disabled?: boolean
 }
 
 @Extend(Radio)
 function radioAttr (attr: RadioAttrs) {
   .radioStyle(attr.radioStyle)
   .themeStyles(attr.themeStyles)
+  .enabled(!attr.disabled)
 }
 
 function getAttributes (node: TaroRadioElement): RadioAttrs {
@@ -25,6 +27,7 @@ function getAttributes (node: TaroRadioElement): RadioAttrs {
     checkedBackgroundColor: node._attrs.color || '#1aad19'
   }
   radioAttrs.themeStyles = !!node._attrs.disabled
+  radioAttrs.disabled = !!node._attrs.disabled
   return radioAttrs
 }
 
@@ -35,59 +38,61 @@ function themeStyles(isDisabled: boolean) {
 
 @Component
 export struct TaroRadio {
-  node: TaroRadioElement | null = null
-  
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroRadioElement) => void = this.customBuilder
+  @ObjectLink node: TaroRadioElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
   aboutToAppear () {
     if (this.node && !this.node._isInit) {
       this.node._isInit = true
+      this.node._instance = this
       this.node._reset = this.node.checked || false
     }
   }
 
   build () {
-    if (this.node) {
-      Stack() {
-        Row() {
-          Radio({
-            group: this.node.group || this.node.parentNode?._nid || '',
-            value: this.node.value || '',
-          })
-            .checked(this.node.checked)
-            .attributeModifier(commonStyleModify.setNode(this.node))
-            .radioAttr(getAttributes(this.node))
-            .onChange((value: boolean) => {
-              if (this.node) {
-                if (!!this.node?._attrs.disabled) {
-                  this.node.updateComponent()
-                } else {
-                  this.node.updateCheckedValue(value)
-      
-                  if (value) {
-                    const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, this.node)
-                    eventHandler(event, 'change', this.node)
-                  }
+    Stack() {
+      Row() {
+        Radio({
+          group: this.node.group || this.node.parentNode?._nid || '',
+          value: this.node.value || '',
+        })
+          .checked(this.node.checked)
+          .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+          .radioAttr(getAttributes(this.node))
+          .onChange((value: boolean) => {
+            if (this.node) {
+              if (!!this.node?._attrs.disabled) {
+                this.node.updateComponent()
+              } else {
+                this.node.updateCheckedValue(value)
+
+                if (value) {
+                  const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, 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) => {
-              if (this.node) {
-                this.node._nodeInfo.areaInfo = res[1]
-              }
-            }))
-            .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-          Text(this.node.textContent)
-            .textAlign(TextAlign.Center)
-            .opacity(!!this.node?._attrs.disabled ? 0.4 : 1)
-        }
-        .onClick(() => {
-          if (this.node) {
-            if (!this.node._checked && !this.node?._attrs.disabled) {
-              this.node.checked = !this.node.checked
             }
-          }
-        })
+          })
+          .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))
+        Text(this.node.textContent)
+          .textAlign(TextAlign.Center)
+          .opacity(!!this.node?._attrs.disabled ? 0.4 : 1)
       }
+      .onClick(() => {
+        if (this.node) {
+          if (!this.node._checked && !this.node?._attrs.disabled) {
+            this.node.checked = !this.node.checked
+          }
+        }
+      })
     }
   }
 }
@@ -95,7 +100,10 @@ export struct TaroRadio {
 
 @Component
 export struct TaroRadioGroup {
-  node: TaroRadioGroupElement | null = null
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroRadioGroupElement) => void = this.customBuilder
+  @ObjectLink node: TaroRadioGroupElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   @Styles visibleChangeEvent () {
     .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
@@ -103,6 +111,7 @@ export struct TaroRadioGroup {
 
   aboutToAppear () {
     if (this.node) {
+      this.node._instance = this
       const childList = this.node.getElementsByTagName<TaroRadioElement>('RADIO')
       childList.forEach(element => {
         element.group = this.node?._attrs.name || this.node?._nid
@@ -123,26 +132,27 @@ export struct TaroRadioGroup {
   }
 
   build() {
-    if (this.node) {
-      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
-        Row() {
-          createLazyChildren(this.node)
-        }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .defaultEvent()
-        .visibleChangeEvent()
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-      } else {
-        Column() {
-          createLazyChildren(this.node)
-        }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .defaultEvent()
-        .visibleChangeEvent()
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+    if (FlexManager.useFlexLayout(this.node)) {
+      Flex(FlexManager.flexOptions(this.node)) {
+        this.createLazyChildren(this.node)
+      }
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .defaultEvent()
+      .visibleChangeEvent()
+    } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
+      Row() {
+        this.createLazyChildren(this.node)
+      }
+      .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .defaultEvent()
+      .visibleChangeEvent()
+    } else {
+      Column() {
+        this.createLazyChildren(this.node)
       }
+      .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .defaultEvent()
+      .visibleChangeEvent()
     }
   }
 }