@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.16 → 4.0.0-alpha.18

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

@@ -32,8 +32,8 @@ export default struct TaroMovableArea {
       }
       .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .clip(true)
-      .onAreaChange((oldValue: Area, newValue: Area) => {
-        areaChangeHandle(this.node, newValue)
+      .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+        sizeChangeHandle(this.node, newValue)
       })
       .gesture(
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
@@ -59,8 +59,8 @@ export default struct TaroMovableArea {
       }
       .attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .clip(true)
-      .onAreaChange((oldValue: Area, newValue: Area) => {
-        areaChangeHandle(this.node, newValue)
+      .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+        sizeChangeHandle(this.node, newValue)
       })
       .gesture(
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
@@ -86,8 +86,8 @@ export default struct TaroMovableArea {
       }
       .attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
       .clip(true)
-      .onAreaChange((oldValue: Area, newValue: Area) => {
-        areaChangeHandle(this.node, newValue)
+      .onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
+        sizeChangeHandle(this.node, newValue)
       })
       .gesture(
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
@@ -110,7 +110,9 @@ export default struct TaroMovableArea {
     }
   }
 }
-function areaChangeHandle(node: TaroMovableAreaElement,newValue: Area) {
+
+
+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)) {

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

@@ -41,7 +41,7 @@ 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) => {
+    .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) }
       }

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/cssNesting.ts

@@ -1,7 +1,6 @@
 import { parseClasses } from '../utils'
 
 import type { CSSProperties, ReactElement } from 'react'
-
 // 抽出来的嵌套查询
 // const __nesting_style__ = [
 //   {
