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

package/dist/runtime-ets/dom/element/form.ts

@@ -29,14 +29,10 @@ interface FormWidgetProps extends StandardProps {
 }
 
 class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends TaroElement<T> {
-  _instance
-
   _isInit = false
 
   _name = ''
 
-  _value: TaroAny = ''
-
   _reset: TaroAny = ''
 
   constructor (tagName: string) {
@@ -45,7 +41,7 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
     bindFocus(this)
 
     this._name = this._attrs.name || ''
-    this._value = this._attrs.value || ''
+    this._nodeInfo._value = this._attrs.value || ''
   }
 
   public setAttribute (name: string, value: any): void {
@@ -66,11 +62,10 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
 
   public set name (val: string) {
     this.updateFormWidgetName(val)
-    this.updateComponent()
   }
 
   public get value () {
-    return this._value
+    return this._nodeInfo._value
   }
 
   public set value (val: TaroAny) {
@@ -78,8 +73,6 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
 
     if (this._instance) {
       this._instance.value = val
-    } else {
-      this.updateComponent()
     }
   }
 
@@ -89,7 +82,7 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
   }
 
   public updateFormWidgetValue (val: TaroAny) {
-    this._value = val
+    this._nodeInfo._value = val
     this._attrs.value = val
   }
 
@@ -121,7 +114,6 @@ class TaroCheckedElement<T extends StandardProps & { checked?: boolean } = Stand
 
   set checked (val: boolean) {
     this.updateCheckedValue(val)
-    this.updateComponent()
   }
 
   public updateCheckedValue (val: boolean) {
@@ -134,6 +126,7 @@ class TaroCheckedElement<T extends StandardProps & { checked?: boolean } = Stand
   }
 }
 
+@Observed
 class TaroInputElement<T extends FormWidgetProps = InputProps> extends TaroFormWidgetElement<T> {
   _height = 0
 
@@ -193,38 +186,39 @@ class TaroInputElement<T extends FormWidgetProps = InputProps> extends TaroFormW
   }
 }
 
