@tarojs/plugin-platform-harmony-ets 4.0.0-beta.26 → 4.0.0-beta.28

package/dist/apis/wxml/IntersectionObserver.ts

@@ -30,14 +30,14 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
         this._observerNodes.forEach((n: TaroElement & any) => {
           disconnectEvent(n, VISIBLE_CHANGE_EVENT_NAME)
           // @ts-ignore
-          n._nodeInfo?.thresholds = null
+          n._nodeInfo.thresholds = null
         })
       } else {
         disconnectEvent(this._observerNodes, VISIBLE_CHANGE_EVENT_NAME)
         // @ts-ignore
         if (this._observerNodes._nodeInfo) {
           // @ts-ignore
-          this._observerNodes._nodeInfo?.thresholds = null
+          this._observerNodes._nodeInfo.thresholds = null
         }
       }
     }
@@ -54,7 +54,7 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
       if (node instanceof Array) {
         node.forEach(n => {
           // @ts-ignore
-          n._nodeInfo?.thresholds = thresholds
+          n._nodeInfo.thresholds = thresholds
 
           setNodeEventCallbackAndTriggerComponentUpdate(n, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
             callback(this.handleResult(isVisible, currentRatio, n))
@@ -62,7 +62,7 @@ export class IntersectionObserver implements Taro.IntersectionObserver {
         })
       } else {
         // @ts-ignore
-        node._nodeInfo?.thresholds = thresholds
+        node._nodeInfo.thresholds = thresholds
 
         setNodeEventCallbackAndTriggerComponentUpdate(node, VISIBLE_CHANGE_EVENT_NAME, (isVisible: boolean, currentRatio: number) => {
           callback(this.handleResult(isVisible, currentRatio, node))

package/dist/components-harmony-ets/text.ets

@@ -1,3 +1,4 @@
+import { isString } from '@tarojs/shared'
 import { eventHandler, convertNumber2VP, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, NodeType } from '@tarojs/runtime'
 
 import commonStyleModify from './style'
@@ -39,6 +40,17 @@ function getButtonFontSize (node: TaroButtonElement) {
   return isMini ? convertNumber2VP(26) : convertNumber2VP(36)
 }
 
+function getTextInViewWidth (node: TaroElement | null): TaroAny {
+  if (node) {
+    const hmStyle = node.hmStyle || {}
+    const isFlexView = hmStyle.display === 'flex'
+    const width: TaroAny = getStyleAttr(node, 'width')
+    const isPercentWidth = isString(width) && width.includes('%')
+
+    return isFlexView || isPercentWidth ? null : getStyleAttr(node, 'width')
+  }
+}
+
 @Component
 export default struct TaroText {
   @Builder customBuilder() {}
@@ -65,8 +77,7 @@ export default struct TaroText {
           Text(this.node.textContent)
             .textNormalFontStyle(this.node.parentElement?.hmStyle || {})
             .textSpecialFontStyle(getFontAttributes(this.node.parentElement as TaroElement))
-            .width(getStyleAttr(this.node.parentElement, 'width'))
-            .height(getStyleAttr(this.node.parentElement, 'height'))
+            .width(getTextInViewWidth(this.node.parentElement))
         }
       }
     } else {

package/dist/components-harmony-ets/utils/styles.ets

@@ -27,13 +27,54 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
     }
   }
 
+  const isFlexText = hmStyle.display === 'flex'
+  let textAlign = hmStyle.textAlign
+  let verticalAlign = hmStyle.verticalAlign
+
+  // 按照 w3c 规范，一旦设置了 display: flex，textAlign 和 verticalAlign 都会直接失效
+  // 需要使用 justifyContent 和 alignItems
+  if (isFlexText) {
+    switch (hmStyle.justifyContent) {
+      case FlexAlign.Start:
+        textAlign = TextAlign.Start
+        break
+      case FlexAlign.Center:
+        textAlign = TextAlign.Center
+        break
+      case FlexAlign.End:
+        textAlign = TextAlign.End
+        break
+      case FlexAlign.SpaceBetween:
+      case FlexAlign.SpaceAround:
+        textAlign = TextAlign.JUSTIFY
+        break
+      default:
+        textAlign = TextAlign.Start
+        break
+    }
+    switch (hmStyle.alignItems) {
+      case ItemAlign.Start:
+        verticalAlign = Alignment.Top
+        break
+      case ItemAlign.Center:
+        verticalAlign = Alignment.Center
+        break
+      case ItemAlign.End:
+        verticalAlign = Alignment.End
+        break
+      default:
+        verticalAlign = Alignment.Top
+        break
+    }
+  }
+
   const attributes: TaroAny = {
+    textAlign,
+    verticalAlign,
     WebkitLineClamp: WebkitLineClamp,
     // 已做处理的属性
     letterSpacing: hmStyle.letterSpacing,
-    textAlign: hmStyle.textAlign,
     textOverflow: hmStyle.textOverflow,
-    verticalAlign: hmStyle.verticalAlign,
     lineHeight: lineHeight
   }
 
@@ -44,8 +85,7 @@ export function getFontAttributes (node: TaroElement): TaroTextStyleType {
 export function isMaxWidthView (node: TaroElement) {
   const parentNode: TaroElement = node.parentNode as TaroElement
 
-  return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' &&
-    !(FlexManager.isFlexNode(parentNode) && FlexManager.flexOptions(parentNode).direction !== FlexDirection.Column)
+  return node.tagName === 'VIEW' && parentNode && parentNode.tagName === 'VIEW' && !FlexManager.isFlexNode(parentNode)
 }
 
 export function getNormalAttributes (node: TaroElement): HarmonyStyle {

package/dist/runtime-utils.js

@@ -4009,14 +4009,12 @@ class IntersectionObserver {
         Object.assign(this._options, options);
     }
     disconnect() {
-        var _a;
         if (this._observerNodes && this._component) {
             if (this._observerNodes instanceof Array) {
                 this._observerNodes.forEach((n) => {
-                    var _a;
                     disconnectEvent(n, VISIBLE_CHANGE_EVENT_NAME);
                     // @ts-ignore
-                    (_a = n._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = null;
+                    n._nodeInfo.thresholds = null;
                 });
             }
             else {
@@ -4024,13 +4022,12 @@ class IntersectionObserver {
                 // @ts-ignore
                 if (this._observerNodes._nodeInfo) {
                     // @ts-ignore
-                    (_a = this._observerNodes._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = null;
+                    this._observerNodes._nodeInfo.thresholds = null;
                 }
             }
         }
     }
     observe(targetSelector, callback) {
-        var _a;
         if (!this._component)
             return;
         const { observeAll, thresholds } = this._options;
@@ -4039,9 +4036,8 @@ class IntersectionObserver {
         if (node) {
             if (node instanceof Array) {
                 node.forEach(n => {
-                    var _a;
                     // @ts-ignore
-                    (_a = n._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = thresholds;
+                    n._nodeInfo.thresholds = thresholds;
                     setNodeEventCallbackAndTriggerComponentUpdate(n, VISIBLE_CHANGE_EVENT_NAME, (isVisible, currentRatio) => {
                         callback(this.handleResult(isVisible, currentRatio, n));
                     });
@@ -4049,7 +4045,7 @@ class IntersectionObserver {
             }
             else {
                 // @ts-ignore
-                (_a = node._nodeInfo) === null || _a === void 0 ? void 0 : _a.thresholds = thresholds;
+                node._nodeInfo.thresholds = thresholds;
                 setNodeEventCallbackAndTriggerComponentUpdate(node, VISIBLE_CHANGE_EVENT_NAME, (isVisible, currentRatio) => {
                     callback(this.handleResult(isVisible, currentRatio, node));
                 });