@tarojs/plugin-platform-harmony-ets 4.0.0-beta.42 → 4.0.0-beta.44

package/dist/apis/base/system.ts

@@ -35,7 +35,7 @@ let windowRect
         }
 
         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 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 = {

package/dist/apis/ui/animation/animation.ts

@@ -72,6 +72,9 @@ export class Animation implements Taro.Animation {
       transformOrigin,
       rule: Object.assign({}, this.rule)
     })
+    if (this.rule.transform) {
+      this.rule.transform = Object.assign({}, this.rule.transform)
+    }
     return this
   }
 
@@ -86,92 +89,137 @@ export class Animation implements Taro.Animation {
   }
 
   rotate (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 0, z: 1, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle }
     return this
   }
 
   rotate3d (x: number, y?: number | undefined, z?: number | undefined, angle?: number | undefined): Taro.Animation {
-    this.rule.rotate = { x, y, z, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x, y, z, angle }
     return this
   }
 
   rotateX (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 1, y: 0, z: 0, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 1, y: 0, z: 0, angle }
     return this
   }
 
   rotateY (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 1, z: 0, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 1, z: 0, angle }
     return this
   }
 
   rotateZ (angle: number): Taro.Animation {
-    this.rule.rotate = { x: 0, y: 0, z: 1, angle }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Rotate = { x: 0, y: 0, z: 1, angle }
     return this
   }
 
   scale (sx: number, sy?: number | undefined): Taro.Animation {
-    this.rule.scale = { x: sx, y: isUndefined(sy) ? sx : sy }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: sx, y: isUndefined(sy) ? sx : sy }
     return this
   }
 
   scale3d (sx: number, sy: number, sz: number): Taro.Animation {
-    this.rule.scale = { x: sx, y: sy, z: sz }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: sx, y: sy, z: sz }
     return this
   }
 
   scaleX (scale: number): Taro.Animation {
-    this.rule.scale = { x: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { x: scale }
     return this
   }
 
   scaleY (scale: number): Taro.Animation {
-    this.rule.scale = { y: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { y: scale }
     return this
   }
 
   scaleZ (scale: number): Taro.Animation {
-    this.rule.scale = { z: scale }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Scale = { z: scale }
     return this
   }
 
   skew (ax: number, ay: number): Taro.Animation {
-    this.rule.skew = { x: ax, y: ay }
+    temporarilyNotSupport('animation.skew:' + `${ax}, ${ay}`)(ax, ay)
     return this
   }
 
   skewX (angle: number): Taro.Animation {
-    this.rule.skew = { x: angle }
+    temporarilyNotSupport('animation.skewX:' + angle)(angle)
     return this
   }
 
   skewY (angle: number): Taro.Animation {
-    this.rule.skew = { y: angle }
+    temporarilyNotSupport('animation.skewY:' + angle)(angle)
     return this
   }
 
   translate (tx?: number | undefined, ty?: number | undefined): Taro.Animation {
-    this.rule.translate = { x: tx, y: ty }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: tx, y: ty }
     return this
   }
 
   translate3d (tx?: number | undefined, ty?: number | undefined, tz?: number | undefined): Taro.Animation {
-    this.rule.translate = { x: tx, y: ty, z: tz }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: tx, y: ty, z: tz }
     return this
   }
 
   translateX (translation: number): Taro.Animation {
-    this.rule.translate = { x: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { x: translation }
     return this
   }
 
   translateY (translation: number): Taro.Animation {
-    this.rule.translate = { y: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { y: translation }
     return this
   }
 
   translateZ (translation: number): Taro.Animation {
-    this.rule.translate = { z: translation }
+    if (!this.rule.transform) {
+      this.rule.transform = {}
+    }
+    this.rule.transform.Translate = { z: translation }
     return this
   }
 
@@ -186,23 +234,17 @@ export class Animation implements Taro.Animation {
   }
 
   width (value: string | number): Taro.Animation {
-    this.rule.size = {
-      ...this.rule.size,
-      width: value
-    }
+    this.rule.width = value
     return this
   }
 
   height (value: string | number): Taro.Animation {
-    this.rule.size = {
-      ...this.rule.size,
-      height: value
-    }
+    this.rule.height = value
     return this
   }
 
   left (value: string | number): Taro.Animation {
-    temporarilyNotSupport('animation.left:' + value)(value)
+    this.rule.left = value
     return this
   }
 
@@ -212,7 +254,7 @@ export class Animation implements Taro.Animation {
   }
 
   top (value: string | number): Taro.Animation {
-    temporarilyNotSupport('animation.top:' + value)(value)
+    this.rule.top = value
     return this
   }
 

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

@@ -25,7 +25,7 @@ function textNormalFontStyle (style: TaroStyleType) {
   .fontStyle(style.fontStyle)
   .fontFamily(style.fontFamily)
   .decoration({
-    type: style.textDecoration,
+    type: style.textDecoration?.type || TextDecorationType.None,
     color: style.color
   })
 }

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

@@ -10,21 +10,12 @@ class TextStyleModify implements AttributeModifier<TextAttribute> {
   node: TaroTextElement | null = null
   style: HarmonyStyle | null = null
   overwriteStyle: Record<string, TaroAny> = {}
-  withNormal = false
-
-  withNormalStyle () {
-    this.withNormal = true
-    return this
-  }
-
-  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
-    this.overwriteStyle = overwriteStyle
-
-    return this
-  }
+  withNormal: boolean = false
 
   setNode (node: TaroTextElement, initStyle?: HarmonyStyle) {
     this.node = node
+    this.withNormal = false
+    this.overwriteStyle = {}
     this.style = getNormalAttributes(this.node)
     this.initStyle = initStyle
     // 覆盖初始化样式
@@ -38,6 +29,16 @@ class TextStyleModify implements AttributeModifier<TextAttribute> {
     return this
   }
 
+  withNormalStyle () {
+    this.withNormal = true
+    return this
+  }
+
+  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
+    this.overwriteStyle = overwriteStyle
+    return this
+  }
+
   applyNormalAttribute(instance: TextAttribute): void {
     if (this.node && this.style) {
       if (this.withNormal) {
@@ -55,18 +56,13 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
   initStyle?: TaroStyleType
   node: TaroElement | null = null
   style: TaroStyleType | null = null
-  overwriteStyle: Record<string, TaroAny> = {}
-  
-  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
-    this.overwriteStyle = overwriteStyle
-
-    return this
-  }
+  overwriteStyle: TaroStyleType = {}
 
   setNode (node: TaroElement, initStyle?: TaroStyleType) {
     this.node = node
     this.style = getNormalAttributes(this.node)
     this.initStyle = initStyle
+    this.overwriteStyle = {}
     // 覆盖初始化样式
     if (initStyle) {
       Object.keys(initStyle).forEach(key => {
@@ -77,6 +73,16 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
     }
     return this
   }
+  
+  setAnimationStyle (overwriteStyle: Record<string, TaroAny>) {
+    this.overwriteStyle = overwriteStyle
+    if (this.style && this.overwriteStyle) {
+      Object.keys(this.overwriteStyle).forEach(key => {
+        this.style![key] = this.overwriteStyle[key]
+      })
+    }
+    return this
+  }
 
   applyNormalAttribute(instance: CommonAttribute): void {
     if (this.node && this.style) {
@@ -145,26 +151,26 @@ class ColumnStyleModify extends CommonStyleModify {
 
 export function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>, style: TaroStyleType) {
   // Animation 需要提前和 @State 变量绑定才能产生动画效果，因此不能做 if else 判断
-  instance.translate({
-    x: overwriteStyle.translate?.x || style.transform?.Translate?.x,
-    y: overwriteStyle.translate?.y || style.transform?.Translate?.y,
-    z: overwriteStyle.translate?.z || style.transform?.Translate?.z,
-  })
-  instance.scale({
-    x: overwriteStyle.scale?.x || style.transform?.Scale?.x,
-    y: overwriteStyle.scale?.y || style.transform?.Scale?.y,
-    z: overwriteStyle.scale?.z || style.transform?.Scale?.z,
-    centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
-    centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
-  })
-  instance.rotate({
-    x: overwriteStyle.rotate?.x || style.transform?.Rotate?.x,
-    y: overwriteStyle.rotate?.y || style.transform?.Rotate?.y,
-    z: overwriteStyle.rotate?.z || style.transform?.Rotate?.z,
-    centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
-    centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
-    angle: overwriteStyle.rotate?.angle || style.transform?.Rotate?.angle || 0,
-  })
+  // instance.translate({
+  //   x: overwriteStyle.translate?.x || style.transform?.Translate?.x,
+  //   y: overwriteStyle.translate?.y || style.transform?.Translate?.y,
+  //   z: overwriteStyle.translate?.z || style.transform?.Translate?.z,
+  // })
+  // instance.scale({
+  //   x: overwriteStyle.scale?.x || style.transform?.Scale?.x,
+  //   y: overwriteStyle.scale?.y || style.transform?.Scale?.y,
+  //   z: overwriteStyle.scale?.z || style.transform?.Scale?.z,
+  //   centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
+  //   centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
+  // })
+  // instance.rotate({
+  //   x: overwriteStyle.rotate?.x || style.transform?.Rotate?.x,
+  //   y: overwriteStyle.rotate?.y || style.transform?.Rotate?.y,
+  //   z: overwriteStyle.rotate?.z || style.transform?.Rotate?.z,
+  //   centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
+  //   centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
+  //   angle: overwriteStyle.rotate?.angle || style.transform?.Rotate?.angle || 0,
+  // })
 }
 
 export function setNormalTextAttributeIntoInstance(instance: TextAttribute | SpanAttribute, style: HarmonyStyle, node?: TaroTextElement | null) {
@@ -185,7 +191,7 @@ export function setNormalTextAttributeIntoInstance(instance: TextAttribute | Spa
   }
   if (!isUndefined(style.textDecoration)) {
     instance.decoration({
-      type: style.textDecoration,
+      type: style.textDecoration.type,
       color: style.color
     })
   }
@@ -360,6 +366,34 @@ export function setNormalAttributeIntoInstance(instance: CommonAttribute, style:
     // 为了适应position不设置z-index也能高于同层级组件，估且让设置了z-index的会更高一级
     instance.zIndex(style.zIndex + 1)
   }
+  if (!isUndefined(style.transform)) {
+    if (style.transform.Translate) {
+      instance.translate({
+        x: style.transform.Translate.x || 0,
+        y: style.transform.Translate.y || 0,
+        z: style.transform.Translate.z || 0,
+      })
+    }
+    if (style.transform.Scale) {
+      instance.scale({
+        x: style.transform.Scale.x || 0,
+        y: style.transform.Scale.y || 0,
+        z: style.transform.Scale.z || 0,
+        centerX: style.transformOrigin?.x || 0,
+        centerY: style.transformOrigin?.y || 0,
+      })
+    }
+    if (style.transform.Rotate) {
+      instance.rotate({
+        x: style.transform.Rotate.x || 0,
+        y: style.transform.Rotate.y || 0,
+        z: style.transform.Rotate.z || 0,
+        centerX: style.transformOrigin?.x || 0,
+        centerY: style.transformOrigin?.y || 0,
+        angle: style.transform.Rotate.angle
+      })
+    }
+  }
 }
 
 export const pseudoModify = new PseudoStyleModify()

package/dist/index.d.ts

@@ -70,7 +70,7 @@ declare class Harmony extends TaroPlatformHarmony {
     indexOfLibraries(lib: string): number;
     removeFromLibraries(lib: string): void;
     moveLibraries(lib: string, target?: string, basedir?: string, sync?: boolean): void;
-    replaceDefineValue(code: string, define: Record<string, string>): string;
+    replaceDefineValue(code: string, define: Record<string, string>, ext?: string): string;
     /**
      * 修改 Vite 配置
      */

package/dist/index.js

@@ -506,8 +506,8 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 if ([/(@tarojs[\\/]runtime|taro-runtime)[\\/]dist/].some(e => e.test(lib))) {
                     define.global = 'globalThis';
                 }
-                code = this.replaceDefineValue(code, define);
                 const ext = path__namespace.extname(target);
+                code = this.replaceDefineValue(code, define, ext);
                 if (['.ts'].includes(ext)) {
                     code = '// @ts-nocheck\n' + code;
                 }
@@ -556,9 +556,13 @@ declare global {
             this.moveLibraries(realPath, target, basedir);
         }
     }
-    replaceDefineValue(code, define) {
+    replaceDefineValue(code, define, ext = '.js') {
         Object.keys(define).forEach(key => {
-            code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), define[key]);
+            let value = define[key];
+            if (/^['"`].*['"`]$/.test(value) && ['.ts', '.tsx', '.ets'].includes(ext)) {
+                value = `(${value} as string)`;
+            }
+            code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), value);
         });
         return code;
     }