@tarojs/plugin-platform-harmony-ets 4.0.0-beta.64 → 4.0.0-beta.65

package/dist/apis/base/system.ts

@@ -27,6 +27,14 @@ let windowRect
 
     try {
       display = _display.getDefaultDisplaySync()
+
+      setSafeArea({
+        top: statusBarHeight,
+        left: 0,
+        right: display.width,
+        bottom: navigationIndicatorRect?.top
+      })
+
       // @ts-ignore
       display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} }: _display.CutoutInfo = {}) => {
         if (err?.code) {
@@ -38,14 +46,13 @@ let windowRect
         const bottom = Math.min(display.height - waterfallDisplayAreaRects.bottom?.top, navigationIndicatorRect?.top)
         const left = waterfallDisplayAreaRects.left?.left + waterfallDisplayAreaRects.left?.width
         const right = display.width - waterfallDisplayAreaRects.right?.left
-        safeArea = {
+
+        setSafeArea({
           top,
-          bottom,
           left,
           right,
-          height: bottom - top,
-          width: right - left,
-        }
+          bottom
+        })
       })
     } catch (e) {
       console.error('Failed to get display', e)
@@ -53,6 +60,19 @@ let windowRect
   })
 })
 
+
+function setSafeArea({ top, left, right, bottom }) {
+  safeArea = {
+    top,
+    bottom,
+    left,
+    right,
+    height: bottom - top,
+    width: right - left,
+  }
+}
+
+
 /* 同步版本 */
 export const getSystemInfoSync: typeof Taro.getSystemInfoSync = function () {
   const res: any = {}

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

@@ -1,10 +1,22 @@
-import type { TaroAny, TaroMovableViewElement } from '@tarojs/runtime'
+import type { TaroAny, TaroMovableViewElement, TaroElement } from '@tarojs/runtime'
 
 import commonStyleModify, { rowModify, columnModify } from './style'
 
 import { FlexManager } from './utils/flexManager'
 import { isUndefined } from '@tarojs/shared'
 
+function callTouchEventFnFromGesture(node: TaroElement, eventName: string, gestureEvent: GestureEvent) {
+  const touchFns = (node?.__listeners?.[eventName] || []) as Function[]
+  touchFns.forEach(fn => {
+    fn({
+      changedTouches: gestureEvent.fingerList.map(finger => ({
+        clientX: finger.globalX,
+        clientY: finger.globalY
+      }))
+    })
+  })
+}
+
 @Component
 export default struct TaroMovableView {
   @Builder customBuilder() {}
@@ -15,6 +27,12 @@ export default struct TaroMovableView {
   aboutToAppear(): void {
     if (this.node) {
       this.node._instance = this
+
+      setTimeout(() => {
+        const x = this.node.getAttribute('x') ? +this.node.getAttribute('x') : 0
+        const y = this.node.getAttribute('y') ? +this.node.getAttribute('y') : 0
+        this.node.checkPositionBoundary({ x, y }, this.node.scaleValue)
+      }, 0)
     }
   }
 
@@ -47,19 +65,16 @@ export default struct TaroMovableView {
         PanGesture({fingers:1}).onActionStart((e: GestureEvent) => {
 
           this.node.startMove()
+          callTouchEventFnFromGesture(this.node, 'touchstart', e)
         }).onActionUpdate((e: GestureEvent) => {
-
+          callTouchEventFnFromGesture(this.node, 'touchmove', e)
           this.node.doMove({
             x: e.offsetX,
             y: e.offsetY
           })
-          // 事件处理
-          const bindchange = this.node.getAttribute('bindchange')
-          if (typeof bindchange === 'function') {
-          }
 
         }).onActionEnd(() => {
-          // this.updatePosition()
+          callTouchEventFnFromGesture(this.node, 'touchend', e)
           this.node.checkPositionBoundary(this.node.position, this.node.scaleValue)
         }),
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {

package/dist/runtime-ets/dom/element/movableView.ts

@@ -80,8 +80,10 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
 
       this.checkPositionBoundary(this.position, val)
 
-      const bindscale = this.getAttribute('bindscale')
-      typeof bindscale === 'function' && bindscale({ ...this.position, scale: this.scaleValue })
+      const scaleFns = this?.__listeners?.scale || []
+      scaleFns.forEach((fn) => {
+        fn({ ...this.position, scale: this.scaleValue })
+      })
     }
   }
 
@@ -124,10 +126,12 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
         areaHeightEnd + incrementHeight * 0.5 + this._outOfBounds
       )
     }
-    const bindchange = this.getAttribute('bindchange')
-    if (typeof bindchange === 'function') {
-      bindchange({ x, y, source: 'touch' })
-    }
+
+    const changeFns = this?.__listeners?.change || []
+    changeFns.forEach((fn) => {
+      fn({ x, y, source: 'touch' })
+    })
+
     this.position = {
       x: x,
       y: y,

package/dist/runtime-utils.js

@@ -279,6 +279,12 @@ Current.contextPromise.then((context) => {
         windowRect = mainWindow.getWindowProperties().windowRect;
         try {
             display$1 = _display.getDefaultDisplaySync();
+            setSafeArea({
+                top: statusBarHeight,
+                left: 0,
+                right: display$1.width,
+                bottom: navigationIndicatorRect === null || navigationIndicatorRect === void 0 ? void 0 : navigationIndicatorRect.top
+            });
             // @ts-ignore
             display$1.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} } = {}) => {
                 var _a, _b, _c, _d, _e, _f;
@@ -290,14 +296,12 @@ Current.contextPromise.then((context) => {
                 const bottom = Math.min(display$1.height - ((_c = waterfallDisplayAreaRects.bottom) === null || _c === void 0 ? void 0 : _c.top), navigationIndicatorRect === null || navigationIndicatorRect === void 0 ? void 0 : navigationIndicatorRect.top);
                 const left = ((_d = waterfallDisplayAreaRects.left) === null || _d === void 0 ? void 0 : _d.left) + ((_e = waterfallDisplayAreaRects.left) === null || _e === void 0 ? void 0 : _e.width);
                 const right = display$1.width - ((_f = waterfallDisplayAreaRects.right) === null || _f === void 0 ? void 0 : _f.left);
-                safeArea = {
+                setSafeArea({
                     top,
-                    bottom,
                     left,
                     right,
-                    height: bottom - top,
-                    width: right - left,
-                };
+                    bottom
+                });
             });
         }
         catch (e) {
@@ -305,6 +309,16 @@ Current.contextPromise.then((context) => {
         }
     });
 });
+function setSafeArea({ top, left, right, bottom }) {
+    safeArea = {
+        top,
+        bottom,
+        left,
+        right,
+        height: bottom - top,
+        width: right - left,
+    };
+}
 /* 同步版本 */
 const getSystemInfoSync = function () {
     var _a, _b;