@tarojs/plugin-platform-harmony-ets 4.0.0-beta.27 → 4.0.0-beta.29

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/button.ets

@@ -109,12 +109,14 @@ export default struct TaroButton {
   build() {
     if (this.node?.hmStyle?.display !== 'none') {
       Button({ stateEffect: !this.node._attrs.disabled }) {
-        Row() {
-          if (this.node._attrs.loading) {
+        if (this.node._attrs.loading) {
+          Row() {
             LoadingProgress()
               .width(20).height(20)
               .color(getThemeAttributes(this.node).color)
+            this.createLazyChildren(this.node)
           }
+        } else {
           this.createLazyChildren(this.node)
         }
       }

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

@@ -35,6 +35,7 @@ class TaroDocument extends TaroNode {
       case 'div': tagName = 'view'; break
       case 'p': tagName = 'text'; break
       case 'span': tagName = 'text'; break
+      case 'a': tagName = 'text'; break
     }
     // @ts-ignore
     if (Current?.createHarmonyElement) {

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

@@ -188,7 +188,7 @@ export class TaroElement<
     return this._style
   }
 
-  // 伪类，不存在style动态设置，均已被转换为鸿蒙样式
+  // 伪元素，不存在style动态设置，均已被转换为鸿蒙样式
   // 可根据实际情况，迁移到具体的组件中，如View、ScrollView中，Text\Image其实是不需要的
   public _pseudo_before: StyleSheet | null = null
 
@@ -219,4 +219,22 @@ export class TaroElement<
       this._pseudo_after = null
     }
   }
+  
+  // 伪类，在获取的时候根据dom和parent的关系，动态设置
+  public _pseudo_class: Record<string, StyleSheet | null> = {
+    // ["::first-child"]: new StyleSheet(),
+  }
+
+  public set_pseudo_class(name: string, value: HarmonyStyle | null) {
+    if (value) {
+      if (!this._pseudo_class[name]) {
+        this._pseudo_class[name] = new StyleSheet()
+      }
+      Object.keys(value).forEach(key => {
+        this._pseudo_class[name]!.hmStyle[key] = value[key]
+      })
+    } else {
+      this._pseudo_class[name] = null
+    }
+  }
 }

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

@@ -38,25 +38,6 @@ export function convertNumber2PX (value: number) {
   return pxTransformHelper(value, 'vp')
 }
 
-// 全局的变量内容
-export const globalCss = {
-  map: {}
-}
-
-// Css变量的var方法
-export function __var_fn(value: string | (() => string), ...rest: any[]) {
-  if (typeof value === 'function') {
-    const res = value()
-    return typeof res !== 'undefined' ? res : (rest && (rest instanceof Array ? __var_fn.apply(null, rest) : __var_fn(rest)))
-  }
-  return typeof value !== 'undefined' ? value: (rest && (rest instanceof Array ? __var_fn.apply(null, rest) : __var_fn(rest)))
-}
-
-// Css变量的var方法，延迟获取变量
-export function __lazy_var_fn(fn, ...rest: any[]) {
-  return () => (fn() || __var_fn.apply(null, rest))
-}
-
 export function convertNumber2VP (value: number, unit = 'px') {
   if (unit === 'vw' || unit === 'vh') {
     return (value / 100 * (unit === 'vw' ? display.width: display.height)) + 'px'

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));
                 });