chore: tweaks

diff --git a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
index 6fef2ba601e06fbf22128ca7c32e5cecf31400de..8d7af61234c6d41e75272de91c5d21e55c711ce6 100644 (file)
--- a/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
+++ b/packages/runtime-vapor/__tests__/componentAttrs.spec.ts
@@ -472,6 +472,6 @@ describe('attribute fallthrough', () => {
 
     const root = document.createElement('div')
     createApp(App).use(vaporInteropPlugin).mount(root)
-    expect(root.innerHTML).toBe('<div foo="vapor foo" bar="bar"></div>')
+    expect(root.innerHTML).toBe('<div foo="foo" bar="bar"></div>')
   })
 })

diff --git a/packages/runtime-vapor/__tests__/componentSlots.spec.ts b/packages/runtime-vapor/__tests__/componentSlots.spec.ts
index d6f4c0af30f76ea7019d0613820baf7f9c2fb702..58076fff9eea213c8180d87ef5ed089951560798 100644 (file)
--- a/packages/runtime-vapor/__tests__/componentSlots.spec.ts
+++ b/packages/runtime-vapor/__tests__/componentSlots.spec.ts
@@ -241,11 +241,14 @@ describe('component: slots', () => {
         }),
       ).render()
 
-      // foo has higher priority than bindObj.foo
-      expect(props).toEqual({ foo: 0, baz: 'qux' })
+      expect(props).toEqual({ foo: 100, baz: 'qux' })
 
       foo.value = 2
       await nextTick()
+      expect(props).toEqual({ foo: 100, baz: 'qux' })
+
+      delete bindObj.value.foo
+      await nextTick()
       expect(props).toEqual({ foo: 2, baz: 'qux' })
     })
 

diff --git a/packages/runtime-vapor/src/componentProps.ts b/packages/runtime-vapor/src/componentProps.ts
index a8fbafd5f9fd243415f5cae2d7af3669b670200e..9cf65c57143a4f72b3b466cd5732bde7cd5cead1 100644 (file)
--- a/packages/runtime-vapor/src/componentProps.ts
+++ b/packages/runtime-vapor/src/componentProps.ts
@@ -178,16 +178,6 @@ export function getAttrFromRawProps(rawProps: RawProps, key: string): unknown {
   if (key === '$') return
   // need special merging behavior for class & style
   const merged = key === 'class' || key === 'style' ? ([] as any[]) : undefined
-
-  // rawProps has high priority
-  if (hasOwn(rawProps, key)) {
-    if (merged) {
-      merged.push(rawProps[key]())
-    } else {
-      return rawProps[key]()
-    }
-  }
-
   const dynamicSources = rawProps.$
   if (dynamicSources) {
     let i = dynamicSources.length
@@ -206,7 +196,13 @@ export function getAttrFromRawProps(rawProps: RawProps, key: string): unknown {
       }
     }
   }
-
+  if (hasOwn(rawProps, key)) {
+    if (merged) {
+      merged.push(rawProps[key]())
+    } else {
+      return rawProps[key]()
+    }
+  }
   if (merged && merged.length) {
     return merged
   }