From 3cb3e1ac3931248d55f21455522155ad317112a7 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Thu, 6 Mar 2025 14:35:16 +0800
Subject: [PATCH] wip: revert some changes

---
 .../runtime-core/src/helpers/renderSlot.ts     |  2 +-
 packages/runtime-vapor/src/component.ts        |  3 +--
 packages/runtime-vapor/src/componentSlots.ts   | 18 +-----------------
 packages/runtime-vapor/src/vdomInterop.ts      |  2 +-
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/packages/runtime-core/src/helpers/renderSlot.ts b/packages/runtime-core/src/helpers/renderSlot.ts
index e41a14c2ae..152c5a4b81 100644
--- 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 b12ae3f2d4..25f909acc5 100644
--- 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 85bf52c0be..9f6c2ba5a0 100644
--- 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 dc3ff7c5e6..44ec5105e9 100644
--- 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]
-- 
2.47.2