@tarojs/plugin-platform-harmony-ets 4.0.0-beta.11 → 4.0.0-beta.110

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

@@ -43,6 +43,8 @@ class TaroEventTarget extends Events {
   }
 
   public dispatchEvent (event: TaroEvent) {
+    // @ts-ignore
+    event.currentTarget = this
     const cancelable = event.cancelable
     const listeners = this.__listeners[event.type]
 
@@ -68,12 +70,10 @@ class TaroEventTarget extends Events {
       }
     }
 
-
     if (event._stop) {
       this._stopPropagation(event)
     }
 
-
     return listeners != null
   }
 
@@ -95,5 +95,4 @@ class TaroEventTarget extends Events {
   }
 }
 
-
 export { TaroEventTarget }

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

@@ -21,8 +21,8 @@ export enum NodeType {
 }
 
 let _id = 0
-function genId (): string {
-  return `_n_${_id++}`
+function genId (): number {
+  return ++_id
 }
 
 export class TaroNode extends TaroDataSourceElement {
@@ -30,8 +30,9 @@ export class TaroNode extends TaroDataSourceElement {
   public readonly nodeType: NodeType
   public childNodes: TaroNode[] = []
   public parentNode: TaroNode | null = null
-  public _nid: string = genId()
+  public _nid: number = genId()
   public _doc: TaroDocument | null = null
+  public _instance?: TaroAny
 
   private _textContent = ''
 
@@ -43,6 +44,9 @@ export class TaroNode extends TaroDataSourceElement {
   // 是否为半编译模板下拥有自主更新权的节点
   public _isDynamicNode = false
 
+  // 以下属性为原生混写组件才有意义的属性
+  public _nativeUpdateTrigger = 0
+
   constructor(nodeName: string, nodeType = NodeType.ELEMENT_NODE) {
     super()
 
@@ -59,8 +63,16 @@ export class TaroNode extends TaroDataSourceElement {
     return this.childNodes[index] as TaroElement
   }
 
-  public findIndex (refChild: TaroNode): number {
-    return this.childNodes.findIndex(node => node._nid === refChild._nid)
+  public getStrNid() {
+    return `n_${this._nid}`;
+  }
+
+  public getNumNid(id) {
+    return +id.slice(2);
+  }
+
+  public findIndex (refChild?: TaroNode): number {
+    return this.childNodes.findIndex(node => node._nid === refChild?._nid)
   }
 
   public updateTextNode () {
@@ -77,17 +89,20 @@ export class TaroNode extends TaroDataSourceElement {
 
   // 更新对应的 ArkUI 组件
   public updateComponent () {
-    if (!this._isCompileMode) return
-
-    // 半编译模式下走 @State 的更新模式
-    if (this._isDynamicNode) {
+    // 非半编译模式或者半编译模式下拥有自主更新权力的节点走 @State 的更新模式
+    if (this._isDynamicNode || (!this._isCompileMode && this._instance)) {
       this._updateTrigger++
     } else {
-      this.parentNode.updateComponent()
+      this.parentNode?.updateComponent()
     }
   }
 
-  public get firstChild (): TaroNode | null{
+  // 提供唯一标识，方便与小程序一致，能根据uid获取到对应的节点
+  public get uid (): string {
+    return this._nid
+  }
+
+  public get firstChild (): TaroNode | null {
     return this.childNodes[0] || null
   }
 
@@ -128,11 +143,15 @@ export class TaroNode extends TaroDataSourceElement {
   public set textContent (value: string) {
     if (this.nodeType === NodeType.TEXT_NODE) {
       this._textContent = value
-      this.parentNode?.updateComponent()
+      if (!this._instance) {
+        this.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 +169,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,28 +181,37 @@ 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)
 
+    // @ts-ignore
+    child.toggleLayer?.(true)
+
     checkIsCompileModeAndInstallAfterDOMAction(child, this)
     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()
+
+      // @ts-ignore
+      newNode.toggleLayer?.(true)
     }
 
     checkIsCompileModeAndInstallAfterDOMAction(newNode, this)
@@ -203,6 +230,7 @@ export class TaroNode extends TaroDataSourceElement {
     oldChild.dispose()
     this.notifyDataChange(idxOfRef)
 
+    checkIsCompileModeAndUninstallAfterDOMAction(oldChild)
     checkIsCompileModeAndInstallAfterDOMAction(newChild, this)
 
     return oldChild
@@ -224,6 +252,10 @@ export class TaroNode extends TaroDataSourceElement {
   }
 
   public dispose () {
+    // 渲染，层级大于0的节点需要让其回到正常层级，然后删掉
+    // @ts-ignore
+    this.toggleLayer?.(false)
+
     this.parentNode = null
     this.childNodes = []
   }
@@ -253,7 +285,7 @@ function checkIsCompileModeAndInstallAfterDOMAction (node: TaroNode, parentNode:
 }
 
 function checkIsCompileModeAndUninstallAfterDOMAction (node: TaroNode) {
-  if (!node._isCompileMode || !parentNode._instance) return
+  if (!node._isCompileMode || !node?._instance) return
 
   node._instance.dynamicCenter?.uninstall?.(node)
 }