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

package/dist/runtime-ets/dom/stylesheet/covertWeb2Hm.ts

@@ -15,6 +15,7 @@ export const WEB_STYLE_MAP = {
   marginRight: ['_marginRight'],
   marginBottom: ['_marginBottom'],
   marginLeft: ['_marginLeft'],
+  position: ['_position'],
   top: ['_top'],
   left: ['_left'],
   flex: ['_flexGrow', '_flexShrink', '_flexBasis'],
@@ -74,7 +75,8 @@ export const WEB_STYLE_MAP = {
   textDecoration: ['_textDecoration'],
   textOverflow: ['_textOverflow'],
   WebkitLineClamp: ['_WebkitLineClamp'],
-  transform: ['_transform']
+  transform: ['_transform'],
+  display: ['_display']
 }
 
 // 将web端的style转换为hm端的style
@@ -458,6 +460,27 @@ export default function convertWebStyle2HmStyle(webStyle: CSSProperties) {
         hmStyle._transform = parseTransform(value)
         break
       }
+      case 'position': {
+        hmStyle._position = value
+        break
+      }
+      case 'display': {
+        hmStyle._display = value
+        break
+      }
+      case 'zIndex': {
+        hmStyle._zIndex = Number(value)
+        break
+      }
+      case 'opacity': {
+        const val = Number(value)
+        hmStyle._opacity = Number.isNaN(val) ? 1 : val
+        break
+      }
+      case 'overflow': {
+        hmStyle._overflow = value === 'hidden'
+        break
+      }
       default: {
         hmStyle[key] = value
         break
@@ -472,9 +495,9 @@ function setBackgroundImage(hmStyle, value) {
     // 如果包含 url()，则说明是 background-image 属性
     const match = value.match(new RegExp('url\\([\'"]?(.*?)[\'"]?\\)'))
     if (match) {
-      hmStyle._backgroundImage = [{
+      hmStyle._backgroundImage = {
         src: match[1]
-      }]
+      }
     }
   }
 }
@@ -482,10 +505,10 @@ function setBackgroundImage(hmStyle, value) {
 function setBackgroundRepeat(hmStyle, value) {
   if (typeof value === 'string') {
     switch (value) {
-      case 'repeat-x': hmStyle._backgroundRepeat = [ImageRepeat.X]; break
-      case 'repeat-y': hmStyle._backgroundRepeat = [ImageRepeat.Y]; break
-      case 'no-repeat': hmStyle._backgroundRepeat = [ImageRepeat.NoRepeat]; break
-      default: hmStyle._backgroundRepeat = [ImageRepeat.XY]; break
+      case 'repeat-x': hmStyle._backgroundRepeat = ImageRepeat.X; break
+      case 'repeat-y': hmStyle._backgroundRepeat = ImageRepeat.Y; break
+      case 'no-repeat': hmStyle._backgroundRepeat = ImageRepeat.NoRepeat; break
+      default: hmStyle._backgroundRepeat = ImageRepeat.XY; break
     }
   }
 }
@@ -494,9 +517,9 @@ function setBackgroundSize(hmStyle, value) {
   if (typeof value === 'string') {
     const sizes = value.split(' ')
     if (sizes.length === 1) {
-      hmStyle._backgroundSize = [{ width: getUnit(sizes[0]) }]
+      hmStyle._backgroundSize = { width: getUnit(sizes[0]) }
     } else if (sizes.length === 2) {
-      hmStyle._backgroundSize = [{ width: getUnit(sizes[0]), height: getUnit(sizes[1]) }]
+      hmStyle._backgroundSize = { width: getUnit(sizes[0]), height: getUnit(sizes[1]) }
     }
   }
 }
@@ -508,28 +531,28 @@ function setBackgroundPosistion (hmStyle, value) {
     const vertical = positions[1].toLowerCase() || 'top'
 
     if (horizontal === 'left' && vertical === 'top') {
-      hmStyle._backgroundPosition = [Alignment.TopStart]
+      hmStyle._backgroundPosition = Alignment.TopStart
     } else if (horizontal === 'center' && vertical === 'top') {
-      hmStyle._backgroundPosition = [Alignment.Top]
+      hmStyle._backgroundPosition = Alignment.Top
     } else if (horizontal === 'right' && vertical === 'top') {
-      hmStyle._backgroundPosition = [Alignment.TopEnd]
+      hmStyle._backgroundPosition = Alignment.TopEnd
     } else if (horizontal === 'left' && vertical === 'center') {
-      hmStyle._backgroundPosition = [Alignment.Start]
+      hmStyle._backgroundPosition = Alignment.Start
     } else if (horizontal === 'center' && vertical === 'center') {
-      hmStyle._backgroundPosition = [Alignment.Center]
+      hmStyle._backgroundPosition = Alignment.Center
     } else if (horizontal === 'right' && vertical === 'center') {
-      hmStyle._backgroundPosition = [Alignment.End]
+      hmStyle._backgroundPosition = Alignment.End
     } else if (horizontal === 'left' && vertical === 'bottom') {
-      hmStyle._backgroundPosition = [Alignment.BottomStart]
+      hmStyle._backgroundPosition = Alignment.BottomStart
     } else if (horizontal === 'center' && vertical === 'bottom') {
-      hmStyle._backgroundPosition = [Alignment.Bottom]
+      hmStyle._backgroundPosition = Alignment.Bottom
     } else if (horizontal === 'right' && vertical === 'bottom') {
-      hmStyle._backgroundPosition = [Alignment.BottomEnd]
+      hmStyle._backgroundPosition = Alignment.BottomEnd
     } else {
       if (/^\d+(\.\d+)?(px|%|vw|vh)$/.test(horizontal)) {
-        hmStyle._backgroundPosition = [{ x: getUnit(horizontal) }]
+        hmStyle._backgroundPosition = { x: getUnit(horizontal) }
         if (/^\d+(\.\d+)?(px|%|vw|vh)$/.test(vertical)) {
-          hmStyle._backgroundPosition = [{ x: getUnit(horizontal), y: getUnit(vertical) }]
+          hmStyle._backgroundPosition = { x: getUnit(horizontal), y: getUnit(vertical) }
         }
       }
     }

package/dist/runtime-ets/dom/stylesheet/index.ts

@@ -15,7 +15,7 @@ export default class StyleSheet {
     return this.hmStyle.display
   }
 
-  set display (value: string) {
+  set _display (value: string) {
     this.hmStyle.display = value
   }
 
@@ -23,7 +23,7 @@ export default class StyleSheet {
     return this.hmStyle.position
   }
 
-  set position (value: string) {
+  set _position (value: string) {
     this.hmStyle.position = value
   }
 
@@ -245,17 +245,17 @@ export default class StyleSheet {
   }
 
   set _background (value: TaroAny) {
-    const _backgroundImage: HarmonyType.Background.backgroundImage = value?.image?.[0]
+    const _backgroundImage: HarmonyType.Background.backgroundImage = value?.image
     if (_backgroundImage) {
       this.hmStyle.backgroundImage = _backgroundImage.src
       if (_backgroundImage.repeat) {
         this.hmStyle.backgroundRepeat = _backgroundImage.repeat
       }
     }
-    this.hmStyle.backgroundImageSize = value?.size?.[0]
+    this.hmStyle.backgroundImageSize = value?.size
     this.hmStyle.backgroundColor = this.hmStyle.backgroundImage ? null : value?.color
 
-    const _backgroundPosition: HarmonyType.Background.backgroundImagePosition = value?.position?.[0]
+    const _backgroundPosition: HarmonyType.Background.backgroundImagePosition = value?.position
     this.hmStyle.backgroundImagePosition = _backgroundPosition
   }
 
@@ -272,7 +272,7 @@ export default class StyleSheet {
   }
 
   set _backgroundImage (value) {
-    this.hmStyle.backgroundImage = value?.[0]
+    this.hmStyle.backgroundImage = value
   }
 
   get backgroundRepeat () {
@@ -287,7 +287,7 @@ export default class StyleSheet {
   }
 
   set _backgroundRepeat (value: ImageRepeat[]) {
-    this.hmStyle.backgroundRepeat = value?.[0]
+    this.hmStyle.backgroundRepeat = value
   }
 
   get backgroundSize () {
@@ -297,7 +297,7 @@ export default class StyleSheet {
   }
 
   set _backgroundSize (value: HarmonyType.Background.backgroundImageSize[]) {
-    this.hmStyle.backgroundSize = value?.[0]
+    this.hmStyle.backgroundSize = value
   }
 
   get backgroundPosition () {
@@ -322,7 +322,7 @@ export default class StyleSheet {
   }
   
   set _backgroundPosition (value: HarmonyType.Background.backgroundImagePosition[]) {
-    this.hmStyle.backgroundPosition = value?.[0]
+    this.hmStyle.backgroundPosition = value
   }
 
   get border () {
@@ -493,7 +493,7 @@ export default class StyleSheet {
     return Number(this.hmStyle.zIndex)
   }
 
-  set zIndex (value: string) {
+  set _zIndex (value: string) {
     this.hmStyle.zIndex = Number(value)
   }
 
@@ -501,16 +501,15 @@ export default class StyleSheet {
     return this.hmStyle.opacity
   }
 
-  set opacity (value: string) {
-    const val = Number(value)
-    this.hmStyle.opacity = Number.isNaN(val) ? 1 : val
+  set _opacity (value: number) {
+    this.hmStyle.opacity = value
   }
 
   get overflow () {
     return this.hmStyle.overflow ? 'hidden' : 'visible'
   }
 
-  set overflow (value: string) {
+  set _overflow (value: string) {
     this.hmStyle.overflow = value === 'hidden'
   }
 
@@ -658,5 +657,13 @@ export default class StyleSheet {
   set _transformOrigin(value) {
     this.hmStyle.transformOrigin = value
   }
+
+  get content () {
+    return this.hmStyle._content
+  }
+
+  set _content (value) {
+    this.hmStyle.content = value
+  }
 }
 

package/dist/runtime-ets/dom/stylesheet/type.ts

@@ -100,6 +100,7 @@ export interface TaroStyleType {
   zIndex?: number
   overflow?: boolean
   focus?: boolean
+  content?: string
 }
 
 export interface TaroTextStyleType {

package/dist/runtime-framework/react/app.ts

@@ -237,7 +237,11 @@ export function createReactApp (
     }
   } as unknown as AppInstance
 
-  Current.app = app
+  if (Current.app) {
+    Current.app = Object.assign(app, Current.app)
+  } else {
+    Current.app = app
+  }
 
   return app
 }

package/dist/runtime-framework/react/native-page.ts

@@ -80,7 +80,11 @@ function initNativeComponentEntry (params: InitNativeComponentEntryParams) {
 
     componentDidMount () {
       if (isDefaultEntryDom) {
-        Current.app = this
+        if (Current.app) {
+          Current.app = Object.assign(this, Current.app)
+        } else {
+          Current.app = this
+        }
       } else {
         nativeComponentApp = this
       }

package/dist/runtime-framework/react/page.ts

@@ -184,6 +184,7 @@ export function createPageConfig (component: any, pageName?: string, pageConfig?
         safeExecute(this.$taroPath, ON_READY)
         // 通过事件触发子组件的生命周期
         requestAnimationFrame(() => eventCenter.trigger(getOnReadyEventKey(id)))
+        this.onReady.called = true
       })
     },
     [ONSHOW] (options = {}) {

package/dist/runtime-utils.js

@@ -1,6 +1,6 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents } 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;