@tarojs/plugin-platform-harmony-ets 4.0.0-beta.31 → 4.0.0-beta.33

package/dist/apis/index.ts

@@ -105,19 +105,18 @@ export function pxTransformHelper (size: number, unit?: string, isNumber = false
   return isNumber ? val : val + targetUnit
 }
 
-export function pxTransform (size: number): number {
+export function pxTransform (size: number): number | string {
   const config = (Current as any).taro?.config || {}
   const targetUnit = config.targetUnit || defaultTargetUnit
 
-  let val = size
+  const val = size
   switch (targetUnit) {
     case 'vp':
-      val = px2vp(size)
-      break
+      return pxTransformHelper(size, 'px')
     default:
       // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
   }
-  return val + config.targetUnit
+  return val + targetUnit
 }
 
 export function canIUseWebp () {

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

@@ -65,13 +65,13 @@ function getThemeAttributes (node: TaroButtonElement): TaroStyleType {
   }
 }
 
-function getButtonWidth (node: TaroButtonElement) {
+function getButtonWidth (node: TaroButtonElement): string | number {
   const isMini = node._attrs.size === 'mini'
 
   return isMini ? convertNumber2VP(120) : '100%'
 }
 
-function getButtonHeight (node: TaroButtonElement) {
+function getButtonHeight (node: TaroButtonElement): string | number {
   const isMini = node._attrs.size === 'mini'
 
   return isMini ? convertNumber2VP(60) : convertNumber2VP(92)

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

@@ -23,6 +23,26 @@ import TaroMovableView from './movableView'
 import { TaroRadio, TaroRadioGroup } from './radio'
 import { TaroCheckboxGroup, TaroCheckbox } from './checkbox'
 
+import commonStyleModify from './style'
+import { getButtonColor } from './button'
+import { FlexManager } from './utils/flexManager'
+import { DynamicCenter } from './utils/DynamicCenter'
+import { TOUCH_EVENT_MAP } from './utils/constant/event'
+import { BUTTON_THEME_COLOR } from './utils/constant/style'
+import { getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper'
+
+export {
+  FlexManager,
+  DynamicCenter,
+  getButtonColor,
+  TOUCH_EVENT_MAP,
+  getFontAttributes,
+  commonStyleModify,
+  getNodeThresholds,
+  BUTTON_THEME_COLOR,
+  getNormalAttributes,
+}
+
 export {
   TaroImage,
   TaroCanvas,

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

@@ -36,7 +36,7 @@ class CommonStyleModify implements AttributeModifier<CommonAttribute> {
       setNormalAttributeIntoInstance(instance, this.style, this.node)
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -69,7 +69,7 @@ class RowStyleModify extends CommonStyleModify {
       })
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
@@ -85,29 +85,31 @@ class ColumnStyleModify extends CommonStyleModify {
       })
     }
 
-    setAnimationAttributeIntoInstance(instance, this.overwriteStyle)
+    setAnimationAttributeIntoInstance(instance, this.overwriteStyle, this.style || {})
   }
 }
 
-function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>) {
+function setAnimationAttributeIntoInstance(instance: CommonAttribute, overwriteStyle: Record<string, TaroAny>, style: TaroStyleType) {
   // Animation 需要提前和 @State 变量绑定才能产生动画效果，因此不能做 if else 判断
   instance.translate({
-    x: overwriteStyle.translate?.x,
-    y: overwriteStyle.translate?.y,
-    z: overwriteStyle.translate?.z,
-  }).scale({
-    x: overwriteStyle.scale?.x,
-    y: overwriteStyle.scale?.y,
-    z: overwriteStyle.scale?.z,
-    centerX: overwriteStyle.transformOrigin?.x,
-    centerY: overwriteStyle.transformOrigin?.y,
-  }).rotate({
-    x: overwriteStyle.rotate?.x,
-    y: overwriteStyle.rotate?.y,
-    z: overwriteStyle.rotate?.z,
-    centerX: overwriteStyle.transformOrigin?.x,
-    centerY: overwriteStyle.transformOrigin?.y,
-    angle: overwriteStyle.rotate?.angle,
+    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,
   })
 }
 
@@ -166,7 +168,11 @@ function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroSt
     instance.backgroundColor(style.backgroundColor)
   }
   if (!isUndefined(style.backgroundImage)) {
-    if (style.backgroundImage.colors) {
+    if (style.backgroundImage.center) {
+      // radialGradient
+      instance.radialGradient(style.backgroundImage)
+    } else if (style.backgroundImage.colors) {
+      // linearGradient
       instance.linearGradient(style.backgroundImage)
     } else {
       instance.backgroundImage(style.backgroundImage?.src, style.backgroundRepeat)
@@ -231,34 +237,35 @@ function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroSt
   //   instance.rotate({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y, angle: 0 })
   //   instance.scale({ centerX: style.transformOrigin.x, centerY: style.transformOrigin.y })
   // }
-  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: 0
-      })
-    }
-  }
+  // // Note: 移植到setAnimationAttributeIntoInstance设置
+  // 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: 0
+  //     })
+  //   }
+  // }
   if (style.position === 'absolute' || style.position === 'fixed') {
     instance.position({
       x: style.left || 0,

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

@@ -34,7 +34,7 @@ function textSpecialFontStyle(attr: TaroTextStyleType) {
   .lineHeight(attr.lineHeight)
 }
 
-function getButtonFontSize (node: TaroButtonElement) {
+function getButtonFontSize (node: TaroButtonElement): string | number {
   const isMini = node._attrs.size === 'mini'
 
   return isMini ? convertNumber2VP(26) : convertNumber2VP(36)

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

@@ -106,14 +106,6 @@ export function getNormalAttributes (node: TaroElement, initStyle?: HarmonyStyle
     normalAttributes = ObjectAssign({}, normalAttributes, pseudoStylesheet)
   }
 
-  // taro_page 等写死在运行时里的节点，没有 _nodeInfo
-  if (node._nodeInfo) {
-    const overwriteStyle: TaroStyleType = node._nodeInfo?.overwriteStyle
-    // 处理覆盖属性：如动画的覆盖
-    if (overwriteStyle) {
-      normalAttributes = ObjectAssign({}, normalAttributes, overwriteStyle)
-    }
-  }
   // 初始化默认的值
   if (initStyle) {
     normalAttributes = ObjectAssign({}, initStyle, normalAttributes)

package/dist/index.d.ts

@@ -49,6 +49,7 @@ declare class Harmony extends TaroPlatformHarmony {
     useJSON5: boolean;
     runtimePath: string[] | string;
     taroComponentsPath: string;
+    apiEntryList: RegExp[];
     constructor(ctx: IPluginContext, config: TConfig);
     get framework(): "solid" | "vue3" | "react" | "preact" | "nerv" | "vue";
     get aliasFramework(): string;

package/dist/index.js

@@ -303,6 +303,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         this.useJSON5 = true;
         this.runtimePath = [];
         this.taroComponentsPath = `${PACKAGE_NAME}/dist/components-harmony-ets`;
+        this.apiEntryList = [
+            /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
+        ];
         _Harmony_defineConstants.set(this, {});
         this.extensions = ['.js', '.jsx', '.ts', '.tsx', '.cjs', '.mjs', '.mts', '.vue', '.ets', '.d.ts'];
         this.excludeLibraries = [];
@@ -339,9 +342,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         return path__namespace.resolve(__dirname, './apis');
     }
     get apiEntry() {
-        return [
-            /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
-        ];
+        return this.apiEntryList;
     }
     get componentLibrary() {
         return path__namespace.resolve(__dirname, './components-harmony-ets');
@@ -500,7 +501,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     }
                     return src;
                 });
-                const define = Object.assign({}, this.defineConstants);
+                const define = Object.assign(Object.assign({}, this.defineConstants), { 
+                    // Note: React 开发环境可能调用 stack 可能导致 appWrapper 实例变更
+                    'ReactDebugCurrentFrame.getCurrentStack': 'ReactDebugCurrentFrame.getCurrentStack$' });
                 if ([/(@tarojs[\\/]runtime|taro-runtime)[\\/]dist/].some(e => e.test(lib))) {
                     define.global = 'globalThis';
                 }