From 6b5d6dacb2f61ad7c7f7c79c00e6864992d3c01c Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Mon, 27 Apr 2026 15:16:10 +0800
Subject: [PATCH] fix: school name can not input (#35597)

---
 .../__tests__/search-input.spec.tsx           | 101 ++++--------------
 web/app/education-apply/search-input.tsx      |   3 +-
 2 files changed, 24 insertions(+), 80 deletions(-)

diff --git a/web/app/education-apply/__tests__/search-input.spec.tsx b/web/app/education-apply/__tests__/search-input.spec.tsx
index bb3cd8cc84..ae9b678add 100644
--- a/web/app/education-apply/__tests__/search-input.spec.tsx
+++ b/web/app/education-apply/__tests__/search-input.spec.tsx
@@ -1,4 +1,3 @@
-import type { ReactNode } from 'react'
 import { fireEvent, render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { useState } from 'react'
@@ -23,73 +22,6 @@ vi.mock('react-i18next', () => ({
   }),
 }))
 
-vi.mock('@/app/components/base/input', () => ({
-  default: ({
-    value,
-    onChange,
-    placeholder,
-    className,
-  }: {
-    value?: string
-    onChange: (event: { target: { value: string } }) => void
-    placeholder?: string
-    className?: string
-  }) => (
-    <input
-      className={className}
-      placeholder={placeholder}
-      value={value}
-      onChange={e => onChange({ target: { value: e.target.value } })}
-    />
-  ),
-}))
-
-vi.mock('@langgenius/dify-ui/popover', async () => {
-  const React = await import('react')
-  const PopoverContext = React.createContext({
-    open: false,
-    setOpen: (_open: boolean) => {},
-  })
-
-  const Popover = ({
-    children,
-    open: controlledOpen,
-    onOpenChange,
-  }: {
-    children: ReactNode
-    open?: boolean
-    onOpenChange?: (open: boolean) => void
-  }) => {
-    const [uncontrolledOpen, setUncontrolledOpen] = React.useState(false)
-    const isControlled = controlledOpen !== undefined
-    const open = isControlled ? !!controlledOpen : uncontrolledOpen
-    const setOpen = (nextOpen: boolean) => {
-      if (!isControlled)
-        setUncontrolledOpen(nextOpen)
-      onOpenChange?.(nextOpen)
-    }
-
-    return (
-      <PopoverContext.Provider value={{ open, setOpen }}>
-        {children}
-      </PopoverContext.Provider>
-    )
-  }
-
-  const PopoverTrigger = ({ render }: { render: ReactNode }) => <>{render}</>
-
-  const PopoverContent = ({ children }: { children: ReactNode }) => {
-    const { open } = React.useContext(PopoverContext)
-    return open ? <div data-testid="education-search-popover">{children}</div> : null
-  }
-
-  return {
-    Popover,
-    PopoverTrigger,
-    PopoverContent,
-  }
-})
-
 const ControlledSearchInput = () => {
   const [value, setValue] = useState('')
   return <SearchInput value={value} onChange={setValue} />
@@ -102,27 +34,38 @@ describe('education-apply/search-input', () => {
     educationMocks.hasNext = false
   })
 
-  it('opens the popover, queries schools, and closes after selection', async () => {
+  it('keeps the search field editable when used as the popover trigger', async () => {
+    const user = userEvent.setup()
+    educationMocks.schools = []
+
+    render(<ControlledSearchInput />)
+
+    const input = screen.getByPlaceholderText('form.schoolName.placeholder') as HTMLInputElement
+    expect(input.type).toBe('text')
+
+    await user.type(input, 'Alpha')
+
+    expect(input).toHaveValue('Alpha')
+    expect(educationMocks.setSchools).toHaveBeenCalledWith([])
+    expect(educationMocks.querySchoolsWithDebounced).toHaveBeenLastCalledWith({
+      keywords: 'Alpha',
+      page: 0,
+    })
+  })
+
+  it('closes the popover after selecting a school', async () => {
     const user = userEvent.setup()
 
     render(<ControlledSearchInput />)
 
-    const input = screen.getByPlaceholderText('form.schoolName.placeholder')
-    await user.type(input, 'A')
+    await user.type(screen.getByPlaceholderText('form.schoolName.placeholder'), 'A')
 
-    expect(educationMocks.setSchools).toHaveBeenCalledWith([])
-    expect(educationMocks.querySchoolsWithDebounced).toHaveBeenLastCalledWith({
-      keywords: 'A',
-      page: 0,
-    })
-
-    expect(screen.getByTestId('education-search-popover')).toBeInTheDocument()
     expect(screen.getByText('Alpha University')).toBeInTheDocument()
 
     await user.click(screen.getByText('Beta College'))
 
     expect(screen.getByDisplayValue('Beta College')).toBeInTheDocument()
-    expect(screen.queryByTestId('education-search-popover')).not.toBeInTheDocument()
+    expect(screen.queryByText('Alpha University')).not.toBeInTheDocument()
   })
 
   it('loads the next page when the dropdown is scrolled to the bottom', async () => {
diff --git a/web/app/education-apply/search-input.tsx b/web/app/education-apply/search-input.tsx
index 4f930eb3eb..5125eba439 100644
--- a/web/app/education-apply/search-input.tsx
+++ b/web/app/education-apply/search-input.tsx
@@ -77,6 +77,7 @@ const SearchInput = ({
   return (
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger
+        nativeButton={false}
         render={(
           <Input
             className="w-full"
@@ -86,7 +87,7 @@ const SearchInput = ({
           />
         )}
       />
-      {!!schools.length && !!value && (
+      {open && !!schools.length && !!value && (
         <PopoverContent
           placement="bottom"
           sideOffset={4}