bootstrap: navbar collapse jQuery -> React state (BS4->5 prep)

Bootstrap's jQuery collapse (`data-toggle="collapse"` in Navigation.js, plus the
per-NavItem `data-target=".navbar-collapse.show"` auto-close) disappears when we
drop `alexwine:bootstrap-4` for `bootstrap@5`. Replace it with a React `useState`
that toggles `.show`, and close the mobile menu via an onClick on the nav <ul>.

Works on the current BS4 CSS (`.collapse.show` is pure CSS; jQuery only added the
height animation) and removes one of the two jQuery/BS4 JS blockers to the CSS
swap (the home carousel is the other). Also drops the dead sr-only toggler button
that targeted a non-existent id. No CSS changes.
This commit is contained in:
vjrj 2026-07-21 23:04:02 +02:00
parent 6b6f02d92d
commit 8dead27d22
3 changed files with 57 additions and 44 deletions

View file

@ -68,11 +68,17 @@ React 19: el `<Blaze serverFacts>` de Status.js (`findDOMNode`), solo en `/statu
- **Salto Bootstrap 4→5 (CSS/JS) pendiente:** react-bootstrap ya está en v2 y - **Salto Bootstrap 4→5 (CSS/JS) pendiente:** react-bootstrap ya está en v2 y
corre sobre el CSS Bootstrap 4 actual (`alexwine:bootstrap-4`) con un único corre sobre el CSS Bootstrap 4 actual (`alexwine:bootstrap-4`) con un único
shim `.form-label` en `forms.scss`. El salto a Bootstrap 5 npm está diferido shim `.form-label` en `forms.scss`. El salto a Bootstrap 5 npm está diferido
porque el carrusel del home (`bootstrap-carousel-swipe`, jQuery/BS4) y el porque el carrusel del home (`bootstrap-carousel-swipe`, jQuery/BS4) depende del
collapse del navbar dependen del JS jQuery de BS4 (`data-toggle`, `data-slide`). JS jQuery de BS4 (`data-slide`).
Al hacerlo: importar `bootstrap@5` SCSS+JS, reescribir el carrusel (BS5 trae - ✅ **Collapse del navbar migrado a React** (`Navigation.js` + `NavItem.js`):
swipe nativo → quitar el plugin), `data-toggle``data-bs-toggle`, el `data-toggle="collapse"` jQuery se sustituyó por estado React (`useState`
`ml-auto``ms-auto`, revisar `new-age.scss`/`custom.scss`/`bootstrap-overrides.scss`. que alterna `.show`); funciona ya sobre el CSS BS4 y no depende del JS jQuery.
*Verificar en staging el menú móvil (<lg): abrir/cerrar y cierre al pulsar un
enlace.* Un blocker jQuery menos.
- Falta: reescribir el carrusel (BS5 trae swipe nativo → quitar el plugin),
importar `bootstrap@5` SCSS+JS, `data-slide``data-bs-slide`,
`ml-auto``ms-auto`, `sr-only``visually-hidden`, revisar
`new-age.scss`/`custom.scss`/`bootstrap-overrides.scss`.
- **Limpieza menor:** migración 217 `// TODO remove falsepositives lowercase - **Limpieza menor:** migración 217 `// TODO remove falsepositives lowercase
collection`; `prerender.js` gating comentado; sección per-fire del sitemap collection`; `prerender.js` gating comentado; sección per-fire del sitemap
eliminada (era código muerto tras `firesMapEnabled=false`). eliminada (era código muerto tras `firesMapEnabled=false`).

View file

