test: undo

Author: sxzz

packages/runtime-vapor/__tests__/componentProps.spec.ts

@@ -222,7 +222,6 @@ describe('component: props', () => {
   test('optimized props updates', async () => {
     const t0 = template('<div>')
     const { component: Child } = define({
-      inheritAttrs: false,
       props: ['foo'],
       render() {
         const instance = getCurrentInstance()!
@@ -239,21 +238,26 @@ describe('component: props', () => {
         return { foo, id }
       },
       render(_ctx: Record<string, any>) {
-        return createComponent(Child, {
-          foo: () => _ctx.foo,
-          id: () => _ctx.id,
-        })
+        return createComponent(
+          Child,
+          {
+            foo: () => _ctx.foo,
+            id: () => _ctx.id,
+          },
+          true,
+        )
       },
     }).render()
     const reset = setCurrentInstance(instance)
-    expect(host.innerHTML).toBe('<div>1</div>')
+    expect(host.innerHTML).toBe('<div id="a">1</div>')
 
     foo.value++
     await nextTick()
-    expect(host.innerHTML).toBe('<div>2</div>')
+    expect(host.innerHTML).toBe('<div id="a">2</div>')
 
     id.value = 'b'
     await nextTick()
+    expect(host.innerHTML).toBe('<div id="b">2</div>')
     reset()
   })
 

packages/runtime-vapor/src/apiCreateComponent.ts

@@ -4,12 +4,12 @@ import {
   currentInstance,
 } from './component'
 import { setupComponent } from './apiRender'
-import type { NormalizedRawProps } from './componentProps'
+import type { RawProps } from './componentProps'
 import { withAttrs } from './componentAttrs'
 
 export function createComponent(
   comp: Component,
-  rawProps: NormalizedRawProps | null = null,
+  rawProps: RawProps | null = null,
   singleRoot: boolean = false,
 ) {
   const current = currentInstance!

packages/runtime-vapor/src/apiRender.ts

@@ -57,7 +57,7 @@ export function setupComponent(
       block = []
     }
     instance.block = block
-    fallThroughAttrs(instance, singleRoot)
+    if (singleRoot) fallThroughAttrs(instance)
     return block
   })
   reset()

packages/runtime-vapor/src/componentAttrs.ts

@@ -57,17 +57,14 @@ export function withAttrs(props: RawProps): RawProps {
   return [attrsGetter, props]
 }
 
-export function fallThroughAttrs(
-  instance: ComponentInternalInstance,
-  singleRoot: boolean,
-) {
+export function fallThroughAttrs(instance: ComponentInternalInstance) {
   const {
     block,
     component: { inheritAttrs },
   } = instance
   if (inheritAttrs === false) return
 
-  if (singleRoot && block instanceof Element) {
+  if (block instanceof Element) {
     renderEffect(() => setDynamicProps(block, instance.attrs))
   }
 }