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

package/dist/runtime-ets/dom/element/normal.ts

@@ -12,43 +12,48 @@ import type {
   ViewProps
 } from '@tarojs/components/types'
 
+@Observed
 class TaroViewElement extends TaroElement<ViewProps> {
   constructor() {
     super('View')
   }
 }
 
+@Observed
 class TaroImageElement extends TaroElement<ImageProps> {
   constructor() {
     super('Image')
   }
 }
 
+@Observed
 class TaroButtonElement extends TaroElement<ButtonProps> {
   constructor() {
     super('Button')
   }
 }
 
-
+@Observed
 class TaroIconElement extends TaroElement<IconProps>{
   constructor() {
     super('Icon')
   }
 }
-
+@Observed
 class TaroLabelElement extends TaroElement<LabelProps>{
   constructor() {
     super('Label')
   }
 }
 
+@Observed
 class TaroRichTextElement extends TaroElement<RichTextProps>{
   constructor() {
     super('RichText')
   }
 }
 
+@Observed
 class TaroSwiperElement extends TaroElement<SwiperProps>{
   controller: SwiperController = new SwiperController()
 
@@ -57,6 +62,7 @@ class TaroSwiperElement extends TaroElement<SwiperProps>{
   }
 }
 
+@Observed
 class TaroSwiperItemElement extends TaroElement<SwiperItemProps>{
   constructor() {
     super('SwiperItem')

package/dist/runtime-ets/dom/element/progress.ts

@@ -0,0 +1,13 @@
+
+import { TaroElement } from './element'
+
+import type { ProgressProps } from '@tarojs/components/types'
+
+@Observed
+export class TaroProgressElement extends TaroElement<ProgressProps> {
+
+  constructor() {
+    super('Progress')
+
+  }
+}

package/dist/runtime-ets/dom/element/scrollView.ts

@@ -3,6 +3,7 @@ import { TaroElement } from './element'
 
 import type { ScrollViewProps } from '@tarojs/components/types'
 
+@Observed
 export class TaroScrollViewElement extends TaroElement<ScrollViewProps> {
   scroller: Scroller = new Scroller()
 

package/dist/runtime-ets/dom/element/text.ts

@@ -3,6 +3,7 @@ import { TaroElement } from './element'
 
 import type { TextProps } from '@tarojs/components/types'
 
+@Observed
 export class TaroTextElement extends TaroElement<TextProps> {
   constructor() {
     super('Text')

package/dist/runtime-ets/dom/element/video.ts

@@ -2,6 +2,7 @@ import { TaroElement } from './element'
 
 import type { VideoProps } from '@tarojs/components/types'
 
+@Observed
 export class TaroVideoElement extends TaroElement<VideoProps> {
   _currentTime = 0
 

package/dist/runtime-ets/dom/element/webView.ts

@@ -5,6 +5,14 @@ import { TaroElement } from './element'
 
 import type { WebViewProps } from '@tarojs/components/types'
 
+@Observed
+export class TaroInnerHtmlElement extends TaroElement {
+  constructor() {
+    super('InnerHtml')
+  }
+}
+
+@Observed
 export class TaroWebViewElement extends TaroElement<WebViewProps>{
   ports: web_webview.WebMessagePort[] = []
 

package/dist/runtime-ets/dom/node.ts

@@ -63,27 +63,27 @@ export class TaroNode extends TaroDataSourceElement {
     return this.childNodes.findIndex(node => node._nid === refChild._nid)
   }
 
+  public updateTextNode () {
+    // @ts-ignore
+    if (this.childNodes.length <= 0 || this.tagName !== 'VIEW') return
+
+    // TextNode 不具备 props 更新能力，需要由父节点来进行触发
+    this.childNodes.forEach(item => {
+      if (item.nodeType !== NodeType.TEXT_NODE) return
+
+      item._updateTrigger++
+    })
+  }
+
   // 更新对应的 ArkUI 组件
   public updateComponent () {
-    if (!this._isCompileMode && (!this.parentNode || !this.parentNode.listeners?.length)) return
-
-    const idx = this.parentNode.findIndex(this)
+    if (!this._isCompileMode) return
 
-    if (this._isCompileMode) {
-      // 半编译模式下走 @State 的更新模式
-      if (this._isDynamicNode) {
-        this._updateTrigger++
-      } else {
-        this.parentNode.updateComponent()
-      }
+    // 半编译模式下走 @State 的更新模式
+    if (this._isDynamicNode) {
+      this._updateTrigger++
     } else {
-      // 非半编译模式下走 LazyForEach 的更新模式
-      if (idx >= 0) {
-        this._updateTrigger++
-        this.parentNode.notifyDataChange(idx)
-      } else {
-        this.parentNode.notifyDataReload()
-      }
+      this.parentNode.updateComponent()
     }
   }
 
@@ -229,6 +229,7 @@ export class TaroNode extends TaroDataSourceElement {
   }
 }
 
+@Observed
 export class TaroTextNode extends TaroNode {
   constructor(value = '', nodeName = '#text', nodeType: NodeType = NodeType.TEXT_NODE) {
     super(nodeName, nodeType)

package/dist/runtime-utils.js

@@ -2,9 +2,9 @@ import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined,
 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 { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
+import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
 import i18n from '@ohos.i18n';
-import deviceMethod from '@system.device';
 import errorManager from '@ohos.app.ability.errorManager';
 import sensor from '@ohos.sensor';
 import batteryInfo, { BatteryChargeState } from '@ohos.batteryInfo';
@@ -266,16 +266,37 @@ const preloadWebview = /* @__PURE__ */ temporarilyNotSupport('preloadWebview');
 const preloadSkylineView = /* @__PURE__ */ temporarilyNotSupport('preloadSkylineView');
 const preloadAssets = /* @__PURE__ */ temporarilyNotSupport('preloadAssets');
 
-// 设备信息,从 API Version 6 开始支持
-const display = _display.getDefaultDisplaySync();
-let device;
-deviceMethod.getInfo({
-    success: data => {
-        device = data;
-    }
-});
+let display;
+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;
+        }
+        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;
     const res = {};
     res.SDKVersion = deviceInfo && deviceInfo.sdkApiVersion; // 客户端基础库版本 string
     res.albumAuthorized = false; // 允许使用相册的开关（仅 iOS 有效） boolean
@@ -285,7 +306,7 @@ const getSystemInfoSync = function () {
     res.cameraAuthorized = null; // 允许使用摄像头的开关 boolean
     res.enableDebug = null; // 是否已打开调试 boolean
     res.fontSizeSetting = null; // 用户字体大小（单位px） number
-    res.language = i18n && i18n.getSystemLanguage && i18n.getSystemLanguage(); // string
+    res.language = (_a = i18n === null || i18n === void 0 ? void 0 : i18n.getSystemLanguage) === null || _a === void 0 ? void 0 : _a.call(i18n); // string
     res.locationAuthorized = null; // 定位的开关 boolean
     res.locationEnabled = null; // 地理位置的系统开关 boolean
     res.microphoneAuthorized = null; // 麦克风的开关 boolean
@@ -296,17 +317,18 @@ const getSystemInfoSync = function () {
     res.notificationSoundAuthorized = false; // 通知带有声音的开关（仅 iOS 有效）boolean
     res.phoneCalendarAuthorized = null; // 使用日历的开关 boolean
     res.wifiEnabled = false; // Wi-Fi 的系统开关 boolean
-    res.pixelRatio = null; // 设备像素比,number
-    res.platform = 'android'; // 客户端平台 string
-    res.safeArea = null; // 在竖屏正方向下的安全区域 General.SafeAreaResult
-    res.screenHeight = display && display.height; // 屏幕高度，单位px number
-    res.screenWidth = display && display.width; // 屏幕宽度，单位px number
-    res.statusBarHeight = null; // 状态栏的高度，单位px number
-    res.system = deviceInfo && deviceInfo.osFullName; // 操作系统及版本 string
-    res.theme = null; // 系统当前主题，取值为light或dark 'light' | 'dark'
-    res.windowWidth = device && device.windowWidth; // 可使用窗口宽度，单位px number
-    res.windowHeight = device && device.windowHeight; // 可使用窗口高度，单位px number
-    res.version = deviceInfo && deviceInfo.displayVersion; // 版本号 string
+    res.pixelRatio = display && (Math.round(display.xDPI / display.width * 100) / 100); // 设备像素比,number
+    res.platform = 'harmony'; // 客户端平台 string
+    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.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.version = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.displayVersion; // 版本号 string
     return res;
 };
 /* 异步版本 */