@tarojs/plugin-platform-harmony-ets 4.0.0-beta.11 → 4.0.0-beta.111

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

@@ -1,13 +1,15 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
-import { getNormalAttributes, parseStyles, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { parseStyles, shouldBindEvent, getNodeThresholds, getStyleAttr } from './utils/helper'
 import { INPUT_TYPE_MAP, INPUT_CONFIRM_MAP } from './utils/constant/style'
 
 import type { TaroStyleType, TaroAny, TaroInputElement, TaroEvent } from '@tarojs/runtime'
 
 interface InputAttrs {
   textAlign?: TextAlign
+  autoFocus?: boolean
+  disabled?: boolean
 }
 
 @Extend(TextInput)
@@ -22,12 +24,15 @@ function styles (style: TaroStyleType) {
 @Extend(TextInput)
 function attrs(attr: InputAttrs) {
   .textAlign(attr.textAlign)
+  .defaultFocus(attr.autoFocus)
+  .enabled(!attr.disabled)
 }
 
-
 function getAttributes(node: TaroInputElement): InputAttrs {
   return {
     textAlign: node.hmStyle.textAlign,
+    autoFocus: node._attrs.autoFocus || node._attrs.focus || false,
+    disabled: node._attrs.disabled || false,
   }
 }
 
@@ -44,11 +49,26 @@ function getPlaceholderColor (node: TaroInputElement): string {
   return placeholderTextColor || parseStyles(placeholderStyle)?.color
 }
 
+function getPlaceholderFont(node: TaroInputElement): Font {
+  const placeholderStyle: string = node._attrs.placeholderStyle || ''
+  const styles = parseStyles(placeholderStyle);
+  if (styles) {
+    return {
+      size: styles.fontSize,
+    }
+  }
+
+  return {}
+}
+
 @Component
 export default struct TaroInput {
   @State value: string = ''
 
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroInputElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroInputElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
   aboutToAppear () {
     if (this.node) {
@@ -63,43 +83,45 @@ export default struct TaroInput {
   }
 
   build () {
-    if (this.node) {
-      TextInput({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
-      .key(this.node._nid)
-      .type(getInputType(this.node))
-      .maxLength(Number(this.node._attrs?.maxlength) || null)
-      .placeholderColor(getPlaceholderColor(this.node))
-      .enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done)
-      .attributeModifier(commonStyleModify.setNode(this.node))
-      .styles(getNormalAttributes(this.node))
-      .attrs(getAttributes(this.node))
-      .onChange((value: string) => {
-        const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
-        
-        this.value = value
-        this.node?.updateFormWidgetValue(value)
-        eventHandler(event, 'input', this.node)
-      })
-      .onSubmit(() => {
-        const event: TaroEvent = createTaroEvent('confirm', { detail: { value: this.value } }, this.node)
-        eventHandler(event, 'confirm', this.node)
-      })
-      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
-      .onBlur(() => {
-        const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
-        eventHandler(event, 'blur', this.node)
-      })
-      .onFocus(() => {
-        const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
-  
-        eventHandler(event, 'focus', this.node)
-      })
-      .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))
-    }
+    TextInput({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
+    .key(this.node._nid.toString())
+    .type(getInputType(this.node))
+    .maxLength(Number(this.node._attrs?.maxlength) || null)
+    .placeholderColor(getPlaceholderColor(this.node))
+    .placeholderFont(getPlaceholderFont(this.node))
+    .enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done)
+    .padding(0) // Note: 移出 Input 默认 padding 设置
+    .backgroundColor(getStyleAttr(this.node, "backgroundColor"))// 
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .styles(this.node?.hmStyle)
+    .attrs(getAttributes(this.node))
+    .onChange((value: string) => {
+      const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
+
+      this.value = value
+      this.node?.updateFormWidgetValue(value)
+      eventHandler(event, 'input', this.node)
+    })
+    .onSubmit(() => {
+      const event: TaroEvent = createTaroEvent('confirm', { detail: { value: this.value } }, this.node)
+      eventHandler(event, 'confirm', this.node)
+    })
+    .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
+    .onBlur(() => {
+      const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
+      eventHandler(event, 'blur', this.node)
+    })
+    .onFocus(() => {
+      const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
+
+      eventHandler(event, 'focus', this.node)
+    })
+    .enableKeyboardOnFocus(typeof (this.node._attrs as TaroAny)?.enableKeyboardOnFocus === 'undefined' ? true : (this.node._attrs as TaroAny).enableKeyboardOnFocus)
+    .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))
   }
 }

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

@@ -1,18 +1,19 @@
 import { Current, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, getPageScrollerOrNode, AREA_CHANGE_EVENT_NAME } 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 { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { FlexManager } from './utils/flexManager'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroLabelElement, TaroElement, TaroAny, TaroRadioElement, TaroCheckboxElement } from '@tarojs/runtime'
+import { isUndefined } from '@tarojs/shared'
 
 function handleTargetChange (id: string) {
   const taro: TaroAny = Current.taro
   const page: TaroAny = taro.getCurrentInstance().page
-  const currentPageNode: TaroElement = getPageScrollerOrNode(page.node, page)
-  const node: TaroElement | null = currentPageNode.getElementById(id)
+  const currentPageNode: TaroElement = getPageScrollerOrNode(page?.node, page)
+  const node: TaroElement | null = currentPageNode?.getElementById(id)
 
   if (!node) return
 
@@ -34,49 +35,71 @@ function handleTargetChange (id: string) {
   }
 }
 
-
 @Component
 export default struct TaroLabel {
-  @ObjectLink node:TaroLabelElement
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroLabelElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroLabelElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
   build() {
-    if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+    if (FlexManager.useFlexLayout(this.node)) {
+      Flex(FlexManager.flexOptions(this.node)) {
+        this.createLazyChildren(this.node, 0)
+      }
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .onClick((e: ClickEvent) => {
+        const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
+        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid.toString() || ''
+
+        handleTargetChange(id)
+        eventHandler(e, 'click', this.node)
+      })
+      .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+    } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
       Row() {
-        createLazyChildren(this.node)
+        this.createLazyChildren(this.node, 0)
       }
-      .attributeModifier(commonStyleModify.setNode(this.node))
+      .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .onClick((e: ClickEvent) => {
         const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
-        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid.toString() || ''
 
         handleTargetChange(id)
         eventHandler(e, 'click', this.node)
       })
-      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
       .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
         this.node._nodeInfo.areaInfo = res[1]
       }))
       .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-      .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-      .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
     } else {
       Column() {
-        createLazyChildren(this.node)
+        this.createLazyChildren(this.node, 0)
       }
-      .attributeModifier(commonStyleModify.setNode(this.node))
+      .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .onClick((e: ClickEvent) => {
         const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
-        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
+        const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid.toString() || ''
 
         handleTargetChange(id)
         eventHandler(e, 'click', this.node)
       })
-      .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+      .onTouch(shouldBindEvent((e: TouchEvent) => { eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node) }, this.node, TOUCH_EVENT_MAP.values()))
       .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
         this.node._nodeInfo.areaInfo = res[1]
       }))
       .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
