fix(swan): fix cannot render when use @tarojs/plugin-html

NervJS#15326
TheKonka · Mar 12, 2024 · 8ce06eb · 8ce06eb
1 parent 430455f
commit 8ce06eb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/packages/taro-plugin-html/src/runtime.ts b/packages/taro-plugin-html/src/runtime.ts
@@ -75,7 +75,7 @@ hooks.tap('modifySetAttrPayload', (element, key, payload, componentsAlias) => {
     payload.value = ensureRect(props, element.style.cssText)
   }
 
-  if (blockElements.has(element.nodeName)) {
+  if (blockElements.has(element.nodeName) && process.env.TARO_ENV !== 'swan') {
     const viewAlias = componentsAlias.view._num
     const staticViewAlias = componentsAlias['static-view']._num
     const catchViewAlias = componentsAlias['catch-view']._num
@@ -128,7 +128,7 @@ hooks.tap('modifyRmAttrPayload', (element, key, payload, componentsAlias) => {
     payload.value = ensureRect(props, element.style.cssText)
   }
 
-  if (blockElements.has(element.nodeName)) {
+  if (blockElements.has(element.nodeName) && process.env.TARO_ENV !== 'swan') {
     const viewAlias = componentsAlias.view._num
     const staticViewAlias = componentsAlias['static-view']._num
     const pureViewAlias = componentsAlias['pure-view']._num
@@ -201,7 +201,7 @@ hooks.tap('modifyAddEventListener', (element, sideEffect, getComponentsAlias) =>
 
 hooks.tap('modifyRemoveEventListener', (element, sideEffect, getComponentsAlias) => {
   // 如果已没有绑定事件，且是 block 元素，则转换为 static-view 或 pure-view
-  if (blockElements.has(element.nodeName) && sideEffect !== false && !element.isAnyEventBinded()) {
+  if (process.env.TARO_ENV !== 'swan' && 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-plugin-html/src/utils.ts b/packages/taro-plugin-html/src/utils.ts
@@ -28,6 +28,8 @@ export function getMappedType (nodeName: string, rawProps: Record<string, any>,
     const { mapName } = mapping
     return isFunction(mapName) ? mapName(rawProps) : mapName
   } else {
+    // fix #15326
+    if (process.env.TARO_ENV === 'swan') return 'view'
     if (node) {
       const { props } = node
       for (const prop in props) {

diff --git a/packages/taro-runtime/src/hydrate.ts b/packages/taro-runtime/src/hydrate.ts
@@ -72,7 +72,12 @@ export function hydrate (node: TaroElement | TaroText): MiniData {
     ) {
       data[propInCamelCase] = props[prop]
     }
-    if (nodeName === VIEW && propInCamelCase === CATCHMOVE && props[prop] !== false) {
+    if (
+      process.env.TARO_ENV !== 'swan' &&
+      nodeName === VIEW &&
+      propInCamelCase === CATCHMOVE &&
+      props[prop] !== false
+    ) {
       data[Shortcuts.NodeName] = CATCH_VIEW
     }
     if (propInCamelCase === COMPILE_MODE) {

diff --git a/packages/taro-swan/src/template.ts b/packages/taro-swan/src/template.ts
@@ -59,6 +59,7 @@ export class Template extends RecursiveTemplate {
 
     delete result['pure-view']
     delete result['static-view']
+    delete result['catch-view']
 
     return result
   }