fix(runtime-vapor): don't overridden attrs in static template

closes #253
vuejs · Nov 13, 2024 · 39f85ec · 39f85ec
1 parent 5f92ff8
commit 39f85ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/runtime-vapor/src/apiCreateComponent.ts b/packages/runtime-vapor/src/apiCreateComponent.ts
@@ -23,7 +23,7 @@ export function createComponent(
     slots,
     once,
   )
-  setupComponent(instance, singleRoot)
+  setupComponent(instance)
 
   // register sub-component with current component for lifecycle management
   current.comps.add(instance)

diff --git a/packages/runtime-vapor/src/apiRender.ts b/packages/runtime-vapor/src/apiRender.ts
@@ -30,10 +30,7 @@ export type Fragment = {
   [fragmentKey]: true
 }
 
-export function setupComponent(
-  instance: ComponentInternalInstance,
-  singleRoot: boolean = false,
-): void {
+export function setupComponent(instance: ComponentInternalInstance): void {
   if (__DEV__) {
     startMeasure(instance, `init`)
   }
@@ -97,7 +94,7 @@ export function setupComponent(
       block = []
     }
     instance.block = block
-    if (singleRoot) fallThroughAttrs(instance)
+    fallThroughAttrs(instance)
     return block
   })
   reset()

diff --git a/packages/runtime-vapor/src/componentAttrs.ts b/packages/runtime-vapor/src/componentAttrs.ts
@@ -72,6 +72,12 @@ export function fallThroughAttrs(instance: ComponentInternalInstance): void {
   if (inheritAttrs === false) return
 
   if (block instanceof Element) {
-    renderEffect(() => setDynamicProps(block, instance.attrs))
+    // attrs in static template
+    const initial: Record<string, string> = {}
+    for (let i = 0; i < block.attributes.length; i++) {
+      const attr = block.attributes[i]
+      initial[attr.name] = attr.value
+    }
+    renderEffect(() => setDynamicProps(block, instance.attrs, initial))
   }
 }