@tarojs/plugin-platform-harmony-ets 4.0.0-beta.2 → 4.0.0-beta.20

package/dist/apis/base/system.ts

@@ -1,24 +1,56 @@
+import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant'
 // 设备信息,从 API Version 6 开始支持
 import deviceInfo from '@ohos.deviceInfo'
 // 显示设备属性,从 API Version 7 开始支持
 import _display from '@ohos.display'
 // 从 API Version 7 开始支持
 import i18n from '@ohos.i18n'
-// 设备信息 从API Version 6开始，该接口不再维护，推荐使用新接口'@ohos.deviceInfo'进行设备信息查询
-import deviceMethod from '@system.device'
+import { Current, window } from '@tarojs/runtime'
 
 import { callAsyncFail, callAsyncSuccess } from '../utils'
 
 import type Taro from '@tarojs/taro/types'
 
-const display = _display.getDefaultDisplaySync()
+let display
+let navigationIndicatorRect
+let safeArea: TaroGeneral.SafeAreaResult | null = null
+let statusBarHeight
+let windowRect
 
-let device
+(Current as any).contextPromise.then((context) => {
+  const win = window.__ohos.getLastWindow(context)
+  win.then(mainWindow => {
+    const topRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_SYSTEM).topRect
+    navigationIndicatorRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_NAVIGATION_INDICATOR).bottomRect
+    statusBarHeight = topRect.top + topRect.height
+    windowRect = mainWindow.getWindowProperties().windowRect
 
-deviceMethod.getInfo({
-  success: data => {
-    device = data
-  }
+    try {
+      display = _display.getDefaultDisplaySync()
+      // @ts-ignore
+      display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} }: _display.CutoutInfo = {}) => {
+        if (err?.code) {
+          console.error('Failed to get cutout info', JSON.stringify(err))
+          return
+        }
+
+        const top = Math.max(...boundingRects.map(rect => rect.top + rect.height), waterfallDisplayAreaRects.top?.top + waterfallDisplayAreaRects.top?.height, statusBarHeight)
+        const bottom = display.height - Math.min(waterfallDisplayAreaRects.bottom?.top, navigationIndicatorRect?.top)
+        const left = waterfallDisplayAreaRects.left?.left + waterfallDisplayAreaRects.left?.width
+        const right = display.width - waterfallDisplayAreaRects.right?.left
+        safeArea = {
+          top,
+          bottom,
+          left,
+          right,
+          height: bottom - top,
+          width: right - left,
+        }
+      })
+    } catch (e) {
+      console.error('Failed to get display', e)
+    }
+  })
 })
 
 /* 同步版本 */
@@ -32,7 +64,7 @@ export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   res.cameraAuthorized = null // 允许使用摄像头的开关 boolean
   res.enableDebug = null // 是否已打开调试 boolean
   res.fontSizeSetting = null // 用户字体大小（单位px） number
-  res.language = i18n && i18n.getSystemLanguage && i18n.getSystemLanguage() // string
+  res.language = i18n?.getSystemLanguage?.() // string
   res.locationAuthorized = null // 定位的开关 boolean
   res.locationEnabled = null // 地理位置的系统开关 boolean
   res.microphoneAuthorized = null // 麦克风的开关 boolean
@@ -43,17 +75,18 @@ export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   res.notificationSoundAuthorized = false // 通知带有声音的开关（仅 iOS 有效）boolean
   res.phoneCalendarAuthorized = null // 使用日历的开关 boolean
   res.wifiEnabled = false // Wi-Fi 的系统开关 boolean
-  res.pixelRatio = null // 设备像素比,number
-  res.platform = 'android' // 客户端平台 string
-  res.safeArea = null // 在竖屏正方向下的安全区域 General.SafeAreaResult
-  res.screenHeight = display && display.height // 屏幕高度，单位px number
-  res.screenWidth = display && display.width // 屏幕宽度，单位px number
-  res.statusBarHeight = null // 状态栏的高度，单位px number
-  res.system = deviceInfo && deviceInfo.osFullName // 操作系统及版本 string
-  res.theme = null // 系统当前主题，取值为light或dark 'light' | 'dark'
-  res.windowWidth = device && device.windowWidth // 可使用窗口宽度，单位px number
-  res.windowHeight = device && device.windowHeight // 可使用窗口高度，单位px number
-  res.version = deviceInfo && deviceInfo.displayVersion // 版本号 string
+  res.pixelRatio = display && (Math.round(display.xDPI / display.width * 100) / 100) // 设备像素比,number
+  res.platform = 'harmony' // 客户端平台 string
+  res.safeArea = safeArea // 在竖屏正方向下的安全区域 General.SafeAreaResult
+  res.screenHeight = display?.height // 屏幕高度，单位px number
+  res.screenWidth = display?.width // 屏幕宽度，单位px number
+  res.statusBarHeight = statusBarHeight // 状态栏的高度，单位px number
+  res.system = deviceInfo?.osFullName // 操作系统及版本 string
+  // Note: 更新配置时才能记录
+  res.theme = AppStorage.get('__TARO_APP_CONFIG')?.colorMode === ConfigurationConstant.ColorMode.COLOR_MODE_DARK ? 'dark' : 'light' // 系统当前主题，取值为light或dark 'light' | 'dark'
+  res.windowHeight = windowRect?.height // 可使用窗口高度，单位px number
+  res.windowWidth = windowRect?.width // 可使用窗口宽度，单位px number
+  res.version = deviceInfo?.displayVersion // 版本号 string
 
   return res
 }

