@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.2 → 4.0.0-alpha.21

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'
 
@@ -22,7 +23,6 @@ type TStep = {
 type TRule = Record<string, any>
 
 export class Animation implements Taro.Animation {
-
   unit: string
   DEFAULT: IAnimationAttr
 
@@ -71,6 +71,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 +88,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 +233,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 +253,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,10 +29,11 @@ export function showToast (options) {
       return callAsyncFail(reject, res, options)
     }
 
-    prompt.showToast({
+    promptAction.showToast({
       message: options.title,
       duration: options.duration,
-      bottom: options.bottom
+      bottom: options.bottom,
+      showMode: 1 // 设置弹窗显示模式，显示在应用之上。
     })
     callAsyncSuccess(resolve, resCallback('showToast'), options)
   })
@@ -72,37 +73,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 +96,19 @@ export function showModal (options) {
           },
           options
         )
+      } else {
+        callAsyncSuccess(
+          resolve,
+          {
+            ...resCallback('showModal'),
+            confirm: true,
+            cancel: false,
+            content: null
+          },
+          options
+        )
       }
-    }
-
-    prompt.showDialog(modalOptions)
+    })
   })
 }
 
@@ -152,45 +145,35 @@ 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)
-  })
-}
-
-export function hideToast (options) {
-  return new Promise(resolve => {
-    prompt.showToast({
-      message: '关闭中',
-      duration: 10,
-      bottom: '9999px'
+      callAsyncSuccess(
+        resolve,
+        {
+          ...data,
+          ...resCallback('showActionSheet')
+        },
+        options
+      )
     })
-    callAsyncSuccess(resolve, resCallback('hideToast'), options)
   })
 }
 
+export const hideToast = /* @__PURE__ */ temporarilyNotSupport('hideToast')
+
 export const showLoading = temporarilyNotSupport('showLoading')
 export const hideLoading = temporarilyNotSupport('hideLoading')
 

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/ui/pull-down-refresh.ts

@@ -1,14 +1,17 @@
 import { Current } from '@tarojs/runtime'
 
-import { callAsyncSuccess } from '../utils'
+import { callAsyncFail, callAsyncSuccess } from '../utils'
 
 import type Taro from '@tarojs/taro/types'
 
 export const startPullDownRefresh: typeof Taro.startPullDownRefresh = function (options) {
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
 
+    if (!page) {
+      return callAsyncFail(reject, { errMsg: 'stopPullDownRefresh:fail' }, options)
+    }
     if (page.isRefreshing instanceof Array) {
       const index = page.tabBarCurrentIndex || 0
       page.isRefreshing[index] = true
@@ -23,10 +26,13 @@ export const startPullDownRefresh: typeof Taro.startPullDownRefresh = function (
 }
 
 export const stopPullDownRefresh: typeof Taro.stopPullDownRefresh = function (options) {
-  return new Promise(resolve => {
+  return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
 
+    if (!page) {
+      return callAsyncFail(reject, { errMsg: 'stopPullDownRefresh:fail' }, options)
+    }
     if (page.isRefreshing instanceof Array) {
       const index = page.tabBarCurrentIndex || 0
       page.isRefreshing[index] = false

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

@@ -34,8 +34,8 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
     const page = taro.getCurrentInstance().page
 
     let scrollValue = -1
-    let scroller = page.scroller
-    const currentPageNode = getPageScrollerOrNode(page.node, page)
+    let scroller = getPageScrollerOrNode(page?.scroller, page)
+    const currentPageNode = getPageScrollerOrNode(page?.node, page)
 
     if (scrollTop || typeof scrollTop === 'number') {
       scrollValue = scrollTop
@@ -66,14 +66,14 @@ export const pageScrollTo: typeof Taro.pageScrollTo = (options) => {
         scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper(offsetTop, 'px', true)
       }
     }
-    const { xOffset } = scroller.currentOffset()
-
-    if (scrollValue === -1) {
+    if (!scroller || scrollValue === -1) {
       return handle.fail({
         errMsg: '请检查传入的 scrollTop 或 selector 是否合法'
       }, { resolve, reject })
     }
 
+    const { xOffset } = scroller.currentOffset()
+
     try {
       scroller.scrollTo({
         xOffset,

package/dist/apis/ui/tab-bar.ts

@@ -22,7 +22,7 @@ const toggleTabBar = function<T extends ToggleAPIs['type']> (type: T): Extract<T
     return new Promise((resolve, reject) => {
       const taro = (Current as any).taro
       const page = taro.getCurrentInstance().page
-      const currentData = page._data?.taroTabBar || page.tabBar
+      const currentData = page?._data?.taroTabBar || page?.tabBar
       const res = { errMsg: `${type}TabBar:ok` }
       const error = { errMsg: `${type}TabBar:fail not TabBar page` }
 
@@ -49,7 +49,7 @@ export const setTabBarStyle: typeof Taro.setTabBarStyle = function (options = {}
   return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const currentData = page._data?.taroTabBar || page.tabBar
+    const currentData = page?._data?.taroTabBar || page?.tabBar
     const res = { errMsg: 'setTabBarStyle:ok' }
     const error = { errMsg: 'setTabBarStyle:fail not TabBar page' }
 
@@ -74,7 +74,7 @@ export const setTabBarItem: typeof Taro.setTabBarItem = function (options) {
   return new Promise((resolve, reject) => {
     const taro = (Current as any).taro
     const page = taro.getCurrentInstance().page
-    const currentData = page._data?.taroTabBar || page.tabBar
+    const currentData = page?._data?.taroTabBar || page?.tabBar
     const res = { errMsg: 'setTabBarItem:ok' }
     const error = { errMsg: 'setTabBarItem:fail not TabBar page' }
 

package/dist/apis/utils/index.ts

@@ -5,6 +5,7 @@ import { ICallbackResult, MethodHandler } from './handler'
 import type { FunctionType, IAsyncParams } from './types'
 
 export * from './validate'
+export { MethodHandler }
 export { noop } from '@tarojs/shared'
 
 export function object2String (obj) {
@@ -19,7 +20,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/selectorQuery.ts

@@ -112,7 +112,7 @@ function filter (fields, dom) {
     return res
   }
   if (context) {
-    // TODO: 暂未实现获取 context
+    // TODO: 暂未实现获取  context
     // const typeName = dom.type
     // if (/^video/i.test(typeName)) {
     //   return { context: dom }
@@ -179,37 +179,50 @@ function filter (fields, dom) {
 
 function querySelector (selector, selectAll) {
   if (typeof selector === 'string') {
-    return parseHandler(selector, selectAll)
+    return selector.split(',').reduce((prev, current) => {
+      const item = current.trim()
+
+      return prev.concat(parseHandler(item, selectAll))
+    }, [])
   }
-  return null
+  return []
 }
 
 function queryBat (queue, cb) {
   const result: any = []
   const taro = (Current as any).taro
   const page = taro.getCurrentInstance().page
-  const element = getPageScrollerOrNode(page.node, page)
+  const element = getPageScrollerOrNode(page?.node, page)
 
-  if (element == null) return null
+  if (!element) return null
 
   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)
   })