@tarojs/plugin-platform-harmony-ets 4.0.0-beta.79 → 4.0.0-beta.80

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

@@ -6,6 +6,21 @@ import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@tarojs/runtime'
 
+interface ButtonAttrs {
+  disabled?: boolean
+}
+
+@Extend(Button)
+function attrs(attr: ButtonAttrs) {
+  .enabled(!attr.disabled)
+}
+
+function getAttributes(node: TaroButtonElement): ButtonAttrs {
+  return {
+    disabled: node._attrs.disabled || false,
+  }
+}
+
 @Extend(Button)
 function themeStyles(style: TaroStyleType) {
   .fontColor(style.color)
@@ -121,6 +136,7 @@ export default struct TaroButton {
     }
     .themeStyles(getThemeAttributes(this.node))
     .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .attrs(getAttributes(this.node))
     .constraintSize({
       minWidth: this.node.hmStyle?.minWidth || getButtonMinWidth(this.node),
       minHeight: this.node.hmStyle?.minHeight || getButtonMinHeight(this.node),

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

@@ -13,17 +13,20 @@ interface CheckboxOptions {
 }
 interface CheckboxAttrs {
   selectedColor?: ResourceColor
+  disabled?: boolean
 }
 
 @Extend(Checkbox)
 function checkboxAttr(attr: CheckboxAttrs) {
   .selectedColor(attr.selectedColor)
+  .enabled(!attr.disabled)
 }
 
 function getAttributes (node: TaroCheckboxElement): CheckboxAttrs {
   const _attrs = node._attrs
   const checkboxAttrs: CheckboxAttrs = {}
   checkboxAttrs.selectedColor = _attrs.color || '#1aad19'
+  checkboxAttrs.disabled = !!_attrs.disabled
   return checkboxAttrs
 }
 

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

@@ -1,7 +1,7 @@
 import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
-import { 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'
@@ -9,6 +9,7 @@ import type { TaroStyleType, TaroAny, TaroInputElement, TaroEvent } from '@taroj
 interface InputAttrs {
   textAlign?: TextAlign
   autoFocus?: boolean
+  disabled?: boolean
 }
 
 @Extend(TextInput)
@@ -24,12 +25,14 @@ function styles (style: TaroStyleType) {
 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,
   }
 }
 
@@ -75,6 +78,7 @@ export default struct TaroInput {
     .placeholderColor(getPlaceholderColor(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))

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

@@ -1,5 +1,5 @@
 import type { TaroAny, TaroMovableAreaElement, TaroMovableViewElement } from '@tarojs/runtime'
-
+import { isTaroMovableViewElement } from '@tarojs/runtime'
 import commonStyleModify, { rowModify, columnModify } from './style'
 
 import { FlexManager } from './utils/flexManager'
@@ -7,7 +7,10 @@ import { isUndefined } from '@tarojs/shared'
 
 @Component
 export default struct TaroMovableArea {
-  @Builder customBuilder() {}
+  @Builder
+  customBuilder() {
+  }
+
   @BuilderParam createLazyChildren: (node: TaroMovableAreaElement) => void = this.customBuilder
   @ObjectLink node: TaroMovableAreaElement
   @State overwriteStyle: Record<string, TaroAny> = {}
@@ -18,6 +21,10 @@ export default struct TaroMovableArea {
     }
   }
 
+
+
+
+
   build() {
     if (FlexManager.useFlexLayout(this.node)) {
       Flex(FlexManager.flexOptions(this.node)) {
@@ -26,28 +33,21 @@ export default struct TaroMovableArea {
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .clip(true)
       .onAreaChange((oldValue: Area, newValue: Area) => {
-        this.node.childNodes.forEach(item => {
-          if(item.nodeName === 'MOVABLE-VIEW') {
-            ;(item as TaroMovableViewElement).area = {
-              w: Number( newValue.width),
-              h: Number(newValue.height)
-            }
-          }
-        })
+        areaChangeHandle(this.node, newValue)
       })
       .gesture(
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
           this.node.childNodes.forEach(item => {
-            if(item.nodeName === 'MOVABLE-VIEW') {
-              ;(item as TaroMovableViewElement).startScale()
+            if (isTaroMovableViewElement(item)) {
+              item.startScale()
             }
           })
         }).onActionUpdate((event) => {
           const scaleArea = this.node.getAttribute('scaleArea')
           if (scaleArea) {
             this.node.childNodes.forEach(item => {
-              if(item.nodeName === 'MOVABLE-VIEW') {
-                ;(item as TaroMovableViewElement).doScale(event.scale)
+              if (isTaroMovableViewElement(item)) {
+                item.doScale(event.scale)
               }
             })
           }
@@ -60,28 +60,21 @@ export default struct TaroMovableArea {
       .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .clip(true)
       .onAreaChange((oldValue: Area, newValue: Area) => {
-        this.node.childNodes.forEach(item => {
-          if(item.nodeName === 'MOVABLE-VIEW') {
-            ;(item as TaroMovableViewElement).area = {
-              w: Number( newValue.width),
-              h: Number(newValue.height)
-            }
-          }
-        })
+        areaChangeHandle(this.node, newValue)
       })
       .gesture(
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
           this.node.childNodes.forEach(item => {
-            if(item.nodeName === 'MOVABLE-VIEW') {
-              ;(item as TaroMovableViewElement).startScale()
+            if (isTaroMovableViewElement(item)) {
+              item.startScale()
             }
           })
         }).onActionUpdate((event) => {
           const scaleArea = this.node.getAttribute('scaleArea')
           if (scaleArea) {
             this.node.childNodes.forEach(item => {
-              if(item.nodeName === 'MOVABLE-VIEW') {
-                ;(item as TaroMovableViewElement).doScale(event.scale)
+              if (isTaroMovableViewElement(item)) {
+                item.doScale(event.scale)
               }
             })
           }
@@ -94,28 +87,21 @@ export default struct TaroMovableArea {
       .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .clip(true)
       .onAreaChange((oldValue: Area, newValue: Area) => {
-        this.node.childNodes.forEach(item => {
-          if(item.nodeName === 'MOVABLE-VIEW') {
-            ;(item as TaroMovableViewElement).area = {
-              w: Number( newValue.width),
-              h: Number(newValue.height)
-            }
-          }
-        })
+        areaChangeHandle(this.node, newValue)
       })
       .gesture(
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
           this.node.childNodes.forEach(item => {
-            if(item.nodeName === 'MOVABLE-VIEW') {
-              ;(item as TaroMovableViewElement).startScale()
+            if (isTaroMovableViewElement(item)) {
+              item.startScale()
             }
           })
         }).onActionUpdate((event) => {
           const scaleArea = this.node.getAttribute('scaleArea')
           if (scaleArea) {
             this.node.childNodes.forEach(item => {
-              if(item.nodeName === 'MOVABLE-VIEW') {
-                ;(item as TaroMovableViewElement).doScale(event.scale)
+              if (isTaroMovableViewElement(item)) {
+                item.doScale(event.scale)
               }
             })
           }
@@ -124,3 +110,15 @@ export default struct TaroMovableArea {
     }
   }
 }
+function areaChangeHandle(node: TaroMovableAreaElement,newValue: Area) {
+  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

@@ -42,7 +42,9 @@ export default struct TaroMovableView {
     .translate({ x: this.node.position.x, y: this.node.position.y })
     .scale({ x: this.node.scaleValue, y: this.node.scaleValue })
     .onAreaChange((oldValue: Area, newValue: Area) => {
-      this.node.selfSize = { w: Number(newValue.width), h: Number(newValue.height) }
+      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(

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

@@ -11,12 +11,14 @@ 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
 }
 

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

@@ -10,6 +10,7 @@ interface SliderAttrs {
   trackColor?: ResourceColor
   trackThickness?: Length
   blockColor?: ResourceColor
+  disabled?: boolean
 }
 
 @Extend(Slider)
@@ -18,6 +19,7 @@ function attrs (attr: SliderAttrs) {
   .trackColor(attr.trackColor)
   .trackThickness(attr.trackThickness)
   .blockColor(attr.blockColor)
+  .enabled(!attr.disabled)
 }
 
 function getAttributes (node: TaroSliderElement): SliderAttrs {
@@ -27,6 +29,7 @@ function getAttributes (node: TaroSliderElement): SliderAttrs {
   sliderAttrs.trackColor = _attrs.backgroundColor || _attrs.color || '#e9e9e9'
   sliderAttrs.trackThickness = _attrs.blockSize
   sliderAttrs.blockColor = _attrs.blockColor || '#ffffff'
+  sliderAttrs.disabled = !!_attrs.disabled
   return sliderAttrs
 }
 

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

@@ -7,18 +7,20 @@ import type { TaroAny, TaroSwitchElement, TaroEvent } from '@tarojs/runtime'
 
 interface SwitchAttrs {
   selectedColor?: ResourceColor
+  disabled?: boolean
 }
 
 @Extend(Toggle)
 function attrs(attr: SwitchAttrs) {
   .selectedColor(attr.selectedColor)
+  .enabled(!attr.disabled)
 }
 
 function getAttributes (node: TaroSwitchElement): SwitchAttrs {
-  const _attrs = node._attrs
-  const switchStyle: SwitchAttrs = {}
-  switchStyle.selectedColor = _attrs.color || '#04BE02'
-  return switchStyle
+  const attr: SwitchAttrs = {}
+  attr.selectedColor = node._attrs.color || '#04BE02'
+  attr.disabled = !!node._attrs.disabled
+  return attr
 }
 
 @Extend(Toggle)

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

@@ -7,6 +7,7 @@ import type { TaroAny, TaroStyleType, TaroTextStyleType, TaroTextAreaElement, Ta
 
 interface TextareaAttrs extends TaroTextStyleType {
   autoFocus?: boolean
+  disabled?: boolean
 }
 
 @Extend(TextArea)
@@ -23,11 +24,13 @@ function textAttr(attr: TextareaAttrs) {
   .textAlign(attr.textAlign)
   .maxLines(attr.WebkitLineClamp)
   .defaultFocus(attr.autoFocus)
+  .enabled(!attr.disabled)
 }
 
 function getAttributes(node: TaroTextAreaElement): TextareaAttrs {
   const attrs: TaroAny = getFontAttributes(node)
   attrs.autoFocus = node._attrs.autoFocus || node._attrs.focus || false
+  attrs.disabled = node._attrs.disabled || false
   return attrs
 }
 

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

@@ -16,7 +16,7 @@ import {
   TaroTextAreaElement
 } from './form'
 import { TaroMovableAreaElement } from './movableArea'
-import { TaroMovableViewElement } from './movableView'
+import { TaroMovableViewElement, isTaroMovableViewElement } from './movableView'
 import {
   TaroButtonElement,
   TaroIconElement,
@@ -113,3 +113,8 @@ export {
   TaroViewElement,
   TaroWebViewElement
 }
+
+
+export {
+  isTaroMovableViewElement
+}

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

@@ -1,6 +1,7 @@
 import { TaroElement } from './element'
 
 import type { MovableViewProps } from '@tarojs/components/types'
+import type { TaroAny } from '../../utils'
 
 type Tsize = {
   w: number
@@ -21,6 +22,9 @@ function calcPosition(postion: number, start: number, end: number) {
   }
 }
 
+export function isTaroMovableViewElement (item: TaroAny): item is TaroMovableViewElement {
+  return item instanceof TaroMovableViewElement
+}
 @Observed
 export class TaroMovableViewElement extends TaroElement<MovableViewProps & { animation: undefined }> {
   _scaleValue = 1
@@ -55,17 +59,6 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
     return 0
   }
 
-  set area(val: Tsize) {
-    if (this._area === undefined) {
-      this._areaInited = true
-    }
-    this._area = val
-  }
-
-  get area(): Tsize | undefined {
-    return this._area
-  }
-
   startScale() {
     this._scalevalueTemp = this._scaleValue
   }
@@ -160,7 +153,7 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
   }
 
   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
@@ -173,6 +166,7 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
   }
 
   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
@@ -186,7 +180,7 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
 
   initPositionFromAttribute () {
     if (!this.area || !this.selfSize) {
-      return 
+      return
     }
     const x = this.getAttribute('x') ? Number(this.getAttribute('x')) : 0
     const y = this.getAttribute('y') ? Number(this.getAttribute('y')) : 0
@@ -238,6 +232,8 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
     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/utils/index.ts

@@ -50,6 +50,9 @@ export function convertNumber2VP (value: number, unit = 'px'): string | number {
 }
 
 export function parseClasses (classNames = ''): string[] {
+  if (typeof classNames !== 'string') {
+    return []
+  }
   return classNames.includes(' ') ? classNames.split(' ') : [classNames]
 }
 
@@ -64,6 +67,7 @@ export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, clas
   const cache: Record<string, CSSProperties> = styleSheet.cache as Record<string, CSSProperties>
 
   const classes = parseClasses(classNames)
+  if (!classes.length) return {}
   if (classes.length === 1) {
     // 同一个引用
     return styleSheet[classes[0]]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.79",
+  "version": "4.0.0-beta.80",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -25,13 +25,13 @@
   },
   "dependencies": {
     "webpack-sources": "^3.2.3",
-    "@tarojs/components": "4.0.0-beta.79",
-    "@tarojs/helper": "4.0.0-beta.79",
-    "@tarojs/runner-utils": "4.0.0-beta.79",
-    "@tarojs/service": "4.0.0-beta.79",
-    "@tarojs/shared": "4.0.0-beta.79",
-    "@tarojs/taro": "4.0.0-beta.79",
-    "@tarojs/runtime": "4.0.0-beta.79"
+    "@tarojs/components": "4.0.0-beta.80",
+    "@tarojs/helper": "4.0.0-beta.80",
+    "@tarojs/runner-utils": "4.0.0-beta.80",
+    "@tarojs/service": "4.0.0-beta.80",
+    "@tarojs/runtime": "4.0.0-beta.80",
+    "@tarojs/shared": "4.0.0-beta.80",
+    "@tarojs/taro": "4.0.0-beta.80"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -44,7 +44,7 @@
     "solid-js": "^1.8.16",
     "tslib": "^2.4.0",
     "typescript": "^4.8.2",
-    "rollup-plugin-copy": "4.0.0-beta.79"
+    "rollup-plugin-copy": "4.0.0-beta.80"
   },
   "scripts": {
     "prebuild": "rimraf ./dist",