-      .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-      .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
     }
   }
 }

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

@@ -0,0 +1,31 @@
+import commonStyleModify from './style'
+
+import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
+
+@Reusable
+@Component
+export default struct TaroListView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroViewElement, layer?: number) => void = this.customBuilder
+  @ObjectLink node: TaroViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  aboutToReuse(params: TaroAny): void {
+    // this.node = params.node;
+  }
+
+  build() {
+    ListItem() {
+      Stack() {
+        this.createLazyChildren(this.node, 0)
+      }
+    }
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+  }
+}

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

@@ -1,67 +1,126 @@
-import type { TaroMovableAreaElement, TaroStyleType } from '@tarojs/runtime'
-import commonStyleModify from './style'
-import { createLazyChildren } from './render'
+import type { TaroAny, TaroMovableAreaElement, TaroMovableViewElement } from '@tarojs/runtime'
+import { isTaroMovableViewElement } from '@tarojs/runtime'
+import commonStyleModify, { rowModify, columnModify } from './style'
 
-import { FlexManager } from './utils/FlexManager'
-import { getNormalAttributes } from './utils/helper'
-
-
-@Extend(Row)
-function rowAttrs(style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-}
-
-@Extend(Column)
-function columnAttrs(style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    maxHeight: style.maxHeight
-  })
-}
+import { FlexManager } from './utils/flexManager'
+import { isUndefined } from '@tarojs/shared'
 
 @Component
 export default struct TaroMovableArea {
+  @Builder
+  customBuilder() {
+  }
+
+  @BuilderParam createLazyChildren: (node: TaroMovableAreaElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroMovableAreaElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+
+
 
-  @Provide areaWidth: Length = 0
-  @Provide areaHeight: Length = 0
 
   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))
-        .rowAttrs(getNormalAttributes(this.node))
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-        .clip(true)
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
+    if (FlexManager.useFlexLayout(this.node)) {
+      Flex(FlexManager.flexOptions(this.node)) {
+        this.createLazyChildren(this.node, 0)
+      }
+      .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .clip(true)
+      .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+        sizeChangeHandle(this.node, newValue)
+      })
+      .gesture(
+        PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+          this.node.childNodes.forEach(item => {
+            if (isTaroMovableViewElement(item)) {
+              item.startScale()
+            }
+          })
+        }).onActionUpdate((event) => {
+          const scaleArea = this.node.getAttribute('scaleArea')
+          if (scaleArea) {
+            this.node.childNodes.forEach(item => {
+              if (isTaroMovableViewElement(item)) {
+                item.doScale(event.scale)
+              }
+            })
+          }
         })
-      } else {
-        Column() {
-          createLazyChildren(this.node)
-        }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .columnAttrs(getNormalAttributes(this.node))
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-        .clip(true)
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
+      )
+    } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
+      Row() {
+        this.createLazyChildren(this.node, 0)
+      }
+      .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .clip(true)
+      .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+        sizeChangeHandle(this.node, newValue)
+      })
+      .gesture(
+        PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+          this.node.childNodes.forEach(item => {
+            if (isTaroMovableViewElement(item)) {
+              item.startScale()
+            }
+          })
+        }).onActionUpdate((event) => {
+          const scaleArea = this.node.getAttribute('scaleArea')
+          if (scaleArea) {
+            this.node.childNodes.forEach(item => {
+              if (isTaroMovableViewElement(item)) {
+                item.doScale(event.scale)
+              }
+            })
+          }
         })
