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

package/dist/apis/base/system.ts

@@ -1,25 +1,42 @@
+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 { callAsyncFail, callAsyncSuccess } from '../utils'
 
 import type Taro from '@tarojs/taro/types'
 
-const display = _display.getDefaultDisplaySync()
-
-let device
+let display
+let safeArea: TaroGeneral.SafeAreaResult | null = null
+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
+    }
 
-deviceMethod.getInfo({
-  success: data => {
-    device = data
-  }
-})
+    const top = Math.max(...boundingRects.map(rect => rect.top * 2 + rect.height), waterfallDisplayAreaRects.top?.top + waterfallDisplayAreaRects.top?.height)
+    const bottom = (waterfallDisplayAreaRects.bottom?.top + waterfallDisplayAreaRects.bottom?.height) || display.height
+    const left = waterfallDisplayAreaRects.left?.left + waterfallDisplayAreaRects.left?.width
+    const right = (waterfallDisplayAreaRects.right?.left + waterfallDisplayAreaRects.right?.width) || display.width
+    safeArea = {
+      top,
+      bottom,
+      left,
+      right,
+      height: bottom - top,
+      width: right - left,
+    }
+  })
+} catch (e) {
+  console.error('Failed to get display', e)
+}
 
 /* 同步版本 */
 export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
@@ -32,7 +49,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 +60,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 = safeArea?.top // 状态栏的高度，单位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 = display?.height // 可使用窗口高度，单位px number
+  res.windowWidth = display?.width // 可使用窗口宽度，单位px number
+  res.version = deviceInfo?.displayVersion // 版本号 string
 
   return res
 }

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

@@ -2,7 +2,7 @@ import { createTaroEvent, eventHandler, getComponentEventCallback, AREA_CHANGE_E
 
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroEvent, TaroCheckboxElement, TaroCheckboxGroupElement } from '@tarojs/runtime'
@@ -60,7 +60,7 @@ export struct TaroCheckbox {
                   this.node.updateComponent()
                 } else {
                   this.node.updateCheckedValue(value)
-      
+
                   if (value) {
                     const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, this.node)
                     eventHandler(event, 'change', this.node)

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

@@ -3,7 +3,7 @@ import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBL
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroFormElement } from '@tarojs/runtime'

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

@@ -3,7 +3,7 @@ import { Current, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroLabelElement, TaroElement, TaroAny, TaroRadioElement, TaroCheckboxElement } from '@tarojs/runtime'

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

@@ -2,7 +2,7 @@ import type { TaroMovableAreaElement, TaroStyleType } from '@tarojs/runtime'
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { getNormalAttributes } from './utils/helper'
 
 

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

