mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-27 15:13:37 +08:00
Prevent model selector clipping in task modals
The model selector dropdown was rendered inside the modal scroll container. When the task form sat near the top of the dialog, the upward-opening menu could be clipped by the container and become impossible to scroll into view. The selector now portals the menu to the document body and positions it against the trigger with viewport-aware fixed coordinates. Constraint: The same selector is used by chat/session controls and scheduled-task controls, so the fix must preserve existing runtime selection behavior. Rejected: Increase modal scroll padding | still leaves the dropdown coupled to a clipping parent and breaks in other overflow containers. Confidence: high Scope-risk: narrow Directive: Keep floating selector content outside scroll-clipping parents; update viewport positioning if the modal layout changes. Tested: cd desktop && bun run test -- src/components/controls/ModelSelector.test.tsx src/components/tasks/NewTaskModal.test.tsx Tested: bun run check:desktop Tested: git diff --check Not-tested: Manual packaged desktop app check.
This commit is contained in:
parent
c9cc5e68a6
commit
6b55ace2d7
@ -117,4 +117,47 @@ describe('ModelSelector', () => {
|
|||||||
modelId: 'provider-fast',
|
modelId: 'provider-fast',
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('portals the dropdown outside clipping containers and positions it below the trigger', async () => {
|
||||||
|
useSettingsStore.setState({
|
||||||
|
locale: 'en',
|
||||||
|
availableModels: MODELS,
|
||||||
|
currentModel: MODELS[0],
|
||||||
|
})
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<div data-testid="scroll-container" className="overflow-hidden">
|
||||||
|
<ModelSelector value="alpha" onChange={vi.fn()} />
|
||||||
|
</div>,
|
||||||
|
)
|
||||||
|
|
||||||
|
const trigger = screen.getByRole('button', { name: /alpha/i })
|
||||||
|
Object.defineProperty(trigger.parentElement, 'getBoundingClientRect', {
|
||||||
|
configurable: true,
|
||||||
|
value: () => ({
|
||||||
|
top: 120,
|
||||||
|
right: 520,
|
||||||
|
bottom: 150,
|
||||||
|
left: 240,
|
||||||
|
width: 280,
|
||||||
|
height: 30,
|
||||||
|
x: 240,
|
||||||
|
y: 120,
|
||||||
|
toJSON: () => {},
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
|
||||||
|
await act(async () => {
|
||||||
|
fireEvent.click(trigger)
|
||||||
|
await Promise.resolve()
|
||||||
|
})
|
||||||
|
|
||||||
|
const dropdown = screen.getByTestId('model-selector-dropdown')
|
||||||
|
expect(container.contains(dropdown)).toBe(false)
|
||||||
|
expect(document.body.contains(dropdown)).toBe(true)
|
||||||
|
expect(dropdown.className).toContain('fixed')
|
||||||
|
expect(dropdown.style.top).toBe('158px')
|
||||||
|
expect(dropdown.style.left).toBe('160px')
|
||||||
|
expect(dropdown.style.width).toBe('360px')
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from 'react'
|
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
|
||||||
|
import { createPortal } from 'react-dom'
|
||||||
import { OFFICIAL_DEFAULT_MODEL_ID, OFFICIAL_MODELS } from '../../constants/modelCatalog'
|
import { OFFICIAL_DEFAULT_MODEL_ID, OFFICIAL_MODELS } from '../../constants/modelCatalog'
|
||||||
import { useTranslation } from '../../i18n'
|
import { useTranslation } from '../../i18n'
|
||||||
import { useChatStore } from '../../stores/chatStore'
|
import { useChatStore } from '../../stores/chatStore'
|
||||||
@ -26,6 +27,19 @@ type Props = {
|
|||||||
compact?: boolean
|
compact?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type DropdownPosition = {
|
||||||
|
top: number
|
||||||
|
left: number
|
||||||
|
width: number
|
||||||
|
maxHeight: number
|
||||||
|
}
|
||||||
|
|
||||||
|
const DROPDOWN_WIDTH = 360
|
||||||
|
const DROPDOWN_GAP = 8
|
||||||
|
const VIEWPORT_MARGIN = 16
|
||||||
|
const DROPDOWN_MAX_HEIGHT = 420
|
||||||
|
const DROPDOWN_MIN_HEIGHT = 180
|
||||||
|
|
||||||
function officialChoices(availableModels: ModelInfo[], isDefault: boolean, officialName: string): ProviderChoice {
|
function officialChoices(availableModels: ModelInfo[], isDefault: boolean, officialName: string): ProviderChoice {
|
||||||
return {
|
return {
|
||||||
providerId: null,
|
providerId: null,
|
||||||
@ -131,7 +145,9 @@ export function ModelSelector({
|
|||||||
runtimeKey ? state.selections[runtimeKey] : undefined,
|
runtimeKey ? state.selections[runtimeKey] : undefined,
|
||||||
)
|
)
|
||||||
const [open, setOpen] = useState(false)
|
const [open, setOpen] = useState(false)
|
||||||
|
const [dropdownPosition, setDropdownPosition] = useState<DropdownPosition | null>(null)
|
||||||
const ref = useRef<HTMLDivElement>(null)
|
const ref = useRef<HTMLDivElement>(null)
|
||||||
|
const dropdownRef = useRef<HTMLDivElement>(null)
|
||||||
const requestedProvidersRef = useRef(false)
|
const requestedProvidersRef = useRef(false)
|
||||||
|
|
||||||
const EFFORT_OPTIONS: { value: EffortLevel; label: string }[] = [
|
const EFFORT_OPTIONS: { value: EffortLevel; label: string }[] = [
|
||||||
@ -155,7 +171,14 @@ export function ModelSelector({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!open) return
|
if (!open) return
|
||||||
const handleClick = (e: MouseEvent) => {
|
const handleClick = (e: MouseEvent) => {
|
||||||
if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false)
|
const target = e.target as Node
|
||||||
|
if (
|
||||||
|
ref.current &&
|
||||||
|
!ref.current.contains(target) &&
|
||||||
|
!dropdownRef.current?.contains(target)
|
||||||
|
) {
|
||||||
|
setOpen(false)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const handleEsc = (e: KeyboardEvent) => {
|
const handleEsc = (e: KeyboardEvent) => {
|
||||||
if (e.key === 'Escape') setOpen(false)
|
if (e.key === 'Escape') setOpen(false)
|
||||||
@ -168,6 +191,55 @@ export function ModelSelector({
|
|||||||
}
|
}
|
||||||
}, [open])
|
}, [open])
|
||||||
|
|
||||||
|
const updateDropdownPosition = useCallback(() => {
|
||||||
|
const anchor = ref.current
|
||||||
|
if (!anchor) return
|
||||||
|
|
||||||
|
const rect = anchor.getBoundingClientRect()
|
||||||
|
const viewportWidth = window.innerWidth || document.documentElement.clientWidth
|
||||||
|
const viewportHeight = window.innerHeight || document.documentElement.clientHeight
|
||||||
|
const width = Math.min(DROPDOWN_WIDTH, Math.max(0, viewportWidth - VIEWPORT_MARGIN * 2))
|
||||||
|
const left = Math.min(
|
||||||
|
Math.max(VIEWPORT_MARGIN, rect.right - width),
|
||||||
|
Math.max(VIEWPORT_MARGIN, viewportWidth - width - VIEWPORT_MARGIN),
|
||||||
|
)
|
||||||
|
const spaceBelow = viewportHeight - rect.bottom - DROPDOWN_GAP - VIEWPORT_MARGIN
|
||||||
|
const spaceAbove = rect.top - DROPDOWN_GAP - VIEWPORT_MARGIN
|
||||||
|
const placeBelow = spaceBelow >= DROPDOWN_MIN_HEIGHT || spaceBelow >= spaceAbove
|
||||||
|
const availableHeight = Math.max(
|
||||||
|
DROPDOWN_MIN_HEIGHT,
|
||||||
|
placeBelow ? spaceBelow : spaceAbove,
|
||||||
|
)
|
||||||
|
const maxHeight = Math.min(DROPDOWN_MAX_HEIGHT, availableHeight)
|
||||||
|
|
||||||
|
setDropdownPosition({
|
||||||
|
top: placeBelow
|
||||||
|
? rect.bottom + DROPDOWN_GAP
|
||||||
|
: Math.max(VIEWPORT_MARGIN, rect.top - DROPDOWN_GAP - maxHeight),
|
||||||
|
left,
|
||||||
|
width,
|
||||||
|
maxHeight,
|
||||||
|
})
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (!open) {
|
||||||
|
setDropdownPosition(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateDropdownPosition()
|
||||||
|
}, [open, updateDropdownPosition])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!open) return
|
||||||
|
window.addEventListener('resize', updateDropdownPosition)
|
||||||
|
window.addEventListener('scroll', updateDropdownPosition, true)
|
||||||
|
return () => {
|
||||||
|
window.removeEventListener('resize', updateDropdownPosition)
|
||||||
|
window.removeEventListener('scroll', updateDropdownPosition, true)
|
||||||
|
}
|
||||||
|
}, [open, updateDropdownPosition])
|
||||||
|
|
||||||
const roleLabels = useMemo(
|
const roleLabels = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
main: t('settings.providers.mainModel'),
|
main: t('settings.providers.mainModel'),
|
||||||
@ -234,31 +306,19 @@ export function ModelSelector({
|
|||||||
setOpen(false)
|
setOpen(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
const dropdown = open && dropdownPosition
|
||||||
<div ref={ref} className="relative">
|
? createPortal(
|
||||||
<button
|
<div
|
||||||
onClick={() => !disabled && setOpen(!open)}
|
ref={dropdownRef}
|
||||||
disabled={disabled}
|
data-testid="model-selector-dropdown"
|
||||||
className={`flex items-center gap-2 rounded-full bg-[var(--color-surface-container-low)] text-xs font-medium text-[var(--color-text-secondary)] transition-colors hover:bg-[var(--color-surface-hover)] disabled:cursor-not-allowed disabled:opacity-50 ${
|
className="fixed z-[80] rounded-xl border border-[var(--color-border)] bg-[var(--color-surface-container-lowest)] shadow-[var(--shadow-dropdown)]"
|
||||||
compact ? 'max-w-[152px] px-2.5 py-1.5' : 'max-w-[280px] px-3 py-1.5'
|
style={{
|
||||||
}`}
|
top: dropdownPosition.top,
|
||||||
|
left: dropdownPosition.left,
|
||||||
|
width: dropdownPosition.width,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<div className="flex min-w-0 flex-1 items-center gap-2">
|
<div className="overflow-y-auto p-3" style={{ maxHeight: dropdownPosition.maxHeight }}>
|
||||||
<span className={`${compact ? 'text-xs' : 'text-sm'} min-w-0 flex-1 truncate font-semibold text-[var(--color-text-primary)]`}>
|
|
||||||
{buttonModelLabel}
|
|
||||||
</span>
|
|
||||||
{!compact && buttonProviderLabel && (
|
|
||||||
<span className="max-w-[108px] flex-shrink-0 truncate text-[11px] text-[var(--color-text-tertiary)]">
|
|
||||||
{buttonProviderLabel}
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<span className="material-symbols-outlined flex-shrink-0 text-[12px]">expand_more</span>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{open && (
|
|
||||||
<div className="absolute right-0 bottom-full z-50 mb-2 w-[360px] rounded-xl border border-[var(--color-border)] bg-[var(--color-surface-container-lowest)] shadow-[var(--shadow-dropdown)]">
|
|
||||||
<div className="max-h-[420px] overflow-y-auto p-3">
|
|
||||||
<div className="mb-2 px-1 text-[10px] font-bold uppercase tracking-widest text-[var(--color-outline)]">
|
<div className="mb-2 px-1 text-[10px] font-bold uppercase tracking-widest text-[var(--color-outline)]">
|
||||||
{t('model.configuration')}
|
{t('model.configuration')}
|
||||||
</div>
|
</div>
|
||||||
@ -400,8 +460,33 @@ export function ModelSelector({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>,
|
||||||
|
document.body,
|
||||||
|
)
|
||||||
|
: null
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div ref={ref} className="relative">
|
||||||
|
<button
|
||||||
|
onClick={() => !disabled && setOpen(!open)}
|
||||||
|
disabled={disabled}
|
||||||
|
className={`flex items-center gap-2 rounded-full bg-[var(--color-surface-container-low)] text-xs font-medium text-[var(--color-text-secondary)] transition-colors hover:bg-[var(--color-surface-hover)] disabled:cursor-not-allowed disabled:opacity-50 ${
|
||||||
|
compact ? 'max-w-[152px] px-2.5 py-1.5' : 'max-w-[280px] px-3 py-1.5'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<div className="flex min-w-0 flex-1 items-center gap-2">
|
||||||
|
<span className={`${compact ? 'text-xs' : 'text-sm'} min-w-0 flex-1 truncate font-semibold text-[var(--color-text-primary)]`}>
|
||||||
|
{buttonModelLabel}
|
||||||
|
</span>
|
||||||
|
{!compact && buttonProviderLabel && (
|
||||||
|
<span className="max-w-[108px] flex-shrink-0 truncate text-[11px] text-[var(--color-text-tertiary)]">
|
||||||
|
{buttonProviderLabel}
|
||||||
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
<span className="material-symbols-outlined flex-shrink-0 text-[12px]">expand_more</span>
|
||||||
|
</button>
|
||||||
|
{dropdown}
|
||||||
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user