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

package/dist/apis/ui/animation/animation.ts

@@ -1,4 +1,5 @@
 import matrix4 from '@ohos.matrix4'
+import { isUndefined } from '@tarojs/shared'
 
 import { temporarilyNotSupport } from '../../utils'
 
@@ -71,6 +72,9 @@ export class Animation implements Taro.Animation {
       transformOrigin,
       rule: Object.assign({}, this.rule)
     })
+    if (this.rule.transform) {
+      this.rule.transform = Object.assign({}, this.rule.transform)
+    }
     return this
   }
 
@@ -85,92 +89,137 @@ export class Animation implements Taro.Animation {
   }
 
   rotate (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 0, z: 1, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle }
     return this
   }
 
   rotate3d (x: number, y?: number | undefined, z?: number | undefined, angle?: number | undefined): Taro.Animation {
-    this.rule.rotate = { x, y, z, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x, y, z, angle }
     return this
   }
 
   rotateX (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 1, y: 0, z: 0, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 1, y: 0, z: 0, angle }
     return this
   }
 
   rotateY (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 1, z: 0, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 1, z: 0, angle }
     return this
   }
 
   rotateZ (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 0, z: 1, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle }
     return this
   }
 
   scale (sx: number, sy?: number | undefined): Taro.Animation {
-    this.rule.scale = { x: sx, y: sy }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: sx, y: isUndefined(sy) ? sx : sy }
     return this
   }
 
   scale3d (sx: number, sy: number, sz: number): Taro.Animation {
-    this.rule.scale = { x: sx, y: sy, z: sz }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: sx, y: sy, z: sz }
     return this
   }
 
   scaleX (scale: number): Taro.Animation {
-    this.rule.scale = { x: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: scale }
     return this
   }
 
   scaleY (scale: number): Taro.Animation {
-    this.rule.scale = { y: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { y: scale }
     return this
   }
 
   scaleZ (scale: number): Taro.Animation {
-    this.rule.scale = { z: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { z: scale }
     return this
   }
 
   skew (ax: number, ay: number): Taro.Animation {
-    this.rule.skew = { x: ax, y: ay }
+    temporarilyNotSupport('animation.skew:' + `${ax}, ${ay}`)(ax, ay)
     return this
   }
 
   skewX (angle: number): Taro.Animation {
-    this.rule.skew = { x: angle }
+    temporarilyNotSupport('animation.skewX:' + angle)(angle)
     return this
   }
 
   skewY (angle: number): Taro.Animation {
-    this.rule.skew = { y: angle }
+    temporarilyNotSupport('animation.skewY:' + angle)(angle)
     return this
   }
 
   translate (tx?: number | undefined, ty?: number | undefined): Taro.Animation {
-    this.rule.translate = { x: tx, y: ty }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: tx, y: ty }
     return this
   }
 
   translate3d (tx?: number | undefined, ty?: number | undefined, tz?: number | undefined): Taro.Animation {
-    this.rule.translate = { x: tx, y: ty, z: tz }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: tx, y: ty, z: tz }
     return this
   }
 
   translateX (translation: number): Taro.Animation {
-    this.rule.translate = { x: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: translation }
     return this
   }
 
   translateY (translation: number): Taro.Animation {
-    this.rule.translate = { y: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { y: translation }
     return this
   }
 
   translateZ (translation: number): Taro.Animation {
-    this.rule.translate = { z: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { z: translation }
     return this
   }
 
@@ -185,23 +234,17 @@ export class Animation implements Taro.Animation {
   }
 
   width (value: string | number): Taro.Animation {
-    this.rule.size = {
-      ...this.rule.size,
-      width: value
-    }
+    this.rule.width = value
     return this
   }
 
   height (value: string | number): Taro.Animation {
-    this.rule.size = {
-      ...this.rule.size,
-      height: value
-    }
+    this.rule.height = value
     return this
   }
 
   left (value: string | number): Taro.Animation {
-    temporarilyNotSupport('animation.left:' + value)(value)
+    this.rule.left = value
     return this
   }
 
@@ -211,7 +254,7 @@ export class Animation implements Taro.Animation {
   }
 
   top (value: string | number): Taro.Animation {
-    temporarilyNotSupport('animation.top:' + value)(value)
+    this.rule.top = value
     return this
   }
 

package/dist/apis/ui/background.ts

@@ -11,7 +11,8 @@ export function setBackgroundColor(options: Taro.setBackgroundColor.Option) {
 
   return new Promise((resolve, reject) => {
     eventCenter.trigger('__taroPageStyle', {
-      backgroundColor: options.backgroundColor || options.backgroundColorTop || options.backgroundColorBottom,
+      backgroundColor: options.backgroundColorBottom || options.backgroundColor,
+      backgroundColorContext: options.backgroundColorTop || options.backgroundColor
     })
 
     return handle.success({}, { resolve, reject })

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

@@ -1,4 +1,4 @@
-import prompt from '@ohos.prompt'
+import promptAction from '@ohos.promptAction'
 
 import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 
@@ -29,7 +29,7 @@ export function showToast (options) {
       return callAsyncFail(reject, res, options)
     }
 
-    prompt.showToast({
+    promptAction.showToast({
       message: options.title,
       duration: options.duration,
       bottom: options.bottom
@@ -72,37 +72,20 @@ export function showModal (options) {
     })
   }
 
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const modalOptions = {
       title,
       message: content,
       buttons: buttons,
-      success: (data) => {
-        if (data.index === 1 || !showCancel) {
-          callAsyncSuccess(
-            resolve,
-            {
-              ...resCallback('showModal'),
-              confirm: true,
-              cancel: false,
-              content: null
-            },
-            options
-          )
-        } else {
-          callAsyncSuccess(
-            resolve,
-            {
-              ...resCallback('showModal'),
-              confirm: false,
-              cancel: true
-            },
-            options
-          )
-        }
-      },
-      // 鸿蒙没有失败方法，只有取消
-      cancel: (_) => {
+    }
+
+    promptAction.showDialog(modalOptions, (error, data) => {
+      if (error) {
+        const res = { errMsg: error }
+        callAsyncFail(reject, res, options)
+      }
+
+      if (data.index === 0 && showCancel) {
         callAsyncSuccess(
           resolve,
           {
@@ -112,10 +95,19 @@ export function showModal (options) {
           },
           options
         )
+      } else {
+        callAsyncSuccess(
+          resolve,
+          {
+            ...resCallback('showModal'),
+            confirm: true,
+            cancel: false,
+            content: null
+          },
+          options
+        )
       }
-    }
-
-    prompt.showDialog(modalOptions)
+    })
   })
 }
 
@@ -152,37 +144,36 @@ export function showActionSheet (options) {
 
     const actionSheetOptions = {
       title,
-      buttons,
-      success: (data) => {
-        callAsyncSuccess(
-          resolve,
-          {
-            ...data,
-            ...resCallback('showActionSheet')
-          },
-          options
-        )
-      },
-      // 取消方法，并非失败
-      fail: (data) => {
+      buttons
+    }
+
+    promptAction.showActionMenu(actionSheetOptions, (error, data) => {
+      if (error) {
         callAsyncFail(
           reject,
           {
             ...data,
-            errMsg: data.errMsg.replace('showActionMenu', 'showActionSheet')
+            errMsg: data.errMsg?.replace('showActionMenu', 'showActionSheet')
           },
           options
         )
       }
-    }
 
-    prompt.showActionMenu(actionSheetOptions)
+      callAsyncSuccess(
+        resolve,
+        {
+          ...data,
+          ...resCallback('showActionSheet')
+        },
+        options
+      )
+    })
   })
 }
 
 export function hideToast (options) {
   return new Promise(resolve => {
-    prompt.showToast({
+    promptAction.showToast({
       message: '关闭中',
       duration: 10,
       bottom: '9999px'

package/dist/apis/ui/navigation-bar/index.ts

@@ -19,7 +19,7 @@ export const setNavigationBarTitle: typeof Taro.setNavigationBarTitle = function
 
 export const setNavigationBarColor: typeof Taro.setNavigationBarColor = function (options) {
   const { success, fail, complete } = options || {}
-  const handle = new MethodHandler({ name: 'setNavigationBarTitle', success, fail, complete })
+  const handle = new MethodHandler({ name: 'setNavigationBarColor', success, fail, complete })
 
   return new Promise((resolve, reject) => {
     eventCenter.trigger('__taroNavigationStyle', {

package/dist/apis/utils/index.ts

@@ -19,7 +19,7 @@ export function temporarilyNotSupport (name: string, recommended?: string) {
   return (option = {}, ...args) => {
     const { success, fail, complete } = option as any
     const handle = new MethodHandler({ name, success, fail, complete })
-    let errMsg = '暂时不支持 API'
+    let errMsg = `暂时不支持 API ${name}`
     if (recommended) {
       errMsg += `, 请使用 ${recommended}`
     }

package/dist/apis/wxml/IntersectionObserver.ts

@@ -19,31 +19,33 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
   constructor(component: any, options: Taro.createIntersectionObserver.Option = {}) {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const currentPage = getPageScrollerOrNode(page.node, page)
-    this._component = component || currentPage
+
+    this._component = component || getPageScrollerOrNode(page?.node, page)
     Object.assign(this._options, options)
   }
 
   public disconnect (): void {
-    if (this._observerNodes) {
+    if (this._observerNodes && this._component) {
       if (this._observerNodes instanceof Array) {
         this._observerNodes.forEach((n: TaroElement & any) => {
           disconnectEvent(n, VISIBLE_CHANGE_EVENT_NAME)
           // @ts-ignore
-          n._nodeInfo?.thresholds = null
+          n._nodeInfo.thresholds = null
         })
       } else {
         disconnectEvent(this._observerNodes, VISIBLE_CHANGE_EVENT_NAME)
         // @ts-ignore
         if (this._observerNodes._nodeInfo) {
           // @ts-ignore
-          this._observerNodes._nodeInfo?.thresholds = null
+          this._observerNodes._nodeInfo.thresholds = null
         }
       }
     }
   }
 
   public observe (targetSelector: string, callback: Taro.IntersectionObserver.ObserveCallback): void {
+    if (!this._component) return
+
     const { observeAll, thresholds } = this._options
     const node = findChildNodeWithDFS(this._component, targetSelector, observeAll)
     this._observerNodes = node
@@ -52,20 +54,24 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
       if (node instanceof Array) {
         node.forEach(n => {
           // @ts-ignore
-          n._nodeInfo?.thresholds = thresholds
+          n._nodeInfo.thresholds = thresholds
 
           setNodeEventCallbackAndTriggerComponentUpdate(n, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
-            callback(this.handleResult(isVisible, currentRatio))
+            callback(this.handleResult(isVisible, currentRatio, n))
           })
         })
       } else {
         // @ts-ignore
-        node._nodeInfo?.thresholds = thresholds
+        node._nodeInfo.thresholds = thresholds
 
         setNodeEventCallbackAndTriggerComponentUpdate(node, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
-          callback(this.handleResult(isVisible, currentRatio))
+          callback(this.handleResult(isVisible, currentRatio, node))
         })
       }
+    } else {
+      callback({
+        errMsg: 'IntersectionObserver.observe:fail cannot find the node for selector.'
+      })
     }
   }
 
@@ -80,8 +86,10 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
   }
 
   // @ts-ignore
-  private handleResult (isVisible: boolean, currentRatio: number): Taro.IntersectionObserver.ObserveCallbackResult {
+  private handleResult (isVisible: boolean, currentRatio: number, node: TaroElement): Taro.IntersectionObserver.ObserveCallbackResult {
     const result = {
+      id: node.id,
+      dataset: node.dataset,
       intersectionRatio: currentRatio,
       // TODO 未做，等待能拿到element的info信息
       boundingClientRect: {

package/dist/apis/wxml/index.ts

@@ -13,3 +13,5 @@ export const createIntersectionObserver: typeof Taro.createIntersectionObserver
 }
 
 export const createMediaQueryObserver = /* @__PURE__ */ temporarilyNotSupport('createMediaQueryObserver')
+
+export { IntersectionObserver }

package/dist/apis/wxml/selectorQuery.ts

@@ -194,22 +194,31 @@ function queryBat (queue, cb) {
 
   arr = []
   traversalDFSDom(element)
-  queue.forEach(item => {
+  queue.forEach((item) => {
     const { selector, single, fields } = item
-    const nodeList = querySelector(selector, !single)
-
-    result.push(nodeList.map(dom => {
+    
+    if (single) {
+      const dom = querySelector(selector, !single)[0]
       // eslint-disable-next-line no-async-promise-executor
-      return new Promise(async resolve => {
+      result.push(new Promise(async resolve => {
         await setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true)
-
         resolve(filter(fields, dom))
-      })
-    }))
+      }))
+    } else {
+      const nodeList = querySelector(selector, !single)
+      result.push(nodeList.map(dom => {
+        // eslint-disable-next-line no-async-promise-executor
+        return new Promise(async resolve => {
+          await setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true)
+
+          resolve(filter(fields, dom))
+        })
+      }))
+    }
   })
 
   Promise.all(result.map(item => {
-    return Promise.all(item)
+    return item instanceof Array ? Promise.all(item) : item
   })).then(data => {
     cb(data)
   })

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

@@ -1,5 +1,4 @@
 import { eventHandler, createTaroEvent, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime'
-import { createLazyChildren } from './render'
 import commonStyleModify from './style'
 import { BUTTON_THEME_COLOR } from './utils/constant/style'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
@@ -66,13 +65,13 @@ function getThemeAttributes (node: TaroButtonElement): TaroStyleType {
   }
 }
 
-function getButtonWidth (node: TaroButtonElement) {
+function getButtonWidth (node: TaroButtonElement): string | number {
   const isMini = node._attrs.size === 'mini'
 
   return isMini ? convertNumber2VP(120) : '100%'
 }
 
-function getButtonHeight (node: TaroButtonElement) {
+function getButtonHeight (node: TaroButtonElement): string | number {
   const isMini = node._attrs.size === 'mini'
 
   return isMini ? convertNumber2VP(60) : convertNumber2VP(92)
@@ -94,38 +93,53 @@ function getButtonMinHeight (node: TaroButtonElement): string | number | undefin
   return getButtonHeight(node)
 }
 
-@Builder
-export default function TaroButton (node: TaroButtonElement) {
-  Button({ stateEffect: !node._attrs.disabled }) {
-    Row() {
-      if (node._attrs.loading) {
-        LoadingProgress()
-        .width(20).height(20)
-        .color(getThemeAttributes(node).color)
-      }
-      createLazyChildren(node)
+@Component
+export default struct TaroButton {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroButtonElement) => void = this.customBuilder
+  @ObjectLink node: TaroButtonElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
     }
   }
-  .themeStyles(getThemeAttributes(node))
-  .attributeModifier(commonStyleModify.setNode(node))
-  .constraintSize({
-    minWidth: node.hmStyle?.minWidth || getButtonMinWidth(node),
-    minHeight: node.hmStyle?.minHeight || getButtonMinHeight(node),
-    maxWidth: node.hmStyle?.maxWidth,
-    maxHeight: node.hmStyle?.maxHeight,
-  })
-  .type(ButtonType.Normal)
-  .onClick((e: ClickEvent) => {
-    if (node._attrs.formType && ['submit', 'reset'].includes(node._attrs.formType)) {
-      const eventName = node._attrs.formType + '-btn'
-      const event: TaroEvent = createTaroEvent(eventName, {}, node)
-      eventHandler(event, eventName, node)
+
+  build() {
+    Button({ stateEffect: !this.node._attrs.disabled }) {
+      if (this.node._attrs.loading) {
+        Row() {
+          LoadingProgress()
+            .width(20).height(20)
+            .color(getThemeAttributes(this.node).color)
+          this.createLazyChildren(this.node)
+        }
+      } else {
+        this.createLazyChildren(this.node)
+      }
     }
-    eventHandler(e, 'click', node)
-  })
-  .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
-  .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-    node._nodeInfo.areaInfo = res[1]
-  }))
-  .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+    .themeStyles(getThemeAttributes(this.node))
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .constraintSize({
+      minWidth: this.node.hmStyle?.minWidth || getButtonMinWidth(this.node),
+      minHeight: this.node.hmStyle?.minHeight || getButtonMinHeight(this.node),
+      maxWidth: this.node.hmStyle?.maxWidth,
+      maxHeight: this.node.hmStyle?.maxHeight,
+    })
+    .type(ButtonType.Normal)
+    .onClick((e: ClickEvent) => {
+      if (this.node._attrs.formType && ['submit', 'reset'].includes(this.node._attrs.formType)) {
+        const eventName = this.node._attrs.formType + '-btn'
+        const event: TaroEvent = createTaroEvent(eventName, {}, this.node)
+        eventHandler(event, eventName, this.node)
+      }
+      eventHandler(e, 'click', this.node)
+    })
+    .onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
+    .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+      this.node._nodeInfo.areaInfo = res[1]
+    }))
+    .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+  }
 }

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

@@ -0,0 +1,51 @@
+import type { TaroAny, TaroCanvasElement } from '@tarojs/runtime'
+import { cancelAnimationFrame, requestAnimationFrame } from '@tarojs/runtime'
+import commonStyleModify from './style'
+
+@Component
+export default struct TaroCanvas {
+  @ObjectLink node: TaroCanvasElement
+  rafId: number = 0
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
+  aboutToDisappear() {
+    if(this.rafId) {
+      cancelAnimationFrame(this.rafId)
+    }
+  }
+
+  build() {
+    Canvas(this.node._context)
+      .attributeModifier(commonStyleModify.setNode(this.node as TaroAny, {
+        width: '100%',
+        height: '100%',
+        backgroundColor: '#ffff00'
+      }).setAnimationStyle(this.overwriteStyle))
+      .onReady(() => {
+        const context = this.node._context
+
+        const draw = () => {
+          if (this.node._drawList.length) {
+            while (this.node._drawList.length) {
+              const item = this.node._drawList.shift()
+              if (item) {
+                if (typeof context[item.key] === 'function') {
+                  context[item.key](...[].concat(item.value))
+                } else {
+                  context[item.key] = item.value
+                }
+              }
+            }
+          }
+          this.rafId = requestAnimationFrame(draw)
+        }
+        draw()
+      })
+  }
+}