@tarojs/plugin-platform-harmony-ets 4.0.0-beta.13 → 4.0.0-beta.15

package/dist/apis/base/system.ts

@@ -5,38 +5,53 @@ import deviceInfo from '@ohos.deviceInfo'
 import _display from '@ohos.display'
 // 从 API Version 7 开始支持
 import i18n from '@ohos.i18n'
+import { Current, window } from '@tarojs/runtime'
 
 import { callAsyncFail, callAsyncSuccess } from '../utils'
 
 import type Taro from '@tarojs/taro/types'
 
 let display
+let navigationIndicatorRect
 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
-    }
+let statusBarHeight
+let windowRect
+
+(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
 
-    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,
+    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)
     }
   })
-} catch (e) {
-  console.error('Failed to get display', e)
-}
+})
 
 /* 同步版本 */
 export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
@@ -65,12 +80,12 @@ export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   res.safeArea = safeArea // 在竖屏正方向下的安全区域 General.SafeAreaResult
   res.screenHeight = display?.height // 屏幕高度，单位px number
   res.screenWidth = display?.width // 屏幕宽度，单位px number
-  res.statusBarHeight = safeArea?.top // 状态栏的高度，单位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 = display?.height // 可使用窗口高度，单位px number
-  res.windowWidth = display?.width // 可使用窗口宽度，单位px number
+  res.windowHeight = windowRect?.height // 可使用窗口高度，单位px number
+  res.windowWidth = windowRect?.width // 可使用窗口宽度，单位px number
   res.version = deviceInfo?.displayVersion // 版本号 string
 
   return res

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

@@ -1,4 +1,4 @@
-import type { TaroMovableAreaElement, TaroStyleType } from '@tarojs/runtime'
+import type { TaroMovableAreaElement, TaroStyleType, TaroMovableViewElement} from '@tarojs/runtime'
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 
@@ -30,9 +30,6 @@ function columnAttrs(style: TaroStyleType) {
 export default struct TaroMovableArea {
   @ObjectLink node: TaroMovableAreaElement
 
-  @Provide areaWidth: Length = 0
-  @Provide areaHeight: Length = 0
-
   build() {
     if (this.node) {
       if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
@@ -45,9 +42,33 @@ export default struct TaroMovableArea {
         .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
         .clip(true)
         .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
+          this.node.childNodes.forEach(item => {
+            if(item.nodeName === 'MOVABLE-VIEW') {
+              ;(item as TaroMovableViewElement).area = {
+                w: Number( newValue.width),
+                h: Number(newValue.height)
+              }
+            }
+          })
         })
+        .gesture(
+          PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+            this.node.childNodes.forEach(item => {
+              if(item.nodeName === 'MOVABLE-VIEW') {
+                ;(item as TaroMovableViewElement).startScale()
+              }
+            })
+          }).onActionUpdate((event) => {
+            const scaleArea = this.node.getAttribute('scaleArea')
+            if (scaleArea) {
+              this.node.childNodes.forEach(item => {
+                if(item.nodeName === 'MOVABLE-VIEW') {
+                  ;(item as TaroMovableViewElement).doScale(event.scale)
+                }
+              })
+            }
+          })
+        )
       } else {
         Column() {
           createLazyChildren(this.node)
@@ -58,9 +79,33 @@ export default struct TaroMovableArea {
         .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
         .clip(true)
         .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
+          this.node.childNodes.forEach(item => {
+            if(item.nodeName === 'MOVABLE-VIEW') {
+              ;(item as TaroMovableViewElement).area = {
+                w: Number( newValue.width),
+                h: Number(newValue.height)
+              }
+            }
+          })
         })
+        .gesture(
+          PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+            this.node.childNodes.forEach(item => {
+              if(item.nodeName === 'MOVABLE-VIEW') {
+                ;(item as TaroMovableViewElement).startScale()
+              }
+            })
+          }).onActionUpdate((event) => {
+            const scaleArea = this.node.getAttribute('scaleArea')
+            if (scaleArea) {
+              this.node.childNodes.forEach(item => {
+                if(item.nodeName === 'MOVABLE-VIEW') {
+                  ;(item as TaroMovableViewElement).doScale(event.scale)
+                }
+              })
+            }
+          })
+        )
       }
     }
   }

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

@@ -1,10 +1,11 @@
-import type { TaroMovableViewElement, TaroStyleType } from '@tarojs/runtime'
+import type { TaroMovableViewElement, TaroStyleType, TaroAny } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
 import { createLazyChildren } from './render'
 
 import { FlexManager } from './utils/flexManager'
 import { getNormalAttributes, } from './utils/helper'
