From f9609e23b96404346c7b5ab549c2590d66a18c5a Mon Sep 17 00:00:00 2001
From: leizhenyu5 <leizhenyu5@jd.com>
Date: Mon, 25 Sep 2023 17:01:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20plugin-html=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8A=8Adiv=E8=BD=AC=E6=8D=A2=E6=88=90static-view=E6=88=96pure?=
 =?UTF-8?q?-view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/runtime-hooks.ts     |  2 +-
 packages/taro-plugin-html/src/runtime.ts |  4 ++--
 packages/taro-plugin-html/src/utils.ts   | 15 +++++++++++++--
 packages/taro-runtime/src/hydrate.ts     |  2 +-
 packages/taro-runtime/src/index.ts       |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/shared/src/runtime-hooks.ts b/packages/shared/src/runtime-hooks.ts
index 0a6fcd613756..618b60c3889e 100644
--- a/packages/shared/src/runtime-hooks.ts
+++ b/packages/shared/src/runtime-hooks.ts
@@ -209,7 +209,7 @@ type ITaroHooks = {
    * @todo: multi
    * 修改 Taro DOM 序列化数据
    **/
-  modifyHydrateData:(data: Record<string, any>) => void
+  modifyHydrateData:(data: Record<string, any>, node) => void
   /**
     * @todo: multi
     * 修改 Taro DOM 序列化数据
diff --git a/packages/taro-plugin-html/src/runtime.ts b/packages/taro-plugin-html/src/runtime.ts
index 56bcbf53d66f..23616f78cdfa 100644
--- a/packages/taro-plugin-html/src/runtime.ts
+++ b/packages/taro-plugin-html/src/runtime.ts
@@ -11,14 +11,14 @@ import {
   mapNameByContion
 } from './utils'
 
-hooks.tap('modifyHydrateData', data => {
+hooks.tap('modifyHydrateData', (data, node) => {
   const nodeName = data[Shortcuts.NodeName]
   if (!isHtmlTags(nodeName)) return
 
   process.env.NODE_ENV !== 'production' && warn(data[Shortcuts.NodeName] === 'select', '请使用 Picker 组件代替 <select>')
 
   // map nodeName
-  data[Shortcuts.NodeName] = getMappedType(nodeName, data)
+  data[Shortcuts.NodeName] = getMappedType(nodeName, data, node)
 
   // map attr Key/Value
   const attrMapFn = getAttrMapFn(nodeName)
diff --git a/packages/taro-plugin-html/src/utils.ts b/packages/taro-plugin-html/src/utils.ts
index ad287ada2af6..5fa1dab17dfb 100644
--- a/packages/taro-plugin-html/src/utils.ts
+++ b/packages/taro-plugin-html/src/utils.ts
@@ -1,3 +1,4 @@
+import { isHasExtractProp, TaroElement } from '@tarojs/runtime'
 import { isFunction, isString, Shortcuts } from '@tarojs/shared'
 
 import {
@@ -7,6 +8,12 @@ import {
   SpecialMaps
 } from './constant'
 
+export function isAnyEventBinded (node: TaroElement): boolean {
+  const handlers = node.__handlers
+  const isAnyEventBinded = Object.keys(handlers).find(key => handlers[key].length)
+  return Boolean(isAnyEventBinded)
+}
+
 export function isHtmlTags (nodeName: string): boolean {
   if (inlineElements.has(nodeName) || blockElements.has(nodeName) || specialElements.has(nodeName)) {
     return true
@@ -14,7 +21,7 @@ export function isHtmlTags (nodeName: string): boolean {
   return false
 }
 
-export function getMappedType (nodeName: string, rawProps: Record<string, any>): string {
+export function getMappedType (nodeName: string, rawProps: Record<string, any>, node?: TaroElement): string {
   if (inlineElements.has(nodeName)) {
     return 'text'
   } else if (specialElements.has(nodeName)) {
@@ -24,8 +31,12 @@ export function getMappedType (nodeName: string, rawProps: Record<string, any>):
     }
     const { mapName } = mapping
     return isFunction(mapName) ? mapName(rawProps) : mapName
-  } else {
+  } else if (!node || isAnyEventBinded(node)) {
     return 'view'
+  } else if (isHasExtractProp(node)) {
+    return 'static-view'
+  } else {
+    return 'pure-view'
   }
 }
 
diff --git a/packages/taro-runtime/src/hydrate.ts b/packages/taro-runtime/src/hydrate.ts
index 1fd26a56e9cf..4e8564e5f707 100644
--- a/packages/taro-runtime/src/hydrate.ts
+++ b/packages/taro-runtime/src/hydrate.ts
@@ -97,7 +97,7 @@ export function hydrate (node: TaroElement | TaroText): MiniData {
     data[Shortcuts.Style] = cssText
   }
 
-  hooks.call('modifyHydrateData', data)
+  hooks.call('modifyHydrateData', data, node)
 
   const nn = data[Shortcuts.NodeName]
   const componentAlias = componentsAlias[nn]
diff --git a/packages/taro-runtime/src/index.ts b/packages/taro-runtime/src/index.ts
index 12d92dfe55fc..66a71243caf2 100644
--- a/packages/taro-runtime/src/index.ts
+++ b/packages/taro-runtime/src/index.ts
@@ -49,7 +49,7 @@ export * from './emitter/emitter'
 export { hydrate } from './hydrate'
 export { nextTick } from './next-tick'
 export { options } from './options'
-export { incrementId } from './utils'
+export { incrementId, isHasExtractProp } from './utils'
 // typings
 export * from './dsl/instance'
 export * from './interface'

From ee1ccd96cb4a86324b454a0aac0639bd00bdb91e Mon Sep 17 00:00:00 2001
From: leizhenyu5 <leizhenyu5@jd.com>
Date: Tue, 17 Oct 2023 17:47:13 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E8=8A=82=E7=82=B9=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E6=94=AF=E6=8C=81html=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/runtime-hooks.ts     |  4 +++-
 packages/taro-plugin-html/src/index.ts   |  4 ++--
 packages/taro-runtime/src/dom/element.ts | 17 +++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/shared/src/runtime-hooks.ts b/packages/shared/src/runtime-hooks.ts
index 618b60c3889e..6fc0b6dc2eab 100644
--- a/packages/shared/src/runtime-hooks.ts
+++ b/packages/shared/src/runtime-hooks.ts
@@ -1,3 +1,5 @@
+import { TaroElement, TaroText } from '@tarojs/runtime'
+
 import { Events } from './event-emitter'
 import { isFunction } from './is'
 
@@ -209,7 +211,7 @@ type ITaroHooks = {
    * @todo: multi
    * 修改 Taro DOM 序列化数据
    **/
-  modifyHydrateData:(data: Record<string, any>, node) => void
+  modifyHydrateData:(data: Record<string, any>, node: TaroElement | TaroText) => void
   /**
     * @todo: multi
     * 修改 Taro DOM 序列化数据
diff --git a/packages/taro-plugin-html/src/index.ts b/packages/taro-plugin-html/src/index.ts
index 9edde38b8c72..0ca687e48133 100644
--- a/packages/taro-plugin-html/src/index.ts
+++ b/packages/taro-plugin-html/src/index.ts
@@ -20,8 +20,8 @@ interface OnParseCreateElementArgs {
 }
 
 export default (ctx: IPluginContext, options: IOptions) => {
-  const inlineElements = ['i', 'abbr', 'select', 'acronym', 'small', 'bdi', 'kbd', 'strong', 'big', 'sub', 'sup', 'br', 'mark', 'meter', 'template', 'cite', 'object', 'time', 'code', 'output', 'u', 'data', 'picture', 'tt', 'datalist', 'var', 'dfn', 'del', 'q', 'em', 's', 'embed', 'samp', 'b']
-  const blockElements = ['body', 'svg', 'address', 'fieldset', 'li', 'span', 'article', 'figcaption', 'main', 'aside', 'figure', 'nav', 'blockquote', 'footer', 'ol', 'details', 'p', 'dialog', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'dd', 'header', 'section', 'div', 'hgroup', 'table', 'dl', 'hr', 'ul', 'dt', 'view', 'view-block']
+  const inlineElements = ['span', 'i', 'abbr', 'select', 'acronym', 'small', 'bdi', 'kbd', 'strong', 'big', 'sub', 'sup', 'br', 'mark', 'meter', 'template', 'cite', 'object', 'time', 'code', 'output', 'u', 'data', 'picture', 'tt', 'datalist', 'var', 'dfn', 'del', 'q', 'em', 's', 'embed', 'samp', 'b']
+  const blockElements = ['body', 'svg', 'address', 'fieldset', 'li', 'article', 'figcaption', 'main', 'aside', 'figure', 'nav', 'blockquote', 'footer', 'ol', 'details', 'p', 'dialog', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'dd', 'header', 'section', 'div', 'hgroup', 'table', 'dl', 'hr', 'ul', 'dt', 'view', 'view-block']
   const specialElements = ['slot', 'form', 'iframe', 'img', 'audio', 'video', 'canvas', 'a', 'input', 'label', 'textarea', 'progress', 'button']
 
   patchMappingElements(ctx, options, inlineElements, blockElements)
diff --git a/packages/taro-runtime/src/dom/element.ts b/packages/taro-runtime/src/dom/element.ts
index 0d88b8a04f67..ef8bcb1d9b1c 100644
--- a/packages/taro-runtime/src/dom/element.ts
+++ b/packages/taro-runtime/src/dom/element.ts
@@ -13,6 +13,7 @@ import {
   STYLE,
   VIEW
 } from '../constants'
+import { isBlockElements } from '../dom-external/inner-html/tags'
 import { MutationObserver, MutationRecordType } from '../dom-external/mutation-observer'
 import { extend, getComponentsAlias, isElement, isHasExtractProp, shortcutAttr } from '../utils'
 import { ClassList } from './class-list'
@@ -138,7 +139,7 @@ export class TaroElement extends TaroNode {
       `元素 ${this.nodeName} 的 ${qualifiedName} 属性值数据量过大，可能会影响渲染性能。考虑降低图片转为 base64 的阈值或在 CSS 中使用 base64。`
     )
 
-    const isPureView = this.nodeName === VIEW && !isHasExtractProp(this) && !this.isAnyEventBinded()
+    const isPureView = (this.nodeName === VIEW || isBlockElements(this.nodeName)) && !isHasExtractProp(this) && !this.isAnyEventBinded()
 
     if (qualifiedName !== STYLE) {
       MutationObserver.record({
@@ -202,7 +203,7 @@ export class TaroElement extends TaroNode {
 
     this.enqueueUpdate(payload)
 
-    if (this.nodeName === VIEW) {
+    if (this.nodeName === VIEW || isBlockElements(this.nodeName)) {
       if (qualifiedNameInCamelCase === CATCHMOVE) {
         // catchMove = true: catch-view
         // catchMove = false: view or static-view
@@ -223,7 +224,7 @@ export class TaroElement extends TaroNode {
   }
 
   public removeAttribute (qualifiedName: string) {
-    const isStaticView = this.nodeName === VIEW && isHasExtractProp(this) && !this.isAnyEventBinded()
+    const isStaticView = (this.nodeName === VIEW || isBlockElements(this.nodeName)) && isHasExtractProp(this) && !this.isAnyEventBinded()
 
     MutationObserver.record({
       target: this,
@@ -273,7 +274,7 @@ export class TaroElement extends TaroNode {
 
     this.enqueueUpdate(payload)
 
-    if (this.nodeName === VIEW) {
+    if (this.nodeName === VIEW || isBlockElements(this.nodeName)) {
       if (qualifiedNameInCamelCase === CATCHMOVE) {
         // catch-view => view or static-view or pure-view
         this.enqueueUpdate({
@@ -360,9 +361,9 @@ export class TaroElement extends TaroNode {
       delete options.sideEffect
     }
 
-    if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
+    if (sideEffect !== false && !this.isAnyEventBinded() && (SPECIAL_NODES.indexOf(name) > -1 || isBlockElements(name))) {
       const componentsAlias = getComponentsAlias()
-      const alias = componentsAlias[name]._num
+      const alias = isBlockElements(name) ? componentsAlias[VIEW]._num : componentsAlias[name]._num
       this.enqueueUpdate({
         path: `${this._path}.${Shortcuts.NodeName}`,
         value: alias
@@ -378,9 +379,9 @@ export class TaroElement extends TaroNode {
     const name = this.nodeName
     const SPECIAL_NODES = hooks.call('getSpecialNodes')!
 
-    if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
+    if (sideEffect !== false && !this.isAnyEventBinded() && (SPECIAL_NODES.indexOf(name) > -1 || isBlockElements(name))) {
       const componentsAlias = getComponentsAlias()
-      const value = isHasExtractProp(this) ? `static-${name}` : `pure-${name}`
+      const value = isBlockElements(name) ? (isHasExtractProp(this) ? STATIC_VIEW : PURE_VIEW) : (isHasExtractProp(this) ? `static-${name}` : `pure-${name}`)
       const valueAlias = componentsAlias[value]._num
       this.enqueueUpdate({
         path: `${this._path}.${Shortcuts.NodeName}`,

From 7925126fdd75eac9bd58ff4b58302d654c7682c9 Mon Sep 17 00:00:00 2001
From: leizhenyu5 <leizhenyu5@jd.com>
Date: Tue, 17 Oct 2023 18:05:44 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=E8=8A=82=E7=82=B9=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E6=94=AF=E6=8C=81html=E6=A0=87=E7=AD=BE,=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-runtime/src/dom/element.ts | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/taro-runtime/src/dom/element.ts b/packages/taro-runtime/src/dom/element.ts
index ef8bcb1d9b1c..8a6e49a875d9 100644
--- a/packages/taro-runtime/src/dom/element.ts
+++ b/packages/taro-runtime/src/dom/element.ts
@@ -139,7 +139,9 @@ export class TaroElement extends TaroNode {
       `元素 ${this.nodeName} 的 ${qualifiedName} 属性值数据量过大，可能会影响渲染性能。考虑降低图片转为 base64 的阈值或在 CSS 中使用 base64。`
     )
 
-    const isPureView = (this.nodeName === VIEW || isBlockElements(this.nodeName)) && !isHasExtractProp(this) && !this.isAnyEventBinded()
+    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
+
+    const isPureView = name === VIEW && !isHasExtractProp(this) && !this.isAnyEventBinded()
 
     if (qualifiedName !== STYLE) {
       MutationObserver.record({
@@ -203,7 +205,7 @@ export class TaroElement extends TaroNode {
 
     this.enqueueUpdate(payload)
 
-    if (this.nodeName === VIEW || isBlockElements(this.nodeName)) {
+    if (name === VIEW) {
       if (qualifiedNameInCamelCase === CATCHMOVE) {
         // catchMove = true: catch-view
         // catchMove = false: view or static-view
@@ -224,7 +226,8 @@ export class TaroElement extends TaroNode {
   }
 
   public removeAttribute (qualifiedName: string) {
-    const isStaticView = (this.nodeName === VIEW || isBlockElements(this.nodeName)) && isHasExtractProp(this) && !this.isAnyEventBinded()
+    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
+    const isStaticView = name === VIEW && isHasExtractProp(this) && !this.isAnyEventBinded()
 
     MutationObserver.record({
       target: this,
@@ -274,7 +277,7 @@ export class TaroElement extends TaroNode {
 
     this.enqueueUpdate(payload)
 
-    if (this.nodeName === VIEW || isBlockElements(this.nodeName)) {
+    if (name === VIEW) {
       if (qualifiedNameInCamelCase === CATCHMOVE) {
         // catch-view => view or static-view or pure-view
         this.enqueueUpdate({
@@ -352,7 +355,7 @@ export class TaroElement extends TaroNode {
   }
 
   public addEventListener (type, handler, options) {
-    const name = this.nodeName
+    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
     const SPECIAL_NODES = hooks.call('getSpecialNodes')!
 
     let sideEffect = true
@@ -361,9 +364,9 @@ export class TaroElement extends TaroNode {
       delete options.sideEffect
     }
 
-    if (sideEffect !== false && !this.isAnyEventBinded() && (SPECIAL_NODES.indexOf(name) > -1 || isBlockElements(name))) {
+    if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
       const componentsAlias = getComponentsAlias()
-      const alias = isBlockElements(name) ? componentsAlias[VIEW]._num : componentsAlias[name]._num
+      const alias = componentsAlias[name]._num
       this.enqueueUpdate({
         path: `${this._path}.${Shortcuts.NodeName}`,
         value: alias
@@ -376,12 +379,12 @@ export class TaroElement extends TaroNode {
   public removeEventListener (type, handler, sideEffect = true) {
     super.removeEventListener(type, handler)
 
-    const name = this.nodeName
+    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
     const SPECIAL_NODES = hooks.call('getSpecialNodes')!
 
-    if (sideEffect !== false && !this.isAnyEventBinded() && (SPECIAL_NODES.indexOf(name) > -1 || isBlockElements(name))) {
+    if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
       const componentsAlias = getComponentsAlias()
-      const value = isBlockElements(name) ? (isHasExtractProp(this) ? STATIC_VIEW : PURE_VIEW) : (isHasExtractProp(this) ? `static-${name}` : `pure-${name}`)
+      const value = isHasExtractProp(this) ? `static-${name}` : `pure-${name}`
       const valueAlias = componentsAlias[value]._num
       this.enqueueUpdate({
         path: `${this._path}.${Shortcuts.NodeName}`,

From 015e6f9c61b549e197994415d9026aab536285c5 Mon Sep 17 00:00:00 2001
From: leizhenyu5 <leizhenyu5@jd.com>
Date: Tue, 17 Oct 2023 20:29:33 +0800
Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E5=9D=97=E7=BA=A7=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-plugin-html/src/index.ts   | 4 ++--
 packages/taro-runtime/src/dom/element.ts | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/taro-plugin-html/src/index.ts b/packages/taro-plugin-html/src/index.ts
index 0ca687e48133..9edde38b8c72 100644
--- a/packages/taro-plugin-html/src/index.ts
+++ b/packages/taro-plugin-html/src/index.ts
@@ -20,8 +20,8 @@ interface OnParseCreateElementArgs {
 }
 
 export default (ctx: IPluginContext, options: IOptions) => {
-  const inlineElements = ['span', 'i', 'abbr', 'select', 'acronym', 'small', 'bdi', 'kbd', 'strong', 'big', 'sub', 'sup', 'br', 'mark', 'meter', 'template', 'cite', 'object', 'time', 'code', 'output', 'u', 'data', 'picture', 'tt', 'datalist', 'var', 'dfn', 'del', 'q', 'em', 's', 'embed', 'samp', 'b']
-  const blockElements = ['body', 'svg', 'address', 'fieldset', 'li', 'article', 'figcaption', 'main', 'aside', 'figure', 'nav', 'blockquote', 'footer', 'ol', 'details', 'p', 'dialog', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'dd', 'header', 'section', 'div', 'hgroup', 'table', 'dl', 'hr', 'ul', 'dt', 'view', 'view-block']
+  const inlineElements = ['i', 'abbr', 'select', 'acronym', 'small', 'bdi', 'kbd', 'strong', 'big', 'sub', 'sup', 'br', 'mark', 'meter', 'template', 'cite', 'object', 'time', 'code', 'output', 'u', 'data', 'picture', 'tt', 'datalist', 'var', 'dfn', 'del', 'q', 'em', 's', 'embed', 'samp', 'b']
+  const blockElements = ['body', 'svg', 'address', 'fieldset', 'li', 'span', 'article', 'figcaption', 'main', 'aside', 'figure', 'nav', 'blockquote', 'footer', 'ol', 'details', 'p', 'dialog', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'dd', 'header', 'section', 'div', 'hgroup', 'table', 'dl', 'hr', 'ul', 'dt', 'view', 'view-block']
   const specialElements = ['slot', 'form', 'iframe', 'img', 'audio', 'video', 'canvas', 'a', 'input', 'label', 'textarea', 'progress', 'button']
 
   patchMappingElements(ctx, options, inlineElements, blockElements)
diff --git a/packages/taro-runtime/src/dom/element.ts b/packages/taro-runtime/src/dom/element.ts
index 8a6e49a875d9..e7c4d7aec907 100644
--- a/packages/taro-runtime/src/dom/element.ts
+++ b/packages/taro-runtime/src/dom/element.ts
@@ -13,7 +13,7 @@ import {
   STYLE,
   VIEW
 } from '../constants'
-import { isBlockElements } from '../dom-external/inner-html/tags'
+import { makeMap } from '../dom-external/inner-html/tags'
 import { MutationObserver, MutationRecordType } from '../dom-external/mutation-observer'
 import { extend, getComponentsAlias, isElement, isHasExtractProp, shortcutAttr } from '../utils'
 import { ClassList } from './class-list'
@@ -26,6 +26,9 @@ import { treeToArray } from './tree'
 import type { Attributes, Func } from '../interface'
 import type { TaroEvent } from './event'
 
+// tags里导出的isBlockElements方法标签范围与html-plugin里不一致，因此这里重新定义个判断html块级元素方法与html-plugin里面块级范围保持一致
+const isBlockElements = makeMap('body,svg,address,fieldset,li,span,article,figcaption,main,aside,figure,nav,blockquote,footer,ol,details,p,dialog,h1,h2,h3,h4,h5,h6,pre,dd,header,section,div,hgroup,table,dl,hr,ul,dt,view,view-block', true)
+
 export class TaroElement extends TaroNode {
   public ctx?
   public tagName: string

From 4d099139781cd8a36fe44ecd2dbe0e9ec1fb2a3b Mon Sep 17 00:00:00 2001
From: leizhenyu5 <leizhenyu5@jd.com>
Date: Tue, 17 Oct 2023 22:51:01 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E7=B1=BB=E5=9E=8B=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/runtime-hooks.ts | 4 +---
 packages/taro-runtime/src/hydrate.ts | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/shared/src/runtime-hooks.ts b/packages/shared/src/runtime-hooks.ts
index 6fc0b6dc2eab..618b60c3889e 100644
--- a/packages/shared/src/runtime-hooks.ts
+++ b/packages/shared/src/runtime-hooks.ts
@@ -1,5 +1,3 @@
-import { TaroElement, TaroText } from '@tarojs/runtime'
-
 import { Events } from './event-emitter'
 import { isFunction } from './is'
 
@@ -211,7 +209,7 @@ type ITaroHooks = {
    * @todo: multi
    * 修改 Taro DOM 序列化数据
    **/
-  modifyHydrateData:(data: Record<string, any>, node: TaroElement | TaroText) => void
+  modifyHydrateData:(data: Record<string, any>, node) => void
   /**
     * @todo: multi
     * 修改 Taro DOM 序列化数据
diff --git a/packages/taro-runtime/src/hydrate.ts b/packages/taro-runtime/src/hydrate.ts
index 92d1aef7d7b1..998008b95d3a 100644
--- a/packages/taro-runtime/src/hydrate.ts
+++ b/packages/taro-runtime/src/hydrate.ts
@@ -98,7 +98,7 @@ export function hydrate (node: TaroElement | TaroText): MiniData {
     data[Shortcuts.Style] = cssText
   }
 
-  hooks.call('modifyHydrateData', data, node)
+  hooks.call('modifyHydrateData', data, node as any)
 
   const nn = data[Shortcuts.NodeName]
   const componentAlias = componentsAlias[nn]

From 66e483f57aa9ea623e2bd00a5cbcea911ada39e1 Mon Sep 17 00:00:00 2001
From: leizhenyu5 <leizhenyu5@jd.com>
Date: Thu, 2 Nov 2023 20:34:37 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20=E7=94=A8=E9=92=A9=E5=AD=90?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E5=AE=9E=E7=8E=B0view=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/runtime-hooks.ts     | 14 +++--
 packages/taro-plugin-html/src/runtime.ts | 65 ++++++++++++++++++++++--
 packages/taro-plugin-html/src/utils.ts   | 31 ++++++-----
 packages/taro-runtime/src/dom/element.ts | 27 +++++-----
 packages/taro-runtime/src/hydrate.ts     |  2 +-
 5 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/packages/shared/src/runtime-hooks.ts b/packages/shared/src/runtime-hooks.ts
index 618b60c3889e..d64649fdb075 100644
--- a/packages/shared/src/runtime-hooks.ts
+++ b/packages/shared/src/runtime-hooks.ts
@@ -214,12 +214,12 @@ type ITaroHooks = {
     * @todo: multi
     * 修改 Taro DOM 序列化数据
     **/
-  modifySetAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>) => void
+  modifySetAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>, isPureView: boolean) => void
   /**
     * @todo: multi
     * 修改 Taro DOM 序列化数据
     **/