+      )
+    } else {
+      Column() {
+        this.createLazyChildren(this.node, 0)
       }
+      .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      .clip(true)
+      .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+        sizeChangeHandle(this.node, newValue)
+      })
+      .gesture(
+        PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+          this.node.childNodes.forEach(item => {
+            if (isTaroMovableViewElement(item)) {
+              item.startScale()
+            }
+          })
+        }).onActionUpdate((event) => {
+          const scaleArea = this.node.getAttribute('scaleArea')
+          if (scaleArea) {
+            this.node.childNodes.forEach(item => {
+              if (isTaroMovableViewElement(item)) {
+                item.doScale(event.scale)
+              }
+            })
+          }
+        })
+      )
     }
   }
 }
+
+
+function sizeChangeHandle(node: TaroMovableAreaElement, newValue: Area | SizeOptions) {
+  node.childNodes.forEach(item => {
+    if (isTaroMovableViewElement(item)) {
+      if (item.area?.w !== Number(newValue.width) || item.area?.h !== Number(newValue.height)) {
+        item.area = {
+          w: Number(newValue.width),
+          h: Number(newValue.height)
+        }
+      }
+    }
+  })
+}

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

@@ -1,66 +1,93 @@
-import type { TaroMovableViewElement, TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroMovableViewElement, TaroElement } from '@tarojs/runtime'
 
-import commonStyleModify from './style'
-import { createLazyChildren } from './render'
+import commonStyleModify, { rowModify, columnModify } from './style'
+
+import { FlexManager } from './utils/flexManager'
 
-import { FlexManager } from './utils/FlexManager'
-import { getNormalAttributes, } from './utils/helper'
-@Extend(Row)
-function rowAttrs(style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth || style.width,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-}
 
-@Extend(Column)
-function columnAttrs(style: TaroStyleType) {
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight || style.height,
-    maxHeight: style.maxHeight
-  })
-}
 
 @Component
-export default struct TaroMovableArea {
+export default struct TaroMovableView {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroMovableViewElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroMovableViewElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
 
-  @Provide areaWidth: Length = 0
-  @Provide areaHeight: Length = 0
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+
+    }
+  }
 
   build() {
-    if (this.node) {
-      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
+    Stack() {
+      if (FlexManager.useFlexLayout(this.node)) {
+        Flex(FlexManager.flexOptions(this.node)) {
+          this.createLazyChildren(this.node, 0)
+        }
+        .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+      } else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
         Row() {
-          createLazyChildren(this.node)
+          this.createLazyChildren(this.node, 0)
         }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .rowAttrs(getNormalAttributes(this.node))
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-        .clip(true)
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
-        })
+        .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       } else {
         Column() {
-          createLazyChildren(this.node)
+          this.createLazyChildren(this.node, 0)
         }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .columnAttrs(getNormalAttributes(this.node))
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-        .clip(true)
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
-        })
+        .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       }
     }
+    .translate({ x: this.node.position.x, y: this.node.position.y })
+    .scale({ x: this.node.scaleValue, y: this.node.scaleValue })
+    .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+      if (this.node.selfSize?.w !== Number(newValue.width) || this.node.selfSize?.h !== Number(newValue.height)) {
+        this.node.selfSize = { w: Number(newValue.width), h: Number(newValue.height) }
+      }
+    })
+    .visibility(this.node.visibility)
+    .gesture(
+      GestureGroup(GestureMode.Parallel,
+        PanGesture(getPanOption(this.node)).onActionStart((e: GestureEvent) => {
+
+          this.node.startMove()
+          this.node.callTouchEventFnFromGesture('touchstart', e)
+        }).onActionUpdate((e: GestureEvent) => {
+          this.node.callTouchEventFnFromGesture('touchmove', e)
+          this.node.doMove({
+            x: e.offsetX,
+            y: e.offsetY
+          })
+
+        }).onActionEnd((e: GestureEvent) => {
+          this.node.callTouchEventFnFromGesture('touchend', e)
+          this.node.checkPositionBoundary(this.node.position, this.node.scaleValue)
+        }),
+        PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+          this.node.startScale()
+        }).onActionUpdate((event) => {
+          this.node.doScale(event.scale)
+        })
+      )
+    )
   }
 }
+
+
+function getPanOption(node: TaroMovableViewElement) {
+  const attrDirection = node.getAttribute('direction')
+  let panDirection = PanDirection.All
+
+  if(node.getAttribute('disabled')) {
+    panDirection = PanDirection.None
+  } else if(attrDirection === 'horizontal') {
+    panDirection = PanDirection.Horizontal
+  } else if (attrDirection === 'vertical') {
+    panDirection = PanDirection.Vertical
+  }
+  return new PanGestureOptions({
+    direction: panDirection,
+    fingers: 1
+  })
+}