mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-20 15:06:19 -05:00
ui: the navbar corner was nudged rather than laid out, and it showed
Three faults in the bar, all reproduced by measurement before being fixed. The indicators sat low. The slot carried `marginTop: 0.8em`, a nudge left over from Semantic's menu; the corner centres its children, and a top margin is part of the margin box being centred, so it applied as a ~6px downward shift. It read as an error on the hotspot and the theme picker but not on share or search, which is why it survived: an IconButton is a square ActionIcon that centres its glyph exactly, while a bare-icon anchor sits high inside a line box that reserves descender space for text that is not there. The nudge cancelled that out on one shape and was pure error on the other. Both are laid out now -- flex, centred, no nudge -- and the anchors get `display: flex` so they hug their glyph instead of a text line. Help and Admin highlighted only a box around their text while Videos and Statistics highlighted the full height. Same class, same rules, different parent: the bar stretches its children, but the corner is a nested flex container that centres its own, so a link inside it was sized to its content. The hover background is painted on the link box, so that box IS the affordance. The bar broke onto a second line at certain widths. Two measurement errors that only overlap in a narrow band, which is why it appeared while resizing rather than always. useOverflowNav measured the WRAPPER's offsetWidth and subtracted only the home link and the corner, missing the bar's own `padding: 0 0.25em` -- about 8px it believed it had. And the hidden "More" placeholder it measured was a plain button with no dropdown caret, about 21px narrower than the button that eventually rendered. The placeholder is now the same component as the real trigger, so the two cannot drift again. Tested in ui-layout.cy.js against the real <DesktopNav/>, which takes its colours, home link and indicators as props and so needs none of NavBar's polling hooks. Indicator centres are measured against the bar's centre rather than each other, because three things can be equally and consistently wrong and were. The wrap case sweeps 1180px down to 640px in 6px steps -- a spot check steps over a band that narrow. All three failed first: share 3.4px high, Help 24.8px against a 54.4px bar, and two rows at 1156px. Confirmed on the running app: every indicator at 0.0px from the bar's centre, Help and Admin at the full 54.4px, and no wrap anywhere from 1500px to 780px. 1115 jest / 62 suites, 182 in ui-layout.cy.js, clean npm run build.
This commit is contained in:
parent
149b40acbd
commit
2058246ef0
4 changed files with 279 additions and 9 deletions
|
|
@ -102,15 +102,30 @@ function DropdownMenuItem({link}) {
|
|||
</Menu.Item>
|
||||
}
|
||||
|
||||
/*
|
||||
* The trigger for a navbar dropdown.
|
||||
*
|
||||
* Shared with the hidden placeholder DesktopNav measures on its first render, and that is
|
||||
* the point of extracting it. The placeholder used to be a plain `<button>More</button>`
|
||||
* with no caret, so the space reserved for the overflow menu was about 21px short of the
|
||||
* button that eventually rendered -- the row overflowed by that much and the bar wrapped.
|
||||
* Measuring one thing and drawing another is only ever right by coincidence.
|
||||
*/
|
||||
const NavDropdownTrigger = React.forwardRef(({text, ...props}, ref) =>
|
||||
<button type='button' ref={ref} className='wrolpi-navbar-link wrolpi-navbar-link-button'
|
||||
{...props}>
|
||||
{text}
|
||||
<Icon name='dropdown' size='small' style={{marginLeft: '0.35em'}}/>
|
||||
</button>
|
||||
);
|
||||
NavDropdownTrigger.displayName = 'NavDropdownTrigger';
|
||||
|
||||
function DropdownLinks({link}) {
|
||||
// A labelled dropdown trigger: the desktop "More" overflow, or any nested
|
||||
// link group handed to MenuLink.
|
||||
return <Menu position='bottom-end' withinPortal>
|
||||
<Menu.Target>
|
||||
<button type='button' className='wrolpi-navbar-link wrolpi-navbar-link-button'>
|
||||
{link.text}
|
||||
<Icon name='dropdown' size='small' style={{marginLeft: '0.35em'}}/>
|
||||
</button>
|
||||
<NavDropdownTrigger text={link.text}/>
|
||||
</Menu.Target>
|
||||
<Menu.Dropdown>
|
||||
{link.links.map(l => <DropdownMenuItem key={l.key} link={l}/>)}
|
||||
|
|
@ -130,9 +145,23 @@ function MobileMenu({links}) {
|
|||
</Menu>
|
||||
}
|
||||
|
||||
function NavIconWrapper({children}) {
|
||||
/*
|
||||
* One status indicator's slot in the right-hand corner.
|
||||
*
|
||||
* This used to carry `marginTop: 0.8em`, a nudge left over from Semantic's menu. The corner
|
||||
* centres its children, and a top margin is part of the margin box being centred, so the
|
||||
* nudge pushed every indicator down by half of it -- about 6px.
|
||||
*
|
||||
* That read as an error on some and not others, which is why it survived: the bare-icon
|
||||
* anchors (share, search) sit high inside their line box because it reserves descender space
|
||||
* for text that is not there, so the nudge happened to cancel out. An IconButton is a square
|
||||
* ActionIcon that centres its glyph exactly, so for the hotspot and the theme picker the
|
||||
* nudge was 6px of pure error. Laying the slot out as a flex box centres both shapes on
|
||||
* their real glyph box and needs no nudge at all.
|
||||
*/
|
||||
export function NavIconWrapper({children}) {
|
||||
if (children) {
|
||||
return <div style={{marginTop: '0.8em', marginLeft: '1.5em'}}>{children}</div>
|
||||
return <div className='wrolpi-navbar-icon'>{children}</div>
|
||||
} else {
|
||||
// Do not use navbar space if children is empty.
|
||||
return <React.Fragment/>
|
||||
|
|
@ -383,7 +412,7 @@ export function NavBar() {
|
|||
</>
|
||||
}
|
||||
|
||||
function DesktopNav({navColors, homeLink, icons}) {
|
||||
export function DesktopNav({navColors, homeLink, icons}) {
|
||||
const containerRef = React.useRef(null);
|
||||
const homeRef = React.useRef(null);
|
||||
const rightMenuRef = React.useRef(null);
|
||||
|
|
@ -410,7 +439,7 @@ function DesktopNav({navColors, homeLink, icons}) {
|
|||
</span>
|
||||
))}
|
||||
{!isReady && <span ref={moreRef} style={{visibility: 'hidden', flexShrink: 0}}>
|
||||
<button type='button' className='wrolpi-navbar-link wrolpi-navbar-link-button'>More</button>
|
||||
<NavDropdownTrigger text='More'/>
|
||||
</span>}
|
||||
{isReady && overflowLinks.length > 0 &&
|
||||
<DropdownLinks link={{text: 'More', key: 'more', links: overflowLinks}}/>}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue