@tarojs/plugin-platform-harmony-ets 4.0.0-beta.50 → 4.0.0-beta.52

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

@@ -1,6 +1,9 @@
+import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+
 import { isTagFirstChild } from './utils/helper'
 
-import type { TaroNavigationBarElement } from '@tarojs/runtime'
+import type { TaroAny, TaroNavigationBarElement } from '@tarojs/runtime'
+import type { IComponentAttributeUpdateEvents } from './pageMeta'
 
 @Component
 export default struct TaroNavigationBar {
@@ -15,6 +18,42 @@ export default struct TaroNavigationBar {
     if (this.node) {
       this.node._instance = this
     }
+
+    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+    this.handleAttributes(this.node._attrs)
+  }
+
+  aboutToDisappear(): void {
+    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+  }
+
+  handleAttributeUpdate (opt: IComponentAttributeUpdateEvents) {
+    if (opt.id === this.node._nid && opt.tagName === 'NAVIGATION-BAR') {
+      const attrs: Record<string, TaroAny> = {}
+      attrs[opt.attribute] = opt.value
+      this.handleAttributes(attrs)
+    }
+  }
+
+  handleAttributes (attrs: Record<string, TaroAny>) {
+    const options: Record<string, TaroAny> = {}
+
+    // FIXME 更新类型支持度
+    if (attrs.title) {
+      options.title = attrs.title
+    }
+    if (attrs.loading) {
+      options.loading = attrs.loading
+    }
+    if (attrs.backgroundColor) {
+      options.backgroundColor = attrs.backgroundColor
+    }
+    if (attrs.frontColor) {
+      options.frontColor = attrs.frontColor
+    }
+    eventCenter.trigger('__taroNavigationStyle', options)
+    // attrs.colorAnimationDuration
+    // attrs.colorAnimationTimingFunc
   }
 
   build() {

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

@@ -1,8 +1,15 @@
-import { APP } from '@tarojs/runtime/dist/runtime.esm'
+import { APP, eventCenter } from '@tarojs/runtime/dist/runtime.esm'
 
 import { isTagFirstChild } from './utils/helper'
 
-import type { TaroPageMetaElement } from '@tarojs/runtime'
+import type { TaroAny, TaroPageMetaElement } from '@tarojs/runtime'
+
+export interface IComponentAttributeUpdateEvents {
+  id: string
+  tagName: string
+  attribute: string
+  value: TaroAny
+}
 
 @Component
 export default struct TaroPageMeta {
@@ -18,6 +25,54 @@ export default struct TaroPageMeta {
     if (this.node) {
       this.node._instance = this
     }
+
+    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+    this.handleAttributes(this.node._attrs)
+  }
+
+  aboutToDisappear(): void {
+    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+  }
+
+  handleAttributeUpdate (opt: IComponentAttributeUpdateEvents) {
+    if (opt.id === this.node._nid && opt.tagName === 'PAGE-META') {
+      const attrs: Record<string, TaroAny> = {}
+      attrs[opt.attribute] = opt.value
+      this.handleAttributes(attrs)
+    }
+  }
+
+  handleAttributes (attrs: Record<string, TaroAny>) {
+    const options: Record<string, TaroAny> = {}
+
+    // FIXME 更新类型支持度
+    if (attrs.backgroundColorTop || options.backgroundColor) {
+      options.backgroundColorContext = attrs.backgroundColorTop || options.backgroundColor
+    }
+    if (attrs.backgroundColorBottom || options.backgroundColor) {
+      options.backgroundColor = attrs.backgroundColorBottom || options.backgroundColor
+    }
+    if (attrs.backgroundTextStyle) {
+      options.backgroundTextStyle = attrs.backgroundTextStyle
+    }
+
+    // if (attrs.scrollTop || attrs.scrollDuration) {
+    //   pageScrollTo({
+    //     scrollTop: attrs.scrollTop || this.node._attrs.scrollTop,
+    //     duration: attrs.scrollDuration || this.node._attrs.scrollDuration,
+    //   })
+    // }
+    // pageStyle
+    if (attrs.rootBackgroundColor) {
+      options.backgroundColor = attrs.rootBackgroundColor
+    }
+    // rootFontSize
+    // pageFontSize
+    // pageOrientation
+    eventCenter.trigger('__taroPageStyle', options)
+    // onResize
+    // onScroll
+    // onScrollDone
   }
 
   build() {

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

@@ -39,12 +39,13 @@ export function getNodeThresholds (node: TaroElement): number[] | null {
 export function isTagFirstChild (node: TaroElement, tagName = VIEW, level = 0): boolean {
   const parent: TaroElement | null = node.parentElement
   const list: TaroNode[] = node.parentNode?.childNodes || []
-  if (!parent || list.length < 1 || level < 0) return false
+  if (list.length < 1 || level < 0) return false
+  else if (!parent) return true
 
   if (parent.nodeName === tagName.toUpperCase()) {
     return list[0] === node
   } else {
-    return list[0] === node && isTagFirstChild(parent, tagName, --level)
+    return (list[0] === node) && isTagFirstChild(parent, tagName, --level)
   }
 }
 

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

@@ -1,4 +1,3 @@
-import { Current } from '../current'
 import { ObjectAssign } from '../utils'
 
 import type { TaroAny } from '../utils'

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

@@ -1,4 +1,4 @@
-import { eventSource } from '@tarojs/runtime/dist/runtime.esm'
+import { eventCenter, eventSource } from '@tarojs/runtime/dist/runtime.esm'
 import { EMPTY_OBJ, toCamelCase } from '@tarojs/shared'
 
 import { ATTRIBUTES_CALLBACK_TRIGGER_MAP, ID } from '../../constant'
@@ -31,7 +31,7 @@ export class TaroElement<
   public _nodeInfo: TaroAny = {
     layer: 0 // 渲染层级
   }
-  
+
   public hm_instance: TaroAny
 
   public get _instance () {
@@ -115,14 +115,24 @@ export class TaroElement<
 
     this._attrs[name] = value
 
-    const attributeTriggerValue: TaroAny = ATTRIBUTES_CALLBACK_TRIGGER_MAP[name]
-    if (attributeTriggerValue) {
-      const triggerName: TaroAny = attributeTriggerValue.triggerName
-      const valueInspect: TaroAny = attributeTriggerValue.valueInspect
+    if (['PAGE-META', 'NAVIGATION-BAR'].includes(this.tagName)) {
+      // FIXME 等 Harmony 支持更细粒度的 @Watch 方法后移出
+      eventCenter.trigger('__taroComponentAttributeUpdate', {
+        id: this._nid,
+        tagName: this.tagName,
+        attribute: name,
+        value
+      })
+    } else {
+      const attributeTriggerValue: TaroAny = ATTRIBUTES_CALLBACK_TRIGGER_MAP[name]
+      if (attributeTriggerValue) {
+        const triggerName: TaroAny = attributeTriggerValue.triggerName
+        const valueInspect: TaroAny = attributeTriggerValue.valueInspect
 
-      if (valueInspect && !valueInspect(value)) return
+        if (valueInspect && !valueInspect(value)) return
 
-      triggerAttributesCallback(this, triggerName)
+        triggerAttributesCallback(this, triggerName)
+      }
     }
   }
 
@@ -240,7 +250,7 @@ export class TaroElement<
       this._pseudo_after = null
     }
   }
-  
+
   // 伪类，在获取的时候根据dom和parent的关系，动态设置
   public _pseudo_class: Record<string, StyleSheet | null> = {
     // ["::first-child"]: new StyleSheet(),
@@ -346,7 +356,7 @@ export class TaroElement<
     }
   }
 
-  // 设置动画  
+  // 设置动画
   public setAnimation (playing) {
     if (!this._instance) {
       if (!this._nodeInfo.aboutToAppear) {
@@ -364,7 +374,7 @@ export class TaroElement<
     if (playing && keyframes && keyframes[0] && keyframes[0].percentage === 0) {
       this._instance.overwriteStyle = keyframes[0].event
     }
-    
+
     // 首次设置，不用实例替换
     if (!this._nodeInfo.hasAnimation) {
       this._nodeInfo.hasAnimation = true
@@ -396,8 +406,8 @@ export class TaroElement<
   }
 
   private playAnimation () {
-    const { 
-      animationDuration = 0, animationDelay = 0, animationIterationCount = 1, animationName: keyframes, 
+    const {
+      animationDuration = 0, animationDelay = 0, animationIterationCount = 1, animationName: keyframes,
       animationTimingFunction
     } = this._st.hmStyle
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.50",
+  "version": "4.0.0-beta.52",
   "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.50",
-    "@tarojs/runner-utils": "4.0.0-beta.50",
-    "@tarojs/helper": "4.0.0-beta.50",
-    "@tarojs/service": "4.0.0-beta.50",
-    "@tarojs/runtime": "4.0.0-beta.50",
-    "@tarojs/shared": "4.0.0-beta.50",
-    "@tarojs/taro": "4.0.0-beta.50"
+    "@tarojs/components": "4.0.0-beta.52",
+    "@tarojs/runner-utils": "4.0.0-beta.52",
+    "@tarojs/helper": "4.0.0-beta.52",
+    "@tarojs/runtime": "4.0.0-beta.52",
+    "@tarojs/service": "4.0.0-beta.52",
+    "@tarojs/shared": "4.0.0-beta.52",
+    "@tarojs/taro": "4.0.0-beta.52"
   },
   "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.50"
+    "rollup-plugin-copy": "4.0.0-beta.52"
   },
   "scripts": {
     "prebuild": "rimraf ./dist",