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

package/dist/runtime.js

@@ -32,7 +32,7 @@ import dataPreferences from '@ohos.data.preferences';
 import hilog from '@ohos.hilog';
 import matrix4 from '@ohos.matrix4';
 import prompt from '@ohos.prompt';
-import { pxTransformHelper } from '@tarojs/taro';
+import { pxTransformHelper as pxTransformHelper$1 } from '@tarojs/taro';
 
 class MethodHandler {
     constructor({ name, success, fail, complete }) {
@@ -3880,7 +3880,7 @@ const pageScrollTo = (options) => {
             scroller = getPageScrollerOrNode(scroller, page);
             const { yOffset } = scroller.currentOffset();
             if (areaInfo) {
-                scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper(offsetTop, 'px', true);
+                scrollValue = areaInfo.globalPosition.y + yOffset + pxTransformHelper$1(offsetTop, 'px', true);
             }
         }
         const { xOffset } = scroller.currentOffset();
@@ -4870,19 +4870,60 @@ function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defau
     }
 }
 const display = _display.getDefaultDisplaySync();
-display.width;
+let displayWidth = display.width;
+let ratioCache = false;
+let designWidthFunc;
+let designWidth = defaultDesignWidth;
+let deviceRatio = defaultDesignRatio;
+function getRatio(value) {
+    var _a;
+    // Note: 提前调用 display 可能无法获取正确值
+    if (ratioCache === false || displayWidth !== display.width) {
+        const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
+        if (!isFunction(designWidthFunc)) {
+            designWidthFunc = isFunction(config.designWidth)
+                ? config.designWidth
+                : () => config.designWidth;
+            designWidth = designWidthFunc(value) || defaultDesignWidth;
+            deviceRatio = config.deviceRatio || defaultDesignRatio;
+            if (!(designWidth in deviceRatio)) {
+                throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`);
+            }
+        }
+        displayWidth = display.width;
+        ratioCache = Math.min(display.width, display.height) / designWidth / deviceRatio[designWidth];
+    }
+    return ratioCache;
+}
+// Note: 设置为 style 单位时会自动完成设计稿转换，设计开发者调用 API 时也许抹平差异，例如 pageScrollTo[option.offsetTop]
+function pxTransformHelper(size, unit, isNumber = false) {
+    var _a;
+    const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
+    const targetUnit = unit || config.targetUnit || defaultTargetUnit;
+    if (targetUnit === 'PX') {
+        return px2vp(size * display.scaledDensity) + 'vp';
+    }
+    const ratio = getRatio(size);
+    let val = size * ratio;
+    switch (targetUnit) {
+        case 'vp':
+            // Note: 在应用创建前调用无效
+            val = px2vp(val);
+            break;
+    }
+    return isNumber ? val : val + targetUnit;
+}
 function pxTransform(size) {
     var _a;
     const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};
     const targetUnit = config.targetUnit || defaultTargetUnit;
-    let val = size;
+    const val = size;
     switch (targetUnit) {
         case 'vp':
-            val = px2vp(size);
-            break;
+            return pxTransformHelper(size, 'px');
         // NOTE: 鸿蒙环境下 style 会自动完成设计稿转换，无需在方法内二次调整
     }
-    return val + config.targetUnit;
+    return val + targetUnit;
 }
 function canIUseWebp() {
     return true;