@tarojs/plugin-platform-harmony-ets 4.0.0-beta.12 → 4.0.0-beta.14

package/dist/runtime.js

@@ -1,6 +1,6 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents, mergeReconciler, mergeInternalComponents } from '@tarojs/shared';
 import _display from '@ohos.display';
-import { Current, window, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME } from '@tarojs/runtime';
+import { Current, window, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, getCurrentInstance } from '@tarojs/runtime';
 import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
 import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
@@ -267,33 +267,45 @@ const preloadSkylineView = /* @__PURE__ */ temporarilyNotSupport('preloadSkyline
 const preloadAssets = /* @__PURE__ */ temporarilyNotSupport('preloadAssets');
 
 let display;
+let navigationIndicatorRect;
 let safeArea = null;
-try {
-    display = _display.getDefaultDisplaySync();
-    // @ts-ignore
-    display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} } = {}) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (err === null || err === void 0 ? void 0 : err.code) {
-            console.error('Failed to get cutout info', JSON.stringify(err));
-            return;
+let statusBarHeight;
+let windowRect;
+Current.contextPromise.then((context) => {
+    const win = window.__ohos.getLastWindow(context);
+    win.then(mainWindow => {
+        const topRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_SYSTEM).topRect;
+        navigationIndicatorRect = mainWindow.getWindowAvoidArea(window.__ohos.AvoidAreaType.TYPE_NAVIGATION_INDICATOR).bottomRect;
+        statusBarHeight = topRect.top + topRect.height;
+        windowRect = mainWindow.getWindowProperties().windowRect;
+        try {
+            display = _display.getDefaultDisplaySync();
+            // @ts-ignore
+            display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} } = {}) => {
+                var _a, _b, _c, _d, _e, _f;
+                if (err === null || err === void 0 ? void 0 : err.code) {
+                    console.error('Failed to get cutout info', JSON.stringify(err));
+                    return;
+                }
+                const top = Math.max(...boundingRects.map(rect => rect.top + rect.height), ((_a = waterfallDisplayAreaRects.top) === null || _a === void 0 ? void 0 : _a.top) + ((_b = waterfallDisplayAreaRects.top) === null || _b === void 0 ? void 0 : _b.height), statusBarHeight);
+                const bottom = display.height - Math.min((_c = waterfallDisplayAreaRects.bottom) === null || _c === void 0 ? void 0 : _c.top, navigationIndicatorRect === null || navigationIndicatorRect === void 0 ? void 0 : navigationIndicatorRect.top);
+                const left = ((_d = waterfallDisplayAreaRects.left) === null || _d === void 0 ? void 0 : _d.left) + ((_e = waterfallDisplayAreaRects.left) === null || _e === void 0 ? void 0 : _e.width);
+                const right = display.width - ((_f = waterfallDisplayAreaRects.right) === null || _f === void 0 ? void 0 : _f.left);
+                safeArea = {
+                    top,
+                    bottom,
+                    left,
+                    right,
+                    height: bottom - top,
+                    width: right - left,
+                };
+            });
+        }
+        catch (e) {
+            console.error('Failed to get display', e);
         }
-        const top = Math.max(...boundingRects.map(rect => rect.top * 2 + rect.height), ((_a = waterfallDisplayAreaRects.top) === null || _a === void 0 ? void 0 : _a.top) + ((_b = waterfallDisplayAreaRects.top) === null || _b === void 0 ? void 0 : _b.height));
-        const bottom = (((_c = waterfallDisplayAreaRects.bottom) === null || _c === void 0 ? void 0 : _c.top) + ((_d = waterfallDisplayAreaRects.bottom) === null || _d === void 0 ? void 0 : _d.height)) || display.height;
-        const left = ((_e = waterfallDisplayAreaRects.left) === null || _e === void 0 ? void 0 : _e.left) + ((_f = waterfallDisplayAreaRects.left) === null || _f === void 0 ? void 0 : _f.width);
-        const right = (((_g = waterfallDisplayAreaRects.right) === null || _g === void 0 ? void 0 : _g.left) + ((_h = waterfallDisplayAreaRects.right) === null || _h === void 0 ? void 0 : _h.width)) || display.width;
-        safeArea = {
-            top,
-            bottom,
-            left,
-            right,
-            height: bottom - top,
-            width: right - left,
-        };
     });
-}
-catch (e) {
-    console.error('Failed to get display', e);
-}
+});
 /* 同步版本 */
 const getSystemInfoSync = function () {
     var _a, _b;
@@ -322,12 +334,12 @@ const getSystemInfoSync = function () {
     res.safeArea = safeArea; // 在竖屏正方向下的安全区域 General.SafeAreaResult
     res.screenHeight = display === null || display === void 0 ? void 0 : display.height; // 屏幕高度，单位px number
     res.screenWidth = display === null || display === void 0 ? void 0 : display.width; // 屏幕宽度，单位px number
-    res.statusBarHeight = safeArea === null || safeArea === void 0 ? void 0 : safeArea.top; // 状态栏的高度，单位px number
+    res.statusBarHeight = statusBarHeight; // 状态栏的高度，单位px number
     res.system = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.osFullName; // 操作系统及版本 string
     // Note: 更新配置时才能记录
     res.theme = ((_b = AppStorage.get('__TARO_APP_CONFIG')) === null || _b === void 0 ? void 0 : _b.colorMode) === ConfigurationConstant.ColorMode.COLOR_MODE_DARK ? 'dark' : 'light'; // 系统当前主题，取值为light或dark 'light' | 'dark'
-    res.windowHeight = display === null || display === void 0 ? void 0 : display.height; // 可使用窗口高度，单位px number
-    res.windowWidth = display === null || display === void 0 ? void 0 : display.width; // 可使用窗口宽度，单位px number
+    res.windowHeight = windowRect === null || windowRect === void 0 ? void 0 : windowRect.height; // 可使用窗口高度，单位px number
+    res.windowWidth = windowRect === null || windowRect === void 0 ? void 0 : windowRect.width; // 可使用窗口宽度，单位px number
     res.version = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.displayVersion; // 版本号 string
     return res;
 };
@@ -2006,7 +2018,6 @@ function getEnv() {
 }
 // TODO
 const getCurrentPages = () => [];
-const getCurrentInstance = () => Current;
 const requirePlugin$1 = temporarilyNotSupport('requirePlugin');
 
 // @ts-nocheck
@@ -4774,7 +4785,7 @@ const defaultBaseFontSize = 20;
 const defaultUnitPrecision = 5;
 const defaultTargetUnit = 'vp';
 function getApp$1() {
-    return Current.app;
+    return Current.app || {};
 }
 function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defaultDesignRatio, baseFontSize = defaultBaseFontSize, unitPrecision = defaultUnitPrecision, targetUnit = defaultTargetUnit }) {
     const taro = Current.taro;