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

package/dist/apis/ui/scroll/index.ts

@@ -34,7 +34,7 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
     const page = taro.getCurrentInstance().page
 
     let scrollValue = -1
-    let scroller = page.scroller
+    let scroller = getPageScrollerOrNode(page.scroller, page)
     const currentPageNode = getPageScrollerOrNode(page.node, page)
 
     if (scrollTop || typeof scrollTop === 'number') {

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

@@ -19,15 +19,16 @@ export default struct TaroNavigationBar {
       this.node._instance = this
     }
 
-    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+    // FIXME 在 Harmony 提供 @Watch 文档后，根据 node 实际使用更细粒度的监听
+    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
     this.handleAttributes(this.node._attrs)
   }
 
   aboutToDisappear(): void {
-    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
   }
 
-  handleAttributeUpdate (opt: IComponentAttributeUpdateEvents) {
+  handleAttributeUpdate = (opt: IComponentAttributeUpdateEvents) => {
     if (opt.id === this.node._nid && opt.tagName === 'NAVIGATION-BAR') {
       const attrs: Record<string, TaroAny> = {}
       attrs[opt.attribute] = opt.value
@@ -38,7 +39,6 @@ export default struct TaroNavigationBar {
   handleAttributes (attrs: Record<string, TaroAny>) {
     const options: Record<string, TaroAny> = {}
 
-    // FIXME 更新类型支持度
     if (attrs.title) {
       options.title = attrs.title
     }
@@ -52,6 +52,7 @@ export default struct TaroNavigationBar {
       options.frontColor = attrs.frontColor
     }
     eventCenter.trigger('__taroNavigationStyle', options)
+    // FIXME: 以下属性暂时不支持
     // attrs.colorAnimationDuration
     // attrs.colorAnimationTimingFunc
   }

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

@@ -1,4 +1,5 @@
 import { APP, eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { getCurrentInstance, pageScrollTo } from '@tarojs/taro'
 
 import { isTagFirstChild } from './utils/helper'
 
@@ -17,24 +18,29 @@ export default struct TaroPageMeta {
   @BuilderParam createLazyChildren: (node: TaroPageMetaElement) => void = this.customBuilder
   @ObjectLink node: TaroPageMetaElement
 
+  page: TaroAny = {}
+
   aboutToAppear(): void {
     if (!isTagFirstChild(this.node, APP, 2)) {
       // PageMeta 只能是页面内的第一个元素
       console.error('PageMeta 只能是页面内的第一个元素。')
     }
+
+    this.page = getCurrentInstance().page
     if (this.node) {
       this.node._instance = this
     }
 
-    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+    // FIXME 在 Harmony 提供 @Watch 文档后，根据 node 实际使用更细粒度的监听
+    eventCenter.on('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
     this.handleAttributes(this.node._attrs)
   }
 
   aboutToDisappear(): void {
-    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate.bind(this))
+    eventCenter.off('__taroComponentAttributeUpdate', this.handleAttributeUpdate)
   }
 
-  handleAttributeUpdate (opt: IComponentAttributeUpdateEvents) {
+  handleAttributeUpdate = (opt: IComponentAttributeUpdateEvents) => {
     if (opt.id === this.node._nid && opt.tagName === 'PAGE-META') {
       const attrs: Record<string, TaroAny> = {}
       attrs[opt.attribute] = opt.value
@@ -44,32 +50,37 @@ export default struct TaroPageMeta {
 
   handleAttributes (attrs: Record<string, TaroAny>) {
     const options: Record<string, TaroAny> = {}
+    let triggerStyleEvent = false
 
     // FIXME 更新类型支持度
-    if (attrs.backgroundColorTop || options.backgroundColor) {
-      options.backgroundColorContext = attrs.backgroundColorTop || options.backgroundColor
+    if (attrs.backgroundColorTop || attrs.rootBackgroundColor || attrs.backgroundColor) {
+      options.backgroundColorContext = attrs.backgroundColorTop || attrs.rootBackgroundColor || attrs.backgroundColor
+      triggerStyleEvent = true
     }
-    if (attrs.backgroundColorBottom || options.backgroundColor) {
-      options.backgroundColor = attrs.backgroundColorBottom || options.backgroundColor
+    if (attrs.backgroundColorBottom || attrs.backgroundColor) {
+      options.backgroundColor = attrs.backgroundColorBottom || attrs.backgroundColor
+      triggerStyleEvent = true
     }
     if (attrs.backgroundTextStyle) {
       options.backgroundTextStyle = attrs.backgroundTextStyle
+      triggerStyleEvent = true
     }
 
-    // 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
+    if (this.page === getCurrentInstance().page) {
+      if (attrs.scrollTop || attrs.scrollDuration) {
+        pageScrollTo({
+          scrollTop: attrs.scrollTop || this.node._attrs.scrollTop,
+          duration: attrs.scrollDuration || this.node._attrs.scrollDuration,
+        } as TaroAny)
+      }
     }
+    // pageStyle
     // rootFontSize
     // pageFontSize
     // pageOrientation
-    eventCenter.trigger('__taroPageStyle', options)
+    if (triggerStyleEvent) {
+      eventCenter.trigger('__taroPageStyle', options)
+    }
     // onResize
     // onScroll
     // onScrollDone

package/dist/runtime-utils.js

@@ -3858,7 +3858,7 @@ const pageScrollTo = (options) => {
         const taro = Current.taro;
         const page = taro.getCurrentInstance().page;
         let scrollValue = -1;
-        let scroller = page.scroller;
+        let scroller = getPageScrollerOrNode(page.scroller, page);
         const currentPageNode = getPageScrollerOrNode(page.node, page);
         if (scrollTop || typeof scrollTop === 'number') {
             scrollValue = scrollTop;