fix: version 2.13.1 -- ComboBox/Flyout no se salen del viewport
El panel se posicionaba una sola vez hacia abajo/derecha del trigger sin revisar si cabia. Ahora se mide el tamaño ya renderizado y se voltea hacia arriba / se recorta hacia adentro si no hay espacio -- regla agregada tambien al orquestador del grupo (project-md-templates/leeme_primero.txt). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
import { ChevronDown, Search } from 'lucide-react';
|
||||
|
||||
@@ -10,16 +10,40 @@ import { ChevronDown, Search } from 'lucide-react';
|
||||
export function ComboBox({ options, value, onChange, placeholder = '', searchThreshold = 10 }) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [query, setQuery] = useState('');
|
||||
const [pos, setPos] = useState(null);
|
||||
const [pos, setPos] = useState(null); // { top, left, width, anchorTop, anchorBottom, ready }
|
||||
const triggerRef = useRef(null);
|
||||
const panelRef = useRef(null);
|
||||
|
||||
function openPanel() {
|
||||
const rect = triggerRef.current.getBoundingClientRect();
|
||||
setPos({ top: rect.bottom + 4, left: rect.left, width: rect.width });
|
||||
setPos({
|
||||
top: rect.bottom + 4, left: rect.left, width: rect.width,
|
||||
anchorTop: rect.top, anchorBottom: rect.bottom, ready: false,
|
||||
});
|
||||
setOpen(true);
|
||||
}
|
||||
|
||||
// Fase 2 (igual tecnica que Flyout): con el panel ya en el DOM (oculto) se mide su alto real y,
|
||||
// si no cabe hacia abajo, se voltea hacia arriba del trigger -- nunca se deja cortado por el
|
||||
// borde inferior del viewport (ver project-md-templates/leeme_primero.txt, seccion UI/UX).
|
||||
useLayoutEffect(() => {
|
||||
if (!open || !pos || pos.ready || !panelRef.current) return;
|
||||
const panelRect = panelRef.current.getBoundingClientRect();
|
||||
const margin = 8;
|
||||
|
||||
let top = pos.top;
|
||||
if (pos.anchorBottom + 4 + panelRect.height > window.innerHeight - margin) {
|
||||
const openUpTop = pos.anchorTop - 4 - panelRect.height;
|
||||
top = openUpTop >= margin ? openUpTop : Math.max(margin, window.innerHeight - margin - panelRect.height);
|
||||
}
|
||||
|
||||
let left = pos.left;
|
||||
if (left + pos.width > window.innerWidth - margin) left = window.innerWidth - margin - pos.width;
|
||||
if (left < margin) left = margin;
|
||||
|
||||
setPos((p) => ({ ...p, top, left, ready: true }));
|
||||
}, [open, pos]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
function onDocMouseDown(e) {
|
||||
@@ -57,7 +81,7 @@ export function ComboBox({ options, value, onChange, placeholder = '', searchThr
|
||||
<ChevronDown size={14} />
|
||||
</button>
|
||||
{open && pos && createPortal(
|
||||
<div ref={panelRef} className="combobox-panel" style={{ top: pos.top, left: pos.left, width: pos.width }}>
|
||||
<div ref={panelRef} className="combobox-panel" style={{ top: pos.top, left: pos.left, width: pos.width, visibility: pos.ready ? 'visible' : 'hidden' }}>
|
||||
{options.length >= searchThreshold && (
|
||||
<div className="combobox-search" style={{ position: 'relative' }}>
|
||||
<Search size={13} style={{ position: 'absolute', left: 8, top: 9, opacity: .6 }} />
|
||||
|
||||
@@ -1,21 +1,53 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
|
||||
// Flyout generico con light-dismiss: click fuera o Esc cierra. trigger recibe { onClick, ref }.
|
||||
// Posicion en dos fases (igual tecnica que ComboBox): se abre debajo/alineado al trigger, se mide
|
||||
// el panel ya renderizado y, si se sale del viewport, se voltea hacia arriba / se recorta hacia
|
||||
// adentro -- nunca se deja que el menu quede cortado por el borde de la ventana (ver
|
||||
// project-md-templates/leeme_primero.txt, seccion UI/UX: "menus flotantes siempre dentro del
|
||||
// viewport").
|
||||
export function Flyout({ trigger, children, align = 'end' }) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [pos, setPos] = useState({ top: 0, left: 0 });
|
||||
const [pos, setPos] = useState(null); // { top, left, anchorTop, anchorBottom, anchorLeft, anchorRight, ready }
|
||||
const anchorRef = useRef(null);
|
||||
const panelRef = useRef(null);
|
||||
|
||||
function openFlyout() {
|
||||
const rect = anchorRef.current.getBoundingClientRect();
|
||||
setPos({
|
||||
top: rect.bottom + 6,
|
||||
left: align === 'end' ? rect.right : rect.left,
|
||||
anchorTop: rect.top,
|
||||
anchorBottom: rect.bottom,
|
||||
anchorLeft: rect.left,
|
||||
anchorRight: rect.right,
|
||||
ready: false,
|
||||
});
|
||||
setOpen(true);
|
||||
}
|
||||
|
||||
// Fase 2: ya con el panel en el DOM (oculto), se mide su tamaño real y se ajusta top/left para
|
||||
// que quepa entero en el viewport antes de mostrarlo -- sin esto, un trigger cerca del borde
|
||||
// inferior/derecho deja el menu cortado por el borde de la ventana.
|
||||
useLayoutEffect(() => {
|
||||
if (!open || !pos || pos.ready || !panelRef.current) return;
|
||||
const panelRect = panelRef.current.getBoundingClientRect();
|
||||
const margin = 8;
|
||||
|
||||
let top = pos.top;
|
||||
if (pos.anchorBottom + 6 + panelRect.height > window.innerHeight - margin) {
|
||||
const openUpTop = pos.anchorTop - 6 - panelRect.height;
|
||||
top = openUpTop >= margin ? openUpTop : Math.max(margin, window.innerHeight - margin - panelRect.height);
|
||||
}
|
||||
|
||||
let left = align === 'end' ? pos.anchorRight - panelRect.width : pos.anchorLeft;
|
||||
if (left + panelRect.width > window.innerWidth - margin) left = window.innerWidth - margin - panelRect.width;
|
||||
if (left < margin) left = margin;
|
||||
|
||||
setPos((p) => ({ ...p, top, left, ready: true }));
|
||||
}, [open, pos]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
function onKey(e) { if (e.key === 'Escape') setOpen(false); }
|
||||
@@ -26,12 +58,13 @@ export function Flyout({ trigger, children, align = 'end' }) {
|
||||
return (
|
||||
<>
|
||||
<span ref={anchorRef}>{trigger({ onClick: () => (open ? setOpen(false) : openFlyout()) })}</span>
|
||||
{open && createPortal(
|
||||
{open && pos && createPortal(
|
||||
<>
|
||||
<div className="flyout-backdrop" onClick={() => setOpen(false)} />
|
||||
<div
|
||||
ref={panelRef}
|
||||
className="flyout-panel"
|
||||
style={{ top: pos.top, left: align === 'end' ? pos.left - 220 : pos.left }}
|
||||
style={{ top: pos.top, left: pos.left, visibility: pos.ready ? 'visible' : 'hidden' }}
|
||||
onClick={() => setOpen(false)}
|
||||
>
|
||||
{children}
|
||||
|
||||
Reference in New Issue
Block a user