wip: revert some changes

diff --git a/packages/runtime-core/src/helpers/renderSlot.ts b/packages/runtime-core/src/helpers/renderSlot.ts
index e41a14c2ae375680ca70d2bf04a0928280705374..152c5a4b81c13735825feb6e6d182ad08e2b0136 100644 (file)
--- a/packages/runtime-core/src/helpers/renderSlot.ts
+++ b/packages/runtime-core/src/helpers/renderSlot.ts
@@ -35,7 +35,7 @@ export function renderSlot(
   let slot = slots[name]
 
   // vapor slots rendered in vdom
-  if (slot && slots.__interop) {
+  if (slot && slots._vapor) {
     const ret = (openBlock(), createBlock(VaporSlot, props))
     ret.vs = { slot, fallback }
     return ret

diff --git a/packages/runtime-vapor/src/component.ts b/packages/runtime-vapor/src/component.ts
index b12ae3f2d47a9a717af84ad74327b69433bc6fd9..25f909acc5e3ea667743a753842ed350883566c3 100644 (file)
--- a/packages/runtime-vapor/src/component.ts
+++ b/packages/runtime-vapor/src/component.ts
@@ -56,7 +56,6 @@ import {
   type VaporSlot,
   dynamicSlotsProxyHandlers,
   getSlot,
-  staticSlotsProxyHandler,
 } from './componentSlots'
 import { hmrReload, hmrRerender } from './hmr'
 
@@ -417,7 +416,7 @@ export class VaporComponentInstance implements GenericComponentInstance {
     this.slots = rawSlots
       ? rawSlots.$
         ? new Proxy(rawSlots, dynamicSlotsProxyHandlers)
-        : new Proxy(rawSlots, staticSlotsProxyHandler)
+        : rawSlots
       : EMPTY_OBJ
   }
 

diff --git a/packages/runtime-vapor/src/componentSlots.ts b/packages/runtime-vapor/src/componentSlots.ts
index 85bf52c0be55995cffe2bc293f598a0ab1accdba..9f6c2ba5a0dc56010f259dde510c4a23b7fa4470 100644 (file)
--- a/packages/runtime-vapor/src/componentSlots.ts
+++ b/packages/runtime-vapor/src/componentSlots.ts
@@ -16,24 +16,8 @@ export type DynamicSlot = { name: string; fn: VaporSlot }
 export type DynamicSlotFn = () => DynamicSlot | DynamicSlot[]
 export type DynamicSlotSource = StaticSlots | DynamicSlotFn
 
-export const staticSlotsProxyHandler: ProxyHandler<any> = {
-  get(target, key) {
-    if (key === '__vapor') {
-      return true
-    } else {
-      return target[key]
-    }
-  },
-}
-
 export const dynamicSlotsProxyHandlers: ProxyHandler<RawSlots> = {
-  get: (target, key: string) => {
-    if (key === '__vapor') {
-      return true
-    } else {
-      return getSlot(target, key)
-    }
-  },
+  get: getSlot,
   has: (target, key: string) => !!getSlot(target, key),
   getOwnPropertyDescriptor(target, key: string) {
     const slot = getSlot(target, key)

diff --git a/packages/runtime-vapor/src/vdomInterop.ts b/packages/runtime-vapor/src/vdomInterop.ts
index dc3ff7c5e6d6bfa69247d78fe67dfad40dcf99de..44ec5105e9bed3ce7e2ccf68fdc184dabf6e87d8 100644 (file)
--- a/packages/runtime-vapor/src/vdomInterop.ts
+++ b/packages/runtime-vapor/src/vdomInterop.ts
@@ -133,7 +133,7 @@ const vaporSlotPropsProxyHandler: ProxyHandler<
 
 const vaporSlotsProxyHandler: ProxyHandler<any> = {
   get(target, key) {
-    if (key === '__interop') {
+    if (key === '_vapor') {
       return target
     } else {
       return target[key]