feat(android): the phone's "More" is a bottom sheet #211
@@ -1113,9 +1113,9 @@ not the fix and cannot be: that function is the `document` listener for
|
|||||||
`navigate`, so it is an infinite loop.
|
`navigate`, so it is an infinite loop.
|
||||||
|
|
||||||
**It is a store rather than an event, because a component that mounts
|
**It is a store rather than an event, because a component that mounts
|
||||||
after a navigation still has to know.** `bottom-nav`'s "More" drawer
|
after a navigation still has to know.** `bottom-nav`'s "More" sheet
|
||||||
creates its `<app-sidebar>` on open, and that copy had heard no
|
creates its `<app-sidebar>` on open, and that copy had heard no
|
||||||
`navigate` at all — standing on Albums, the drawer opened highlighting
|
`navigate` at all — standing on Albums, it opened highlighting
|
||||||
Home. An event has no answer for a listener that was not there.
|
Home. An event has no answer for a listener that was not there.
|
||||||
|
|
||||||
**A detail view is not a view here**, so the destination it was opened
|
**A detail view is not a view here**, so the destination it was opened
|
||||||
@@ -1216,7 +1216,7 @@ and then vanishing.
|
|||||||
than a general rule about phones.** `PHONE_COLUMN_IDS` is the precedent
|
than a general rule about phones.** `PHONE_COLUMN_IDS` is the precedent
|
||||||
for "what a phone shows is a different question", and it would apply —
|
for "what a phone shows is a different question", and it would apply —
|
||||||
except that `bottom-nav`'s "More" opens the *same* `<app-sidebar>`,
|
except that `bottom-nav`'s "More" opens the *same* `<app-sidebar>`,
|
||||||
which filters, so an unfiltered bar would contradict its own drawer one
|
which filters, so an unfiltered bar would contradict its own sheet one
|
||||||
tap away. Which four tabs is still plan 016's committed subset; this
|
tap away. Which four tabs is still plan 016's committed subset; this
|
||||||
only removes from it, and "More" is never filtered because it is how
|
only removes from it, and "More" is never filtered because it is how
|
||||||
everything else stays reachable.
|
everything else stays reachable.
|
||||||
@@ -1874,7 +1874,7 @@ listing the destinations again — but rendering it unconditionally put a
|
|||||||
second copy of every `data-testid="nav-*"` in the DOM, and 30 existing
|
second copy of every `data-testid="nav-*"` in the DOM, and 30 existing
|
||||||
specs failed with "strict mode violation: resolved to 2 elements" on a
|
specs failed with "strict mode violation: resolved to 2 elements" on a
|
||||||
desktop viewport where the element is not even visible. It renders only
|
desktop viewport where the element is not even visible. It renders only
|
||||||
while the drawer is open, and `bottom-nav.test.ts` asserts its absence
|
while the sheet is open, and `bottom-nav.test.ts` asserts its absence
|
||||||
before that.
|
before that.
|
||||||
|
|
||||||
**The tab bar is four destinations and a way to the rest.** Three to
|
**The tab bar is four destinations and a way to the rest.** Three to
|
||||||
@@ -1883,6 +1883,33 @@ is 32px each. Which four is plan 016's committed subset, and everything
|
|||||||
else — Settings included, because a phone still needs it — is behind
|
else — Settings included, because a phone still needs it — is behind
|
||||||
"More".
|
"More".
|
||||||
|
|
||||||
|
**And "More" rises from the bottom, on #60's sheet rather than a
|
||||||
|
second one** (#71). It was a `wa-drawer placement="start"`: a 200px
|
||||||
|
column of a 424px screen, opening away from the thumb that asked for
|
||||||
|
it, with the rest of its 400px band empty. It is the *same element*
|
||||||
|
with `placement="bottom"` and `without-header`, which is what keeps
|
||||||
|
the change to where it comes from — `wa-drawer` renders a native
|
||||||
|
`<dialog>` and opens it with `showModal()`, so #60's containment
|
||||||
|
finding carries over with nothing new to prove, and the focus trap,
|
||||||
|
Escape, tap-outside and `wa-after-hide` all come along. Measured at
|
||||||
|
424x439: 424 wide, 373 tall (85vh, so there is an outside to tap),
|
||||||
|
48px rows.
|
||||||
|
|
||||||
|
Three things about it are load-bearing. **The sidebar is mounted
|
||||||
|
rather than re-listed as data**, which the issue offers as the
|
||||||
|
alternative: the shell's own `<app-sidebar>` is `display: none` below
|
||||||
|
600px rather than removed, so a second list drawing `nav-*` handles is
|
||||||
|
the duplication above, and it would be a second place to add the next
|
||||||
|
view to. **There is one scroller, and it is the sheet's body** — the
|
||||||
|
reported "only part of the screen scrolls under my finger" is three
|
||||||
|
nested ones (the dialog, its body, and the sidebar's own
|
||||||
|
`overflow-y: auto` host), so which box a drag moves depends on where
|
||||||
|
the finger landed; `overscroll-behavior: contain` is the other half.
|
||||||
|
And **`expanded` means the host owns the box, not just the labels**:
|
||||||
|
`app-sidebar` writes an *inline* width and caps itself at 400px, which
|
||||||
|
beats any rule the host could write, so the width, the scrolling and
|
||||||
|
the mouse-only resize handle all follow that attribute.
|
||||||
|
|
||||||
**There are three supported size bands, and the queue is part of the
|
**There are three supported size bands, and the queue is part of the
|
||||||
promise.** Plan 018 (#24) wrote them down: **Phone** below 600 (bottom
|
promise.** Plan 018 (#24) wrote them down: **Phone** below 600 (bottom
|
||||||
nav, reflows, fits 320px exactly), **Compact** 600–899 (icon sidebar),
|
nav, reflows, fits 320px exactly), **Compact** 600–899 (icon sidebar),
|
||||||
|
|||||||
@@ -98,6 +98,58 @@ test.describe('the shell on a phone', () => {
|
|||||||
).toBeVisible();
|
).toBeVisible();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('draws "More" as a sheet on the bottom edge (#71)', async ({ app }) => {
|
||||||
|
await app.getByTestId('tab-more').click();
|
||||||
|
await expect(app.getByTestId('nav-drawer').locator('app-sidebar'))
|
||||||
|
.toBeVisible();
|
||||||
|
|
||||||
|
// What the report is about is geometry, and geometry is what no
|
||||||
|
// other assertion here can see: the side drawer was a 200px column
|
||||||
|
// opening away from the thumb that asked for it, with the rest of
|
||||||
|
// its 400px band empty. Measured rather than screenshotted, since
|
||||||
|
// the failure is a number.
|
||||||
|
//
|
||||||
|
// Polled, because a sheet *arrives*: the drawer's show animation
|
||||||
|
// translates it a full height below the fold, so a measurement
|
||||||
|
// taken the moment its content is visible reports a box hanging
|
||||||
|
// 412px off the bottom of the screen. Asking for the settled
|
||||||
|
// number is the assertion; asking once is a race.
|
||||||
|
const measure = () => app.evaluate(() => {
|
||||||
|
const nav = document.querySelector('bottom-nav');
|
||||||
|
const drawer = nav?.shadowRoot?.querySelector('wa-drawer');
|
||||||
|
const dialog = drawer?.shadowRoot?.querySelector('[part~="dialog"]');
|
||||||
|
const sidebar = nav?.shadowRoot?.querySelector('app-sidebar');
|
||||||
|
const row = sidebar?.shadowRoot?.querySelector('li button');
|
||||||
|
const box = dialog?.getBoundingClientRect();
|
||||||
|
|
||||||
|
return {
|
||||||
|
left: Math.round(box?.left ?? -1),
|
||||||
|
right: Math.round(box?.right ?? -1),
|
||||||
|
bottom: Math.round(box?.bottom ?? -1),
|
||||||
|
height: Math.round(box?.height ?? -1),
|
||||||
|
row: Math.round(row?.getBoundingClientRect().height ?? -1),
|
||||||
|
viewport: [window.innerWidth, window.innerHeight],
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(async () => (await measure()).bottom)
|
||||||
|
.toBe(PHONE.height);
|
||||||
|
|
||||||
|
const sheet = await measure();
|
||||||
|
|
||||||
|
expect(sheet.left).toBe(0);
|
||||||
|
expect(sheet.right).toBe(sheet.viewport[0]);
|
||||||
|
|
||||||
|
// A surface covering the whole screen is a page, not a sheet --
|
||||||
|
// which is also what leaves an outside to tap on, the only pointer
|
||||||
|
// route out of it (#171 is the same question one surface over).
|
||||||
|
expect(sheet.height).toBeLessThan(sheet.viewport[1]);
|
||||||
|
|
||||||
|
// 48px rows, from #186's touch floor and #60's context sheet.
|
||||||
|
expect(sheet.row).toBeGreaterThanOrEqual(48);
|
||||||
|
});
|
||||||
|
|
||||||
for (const vp of [PHONE, SMALL_PHONE]) {
|
for (const vp of [PHONE, SMALL_PHONE]) {
|
||||||
test(`does not scroll sideways at ${vp.width}×${vp.height}`, async ({ app }) => {
|
test(`does not scroll sideways at ${vp.width}×${vp.height}`, async ({ app }) => {
|
||||||
await app.setViewportSize(vp);
|
await app.setViewportSize(vp);
|
||||||
|
|||||||
@@ -27,15 +27,43 @@ interface Tab {
|
|||||||
* three to five items before the targets stop being thumb-sized —
|
* three to five items before the targets stop being thumb-sized —
|
||||||
* 360 px over eleven sidebar entries is 32 px each — so the four here
|
* 360 px over eleven sidebar entries is 32 px each — so the four here
|
||||||
* are the ones plan 016's subset says a phone is *for*, and "More"
|
* are the ones plan 016's subset says a phone is *for*, and "More"
|
||||||
* opens the existing `<app-sidebar>` in a drawer. That is deliberately
|
* opens the existing `<app-sidebar>` in a sheet. That is deliberately
|
||||||
* a reuse rather than a second nav: two lists of destinations is two
|
* a reuse rather than a second nav: two lists of destinations is two
|
||||||
* places to add the next view to, and the sidebar already carries the
|
* places to add the next view to, and the sidebar already carries the
|
||||||
* drag-to-navigate behaviour, the active state and the labels.
|
* drag-to-navigate behaviour, the active state and the labels.
|
||||||
*
|
*
|
||||||
|
* **"More" rises from the bottom, and it is the same sheet a context
|
||||||
|
* menu is** (#71). It was a `wa-drawer` sliding in from the side: a
|
||||||
|
* 200px column of a 424px screen, opening away from the thumb that
|
||||||
|
* asked for it, with three nested scrollers in it — the dialog, its
|
||||||
|
* body, and the sidebar's own `overflow-y: auto` host — which is the
|
||||||
|
* "only part of the screen scrolls under my finger" in the report.
|
||||||
|
*
|
||||||
|
* Three things about the replacement are load-bearing.
|
||||||
|
*
|
||||||
|
* **It is the same element with another `placement`, not a new
|
||||||
|
* surface.** `wa-drawer` renders a native `<dialog>` and opens it with
|
||||||
|
* `showModal()`, which is exactly what `menu-surface`'s sheet relies
|
||||||
|
* on — Chrome 37, the real top layer — so #60's containment finding
|
||||||
|
* carries over with nothing new to prove, and the focus trap, Escape,
|
||||||
|
* tap-outside and `wa-after-hide` all come along unchanged.
|
||||||
|
*
|
||||||
|
* **The body is the only scroller**, with `overscroll-behavior:
|
||||||
|
* contain`, and the sidebar is told to stop being one. Nesting them is
|
||||||
|
* what makes a drag scroll the wrong box.
|
||||||
|
*
|
||||||
|
* **The sidebar is still mounted rather than re-listed as data**,
|
||||||
|
* which the issue offers as an alternative. Its `data-testid` per
|
||||||
|
* destination is the reason: the shell's own sidebar is `display:
|
||||||
|
* none` below 600px rather than removed, so a second list drawing
|
||||||
|
* `nav-*` handles is the duplication this component already renders
|
||||||
|
* conditionally to avoid — and it would be a second place to add the
|
||||||
|
* next view to, with its own copy of #25's visibility filter.
|
||||||
|
*
|
||||||
* It emits the same bubbling, composed `navigate` event the sidebar
|
* It emits the same bubbling, composed `navigate` event the sidebar
|
||||||
* does, so `index.ts` needs no knowledge of it, and it listens for that
|
* does, so `index.ts` needs no knowledge of it, and it listens for that
|
||||||
* event globally for the same reason the sidebar does: a navigation it
|
* event globally for the same reason the sidebar does: a navigation it
|
||||||
* did not send (a card click, a detail view, the drawer) still has to
|
* did not send (a card click, a detail view, the sheet) still has to
|
||||||
* move the highlight.
|
* move the highlight.
|
||||||
*/
|
*/
|
||||||
@customElement('bottom-nav')
|
@customElement('bottom-nav')
|
||||||
@@ -115,15 +143,50 @@ export class BottomNav extends LitElement {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
wa-drawer::part(body) {
|
/* The sheet. --size is the drawer's own API for the axis its
|
||||||
padding: 0;
|
placement uses, so auto is what makes it hug its content
|
||||||
|
instead of being a fixed 25rem band; the rest is the shape
|
||||||
|
the menu-surface context sheet already has, so a phone meets
|
||||||
|
one sheet rather than two. 85vh for its reason too: a surface
|
||||||
|
covering the whole screen is a page, not a sheet. */
|
||||||
|
wa-drawer {
|
||||||
|
--size: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
app-sidebar {
|
wa-drawer::part(dialog) {
|
||||||
/* The sidebar sizes itself inline and collapses to icons
|
max-height: 85vh;
|
||||||
below 900px, which is every phone. In the drawer there
|
border-radius: 12px 12px 0 0;
|
||||||
is room for the labels, so it is told not to. */
|
/* The sidebar paints its own surface, so the sheet takes
|
||||||
height: 100%;
|
that colour rather than the menus' elevated one: two
|
||||||
|
greys in one sheet is a seam across the middle of it. */
|
||||||
|
background-color: var(--yj-bg-surface, #212529);
|
||||||
|
/* One scroller, and it is the body below. The dialog's own
|
||||||
|
overflow: auto is what let the sheet scroll as well as
|
||||||
|
its content, and it is also what would square off the
|
||||||
|
corners this rule just rounded. */
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
wa-drawer::part(body) {
|
||||||
|
padding: 0;
|
||||||
|
/* A scroll that reaches the end of this list must not
|
||||||
|
become a scroll of the page underneath it. */
|
||||||
|
overscroll-behavior: contain;
|
||||||
|
/* The sheet sits on the bottom edge, so the last
|
||||||
|
destination would otherwise be under the home indicator
|
||||||
|
on a gesture-navigation phone -- the same allowance the
|
||||||
|
bar itself makes above. */
|
||||||
|
padding-bottom: env(safe-area-inset-bottom, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* A sheet is dragged at with a thumb, so it says where its top
|
||||||
|
edge is. Decorative: the destinations are below it. */
|
||||||
|
.grip {
|
||||||
|
width: 36px;
|
||||||
|
height: 4px;
|
||||||
|
margin: 8px auto 4px;
|
||||||
|
border-radius: 2px;
|
||||||
|
background: var(--yj-text-tertiary, #888);
|
||||||
}
|
}
|
||||||
`];
|
`];
|
||||||
|
|
||||||
@@ -158,7 +221,7 @@ export class BottomNav extends LitElement {
|
|||||||
private visibilityCtrl = new ViewVisibilityController(this);
|
private visibilityCtrl = new ViewVisibilityController(this);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the drawer has been asked for.
|
* Whether the sheet has been asked for.
|
||||||
*
|
*
|
||||||
* The sidebar inside it is rendered only while this is true, and
|
* The sidebar inside it is rendered only while this is true, and
|
||||||
* that is not an optimisation. `app-sidebar` carries a
|
* that is not an optimisation. `app-sidebar` carries a
|
||||||
@@ -200,15 +263,17 @@ export class BottomNav extends LitElement {
|
|||||||
|
|
||||||
override updated() {
|
override updated() {
|
||||||
// Web Awesome renders its heading into its own shadow root and
|
// Web Awesome renders its heading into its own shadow root and
|
||||||
// never points aria-labelledby at it, so the drawer would
|
// never points aria-labelledby at it, so the sheet would
|
||||||
// otherwise be announced unnamed -- the same fix, and the same
|
// otherwise be announced unnamed -- the same fix, and the same
|
||||||
// reason, as every wa-dialog in the app. A drawer's shadow root
|
// reason, as every wa-dialog in the app. A drawer's shadow root
|
||||||
// has the same shape, so the helper needs no change.
|
// has the same shape, so the helper needs no change; under
|
||||||
|
// `without-header` there is no heading to point at, which is
|
||||||
|
// that helper's documented `aria-label` path.
|
||||||
nameDialog(this.drawer);
|
nameDialog(this.drawer);
|
||||||
}
|
}
|
||||||
|
|
||||||
private onGlobalNavigate = () => {
|
private onGlobalNavigate = () => {
|
||||||
// A navigation from inside the drawer is the drawer's job done.
|
// A navigation from inside the sheet is the sheet's job done.
|
||||||
// The highlight is not this listener's business any more.
|
// The highlight is not this listener's business any more.
|
||||||
this.drawerOpen = false;
|
this.drawerOpen = false;
|
||||||
};
|
};
|
||||||
@@ -274,12 +339,14 @@ export class BottomNav extends LitElement {
|
|||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<wa-drawer
|
<wa-drawer
|
||||||
placement="start"
|
placement="bottom"
|
||||||
|
without-header
|
||||||
label="All views"
|
label="All views"
|
||||||
data-testid="nav-drawer"
|
data-testid="nav-drawer"
|
||||||
?open=${this.drawerOpen}
|
?open=${this.drawerOpen}
|
||||||
@wa-after-hide=${this.onDrawerHide}
|
@wa-after-hide=${this.onDrawerHide}
|
||||||
>
|
>
|
||||||
|
<div class="grip"></div>
|
||||||
${this.drawerOpen
|
${this.drawerOpen
|
||||||
? html`<app-sidebar expanded></app-sidebar>`
|
? html`<app-sidebar expanded></app-sidebar>`
|
||||||
: nothing}
|
: nothing}
|
||||||
|
|||||||
@@ -42,6 +42,26 @@ export class AppSidebar extends LitElement {
|
|||||||
scrollbar-width: thin;
|
scrollbar-width: thin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A host that has made room owns the box, not just the labels
|
||||||
|
(#71). The bottom-nav sheet is the width of the screen and
|
||||||
|
provides the one scroll container it needs; left to itself
|
||||||
|
the sidebar is a 200px column with a second scroller inside
|
||||||
|
it, which is what a nested scroll region feels like under a
|
||||||
|
thumb -- part of the surface moves and part of it does not. */
|
||||||
|
:host([expanded]) {
|
||||||
|
max-width: none;
|
||||||
|
height: auto;
|
||||||
|
overflow: visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* And the width is not draggable there. It is a mouse
|
||||||
|
affordance (mousedown, col-resize) sitting on the right edge
|
||||||
|
of a touch surface, where the compatibility mouse events a
|
||||||
|
tap synthesises can start a resize nobody asked for. */
|
||||||
|
:host([expanded]) .resize-handle {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.resize-handle {
|
.resize-handle {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
@@ -160,6 +180,25 @@ export class AppSidebar extends LitElement {
|
|||||||
:host(.collapsed) li button wa-icon {
|
:host(.collapsed) li button wa-icon {
|
||||||
font-size: var(--yj-icon-md);
|
font-size: var(--yj-icon-md);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Below 600px the only place this renders is the bottom-nav
|
||||||
|
sheet -- the shell's own copy is display: none there -- so
|
||||||
|
the rows are sized for the thumb that opened it: 48px, which
|
||||||
|
is #186's floor and the height every row in #60's context
|
||||||
|
sheet already has. A media query inside a shadow root is
|
||||||
|
answered by the viewport, so the component states this
|
||||||
|
itself rather than the sheet reaching in. */
|
||||||
|
@media (max-width: 599px) {
|
||||||
|
ul {
|
||||||
|
padding: 4px 8px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
li button {
|
||||||
|
min-height: 48px;
|
||||||
|
padding: 12px 10px;
|
||||||
|
gap: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
`];
|
`];
|
||||||
|
|
||||||
/** Delay in ms before a drag-hover triggers navigation. */
|
/** Delay in ms before a drag-hover triggers navigation. */
|
||||||
@@ -188,11 +227,14 @@ export class AppSidebar extends LitElement {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Keep the labels regardless of the viewport, for a host that has
|
* Keep the labels regardless of the viewport, for a host that has
|
||||||
* made room for them -- `bottom-nav`'s drawer, which is the whole
|
* made room for them -- `bottom-nav`'s sheet, which is the whole
|
||||||
* screen wide on the phone where this would otherwise auto-collapse
|
* screen wide on the phone where this would otherwise auto-collapse
|
||||||
* to icons. The auto-collapse is a *width* response to a narrow
|
* to icons. The auto-collapse is a *width* response to a narrow
|
||||||
* shell, and inside a drawer the shell is not what the sidebar is
|
* shell, and inside a sheet the shell is not what the sidebar is
|
||||||
* sharing space with.
|
* sharing space with.
|
||||||
|
*
|
||||||
|
* It says the host owns the *box*, not only the labels: the width,
|
||||||
|
* the scrolling and the resize handle all follow it (#71).
|
||||||
*/
|
*/
|
||||||
@property({ type: Boolean, reflect: true })
|
@property({ type: Boolean, reflect: true })
|
||||||
expanded = false;
|
expanded = false;
|
||||||
@@ -365,9 +407,18 @@ export class AppSidebar extends LitElement {
|
|||||||
* be a media query in the stylesheet.
|
* be a media query in the stylesheet.
|
||||||
*/
|
*/
|
||||||
private applyViewportWidth() {
|
private applyViewportWidth() {
|
||||||
const narrow =
|
// A host that made room decides how much: `bottom-nav`'s sheet
|
||||||
!this.expanded &&
|
// is the whole screen wide, and the inline width below -- which
|
||||||
(this.narrowViewport?.matches ?? false);
|
// beats any rule the host could write -- would draw the old
|
||||||
|
// 200px side drawer inside it.
|
||||||
|
if (this.expanded) {
|
||||||
|
this.style.width = '100%';
|
||||||
|
this.collapsed = false;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const narrow = this.narrowViewport?.matches ?? false;
|
||||||
const width = narrow
|
const width = narrow
|
||||||
? MIN_WIDTH
|
? MIN_WIDTH
|
||||||
: this.userWidth;
|
: this.userWidth;
|
||||||
|
|||||||
@@ -193,4 +193,119 @@ describe('bottom-nav', () => {
|
|||||||
expect(shadow<HTMLElement>(el, 'app-sidebar')?.hasAttribute('expanded'))
|
expect(shadow<HTMLElement>(el, 'app-sidebar')?.hasAttribute('expanded'))
|
||||||
.toBe(true);
|
.toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('draws "More" as a sheet rising from the bottom', async () => {
|
||||||
|
const el = await fixture<Nav>('bottom-nav');
|
||||||
|
const drawer = shadow<HTMLElement>(el, 'wa-drawer');
|
||||||
|
|
||||||
|
// #71. A side drawer is a desktop shape: it opened away from the
|
||||||
|
// thumb that asked for it and drew a 200px column of a 424px
|
||||||
|
// screen. `placement` is the whole of the change to *where* it
|
||||||
|
// comes from, and `without-header` is what makes it the same sheet
|
||||||
|
// `menu-surface` draws rather than a second pattern with a title
|
||||||
|
// bar and a close button.
|
||||||
|
expect(drawer?.getAttribute('placement')).toBe('bottom');
|
||||||
|
expect(drawer?.hasAttribute('without-header')).toBe(true);
|
||||||
|
|
||||||
|
// Named all the same: `nameDialog`'s documented aria-label path,
|
||||||
|
// since without-header renders no heading to point at.
|
||||||
|
expect(drawer?.getAttribute('label')).toBe('All views');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves exactly one scroll container, and it is the sheet body', async () => {
|
||||||
|
const el = await fixture<Nav>('bottom-nav');
|
||||||
|
const drawer = shadow<HTMLElement & { open: boolean }>(el, 'wa-drawer');
|
||||||
|
|
||||||
|
if (!drawer) throw new Error('no drawer');
|
||||||
|
|
||||||
|
const shown = once(drawer, 'wa-after-show');
|
||||||
|
|
||||||
|
shadow<HTMLButtonElement>(el, '[data-testid="tab-more"]')?.click();
|
||||||
|
await shown;
|
||||||
|
await update(el, {});
|
||||||
|
|
||||||
|
// The report is "only part of the screen scrolls under my finger",
|
||||||
|
// and the cause is three boxes that each scroll: the dialog, its
|
||||||
|
// body, and the sidebar's own overflow-y host. Which one a drag
|
||||||
|
// moves depends on where the finger landed.
|
||||||
|
const dialog = drawer.shadowRoot?.querySelector('[part~="dialog"]');
|
||||||
|
const body = drawer.shadowRoot?.querySelector('[part~="body"]');
|
||||||
|
const sidebar = shadow<HTMLElement>(el, 'app-sidebar');
|
||||||
|
|
||||||
|
if (!dialog || !body || !sidebar) throw new Error('no sheet');
|
||||||
|
|
||||||
|
expect(getComputedStyle(dialog).overflowY).toBe('hidden');
|
||||||
|
expect(getComputedStyle(body).overflowY).toBe('auto');
|
||||||
|
expect(getComputedStyle(sidebar).overflowY).toBe('visible');
|
||||||
|
|
||||||
|
// And the one that does scroll keeps it to itself, or reaching the
|
||||||
|
// end of the destinations scrolls the page behind the sheet.
|
||||||
|
expect(getComputedStyle(body).overscrollBehaviorY).toBe('contain');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives the sheet the whole width, which the sidebar does not take', async () => {
|
||||||
|
const el = await fixture<Nav>('bottom-nav');
|
||||||
|
|
||||||
|
shadow<HTMLButtonElement>(el, '[data-testid="tab-more"]')?.click();
|
||||||
|
await update(el, {});
|
||||||
|
|
||||||
|
const sidebar = shadow<HTMLElement>(el, 'app-sidebar');
|
||||||
|
|
||||||
|
if (!sidebar) throw new Error('no sidebar');
|
||||||
|
|
||||||
|
// `app-sidebar` writes an *inline* width and caps itself at 400px,
|
||||||
|
// which beats any rule this host could write — so "the host owns
|
||||||
|
// the box" has to be part of what `expanded` means, or the sheet
|
||||||
|
// draws the old 200px column inside a full-width surface.
|
||||||
|
expect(sidebar.style.width).toBe('100%');
|
||||||
|
expect(getComputedStyle(sidebar).maxWidth).toBe('none');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('sizes the sheet rows for a thumb, below the phone breakpoint', async () => {
|
||||||
|
const el = await fixture<Nav>('bottom-nav');
|
||||||
|
|
||||||
|
shadow<HTMLButtonElement>(el, '[data-testid="tab-more"]')?.click();
|
||||||
|
await update(el, {});
|
||||||
|
|
||||||
|
const sidebar = shadow<HTMLElement>(el, 'app-sidebar');
|
||||||
|
const sheets = sidebar?.shadowRoot?.adoptedStyleSheets ?? [];
|
||||||
|
const phoneRules: string[] = [];
|
||||||
|
|
||||||
|
for (const sheet of sheets) {
|
||||||
|
for (const rule of Array.from(sheet.cssRules)) {
|
||||||
|
if (!(rule instanceof CSSMediaRule)) continue;
|
||||||
|
|
||||||
|
if (!/max-width:\s*599px/.test(rule.conditionText)) continue;
|
||||||
|
|
||||||
|
for (const inner of Array.from(rule.cssRules)) {
|
||||||
|
phoneRules.push(inner.cssText);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Asserted against the parsed stylesheet, like
|
||||||
|
// `hover-affordance.test.ts` and for the same reason: this tier's
|
||||||
|
// iframe is not 599px wide, so the rule cannot be *rendered* here —
|
||||||
|
// but the regression worth catching is someone moving it out of the
|
||||||
|
// query, which nothing on a desktop draws differently.
|
||||||
|
expect(phoneRules.length).toBeGreaterThan(0);
|
||||||
|
expect(phoneRules.some((r) => /min-height:\s*48px/.test(r))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('takes the resize handle out of the sheet', async () => {
|
||||||
|
const el = await fixture<Nav>('bottom-nav');
|
||||||
|
|
||||||
|
shadow<HTMLButtonElement>(el, '[data-testid="tab-more"]')?.click();
|
||||||
|
await update(el, {});
|
||||||
|
|
||||||
|
const handle = shadow<HTMLElement>(el, 'app-sidebar')
|
||||||
|
?.shadowRoot?.querySelector('.resize-handle');
|
||||||
|
|
||||||
|
if (!handle) throw new Error('no resize handle');
|
||||||
|
|
||||||
|
// A col-resize strip on the right edge of a touch surface: the
|
||||||
|
// compatibility mouse events a tap synthesises reach its
|
||||||
|
// `mousedown`, so it can start a resize nobody asked for.
|
||||||
|
expect(getComputedStyle(handle).display).toBe('none');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user