@tarojs/plugin-platform-harmony-ets 4.0.0-beta.32 → 4.0.0-beta.34

package/dist/apis/wxml/selectorQuery.ts

@@ -194,22 +194,31 @@ function queryBat (queue, cb) {
 
   arr = []
   traversalDFSDom(element)
-  queue.forEach(item => {
+  queue.forEach((item) => {
     const { selector, single, fields } = item
-    const nodeList = querySelector(selector, !single)
-
-    result.push(nodeList.map(dom => {
+    
+    if (single) {
+      const dom = querySelector(selector, !single)[0]
       // eslint-disable-next-line no-async-promise-executor
-      return new Promise(async resolve => {
+      result.push(new Promise(async resolve => {
         await setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true)
-
         resolve(filter(fields, dom))
-      })
-    }))
+      }))
+    } else {
+      const nodeList = querySelector(selector, !single)
+      result.push(nodeList.map(dom => {
+        // eslint-disable-next-line no-async-promise-executor
+        return new Promise(async resolve => {
+          await setNodeEventCallbackAndTriggerComponentUpdate(dom, AREA_CHANGE_EVENT_NAME, null, true)
+
+          resolve(filter(fields, dom))
+        })
+      }))
+    }
   })
 
   Promise.all(result.map(item => {
-    return Promise.all(item)
+    return item instanceof Array ? Promise.all(item) : item
   })).then(data => {
     cb(data)
   })

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,27 @@ 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 { shouldBindEvent, getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper'
+
+export {
+  FlexManager,
+  DynamicCenter,
+  getButtonColor,
+  TOUCH_EVENT_MAP,
+  shouldBindEvent,
+  getFontAttributes,
+  commonStyleModify,
+  getNodeThresholds,
+  BUTTON_THEME_COLOR,
+  getNormalAttributes,
+}
+
 export {
   TaroImage,
   TaroCanvas,

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

@@ -168,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)
@@ -220,9 +224,6 @@ function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroSt
       bottomRight: style.borderBottomRightRadius
     })
   }
-  if (!isUndefined(style.zIndex)) {
-    instance.zIndex(style.zIndex)
-  }
   if (!isUndefined(style.opacity)) {
     instance.opacity(style.opacity)
   }
@@ -267,12 +268,20 @@ function setNormalAttributeIntoInstance(instance: CommonAttribute, style: TaroSt
       x: style.left || 0,
       y: style.top || 0,
     })
+    // 绝对定位和固定定位在web上都会脱离文档流，因此需要设置zIndex让它相比正常流的元素更上层
+    instance.zIndex(1)
   }
   if (style.position === 'relative') {
     instance.offset({
       x: style.left || 0,
       y: style.top || 0,
     })
+    // 绝对定位和固定定位在web上都会脱离文档流，因此需要设置zIndex让它相比正常流的元素更上层
+    instance.zIndex(1)
+  }
+  if (!isUndefined(style.zIndex)) {
+    // 为了适应position不设置z-index也能高于同层级组件，估且让设置了z-index的会更高一级
+    instance.zIndex(style.zIndex + 1)
   }
 }
 

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helper = require('@tarojs/helper');
 var path = require('node:path');
-var runnerUtils = require('@tarojs/runner-utils');
 var service = require('@tarojs/service');
 var _package = require('@tarojs/service/dist/utils/package');
 var shared = require('@tarojs/shared');
@@ -303,6 +302,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 +341,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 +500,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';
                 }
@@ -637,12 +639,11 @@ declare global {
             }
             function injectLoaderMeta() {
                 return {
-                    name: 'taro:vite-h5-loader-meta',
+                    name: 'taro:vite-loader-meta',
                     buildStart() {
                         return __awaiter(this, void 0, void 0, function* () {
-                            yield this.load({ id: runnerUtils.VITE_COMPILER_LABEL });
-                            const info = this.getModuleInfo(runnerUtils.VITE_COMPILER_LABEL);
-                            const compiler = info === null || info === void 0 ? void 0 : info.meta.viteCompilerContext;
+                            const { getViteHarmonyCompilerContext } = that.ctx.runnerUtils;
+                            const compiler = getViteHarmonyCompilerContext(this);
                             if (compiler) {
                                 switch (that.framework) {
                                     // @ts-ignore