@tarojs/plugin-platform-harmony-ets 4.0.0-beta.43 → 4.0.0-beta.45

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/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

@@ -151,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.transform?.Translate?.x || style.transform?.Translate?.x,
+    y: overwriteStyle.transform?.Translate?.y || style.transform?.Translate?.y,
+    z: overwriteStyle.transform?.Translate?.z || style.transform?.Translate?.z,
+  })
+  instance.scale({
+    x: overwriteStyle.transform?.Scale?.x || style.transform?.Scale?.x,
+    y: overwriteStyle.transform?.Scale?.y || style.transform?.Scale?.y,
+    z: overwriteStyle.transform?.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.transform?.Rotate?.x || style.transform?.Rotate?.x,
+    y: overwriteStyle.transform?.Rotate?.y || style.transform?.Rotate?.y,
+    z: overwriteStyle.transform?.Rotate?.z || style.transform?.Rotate?.z,
+    centerX: overwriteStyle.transformOrigin?.x || style.transformOrigin?.x || 0,
+    centerY: overwriteStyle.transformOrigin?.y || style.transformOrigin?.y || 0,
+    angle: overwriteStyle.transform?.Rotate?.angle || style.transform?.Rotate?.angle || 0,
+  })
 }
 
 export function setNormalTextAttributeIntoInstance(instance: TextAttribute | SpanAttribute, style: HarmonyStyle, node?: TaroTextElement | null) {
@@ -191,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
     })
   }
@@ -366,34 +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
-      })
-    }
-  }
+  // 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,10 @@ 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);
+                if (![/d\.e?tsx?$/, /\.(json|md)$/].some(e => e.test(target))) {
+                    code = this.replaceDefineValue(code, define, ext);
+                }
                 if (['.ts'].includes(ext)) {
                     code = '// @ts-nocheck\n' + code;
                 }
@@ -556,9 +558,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;
     }