@@ -3,7 +3,7 @@ import type { TaroMovableViewElement, TaroStyleType } from '@tarojs/runtime'
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { getNormalAttributes, } from './utils/helper'
 @Extend(Row)
 function rowAttrs(style: TaroStyleType) {

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

@@ -3,7 +3,7 @@ import { createLazyChildren } from './render'
 import commonStyleModify from './style'
 import { getSingleSelector, getMultiSelector } from './utils'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import type { TaroAny, TaroEvent } from '@tarojs/runtime'
@@ -238,8 +238,8 @@ export default struct TaroPicker {
           break
         case 'time': {
           const hour = new Date().getHours()
-          const minute = new Date().getMinutes() 
-  
+          const minute = new Date().getMinutes()
+
           defaultResetValue = `${('00'+hour).slice(-2)}:${('00'+minute).slice(-2)}`
           break
         }
@@ -248,7 +248,7 @@ export default struct TaroPicker {
           const day = data[1]
           const month = data[0]
           const year = data[2]
-  
+
           defaultResetValue = `${year}-${month}-${day}`
           break
         }
@@ -256,7 +256,7 @@ export default struct TaroPicker {
           defaultResetValue = ''
           break
       }
-  
+
       this.node._isInit = true
       this.node._reset = this.node.value || defaultResetValue
     }

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

@@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { shouldBindEvent, getNodeThresholds } from './utils/helper'
 
 import { TaroEvent, TaroAny, HarmonyType, TaroRadioGroupElement, TaroRadioElement } from '@tarojs/runtime'
@@ -36,7 +36,7 @@ function themeStyles(isDisabled: boolean) {
 @Component
 export struct TaroRadio {
   @ObjectLink node: TaroRadioElement
-  
+
   aboutToAppear () {
     if (this.node && !this.node._isInit) {
       this.node._isInit = true
@@ -61,7 +61,7 @@ export struct TaroRadio {
                   this.node.updateComponent()
                 } else {
                   this.node.updateCheckedValue(value)
-      
+
                   if (value) {
                     const event: TaroEvent = createTaroEvent('change', { detail: { value: this.node?._attrs.value } }, this.node)
                     eventHandler(event, 'change', this.node)

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

@@ -2,7 +2,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
 import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
 
@@ -49,8 +49,8 @@ function handleScrollEvent (node: TaroScrollViewElement, eventName = 'scroll', x
     deltaY: vp2px(yOffset),
     scrollLeft: vp2px(currentXOffset),
     scrollTop: vp2px(currentYOffset),
-    scrollWidth: vp2px(Number(node._scroll?.width)),
-    scrollHeight: vp2px(Number(node._scroll?.height)),
+    scrollWidth: vp2px(Number(node._nodeInfo?._scroll?.width)),
+    scrollHeight: vp2px(Number(node._nodeInfo?._scroll?.height)),
   }
   const event: TaroEvent = createTaroEvent(eventName, { detail: value }, node)
 
@@ -91,7 +91,7 @@ export default struct TaroScrollView {
         .rowAttrs(getNormalAttributes(this.node))
         .width(null)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          this.node._scroll = areaResult
+          this.node._nodeInfo._scroll = areaResult
         }, this.node, ['scroll', 'scrollstart', 'scrollend']))
         .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
         .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
@@ -105,7 +105,7 @@ export default struct TaroScrollView {
         .height(null)
         .alignItems(HorizontalAlign.Start)
         .onAreaChange(shouldBindEvent((_: Area, areaResult: Area) => {
-          this.node._scroll = areaResult
+          this.node._nodeInfo._scroll = areaResult
         }, this.node, ['scroll', 'scrollstart', 'scrollend']))
         .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
         .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
@@ -127,5 +127,6 @@ export default struct TaroScrollView {
     .onScrollStart(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollstart') }, this.node, ['scrollstart']))
     .onScrollStop(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrollend') }, this.node, ['scrollend']))
     .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+    .onReachEnd(shouldBindEvent(() => { handleScrollEvent(this.node, 'scrolltolower') }, this.node, ['scrolltolower']))
   }
 }

package/dist/components-harmony-ets/utils/styles.ets

@@ -1,7 +1,7 @@
 import { isUndefined } from '@tarojs/shared'
 import { ObjectAssign } from '@tarojs/runtime'
 
-import { FlexManager } from './FlexManager'
+import { FlexManager } from './flexManager'
 import { TEXT_DEFAULT_STYLE } from './constant/style'
 
 import type { StandardProps, TextProps } from '@tarojs/components/types'
@@ -25,7 +25,7 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
 // 模拟 div 自动撑满父元素的情况
 function isMaxWidthView (node: TaroElement) {
   const parentNode: TaroElement = node.parentNode as TaroElement
-  
+
   return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' &&
     !(FlexManager.isFlexNode(parentNode) && FlexManager.flexOptions(parentNode).direction !== FlexDirection.Column)
 }

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

@@ -3,7 +3,7 @@ import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBL
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 import { TOUCH_EVENT_MAP } from './utils/constant/event'
-import { FlexManager } from './utils/FlexManager'
+import { FlexManager } from './utils/flexManager'
 import { getNodeThresholds, getNormalAttributes, shouldBindEvent } from './utils/helper'
 
 import type { TaroViewElement, TaroStyleType, TaroAny } from '@tarojs/runtime'

package/dist/index.js

@@ -158,7 +158,7 @@ export {
 const PLATFORM_NAME = 'harmony';
 const PACKAGE_NAME = '@tarojs/plugin-platform-harmony-ets';
 const PLUGIN_NAME = 'TaroHarmony';
-const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//];
+const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//, /^@jd-oh\//];
 
 function parseRelativePath(from, to) {
     const relativePath = path.relative(from, to).replace(/\\/g, '/');