package/dist/apis/framework/index.ts

@@ -1,5 +1,3 @@
-import { Current } from '@tarojs/runtime'
-
 import { temporarilyNotSupport } from '../utils'
 
 export const ENV_TYPE = {
@@ -19,12 +17,10 @@ export function getEnv () {
   return ENV_TYPE.HARMONY
 }
 
-export { Current }
-
 // TODO
 export const getCurrentPages = () => []
 
-export const getCurrentInstance = () => Current
+export { Current, getCurrentInstance } from '@tarojs/runtime'
 
 export const requirePlugin = temporarilyNotSupport('requirePlugin')
 

package/dist/apis/index.ts

@@ -33,7 +33,7 @@ const defaultUnitPrecision = 5
 const defaultTargetUnit = 'vp'
 
 export function getApp () {
-  return Current.app
+  return Current.app || {}
 }
 
 export function initPxTransform ({
@@ -120,5 +120,7 @@ export function getAppInfo () {
   }
 }
 
+initNativeApi(taro)
+
 export * from './apis'
 export default taro

package/dist/apis/network/request.ts

@@ -6,7 +6,7 @@
 // ✅ RequestTask.onHeadersReceived
 
 import http from '@ohos.net.http'
-import { isString, isUndefined } from '@tarojs/shared'
+import { isString } from '@tarojs/shared'
 
 import { callAsyncFail, callAsyncSuccess, validateParams } from '../utils'
 
@@ -59,10 +59,10 @@ export const request: typeof Taro.request = function (options) {
     }
 
     // 检查 Header 是否有 Referer
-    if (isUndefined(header.Referer)) {
-      const error = { errMsg: 'request fail parameter error: the header doesn‘t support Referer property' }
-      callAsyncFail(reject, error, options)
-    }
+    // if (isUndefined(header.Referer)) {
+    //   const error = { errMsg: 'request fail parameter error: the header doesn‘t support Referer property' }
+    //   callAsyncFail(reject, error, options)
+    // }
 
     // 检查 method 是否正确
     if (method) {

package/dist/apis/route/index.ts

@@ -16,6 +16,21 @@ function parseURL (raw = ''): [string, Record<string, unknown>] {
   const [urlStr, queryStr = ''] = raw.split('?')
   const query: Record<string, unknown> = queryToJson(queryStr)
   let url = urlStr.replace(/^\//, '')
+
+  // 处理相对路径
+  if (url.indexOf('.') === 0) {
+    const page = router.getState()
+    const parts = page.path.split('/')
+    parts.pop()
+    url.split('/').forEach((item) => {
+      if (item === '.') {
+        return
+      }
+      item === '..' ? parts.pop() : parts.push(item)
+    })
+    url = parts.join('/')
+  }
+
   if (isTabPage(url)) {
     query.$page = url
     url = TARO_TABBAR_PAGE_PATH

package/dist/apis/storage/index.ts

@@ -7,32 +7,30 @@ import dataPreferences from '@ohos.data.preferences'
 import hilog from '@ohos.hilog'
 import { Current } from '@tarojs/runtime'
 
-import { callAsyncFail, callAsyncSuccess, temporarilyNotSupport, validateParams } from '../utils'
+import { temporarilyNotSupport, validateParams } from '../utils'
+import { MethodHandler } from '../utils/handler'
 
 import type Taro from '@tarojs/taro/types'
 
-const preferencesPromise = (Current as any).contextPromise
-  .then((context) => {
-    return bundleManager
-      .getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
-      .then(data => {
-        return dataPreferences
-          .getPreferences(context, `${data.appInfo.uid}Store`)
-      })
-  })
-  .catch((error) => {
-    hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error)
-  })
+let context
+let preferences: any
 
-async function getItem (key: string): Promise<{ result: boolean, data?: number | string | boolean }> {
-  try {
-    const preferences = await preferencesPromise
-    const item = await preferences.get(key, null)
+(Current as any).contextPromise.then((ctx) => {
+  context = ctx
+  return context
+})
 
-    return { result: true, data: item }
+function getPreferences () {
+  try {
+    if (!preferences) {
+      const data = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION)
+      preferences = dataPreferences.getPreferencesSync(context, { name: `${data.appInfo.uid}Store` })
+    }
   } catch (error) {
-    return { result: false }
+    hilog.error(0x0000, 'TaroFailedTag', 'Failed to load the storage. Cause: %{public}s', error.code ? JSON.stringify(error) : error.message || error)
   }
+
+  return preferences
 }
 
 const storageSchema = {
@@ -40,89 +38,155 @@ const storageSchema = {
 }
 
 export function getStorage<T = any> (options: Taro.getStorage.Option<T>) {
+  const { key, success, fail, complete } = options || {}
+  const handle = new MethodHandler<{data: any}>({ name: 'getStorage', success, fail, complete })
+
   return new Promise((resolve, reject) => {
     try {
       validateParams('getStorage', options, storageSchema)
     } catch (error) {
       const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
+      return handle.fail(res, { resolve, reject })
+    }
+
+    const preferences = getPreferences()
+    
+    if (!preferences) return handle.fail({}, { resolve, reject })
+
+    const data = preferences.getSync(key, null)
+    if (data) {
+      return handle.success({ data }, { resolve, reject })
+    } else {
+      return handle.success({ errMsg: 'data not found' }, { resolve, reject })
     }
-    getItem(options.key).then(({ result, data }) => {
-      const res: Record<string, any> = { errMsg: 'getStorage:ok' }
-
-      if (result) {
-        res.data = data
-        callAsyncSuccess(resolve, res, options)
-      } else {
-        res.errMsg = 'getStorage:fail data not found'
-        callAsyncFail(reject, res, options)
-      }
-    })
   })
 }
 
+export function getStorageSync (key: string) {
+  if (!key) {
+    throw new Error('getStorageSync:fail parameter error: parameter should be String')
+  }
+
+  const preferences = getPreferences()
+  
+  if (!preferences) {
+    throw new Error('getStorageSync:fail:preferences is null')
+  }
+
+  const data = preferences.getSync(key, null)
+  if (data) {
+    return data
+  } else {
+    throw new Error('data not found')
+  }
+}
+
 export function setStorage (options: Taro.setStorage.Option) {
+  const { key, data, success, fail, complete } = options || {}
+  const handle = new MethodHandler({ name: 'setStorage', success, fail, complete })
+
   return new Promise((resolve, reject) => {
     try {
       validateParams('setStorage', options, storageSchema)
     } catch (error) {
       const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
+      return handle.fail(res, { resolve, reject })
     }
 
-    const { key, data } = options
-    const res = { errMsg: 'setStorage:ok' }
+    const preferences = getPreferences()
 
-    preferencesPromise.then(async (preferences) => {
-      await preferences.put(key, data)
-      await preferences.flush()
+    if (!preferences) return handle.fail({}, { resolve, reject })
 
-      callAsyncSuccess(resolve, res, options)
-    })
+    preferences.putSync(key, data)
+    preferences.flush()
+
+    return handle.success({}, { resolve, reject })
   })
 }
 
+export function setStorageSync (key: string, data: any) {
+  if (!key) {
+    throw new Error('setStorageSync:fail key error: key should be String')
+  }
+
+  const preferences = getPreferences()
+  
+  if (!preferences) {
+    throw new Error('setStorageSync:fail:preferences is null')
+  }
+
+  preferences.putSync(key, data)
+  preferences.flush()
+}
+
 export function removeStorage (options: Taro.removeStorage.Option) {
+  const { key, success, fail, complete } = options || {}
+  const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete })
+
   return new Promise((resolve, reject) => {
     try {
       validateParams('removeStorage', options, storageSchema)
     } catch (error) {
       const res = { errMsg: error.message }
-      return callAsyncFail(reject, res, options)
+      return handle.fail(res, { resolve, reject })
     }
 
-    const { key } = options
+    const preferences = getPreferences()
 
-    preferencesPromise.then(async (preferences) => {
-      await preferences.delete(key)
-      await preferences.flush()
+    if (!preferences) return handle.fail({}, { resolve, reject })
 
-      const res = { errMsg: 'removeStorage:ok' }
-      callAsyncSuccess(resolve, res, options)
-    })
+    preferences.deleteSync(key)
+    preferences.flush()
+
+    return handle.success({}, { resolve, reject })
   })
 }
 
+export function removeStorageSync (key: string) {
+  if (!key) {
+    throw new Error('removeStorageSync:fail key error: key should be String')
+  }
+
+  const preferences = getPreferences()
+  
+  if (!preferences) {
+    throw new Error('removeStorageSync:fail:preferences is null')
+  }
+
+  preferences.deleteSync(key)
+  preferences.flush()
+}
+
 export function clearStorage (options: Taro.clearStorage.Option) {
-  return new Promise(resolve => {
-    preferencesPromise.then(async (preferences) => {
-      await preferences.clear()
-      await preferences.flush()
-
-      const res = { errMsg: 'clearStorage:ok' }
-      callAsyncSuccess(resolve, res, options)
-    })
+  const { success, fail, complete } = options || {}
+  const handle = new MethodHandler({ name: 'clearStorage', success, fail, complete })
+
+  return new Promise((resolve, reject) => {
+    const preferences = getPreferences()
+
+    if (!preferences) return handle.fail({}, { resolve, reject })
+
+    preferences.clearSync()
+    preferences.flush()
+    
+    return handle.success({}, { resolve, reject })
   })
 }
 
+export function clearStorageSync () {
+  const preferences = getPreferences()
+  
+  if (!preferences) {
+    throw new Error('clearStorageSync:fail:preferences is null')
+  }
+
+  preferences.clearSync()
+  preferences.flush()
+}
+
 export const getStorageInfoSync = temporarilyNotSupport('getStorageInfoSync')
 export const getStorageInfo = temporarilyNotSupport('getStorageInfo')
 
-export const getStorageSync = temporarilyNotSupport('getStorageSync', 'getStorage')
-export const setStorageSync = temporarilyNotSupport('setStorageSync', 'setStorage')
-export const clearStorageSync = temporarilyNotSupport('clearStorageSync', 'clearStorage')
-export const removeStorageSync = temporarilyNotSupport('removeStorageSync', 'removeStorage')
-
 export const createBufferURL = /* @__PURE__ */ temporarilyNotSupport('createBufferURL')
 export const revokeBufferURL = /* @__PURE__ */ temporarilyNotSupport('revokeBufferURL')
 

package/dist/apis/wxml/IntersectionObserver.ts

@@ -19,13 +19,13 @@ 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)
@@ -44,6 +44,8 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
   }
 
   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

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/components-harmony-ets/button.ets

@@ -1,56 +1,11 @@
 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 { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
+import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroEvent, TaroButtonElement, TaroStyleType } from '@tarojs/runtime'
 
-@Extend(Button)
-function attrs (style: TaroStyleType) {
-  .id(style.id)
-  .key(style.id)
-  .flexGrow(style.flexGrow)
-  .flexShrink(style.flexShrink)
-  .flexBasis(style.flexBasis)
-  .alignSelf(style.alignSelf)
-  .padding({
-    top: style.paddingTop,
-    right: style.paddingRight || 10,
-    bottom: style.paddingBottom,
-    left: style.paddingLeft || 10
-  })
-  .margin({
-    top: style.marginTop,
-    right: style.marginRight,
-    bottom: style.marginBottom,
-    left: style.marginLeft
-  })
-  .width(style.width)
-  .height(style.height)
-  .constraintSize({
-    minWidth: style.minWidth,
-    maxWidth: style.maxWidth,
-    minHeight: style.minHeight,
-    maxHeight: style.maxHeight
-  })
-  .backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
-  .backgroundImageSize(style.backgroundSize)
-  .backgroundImagePosition(style.backgroundPosition)
-  .borderStyle({
-    top: style.borderTopStyle,
-    right: style.borderRightStyle,
-    bottom: style.borderBottomStyle,
-    left: style.borderLeftStyle
-  })
-  .zIndex(style.zIndex)
-  .linearGradient(style.linearGradient)
-  .clip(style.overflow)
-  .rotate({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y, angle: 0 })
-  .scale({ centerX: style.transformOrigin?.x, centerY: style.transformOrigin?.y })
-  .transform(style.transform)
-}
-
 @Extend(Button)
 function themeStyles(style: TaroStyleType) {
   .fontColor(style.color)
@@ -138,38 +93,46 @@ 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)
+@Component
+export default struct TaroButton {
+  @Builder customBuilder() {}
+  @BuilderParam createLazyChildren: (node: TaroButtonElement) => void = this.customBuilder
+  @ObjectLink node: TaroButtonElement
+
+  build() {
+    if (this.node?.hmStyle?.display !== 'none') {
+      Button({ stateEffect: !this.node._attrs.disabled }) {
+        Row() {
+          if (this.node._attrs.loading) {
+            LoadingProgress()
+              .width(20).height(20)
+              .color(getThemeAttributes(this.node).color)
+          }
+          this.createLazyChildren(this.node)
+        }
       }
-      createLazyChildren(node)
+      .themeStyles(getThemeAttributes(this.node))
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .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))
     }
   }
-  .themeStyles(getThemeAttributes(node))
-  .attrs(getNormalAttributes(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)
-    }
-    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))
 }