@tarojs/plugin-platform-harmony-ets 4.0.0-beta.22 → 4.0.0-beta.23

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

@@ -77,10 +77,8 @@ export class TaroNode extends TaroDataSourceElement {
 
   // 更新对应的 ArkUI 组件
   public updateComponent () {
-    if (!this._isCompileMode) return
-
-    // 半编译模式下走 @State 的更新模式
-    if (this._isDynamicNode) {
+    // 非半编译模式或者半编译模式下拥有自主更新权力的节点走 @State 的更新模式
+    if (this._isDynamicNode || !this._isCompileMode) {
       this._updateTrigger++
     } else {
       this.parentNode?.updateComponent()
@@ -128,11 +126,12 @@ export class TaroNode extends TaroDataSourceElement {
   public set textContent (value: string) {
     if (this.nodeType === NodeType.TEXT_NODE) {
       this._textContent = value
-      this.parentNode?.updateComponent()
     } else if (this.nodeType === NodeType.ELEMENT_NODE) {
       const node = new TaroTextNode(value)
       node._doc = this.ownerDocument
-      this.childNodes = [node]
+      node.parentNode = this
+      this.childNodes.length = 0
+      this.childNodes.push(node)
     }
   }
 
@@ -150,7 +149,6 @@ export class TaroNode extends TaroDataSourceElement {
   public set nodeValue (value: string | null) {
     if (this.nodeType === NodeType.TEXT_NODE && value) {
       this.textContent = value
-      this.parentNode?.updateComponent()
     }
   }
 
@@ -163,11 +161,13 @@ export class TaroNode extends TaroDataSourceElement {
   }
 
   // TODO cloneNode()、contains()
-
-  public appendChild (child: TaroNode): TaroNode {
+  public connectParentNode (child: TaroNode) {
     child.parentNode?.removeChild(child)
     child.parentNode = this
+  }
 
+  public appendChild (child: TaroNode): TaroNode {
+    this.connectParentNode(child)
     this.childNodes.push(child)
     this.notifyDataAdd(this.childNodes.length - 1)
 
@@ -175,14 +175,15 @@ export class TaroNode extends TaroDataSourceElement {
     return child
   }
 
-  public insertBefore (newNode: TaroNode, referenceNode: TaroNode | null): TaroNode {
+  public insertBefore (newNode: TaroNode, referenceNode?: TaroNode): TaroNode {
     newNode.parentNode?.removeChild(newNode)
 
-    if (referenceNode === null) {
+    if (!referenceNode) {
       this.appendChild(newNode)
     } else {
       const idxOfRef = this.findIndex(referenceNode)
       this.childNodes.splice(idxOfRef, 0, newNode)
+      this.connectParentNode(newNode)
       // TODO: 优化
       this.notifyDataReload()
     }

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

@@ -2,11 +2,12 @@
 
 import { CSSProperties } from 'react'
 
+import { TaroElement } from '../element/element'
 import { BORDER_STYLE_MAP, capitalizeFirstLetter, FlexManager, getNodeMarginOrPaddingData, getUnit } from './util'
 
-// 将web端的style转换为hm端的style
-export default function convertWebStyle2HmStyle(webStyle: CSSProperties) {
-  const hmStyle: Record<string, any> = {}
+// Note: 将 web 端的 style 转换为 hm 端的 style
+export default function convertWebStyle2HmStyle(webStyle: CSSProperties, node?: TaroElement) {
+  const hmStyle: Record<string, any> = node?._st?.hmStyle || {}
   Object.keys(webStyle).forEach((key) => {
     const value = webStyle[key]
     switch (key) {
@@ -405,7 +406,7 @@ export default function convertWebStyle2HmStyle(webStyle: CSSProperties) {
       }
       case 'WebkitLineClamp': {
         hmStyle.WebkitLineClamp = Number(value)
-        break 
+        break
       }
       case 'transform': {
         // todo: 需要更新

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

@@ -183,7 +183,6 @@ export class BORDER_STYLE_MAP {
       case BorderStyle.Solid: return 'solid'
       default: return ''
     }
-  
   }
 }
 
@@ -191,25 +190,28 @@ export function getNodeMarginOrPaddingData (dataValue: string) {
   let res: any = {}
   if (dataValue) {
     const values = dataValue.toString().trim().split(new RegExp('\\s+'))
+    let val1: string
+    let val2: string
     switch (values.length) {
       case 1:
-        res = { top: values[0], right: values[0], bottom: values[0], left: values[0] }
+        val1 = getUnit(values[0])
+        res = { top: val1, right: val1, bottom: val1, left: val1 }
         break
       case 2:
-        res = { top: values[0], right: values[1], bottom: values[0], left: values[1] }
+        val1 = getUnit(values[0])
+        val2 = getUnit(values[1])
+        res = { top: val1, right: val2, bottom: val1, left: val2 }
         break
       case 3:
-        res = { top: values[0], right: values[1], bottom: values[2], left: values[1] }
+        val2 = getUnit(values[1])
+        res = { top: getUnit(values[0]), right: val2, bottom: getUnit(values[2]), left: val2 }
         break
       case 4:
-        res = { top: values[0], right: values[1], bottom: values[2], left: values[3] }
+        res = { top: getUnit(values[0]), right: getUnit(values[1]), bottom: getUnit(values[2]), left: getUnit(values[3]) }
         break
       default:
         break
     }
-    Object.keys(res).forEach(key => {
-      res[key] = getUnit(res[key]) || 0
-    })
   }
   return res
 }
@@ -225,9 +227,9 @@ export function getUnit (val) {
   }
   if (val) {
     // 匹配vw\vh
-    const exec = val.match(/(\d+)(vw|vh|px)$/)
+    const exec = val.match(/(-?\d*(\.\d+)?)(vw|vh|px)$/)
     if (exec) {
-      const [, num, unit] = exec
+      const [, num, , unit] = exec
       return convertNumber2VP(parseFloat(num), unit)
     }
   }

package/dist/runtime-ets/utils/index.ts

@@ -49,10 +49,20 @@ export function convertNumber2VP (value: number, unit = 'px') {
   return pxTransformHelper(value, 'vp')
 }
 
+export function parseClasses (classNames: string | string[] = []): string[] {
+  if (typeof classNames === 'string') {
+    return classNames.includes(' ') ? classNames.split(' ') : [classNames]
+  } else if (Array.isArray(classNames)) {
+    return classNames // Note: 不考虑支持单个元素传入多个类名的情况，过于损耗性能
+  }
+
+  return []
+}
+
 // 合并静态样式，从样式表里面找到对应的样式
-export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string, style: CSSProperties): CSSProperties {
+export function calcStaticStyle (styleSheet: Record<string, CSSProperties>, classNames: string | string[] = [], style: CSSProperties): CSSProperties {
   const obj: CSSProperties[] = []
-  const classes = typeof classNames === 'string' ? classNames.split(' ') : []
+  const classes = parseClasses(classNames)
   if (classes.length === 1) {
     if (style) {
       return Object.assign({}, styleSheet[classNames], style)
@@ -96,6 +106,10 @@ export function getPageScrollerOrNode (scrollerOrNode: any, page: any) {
   return scrollerOrNode
 }
 
+export function ObjectKeys(obj: object): string[] {
+  return Object.keys(obj)
+}
+
 export function ObjectAssign(...objects) {
   return Object.assign.apply(this, [{}].concat(...objects))
 }

package/dist/runtime-ets/utils/info.ts

@@ -50,7 +50,7 @@ function tapCallbackToNodeAndUpdate (node: TaroElement, eventName: string, callb
     callback && callback(...eventResult)
   }
 
-  if (!node._isDynamicNode || !node._isCompileMode) {
+  if (!node._isDynamicNode && node._isCompileMode) {
     node.updateComponent()
   }
 }

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

@@ -278,6 +278,7 @@ export function createNativePageConfig (Component, pageName: string, react: type
         safeExecute(this.$taroPath, ON_READY)
         // 通过事件触发子组件的生命周期
         requestAnimationFrame(() => eventCenter.trigger(getOnReadyEventKey(id)))
+        this.onReady = {}
         this.onReady.called = true
       })
     },

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 = {}
         this.onReady.called = true
       })
     },

package/dist/runtime-framework/solid/reconciler/props.ts

@@ -108,13 +108,9 @@ interface DangerouslySetInnerHTML {
 export function setProperty (dom: TaroElement, name: string, value: unknown, oldValue?: unknown) {
   name = name === 'className' ? 'class' : name
 
-  if (
-    name === 'key' ||
-    name === 'children' ||
-    name === 'ref'
-  ) {
-    // skip
-  } else if (name === 'style') {
+  if (['key', 'children', 'ref'].includes(name)) return
+
+  if (name === 'style') {
     const style = dom.style
     if (isString(value)) {
       style.cssText = value
@@ -169,7 +165,6 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old
         }
       }
     }
-
   } else if (isEventName(name)) {
     setEvent(dom, name, value, oldValue)
   } else if (name === 'dangerouslySetInnerHTML') {

package/dist/runtime-utils.js

@@ -266,7 +266,7 @@ const preloadWebview = /* @__PURE__ */ temporarilyNotSupport('preloadWebview');
 const preloadSkylineView = /* @__PURE__ */ temporarilyNotSupport('preloadSkylineView');
 const preloadAssets = /* @__PURE__ */ temporarilyNotSupport('preloadAssets');
 
-let display;
+let display$1;
 let navigationIndicatorRect;
 let safeArea = null;
 let statusBarHeight;
@@ -279,18 +279,18 @@ Current.contextPromise.then((context) => {
         statusBarHeight = topRect.top + topRect.height;
         windowRect = mainWindow.getWindowProperties().windowRect;
         try {
-            display = _display.getDefaultDisplaySync();
+            display$1 = _display.getDefaultDisplaySync();
             // @ts-ignore
-            display.getCutoutInfo((err, { boundingRects = [], waterfallDisplayAreaRects = {} } = {}) => {
+            display$1.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 bottom = display$1.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);
+                const right = display$1.width - ((_f = waterfallDisplayAreaRects.right) === null || _f === void 0 ? void 0 : _f.left);
                 safeArea = {
                     top,
                     bottom,
@@ -329,11 +329,11 @@ const getSystemInfoSync = function () {
     res.notificationSoundAuthorized = false; // 通知带有声音的开关（仅 iOS 有效）boolean
     res.phoneCalendarAuthorized = null; // 使用日历的开关 boolean
     res.wifiEnabled = false; // Wi-Fi 的系统开关 boolean
-    res.pixelRatio = display && display.densityPixels; // 设备像素比,number
+    res.pixelRatio = display$1 && display$1.densityPixels; // 设备像素比,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.screenHeight = display$1 === null || display$1 === void 0 ? void 0 : display$1.height; // 屏幕高度，单位px number
+    res.screenWidth = display$1 === null || display$1 === void 0 ? void 0 : display$1.width; // 屏幕宽度，单位px number
     res.statusBarHeight = statusBarHeight; // 状态栏的高度，单位px number
     res.system = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.osFullName; // 操作系统及版本 string
     // Note: 更新配置时才能记录
@@ -3444,7 +3444,7 @@ class Animation {
         return this;
     }
     scale(sx, sy) {
-        this.rule.scale = { x: sx, y: sy };
+        this.rule.scale = { x: sx, y: isUndefined(sy) ? sx : sy };
         return this;
     }
     scale3d(sx, sy, sz) {
@@ -4055,6 +4055,11 @@ class IntersectionObserver {
                 });
             }
         }
+        else {
+            callback({
+                errMsg: 'IntersectionObserver.observe:fail cannot find the node for selector.'
+            });
+        }
     }
     relativeTo() {
         temporarilyNotSupport('relativeTo')();
@@ -4806,7 +4811,8 @@ function initPxTransform({ designWidth = defaultDesignWidth, deviceRatio = defau
         config.unitPrecision = unitPrecision;
     }
 }
-_display.getDefaultDisplaySync();
+const display = _display.getDefaultDisplaySync();
+display.width;
 function pxTransform(size) {
     var _a;
     const config = ((_a = Current.taro) === null || _a === void 0 ? void 0 : _a.config) || {};