@@ -74,7 +73,7 @@ function depthTraversal(root: ReactElement) {
     const result: Record<string, TMapping> = {}
     if (tree && tree.props) {
       // 兜底适配：如果Taro组件被原封不动的再别的地方导出使用，导致无法在编译环境添加__hmStyle
-      // import { View } from '~/components'
+      // import { View } from '../../../~/components'
       // hack：如果是taro节点，但是被赋予了__styleSheet，则走一下__styleSheet转__hmStyle
       if (tree.props.__styleSheet && typeof tree.type !== 'function') {
         tree.props.__hmStyle = Object.assign({}, tree.props.__hmStyle, tree.props.__styleSheet.value)
@@ -128,28 +127,34 @@ function depthTraversal(root: ReactElement) {
   const processLeaf = (leaf, descendant_map: TMappingNode) => {
     if (!leaf) return
 
-    // 如果是个数组
-    if (leaf instanceof Array) {
-      for (let i = 0; i < leaf.length; i++) {
-        processLeaf(leaf[i], descendant_map)
+    const queue = [leaf]
+
+    while (queue.length > 0) {
+      const current = queue.shift()
+
+      if (current instanceof Array) {
+        for (let i = 0; i < current.length; i++) {
+          queue.push(current[i])
+        }
+        continue
       }
-    }
 
-    const leaf_map = traverse(leaf)
-    if (!leaf_map) return
+      const leaf_map = traverse(current)
+      if (!leaf_map) continue
 
-    // 直接后代
-    Object.assign(descendant_map.children, leaf_map)
+      // 直接后代
+      Object.assign(descendant_map.children, leaf_map)
 
-    // 子孙后代
-    const grandchild: (Record<string, TMapping> | TMapping)[] = [leaf_map]
-    Object.keys(leaf_map).forEach(key => {
-      const leaf_child_map = class_mapping[key]
-      if (leaf_child_map?.descendants) {
-        grandchild.push(leaf_child_map.descendants)
-      }
-    })
-    Object.assign(descendant_map.descendants, ...grandchild)
+      // 子孙后代
+      const grandchild: (Record<string, TMapping> | TMapping)[] = [leaf_map]
+      Object.keys(leaf_map).forEach(key => {
+        const leaf_child_map = class_mapping[key]
+        if (leaf_child_map?.descendants) {
+          grandchild.push(leaf_child_map.descendants)
+        }
+      })
+      Object.assign(descendant_map.descendants, ...grandchild)
+    }
   }
 
   traverse(root)
@@ -239,24 +244,29 @@ function combineStyle(nestingStyle: NestingStyle, class_mapping: TMapping, alias
     }
     return selector_nodes
   }
-  const findSelector = (selectors, current_mapping, declaration): TSelectorNode[] => {
-    const new_selectors = selectors.slice()
-    const selector_string = new_selectors.shift()
-    const combinator_type = new_selectors.shift()
-    const _elements = findElement(selector_string, combinator_type, current_mapping, new_selectors, declaration)
-    if (_elements.length) {
-      if (new_selectors.length) {
-        let elements: TSelectorNode[] = []
-        _elements.forEach(element => {
-          elements = elements.concat(findSelector(new_selectors.slice(), element.mapping, declaration))
-        })
-        return elements
-      } else {
-        return _elements
+  const findSelector = (selectors: string[], current_mapping: any, declaration: any): TSelectorNode[] => {
+    const workQueue: { selectors: string[], current_mapping: any }[] = [{ selectors, current_mapping }]
+    let resultElements: TSelectorNode[] = []
+    while (workQueue.length > 0) {
+      const { selectors: currentSelectors, current_mapping: currentMapping } = workQueue.shift()!
+      const new_selectors = currentSelectors.slice()
+      const selector_string = new_selectors.shift()
+      const combinator_type = new_selectors.shift()
+
+      const _elements = findElement(selector_string, combinator_type, currentMapping, new_selectors, declaration)
+
+      if (_elements.length) {
+        if (new_selectors.length) {
+          _elements.forEach(element => {
+            workQueue.push({ selectors: new_selectors.slice(), current_mapping: element.mapping })
+          })
+        } else {
+          resultElements = resultElements.concat(_elements)
+        }
       }
-    } else {
-      return []
     }
+
+    return resultElements
   }
   if (nestingStyle && nestingStyle instanceof Array) {
     // 合并样式

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

@@ -53,12 +53,16 @@ export class TaroElement<
   public dataset: Record<string, unknown> = EMPTY_OBJ
   public _attrs: T & TaroExtraProps = {} as T & TaroExtraProps
 
+  private _page: any
+
   constructor(tagName: string) {
     super(tagName.replace(new RegExp('(?<=.)([A-Z])', 'g'), '-$1').toUpperCase(), NodeType.ELEMENT_NODE)
     this.tagName = this.nodeName
     this._style = createCSSStyleDeclaration(this)
     initComponentNodeInfo(this)
     bindAnimation(this)
+
+    this._page = Current.page
   }
 
   public set id(value: string) {
@@ -270,28 +274,28 @@ export class TaroElement<
   }
 
   get currentLayerNode () {
-    if (!Current.page) return null
-    if (typeof Current.page.tabBarCurrentIndex !== 'undefined') {
-      Current.page.layerNode ||= []
-      Current.page.layerNode[Current.page.tabBarCurrentIndex] ||= Current.createHarmonyElement('VIEW')
+    if (!this._page) return null
+    if (typeof this._page.tabBarCurrentIndex !== 'undefined') {
+      this._page.layerNode ||= []
+      this._page.layerNode[this._page.tabBarCurrentIndex] ||= Current.createHarmonyElement('VIEW')
       // Tabbar
-      return Current.page.layerNode[Current.page.tabBarCurrentIndex]
+      return this._page.layerNode[this._page.tabBarCurrentIndex]
     } else {
-      Current.page.layerNode ||= Current.createHarmonyElement('VIEW')
-      return Current.page.layerNode
+      this._page.layerNode ||= Current.createHarmonyElement('VIEW')
+      return this._page.layerNode
     }
   }
 
   get currentLayerParents () {
-    if (!Current.page) return null
-    if (typeof Current.page.tabBarCurrentIndex !== 'undefined') {
-      Current.page.layerParents ||= []
-      Current.page.layerParents[Current.page.tabBarCurrentIndex] ||= []
+    if (!this._page) return null
+    if (typeof this._page.tabBarCurrentIndex !== 'undefined') {
+      this._page.layerParents ||= []
+      this._page.layerParents[this._page.tabBarCurrentIndex] ||= []
       // Tabbar
-      return Current.page.layerParents[Current.page.tabBarCurrentIndex]
+      return this._page.layerParents[this._page.tabBarCurrentIndex]
     } else {
-      Current.page.layerParents ||= []
-      return Current.page.layerParents
+      this._page.layerParents ||= []
+      return this._page.layerParents
     }
   }
 

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

@@ -232,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-framework/react/app.ts

@@ -196,7 +196,7 @@ export function createReactApp (
             const keys = Object.keys(globalData)
             const descriptors = Object.getOwnPropertyDescriptors(globalData)
             keys.forEach(key => {
-              Object.defineProperty(this, key, {
+              Object.defineProperty(Current?.app || this, key, {
                 configurable: true,
                 enumerable: true,
                 get () {
@@ -207,7 +207,7 @@ export function createReactApp (
                 }
               })
             })
-            Object.defineProperties(this, descriptors)
+            Object.defineProperties(Current?.app || this, descriptors)
           }
 
           app.onCreate?.()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -26,22 +26,22 @@
   "dependencies": {
     "webpack-sources": "^3.2.3",
     "webpack": "5.78.0",
-    "@tarojs/components": "4.0.0-alpha.16",
-    "@tarojs/helper": "4.0.0-alpha.16",
-    "@tarojs/service": "4.0.0-alpha.16",
-    "@tarojs/runner-utils": "4.0.0-alpha.16",
-    "@tarojs/runtime": "4.0.0-alpha.16",
-    "@tarojs/taro": "4.0.0-alpha.16",
-    "@tarojs/shared": "4.0.0-alpha.16"
+    "@tarojs/components": "4.0.0-alpha.18",
+    "@tarojs/runner-utils": "4.0.0-alpha.18",
+    "@tarojs/runtime": "4.0.0-alpha.18",
+    "@tarojs/helper": "4.0.0-alpha.18",
+    "@tarojs/shared": "4.0.0-alpha.18",
+    "@tarojs/taro": "4.0.0-alpha.18",
+    "@tarojs/service": "4.0.0-alpha.18"
   },
   "devDependencies": {
     "fast-glob": "^3.3.1",
-    "rollup": "^3.8.1",
+    "rollup": "^3.29.4",
     "rollup-plugin-node-externals": "^5.0.0",
     "rollup-plugin-ts": "^3.0.2",
     "solid-js": "^1.8.16",
     "tslib": "^2.4.0",
-    "rollup-plugin-copy": "4.0.0-alpha.16"
+    "rollup-plugin-copy": "4.0.0-alpha.18"
   },
   "scripts": {
     "prod": "pnpm run build",