@tarojs/plugin-platform-harmony-ets 4.0.0-canary.8 → 4.0.0

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

@@ -2,13 +2,14 @@ import { TaroElement } from './element'
 
 import type { VideoProps } from '@tarojs/components/types'
 
+@Observed
 export class TaroVideoElement extends TaroElement<VideoProps> {
-  _currentTime = 0
-
   controller: VideoController = new VideoController()
 
   constructor() {
     super('Video')
+
+    this._nodeInfo._currentTime = 0
   }
 
   async play() {
@@ -39,11 +40,11 @@ export class TaroVideoElement extends TaroElement<VideoProps> {
   }
 
   get currentTime() {
-    return this._currentTime
+    return this._nodeInfo._currentTime
   }
 
   set currentTime(val: number) {
-    this._currentTime = val
+    this._nodeInfo._currentTime = val
     this.controller.setCurrentTime(val)
   }
 }

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

@@ -5,13 +5,21 @@ import { TaroElement } from './element'
 
 import type { WebViewProps } from '@tarojs/components/types'
 
-export class TaroWebViewElement extends TaroElement<WebViewProps>{
+@Observed
+export class TaroInnerHtmlElement extends TaroElement {
+  constructor() {
+    super('InnerHtml')
+  }
+}
+
+@Observed
+export class TaroWebViewElement extends TaroElement<WebViewProps> {
   ports: web_webview.WebMessagePort[] = []
 
   nativePort: web_webview.WebMessagePort | null = null
 
   message: web_webview.WebMessageExt = new web_webview.WebMessageExt()
-  
+
   controller: web_webview.WebviewController = new web_webview.WebviewController()
 
   constructor() {
@@ -51,10 +59,9 @@ export class TaroWebViewElement extends TaroElement<WebViewProps>{
           return null
         }
       }
-    }
-    catch (error) {
+    } catch (error) {
       const e: business_error.BusinessError = error as business_error.BusinessError
-      
+
       console.error(`ErrorCode: ${e.code},  Message: ${e.message}`)
     }
   }

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

@@ -55,7 +55,6 @@ export class TaroEvent<T = any> {
   }
 }
 
-
 export function createEvent (event: TaroEvent | string, type?: string, node?: TaroElement) {
   if (typeof event === 'string') {
     // For Vue3 using document.createEvent
@@ -87,7 +86,6 @@ function stopOrTriggerPropagation (event: TaroEvent, node: TaroElement) {
 
   // eslint-disable-next-line no-unmodified-loop-condition
   while ((target = target.parentNode as TaroElement)) {
-    event.currentTarget = target
     const listeners = target.__listeners[event.type]
 
     if (!Array.isArray(listeners) || target._attrs?.disabled) {
@@ -111,7 +109,7 @@ const BUBBLE_EVENTS = new Set([
   'longTap',
   'change',
   'submit',
-  'submit-btn', 
+  'submit-btn',
   'reset-btn'
 ])
 
@@ -123,7 +121,7 @@ function collectBatchFunction (type: string, dispatch: () => void) {
   }
 }
 
-export function eventHandler (event, type: string, node: TaroElement) {
+export function eventHandler (event, type: string, node: TaroElement): void {
   if (!node) return
 
   const isBatchUpdates = hooks.isExist('batchedEventUpdates')
@@ -144,7 +142,7 @@ export function eventHandler (event, type: string, node: TaroElement) {
 
     // hooks.call('dispatchTaroEventFinish', e, node)
   }
-  
+
   dispatch()
   if (isBatchUpdates) {
     // collectBatchFunction(type, dispatch)

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,35 +63,46 @@ 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}`
   }
 
-  // 更新对应的 ArkUI 组件
-  public updateComponent () {
-    if (!this._isCompileMode && (!this.parentNode || !this.parentNode.listeners?.length)) return
+  public getNumNid(id) {
+    return +id.slice(2)
+  }
 
-    const idx = this.parentNode.findIndex(this)
+  public findIndex (refChild?: TaroNode): number {
+    return this.childNodes.findIndex(node => node._nid === refChild?._nid)
+  }
 
-    if (this._isCompileMode) {
-      // 半编译模式下走 @State 的更新模式
-      if (this._isDynamicNode) {
-        this._updateTrigger++
-      } else {
-        this.parentNode.updateComponent()
-      }
+  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 () {
+    // 非半编译模式或者半编译模式下拥有自主更新权力的节点走 @State 的更新模式
+    if (this._isDynamicNode || (!this._isCompileMode && this._instance)) {
+      this._updateTrigger++
     } else {
-      // 非半编译模式下走 LazyForEach 的更新模式
-      if (idx >= 0) {
-        this._updateTrigger++
-        this.parentNode.notifyDataChange(idx)
-      } else {
-        this.parentNode.notifyDataReload()
-      }
+      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,11 +252,16 @@ export class TaroNode extends TaroDataSourceElement {
   }
 
   public dispose () {
+    // 渲染，层级大于0的节点需要让其回到正常层级，然后删掉
+    // @ts-ignore
+    this.toggleLayer?.(false)
+
     this.parentNode = null
     this.childNodes = []
   }
 }
 
+@Observed
 export class TaroTextNode extends TaroNode {
   constructor(value = '', nodeName = '#text', nodeType: NodeType = NodeType.TEXT_NODE) {
     super(nodeName, nodeType)
@@ -252,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)
 }