+
 @Extend(Row)
 function rowAttrs(style: TaroStyleType) {
   .constraintSize({
@@ -25,42 +26,65 @@ function columnAttrs(style: TaroStyleType) {
   })
 }
 
+
 @Component
-export default struct TaroMovableArea {
+export default struct TaroMovableView {
   @ObjectLink node: TaroMovableViewElement
 
-  @Provide areaWidth: Length = 0
-  @Provide areaHeight: Length = 0
-
   build() {
     if (this.node) {
-      if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node).direction !== FlexDirection.Column) {
-        Row() {
-          createLazyChildren(this.node)
-        }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .rowAttrs(getNormalAttributes(this.node))
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-        .clip(true)
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
-        })
-      } else {
-        Column() {
-          createLazyChildren(this.node)
+      Stack() {
+        if (FlexManager.isFlexNode(this.node) && FlexManager.flexOptions(this.node)
+          .direction !== FlexDirection.Column) {
+          Row() {
+            createLazyChildren(this.node)
+          }
+          .attributeModifier(commonStyleModify.setNode(this.node))
+          .rowAttrs(getNormalAttributes(this.node))
+          .alignItems(FlexManager.flexOptions(this.node).alignItems as VerticalAlign)
+          .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
+        } else {
+          Column() {
+            createLazyChildren(this.node)
+          }
+          .attributeModifier(commonStyleModify.setNode(this.node))
+          .columnAttrs(getNormalAttributes(this.node))
+          .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
+          .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
         }
-        .attributeModifier(commonStyleModify.setNode(this.node))
-        .columnAttrs(getNormalAttributes(this.node))
-        .alignItems(FlexManager.flexOptions(this.node).alignItems as HorizontalAlign)
-        .justifyContent(FlexManager.flexOptions(this.node).justifyContent)
-        .clip(true)
-        .onAreaChange((oldValue: Area, newValue: Area) => {
-          this.areaWidth = newValue.width
-          this.areaHeight = newValue.height
-        })
       }
+      .translate({ x: this.node.position.x, y: this.node.position.y })
+      .scale({ x: this.node.scaleValue, y: this.node.scaleValue })
+      .onAreaChange((oldValue: Area, newValue: Area) => {
+        this.node.selfSize = {w: Number(newValue.width), h: Number(newValue.height)}
+      })
+      .gesture(
+        GestureGroup(GestureMode.Exclusive,
+          PanGesture({fingers:1}).onActionStart((e: GestureEvent) => {
+
+            this.node.startMove()
+          }).onActionUpdate((e: GestureEvent) => {
+
+            this.node.doMove({
+              x: e.offsetX,
+              y: e.offsetY
+            })
+            // 事件处理
+            const bindchange = this.node.getAttribute('bindchange')
+            if (typeof bindchange === 'function') {
+            }
+
+          }).onActionEnd(() => {
+            // this.updatePosition()
+            this.node.checkPositionBoundary(this.node.position, this.node.scaleValue)
+          }),
+          PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
+            this.node.startScale()
+          }).onActionUpdate((event) => {
+            this.node.doScale(event.scale)
+          })
+        )
+      )
     }
   }
 }

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

@@ -60,7 +60,7 @@ class AttributeManager {
     const dataValue: string = AttributeManager.getNodeStyle(style, 'animation')
 
     if (dataValue) {
-      let values: string[] = dataValue.trim().split(new RegExp("/\s+/"))
+      let values: string[] = dataValue.toString().trim().split(new RegExp("/\s+/"))
       switch (values.length) {
         case 4:
           res = { duration: values[0], curve: values[1], delay: values[2] }

package/dist/components-harmony-ets/utils/index.ts

@@ -30,7 +30,7 @@ export function getUnit (val) {
 function handleNodeStyleData (dataValue: string, handler: (values: string[]) => { [key: string]: string } | void) {
   let res: any = {}
   if (dataValue) {
-    const values = dataValue.trim().split(/\s+/)
+    const values = dataValue.toString().trim().split(/\s+/)
     const data = handler(values)
 
     if (!data) return res

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\//, /^@jd-oh\//];
+const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//];
 
 function parseRelativePath(from, to) {
     const relativePath = path.relative(from, to).replace(/\\/g, '/');
@@ -1325,6 +1325,7 @@ function assertHarmonyConfig(ctx, config) {
     }
 }
 
+exports.HarmonyOS_ArkTS = Harmony$1;
 exports.HarmonyOS_JSUI = Harmony;
 exports.default = index;
 //# sourceMappingURL=index.js.map