-
-class TaroTextAreaElement extends TaroInputElement<TextareaProps>{
+@Observed
+class TaroTextAreaElement extends TaroInputElement<TextareaProps> {
   controller: TextAreaController = new TextAreaController()
 
   constructor() {
     super('TextArea')
   }
 }
-
-class TaroCheckboxElement extends TaroCheckedElement<CheckboxProps>{
+@Observed
+class TaroCheckboxElement extends TaroCheckedElement<CheckboxProps> {
   constructor() {
     super('Checkbox')
   }
 }
 
-class TaroRadioElement extends TaroCheckedElement<RadioProps>{
+@Observed
+class TaroRadioElement extends TaroCheckedElement<RadioProps> {
   public group?: string
 
   constructor() {
     super('Radio')
   }
 }
-class TaroSliderElement extends TaroFormWidgetElement<SliderProps> {
-  _value = 0
 
+@Observed
+class TaroSliderElement extends TaroFormWidgetElement<SliderProps> {
   constructor() {
     super('Slider')
 
-    this._value = Number(this._attrs.value || 0)
+    this._nodeInfo._value = Number(this._attrs.value || 0)
   }
 }
-
+@Observed
 class TaroPickerElement extends TaroFormWidgetElement<PickerSelectorProps | PickerTimeProps | PickerDateProps | PickerMultiSelectorProps> {
   constructor() {
     super('Picker')
@@ -238,7 +232,7 @@ class TaroPickerElement extends TaroFormWidgetElement<PickerSelectorProps | Pick
       case 'selector': {
         const key = this._attrs.rangeKey
         const item = this._attrs.range[this.value]
-        
+
         if (key) {
           return item[key]
         } else {
@@ -267,18 +261,19 @@ class TaroPickerElement extends TaroFormWidgetElement<PickerSelectorProps | Pick
     super.reset()
 
     const event: TaroEvent = createTaroEvent('change', { detail: { value: this._reset } }, this)
-    
+
     event.stopPropagation()
     eventHandler(event, 'change', this)
   }
 }
 
+@Observed
 class TaroSwitchElement extends TaroCheckedElement<SwitchProps> {
   constructor() {
     super('Switch')
   }
 }
-
+@Observed
 class TaroCheckboxGroupElement extends TaroFormWidgetElement<CheckboxGroupProps> {
   constructor() {
     super('CheckboxGroup')
@@ -304,6 +299,7 @@ class TaroCheckboxGroupElement extends TaroFormWidgetElement<CheckboxGroupProps>
   }
 }
 
+@Observed
 class TaroRadioGroupElement extends TaroFormWidgetElement<RadioGroupProps> {
   constructor() {
     super('RadioGroup')
@@ -329,6 +325,7 @@ class TaroRadioGroupElement extends TaroFormWidgetElement<RadioGroupProps> {
   }
 }
 
+@Observed
 class TaroFormElement extends TaroFormWidgetElement {
   constructor() {
     super('Form')
@@ -340,7 +337,7 @@ class TaroFormElement extends TaroFormWidgetElement {
 
       findChildNodeWithDFS<TaroFormWidgetElement>(this, item => {
         if (!item.name) return false
-        
+
         switch (item.nodeName) {
           case 'INPUT':
           case 'RADIO':
@@ -371,9 +368,9 @@ class TaroFormElement extends TaroFormWidgetElement {
         e.stopPropagation()
         switch (item.nodeName) {
           case 'INPUT':
-          case 'SLIDER': 
+          case 'SLIDER':
           case 'PICKER':
-          case 'RADIO': 
+          case 'RADIO':
           case 'SWITCH':
           case 'CHECKBOX':
           case 'TEXTAREA':

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

@@ -1,5 +1,6 @@
 import { Current } from '../../current'
 import { TaroTextNode } from '../node'
+import { TaroCanvasElement } from './canvas'
 import { TaroElement } from './element'
 import {
   FormElement,
@@ -14,20 +15,26 @@ import {
   TaroSwitchElement,
   TaroTextAreaElement
 } from './form'
+import { TaroMovableAreaElement } from './movableArea'
+import { TaroMovableViewElement, isTaroMovableViewElement } from './movableView'
 import {
   TaroButtonElement,
   TaroIconElement,
   TaroImageElement,
   TaroLabelElement,
+  TaroNavigationBarElement,
+  TaroOtherElement,
+  TaroPageMetaElement,
   TaroRichTextElement,
   TaroSwiperElement,
   TaroSwiperItemElement,
   TaroViewElement
 } from './normal'
+import { TaroProgressElement } from './progress'
 import { TaroScrollViewElement } from './scrollView'
 import { TaroTextElement } from './text'
 import { TaroVideoElement } from './video'
-import { TaroWebViewElement } from './webView'
+import { TaroInnerHtmlElement, TaroWebViewElement } from './webView'
 
 export function initHarmonyElement () {
   Current.createHarmonyElement = (tagName: string) => {
@@ -36,7 +43,11 @@ export function initHarmonyElement () {
       case 'image': return new TaroImageElement()
       case 'text': return new TaroTextElement()
       case 'button': return new TaroButtonElement()
+      case 'movable-area': return new TaroMovableAreaElement()
+      case 'movable-view': return new TaroMovableViewElement()
+      case 'progress': return new TaroProgressElement()
       case 'scroll-view': return new TaroScrollViewElement()
+      case 'scroll-list': return new TaroScrollViewElement()
       case 'checkbox-group': return new TaroCheckboxGroupElement()
       case 'input': return new TaroInputElement()
       case 'picker': return new TaroPickerElement()
@@ -49,12 +60,16 @@ export function initHarmonyElement () {
       case 'icon': return new TaroIconElement()
       case 'label': return new TaroLabelElement()
       case 'rich-text': return new TaroRichTextElement()
+      case 'canvas': return new TaroCanvasElement()
       case 'swiper': return new TaroSwiperElement()
       case 'swiper-item': return new TaroSwiperItemElement()
       case 'textarea': return new TaroTextAreaElement()
       case 'form': return new TaroFormElement()
       case 'web-view': return new TaroWebViewElement()
-      default: return new TaroElement(tagName)
+      case 'inner-html': return new TaroInnerHtmlElement()
+      case 'page-meta': return new TaroPageMetaElement()
+      case 'navigation-bar': return new TaroNavigationBarElement()
+      default: return new TaroOtherElement(tagName)
     }
   }
 
@@ -67,15 +82,23 @@ export function initHarmonyElement () {
 export {
   FormElement,
   TaroButtonElement,
+  TaroCanvasElement,
   TaroCheckboxElement,
   TaroCheckboxGroupElement,
   TaroElement,
   TaroFormElement,
   TaroIconElement,
   TaroImageElement,
+  TaroInnerHtmlElement,
   TaroInputElement,
   TaroLabelElement,
+  TaroMovableAreaElement,
+  TaroMovableViewElement,
+  TaroNavigationBarElement,
+  TaroOtherElement,
+  TaroPageMetaElement,
   TaroPickerElement,
+  TaroProgressElement,
   TaroRadioElement,
   TaroRadioGroupElement,
   TaroRichTextElement,
@@ -90,3 +113,8 @@ export {
   TaroViewElement,
   TaroWebViewElement
 }
+
+
+export {
+  isTaroMovableViewElement
+}

package/dist/runtime-ets/dom/element/movableArea.ts

@@ -0,0 +1,11 @@
+
+import { TaroElement } from './element'
+
+import type { MovableAreaProps } from '@tarojs/components/types'
+
+@Observed
+export class TaroMovableAreaElement extends TaroElement<MovableAreaProps> {
+  constructor() {
+    super('MovableArea')
+  }
+}

package/dist/runtime-ets/dom/element/movableView.ts

@@ -0,0 +1,244 @@
+import { TaroElement } from './element'
+
+import type { MovableViewProps } from '@tarojs/components/types'
+import type { TaroAny } from '../../utils'
+
+type Tsize = {
+  w: number
+  h: number
+}
+type Tpoint = {
+  x: number
+  y: number
+}
+
+function calcPosition(postion: number, start: number, end: number) {
+  if (postion <= end && postion >= start) {
+    return postion
+  } else if (postion < start) {
+    return start
+  } else {
+    return end
+  }
+}
+
+export function isTaroMovableViewElement (item: TaroAny): item is TaroMovableViewElement {
+  return item instanceof TaroMovableViewElement
+}
+@Observed
+export class TaroMovableViewElement extends TaroElement<MovableViewProps & { animation: undefined }> {
+  _scaleValue = 1
+  _scalevalueTemp = 1
+
+  // 父级区别的大小
+  _area?: Tsize
+  // 自己元素的大小
+  _selfSize?: Tsize
+  _areaInited: false
+  _selfSizeInited: false
+
+  // 元素的位置
+  _position: Tpoint = {
+    x: 0,
+    y: 0,
+  }
+
+  _positionTemp: Tpoint = {
+    x: 0,
+    y: 0,
+  }
+
+  constructor() {
+    super('MovableView')
+  }
+
+  get _outOfBounds() {
+    if (this.getAttribute('outOfBounds')) {
+      return this.selfSize ? this.selfSize.w / 3 : 0
+    }
+    return 0
+  }
+
+  startScale() {
+    this._scalevalueTemp = this._scaleValue
+  }
+
+  doScale(val: number) {
+    const scale = this.getAttribute('scale')
+
+    // 禁止缩放的时候不生效
+    if (scale) {
+      this.scaleValue = val * this._scalevalueTemp
+    }
+  }
+
+  set scaleValue(val: number) {
+    if (this.checkScaleValueInBounds(val)) {
+      this._scaleValue = val
+
+      this.checkPositionBoundary(this.position, val)
+
+      const scaleFns = this?.__listeners?.scale || []
+      scaleFns.forEach((fn) => {
+        fn({ ...this.position, scale: this.scaleValue })
+      })
+    }
+  }
+
+  get visibility () {
+    return this._areaInited && this._selfSizeInited ? Visibility.Visible : Visibility.Hidden
+  }
+
+  get scaleValue() {
+    return this._scaleValue
+  }
+
+  startMove() {
+    this._positionTemp = this._position
+  }
+
+  doMove(val: Tpoint) {
+    if (!this.area || !this.selfSize) {
+      return
+    }
+    if (this.getAttribute('disabled')) {
+      return
+    }
+    const direction = this.getAttribute('direction')
+
+    // 容器的宽高终点
+    const areaWidthEnd = this.area.w - this.selfSize.w * this.scaleValue
+    const areaHeightEnd = this.area.h - this.selfSize.h * this.scaleValue
+
+    const incrementWidth = (this.scaleValue - 1) * this.selfSize.w
+    const incrementHeight = (this.scaleValue - 1) * this.selfSize.h
+
+    let x = this._positionTemp.x
+    let y = this._positionTemp.y
+    if (['all', 'horizontal'].includes(direction)) {
+      const nextX = this._positionTemp.x + val.x * this.scaleValue
+      x = calcPosition(
+        nextX,
+        incrementWidth * 0.5 - this._outOfBounds,
+        areaWidthEnd + incrementWidth * 0.5 + this._outOfBounds
+      )
+    }
+
+    if (['all', 'vertical'].includes(direction)) {
+      const nextY = this._positionTemp.y + val.y * this.scaleValue
+      y = calcPosition(
+        nextY,
+        incrementHeight * 0.5 - this._outOfBounds,
+        areaHeightEnd + incrementHeight * 0.5 + this._outOfBounds
+      )
+    }
+
+    const changeFns = this?.__listeners?.change || []
+    changeFns.forEach((fn) => {
+      fn({ x, y, source: 'touch' })
+    })
+
+    this.position = {
+      x: x,
+      y: y,
+    }
+  }
+
+  get position() {
+    return this._position
+  }
+
+  set position(val: Tpoint) {
+    this._position = val
+  }
+
+  set area(val: Tsize) {
+    if (val.w === this._area?.w && val.h === this._area?.h) return
+    this._area = val
+    if (!this._areaInited) {
+      this._areaInited = true
+      this.initPositionFromAttribute()
+    }
+  }
+
+  get area(): Tsize | undefined {
+    return this._area
+  }
+
+  set selfSize(val: Tsize) {
+    if (val.w === this._selfSize?.w && val.h === this._selfSize?.h) return
+    this._selfSize = val
+    if (!this._selfSizeInited) {
+      this._selfSizeInited = true
+      this.initPositionFromAttribute()
+    }
+  }
+
+  get selfSize(): Tsize | undefined {
+    return this._selfSize
+  }
+
+  initPositionFromAttribute () {
+    if (!this.area || !this.selfSize) {
+      return
+    }
+    const x = this.getAttribute('x') ? Number(this.getAttribute('x')) : 0
+    const y = this.getAttribute('y') ? Number(this.getAttribute('y')) : 0
+    this.checkPositionBoundary({ x, y }, this.scaleValue)
+  }
+
+  checkPositionBoundary(position: Tpoint, scale: number) {
+    if (!this.area || !this.selfSize) {
+      return { x: 0, y: 0 }
+    }
+
+    const areaWidthEnd = this.area.w - this.selfSize.w * scale
+    const areaHeightEnd = this.area.h - this.selfSize.h * scale
+
+    const incrementWidth = (scale - 1) * this.selfSize.w
+    const incrementHeight = (scale - 1) * this.selfSize.h
+
+    this.position = {
+      x: calcPosition(position.x, incrementWidth * 0.5, areaWidthEnd + incrementWidth * 0.5),
+      y: calcPosition(position.y, incrementHeight * 0.5, areaHeightEnd + incrementHeight * 0.5),
+    }
+  }
+
+  checkScaleValueInBounds(currentScale: number) {
+    const scaleMin = this.getAttribute('scaleMin')
+    const scaleMax = this.getAttribute('scaleMax')
+
+    if (scaleMin && Number(scaleMin) >= 0.1 && currentScale < Number(scaleMin)) {
+      return false
+    } else if (scaleMax && Number(scaleMax) >= 0.1 && currentScale > Number(scaleMax)) {
+      return false
+    }
+
+    return true
+  }
+
+  public setAttribute(name: string, value: any): void {
+    if (name === 'x') {
+      this.checkPositionBoundary({ x: value, y: this.position.y }, this.scaleValue)
+    }
+    if (name === 'y') {
+      this.checkPositionBoundary({ x: this.position.x, y: value }, this.scaleValue)
+    }
+
+    super.setAttribute(name, value)
+  }
+
+  public callTouchEventFnFromGesture(eventName: string, gestureEvent: GestureEvent) {
+    const touchFns = (this?.__listeners?.[eventName] || []) as Function[]
+    touchFns.forEach(fn => {
+      fn({
+        _hmEvent: gestureEvent,
+        target: this,
+        changedTouches: gestureEvent.fingerList.map(finger => ({
+          clientX: finger.globalX,
+          clientY: finger.globalY
+        }))
+      })
+    })
+  }
+}

package/dist/runtime-ets/dom/element/normal.ts

@@ -6,50 +6,60 @@ import type {
   IconProps,
   ImageProps,
   LabelProps,
+  NavigationBarProps,
+  PageMetaProps,
   RichTextProps,
   SwiperItemProps,
   SwiperProps,
   ViewProps
 } from '@tarojs/components/types'
 
+@Observed
+class TaroOtherElement extends TaroElement<ViewProps> {}
+
+@Observed
 class TaroViewElement extends TaroElement<ViewProps> {
   constructor() {
     super('View')
   }
 }
 
+@Observed
 class TaroImageElement extends TaroElement<ImageProps> {
   constructor() {
     super('Image')
   }
 }
 
+@Observed
 class TaroButtonElement extends TaroElement<ButtonProps> {
   constructor() {
     super('Button')
   }
 }
 
-
-class TaroIconElement extends TaroElement<IconProps>{
+@Observed
+class TaroIconElement extends TaroElement<IconProps> {
   constructor() {
     super('Icon')
   }
 }
-
-class TaroLabelElement extends TaroElement<LabelProps>{
+@Observed
+class TaroLabelElement extends TaroElement<LabelProps> {
   constructor() {
     super('Label')
   }
 }
 
-class TaroRichTextElement extends TaroElement<RichTextProps>{
+@Observed
+class TaroRichTextElement extends TaroElement<RichTextProps> {
   constructor() {
     super('RichText')
   }
 }
 
-class TaroSwiperElement extends TaroElement<SwiperProps>{
+@Observed
+class TaroSwiperElement extends TaroElement<SwiperProps> {
   controller: SwiperController = new SwiperController()
 
   constructor() {
@@ -57,20 +67,37 @@ class TaroSwiperElement extends TaroElement<SwiperProps>{
   }
 }
 
-class TaroSwiperItemElement extends TaroElement<SwiperItemProps>{
+@Observed
+class TaroSwiperItemElement extends TaroElement<SwiperItemProps> {
   constructor() {
     super('SwiperItem')
   }
 }
 
+@Observed
+class TaroPageMetaElement extends TaroElement<PageMetaProps> {
+  constructor() {
+    super('PageMeta')
+  }
+}
+
+@Observed
+class TaroNavigationBarElement extends TaroElement<NavigationBarProps> {
+  constructor() {
+    super('NavigationBar')
+  }
+}
 
 export {
   TaroButtonElement,
   TaroIconElement,
   TaroImageElement,
   TaroLabelElement,
+  TaroNavigationBarElement,
+  TaroOtherElement,
+  TaroPageMetaElement,
   TaroRichTextElement,
   TaroSwiperElement,
   TaroSwiperItemElement,
-  TaroViewElement, 
+  TaroViewElement
 }

package/dist/runtime-ets/dom/element/progress.ts

@@ -0,0 +1,11 @@
+
+import { TaroElement } from './element'
+
+import type { ProgressProps } from '@tarojs/components/types'
+
+@Observed
+export class TaroProgressElement extends TaroElement<ProgressProps> {
+  constructor() {
+    super('Progress')
+  }
+}

package/dist/runtime-ets/dom/element/scrollView.ts

@@ -3,6 +3,7 @@ import { TaroElement } from './element'
 
 import type { ScrollViewProps } from '@tarojs/components/types'
 
+@Observed
 export class TaroScrollViewElement extends TaroElement<ScrollViewProps> {
   scroller: Scroller = new Scroller()
 

package/dist/runtime-ets/dom/element/text.ts

@@ -1,17 +1,10 @@
-import { TaroNode } from '../node'
 import { TaroElement } from './element'
 
 import type { TextProps } from '@tarojs/components/types'
 
+@Observed
 export class TaroTextElement extends TaroElement<TextProps> {
   constructor() {
     super('Text')
   }
-
-  public appendChild (child: TaroNode): TaroNode {
-    super.appendChild(child)
-
-    this.updateComponent()
-    return child
-  }
 }