@tarojs/plugin-platform-harmony-ets 4.0.0-beta.12 → 4.0.0-beta.121

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

@@ -1,4 +1,5 @@
-import prompt from '@ohos.prompt'
+// @ts-ignore
+import { Current } from '@tarojs/runtime'
 
 import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../../utils'
 
@@ -29,10 +30,16 @@ export function showToast (options) {
       return callAsyncFail(reject, res, options)
     }
 
-    prompt.showToast({
+    // @ts-ignore
+    const uiContext = Current?.page?.getUIContext?.()
+
+    if (!uiContext) return
+
+    uiContext.getPromptAction().showToast({
       message: options.title,
       duration: options.duration,
-      bottom: options.bottom
+      bottom: options.bottom,
+      showMode: 1 // 设置弹窗显示模式，显示在应用之上。
     })
     callAsyncSuccess(resolve, resCallback('showToast'), options)
   })
@@ -72,37 +79,25 @@ 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: (_) => {
+    }
+
+    // @ts-ignore
+    const uiContext = Current?.page?.getUIContext?.()
+
+    if (!uiContext) return
+
+    uiContext.getPromptAction().showDialog(modalOptions, (error, data) => {
+      if (error) {
+        const res = { errMsg: error }
+        callAsyncFail(reject, res, options)
+      }
+
+      if (data.index === 0 && showCancel) {
         callAsyncSuccess(
           resolve,
           {
@@ -112,10 +107,19 @@ export function showModal (options) {
           },
           options
         )
+      } else {
+        callAsyncSuccess(
+          resolve,
+          {
+            ...resCallback('showModal'),
+            confirm: true,
+            cancel: false,
+            content: null
+          },
+          options
+        )
       }
-    }
-
-    prompt.showDialog(modalOptions)
+    })
   })
 }
 
@@ -152,45 +156,40 @@ export function showActionSheet (options) {
 
     const actionSheetOptions = {
       title,
-      buttons,
-      success: (data) => {
-        callAsyncSuccess(
-          resolve,
-          {
-            ...data,
-            ...resCallback('showActionSheet')
-          },
-          options
-        )
-      },
-      // 取消方法，并非失败
-      fail: (data) => {
+      buttons
+    }
+
+    // @ts-ignore
+    const uiContext = Current?.page?.getUIContext?.()
+
+    if (!uiContext) return
+
+    uiContext.getPromptAction().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

@@ -1,4 +1,4 @@
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { eventCenter } from '@tarojs/runtime'
 
 import { MethodHandler } from '../../utils/handler'
 
@@ -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

@@ -6,8 +6,8 @@
  * 文档地址 https://developer.harmonyos.com/cn/docs/documentation/doc-references/js-framework-syntax-js-0000000000611432
  */
 import { AREA_CHANGE_EVENT_NAME, Current, findChildNodeWithDFS, getPageScrollerOrNode, setNodeEventCallbackAndTriggerComponentUpdate } from '@tarojs/runtime'
-import { pxTransformHelper } from '@tarojs/taro'
 
+import { pxTransformHelper } from '../../index'
 import { MethodHandler } from '../../utils/handler'
 
 import type Taro from '@tarojs/taro/types'
@@ -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

@@ -1,5 +1,4 @@
-import { Current } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { Current, eventCenter } from '@tarojs/runtime'
 
 import { callAsyncFail, callAsyncSuccess } from '../utils'
 
@@ -22,7 +21,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 +48,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 +73,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

@@ -1,12 +1,30 @@
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
+import { Current, eventCenter } from '@tarojs/runtime'
 
 import { ICallbackResult, MethodHandler } from './handler'
 
 import type { FunctionType, IAsyncParams } from './types'
 
 export * from './validate'
+export { MethodHandler }
 export { noop } from '@tarojs/shared'
 
+export function requestPermissions (permissions: string[]) {
+  return new Promise<void>((resolve, reject) => {
+    const context = getContext(Current?.page)
+    const atManager = abilityAccessCtrl.createAtManager()
+
+    atManager.requestPermissionsFromUser(context, permissions, (err, _) => {
+      if (err) {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject(`[Taro] 请求用户授权 ${permissions.join('、')} 失败：${JSON.stringify(err)}`)
+      } else {
+        resolve()
+      }
+    })
+  })
+}
+
 export function object2String (obj) {
   let str = ''
   for (const item in obj) {
@@ -19,7 +37,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/utils/permissions.ts

@@ -0,0 +1,6 @@
+export const READ_IMAGEVIDEO_PERMISSIONS = 'ohos.permission.READ_IMAGEVIDEO'
+export const READ_MEDIA_PERMISSIONS = 'ohos.permission.READ_MEDIA'
+export const WRITE_MEDIA_PERMISSIONS = 'ohos.permission.WRITE_MEDIA'
+export const MEDIA_LOCATION_PERMISSIONS = 'ohos.permission.MEDIA_LOCATION'
+
+export const IMAGE_PERMISSION = [READ_IMAGEVIDEO_PERMISSIONS, READ_MEDIA_PERMISSIONS, WRITE_MEDIA_PERMISSIONS, MEDIA_LOCATION_PERMISSIONS]

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)
   })

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

@@ -1,11 +1,25 @@
 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'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
-import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@tarojs/runtime'
+import type { TaroAny, TaroButtonElement, TaroEvent, TaroStyleType } from '@tarojs/runtime'
+
+interface ButtonAttrs {
+  disabled?: boolean
+}
+
+@Extend(Button)
+function attrs(attr: ButtonAttrs) {
+  .enabled(!attr.disabled)
+}
+
+function getAttributes(node: TaroButtonElement): ButtonAttrs {
+  return {
+    disabled: node._attrs.disabled || false,
+  }
+}
 
 @Extend(Button)
 function themeStyles(style: TaroStyleType) {
@@ -66,13 +80,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)
@@ -96,20 +110,33 @@ function getButtonMinHeight (node: TaroButtonElement): string | number | undefin
 
 @Component
 export default struct TaroButton {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroButtonElement, layer?: number) => void = this.customBuilder
   @ObjectLink node: TaroButtonElement
+  @State overwriteStyle: Record<string, TaroAny> = {}
+
+  aboutToAppear(): void {
+    if (this.node) {
+      this.node._instance = this
+    }
+  }
+
   build() {
     Button({ stateEffect: !this.node._attrs.disabled }) {
-      Row() {
-        if (this.node._attrs.loading) {
+      if (this.node._attrs.loading) {
+        Row() {
           LoadingProgress()
             .width(20).height(20)
             .color(getThemeAttributes(this.node).color)
+          this.createLazyChildren(this.node, 0)
         }
-        createLazyChildren(this.node)
+      } else {
+        this.createLazyChildren(this.node, 0)
       }
     }
     .themeStyles(getThemeAttributes(this.node))
-    .attributeModifier(commonStyleModify.setNode(this.node))
+    .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
+    .attrs(getAttributes(this.node))
     .constraintSize({
       minWidth: this.node.hmStyle?.minWidth || getButtonMinWidth(this.node),
       minHeight: this.node.hmStyle?.minHeight || getButtonMinHeight(this.node),
@@ -125,7 +152,7 @@ export default struct TaroButton {
       }
       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()))
+    .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]
     }))

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()
+      })
+  }
+}