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

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/style.ets

@@ -4,7 +4,7 @@ import { isUndefined } from '@tarojs/shared'
 import { computeBackgroundPosition, convertVp2Px } from './utils'
 import { getNormalAttributes } from './utils/helper'
 import { isMaxWidthView } from './utils/styles'
-import { FlexManager } from './utils/flexManager.ets'
+import { FlexManager } from './utils/flexManager'
 
 class TextStyleModify implements AttributeModifier<TextAttribute> {
   initStyle?: TaroStyleType

package/dist/components-harmony-ets/utils/flexManager.ets

@@ -1,6 +1,6 @@
 import type { TaroElement, HarmonyStyle } from '@tarojs/runtime'
 import { isUndefined } from '@tarojs/shared'
-import { getNormalAttributes } from './styles.ets'
+import { getNormalAttributes } from './styles'
 
 interface IFlexOptions {
   direction: FlexDirection,

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) {
@@ -115,6 +119,17 @@ export class TaroElement<
 
     this._attrs[name] = value
 
+    // 混合开发的组件没办法自动更新，需要把父级的结点删掉新建
+    // Current.nativeComponentNames会在render.ets中赋值
+    if(Current.nativeComponentNames?.includes(this.tagName)) {
+      const idxOfRef = this.parentNode?.findIndex(this)
+
+      if (idxOfRef !== undefined) {
+        this._nativeUpdateTrigger++
+        this.parentNode?.notifyDataChange(idxOfRef)
+      } 
+    }
+
     if (['PAGE-META', 'NAVIGATION-BAR'].includes(this.tagName)) {
       // FIXME 等 Harmony 支持更细粒度的 @Watch 方法后移出
       eventCenter.trigger('__taroComponentAttributeUpdate', {
@@ -270,28 +285,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/node.ts

@@ -44,6 +44,9 @@ export class TaroNode extends TaroDataSourceElement {
   // 是否为半编译模板下拥有自主更新权的节点
   public _isDynamicNode = false
 
+  // 以下属性为原生混写组件才有意义的属性
+  public _nativeUpdateTrigger = 0
+
   constructor(nodeName: string, nodeType = NodeType.ELEMENT_NODE) {
     super()
 

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-beta.80",
+  "version": "4.0.0-beta.82",
   "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.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"
+    "@tarojs/runner-utils": "4.0.0-beta.82",
+    "@tarojs/components": "4.0.0-beta.82",
+    "@tarojs/helper": "4.0.0-beta.82",
+    "@tarojs/runtime": "4.0.0-beta.82",
+    "@tarojs/service": "4.0.0-beta.82",
+    "@tarojs/shared": "4.0.0-beta.82",
+    "@tarojs/taro": "4.0.0-beta.82"
   },
   "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.80"
+    "rollup-plugin-copy": "4.0.0-beta.82"
   },
   "scripts": {
     "prebuild": "rimraf ./dist",