@ -4,7 +4,9 @@ import PropTypes from 'prop-types';
// Self-contained NavItem. The old one wrapped react-bootstrap 0.31's // Self-contained NavItem. The old one wrapped react-bootstrap 0.31's
// `SafeAnchor` + `createChainedFunction` (both gone in v2); the markup this // `SafeAnchor` + `createChainedFunction` (both gone in v2); the markup this
// navbar needs is just an <li><a> that toggles the collapsed menu on click. // navbar needs is just an <li><a>. The mobile menu is now collapsed from React
// state in Navigation (the parent <ul onClick>), so the old jQuery
// `data-toggle="collapse"` / `data-target` hooks were dropped here.
const propTypes = { const propTypes = {
active: PropTypes.bool, active: PropTypes.bool,
disabled: PropTypes.bool, disabled: PropTypes.bool,
@ -57,8 +59,6 @@ class NavItem extends React.Component {
return ( return (
<li <li
role="presentation" role="presentation"
data-toggle="collapse"
data-target=".navbar-collapse.show"
className={classNames(className, { active, disabled })} className={classNames(className, { active, disabled })}
style={style} style={style}
> >

View file

@ -15,44 +15,51 @@ import './Navigation.scss';
// removed class: fixed-top // removed class: fixed-top
// md instead of lg: no menu in medium // md instead of lg: no menu in medium
const Navigation = ({ name = '', ...props }) => ( //
<nav className="navbar navbar-expand-lg navbar-dark bg-dark"> // Bootstrap 4→5 prep: the collapse used to be driven by Bootstrap's jQuery JS
<div style={{ overflow: 'hidden' } /* for ribbon */} className="container"> // (`data-toggle="collapse"`), which goes away when we drop `alexwine:bootstrap-4`
{/* <BetaRibbon /> */} // for `bootstrap@5`. Toggling the `.show` class from React state removes that
<Link to="/" className={`navbar-brand ${window.location.pathname === '/' ? 'hide-brand' : ''}`} > // dependency and keeps working on the current BS4 CSS (`.collapse.show` is pure
{props.t('AppNameFull')} // CSS; jQuery only added the height animation). Clicking a nav link collapses the
</Link> // mobile menu again — the old per-NavItem `data-target=".navbar-collapse.show"`.
<button className="sr-only navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> const Navigation = ({ name = '', ...props }) => {
<span className="navbar-toggler-icon" /> const [open, setOpen] = React.useState(false);
</button> const close = () => setOpen(false);
<button className="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation"> return (
<span className="navbar-toggler-icon" /> <nav className="navbar navbar-expand-lg navbar-dark bg-dark">
</button> <div style={{ overflow: 'hidden' } /* for ribbon */} className="container">
{/* <Navbar.Collapse> */} {/* <BetaRibbon /> */}
<div className="collapse navbar-collapse" id="navbarNavDropdown"> <Link to="/" className={`navbar-brand ${window.location.pathname === '/' ? 'hide-brand' : ''}`} >
<ul className="navbar-nav ml-auto "> {props.t('AppNameFull')}
{/* <LinkContainer className="nav-item" anchorClassName="nav-link" to="/sandbox"> </Link>
<NavItem eventKey={1.1} href="/sandbox">Sandbox</NavItem> <button className="navbar-toggler" type="button" onClick={() => setOpen(o => !o)} aria-controls="navbarNavDropdown" aria-expanded={open} aria-label="Toggle navigation">
</LinkContainer> */} <span className="navbar-toggler-icon" />
<LinkContainer id={testId('subscriptions')} className="nav-item" anchorClassName="nav-link" to="/subscriptions"> </button>
<NavItem eventKey={1.2} href="/subscriptions"> <div className={`collapse navbar-collapse${open ? ' show' : ''}`} id="navbarNavDropdown">
{props.authenticated ? <Trans>Mis zonas</Trans> : <Trans>Participar</Trans>} {/* onClick closes the mobile menu when a main nav link is tapped */}
</NavItem> <ul className="navbar-nav ml-auto " onClick={close}>
</LinkContainer> {/* <LinkContainer className="nav-item" anchorClassName="nav-link" to="/sandbox">
<LinkContainer id={testId('moniZones')} className="nav-item" anchorClassName="nav-link" to="/zones"> <NavItem eventKey={1.1} href="/sandbox">Sandbox</NavItem>
<NavItem eventKey={2} href="/zones">{props.t('Zonas vigiladas')}</NavItem> </LinkContainer> */}
</LinkContainer> <LinkContainer id={testId('subscriptions')} className="nav-item" anchorClassName="nav-link" to="/subscriptions">
<LinkContainer id={testId('activeFires')} className="nav-item" anchorClassName="nav-link" to="/fires"> <NavItem eventKey={1.2} href="/subscriptions">
<NavItem eventKey={2.1} href="/fires">{props.t('activeFires')}</NavItem> {props.authenticated ? <Trans>Mis zonas</Trans> : <Trans>Participar</Trans>}
</LinkContainer> </NavItem>
</LinkContainer>
<LinkContainer id={testId('moniZones')} className="nav-item" anchorClassName="nav-link" to="/zones">
<NavItem eventKey={2} href="/zones">{props.t('Zonas vigiladas')}</NavItem>
</LinkContainer>
<LinkContainer id={testId('activeFires')} className="nav-item" anchorClassName="nav-link" to="/fires">
<NavItem eventKey={2.1} href="/fires">{props.t('activeFires')}</NavItem>
</LinkContainer>
</ul> </ul>
{!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation name={name} {...props} />} {!props.authenticated ? <PublicNavigation /> : <AuthenticatedNavigation name={name} {...props} />}
{/* </Navbar.Collapse> */} </div>
</div> </div>
</div> </nav>
</nav> );
); };
Navigation.propTypes = { Navigation.propTypes = {
t: PropTypes.func.isRequired, t: PropTypes.func.isRequired,