-  modifyRmAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>) => void
+  modifyRmAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>, isStaticView: boolean) => void
   /**
     * @todo: multi
     * 调用 addEventListener 时触发
@@ -241,6 +241,10 @@ type ITaroHooks = {
 
   /** 解 Proxy */
   proxyToRaw: (proxyObj) => Record<any, any>
+  /** 元素增加事件监听钩子 */
+  modifyAddEventListener: (element, sideEffect: boolean, getComponentsAlias: () => Record<string, any>) => void
+  /** 元素删除事件监听钩子 */
+  modifyRemoveEventListener: (element, sideEffect: boolean, getComponentsAlias: () => Record<string, any>) => void
 }
 
 export const hooks = new TaroHooks<ITaroHooks>({
@@ -330,5 +334,9 @@ export const hooks = new TaroHooks<ITaroHooks>({
 
   initNativeApi: TaroHook(HOOK_TYPE.MULTI),
 
-  patchElement: TaroHook(HOOK_TYPE.MULTI)
+  patchElement: TaroHook(HOOK_TYPE.MULTI),
+
+  modifyAddEventListener: TaroHook(HOOK_TYPE.SINGLE),
+
+  modifyRemoveEventListener: TaroHook(HOOK_TYPE.SINGLE),
 })
diff --git a/packages/taro-plugin-html/src/runtime.ts b/packages/taro-plugin-html/src/runtime.ts
index 23616f78cdfa..3c58b9435855 100644
--- a/packages/taro-plugin-html/src/runtime.ts
+++ b/packages/taro-plugin-html/src/runtime.ts
@@ -1,6 +1,7 @@
-import { TaroElement } from '@tarojs/runtime'
+import { isHasExtractProp, TaroElement } from '@tarojs/runtime'
 import { hooks, Shortcuts, toCamelCase, warn } from '@tarojs/shared'
 
+import { blockElements } from './constant'
 import {
   defineMappedProp,
   ensureHtmlClass,
@@ -46,7 +47,7 @@ hooks.tap('modifyHydrateData', (data, node) => {
   data[Shortcuts.Style] = ensureRect(data, data[Shortcuts.Style])
 })
 
-hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {
+hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias, isPureView) => {
   const { nodeName, _path, props } = element
   if (!isHtmlTags(nodeName)) return
 
@@ -73,9 +74,27 @@ hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {
     payload.path = `${_path}.${Shortcuts.Style}`
     payload.value = ensureRect(props, element.style.cssText)
   }
+
+  if (blockElements.has(element.nodeName)) {
+    const viewAlias = componentsAlias.view._num
+    const staticViewAlias = componentsAlias['static-view']._num
+    const catchViewAlias = componentsAlias['catch-view']._num
+    const qualifiedNameInCamelCase = toCamelCase(key)
+    payload.path = `${_path}.${Shortcuts.NodeName}`
+    if (qualifiedNameInCamelCase === 'catchMove') {
+      // catchMove = true: catch-view
+      // catchMove = false: view or static-view
+      payload.value = payload.value ? catchViewAlias : (
+        element.isAnyEventBinded() ? viewAlias : staticViewAlias
+      )
+    } else if (isPureView && isHasExtractProp(element)) {
+      // pure-view => static-view
+      payload.value = staticViewAlias
+    }
+  }
 })
 
-hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {
+hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias, isStaticView) => {
   const { nodeName, _path, props } = element
   if (!isHtmlTags(nodeName)) return
 
@@ -101,6 +120,21 @@ hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {
     payload.path = `${_path}.${Shortcuts.Style}`
     payload.value = ensureRect(props, element.style.cssText)
   }
+
+  if (blockElements.has(element.nodeName)) {
+    const viewAlias = componentsAlias.view._num
+    const staticViewAlias = componentsAlias['static-view']._num
+    const pureViewAlias = componentsAlias['pure-view']._num
+    const qualifiedNameInCamelCase = toCamelCase(key)
+    payload.path = `${_path}.${Shortcuts.NodeName}`
+    if (qualifiedNameInCamelCase === 'catchMove') {
+      // catch-view => view or static-view or pure-view
+      payload.value = element.isAnyEventBinded() ? viewAlias : (isHasExtractProp(element) ? staticViewAlias : pureViewAlias)
+    } else if (isStaticView && !isHasExtractProp(element)) {
+      // static-view => pure-view
+      payload.value = pureViewAlias
+    }
+  }
 })
 
 hooks.tap('onAddEvent', (type, _handler, _options, node) => {
@@ -138,3 +172,28 @@ hooks.tap('modifyTaroEvent', (event, element) => {
     }
   }
 })
+
+hooks.tap('modifyAddEventListener', (element, sideEffect, getComponentsAlias) => {
+  // 如果是从没有事件绑定到有事件绑定，且是 block 元素，则转换为 view
+  if (sideEffect !== false && !element.isAnyEventBinded() && blockElements.has(element.nodeName)) {
+    const componentsAlias = getComponentsAlias()
+    const alias = componentsAlias.view._num
+    element.enqueueUpdate({
+      path: `${element._path}.${Shortcuts.NodeName}`,
+      value: alias
+    })
+  }
+})
+
+hooks.tap('modifyRemoveEventListener', (element, sideEffect, getComponentsAlias) => {
+  // 如果已没有绑定事件，且是 block 元素，则转换为 static-view 或 pure-view
+  if (sideEffect !== false && !element.isAnyEventBinded() && blockElements.has(element.nodeName)) {
+    const componentsAlias = getComponentsAlias()
+    const value = isHasExtractProp(element) ? 'static-view' : 'pure-view'
+    const valueAlias = componentsAlias[value]._num
+    element.enqueueUpdate({
+      path: `${element._path}.${Shortcuts.NodeName}`,
+      value: valueAlias
+    })
+  }
+})
diff --git a/packages/taro-plugin-html/src/utils.ts b/packages/taro-plugin-html/src/utils.ts
index 5fa1dab17dfb..88dc9ba1c22a 100644
--- a/packages/taro-plugin-html/src/utils.ts
+++ b/packages/taro-plugin-html/src/utils.ts
@@ -1,5 +1,5 @@
-import { isHasExtractProp, TaroElement } from '@tarojs/runtime'
-import { isFunction, isString, Shortcuts } from '@tarojs/shared'
+import { isHasExtractProp } from '@tarojs/runtime'
+import { isFunction, isString, Shortcuts, toCamelCase } from '@tarojs/shared'
 
 import {
   blockElements,
@@ -8,11 +8,7 @@ import {
   SpecialMaps
 } from './constant'
 
-export function isAnyEventBinded (node: TaroElement): boolean {
-  const handlers = node.__handlers
-  const isAnyEventBinded = Object.keys(handlers).find(key => handlers[key].length)
-  return Boolean(isAnyEventBinded)
-}
+import type { TaroElement } from '@tarojs/runtime'
 
 export function isHtmlTags (nodeName: string): boolean {
   if (inlineElements.has(nodeName) || blockElements.has(nodeName) || specialElements.has(nodeName)) {
@@ -31,12 +27,23 @@ export function getMappedType (nodeName: string, rawProps: Record<string, any>,
     }
     const { mapName } = mapping
     return isFunction(mapName) ? mapName(rawProps) : mapName
-  } else if (!node || isAnyEventBinded(node)) {
-    return 'view'
-  } else if (isHasExtractProp(node)) {
-    return 'static-view'
   } else {
-    return 'pure-view'
+    if (node) {
+      const { props } = node
+      for (const prop in props) {
+        const propInCamelCase = toCamelCase(prop)
+        if (propInCamelCase === 'catchMove' && props[prop] !== false) {
+          return 'catch-view'
+        }
+      }
+    }
+    if (!node || node.isAnyEventBinded()) {
+      return 'view'
+    } else if (isHasExtractProp(node)) {
+      return 'static-view'
+    } else {
+      return 'pure-view'
+    }
   }
 }
 
diff --git a/packages/taro-runtime/src/dom/element.ts b/packages/taro-runtime/src/dom/element.ts
index e7c4d7aec907..3f550c8abec5 100644
--- a/packages/taro-runtime/src/dom/element.ts
+++ b/packages/taro-runtime/src/dom/element.ts
@@ -13,7 +13,6 @@ import {
   STYLE,
   VIEW
 } from '../constants'
-import { makeMap } from '../dom-external/inner-html/tags'
 import { MutationObserver, MutationRecordType } from '../dom-external/mutation-observer'
 import { extend, getComponentsAlias, isElement, isHasExtractProp, shortcutAttr } from '../utils'
 import { ClassList } from './class-list'
@@ -26,9 +25,6 @@ import { treeToArray } from './tree'
 import type { Attributes, Func } from '../interface'
 import type { TaroEvent } from './event'
 
-// tags里导出的isBlockElements方法标签范围与html-plugin里不一致，因此这里重新定义个判断html块级元素方法与html-plugin里面块级范围保持一致
-const isBlockElements = makeMap('body,svg,address,fieldset,li,span,article,figcaption,main,aside,figure,nav,blockquote,footer,ol,details,p,dialog,h1,h2,h3,h4,h5,h6,pre,dd,header,section,div,hgroup,table,dl,hr,ul,dt,view,view-block', true)
-
 export class TaroElement extends TaroNode {
   public ctx?
   public tagName: string
@@ -142,9 +138,7 @@ export class TaroElement extends TaroNode {
       `元素 ${this.nodeName} 的 ${qualifiedName} 属性值数据量过大，可能会影响渲染性能。考虑降低图片转为 base64 的阈值或在 CSS 中使用 base64。`
     )
 
-    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
-
-    const isPureView = name === VIEW && !isHasExtractProp(this) && !this.isAnyEventBinded()
+    const isPureView = this.nodeName === VIEW && !isHasExtractProp(this) && !this.isAnyEventBinded()
 
     if (qualifiedName !== STYLE) {
       MutationObserver.record({
@@ -199,7 +193,7 @@ export class TaroElement extends TaroNode {
       value: isFunction(value) ? () => value : value
     }
 
-    hooks.call('modifySetAttrPayload', this, qualifiedName, payload, componentsAlias)
+    hooks.call('modifySetAttrPayload', this, qualifiedName, payload, componentsAlias, isPureView)
 
     if (_alias) {
       const qualifiedNameAlias = _alias[qualifiedNameInCamelCase] || qualifiedName
@@ -208,7 +202,7 @@ export class TaroElement extends TaroNode {
 
     this.enqueueUpdate(payload)
 
-    if (name === VIEW) {
+    if (this.nodeName === VIEW) {
       if (qualifiedNameInCamelCase === CATCHMOVE) {
         // catchMove = true: catch-view
         // catchMove = false: view or static-view
@@ -229,8 +223,7 @@ export class TaroElement extends TaroNode {
   }
 
   public removeAttribute (qualifiedName: string) {
-    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
-    const isStaticView = name === VIEW && isHasExtractProp(this) && !this.isAnyEventBinded()
+    const isStaticView = this.nodeName === VIEW && isHasExtractProp(this) && !this.isAnyEventBinded()
 
     MutationObserver.record({
       target: this,
@@ -271,7 +264,7 @@ export class TaroElement extends TaroNode {
       value: ''
     }
 
-    hooks.call('modifyRmAttrPayload', this, qualifiedName, payload, componentsAlias)
+    hooks.call('modifyRmAttrPayload', this, qualifiedName, payload, componentsAlias, isStaticView)
 
     if (_alias) {
       const qualifiedNameAlias = _alias[qualifiedNameInCamelCase] || qualifiedName
@@ -280,7 +273,7 @@ export class TaroElement extends TaroNode {
 
     this.enqueueUpdate(payload)
 
-    if (name === VIEW) {
+    if (this.nodeName === VIEW) {
       if (qualifiedNameInCamelCase === CATCHMOVE) {
         // catch-view => view or static-view or pure-view
         this.enqueueUpdate({
@@ -358,7 +351,7 @@ export class TaroElement extends TaroNode {
   }
 
   public addEventListener (type, handler, options) {
-    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
+    const name = this.nodeName
     const SPECIAL_NODES = hooks.call('getSpecialNodes')!
 
     let sideEffect = true
@@ -367,6 +360,8 @@ export class TaroElement extends TaroNode {
       delete options.sideEffect
     }
 
+    hooks.call('modifyAddEventListener', this, sideEffect, getComponentsAlias)
+
     if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
       const componentsAlias = getComponentsAlias()
       const alias = componentsAlias[name]._num
@@ -382,9 +377,11 @@ export class TaroElement extends TaroNode {
   public removeEventListener (type, handler, sideEffect = true) {
     super.removeEventListener(type, handler)
 
-    const name = isBlockElements(this.nodeName) ? VIEW : this.nodeName
+    const name = this.nodeName
     const SPECIAL_NODES = hooks.call('getSpecialNodes')!
 
+    hooks.call('modifyRemoveEventListener', this, sideEffect, getComponentsAlias)
+
     if (sideEffect !== false && !this.isAnyEventBinded() && SPECIAL_NODES.indexOf(name) > -1) {
       const componentsAlias = getComponentsAlias()
       const value = isHasExtractProp(this) ? `static-${name}` : `pure-${name}`
diff --git a/packages/taro-runtime/src/hydrate.ts b/packages/taro-runtime/src/hydrate.ts
index 998008b95d3a..92d1aef7d7b1 100644
--- a/packages/taro-runtime/src/hydrate.ts
+++ b/packages/taro-runtime/src/hydrate.ts
@@ -98,7 +98,7 @@ export function hydrate (node: TaroElement | TaroText): MiniData {
     data[Shortcuts.Style] = cssText
   }
 
-  hooks.call('modifyHydrateData', data, node as any)
+  hooks.call('modifyHydrateData', data, node)
 
   const nn = data[Shortcuts.NodeName]
   const componentAlias = componentsAlias[nn]

From 457a5fa1960f8d014202383931c66b272e7b684e Mon Sep 17 00:00:00 2001
From: Chen-jj <798095202@qq.com>
Date: Tue, 7 Nov 2023 19:07:19 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix(plugin-html):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=81=E5=88=A0=E9=99=A4=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=97=B6=20view=20=E8=8A=82=E7=82=B9=E5=90=8D=E5=87=BA?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/runtime-hooks.ts     |  4 +--
 packages/taro-plugin-html/src/runtime.ts | 42 ++++++++++++++++--------
 packages/taro-runtime/src/dom/element.ts |  6 ++--
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/packages/shared/src/runtime-hooks.ts b/packages/shared/src/runtime-hooks.ts
index ddf8afa38275..f3b4a1fbc547 100644
--- a/packages/shared/src/runtime-hooks.ts
+++ b/packages/shared/src/runtime-hooks.ts
@@ -218,12 +218,12 @@ type ITaroHooks = {
     * @todo: multi
     * 修改 Taro DOM 序列化数据
     **/
-  modifySetAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>, isPureView: boolean) => void
+  modifySetAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>) => void
   /**
     * @todo: multi
     * 修改 Taro DOM 序列化数据
     **/
-  modifyRmAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>, isStaticView: boolean) => void
+  modifyRmAttrPayload: (element, key: string, payload: UpdatePayload, componentsAlias: Record<string, any>) => void
   /**
     * @todo: multi
     * 调用 addEventListener 时触发
diff --git a/packages/taro-plugin-html/src/runtime.ts b/packages/taro-plugin-html/src/runtime.ts
index 3c58b9435855..8712b815ed8a 100644
--- a/packages/taro-plugin-html/src/runtime.ts
+++ b/packages/taro-plugin-html/src/runtime.ts
@@ -47,7 +47,7 @@ hooks.tap('modifyHydrateData', (data, node) => {
   data[Shortcuts.Style] = ensureRect(data, data[Shortcuts.Style])
 })
 
-hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias, isPureView) => {
+hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {
   const { nodeName, _path, props } = element
   if (!isHtmlTags(nodeName)) return
 
@@ -80,21 +80,28 @@ hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias, isPur
     const staticViewAlias = componentsAlias['static-view']._num
     const catchViewAlias = componentsAlias['catch-view']._num
     const qualifiedNameInCamelCase = toCamelCase(key)
-    payload.path = `${_path}.${Shortcuts.NodeName}`
+    const dataPath = `${_path}.${Shortcuts.NodeName}`
     if (qualifiedNameInCamelCase === 'catchMove') {
       // catchMove = true: catch-view
       // catchMove = false: view or static-view
-      payload.value = payload.value ? catchViewAlias : (
-        element.isAnyEventBinded() ? viewAlias : staticViewAlias
-      )
-    } else if (isPureView && isHasExtractProp(element)) {
+      element.enqueueUpdate({
+        path: dataPath,
+        value: payload.value ? catchViewAlias : (
+          element.isAnyEventBinded() ? viewAlias : staticViewAlias
+        )
+      })
+    } else if (isHasExtractProp(element) && !element.isAnyEventBinded()) {
       // pure-view => static-view
-      payload.value = staticViewAlias
+      // static-view => static-view 因为没有办法分辨之前是不是 pure，所以就算之前是 static 也需要 setData
+      element.enqueueUpdate({
+        path: dataPath,
+        value: staticViewAlias
+      })
     }
   }
 })
 
-hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias, isStaticView) => {
+hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {
   const { nodeName, _path, props } = element
   if (!isHtmlTags(nodeName)) return
 
@@ -126,13 +133,20 @@ hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias, isStat
     const staticViewAlias = componentsAlias['static-view']._num
     const pureViewAlias = componentsAlias['pure-view']._num
     const qualifiedNameInCamelCase = toCamelCase(key)
-    payload.path = `${_path}.${Shortcuts.NodeName}`
+    const dataPath = `${_path}.${Shortcuts.NodeName}`
     if (qualifiedNameInCamelCase === 'catchMove') {
       // catch-view => view or static-view or pure-view
-      payload.value = element.isAnyEventBinded() ? viewAlias : (isHasExtractProp(element) ? staticViewAlias : pureViewAlias)
-    } else if (isStaticView && !isHasExtractProp(element)) {
+      element.enqueueUpdate({
+        path: dataPath,
+        value: element.isAnyEventBinded() ? viewAlias : (isHasExtractProp(element) ? staticViewAlias : pureViewAlias)
+      })
+    } else if (!isHasExtractProp(element)) {
       // static-view => pure-view
-      payload.value = pureViewAlias
+      // pure-view => pure-view 因为没有办法分辨之前是不是 pure，所以就算之前是 pure 也需要 setData
+      element.enqueueUpdate({
+        path: dataPath,
+        value: pureViewAlias
+      })
     }
   }
 })
@@ -175,7 +189,7 @@ hooks.tap('modifyTaroEvent', (event, element) => {
 
 hooks.tap('modifyAddEventListener', (element, sideEffect, getComponentsAlias) => {
   // 如果是从没有事件绑定到有事件绑定，且是 block 元素，则转换为 view
-  if (sideEffect !== false && !element.isAnyEventBinded() && blockElements.has(element.nodeName)) {
+  if (blockElements.has(element.nodeName) && sideEffect !== false && !element.isAnyEventBinded()) {
     const componentsAlias = getComponentsAlias()
     const alias = componentsAlias.view._num
     element.enqueueUpdate({
@@ -187,7 +201,7 @@ hooks.tap('modifyAddEventListener', (element, sideEffect, getComponentsAlias) =>
 
 hooks.tap('modifyRemoveEventListener', (element, sideEffect, getComponentsAlias) => {
   // 如果已没有绑定事件，且是 block 元素，则转换为 static-view 或 pure-view
-  if (sideEffect !== false && !element.isAnyEventBinded() && blockElements.has(element.nodeName)) {
+  if (blockElements.has(element.nodeName) && sideEffect !== false && !element.isAnyEventBinded()) {
     const componentsAlias = getComponentsAlias()
     const value = isHasExtractProp(element) ? 'static-view' : 'pure-view'
     const valueAlias = componentsAlias[value]._num
diff --git a/packages/taro-runtime/src/dom/element.ts b/packages/taro-runtime/src/dom/element.ts
index 3f550c8abec5..e6e132766622 100644
--- a/packages/taro-runtime/src/dom/element.ts
+++ b/packages/taro-runtime/src/dom/element.ts
@@ -193,7 +193,7 @@ export class TaroElement extends TaroNode {
       value: isFunction(value) ? () => value : value
     }
 
-    hooks.call('modifySetAttrPayload', this, qualifiedName, payload, componentsAlias, isPureView)
+    hooks.call('modifySetAttrPayload', this, qualifiedName, payload, componentsAlias)
 
     if (_alias) {
       const qualifiedNameAlias = _alias[qualifiedNameInCamelCase] || qualifiedName
@@ -264,7 +264,7 @@ export class TaroElement extends TaroNode {
       value: ''
     }
 
-    hooks.call('modifyRmAttrPayload', this, qualifiedName, payload, componentsAlias, isStaticView)
+    hooks.call('modifyRmAttrPayload', this, qualifiedName, payload, componentsAlias)
 
     if (_alias) {
       const qualifiedNameAlias = _alias[qualifiedNameInCamelCase] || qualifiedName
@@ -303,7 +303,7 @@ export class TaroElement extends TaroNode {
 
   public getElementsByClassName (className: string): TaroElement[] {
     const classNames = className.trim().split(/\s+/)
-  
+
     return treeToArray(this, (el) => {
       const classList = el.classList
       return classNames.every(c => classList.contains(c))