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

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

@@ -3,19 +3,8 @@ import type { TaroAny, TaroMovableViewElement, TaroElement } from '@tarojs/runti
 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 {
@@ -29,8 +18,8 @@ export default struct TaroMovableView {
       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
+        const x = this.node.getAttribute('x') ? Number(this.node.getAttribute('x')) : 0
+        const y = this.node.getAttribute('y') ? Number(this.node.getAttribute('y')) : 0
         this.node.checkPositionBoundary({ x, y }, this.node.scaleValue)
       }, 0)
     }
@@ -58,23 +47,23 @@ export default struct TaroMovableView {
     .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)}
+      this.node.selfSize = { w: Number(newValue.width), h: Number(newValue.height) }
     })
     .gesture(
       GestureGroup(GestureMode.Exclusive,
-        PanGesture({fingers:1}).onActionStart((e: GestureEvent) => {
+        PanGesture({ fingers: 1 }).onActionStart((e: GestureEvent) => {
 
           this.node.startMove()
-          callTouchEventFnFromGesture(this.node, 'touchstart', e)
+          this.node.callTouchEventFnFromGesture('touchstart', e)
         }).onActionUpdate((e: GestureEvent) => {
-          callTouchEventFnFromGesture(this.node, 'touchmove', e)
+          this.node.callTouchEventFnFromGesture('touchmove', e)
           this.node.doMove({
             x: e.offsetX,
             y: e.offsetY
           })
 
-        }).onActionEnd(() => {
-          callTouchEventFnFromGesture(this.node, 'touchend', e)
+        }).onActionEnd((e: GestureEvent) => {
+          this.node.callTouchEventFnFromGesture('touchend', e)
           this.node.checkPositionBoundary(this.node.position, this.node.scaleValue)
         }),
         PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {

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

@@ -95,7 +95,6 @@ export default struct TaroVideo {
     Video(getVideoData(this.node))
     .attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
     .props(getVideoProps(this.node))
-    .aspectRatio(4 / 3)
     .onStart(shouldBindEvent(() => { emitEvent(this.node, 'play') }, this.node, ['play']))
     .onPause(shouldBindEvent(() => { emitEvent(this.node, 'pause') }, this.node, ['pause']))
     .onFinish(shouldBindEvent(() => { emitEvent(this.node, 'ended') }, this.node, ['ended']))

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

@@ -194,4 +194,16 @@ export class TaroMovableViewElement extends TaroElement<MovableViewProps & { ani
 
     super.setAttribute(name, value)
   }
+
+  public callTouchEventFnFromGesture(eventName: string, gestureEvent: GestureEvent) {
+    const touchFns = (this?.__listeners?.[eventName] || []) as Function[]
+    touchFns.forEach(fn => {
+      fn({
+        changedTouches: gestureEvent.fingerList.map(finger => ({
+          clientX: finger.globalX,
+          clientY: finger.globalY
+        }))
+      })
+    })
+  }
 }

package/dist/runtime-ets/dom/event.ts

@@ -86,7 +86,6 @@ function stopOrTriggerPropagation (event: TaroEvent, node: TaroElement) {
 
   // eslint-disable-next-line no-unmodified-loop-condition
   while ((target = target.parentNode as TaroElement)) {
-    event.currentTarget = target
     const listeners = target.__listeners[event.type]
 
     if (!Array.isArray(listeners) || target._attrs?.disabled) {

package/dist/runtime-ets/dom/eventTarget.ts

@@ -43,6 +43,8 @@ class TaroEventTarget extends Events {
   }
 
   public dispatchEvent (event: TaroEvent) {
+    // @ts-ignore
+    event.currentTarget = this
     const cancelable = event.cancelable
     const listeners = this.__listeners[event.type]
 

package/dist/runtime-ets/dom/node.ts

@@ -32,6 +32,7 @@ export class TaroNode extends TaroDataSourceElement {
   public parentNode: TaroNode | null = null
   public _nid: string = genId()
   public _doc: TaroDocument | null = null
+  public _instance?: TaroAny
 
   private _textContent = ''
 
@@ -78,7 +79,7 @@ export class TaroNode extends TaroDataSourceElement {
   // 更新对应的 ArkUI 组件
   public updateComponent () {
     // 非半编译模式或者半编译模式下拥有自主更新权力的节点走 @State 的更新模式
-    if (this._isDynamicNode || !this._isCompileMode) {
+    if (this._isDynamicNode || (!this._isCompileMode && this._instance)) {
       this._updateTrigger++
     } else {
       this.parentNode?.updateComponent()
@@ -131,6 +132,9 @@ export class TaroNode extends TaroDataSourceElement {
   public set textContent (value: string) {
     if (this.nodeType === NodeType.TEXT_NODE) {
       this._textContent = value
+      if (!this._instance) {
+        this.updateComponent()
+      }
     } else if (this.nodeType === NodeType.ELEMENT_NODE) {
       const node = new TaroTextNode(value)
       node._doc = this.ownerDocument

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-platform-harmony-ets",
-  "version": "4.0.0-beta.65",
+  "version": "4.0.0-beta.67",
   "description": "OpenHarmony & 鸿蒙系统插件",
   "author": "O2Team",
   "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -25,13 +25,13 @@
   },
   "dependencies": {
     "webpack-sources": "^3.2.3",
-    "@tarojs/components": "4.0.0-beta.65",
-    "@tarojs/helper": "4.0.0-beta.65",
-    "@tarojs/runner-utils": "4.0.0-beta.65",
-    "@tarojs/runtime": "4.0.0-beta.65",
-    "@tarojs/shared": "4.0.0-beta.65",
-    "@tarojs/taro": "4.0.0-beta.65",
-    "@tarojs/service": "4.0.0-beta.65"
+    "@tarojs/components": "4.0.0-beta.67",
+    "@tarojs/runner-utils": "4.0.0-beta.67",
+    "@tarojs/helper": "4.0.0-beta.67",
+    "@tarojs/runtime": "4.0.0-beta.67",
+    "@tarojs/service": "4.0.0-beta.67",
+    "@tarojs/shared": "4.0.0-beta.67",
+    "@tarojs/taro": "4.0.0-beta.67"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -44,7 +44,7 @@
     "solid-js": "^1.8.16",
     "tslib": "^2.4.0",
     "typescript": "^4.8.2",
-    "rollup-plugin-copy": "4.0.0-beta.65"
+    "rollup-plugin-copy": "4.0.0-beta.67"
   },
   "scripts": {
     "prebuild": "rimraf ./dist",