Compare commits
43
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee1d8b3179 | ||
|
|
29feb4b94b | ||
|
|
4e667759c4 | ||
|
|
ff3875b55d | ||
|
|
76e1c444cc | ||
|
|
4f32d4e13c | ||
|
|
4f628b1f52 | ||
|
|
2100f0022f | ||
|
|
52038dc5ae | ||
|
|
0d331666d6 | ||
|
|
6a5a3c33dc | ||
|
|
1668b9e0d2 | ||
|
|
ec64dbded0 | ||
|
|
dad852a8a0 | ||
|
|
30c6b665f1 | ||
|
|
d034d6e571 | ||
|
|
25ea1f3511 | ||
|
|
842fe47e9e | ||
|
|
168e588387 | ||
|
|
7eb55bd378 | ||
|
|
f31331c83b | ||
|
|
6a22601af7 | ||
|
|
ce9951b93a | ||
|
|
99a45401c7 | ||
|
|
dd76bd2fa7 | ||
|
|
dee176c0f7 | ||
|
|
75a24f98b6 | ||
|
|
327785e5ec | ||
|
|
7ba5d321f6 | ||
|
|
f126dd7397 | ||
|
|
510d3470f9 | ||
|
|
d78830aa52 | ||
|
|
a72d1f68ed | ||
|
|
60f1c5a6b2 | ||
|
|
11ba7b3180 | ||
|
|
7f8e185d7c | ||
|
|
42483c4b61 | ||
|
|
deea6ad06d | ||
|
|
fba608fdbd | ||
|
|
f59490b113 | ||
|
|
6cca57f229 | ||
|
|
ea3edde697 | ||
|
|
14e3ab574c |
@@ -88,3 +88,8 @@ build/android/overlay.json
|
|||||||
# Written by @semantic-release/changelog purely to carry the release notes
|
# Written by @semantic-release/changelog purely to carry the release notes
|
||||||
# into scripts/gitea-release.sh; the release page is the changelog.
|
# into scripts/gitea-release.sh; the release page is the changelog.
|
||||||
.release-notes.md
|
.release-notes.md
|
||||||
|
|
||||||
|
# Agent session log: local scratch, not repo memory (that is CLAUDE.md
|
||||||
|
# and .planning/). Written by the scheduled backlog runs.
|
||||||
|
.pi/journal.md
|
||||||
|
.pi/schedule-prompts.json
|
||||||
|
|||||||
@@ -130,7 +130,13 @@ reference, because you need them *before* the failure, not after.
|
|||||||
what you otherwise get is `Property 'scroll' does not exist on type
|
what you otherwise get is `Property 'scroll' does not exist on type
|
||||||
'CSSResult'` pointing at a line of prose, or every test in the suite
|
'CSSResult'` pointing at a line of prose, or every test in the suite
|
||||||
failing to import. It went in after the trap cost a fourth session in
|
failing to import. It went in after the trap cost a fourth session in
|
||||||
which its own warning had been read twice.
|
which its own warning had been read twice. **The same command carries
|
||||||
|
a second CSS check**: a nested rule whose selector starts with an
|
||||||
|
element name (`audio-player { … }` rather than `& audio-player { … }`)
|
||||||
|
is silently dropped by the device's Chrome 113 and by nothing else, so
|
||||||
|
every tier you can run renders it correctly. Run it after touching
|
||||||
|
`index.css` or any `css` literal; a rule directly inside a top-level
|
||||||
|
`@media` is not nested and is not flagged.
|
||||||
- **A failing CI job's log is reachable even when `gitea_ci job_logs`
|
- **A failing CI job's log is reachable even when `gitea_ci job_logs`
|
||||||
says it is not.** That endpoint 404s on this Gitea build. The REST
|
says it is not.** That endpoint 404s on this Gitea build. The REST
|
||||||
API answers, with the `GITEA_TOKEN` already in the environment:
|
API answers, with the `GITEA_TOKEN` already in the environment:
|
||||||
|
|||||||
@@ -8,13 +8,29 @@ This tier answers "does the phone build run", nothing else. It is not a
|
|||||||
spec tier, it does not run in CI, and the app is not a usable Android
|
spec tier, it does not run in CI, and the app is not a usable Android
|
||||||
player yet (plan 015 says why, at length).
|
player yet (plan 015 says why, at length).
|
||||||
|
|
||||||
## Three facts that make failure invisible
|
## Two facts that make failure invisible
|
||||||
|
|
||||||
**Go's stdout does not reach logcat.** An Android app's fd 1 and 2 go to
|
There were three. The first was that **Go's stdout does not reach
|
||||||
`/dev/null`. Every `slog` line the app writes is discarded — including
|
logcat** — an Android app's fd 1 and 2 go to `/dev/null`, so every
|
||||||
the one naming the error it is about to exit on. `setprop
|
`slog` line the app wrote was discarded, including the one naming the
|
||||||
log.redirect-stdio true` does not help: it redirects the *Java*
|
error it was about to exit on. That is fixed (#160):
|
||||||
runtime's `System.out`, and the Go code is a c-shared native library.
|
`backend/androidlog` is a `slog.Handler` over `__android_log_write`,
|
||||||
|
selected in `main()` by build tag, and the app's whole diagnostic
|
||||||
|
stream now arrives under the `yellowjacket` tag, which `make
|
||||||
|
android-logs` filters for.
|
||||||
|
|
||||||
|
What remains true about it is the part that misleads: **`setprop
|
||||||
|
log.redirect-stdio true` still does not help**, because it redirects
|
||||||
|
the *Java* runtime's `System.out` and the Go code is a c-shared native
|
||||||
|
library. Nothing that reaches logcat here does so through stdout, so
|
||||||
|
anything printed with `fmt.Println` is still lost. Log with `slog`.
|
||||||
|
|
||||||
|
The tag is a fixed string rather than the application id, and that is
|
||||||
|
load-bearing rather than tidy: the debug build carries
|
||||||
|
`applicationIdSuffix ".dev"` so it can be installed beside the release
|
||||||
|
app, and it is the only build whose WebView can be inspected — so a tag
|
||||||
|
derived from the id would be filtered out on the one build anybody
|
||||||
|
debugging this app is running.
|
||||||
|
|
||||||
**`os.Exit` is a silent death.** `main()` ends several failure paths in
|
**`os.Exit` is a silent death.** `main()` ends several failure paths in
|
||||||
`os.Exit(1)`. From Android's side that is a process that vanished:
|
`os.Exit(1)`. From Android's side that is a process that vanished:
|
||||||
@@ -34,7 +50,10 @@ the wrong question. `make android-smoke` asks the right one — is it the
|
|||||||
The tell, once you know it: `I/WailsBridge: Wails bridge initialized`
|
The tell, once you know it: `I/WailsBridge: Wails bridge initialized`
|
||||||
followed immediately by a new pid doing the same thing. That means the
|
followed immediately by a new pid doing the same thing. That means the
|
||||||
native library loaded, the JNI bridge came up, Go's `main()` ran, and
|
native library loaded, the JNI bridge came up, Go's `main()` ran, and
|
||||||
`main()` left. Work backwards through its `os.Exit(1)` paths.
|
`main()` left. Work backwards through its `os.Exit(1)` paths — and
|
||||||
|
since #160, **read the `E/yellowjacket` line above it first**, because
|
||||||
|
every one of those paths logs the error before it exits. That line is
|
||||||
|
what #52 spent months without.
|
||||||
|
|
||||||
## What to run
|
## What to run
|
||||||
|
|
||||||
@@ -524,6 +543,61 @@ Four things about it, each of which costs an hour if met cold:
|
|||||||
app.yellowjacket.dev android.permission.READ_MEDIA_AUDIO` (and
|
app.yellowjacket.dev android.permission.READ_MEDIA_AUDIO` (and
|
||||||
`POST_NOTIFICATIONS`) ahead of the launch skips it.
|
`POST_NOTIFICATIONS`) ahead of the launch skips it.
|
||||||
|
|
||||||
|
### Getting the app into a state worth measuring
|
||||||
|
|
||||||
|
A fresh install is **not** a neutral starting point, and three things
|
||||||
|
about it will each cost you a measurement.
|
||||||
|
|
||||||
|
**It downloads the real catalog.** `YJ_CORE_INDEX_URL` is stubbed in
|
||||||
|
`dev-headless.sh` and in CI and is *real* here, so the app spends its
|
||||||
|
first minutes fetching ~0.6 GB and `job-band` is **103px of a 439px
|
||||||
|
screen** while it does. Every vertical number taken in that state is
|
||||||
|
wrong -- one #51 measurement had the album art at 0px and it was
|
||||||
|
entirely this.
|
||||||
|
|
||||||
|
`__yj.call("explore.Service.StopIndexBuild", [])` stops it and returns
|
||||||
|
cleanly. **It then starts again within seconds.** So stop it
|
||||||
|
*immediately before* the measurement rather than once at the beginning,
|
||||||
|
and check `jobs.Service.GetJobs` afterwards -- an empty array is the
|
||||||
|
only proof. `jobs.Service.ClearFinishedJobs` tidies the finished rows
|
||||||
|
that otherwise keep the band open.
|
||||||
|
|
||||||
|
**A library added over the bridge does not dismiss the first-run
|
||||||
|
wizard.** `library.Library.AddLibrary` works and scans, but the wizard
|
||||||
|
checks for an existing library once, on mount, and its "Get Started"
|
||||||
|
button gates on a directory chosen *in the wizard* -- so it stays up
|
||||||
|
with a correctly disabled button over everything you are trying to
|
||||||
|
measure. Nothing is broken; reload the page and it is gone. This reads
|
||||||
|
exactly like a tap being swallowed, which is the expensive part.
|
||||||
|
|
||||||
|
**Scoped storage decides where the music can be.** `/sdcard/Music/...`
|
||||||
|
plus `pm grant <pkg> android.permission.READ_MEDIA_AUDIO` works and
|
||||||
|
`AddLibrary` takes the plain path; a push into
|
||||||
|
`/sdcard/Android/data/<pkg>/files/` looks like it worked and then is not
|
||||||
|
there. Some builds additionally want
|
||||||
|
`appops set <pkg> MANAGE_EXTERNAL_STORAGE allow`, and until they have it
|
||||||
|
the app opens the *system* "All files access" screen on launch -- so
|
||||||
|
`dumpsys window | grep mCurrentFocus` naming `com.android.settings` is
|
||||||
|
that, not a crash.
|
||||||
|
|
||||||
|
### A note on quoting `make android-eval`
|
||||||
|
|
||||||
|
`EXPR='...'` is a single-quoted shell word, so anything with a quote or
|
||||||
|
an apostrophe in it -- a file path like `Blazo, 49'ers - ...`, or a
|
||||||
|
snippet containing a string literal -- breaks in a way that reads as a
|
||||||
|
JavaScript error. Put the expression in a file and pass it positionally:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
node ./scripts/android-eval.mjs "$(cat /tmp/probe.js)"
|
||||||
|
```
|
||||||
|
|
||||||
|
That is the same script `make android-eval` wraps, so nothing is lost.
|
||||||
|
Two things worth knowing about it: it does **not** await a promise, so
|
||||||
|
an async call has to park its result (`window.__r = ...`) and be read
|
||||||
|
back in a second eval; and the shim from the section below is lost on
|
||||||
|
every reload and every app restart, along with the devtools socket,
|
||||||
|
whose name carries the pid.
|
||||||
|
|
||||||
### Calling a binding on the device
|
### Calling a binding on the device
|
||||||
|
|
||||||
**The runtime call does not go over HTTP on Android**, and this is worth
|
**The runtime call does not go over HTTP on Android**, and this is worth
|
||||||
|
|||||||
@@ -4785,3 +4785,130 @@ broken build. The specs assert the *mechanism* — that the surface is a
|
|||||||
native `<dialog>` at phone width — which is the same move
|
native `<dialog>` at phone width — which is the same move
|
||||||
`queue-as-a-screen.spec.ts` makes about containment and for the same
|
`queue-as-a-screen.spec.ts` makes about containment and for the same
|
||||||
reason.
|
reason.
|
||||||
|
|
||||||
|
## Now Playing was not drawing a small square, it was drawing a crop (measured 2026-08-21, TLP301 / Chrome 113 / 424x439)
|
||||||
|
|
||||||
|
#172 handed #51 a design question — whether the album art gets a floor
|
||||||
|
with the block scrolling, or whether the screen reflows below some
|
||||||
|
height. Measuring it first turned up a defect underneath the question,
|
||||||
|
and the defect is bigger than the phone.
|
||||||
|
|
||||||
|
**The art was never square.** `aspect-ratio` is specified not to
|
||||||
|
re-derive the width when `max-height` clamps the height — unlike an
|
||||||
|
intrinsic ratio, which CSS2.1 10.4 preserves under both bounds. So
|
||||||
|
`width: min(100%, 60vh)` made the width definite, the ratio derived a
|
||||||
|
height from it, `max-height: 100%` clipped that height, and the width
|
||||||
|
stayed where it was. `object-fit: cover` then cropped a square cover
|
||||||
|
into the band. On the device: **264x53**, a 5:1 strip. #172's own table
|
||||||
|
called it "39px of art" and the missing half is that those 39px were
|
||||||
|
263 wide.
|
||||||
|
|
||||||
|
**And it is not only the phone.** The leftover exceeds the width only
|
||||||
|
above ~843px of viewport, so every height from ~500 to ~843 drew a
|
||||||
|
crop too — most phones, and any short window. The e2e spec written for
|
||||||
|
this fails on the old build at 424x439 (263x39), 390x700 (358x315) and
|
||||||
|
900x500 (300x36), and *passes* at 412x869, which is the boundary
|
||||||
|
falling exactly where the arithmetic says it should.
|
||||||
|
|
||||||
|
**Both maxes with auto sizes is the whole fix**, and it was chosen by
|
||||||
|
asking Chrome 113 rather than by reasoning: a probe shadow root at
|
||||||
|
column heights of 288, 300, 451, 600 and 800 measured four candidate
|
||||||
|
rules. `max-width/max-height: 100%` with `width/height: auto` is square
|
||||||
|
at all five; the shipped rule cropped at four; `aspect-ratio` on the
|
||||||
|
box cropped at the tallest. A corollary that makes it free: `auto` will
|
||||||
|
not upscale past the natural size, and the largest tier `saveCoverArt`
|
||||||
|
keeps is 400px, so nothing is lost by never exceeding it.
|
||||||
|
|
||||||
|
**The placeholder cannot use that rule and needed its own**, which is
|
||||||
|
the part that would have shipped broken. It is not a replaced element,
|
||||||
|
so with no intrinsic size auto/auto collapses it to its icon —
|
||||||
|
measured at **13x58**, neither square nor the art's size. Three things
|
||||||
|
about the rule it did get:
|
||||||
|
|
||||||
|
- It is driven from the **height**, which is the axis that binds
|
||||||
|
everywhere this view is reached from.
|
||||||
|
- A flex item's automatic minimum is its content, so without
|
||||||
|
`min-width: 0` the icon's own width becomes a floor and the box goes
|
||||||
|
wider than it is tall the moment the row is shorter than the icon —
|
||||||
|
which is exactly the state a job band puts this screen in.
|
||||||
|
- **A non-replaced box cannot express "the largest square that fits" at
|
||||||
|
all**, because whichever max clamps does not re-derive the other. The
|
||||||
|
height-driven rule alone went **380x484** at 412x869 — a tall phone,
|
||||||
|
#51's other named device — and `max-height: calc(100vw - 2rem)` is
|
||||||
|
what closes it. That is sound here for the reason `60vh` was not: this
|
||||||
|
is a phone-width detail view, so its content box really is the
|
||||||
|
viewport less the host's own gutters, and it is a *max*, so if that
|
||||||
|
ever stopped being true the failure is a square bounded early rather
|
||||||
|
than a crop. `rem` and not `em` — the box sets `font-size: 3rem` for
|
||||||
|
the icon, so `2em` there is 96px.
|
||||||
|
|
||||||
|
**Then the design question, and the reflow is the answer.** The
|
||||||
|
stacked layout's budget is fixed — 48px of header, 143px of transport
|
||||||
|
since #64, 78px of names, 68px of padding and gaps — so the art gets
|
||||||
|
`height - 386`, which is 53px at 439. A floor on the art scrolls the
|
||||||
|
transport off the bottom, and "controls never scroll off" is #51's own
|
||||||
|
Direction and plan 018's promise. So below 500px the art and the names
|
||||||
|
share a row, where the art is bounded by the row's height rather than
|
||||||
|
by the column's leftover: **53px to 143px on the device**, measured on
|
||||||
|
the shipped build, with nothing scrolling and the transport untouched.
|
||||||
|
|
||||||
|
**500 is where the two layouts cross, not a round number.** In a row
|
||||||
|
the art is `height - 296` and the names get what is left of 392px, so
|
||||||
|
the names hold 176px at exactly 500 and less above it; stacked, the art
|
||||||
|
is `height - 386`, which passes 176px at 562. It is keyed on height
|
||||||
|
alone rather than on the phone's width because it is an answer to
|
||||||
|
vertical room — a 900x450 window has the same problem and the same fix.
|
||||||
|
|
||||||
|
Two things the audit found that are *not* this, and are filed:
|
||||||
|
**#186**, every control that is not the transport is under the 44px
|
||||||
|
floor (the sort direction arrow is 28x21, and `search-trigger` — which
|
||||||
|
exists only on a phone — is 40x40), and **#187**, the seek bar's drag
|
||||||
|
target is 6px tall.
|
||||||
|
|
||||||
|
**What the audit did not find is a reachability failure**, which is
|
||||||
|
worth recording because it is the promise plan 018 makes. At 424x439,
|
||||||
|
on every view -- the ten primary ones, the queue, `album-details`,
|
||||||
|
`artist-details`, Downloads and Autotag -- `documentElement.scrollWidth`
|
||||||
|
is 424 against a 424 viewport, no control sits outside a scrollable
|
||||||
|
ancestor, and a hit test at each control's centre reaches the control.
|
||||||
|
The width work of #57, #62, #55 and #59 holds; what was left was
|
||||||
|
vertical, and it was this screen.
|
||||||
|
|
||||||
|
**A number measured on the device is not a number CI can assert.** The
|
||||||
|
spec's floor on the art's height passed here at 114 and failed in CI at
|
||||||
|
**64**, and both are honest: this app is long-lived, so a job staged by
|
||||||
|
an earlier spec is still on screen, and `volume-control` renders in a
|
||||||
|
browser where it does not on Android. Both are chrome above and below
|
||||||
|
the view and both move the leftover. That is the same trap the entry
|
||||||
|
above about staged jobs describes, arriving as a *measurement* rather
|
||||||
|
than as a stuck job. The assertion is the mechanism now -- in a row the
|
||||||
|
art fills the row's height rather than being the leftover -- and the
|
||||||
|
53-to-143 stays on the issue, where it was measured.
|
||||||
|
|
||||||
|
The probe is worth keeping in mind for the next audit, because two of
|
||||||
|
its three checks needed a second pass to mean anything. "Painted
|
||||||
|
outside the viewport" flags a horizontally scrolling carousel -- the
|
||||||
|
home shelves -- so the real question is whether a *scrollable ancestor*
|
||||||
|
can bring the element back. And a hit test at a control's centre flags
|
||||||
|
everything below the fold in a scroll container, so it only says
|
||||||
|
something once the control is on screen. Both first drafts produced
|
||||||
|
long lists of nothing.
|
||||||
|
|
||||||
|
## Two traps that cost time on the device, both already written down (2026-08-21)
|
||||||
|
|
||||||
|
Recorded because both are in `android-tier.md` and I met them anyway.
|
||||||
|
|
||||||
|
**A fresh install downloads the real catalog**, so `job-band` is 103px
|
||||||
|
of a 439px screen and every vertical measurement is wrong. Worse, it
|
||||||
|
**restarts**: `explore.Service.StopIndexBuild` returns cleanly and the
|
||||||
|
job is `running` again within seconds, so it has to be stopped again
|
||||||
|
immediately before a measurement rather than once at the start.
|
||||||
|
`YJ_CORE_INDEX_URL` is stubbed in `dev-headless.sh` and in CI and is
|
||||||
|
real on a device.
|
||||||
|
|
||||||
|
**The first-run wizard does not re-check for a library it did not
|
||||||
|
create.** Adding one through `library.Library.AddLibrary` over the
|
||||||
|
bridge leaves the wizard up with its "Get Started" button correctly
|
||||||
|
disabled — it gates on a directory chosen *in the wizard*, and the
|
||||||
|
existing-library check runs once, on mount. A reload clears it. Nothing
|
||||||
|
is broken; it cost twenty minutes of believing a tap had been swallowed.
|
||||||
|
|||||||
@@ -0,0 +1,408 @@
|
|||||||
|
# 019 — The Android touch model
|
||||||
|
|
||||||
|
**Issue:** #63 (`Area/Library-UI`, `Kind/Feature`, `Priority/High`)
|
||||||
|
**Depends on:** #60 (bottom-sheet menus) — closed, merged as PR #176
|
||||||
|
**Relates:** #67 (inline links into the menu), #71 ("More" nav), #54
|
||||||
|
(native feel), #5/#8 (selection, drag to queue — the desktop semantics
|
||||||
|
being diverged from)
|
||||||
|
**Status:** shipped (phases 1-4). Its one deliberate remainder is #200.
|
||||||
|
|
||||||
|
#73 puts #60 first in Phase 4 because it is "the presentation every
|
||||||
|
other item needs", and this is the next one. The Direction on #63 asks
|
||||||
|
for the interaction model to be designed as one piece before any of it
|
||||||
|
is built, because it *reassigns an existing gesture* rather than adding
|
||||||
|
one — `utils/long-press.ts` currently owns the 500ms hold, and every
|
||||||
|
context menu in the app is downstream of it.
|
||||||
|
|
||||||
|
This document is that design. Everything below is a measurement, or an
|
||||||
|
argument for one of the choices #63 leaves open.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## The mapping
|
||||||
|
|
||||||
|
| gesture | pointer is a finger | pointer is a mouse |
|
||||||
|
|---|---|---|
|
||||||
|
| single tap / click | **play the row** | select the row |
|
||||||
|
| double | — | play the row |
|
||||||
|
| long press (500ms) | **enter selection mode** | — |
|
||||||
|
| right-click | — | context menu |
|
||||||
|
| swipe right | **add to queue** | — |
|
||||||
|
| drag | reorder / drag to playlist | reorder / drag to playlist |
|
||||||
|
|
||||||
|
Three of those are #63's report unchanged. Two are decisions it left
|
||||||
|
open, and one is a deliberate divergence.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Decision 1 — the predicate is the pointer, not the platform
|
||||||
|
|
||||||
|
#63 says "the row component needs a platform-aware interaction layer
|
||||||
|
rather than shared handlers". It needs an interaction layer; it should
|
||||||
|
not be platform-aware.
|
||||||
|
|
||||||
|
**The question a row has to answer is not "am I on Android" or "is the
|
||||||
|
viewport under 600px" but "what made this event".** `pointerType ===
|
||||||
|
'touch'`, read off the event that is being handled, which is already
|
||||||
|
how `long-press.ts` decides (`if (e.pointerType !== 'touch') return`)
|
||||||
|
and is the only such test in the frontend today.
|
||||||
|
|
||||||
|
This is #64's rule — the predicate is named after the capability, not
|
||||||
|
the platform — and it carries #64's warning with it. Keyed on a width:
|
||||||
|
|
||||||
|
- an Android **tablet** at 600px or more gets click-selects /
|
||||||
|
double-click-plays on a touchscreen, which is the exact inversion
|
||||||
|
this issue exists to fix, on the platform it exists for;
|
||||||
|
- a **touchscreen laptop** cannot be described at all, because both
|
||||||
|
pointers are live in the same session on the same row;
|
||||||
|
- and a narrow desktop window gets phone semantics with a mouse.
|
||||||
|
|
||||||
|
Per event, all three are right for free, and there is no second
|
||||||
|
declaration of what a phone does — the thing CLAUDE.md declines to add
|
||||||
|
every time it comes up.
|
||||||
|
|
||||||
|
**Measured, so this is not an assumption about the WebView.** On the
|
||||||
|
reference device (TLP301, Android 14, WebView Chrome 113, 424x439),
|
||||||
|
driving a real tap with `adb shell input tap`:
|
||||||
|
|
||||||
|
```
|
||||||
|
[["down","touch",78,94],["touchstart","touchstart",0,0],["up","touch",78,94]]
|
||||||
|
```
|
||||||
|
|
||||||
|
`PointerEvent` exists, `pointerType` is `"touch"`, `maxTouchPoints` is
|
||||||
|
5, and `(pointer: coarse)` / `(hover: none)` both match.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Decision 2 — there is no double-tap, and the number is why
|
||||||
|
|
||||||
|
#63 asks for *single tap → play* **and** *double tap → context menu*.
|
||||||
|
Those two cannot both be honoured. The first tap of a double tap is
|
||||||
|
indistinguishable from a single tap until the interval expires, so
|
||||||
|
"tap plays" necessarily becomes "tap waits to find out whether you
|
||||||
|
meant something else, then plays". The app already owns that constant:
|
||||||
|
`utils/explore-link.ts` holds a navigation for `DOUBLE_CLICK_GRACE_MS
|
||||||
|
= 250` for precisely this reason.
|
||||||
|
|
||||||
|
**What it would be added to, measured on the device.** Six runs, from
|
||||||
|
the play command to the backend's `TrackChanged`:
|
||||||
|
|
||||||
|
```
|
||||||
|
155, 123, 85, 56, 91 ms median ~100
|
||||||
|
```
|
||||||
|
|
||||||
|
So the app's primary interaction is ~100ms, and a double-tap
|
||||||
|
discriminator makes it ~350 — **3.5x, of which 250ms is spent
|
||||||
|
deliberately doing nothing** — paid on every track anyone ever plays,
|
||||||
|
in order to reach a menu.
|
||||||
|
|
||||||
|
It is also against the platform's convention, which counts for more
|
||||||
|
than usual here because this is the phone build and nothing else:
|
||||||
|
long-press is *how you select* on Android (Gmail, Files, Photos),
|
||||||
|
double-tap is zoom or nothing, and a list's menu is either the
|
||||||
|
long-press sheet or a per-row overflow.
|
||||||
|
|
||||||
|
**So the menu and the selection action bar become the same surface**,
|
||||||
|
which is the convention and removes a concept rather than adding one.
|
||||||
|
Long-press selects the row it was made on and raises the action bar;
|
||||||
|
the bar's actions *are* the context menu's actions, contextualised to
|
||||||
|
whatever is selected — one row or forty. #60's bottom sheet stays
|
||||||
|
behind it as the overflow, so `contextMenuStyles`, `MenuKeyboard` and
|
||||||
|
`menu-surface` are reused rather than reimplemented.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Decision 3 — tap-to-play and selection mode ship together
|
||||||
|
|
||||||
|
The obvious phase order is "tap plays first, it is the smallest
|
||||||
|
change". It is wrong, and the reason is a capability that exists today
|
||||||
|
and is easy to miss.
|
||||||
|
|
||||||
|
**A touch user can already multi-select**: tap selects (the desktop
|
||||||
|
semantics, which a finger currently gets), and the long-press menu then
|
||||||
|
acts on the selection. Move tap to play without shipping selection mode
|
||||||
|
in the same change and there is a window — a release, if it lands — in
|
||||||
|
which selecting forty tracks to add to a playlist is impossible on a
|
||||||
|
phone. That is a regression dressed as an increment.
|
||||||
|
|
||||||
|
So phase 1 is both, or neither.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## What the code looks like now
|
||||||
|
|
||||||
|
| surface | how it binds | selection |
|
||||||
|
|---|---|---|
|
||||||
|
| `track-list` | delegated on the virtualizer: `click`, `dblclick`, `contextmenu`, `dragstart` | `SelectionController` |
|
||||||
|
| `queue-panel` | delegated, same shape | `SelectionController` |
|
||||||
|
| `playlist-details` | per row | `SelectionController` |
|
||||||
|
| `smart-playlist-details` | per row | `SelectionController` |
|
||||||
|
|
||||||
|
All four already share `SelectionController`, and all four resolve a
|
||||||
|
row from an event by `data-index` / `data-file-path` on the row. So the
|
||||||
|
gesture layer has one shape to talk to, and "selection mode" is a flag
|
||||||
|
on the controller they already have rather than a fifth concept.
|
||||||
|
|
||||||
|
`utils/long-press.ts` is one document-capture listener that synthesises
|
||||||
|
a `contextmenu` — the seam that needed no component to opt in. **This
|
||||||
|
plan keeps that shape and changes what the gesture means**, which is
|
||||||
|
why it is a rewrite of that file rather than a second listener set: two
|
||||||
|
document listeners both claiming the 500ms hold is the fault the file's
|
||||||
|
own header warns about.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Two measurements that decide the implementation
|
||||||
|
|
||||||
|
**`touch-action` is `auto` on both the virtualizer and the rows.** With
|
||||||
|
`auto` the browser owns panning on both axes, so a horizontal drag can
|
||||||
|
be claimed as a scroll and our gesture ends in `pointercancel`
|
||||||
|
mid-swipe. A row that wants a horizontal swipe has to declare
|
||||||
|
`touch-action: pan-y`: the browser keeps the vertical pan (which is the
|
||||||
|
virtualizer's scroll, and must stay native or the list stutters) and
|
||||||
|
hands us the horizontal axis. This is the single most likely way for
|
||||||
|
swipe-to-queue to "work in Chromium and not on the phone".
|
||||||
|
|
||||||
|
**The row is 424x52 on the device**, so a swipe threshold in px is a
|
||||||
|
fraction of a row height, not of a screen.
|
||||||
|
|
||||||
|
**And the third one was found by building phase 1 and then running it**
|
||||||
|
— it is not something any browser tier can report. Chrome 113's Android
|
||||||
|
WebView **fires its own `contextmenu` on a long press**. `long-press.ts`
|
||||||
|
stood down when a trusted one arrived, which was right while both paths
|
||||||
|
ended in the same place; once a hold can mean selection mode they end
|
||||||
|
in different places, and standing down means the gesture silently does
|
||||||
|
the *old* thing. Measured, before the fix:
|
||||||
|
|
||||||
|
```
|
||||||
|
{"log":["contextmenu isTrusted=true"],
|
||||||
|
"state":{"bar":null,"menuActive":true,"selected":1}}
|
||||||
|
```
|
||||||
|
|
||||||
|
`yj-long-press` was never announced at all, the context menu opened,
|
||||||
|
and all 26 tests in the component tier passed — dispatched pointer
|
||||||
|
events do not make a browser synthesise a `contextmenu`.
|
||||||
|
|
||||||
|
So the browser's event is a **trigger, not a competitor**: the gesture
|
||||||
|
is announced from it, and only a component that claims it suppresses
|
||||||
|
the native menu. Unclaimed, it propagates untouched. That is the same
|
||||||
|
"browser wins" outcome, reached by asking instead of assuming — and
|
||||||
|
verified both ways on the device, a track row entering selection mode
|
||||||
|
and an album card still opening its menu.
|
||||||
|
|
||||||
|
The tier could not *find* it and can *hold* it: a test cannot dispatch
|
||||||
|
a trusted event, but this module has always told its own apart by
|
||||||
|
identity rather than `isTrusted`, so an untrusted one from a test takes
|
||||||
|
exactly the browser's path.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## A tier note: this one can be driven, not only measured
|
||||||
|
|
||||||
|
`adb shell input tap|swipe` reaches the WebView as real pointer events,
|
||||||
|
which the log above is evidence of. So for the first time the Android
|
||||||
|
tier can *perform* the thing under test rather than describe the page
|
||||||
|
afterwards — a long press is `input swipe X Y X Y 600`, a swipe right
|
||||||
|
is `input swipe X Y X+N Y 120`.
|
||||||
|
|
||||||
|
Device CSS pixels from device pixels, on this phone:
|
||||||
|
`css = (device - 59) / 2.564` vertically, `css = device / 2.564`
|
||||||
|
horizontally (measured from the tap above: 200,300 arrived as 78,94).
|
||||||
|
|
||||||
|
This does not make the device a spec tier — it does not run in CI and
|
||||||
|
`make ui-test` still has to carry the assertions. It makes "does the
|
||||||
|
gesture actually fire on Chrome 113" answerable in seconds.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Phases
|
||||||
|
|
||||||
|
**Phase 1 — the seam, tap-to-play, selection mode.** `utils/
|
||||||
|
touch-gestures.ts` replacing `long-press.ts`: pointer-typed
|
||||||
|
recognition of tap / long-press / horizontal swipe, dispatched as
|
||||||
|
composed custom events so a delegated listener in any shadow root
|
||||||
|
still works. `SelectionController` gains a mode. `track-list` acts on
|
||||||
|
tap and enters the mode on long press. The action bar.
|
||||||
|
|
||||||
|
**Phase 2 — swipe right to queue**, with the `touch-action: pan-y`
|
||||||
|
finding above and a reveal-and-snap affordance. **Shipped**; what the
|
||||||
|
device said about it is the section below.
|
||||||
|
|
||||||
|
**Phase 3 — the other three surfaces**, which is mostly wiring, since
|
||||||
|
they already share the controller. **Shipped**, and it was not entirely
|
||||||
|
wiring — see below.
|
||||||
|
|
||||||
|
**Phase 4 — what this leaves behind.** The inline `explore-link`s in a
|
||||||
|
row are a single-click target inside a row whose single tap now plays;
|
||||||
|
that conflict is #67's, and this plan should not pre-empt its answer
|
||||||
|
beyond making tap-to-play win on touch. **Shipped.**
|
||||||
|
|
||||||
|
## Phase 3 was not symmetric, in two places
|
||||||
|
|
||||||
|
**A tap on a queue row plays that position**, not the list. Copying
|
||||||
|
`track-list`'s tap — which sets the queue to the list the row is in —
|
||||||
|
would rebuild the queue *from* the queue, discarding its source, its
|
||||||
|
shuffle order and everything a user had inserted by hand. It reads as a
|
||||||
|
no-op and is not one.
|
||||||
|
|
||||||
|
**The queue panel has no swipe, deliberately.** A right swipe means
|
||||||
|
*add to the queue* everywhere else it exists, and a queue row is
|
||||||
|
already in the queue; the only thing it could mean there is *remove*,
|
||||||
|
which is the same gesture with the opposite effect one screen away —
|
||||||
|
the fault `utils/icon-language.ts` exists to have fixed for glyphs.
|
||||||
|
Removing a queue row is on the row itself (the ×), on its bottom sheet
|
||||||
|
since #60, and on the selection bar this phase gave it. The assertion
|
||||||
|
is that its rows do **not** carry `data-swipe`, so a swipe there cannot
|
||||||
|
silently become a second meaning for the app's one horizontal gesture.
|
||||||
|
|
||||||
|
And the affordance became `utils/swipe-to-queue.ts` rather than being
|
||||||
|
copied twice. Three lists want it; three copies of "how far is far
|
||||||
|
enough" is three chances for them to disagree, which is what
|
||||||
|
`utils/library-status.ts` and `utils/ownership.ts` each exist to have
|
||||||
|
stopped happening. The shared stylesheet is keyed on `[data-swipe]`
|
||||||
|
rather than on a class name, because the three lists call their rows
|
||||||
|
two different things and the `touch-action` half of the device fix has
|
||||||
|
to reach all of them.
|
||||||
|
|
||||||
|
## Phase 4 was already true, which is why it is asserted
|
||||||
|
|
||||||
|
A claimed tap has its click swallowed at document capture, so an
|
||||||
|
`explore-link` inside the row never sees one and tap-to-play wins with
|
||||||
|
no rule of its own. Nothing in the suite would have failed if that
|
||||||
|
stopped covering the link, and the symptom — tapping a track's *title*
|
||||||
|
navigating to its album instead of playing it — is one a phone user
|
||||||
|
meets constantly and a mouse user never does.
|
||||||
|
|
||||||
|
**Its test was vacuous when written**, in the way this file keeps
|
||||||
|
finding: the tap helper dispatched `pointerdown` and `pointerup` and no
|
||||||
|
`click`, so there was nothing to swallow and the assertion held on any
|
||||||
|
build. It sends the trailing click now, which also strengthened phase
|
||||||
|
1's "a tap plays and does not also select". The fixture needed an MBID
|
||||||
|
for the same reason — without one the link asks the backend for a local
|
||||||
|
album first and gives up when nothing answers, so "it did not navigate"
|
||||||
|
was true of a working build and a broken one alike.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## What phase 2 measured, which was not what phase 2 predicted
|
||||||
|
|
||||||
|
The `touch-action` finding above is **half** of the answer, and
|
||||||
|
shipping only that half would have been the exact failure it warns
|
||||||
|
about. Driving a real finger with `adb shell input swipe` across a
|
||||||
|
track row, three values, all three on the device:
|
||||||
|
|
||||||
|
```
|
||||||
|
touch-action: auto pointerdown, 1 move, pointercancel
|
||||||
|
touch-action: pan-y pointerdown, 2 moves, pointercancel
|
||||||
|
touch-action: none pointerdown, 2 moves, pointercancel
|
||||||
|
```
|
||||||
|
|
||||||
|
`touchmove` kept firing in all three. So **Chrome 113's WebView
|
||||||
|
cancels the pointer stream ~16px into any drag whatever `touch-action`
|
||||||
|
says**, and a swipe recognised from `pointermove` — which is what the
|
||||||
|
rest of this module is built on — is a swipe that dies 16px in.
|
||||||
|
|
||||||
|
The other half is a **non-passive `touchmove` calling
|
||||||
|
`preventDefault()`**: with it, the same swipe ran to 12 moves and a
|
||||||
|
`pointerup` at full travel. And both halves are required, which was
|
||||||
|
measured rather than assumed — with the `preventDefault` in place and
|
||||||
|
`touch-action` back at `auto`, the gesture died after **one** move.
|
||||||
|
The reading is that `auto` lets the browser commit to a horizontal pan
|
||||||
|
on the first move past slop, before any threshold of ours can have
|
||||||
|
been crossed, while `pan-y` leaves it undecided long enough for the
|
||||||
|
second move to claim it.
|
||||||
|
|
||||||
|
`none` is the one value to avoid: the list stopped scrolling at all.
|
||||||
|
With the shipped pair, a vertical drag still scrolls the virtualizer
|
||||||
|
81px on the same run that a horizontal one survives.
|
||||||
|
|
||||||
|
**`draggable="true"` is not a competitor**, which is the other thing
|
||||||
|
the device was asked. No `dragstart` fires from a touch drag on this
|
||||||
|
WebView at all, so the drag-to-playlist attribute on every row needs no
|
||||||
|
pointer-type gate.
|
||||||
|
|
||||||
|
### And it found a phase 1 defect that no tier can see
|
||||||
|
|
||||||
|
The native `contextmenu` arrives in **either** order, and phase 1 only
|
||||||
|
handled one of them. `nativeSeen` covers the browser's menu arriving
|
||||||
|
*during* the hold. The reverse — our 500ms timer firing first, a
|
||||||
|
component claiming it, and Chrome delivering its own `contextmenu`
|
||||||
|
50–70ms *later* — was suppressed by nothing, so the context menu
|
||||||
|
opened on top of the selection bar. Measured over four holds:
|
||||||
|
|
||||||
|
```
|
||||||
|
hold 1 yj-long-press, then contextmenu isTrusted=true menu open
|
||||||
|
hold 2 yj-long-press clean
|
||||||
|
hold 3 yj-long-press, then contextmenu isTrusted=true menu open
|
||||||
|
hold 4 yj-long-press clean
|
||||||
|
```
|
||||||
|
|
||||||
|
Two in four, on the one surface #63 exists to have changed, and
|
||||||
|
invisible to both browser tiers because neither synthesises a
|
||||||
|
`contextmenu` from a dispatched press. A press that has produced its
|
||||||
|
outcome now suppresses a late one whichever branch it took; six holds
|
||||||
|
on the fixed build, six clean.
|
||||||
|
|
||||||
|
### The rules phase 2 settled
|
||||||
|
|
||||||
|
- **A swipe is not a selection.** It queues the row it was made on,
|
||||||
|
unless that row is one of several *explicitly* selected — the same
|
||||||
|
rule the context menu answers with, because a bar reading "40
|
||||||
|
selected" beside a gesture that quietly queues one of them is two
|
||||||
|
answers to one question. It never changes the selection, which is
|
||||||
|
where it differs from a right-click.
|
||||||
|
- **Rightward only.** Nothing is bound to a leftward swipe and
|
||||||
|
claiming one would take a gesture away to do nothing with it.
|
||||||
|
- **The commit threshold is a fraction of the row** (0.3, floor 72px),
|
||||||
|
because the row is 424x52 on this device and a bare pixel count is a
|
||||||
|
fraction of a row height on one screen and a third of the width on
|
||||||
|
the next.
|
||||||
|
- **The affordance is not only a colour** (WCAG 1.4.1, the rule the
|
||||||
|
playing-row marker exists for): the pane carries the queue icon and
|
||||||
|
words, the words change at the threshold ("Add to queue" → "Release
|
||||||
|
to add" → "Added"), and the outcome is announced in a live region.
|
||||||
|
- **The row does not move; its cells do.** `.track-row` is
|
||||||
|
`contain: strict` with `overflow: hidden`, so a pane held at the
|
||||||
|
row's original position while the row translates is a pane at a
|
||||||
|
negative offset inside a clipping box and is simply not painted.
|
||||||
|
Sliding the cells needs no wrapper element in a row that is already
|
||||||
|
a grid.
|
||||||
|
- **The travel is written to the row's own style, not rendered.** One
|
||||||
|
render at the start, one at the threshold, one at the end; a
|
||||||
|
virtualizer re-rendering every visible row per frame of one finger's
|
||||||
|
travel is the thing `perf.m1` is about.
|
||||||
|
|
||||||
|
## Open questions
|
||||||
|
|
||||||
|
1. **Does selection mode have an escape other than the bar's own
|
||||||
|
close?** *Settled: Escape, here; back, not here.*
|
||||||
|
|
||||||
|
Escape leaves the mode, from `selection-bar` rather than from each
|
||||||
|
of the four hosts — that element exists only while the mode does, so
|
||||||
|
it is the one place a dismissal can be attached and detached with
|
||||||
|
the thing it dismisses. It is the same documented exception the
|
||||||
|
overlaid queue's Escape is: **a dismissal, not a shortcut**, so it
|
||||||
|
is not a panel-scoped binding.
|
||||||
|
|
||||||
|
The back gesture is the half that is *not* done, and deliberately.
|
||||||
|
The obvious version — `selection-bar` pushing a history entry — is
|
||||||
|
precisely the fault `navStack` was deleted for: the shell owns the
|
||||||
|
stack (#6/#55) and is the only thing that calls `pushState`, so that
|
||||||
|
two stacks cannot disagree about what one press means. Four lists
|
||||||
|
each reaching for `history` is four stacks. It is also wrong on its
|
||||||
|
own terms, since a mode is per-component and a user who enters one,
|
||||||
|
navigates away and returns has an entry for a mode that no longer
|
||||||
|
exists. #55 settled the shape for a *place*; a mode is not one,
|
||||||
|
which is why it could not simply inherit that answer.
|
||||||
|
|
||||||
|
What it wants is one shell-owned register of dismissible surfaces,
|
||||||
|
which would retro-fit the queue overlay, the dialogs and this alike
|
||||||
|
rather than adding a fourth private answer. **#200.**
|
||||||
|
|
||||||
|
2. **Does a tap on a row's favourite icon still toggle it in normal
|
||||||
|
mode?** *Settled in phase 1: yes.* A control inside the row keeps
|
||||||
|
its own tap — the gesture is simply not claimed there, so the click
|
||||||
|
behind it falls through untouched. It is the same rule the shortcut
|
||||||
|
service has for a focused control that owns a key, and it is what
|
||||||
|
keeps the 44px favourite target (#56) from becoming a 44px play
|
||||||
|
target. The queue row's × is the second instance of it.
|
||||||
@@ -1449,18 +1449,148 @@ never opens). **The sweep found two of the fourteen**; twelve were
|
|||||||
converted by hand.
|
converted by hand.
|
||||||
|
|
||||||
**And a menu opens from a finger, through the event it already has.**
|
**And a menu opens from a finger, through the event it already has.**
|
||||||
`utils/long-press.ts` is one document-capture listener installed once
|
`utils/touch-gestures.ts` is one document-capture listener installed
|
||||||
from `index.ts`: a touch that holds still for 500 ms dispatches a
|
once from `index.ts` — `utils/long-press.ts` until #63 replaced it,
|
||||||
synthetic `contextmenu` at the touch point, so all six components that
|
rather than adding a second listener claiming the same 500 ms hold. It
|
||||||
bind one — delegated on a virtualizer, per row, per card — gained the
|
**announces** rather than acts: `yj-tap`, `yj-long-press` and
|
||||||
gesture without changing. The target is `composedPath()[0]` rather than
|
`yj-swipe-start` are composed and cancelable, and a component claims
|
||||||
|
one with `preventDefault()`. That is what let #63 reassign the hold
|
||||||
|
without touching one of the fourteen context menus: an *unclaimed*
|
||||||
|
`yj-long-press` still becomes a synthetic `contextmenu`, so all six
|
||||||
|
components that bind one — delegated on a virtualizer, per row, per
|
||||||
|
card — behave exactly as they did, and only the lists that opt in get
|
||||||
|
selection mode. The target is `composedPath()[0]` rather than
|
||||||
`elementFromPoint`, which stops at the outermost shadow host and so
|
`elementFromPoint`, which stops at the outermost shadow host and so
|
||||||
reaches a delegated listener and no per-row one; a browser that fires
|
reaches a delegated listener and no per-row one; and the click that
|
||||||
its own long-press `contextmenu` (Chromium does, WebKit and the WebView
|
ends a *claimed* gesture is swallowed, keyed on the gesture rather than
|
||||||
vary) wins, ours being told from theirs by **identity** rather than
|
on a time window so the first tap on the menu it opened is not eaten
|
||||||
`isTrusted`, since no test can dispatch a trusted event; and the click
|
too.
|
||||||
that ends the gesture is swallowed, keyed on the gesture rather than on
|
|
||||||
a time window so the first tap on the menu it opened is not eaten too.
|
Three things about it are load-bearing, and all three were found on the
|
||||||
|
device rather than in a tier.
|
||||||
|
|
||||||
|
**A browser that fires its own long-press `contextmenu` is a trigger,
|
||||||
|
not a competitor.** Chromium does, WebKit and the WebView vary. The old
|
||||||
|
rule was to stand down when a trusted one arrived, which was right
|
||||||
|
while both paths ended in a context menu and is wrong the moment a hold
|
||||||
|
can mean something else — standing down silently does the *old* thing.
|
||||||
|
So the gesture is announced from the native event, and only a component
|
||||||
|
that claims it suppresses that event. Ours and the browser's are told
|
||||||
|
apart by **identity** rather than `isTrusted`, since no test can
|
||||||
|
dispatch a trusted event.
|
||||||
|
|
||||||
|
**That arrives in either order, and both have to be handled.** The
|
||||||
|
native `contextmenu` mid-hold is one case; the other is our own 500 ms
|
||||||
|
timer firing first and Chrome delivering its menu **50–70 ms later**,
|
||||||
|
which nothing suppressed — measured over four holds on the reference
|
||||||
|
phone, two took that order, so the context menu opened over the
|
||||||
|
selection bar intermittently, on the one surface #63 changed. A press
|
||||||
|
that has produced its outcome therefore suppresses a late
|
||||||
|
`contextmenu` whichever branch it took.
|
||||||
|
|
||||||
|
**A horizontal swipe runs on touch events, and needs two things that
|
||||||
|
look like one.** Chrome 113's WebView cancels the *pointer* stream
|
||||||
|
~16 px into any drag — measured at `auto`, `pan-y` and `none` alike,
|
||||||
|
one or two `pointermove`s and then `pointercancel`, while `touchmove`
|
||||||
|
kept firing throughout. So the recogniser is `touchmove`, the surface
|
||||||
|
declares **`touch-action: pan-y`** *and* a claimed swipe calls
|
||||||
|
**`preventDefault()`** on a non-passive listener. Neither works alone:
|
||||||
|
with the `preventDefault` in place but `touch-action` back at `auto`
|
||||||
|
the gesture died after one move, because `auto` lets the browser commit
|
||||||
|
to a horizontal pan before any threshold can be crossed. `none` is the
|
||||||
|
value to avoid — it takes the list's own vertical scrolling with it.
|
||||||
|
**Both are correct in Chromium either way**, which is why this is
|
||||||
|
written down rather than tested. The tie breaks toward scrolling, in
|
||||||
|
that order: vertical drift past the tolerance vetoes the swipe for the
|
||||||
|
rest of the press (a scroll that curves is still a scroll), and a
|
||||||
|
gesture that is not *strictly* more horizontal than vertical is the
|
||||||
|
scroller's.
|
||||||
|
|
||||||
|
**And what a finger *means* on a row is the inversion of what a mouse
|
||||||
|
means, decided per event** (#63). A click selects and a double-click
|
||||||
|
plays; a tap **plays** and a hold enters **selection mode**, in which a
|
||||||
|
tap toggles. The predicate is `pointerType`, never a viewport width and
|
||||||
|
never a platform flag — #64's rule, and with #64's warning: keyed on a
|
||||||
|
width, an Android tablet over 600px gets desktop semantics on a
|
||||||
|
touchscreen, a touchscreen laptop cannot be described at all, and a
|
||||||
|
narrow desktop window gets phone semantics with a mouse.
|
||||||
|
|
||||||
|
There is deliberately **no double-tap**, which #63 asked for. The first
|
||||||
|
tap of one is indistinguishable from a single tap until the interval
|
||||||
|
expires, so tapping would have to wait `DOUBLE_CLICK_GRACE_MS` before
|
||||||
|
acting — 250ms on top of a measured ~100ms play, 3.5x the app's primary
|
||||||
|
interaction, to reach a menu a hold already reaches. So the menu and
|
||||||
|
the action bar are the same surface: `components/selection-bar/` is
|
||||||
|
presentational (a count and a list of actions, no store, no selection),
|
||||||
|
`SelectionController` carries the mode for all four selecting surfaces,
|
||||||
|
and #60's bottom sheet is the overflow behind "More" — so
|
||||||
|
`contextMenuStyles`, `MenuKeyboard` and `menu-surface` are reused
|
||||||
|
rather than reimplemented.
|
||||||
|
|
||||||
|
Three things about it are load-bearing. **A control inside a row keeps
|
||||||
|
its own tap**: the gesture is simply not claimed there, so the click
|
||||||
|
behind it falls through, which is what stops the 44px favourite target
|
||||||
|
(#56) becoming a 44px play target — the queue row's × is the second
|
||||||
|
instance. **A swipe right queues**, and its affordance is
|
||||||
|
`utils/swipe-to-queue.ts` once rather than in each of the three lists
|
||||||
|
that draw it: the row does not move, its *children* do (a row here is
|
||||||
|
`contain: strict` with `overflow: hidden`, so a pane held at the row's
|
||||||
|
original position while the row translates is at a negative offset
|
||||||
|
inside a clipping box and is not painted), the travel is written to the
|
||||||
|
row's own style rather than rendered, and the threshold is a fraction
|
||||||
|
of the row because the row is 424x52 on the reference device. **The
|
||||||
|
queue panel takes the tap and the hold and refuses the swipe**, because
|
||||||
|
a right swipe means *add to the queue* everywhere it exists and a queue
|
||||||
|
row is already in it — the only thing it could mean there is *remove*,
|
||||||
|
which is the same gesture with the opposite effect one screen away.
|
||||||
|
A tap there plays that *position*, too: setting the queue to the queue
|
||||||
|
reads as a no-op and discards its source, its shuffle order and
|
||||||
|
anything inserted by hand.
|
||||||
|
|
||||||
|
Escape leaves the mode, from `selection-bar` rather than from each
|
||||||
|
host, since that element exists only while the mode does — the same
|
||||||
|
exception the overlaid queue's Escape is, *a dismissal, not a
|
||||||
|
shortcut*. The platform's back gesture deliberately does **not** reach
|
||||||
|
it: the shell owns the history stack and four lists each reaching for
|
||||||
|
`history` is four stacks, which is the fault `navStack` was deleted
|
||||||
|
for. That wants one shell-owned register of dismissible surfaces, which
|
||||||
|
is #200.
|
||||||
|
|
||||||
|
**A control revealed by `:hover` is gated on the device having hover,
|
||||||
|
and which way round depends on whether it is the only route to its
|
||||||
|
action.** The gate itself is not optional: a touch long-press
|
||||||
|
synthesises a hover state in the WebView, so every one of these flashed
|
||||||
|
into view during the 500 ms hold above — a control appearing because
|
||||||
|
the user was reaching for a different one. Where the action is reachable
|
||||||
|
another way the control is **absent** on a touch device (the home card's
|
||||||
|
play button, #68; the queue row's remove, which the row's bottom-sheet
|
||||||
|
menu carries since #60), and that is `display: none` outside
|
||||||
|
`(hover: hover) and (pointer: fine)` rather than `opacity: 0` or
|
||||||
|
`visibility: hidden`, both of which leave a button holding its hit area
|
||||||
|
and its place in the accessibility tree. Where the control is the
|
||||||
|
**only** route it is instead always visible under
|
||||||
|
`@media not all and (hover: hover)` — `track-details`'s cover-art
|
||||||
|
overlay and remove, `shortcut-capture`'s reset (#137) — because hiding
|
||||||
|
it takes the action away entirely.
|
||||||
|
|
||||||
|
**Always-visible is not the same as always-in-the-way.** The cover-art
|
||||||
|
overlay is `inset: 0` at 50% black, which is fine as a hover state and
|
||||||
|
is not fine as the permanent appearance of the artwork being edited —
|
||||||
|
and it is only a *hint*, since `.cover-art-edit` carries the click and
|
||||||
|
tapping the art always worked. Off hover it becomes a corner chip in
|
||||||
|
the remove button's own language. The × beside it stays full-size,
|
||||||
|
because that one really is the only route to its action.
|
||||||
|
|
||||||
|
One thing to know before checking either: **no *committed* tier renders
|
||||||
|
as a touch device.** CDP's `Emulation.setEmulatedMedia` does not reach
|
||||||
|
the component tier's iframe, and the e2e projects are Desktop Chrome
|
||||||
|
and Desktop Safari, neither of which has touch — a Playwright project
|
||||||
|
using a mobile descriptor would report `hover: none`, so this is a
|
||||||
|
choice not to carry one rather than a thing that cannot be done. So
|
||||||
|
`hover-affordance.test.ts` asserts the *parsed stylesheet* — which rule
|
||||||
|
sits inside which media query — and says so; the regression it exists
|
||||||
|
for is someone hoisting a rule out of its query as a tidy-up, which
|
||||||
|
nothing on a desktop renders differently.
|
||||||
|
|
||||||
Three lists had no focused row to open a menu *from* — the queue panel
|
Three lists had no focused row to open a menu *from* — the queue panel
|
||||||
and both playlist detail views — and gained a roving tab stop through
|
and both playlist detail views — and gained a roving tab stop through
|
||||||
@@ -1909,6 +2039,33 @@ every desktop button from 33×21 to 36×24, silently. The sizes are
|
|||||||
asserted as `'33x21'` rather than as a range, because the regression
|
asserted as `'33x21'` rather than as a range, because the regression
|
||||||
was three pixels.
|
was three pixels.
|
||||||
|
|
||||||
|
**What that bar lost is how far through the song it is, and
|
||||||
|
`<player-progress-line>` is where it went** (#58). Plan 016 B2 took the
|
||||||
|
seek bar off the phone's transport, so the one thing a mini player is
|
||||||
|
expected to say without being opened had nowhere left to be said. It is
|
||||||
|
a 2px line on the border between the mini player and the tab bar: the
|
||||||
|
**shell's** element and its own `auto` grid row between `bottom-bar`
|
||||||
|
and `bottom-nav`, because those two are separate components and either
|
||||||
|
one drawing it means reaching into the other's box for two pixels.
|
||||||
|
|
||||||
|
Four things about it are load-bearing. **It never counts** — the fill is
|
||||||
|
`scaleX()` off the same `PlaybackPositionChanged` the seek bar renders,
|
||||||
|
with the same `trackChangeId` and `seq` guards and an interval that is
|
||||||
|
stopped and restarted by every report, which is the rule that exists
|
||||||
|
because a local clock drifted 30 s away across four keyboard seeks.
|
||||||
|
**It is not a control and cannot become one**: `aria-hidden` on the host
|
||||||
|
and `pointer-events: none` throughout, because Now Playing's seek bar
|
||||||
|
is what announces the position and a 2px strip on the top edge of the
|
||||||
|
tab bar is exactly where a thumb aiming at a tab lands. **It renders
|
||||||
|
nothing above 600px**, from `matchMedia` rather than a media query, for
|
||||||
|
`job-band`'s reason plus one of its own — a stylesheet cannot stop a
|
||||||
|
1 Hz interval running for the life of every desktop session about a
|
||||||
|
line nobody can see. And **its phone rule sits at the foot of
|
||||||
|
`index.css`, beside `job-band`'s**, not in the phone block above: a
|
||||||
|
media query adds no specificity, so a `display: block` written before
|
||||||
|
the `display: none` that takes it out of the desktop grid loses to it
|
||||||
|
and the line never appears at any width, silently.
|
||||||
|
|
||||||
**900 is the worst desktop width, not the 800×600 minimum.** The
|
**900 is the worst desktop width, not the 800×600 minimum.** The
|
||||||
sidebar collapses to icons *below* 900, so the main panel is 843px at
|
sidebar collapses to icons *below* 900, so the main panel is 843px at
|
||||||
899 and 700px at 900 — the narrowest content area any desktop width
|
899 and 700px at 900 — the narrowest content area any desktop width
|
||||||
@@ -2006,9 +2163,26 @@ one that closes the queue — the reported defect moved one press later,
|
|||||||
which looks exactly like a press that did nothing.
|
which looks exactly like a press that did nothing.
|
||||||
|
|
||||||
**And the way out is 44px on a phone.** With the panel spanning the
|
**And the way out is 44px on a phone.** With the panel spanning the
|
||||||
whole width the scrim has no uncovered pixels at all, so the close
|
whole width there is no scrim there at all, so the close button is the
|
||||||
button is the only pointer route out of a full-screen surface; it was
|
only pointer route out of a full-screen surface; it was **25×21px**.
|
||||||
**25×21px**.
|
|
||||||
|
**The scrim is drawn only where it can be tapped** (#171). Below 600px
|
||||||
|
`.panel-content` is `width: 100%`, so the scrim sat entirely underneath
|
||||||
|
an opaque panel — measured at 424×439, host, panel and scrim all
|
||||||
|
424×318 — dimming nothing and dismissing nothing while wearing
|
||||||
|
`cursor: pointer`. #24's tap-outside-to-close cannot exist on a surface
|
||||||
|
with no outside, and the screen above is what answers it instead: back,
|
||||||
|
and a 44px close button. The alternative — a gutter, which is the
|
||||||
|
drawer pattern — was declined, because it buys the affordance by taking
|
||||||
|
width off a full-screen surface on a 424px viewport. Two things about
|
||||||
|
it are load-bearing. Its **existence** is `matchMedia`, not
|
||||||
|
`display: none`, on `job-band`'s rule: a hidden scrim is still an
|
||||||
|
element carrying the dismissal handler. And **the 600–899 band is
|
||||||
|
untouched**, where the panel is a 320px column of a wider content area
|
||||||
|
and the scrim has real uncovered pixels — which is why the e2e half
|
||||||
|
asserts *absence* at 424×439 rather than clicking, since a phone-width
|
||||||
|
case that clicks the scrim's centre hits the panel and passes on the
|
||||||
|
broken build.
|
||||||
|
|
||||||
What this does **not** fix is `page-header` overflowing on its own:
|
What this does **not** fix is `page-header` overflowing on its own:
|
||||||
at 900×600 "New Smart Playlist" is still clipped to 114 of 162px with
|
at 900×600 "New Smart Playlist" is still clipped to 114 of 162px with
|
||||||
@@ -2040,6 +2214,54 @@ toggled from `index.ts` would be a second expression of the same fact.
|
|||||||
The view therefore carries its own queue button, because that button
|
The view therefore carries its own queue button, because that button
|
||||||
lives in the bar it hides.
|
lives in the bar it hides.
|
||||||
|
|
||||||
|
**And below 500px of height its art and its names share a row** (#51).
|
||||||
|
The stacked arrangement's budget is fixed — 48px of header, 143px of
|
||||||
|
transport since #64, 78px of names, 68px of padding and gaps — so the
|
||||||
|
art gets `height - 386`, which at the reference device's 424x439 is
|
||||||
|
**53px**: the one thing a Now Playing screen exists to show, smallest
|
||||||
|
on it. #172 named the two ways out and this is the second, because the
|
||||||
|
first — a floor on the art with the block scrolling — scrolls the
|
||||||
|
transport off the bottom, and *controls never scroll off* is #51's own
|
||||||
|
Direction and plan 018's promise. Sideways the art is bounded by the
|
||||||
|
row's height instead of by the column's leftover: **53px to 143px**,
|
||||||
|
measured on the device, nothing scrolling, the transport untouched.
|
||||||
|
|
||||||
|
Three things about it are load-bearing.
|
||||||
|
|
||||||
|
**500 is where the two layouts cross rather than a round number.** In a
|
||||||
|
row the art is `height - 296` and the names get what is left of 392px,
|
||||||
|
so the names hold 176px at exactly 500 and less above it; stacked, the
|
||||||
|
art is `height - 386`, which passes 176px at 562. Below 500 the row is
|
||||||
|
the bigger art *and* the readable one — above it the column is, which
|
||||||
|
is why a tall phone keeps the arrangement it has. It is keyed on height
|
||||||
|
alone and not on the phone's width, because it answers vertical room: a
|
||||||
|
900x450 window has the same problem and the same fix.
|
||||||
|
|
||||||
|
**The art was not a small square, it was a crop, and that was never
|
||||||
|
only the phone.** `aspect-ratio` is specified not to re-derive the
|
||||||
|
width when `max-height` clamps the height — unlike an intrinsic ratio,
|
||||||
|
which is preserved under both bounds — so a definite `width: min(100%,
|
||||||
|
60vh)` kept its width while the height was clipped, and `object-fit:
|
||||||
|
cover` cropped a square cover into the band: **264x53** on the device.
|
||||||
|
The leftover exceeds the width only above ~843px of viewport, so every
|
||||||
|
height from ~500 to ~843 drew one too. `max-width`/`max-height: 100%`
|
||||||
|
with `width`/`height: auto` is the fix and is the replaced-element
|
||||||
|
path; it also never upscales past the natural size, and the largest
|
||||||
|
tier `saveCoverArt` keeps is 400px, so nothing is lost.
|
||||||
|
|
||||||
|
**The placeholder needs its own rule, and a non-replaced box cannot
|
||||||
|
express this one.** With no intrinsic size, auto/auto collapses it to
|
||||||
|
its icon (13x58, measured). It is driven from the height instead, with
|
||||||
|
`min-width: 0` because a flex item's automatic minimum is its content —
|
||||||
|
without it the icon's width becomes a floor the moment the row is
|
||||||
|
shorter than the icon, which is exactly what a job band does to this
|
||||||
|
screen. And since whichever max clamps does not re-derive the other, a
|
||||||
|
height-driven box goes **380x484** on a tall phone; `max-height:
|
||||||
|
calc(100vw - 2rem)` closes it, which is sound here for the reason
|
||||||
|
`60vh` was not — this is a phone-width detail view, so its content box
|
||||||
|
really is the viewport less the host's gutters, and it is a *max*, so
|
||||||
|
the failure mode is a square bounded early rather than a crop.
|
||||||
|
|
||||||
**The playing row is a shape, not a hue.** `track-list` and
|
**The playing row is a shape, not a hue.** `track-list` and
|
||||||
`queue-panel` draw a `::before` triangle in each row's own left
|
`queue-panel` draw a `::before` triangle in each row's own left
|
||||||
padding, plus `aria-current` — before, both rows were a background tint
|
padding, plus `aria-current` — before, both rows were a background tint
|
||||||
@@ -2489,6 +2711,31 @@ missing half; `catalogFailed` is the only route to `unavailable` now,
|
|||||||
and the timer is a 60 s backstop for a genuine hang rather than the
|
and the timer is a 60 s backstop for a genuine hang rather than the
|
||||||
verdict.
|
verdict.
|
||||||
|
|
||||||
|
**On a phone that page is one scroll container, and the header is in
|
||||||
|
it** (#66). It was built as a fixed header over a scrolling tracklist,
|
||||||
|
which is the desktop arrangement: at the reference device's 424×439 the
|
||||||
|
header owned **253 of the panel's 318px** and the list scrolled inside
|
||||||
|
the 64 that were left. Below 600px the *host* is the scroller and
|
||||||
|
`.content` stops being one, so the whole page moves together — which is
|
||||||
|
only available because this tracklist is plain DOM rather than a
|
||||||
|
virtualizer, and because `.main-panel > *` already gives the host a
|
||||||
|
definite height.
|
||||||
|
|
||||||
|
Three things about it are load-bearing. **Another `min-width: 0` was
|
||||||
|
not the fix**: `.album-info` carries one and was shrinking exactly as
|
||||||
|
asked, to 112px beside a 200px cover — so the title drew as `G…` and
|
||||||
|
"Shuffle album" ended at x=443 inside a 424px box, clipped by the
|
||||||
|
component's own `overflow: hidden` and reachable by no gesture. A row
|
||||||
|
with a fixed-size sibling has to **stack** at that width, or the column
|
||||||
|
that must shrink has nothing to be wide with. **`layout-overflow.spec.ts`
|
||||||
|
cannot see any of this** — `body.scrollWidth` equalled the viewport
|
||||||
|
throughout, because the overflow was *inside* a component; the spec
|
||||||
|
measures each header control against the host's own box, which is
|
||||||
|
`top-bar-fit.spec.ts`'s shape for the same reason. And **the phone block
|
||||||
|
is last in the stylesheet**, on `index.css`'s rule: a media query adds
|
||||||
|
no specificity, so written above the plain rules it overrides every
|
||||||
|
declaration in it is silently dead.
|
||||||
|
|
||||||
**Activating a row plays the list the row is in, from that row.** A
|
**Activating a row plays the list the row is in, from that row.** A
|
||||||
double-click — and Play on a single row's context menu — queues the
|
double-click — and Play on a single row's context menu — queues the
|
||||||
list as *displayed* with `startIndex` on that row, not a queue of one
|
list as *displayed* with `startIndex` on that row, not a queue of one
|
||||||
@@ -3444,6 +3691,27 @@ android-inspect` forwards the WebView's devtools socket and `make
|
|||||||
android-eval` asks the real page — raw CDP, because `connectOverCDP`
|
android-eval` asks the real page — raw CDP, because `connectOverCDP`
|
||||||
calls `Browser.setDownloadBehavior` and a WebView refuses it.
|
calls `Browser.setDownloadBehavior` and a WebView refuses it.
|
||||||
|
|
||||||
|
**One of those gaps is checked rather than remembered.** A nested rule
|
||||||
|
whose selector starts with an element name is not a parse error anyone
|
||||||
|
would notice on 113 — the rule simply does not exist, there and nowhere
|
||||||
|
else, which is how the bottom bar's `text-overflow: ellipsis` came to
|
||||||
|
have never truncated on the device. `make css-check`
|
||||||
|
(`frontend/scripts/check-css-nesting.mjs`, a pre-commit hook and a CI
|
||||||
|
step) fails on one, over every `frontend/*.css` and the `css` literals
|
||||||
|
alike — a glob rather than `index.css` by name, because the hook fires
|
||||||
|
on `frontend/**/*.{ts,css}` and a sweep that names one file goes green
|
||||||
|
over a stylesheet it never opened — and
|
||||||
|
says the fix is a leading `&` — valid in both syntaxes, so no nested
|
||||||
|
rule here has a reason to omit it. Two things it has to get right, and
|
||||||
|
both follow from asking whether a *style* rule is anywhere above rather
|
||||||
|
than what the immediate parent is: `@media (…) { bottom-nav { … } }` at
|
||||||
|
the top level is an ordinary rule and is the majority of what a regex
|
||||||
|
over the file would report, while the same rule one level inside
|
||||||
|
`.bar { @media (…) { … } }` is nested and is flagged. The check is the
|
||||||
|
cheap version of the answer; a build-time downlevel (Lightning CSS
|
||||||
|
targeting 113) would fix the class permanently and is a dependency and
|
||||||
|
a build step rather than twenty lines.
|
||||||
|
|
||||||
`build/config.yml`'s `version` is the
|
`build/config.yml`'s `version` is the
|
||||||
*metadata* version and is not what the app reports — `main.version` is
|
*metadata* version and is not what the app reports — `main.version` is
|
||||||
stamped at link time from the packaging recipe's git-derived version.
|
stamped at link time from the packaging recipe's git-derived version.
|
||||||
|
|||||||
@@ -172,12 +172,17 @@ ui-setup: ## Install the Vitest browser provider's own Chromium (once)
|
|||||||
bindings-check: ## Fail if the generated bindings are stale
|
bindings-check: ## Fail if the generated bindings are stale
|
||||||
@./scripts/bindings-check.sh
|
@./scripts/bindings-check.sh
|
||||||
|
|
||||||
|
# Two CSS traps that report a long way from their cause, or not at all.
|
||||||
# A backtick inside a comment in a css`` literal ends the literal, and
|
# A backtick inside a comment in a css`` literal ends the literal, and
|
||||||
# what you get back is a type error about CSSResult, or every test in
|
# what you get back is a type error about CSSResult, or every test in
|
||||||
# the suite failing to import. Four sessions, three plans. Instant.
|
# the suite failing to import. Four sessions, three plans. And a nested
|
||||||
|
# rule starting with an element name is dropped by the device's
|
||||||
|
# Chrome 113 in silence -- no tier here runs an engine that can see it.
|
||||||
|
# Instant.
|
||||||
.PHONY: css-check
|
.PHONY: css-check
|
||||||
css-check: ## Fail if a css`` literal was ended early by a backtick in a comment
|
css-check: ## Fail on a css`` literal ended early by a backtick, or a nested rule needing an &
|
||||||
@cd frontend && node scripts/check-css-literals.mjs
|
@cd frontend && node scripts/check-css-literals.mjs
|
||||||
|
@cd frontend && node scripts/check-css-nesting.mjs
|
||||||
|
|
||||||
# .pi/ and CLAUDE.md document commands, and a doc that documents a
|
# .pi/ and CLAUDE.md document commands, and a doc that documents a
|
||||||
# command wrongly is worse than no doc: an agent runs it confidently.
|
# command wrongly is worse than no doc: an agent runs it confidently.
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
//go:build android
|
||||||
|
|
||||||
|
// The write itself, and nothing else. Everything decidable off a phone
|
||||||
|
// is in androidlog.go; see the package comment for why.
|
||||||
|
|
||||||
|
package androidlog
|
||||||
|
|
||||||
|
/*
|
||||||
|
#cgo LDFLAGS: -llog
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <android/log.h>
|
||||||
|
*/
|
||||||
|
import "C"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The priorities in androidlog.go are android/log.h's own values, and
|
||||||
|
// these are what says so. A constant expression that would be negative
|
||||||
|
// does not compile as a uint, so a renumbered header fails the build
|
||||||
|
// here rather than logging everything at the wrong severity -- which is
|
||||||
|
// the failure that would otherwise be invisible, since logcat would
|
||||||
|
// happily print whatever number it was handed.
|
||||||
|
const (
|
||||||
|
_ = uint(C.ANDROID_LOG_VERBOSE - PrioVerbose)
|
||||||
|
_ = uint(PrioVerbose - C.ANDROID_LOG_VERBOSE)
|
||||||
|
_ = uint(C.ANDROID_LOG_DEBUG - PrioDebug)
|
||||||
|
_ = uint(PrioDebug - C.ANDROID_LOG_DEBUG)
|
||||||
|
_ = uint(C.ANDROID_LOG_INFO - PrioInfo)
|
||||||
|
_ = uint(PrioInfo - C.ANDROID_LOG_INFO)
|
||||||
|
_ = uint(C.ANDROID_LOG_WARN - PrioWarn)
|
||||||
|
_ = uint(PrioWarn - C.ANDROID_LOG_WARN)
|
||||||
|
_ = uint(C.ANDROID_LOG_ERROR - PrioError)
|
||||||
|
_ = uint(PrioError - C.ANDROID_LOG_ERROR)
|
||||||
|
_ = uint(C.ANDROID_LOG_FATAL - PrioFatal)
|
||||||
|
_ = uint(PrioFatal - C.ANDROID_LOG_FATAL)
|
||||||
|
)
|
||||||
|
|
||||||
|
// New returns the handler main() installs on Android.
|
||||||
|
func New(opts *slog.HandlerOptions) slog.Handler {
|
||||||
|
return NewHandler(opts, write)
|
||||||
|
}
|
||||||
|
|
||||||
|
// write hands one line to liblog.
|
||||||
|
func write(prio int, tag, msg string) {
|
||||||
|
cTag := C.CString(tag)
|
||||||
|
defer C.free(unsafe.Pointer(cTag))
|
||||||
|
|
||||||
|
cMsg := C.CString(msg)
|
||||||
|
defer C.free(unsafe.Pointer(cMsg))
|
||||||
|
|
||||||
|
C.__android_log_write(C.int(prio), cTag, cMsg)
|
||||||
|
}
|
||||||
@@ -0,0 +1,250 @@
|
|||||||
|
// Package androidlog routes slog to logcat.
|
||||||
|
//
|
||||||
|
// **An Android app's fd 1 and 2 go to /dev/null**, so every line this
|
||||||
|
// app writes with slog is discarded on that platform -- including the
|
||||||
|
// one naming the error it is about to os.Exit on. #52 is what that
|
||||||
|
// cost: a process that vanished with no tombstone, no AndroidRuntime
|
||||||
|
// stack and nothing in `logcat -b crash`, at Priority/Critical for
|
||||||
|
// months, whose entire diagnosis was one slog.Error main.go was
|
||||||
|
// already writing.
|
||||||
|
//
|
||||||
|
// The platform's own sink is __android_log_write, which is a handful
|
||||||
|
// of cgo -- and cgo compiled by nothing `make lint` or `make test`
|
||||||
|
// runs, since the only toolchain that builds the android tag is a
|
||||||
|
// cross-compiler and the only thing that runs it is a phone. So the
|
||||||
|
// split here is the one backend/mediacontrols/androidpayload.go makes,
|
||||||
|
// pushed as far as it will go: **everything except the write itself is
|
||||||
|
// in this file, untagged**. The priority mapping, the formatting, the
|
||||||
|
// chunking and the handler's own attr and group bookkeeping are
|
||||||
|
// ordinary Go that `go test` exercises on any platform; android.go is
|
||||||
|
// fifteen lines that hand a string to liblog.
|
||||||
|
package androidlog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Tag is what logcat labels these lines with.
|
||||||
|
//
|
||||||
|
// It is a constant of ours rather than the application id, because the
|
||||||
|
// debug build carries `applicationIdSuffix ".dev"` so that it can be
|
||||||
|
// installed beside the release app -- so a tag derived from the package
|
||||||
|
// name is a *different* tag on the one build that can be inspected, and
|
||||||
|
// the filter that is supposed to show these lines would hide them on
|
||||||
|
// exactly the build used to look for them.
|
||||||
|
const Tag = "yellowjacket"
|
||||||
|
|
||||||
|
// Android's priorities, from android/log.h. These are the values
|
||||||
|
// __android_log_write takes; android.go asserts at compile time that
|
||||||
|
// they still match the header, so a renumbered platform is a build
|
||||||
|
// failure here rather than a warning silently logged as an error.
|
||||||
|
const (
|
||||||
|
PrioVerbose = 2
|
||||||
|
PrioDebug = 3
|
||||||
|
PrioInfo = 4
|
||||||
|
PrioWarn = 5
|
||||||
|
PrioError = 6
|
||||||
|
PrioFatal = 7
|
||||||
|
)
|
||||||
|
|
||||||
|
// maxPayload is how much of one line liblog will carry.
|
||||||
|
//
|
||||||
|
// The kernel logger's entry is 4068 bytes for the tag, the message and
|
||||||
|
// their two NULs together, and what does not fit is **dropped without
|
||||||
|
// comment** -- so a long line would be truncated in the middle of the
|
||||||
|
// thing worth reading. 3500 leaves room for the tag and for the "(N/M)"
|
||||||
|
// a continuation carries.
|
||||||
|
const maxPayload = 3500
|
||||||
|
|
||||||
|
// WriteFunc is the platform sink: one already-formatted line, at one
|
||||||
|
// priority, under one tag.
|
||||||
|
//
|
||||||
|
// It is a parameter rather than a package-level function so that the
|
||||||
|
// handler can be driven by a test on a machine with no liblog at all.
|
||||||
|
type WriteFunc func(prio int, tag, msg string)
|
||||||
|
|
||||||
|
// Priority maps a slog level onto an Android one.
|
||||||
|
//
|
||||||
|
// slog's levels are open -- a caller may define its own at any int --
|
||||||
|
// so this is a banding rather than a lookup: anything below Info is
|
||||||
|
// debug, anything at or above Error is error. A custom level between
|
||||||
|
// two of the standard ones lands in the band beneath it, which is what
|
||||||
|
// slog's own level naming does.
|
||||||
|
func Priority(level slog.Level) int {
|
||||||
|
switch {
|
||||||
|
case level < slog.LevelDebug:
|
||||||
|
return PrioVerbose
|
||||||
|
case level < slog.LevelInfo:
|
||||||
|
return PrioDebug
|
||||||
|
case level < slog.LevelWarn:
|
||||||
|
return PrioInfo
|
||||||
|
case level < slog.LevelError:
|
||||||
|
return PrioWarn
|
||||||
|
default:
|
||||||
|
return PrioError
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handler formats records with slog's own TextHandler and hands each
|
||||||
|
// line to a WriteFunc.
|
||||||
|
//
|
||||||
|
// It delegates the formatting rather than doing it, because WithAttrs
|
||||||
|
// and WithGroup are the half of slog.Handler that is easy to get subtly
|
||||||
|
// wrong -- and a logger whose groups are wrong is a logger nobody reads.
|
||||||
|
// What it does own is what logcat needs and TextHandler does not know
|
||||||
|
// about: the priority, and the fact that a line has a maximum length.
|
||||||
|
type Handler struct {
|
||||||
|
write WriteFunc
|
||||||
|
|
||||||
|
// mu guards buf, which the delegate writes into. slog.Handler is
|
||||||
|
// documented as safe for concurrent use.
|
||||||
|
mu *sync.Mutex
|
||||||
|
buf *bytes.Buffer
|
||||||
|
delegate slog.Handler
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewHandler builds a handler over an arbitrary sink.
|
||||||
|
//
|
||||||
|
// The time and the level are dropped from the formatted line: logcat
|
||||||
|
// stamps every entry with both, and repeating them costs a quarter of
|
||||||
|
// the width of a phone-sized terminal to say the same thing twice.
|
||||||
|
func NewHandler(opts *slog.HandlerOptions, write WriteFunc) *Handler {
|
||||||
|
buf := &bytes.Buffer{}
|
||||||
|
|
||||||
|
inner := &slog.HandlerOptions{}
|
||||||
|
if opts != nil {
|
||||||
|
*inner = *opts
|
||||||
|
}
|
||||||
|
|
||||||
|
user := inner.ReplaceAttr
|
||||||
|
inner.ReplaceAttr = func(groups []string, a slog.Attr) slog.Attr {
|
||||||
|
if len(groups) == 0 && isBuiltin(a) {
|
||||||
|
return slog.Attr{}
|
||||||
|
}
|
||||||
|
|
||||||
|
if user != nil {
|
||||||
|
return user(groups, a)
|
||||||
|
}
|
||||||
|
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
|
||||||
|
return &Handler{
|
||||||
|
write: write,
|
||||||
|
mu: &sync.Mutex{},
|
||||||
|
buf: buf,
|
||||||
|
delegate: slog.NewTextHandler(buf, inner),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// isBuiltin reports whether an attr is slog's own time or level,
|
||||||
|
// rather than a caller's attribute that happens to share the name.
|
||||||
|
//
|
||||||
|
// ReplaceAttr cannot tell those apart by key. It is called with an
|
||||||
|
// empty group path for the built-ins *and* for every top-level
|
||||||
|
// attribute, so a key comparison alone silently eats a caller's own
|
||||||
|
// "level" or "time" -- which is not hypothetical: the probe that
|
||||||
|
// verified this package on the device logged one, and the attribute
|
||||||
|
// vanished. The kinds are what separate them, because slog builds the
|
||||||
|
// built-ins as slog.Any(LevelKey, r.Level) and slog.Time(TimeKey, ...)
|
||||||
|
// and an attribute value of type slog.Level is not something a caller
|
||||||
|
// passes by accident.
|
||||||
|
func isBuiltin(a slog.Attr) bool {
|
||||||
|
switch a.Key {
|
||||||
|
case slog.TimeKey:
|
||||||
|
return a.Value.Kind() == slog.KindTime
|
||||||
|
case slog.LevelKey:
|
||||||
|
_, ok := a.Value.Any().(slog.Level)
|
||||||
|
|
||||||
|
return ok
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enabled reports whether the level is worth formatting.
|
||||||
|
func (h *Handler) Enabled(ctx context.Context, level slog.Level) bool {
|
||||||
|
return h.delegate.Enabled(ctx, level)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle formats one record and writes it out, in as many entries as
|
||||||
|
// its length demands.
|
||||||
|
func (h *Handler) Handle(ctx context.Context, rec slog.Record) error {
|
||||||
|
h.mu.Lock()
|
||||||
|
defer h.mu.Unlock()
|
||||||
|
|
||||||
|
h.buf.Reset()
|
||||||
|
|
||||||
|
if err := h.delegate.Handle(ctx, rec); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
prio := Priority(rec.Level)
|
||||||
|
for _, line := range Chunk(strings.TrimRight(h.buf.String(), "\n")) {
|
||||||
|
h.write(prio, Tag, line)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithAttrs returns a handler carrying the given attributes.
|
||||||
|
func (h *Handler) WithAttrs(attrs []slog.Attr) slog.Handler {
|
||||||
|
return h.derive(h.delegate.WithAttrs(attrs))
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithGroup returns a handler that qualifies subsequent attributes.
|
||||||
|
func (h *Handler) WithGroup(name string) slog.Handler {
|
||||||
|
return h.derive(h.delegate.WithGroup(name))
|
||||||
|
}
|
||||||
|
|
||||||
|
// derive shares the buffer and its mutex with the parent.
|
||||||
|
//
|
||||||
|
// They must be shared rather than copied: the delegate returned by
|
||||||
|
// WithAttrs writes into the *same* buffer this one does, so a second
|
||||||
|
// mutex would guard nothing and two loggers derived from one would
|
||||||
|
// interleave their bytes into a single line.
|
||||||
|
func (h *Handler) derive(delegate slog.Handler) *Handler {
|
||||||
|
return &Handler{
|
||||||
|
write: h.write,
|
||||||
|
mu: h.mu,
|
||||||
|
buf: h.buf,
|
||||||
|
delegate: delegate,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Chunk splits a formatted record into entries liblog will carry
|
||||||
|
// whole.
|
||||||
|
//
|
||||||
|
// A record short enough to fit is returned as it is, which is nearly
|
||||||
|
// every record; the numbering only appears where something was going
|
||||||
|
// to be silently truncated anyway. It splits on bytes rather than runes
|
||||||
|
// because the limit is a byte count -- a multi-byte rune straddling the
|
||||||
|
// boundary is a mojibake character in a log line, against a lost one.
|
||||||
|
func Chunk(msg string) []string {
|
||||||
|
if len(msg) <= maxPayload {
|
||||||
|
return []string{msg}
|
||||||
|
}
|
||||||
|
|
||||||
|
var parts []string
|
||||||
|
|
||||||
|
for rest := msg; rest != ""; {
|
||||||
|
n := min(maxPayload, len(rest))
|
||||||
|
parts = append(parts, rest[:n])
|
||||||
|
rest = rest[n:]
|
||||||
|
}
|
||||||
|
|
||||||
|
numbered := make([]string, 0, len(parts))
|
||||||
|
for i, p := range parts {
|
||||||
|
numbered = append(
|
||||||
|
numbered,
|
||||||
|
"("+strconv.Itoa(i+1)+"/"+strconv.Itoa(len(parts))+") "+p,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return numbered
|
||||||
|
}
|
||||||
@@ -0,0 +1,355 @@
|
|||||||
|
package androidlog_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"yellowjacket/backend/androidlog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// entry is one call to the sink.
|
||||||
|
type entry struct {
|
||||||
|
prio int
|
||||||
|
tag string
|
||||||
|
msg string
|
||||||
|
}
|
||||||
|
|
||||||
|
// recorder is the platform write, on a machine with no platform.
|
||||||
|
type recorder struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
entries []entry
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *recorder) write(prio int, tag, msg string) {
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
|
||||||
|
r.entries = append(r.entries, entry{prio: prio, tag: tag, msg: msg})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *recorder) only(t *testing.T) entry {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
|
||||||
|
if len(r.entries) != 1 {
|
||||||
|
t.Fatalf("want exactly one entry, got %d: %v", len(r.entries), r.entries)
|
||||||
|
}
|
||||||
|
|
||||||
|
return r.entries[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
func newLogger(r *recorder, level slog.Level) *slog.Logger {
|
||||||
|
return slog.New(androidlog.NewHandler(
|
||||||
|
&slog.HandlerOptions{Level: level},
|
||||||
|
r.write,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestPriorityMapsEveryLevel pins the level banding.
|
||||||
|
//
|
||||||
|
// This is the one thing in #160 that a wrong answer hides rather than
|
||||||
|
// breaks: logcat prints whatever priority it is handed, so an Error
|
||||||
|
// filed as Info is a line that is present, correct and invisible to
|
||||||
|
// every filter anyone would use to look for it.
|
||||||
|
func TestPriorityMapsEveryLevel(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
level slog.Level
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{"below debug is verbose", slog.LevelDebug - 1, androidlog.PrioVerbose},
|
||||||
|
{"debug", slog.LevelDebug, androidlog.PrioDebug},
|
||||||
|
{"info", slog.LevelInfo, androidlog.PrioInfo},
|
||||||
|
{"warn", slog.LevelWarn, androidlog.PrioWarn},
|
||||||
|
{"error", slog.LevelError, androidlog.PrioError},
|
||||||
|
|
||||||
|
// slog's levels are open, so a caller may sit between two of
|
||||||
|
// the named ones. Each lands in the band beneath it, which is
|
||||||
|
// what slog's own level naming does ("INFO+2").
|
||||||
|
{"between info and warn", slog.LevelInfo + 2, androidlog.PrioInfo},
|
||||||
|
{"between warn and error", slog.LevelWarn + 1, androidlog.PrioWarn},
|
||||||
|
{"above error", slog.LevelError + 4, androidlog.PrioError},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
if got := androidlog.Priority(tt.level); got != tt.want {
|
||||||
|
t.Errorf("Priority(%v) = %d, want %d", tt.level, got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestPrioritiesAreTheHeadersValues pins the constants themselves.
|
||||||
|
//
|
||||||
|
// android.go asserts these against android/log.h at compile time, but
|
||||||
|
// only a cross-compiler ever builds that file. This is the assertion
|
||||||
|
// that runs in CI, and the numbers are written out longhand on purpose
|
||||||
|
// -- comparing a constant to itself would pass on any renumbering.
|
||||||
|
func TestPrioritiesAreTheHeadersValues(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
for _, tt := range []struct {
|
||||||
|
name string
|
||||||
|
got int
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{"verbose", androidlog.PrioVerbose, 2},
|
||||||
|
{"debug", androidlog.PrioDebug, 3},
|
||||||
|
{"info", androidlog.PrioInfo, 4},
|
||||||
|
{"warn", androidlog.PrioWarn, 5},
|
||||||
|
{"error", androidlog.PrioError, 6},
|
||||||
|
{"fatal", androidlog.PrioFatal, 7},
|
||||||
|
} {
|
||||||
|
if tt.got != tt.want {
|
||||||
|
t.Errorf("%s priority = %d, want %d", tt.name, tt.got, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRecordReachesTheSink is the whole point of the package: a line
|
||||||
|
// written with slog arrives, under the app's tag, at the right
|
||||||
|
// priority.
|
||||||
|
func TestRecordReachesTheSink(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
rec := &recorder{}
|
||||||
|
newLogger(rec, slog.LevelInfo).Error("application error", "err", "boom")
|
||||||
|
|
||||||
|
got := rec.only(t)
|
||||||
|
|
||||||
|
if got.prio != androidlog.PrioError {
|
||||||
|
t.Errorf("priority = %d, want %d", got.prio, androidlog.PrioError)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got.tag != androidlog.Tag {
|
||||||
|
t.Errorf("tag = %q, want %q", got.tag, androidlog.Tag)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(got.msg, "application error") {
|
||||||
|
t.Errorf("message %q does not carry the message", got.msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(got.msg, `err=boom`) {
|
||||||
|
t.Errorf("message %q does not carry the attribute", got.msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTheTagIsNotTheApplicationID guards the trap the tag exists to
|
||||||
|
// avoid.
|
||||||
|
//
|
||||||
|
// The debug build carries `applicationIdSuffix ".dev"`, so it is
|
||||||
|
// installed as app.yellowjacket.dev -- and it is the *only* build whose
|
||||||
|
// WebView can be inspected, so it is the build anyone debugging this
|
||||||
|
// app is running. A tag derived from the application id therefore
|
||||||
|
// differs between the build being looked at and the build the filter
|
||||||
|
// was written for, which is the failure this whole issue is about
|
||||||
|
// wearing a different hat.
|
||||||
|
func TestTheTagIsNotTheApplicationID(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
if strings.Contains(androidlog.Tag, ".") {
|
||||||
|
t.Errorf(
|
||||||
|
"tag %q looks like an application id; it must be stable "+
|
||||||
|
"across the debug suffix",
|
||||||
|
androidlog.Tag,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Logcat's tag field is 23 bytes. A longer one is truncated, and a
|
||||||
|
// truncated tag matches no filter.
|
||||||
|
if len(androidlog.Tag) > 23 {
|
||||||
|
t.Errorf("tag %q is %d bytes, over logcat's 23", androidlog.Tag, len(androidlog.Tag))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTimeAndLevelAreDropped checks the formatting decision.
|
||||||
|
//
|
||||||
|
// logcat stamps every entry with a timestamp and a priority letter, so
|
||||||
|
// carrying slog's own is the same information twice on a 424px screen.
|
||||||
|
func TestTimeAndLevelAreDropped(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
rec := &recorder{}
|
||||||
|
newLogger(rec, slog.LevelInfo).Warn("scan finished", "files", 1577)
|
||||||
|
|
||||||
|
got := rec.only(t).msg
|
||||||
|
|
||||||
|
if strings.Contains(got, "time=") {
|
||||||
|
t.Errorf("message %q still carries a timestamp", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
if strings.Contains(got, "level=") {
|
||||||
|
t.Errorf("message %q still carries a level", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !strings.Contains(got, "files=1577") {
|
||||||
|
t.Errorf("message %q lost its attributes with them", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestACallersOwnLevelAttrSurvives is a regression, and it was found on
|
||||||
|
// the phone rather than here.
|
||||||
|
//
|
||||||
|
// Dropping slog's built-in time and level by key alone also drops a
|
||||||
|
// caller's attribute of the same name, because ReplaceAttr sees an
|
||||||
|
// empty group path for both. The probe that verified this package on
|
||||||
|
// the device wrote slog.Info("...", "level", "info") and logcat showed
|
||||||
|
// the message with no attributes at all.
|
||||||
|
func TestACallersOwnLevelAttrSurvives(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
rec := &recorder{}
|
||||||
|
newLogger(rec, slog.LevelInfo).Info("probe", "level", "info", "time", "soon")
|
||||||
|
|
||||||
|
got := rec.only(t).msg
|
||||||
|
|
||||||
|
for _, want := range []string{"level=info", "time=soon"} {
|
||||||
|
if !strings.Contains(got, want) {
|
||||||
|
t.Errorf("message %q lost the caller's %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And slog's own are still gone: the built-in level renders as a
|
||||||
|
// bare word like INFO, never as the caller's value.
|
||||||
|
if strings.Contains(got, "level=INFO") {
|
||||||
|
t.Errorf("message %q carries slog's own level", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestLevelIsHonoured checks that Enabled reaches the delegate.
|
||||||
|
func TestLevelIsHonoured(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
rec := &recorder{}
|
||||||
|
log := newLogger(rec, slog.LevelWarn)
|
||||||
|
|
||||||
|
log.Info("not this one")
|
||||||
|
log.Warn("this one")
|
||||||
|
|
||||||
|
if got := rec.only(t).msg; !strings.Contains(got, "this one") {
|
||||||
|
t.Errorf("wrong record survived: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestGroupsAndAttrsSurvive covers the half of slog.Handler this
|
||||||
|
// delegates rather than implements -- the reason it delegates at all.
|
||||||
|
func TestGroupsAndAttrsSurvive(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
rec := &recorder{}
|
||||||
|
log := newLogger(rec, slog.LevelInfo).
|
||||||
|
With("component", "player").
|
||||||
|
WithGroup("track")
|
||||||
|
|
||||||
|
log.Info("loaded", "path", "/sdcard/Music/a.flac")
|
||||||
|
|
||||||
|
got := rec.only(t).msg
|
||||||
|
|
||||||
|
for _, want := range []string{
|
||||||
|
"component=player",
|
||||||
|
"track.path=/sdcard/Music/a.flac",
|
||||||
|
} {
|
||||||
|
if !strings.Contains(got, want) {
|
||||||
|
t.Errorf("message %q is missing %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestDerivedHandlersDoNotInterleave is why derive shares the buffer's
|
||||||
|
// mutex rather than taking a new one.
|
||||||
|
//
|
||||||
|
// Two loggers derived from one write into the same buffer, so a second
|
||||||
|
// mutex would guard nothing and a concurrent pair would splice each
|
||||||
|
// other's bytes into a single line -- which reads as corrupted logs
|
||||||
|
// under load and as nothing at all in a test that logs once.
|
||||||
|
func TestDerivedHandlersDoNotInterleave(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
rec := &recorder{}
|
||||||
|
base := newLogger(rec, slog.LevelInfo)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
|
||||||
|
for i := range 8 {
|
||||||
|
wg.Add(1)
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
|
log := base.With("worker", i).WithGroup("g")
|
||||||
|
for range 50 {
|
||||||
|
log.Info("tick", "n", i)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
rec.mu.Lock()
|
||||||
|
defer rec.mu.Unlock()
|
||||||
|
|
||||||
|
if len(rec.entries) != 8*50 {
|
||||||
|
t.Fatalf("got %d entries, want %d", len(rec.entries), 8*50)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, e := range rec.entries {
|
||||||
|
if strings.Count(e.msg, "msg=tick") != 1 {
|
||||||
|
t.Fatalf("interleaved line: %q", e.msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestChunkLeavesShortLinesAlone is the common case: no numbering
|
||||||
|
// appears on a record that was never going to be truncated.
|
||||||
|
func TestChunkLeavesShortLinesAlone(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
got := androidlog.Chunk("msg=short")
|
||||||
|
|
||||||
|
if len(got) != 1 || got[0] != "msg=short" {
|
||||||
|
t.Errorf("Chunk(short) = %q, want the input unchanged", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestChunkSplitsWhatWouldBeTruncated covers the case liblog drops
|
||||||
|
// silently.
|
||||||
|
func TestChunkSplitsWhatWouldBeTruncated(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
const n = 9000
|
||||||
|
|
||||||
|
long := strings.Repeat("x", n)
|
||||||
|
parts := androidlog.Chunk(long)
|
||||||
|
|
||||||
|
if len(parts) < 2 {
|
||||||
|
t.Fatalf("a %d-byte line was not split", n)
|
||||||
|
}
|
||||||
|
|
||||||
|
var payload strings.Builder
|
||||||
|
|
||||||
|
for i, p := range parts {
|
||||||
|
if len(p) > 4000 {
|
||||||
|
t.Errorf("part %d is %d bytes, over liblog's entry", i, len(p))
|
||||||
|
}
|
||||||
|
|
||||||
|
_, rest, found := strings.Cut(p, ") ")
|
||||||
|
if !found {
|
||||||
|
t.Fatalf("part %d carries no (n/m) marker: %q", i, p)
|
||||||
|
}
|
||||||
|
|
||||||
|
payload.WriteString(rest)
|
||||||
|
}
|
||||||
|
|
||||||
|
if payload.String() != long {
|
||||||
|
t.Errorf("the parts do not reassemble into the input")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -40,7 +40,8 @@ WHERE id = ? AND (mbid IS NULL OR mbid = '');
|
|||||||
-- name: GetAlbumsWithPendingReleaseMBID :many
|
-- name: GetAlbumsWithPendingReleaseMBID :many
|
||||||
SELECT id, pending_release_mbid FROM albums
|
SELECT id, pending_release_mbid FROM albums
|
||||||
WHERE pending_release_mbid IS NOT NULL AND pending_release_mbid != ''
|
WHERE pending_release_mbid IS NOT NULL AND pending_release_mbid != ''
|
||||||
AND (mbid IS NULL OR mbid = '');
|
AND (mbid IS NULL OR mbid = '')
|
||||||
|
LIMIT ?;
|
||||||
|
|
||||||
-- name: DeleteAlbum :exec
|
-- name: DeleteAlbum :exec
|
||||||
DELETE FROM albums WHERE id = ?;
|
DELETE FROM albums WHERE id = ?;
|
||||||
|
|||||||
@@ -331,6 +331,7 @@ const getAlbumsWithPendingReleaseMBID = `-- name: GetAlbumsWithPendingReleaseMBI
|
|||||||
SELECT id, pending_release_mbid FROM albums
|
SELECT id, pending_release_mbid FROM albums
|
||||||
WHERE pending_release_mbid IS NOT NULL AND pending_release_mbid != ''
|
WHERE pending_release_mbid IS NOT NULL AND pending_release_mbid != ''
|
||||||
AND (mbid IS NULL OR mbid = '')
|
AND (mbid IS NULL OR mbid = '')
|
||||||
|
LIMIT ?
|
||||||
`
|
`
|
||||||
|
|
||||||
type GetAlbumsWithPendingReleaseMBIDRow struct {
|
type GetAlbumsWithPendingReleaseMBIDRow struct {
|
||||||
@@ -338,8 +339,8 @@ type GetAlbumsWithPendingReleaseMBIDRow struct {
|
|||||||
PendingReleaseMbid sql.NullString
|
PendingReleaseMbid sql.NullString
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *Queries) GetAlbumsWithPendingReleaseMBID(ctx context.Context) ([]GetAlbumsWithPendingReleaseMBIDRow, error) {
|
func (q *Queries) GetAlbumsWithPendingReleaseMBID(ctx context.Context, limit int64) ([]GetAlbumsWithPendingReleaseMBIDRow, error) {
|
||||||
rows, err := q.db.QueryContext(ctx, getAlbumsWithPendingReleaseMBID)
|
rows, err := q.db.QueryContext(ctx, getAlbumsWithPendingReleaseMBID, limit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
+35
-31
@@ -2,6 +2,7 @@ package explore
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"database/sql"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"math"
|
"math"
|
||||||
"sort"
|
"sort"
|
||||||
@@ -12,6 +13,7 @@ import (
|
|||||||
"golang.org/x/sync/singleflight"
|
"golang.org/x/sync/singleflight"
|
||||||
|
|
||||||
"yellowjacket/backend/database"
|
"yellowjacket/backend/database"
|
||||||
|
"yellowjacket/backend/database/sql/sqlcgen"
|
||||||
"yellowjacket/backend/events"
|
"yellowjacket/backend/events"
|
||||||
"yellowjacket/backend/jobs"
|
"yellowjacket/backend/jobs"
|
||||||
)
|
)
|
||||||
@@ -279,37 +281,32 @@ func (e *Service) BackfillReleaseGroupMBIDs() {
|
|||||||
go e.backfillReleaseGroupMBIDs(e.ctx)
|
go e.backfillReleaseGroupMBIDs(e.ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *Service) backfillReleaseGroupMBIDs(ctx context.Context) {
|
// pendingReleaseMBIDs is the albums this pass has work to do on.
|
||||||
rows, err := e.db.QueryContext(
|
//
|
||||||
"SELECT id, pending_release_mbid FROM release_groups "+
|
// It is separate from the pass, and returns its error rather than
|
||||||
"WHERE (mbid IS NULL OR mbid = '') "+
|
// logging it, so that a test can assert the statement runs against the
|
||||||
"AND pending_release_mbid IS NOT NULL AND pending_release_mbid != '' "+
|
// real schema. That is not a general preference -- it is this
|
||||||
"LIMIT ?",
|
// statement's history: it named `release_groups`, a table plan 013
|
||||||
releaseGroupMBIDBackfillMaxPerRun,
|
// renamed to `albums`, so it failed on every launch since e7748f1 and
|
||||||
|
// the pass returned quietly having done nothing. A test of the pass
|
||||||
|
// as a whole cannot see that, because a query error and an empty
|
||||||
|
// library are the same early return.
|
||||||
|
func (e *Service) pendingReleaseMBIDs(
|
||||||
|
ctx context.Context,
|
||||||
|
) ([]sqlcgen.GetAlbumsWithPendingReleaseMBIDRow, error) {
|
||||||
|
return e.db.ReadQueries.GetAlbumsWithPendingReleaseMBID(
|
||||||
|
ctx, releaseGroupMBIDBackfillMaxPerRun,
|
||||||
)
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *Service) backfillReleaseGroupMBIDs(ctx context.Context) {
|
||||||
|
pending, err := e.pendingReleaseMBIDs(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
e.logger.Warn("release-group mbid backfill: query failed", "error", err)
|
e.logger.Warn("release-group mbid backfill: query failed", "error", err)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
type pendingRow struct {
|
|
||||||
id int64
|
|
||||||
releaseMBID string
|
|
||||||
}
|
|
||||||
|
|
||||||
var pending []pendingRow
|
|
||||||
|
|
||||||
for rows.Next() {
|
|
||||||
var p pendingRow
|
|
||||||
|
|
||||||
if err := rows.Scan(&p.id, &p.releaseMBID); err == nil {
|
|
||||||
pending = append(pending, p)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = rows.Close()
|
|
||||||
|
|
||||||
if len(pending) == 0 {
|
if len(pending) == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -335,7 +332,7 @@ func (e *Service) backfillReleaseGroupMBIDs(ctx context.Context) {
|
|||||||
|
|
||||||
job.progress(i, len(pending))
|
job.progress(i, len(pending))
|
||||||
|
|
||||||
release, err := e.mb.LookupRelease(ctx, p.releaseMBID)
|
release, err := e.mb.LookupRelease(ctx, p.PendingReleaseMbid.String)
|
||||||
if err != nil || release.ReleaseGroupMBID == "" {
|
if err != nil || release.ReleaseGroupMBID == "" {
|
||||||
// Left alone rather than cleared: LookupRelease caches its
|
// Left alone rather than cleared: LookupRelease caches its
|
||||||
// answer (success or a release with no group) for 7 days,
|
// answer (success or a release with no group) for 7 days,
|
||||||
@@ -344,12 +341,19 @@ func (e *Service) backfillReleaseGroupMBIDs(ctx context.Context) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = e.db.ExecContext(
|
// The writer, not ReadQueries: an UPDATE issued on the
|
||||||
"UPDATE release_groups SET mbid = ?, pending_release_mbid = NULL "+
|
// query-only pool fails at runtime with "attempt to write a
|
||||||
"WHERE id = ? AND (mbid IS NULL OR mbid = '')",
|
// readonly database".
|
||||||
release.ReleaseGroupMBID, p.id,
|
if err := e.db.Queries.ResolveAlbumPendingReleaseMBID(
|
||||||
)
|
ctx,
|
||||||
if err != nil {
|
sqlcgen.ResolveAlbumPendingReleaseMBIDParams{
|
||||||
|
Mbid: sql.NullString{
|
||||||
|
String: release.ReleaseGroupMBID,
|
||||||
|
Valid: true,
|
||||||
|
},
|
||||||
|
ID: p.ID,
|
||||||
|
},
|
||||||
|
); err != nil {
|
||||||
e.logger.Warn("release-group mbid backfill: update failed", "error", err)
|
e.logger.Warn("release-group mbid backfill: update failed", "error", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,250 @@
|
|||||||
|
package explore
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"log/slog"
|
||||||
|
"strconv"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"yellowjacket/backend/database"
|
||||||
|
"yellowjacket/backend/database/sql/sqlcgen"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The release-group MBID backfill queried `release_groups`, a table
|
||||||
|
// plan 013 renamed to `albums`, so it failed on its first statement on
|
||||||
|
// every launch from e7748f1 until #189 -- and the pass swallowed that,
|
||||||
|
// because a query error and an empty library are the same early
|
||||||
|
// return. Nothing noticed for two reasons worth keeping in mind:
|
||||||
|
//
|
||||||
|
// - the statement was **raw SQL**, so sqlc never read it. Every other
|
||||||
|
// statement in the repo was renamed by the same change because sqlc
|
||||||
|
// reads sql/schemas/ and cannot generate against a table that is not
|
||||||
|
// declared. The two sqlc queries this now calls were written by 013
|
||||||
|
// and left uncalled.
|
||||||
|
// - it needs no network and no fixture library to reproduce. The
|
||||||
|
// failure is at prepare time.
|
||||||
|
|
||||||
|
// seedPendingAlbum inserts an album whose files carried a release MBID
|
||||||
|
// but no release-group MBID, which is what `library.updateMBIDs`
|
||||||
|
// leaves behind for this pass to resolve.
|
||||||
|
func seedPendingAlbum(
|
||||||
|
t *testing.T,
|
||||||
|
db *database.DB,
|
||||||
|
name, pendingMBID string,
|
||||||
|
) int64 {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
res, err := db.ExecContext(
|
||||||
|
"INSERT INTO albums (name, artist_credit, pending_release_mbid) "+
|
||||||
|
"VALUES (?, ?, ?)",
|
||||||
|
name, "Test Artist", pendingMBID,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("insert albums row: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
id, err := res.LastInsertId()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("last insert id: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
func newPendingTestService(db *database.DB) *Service {
|
||||||
|
return &Service{db: db, logger: slog.Default()}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestPendingReleaseMBIDsRunsAgainstTheRealSchema is the regression.
|
||||||
|
//
|
||||||
|
// It asserts the statement *runs*, which is the whole of what was
|
||||||
|
// broken: against the old raw SQL this returns
|
||||||
|
// "no such table: release_groups" rather than a row.
|
||||||
|
func TestPendingReleaseMBIDsRunsAgainstTheRealSchema(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
db := database.NewTestDB(t)
|
||||||
|
e := newPendingTestService(db)
|
||||||
|
|
||||||
|
want := seedPendingAlbum(t, db, "Pending Album", "release-mbid-1")
|
||||||
|
|
||||||
|
pending, err := e.pendingReleaseMBIDs(db.Ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the backfill's query failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(pending) != 1 {
|
||||||
|
t.Fatalf("got %d pending albums, want 1", len(pending))
|
||||||
|
}
|
||||||
|
|
||||||
|
if pending[0].ID != want {
|
||||||
|
t.Errorf("got album id %d, want %d", pending[0].ID, want)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := pending[0].PendingReleaseMbid.String; got != "release-mbid-1" {
|
||||||
|
t.Errorf("got pending mbid %q, want %q", got, "release-mbid-1")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestOnlyUnresolvedAlbumsAreReturned pins the two conditions that make
|
||||||
|
// the pass idempotent, since between them they are what stops it doing
|
||||||
|
// the same MusicBrainz lookups on every launch forever.
|
||||||
|
func TestOnlyUnresolvedAlbumsAreReturned(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
db := database.NewTestDB(t)
|
||||||
|
e := newPendingTestService(db)
|
||||||
|
|
||||||
|
pendingID := seedPendingAlbum(t, db, "Still Pending", "release-mbid-1")
|
||||||
|
|
||||||
|
// Already resolved: it has a real MBID, so there is nothing to
|
||||||
|
// look up even though a marker is still sitting on it.
|
||||||
|
resolved := seedPendingAlbum(t, db, "Already Resolved", "release-mbid-2")
|
||||||
|
if err := db.Queries.SetAlbumMBID(db.Ctx, sqlcgen.SetAlbumMBIDParams{
|
||||||
|
Mbid: sql.NullString{String: "rg-mbid", Valid: true},
|
||||||
|
ID: resolved,
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("set album mbid: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Never had a release MBID to resolve in the first place, which is
|
||||||
|
// most of a library.
|
||||||
|
seedPendingAlbum(t, db, "Nothing Pending", "")
|
||||||
|
|
||||||
|
pending, err := e.pendingReleaseMBIDs(db.Ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the backfill's query failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(pending) != 1 || pending[0].ID != pendingID {
|
||||||
|
t.Fatalf(
|
||||||
|
"got %d albums %v, want only the unresolved one (%d)",
|
||||||
|
len(pending), pending, pendingID,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestResolvingClearsTheMarker is the other half: once the lookup has
|
||||||
|
// answered, the album must stop being a candidate, or the pass repeats
|
||||||
|
// the same live MusicBrainz call on every launch.
|
||||||
|
func TestResolvingClearsTheMarker(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
db := database.NewTestDB(t)
|
||||||
|
e := newPendingTestService(db)
|
||||||
|
|
||||||
|
id := seedPendingAlbum(t, db, "Pending Album", "release-mbid-1")
|
||||||
|
|
||||||
|
// The writer, deliberately: this is an UPDATE, and the read pool
|
||||||
|
// would refuse it at runtime.
|
||||||
|
if err := db.Queries.ResolveAlbumPendingReleaseMBID(
|
||||||
|
db.Ctx,
|
||||||
|
sqlcgen.ResolveAlbumPendingReleaseMBIDParams{
|
||||||
|
Mbid: sql.NullString{String: "resolved-rg-mbid", Valid: true},
|
||||||
|
ID: id,
|
||||||
|
},
|
||||||
|
); err != nil {
|
||||||
|
t.Fatalf("resolve pending release mbid: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
pending, err := e.pendingReleaseMBIDs(db.Ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the backfill's query failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(pending) != 0 {
|
||||||
|
t.Fatalf("a resolved album is still a candidate: %v", pending)
|
||||||
|
}
|
||||||
|
|
||||||
|
album, err := db.ReadQueries.GetAlbum(db.Ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get album: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if album.Mbid.String != "resolved-rg-mbid" {
|
||||||
|
t.Errorf("album mbid = %q, want the resolved one", album.Mbid.String)
|
||||||
|
}
|
||||||
|
|
||||||
|
if album.PendingReleaseMbid.Valid &&
|
||||||
|
album.PendingReleaseMbid.String != "" {
|
||||||
|
t.Errorf(
|
||||||
|
"the pending marker survived as %q",
|
||||||
|
album.PendingReleaseMbid.String,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestAResolvedMBIDIsNeverOverwritten covers the guard in the UPDATE.
|
||||||
|
//
|
||||||
|
// The pass runs against rows it read earlier, and a rescan can resolve
|
||||||
|
// an album from its tags in between -- a real MBID from the file must
|
||||||
|
// win over one this pass inferred from a release.
|
||||||
|
func TestAResolvedMBIDIsNeverOverwritten(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
db := database.NewTestDB(t)
|
||||||
|
|
||||||
|
id := seedPendingAlbum(t, db, "Pending Album", "release-mbid-1")
|
||||||
|
|
||||||
|
if err := db.Queries.SetAlbumMBID(db.Ctx, sqlcgen.SetAlbumMBIDParams{
|
||||||
|
Mbid: sql.NullString{String: "from-the-tags", Valid: true},
|
||||||
|
ID: id,
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("set album mbid: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := db.Queries.ResolveAlbumPendingReleaseMBID(
|
||||||
|
db.Ctx,
|
||||||
|
sqlcgen.ResolveAlbumPendingReleaseMBIDParams{
|
||||||
|
Mbid: sql.NullString{String: "from-the-backfill", Valid: true},
|
||||||
|
ID: id,
|
||||||
|
},
|
||||||
|
); err != nil {
|
||||||
|
t.Fatalf("resolve pending release mbid: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
album, err := db.ReadQueries.GetAlbum(db.Ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get album: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if album.Mbid.String != "from-the-tags" {
|
||||||
|
t.Errorf(
|
||||||
|
"album mbid = %q, want the tagged one to have won",
|
||||||
|
album.Mbid.String,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestThePassIsBounded checks the LIMIT.
|
||||||
|
//
|
||||||
|
// Each row costs a live MusicBrainz lookup on a 1 req/s limiter shared
|
||||||
|
// with every page the user can open, so an unbounded read is a run that
|
||||||
|
// lasts as long as the library is untagged. The sqlc query 013 wrote
|
||||||
|
// had no LIMIT; the raw statement it was replacing did.
|
||||||
|
func TestThePassIsBounded(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
db := database.NewTestDB(t)
|
||||||
|
e := newPendingTestService(db)
|
||||||
|
|
||||||
|
for i := range releaseGroupMBIDBackfillMaxPerRun + 10 {
|
||||||
|
seedPendingAlbum(
|
||||||
|
t, db,
|
||||||
|
"Album "+string(rune('A'+i%26))+strconv.Itoa(i),
|
||||||
|
"release-mbid-"+strconv.Itoa(i),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pending, err := e.pendingReleaseMBIDs(db.Ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the backfill's query failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(pending) != releaseGroupMBIDBackfillMaxPerRun {
|
||||||
|
t.Errorf(
|
||||||
|
"got %d albums, want the run bounded at %d",
|
||||||
|
len(pending), releaseGroupMBIDBackfillMaxPerRun,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,6 +47,39 @@ type BufferedStreamer struct {
|
|||||||
// seek bar and suppresses its interpolation.
|
// seek bar and suppresses its interpolation.
|
||||||
starved int
|
starved int
|
||||||
starvedSince time.Time
|
starvedSince time.Time
|
||||||
|
|
||||||
|
// underruns accumulates for the life of this streamer, where
|
||||||
|
// starved is reset by every arriving sample.
|
||||||
|
//
|
||||||
|
// The two answer different questions and only the first was being
|
||||||
|
// asked. starved is a *stall* detector: it exists to end a track
|
||||||
|
// whose source has died, so it forgets a run the moment audio
|
||||||
|
// resumes -- which is exactly the case this counts. A hundred 20ms
|
||||||
|
// underruns a minute never approach the give-up threshold and were
|
||||||
|
// invisible to the log, the UI and every test tier, while being
|
||||||
|
// audible as static: an underrun is served as a run of zeros
|
||||||
|
// spliced into the waveform, and a step discontinuity at each edge
|
||||||
|
// is what a click is.
|
||||||
|
underruns UnderrunStats
|
||||||
|
}
|
||||||
|
|
||||||
|
// UnderrunStats is what the ring buffer missed, cumulatively.
|
||||||
|
//
|
||||||
|
// Samples rather than milliseconds because this type does not know the
|
||||||
|
// sample rate -- the player does, and converts at the point of
|
||||||
|
// reporting.
|
||||||
|
type UnderrunStats struct {
|
||||||
|
// Runs is the number of *episodes*: transitions from healthy into
|
||||||
|
// starved. Calls is how many Stream calls were served with
|
||||||
|
// silence, and Samples is how much silence that was.
|
||||||
|
//
|
||||||
|
// Runs is the count that means something audible. One episode is
|
||||||
|
// one pop however many calls it spans, and the ratio of the two is
|
||||||
|
// how long the average episode was -- which is what separates
|
||||||
|
// "clicking" from "dropping out".
|
||||||
|
Runs int64
|
||||||
|
Calls int64
|
||||||
|
Samples int64
|
||||||
}
|
}
|
||||||
|
|
||||||
// The silence fill is bounded by both a duration and a run of calls,
|
// The silence fill is bounded by both a duration and a run of calls,
|
||||||
@@ -226,6 +259,13 @@ func (bs *BufferedStreamer) Stream(
|
|||||||
// but only for a bounded stretch, because "forever" is
|
// but only for a bounded stretch, because "forever" is
|
||||||
// reported upward as healthy playback and there is no watchdog
|
// reported upward as healthy playback and there is no watchdog
|
||||||
// above this to notice otherwise.
|
// above this to notice otherwise.
|
||||||
|
if bs.starved == 0 {
|
||||||
|
bs.underruns.Runs++
|
||||||
|
}
|
||||||
|
|
||||||
|
bs.underruns.Calls++
|
||||||
|
bs.underruns.Samples += int64(len(samples))
|
||||||
|
|
||||||
bs.starved++
|
bs.starved++
|
||||||
|
|
||||||
if bs.starvedSince.IsZero() {
|
if bs.starvedSince.IsZero() {
|
||||||
@@ -269,6 +309,20 @@ func (bs *BufferedStreamer) Stream(
|
|||||||
return n, true
|
return n, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Underruns returns the cumulative underrun count.
|
||||||
|
//
|
||||||
|
// It is a snapshot rather than a live view, and it is read from
|
||||||
|
// outside the audio callback: counting happens in Stream, under the
|
||||||
|
// lock it already takes, because that path has a real-time deadline
|
||||||
|
// and anything that allocates or formats on it is a cause of the
|
||||||
|
// defect it is measuring rather than a measurement of it.
|
||||||
|
func (bs *BufferedStreamer) Underruns() UnderrunStats {
|
||||||
|
bs.mu.Lock()
|
||||||
|
defer bs.mu.Unlock()
|
||||||
|
|
||||||
|
return bs.underruns
|
||||||
|
}
|
||||||
|
|
||||||
// Err returns any error encountered by the source streamer.
|
// Err returns any error encountered by the source streamer.
|
||||||
func (bs *BufferedStreamer) Err() error {
|
func (bs *BufferedStreamer) Err() error {
|
||||||
bs.mu.Lock()
|
bs.mu.Lock()
|
||||||
@@ -298,6 +352,10 @@ func (bs *BufferedStreamer) Flush() {
|
|||||||
|
|
||||||
// resetStarvationLocked forgets an underrun run. Must be called with
|
// resetStarvationLocked forgets an underrun run. Must be called with
|
||||||
// bs.mu held.
|
// bs.mu held.
|
||||||
|
//
|
||||||
|
// Deliberately does not touch bs.underruns: forgetting the run is what
|
||||||
|
// makes starved a stall detector, and remembering it is the whole
|
||||||
|
// point of the counter beside it.
|
||||||
func (bs *BufferedStreamer) resetStarvationLocked() {
|
func (bs *BufferedStreamer) resetStarvationLocked() {
|
||||||
bs.starved = 0
|
bs.starved = 0
|
||||||
bs.starvedSince = time.Time{}
|
bs.starvedSince = time.Time{}
|
||||||
|
|||||||
@@ -0,0 +1,279 @@
|
|||||||
|
package player
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// An underrun is audible and nothing counted it (#135).
|
||||||
|
//
|
||||||
|
// The distinction these tests exist for is that `starved` and
|
||||||
|
// `underruns` disagree on purpose. `starved` is a stall detector: it is
|
||||||
|
// reset by every arriving sample, because its job is to end a track
|
||||||
|
// whose source has died and a source that is merely slow must not be
|
||||||
|
// cut short (TestUnderrunsDoNotAccumulateAcrossASlowSource, next
|
||||||
|
// door). That reset is exactly what made the audible case invisible --
|
||||||
|
// a hundred short underruns a minute never approach the give-up
|
||||||
|
// threshold, and each one is a run of zeros spliced into the waveform
|
||||||
|
// with a step discontinuity at both edges.
|
||||||
|
|
||||||
|
// TestAnEmptyRingIsCounted is the measurement itself: silence served
|
||||||
|
// for a missing sample is recorded rather than merely tolerated.
|
||||||
|
func TestAnEmptyRingIsCounted(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
// A source that never produces is the cleanest way to make the
|
||||||
|
// ring empty on demand; the stall budget is far longer than the
|
||||||
|
// handful of calls below.
|
||||||
|
bs := NewBufferedStreamer(stalledStreamer{}, 1024)
|
||||||
|
defer bs.Close()
|
||||||
|
|
||||||
|
if got := bs.Underruns(); got != (UnderrunStats{}) {
|
||||||
|
t.Fatalf("a fresh streamer already reports %+v", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
buf := make([][2]float64, 256)
|
||||||
|
|
||||||
|
for range 3 {
|
||||||
|
if _, ok := bs.Stream(buf); !ok {
|
||||||
|
t.Fatal("the stall budget ran out before the test did")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
got := bs.Underruns()
|
||||||
|
|
||||||
|
if got.Calls != 3 {
|
||||||
|
t.Errorf("Calls = %d, want 3", got.Calls)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got.Samples != int64(3*len(buf)) {
|
||||||
|
t.Errorf("Samples = %d, want %d", got.Samples, 3*len(buf))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Three consecutive silent calls are one episode, not three. That
|
||||||
|
// is the number that means something audible: one interruption is
|
||||||
|
// one pop however many callbacks it spans.
|
||||||
|
if got.Runs != 1 {
|
||||||
|
t.Errorf("Runs = %d, want 1 -- an unbroken run is one episode", got.Runs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSilenceIsWhatIsCounted pins what an underrun actually does to the
|
||||||
|
// waveform, which is the reason to count it at all.
|
||||||
|
func TestSilenceIsWhatIsCounted(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
bs := NewBufferedStreamer(stalledStreamer{}, 1024)
|
||||||
|
defer bs.Close()
|
||||||
|
|
||||||
|
buf := make([][2]float64, 64)
|
||||||
|
for i := range buf {
|
||||||
|
buf[i] = [2]float64{0.5, 0.5}
|
||||||
|
}
|
||||||
|
|
||||||
|
n, ok := bs.Stream(buf)
|
||||||
|
if !ok || n != len(buf) {
|
||||||
|
t.Fatalf("Stream = (%d, %v), want (%d, true)", n, ok, len(buf))
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := range buf {
|
||||||
|
if buf[i] != ([2]float64{}) {
|
||||||
|
t.Fatalf("sample %d is %v, want silence", i, buf[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := bs.Underruns().Samples; got != int64(len(buf)) {
|
||||||
|
t.Errorf("counted %d samples of silence, wrote %d", got, len(buf))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSeparateEpisodesAreSeparateRuns is the counter's whole shape:
|
||||||
|
// audio arriving between two underruns makes them two, because that is
|
||||||
|
// two interruptions and two clicks.
|
||||||
|
func TestSeparateEpisodesAreSeparateRuns(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
// A source that yields nothing until it is fed, so the ring can be
|
||||||
|
// emptied, filled and emptied again on demand.
|
||||||
|
src := &gatedStreamer{}
|
||||||
|
|
||||||
|
bs := NewBufferedStreamer(src, 1024)
|
||||||
|
defer bs.Close()
|
||||||
|
|
||||||
|
buf := make([][2]float64, 128)
|
||||||
|
|
||||||
|
starve := func() {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
for range 2 {
|
||||||
|
if _, ok := bs.Stream(buf); !ok {
|
||||||
|
t.Fatal("the stall budget ran out before the test did")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// feed lets exactly one bufferful through and drains it, so the
|
||||||
|
// ring is empty again on return. Allowing more would mean the
|
||||||
|
// starve() after it drained real audio instead of underrunning,
|
||||||
|
// which is what the first version of this test did -- it reported
|
||||||
|
// one episode and looked like the counter was wrong.
|
||||||
|
feed := func() {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
src.allow(len(buf))
|
||||||
|
|
||||||
|
// The read-ahead is a goroutine, so wait for real samples
|
||||||
|
// rather than assuming they have landed.
|
||||||
|
deadline := time.Now().Add(2 * time.Second)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
n, ok := bs.Stream(buf)
|
||||||
|
if ok && n > 0 && buf[0] != ([2]float64{}) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
time.Sleep(time.Millisecond)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Fatal("the source never delivered a sample")
|
||||||
|
}
|
||||||
|
|
||||||
|
starve()
|
||||||
|
feed()
|
||||||
|
starve()
|
||||||
|
|
||||||
|
if got := bs.Underruns().Runs; got < 2 {
|
||||||
|
t.Errorf(
|
||||||
|
"Runs = %d, want at least 2 -- audio in between makes two "+
|
||||||
|
"episodes, not one",
|
||||||
|
got,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTheStallResetDoesNotClearTheCounter is the regression this file
|
||||||
|
// is really about.
|
||||||
|
//
|
||||||
|
// resetStarvationLocked runs on every arriving sample and on every
|
||||||
|
// Flush. If it cleared the cumulative count too, the counter would
|
||||||
|
// report zero on exactly the workload it exists to measure -- a stream
|
||||||
|
// that underruns repeatedly but always recovers -- which is
|
||||||
|
// indistinguishable from healthy playback and is what the code did
|
||||||
|
// before #135.
|
||||||
|
func TestTheStallResetDoesNotClearTheCounter(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
bs := NewBufferedStreamer(stalledStreamer{}, 1024)
|
||||||
|
defer bs.Close()
|
||||||
|
|
||||||
|
buf := make([][2]float64, 128)
|
||||||
|
|
||||||
|
if _, ok := bs.Stream(buf); !ok {
|
||||||
|
t.Fatal("the stall budget ran out before the test did")
|
||||||
|
}
|
||||||
|
|
||||||
|
before := bs.Underruns()
|
||||||
|
if before.Runs == 0 {
|
||||||
|
t.Fatal("nothing was counted, so the reset cannot be tested")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both of the ways a run is forgotten.
|
||||||
|
bs.mu.Lock()
|
||||||
|
bs.resetStarvationLocked()
|
||||||
|
bs.mu.Unlock()
|
||||||
|
|
||||||
|
bs.Flush()
|
||||||
|
|
||||||
|
if got := bs.Underruns(); got != before {
|
||||||
|
t.Errorf(
|
||||||
|
"forgetting the stall run also discarded the count: %+v, "+
|
||||||
|
"want %+v",
|
||||||
|
got, before,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUnderrunDeltaNeverGoesBackwards covers the one arithmetic trap in
|
||||||
|
// the reporting side.
|
||||||
|
//
|
||||||
|
// The counter belongs to the streamer and the streamer is replaced on
|
||||||
|
// every track, so a baseline carried across a track change is the
|
||||||
|
// previous track's total subtracted from a fresh zero. The load path
|
||||||
|
// resets the baseline, and this clamps as well -- a negative count in a
|
||||||
|
// log line reads as a broken instrument, which would discredit the
|
||||||
|
// measurement rather than merely mis-state it.
|
||||||
|
func TestUnderrunDeltaNeverGoesBackwards(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
now UnderrunStats
|
||||||
|
last UnderrunStats
|
||||||
|
want UnderrunStats
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "ordinary progress",
|
||||||
|
now: UnderrunStats{Runs: 5, Calls: 40, Samples: 4000},
|
||||||
|
last: UnderrunStats{Runs: 2, Calls: 10, Samples: 1000},
|
||||||
|
want: UnderrunStats{Runs: 3, Calls: 30, Samples: 3000},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "nothing happened",
|
||||||
|
now: UnderrunStats{Runs: 5, Calls: 40, Samples: 4000},
|
||||||
|
last: UnderrunStats{Runs: 5, Calls: 40, Samples: 4000},
|
||||||
|
want: UnderrunStats{},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "a new streamer, with a stale baseline",
|
||||||
|
now: UnderrunStats{},
|
||||||
|
last: UnderrunStats{Runs: 9, Calls: 90, Samples: 9000},
|
||||||
|
want: UnderrunStats{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
if got := underrunDelta(tt.now, tt.last); got != tt.want {
|
||||||
|
t.Errorf("underrunDelta = %+v, want %+v", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// gatedStreamer produces only what it has been allowed to, and
|
||||||
|
// otherwise stalls without ending -- so a test can decide exactly when
|
||||||
|
// the ring runs dry.
|
||||||
|
type gatedStreamer struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
remaining int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *gatedStreamer) allow(n int) {
|
||||||
|
g.mu.Lock()
|
||||||
|
defer g.mu.Unlock()
|
||||||
|
|
||||||
|
g.remaining += n
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *gatedStreamer) Stream(samples [][2]float64) (int, bool) {
|
||||||
|
g.mu.Lock()
|
||||||
|
defer g.mu.Unlock()
|
||||||
|
|
||||||
|
if g.remaining <= 0 {
|
||||||
|
return 0, true
|
||||||
|
}
|
||||||
|
|
||||||
|
n := min(len(samples), g.remaining)
|
||||||
|
|
||||||
|
for i := range n {
|
||||||
|
samples[i] = [2]float64{0.25, 0.25}
|
||||||
|
}
|
||||||
|
|
||||||
|
g.remaining -= n
|
||||||
|
|
||||||
|
return n, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *gatedStreamer) Err() error { return nil }
|
||||||
+90
-10
@@ -39,16 +39,21 @@ type Player struct {
|
|||||||
// via the queue).
|
// via the queue).
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
|
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
logger *slog.Logger
|
logger *slog.Logger
|
||||||
db *database.DB
|
db *database.DB
|
||||||
state State
|
state State
|
||||||
currentFile *os.File
|
currentFile *os.File
|
||||||
format beep.Format
|
format beep.Format
|
||||||
baseStreamer beep.Streamer
|
baseStreamer beep.Streamer
|
||||||
seeker beep.StreamSeeker
|
seeker beep.StreamSeeker
|
||||||
resampled beep.Streamer
|
resampled beep.Streamer
|
||||||
buffered *BufferedStreamer
|
buffered *BufferedStreamer
|
||||||
|
|
||||||
|
// lastUnderruns is the previous report, so the 1 Hz log can say
|
||||||
|
// what happened in the last second and stay quiet when nothing did.
|
||||||
|
// It is reset with the streamer, in loadFileLocked.
|
||||||
|
lastUnderruns UnderrunStats
|
||||||
control *beep.Ctrl
|
control *beep.Ctrl
|
||||||
volume *effects.Volume
|
volume *effects.Volume
|
||||||
speakerStreamer beep.Streamer
|
speakerStreamer beep.Streamer
|
||||||
@@ -292,9 +297,78 @@ func (p *Player) emitPositionIfPlaying() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p.reportUnderrunsLocked()
|
||||||
p.emitPositionLocked()
|
p.emitPositionLocked()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// underrunDelta is what happened since the last report.
|
||||||
|
//
|
||||||
|
// It clamps at zero rather than subtracting blind, because the counter
|
||||||
|
// belongs to the *streamer* and the streamer is replaced on every
|
||||||
|
// track: a baseline carried across that boundary is the previous
|
||||||
|
// track's total subtracted from a fresh zero, which is negative. That
|
||||||
|
// is repaired at the load (lastUnderruns is reset with the streamer)
|
||||||
|
// and clamped here as well, because a negative count in a log line
|
||||||
|
// reads as a broken instrument and would discredit the measurement
|
||||||
|
// this exists to make.
|
||||||
|
func underrunDelta(now, last UnderrunStats) UnderrunStats {
|
||||||
|
return UnderrunStats{
|
||||||
|
Runs: max(0, now.Runs-last.Runs),
|
||||||
|
Calls: max(0, now.Calls-last.Calls),
|
||||||
|
Samples: max(0, now.Samples-last.Samples),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// reportUnderrunsLocked logs what the ring buffer missed, at most once
|
||||||
|
// a second and only when the number moved. Must be called with p.mu
|
||||||
|
// held.
|
||||||
|
//
|
||||||
|
// **An underrun is audible and nothing counted it** (#135). The ring
|
||||||
|
// serves silence when it is empty, so a run of zeros is spliced into
|
||||||
|
// the waveform and the step discontinuity at each edge is a click; a
|
||||||
|
// series of short ones is static. Everything that makes one likelier
|
||||||
|
// is worse on a phone than on a desktop -- slower storage, a governor
|
||||||
|
// that parks cores, background work, GC -- and no tier here can see it,
|
||||||
|
// since CI's audio device is a null sink chosen because it keeps time.
|
||||||
|
//
|
||||||
|
// Three things about the reporting are deliberate.
|
||||||
|
//
|
||||||
|
// **It is on the 1 Hz position ticker rather than in Stream.** Stream
|
||||||
|
// runs on the speaker callback's real-time deadline, and a log line
|
||||||
|
// there would allocate, format and write on the exact path whose
|
||||||
|
// missed deadline is the defect -- measuring by making it worse.
|
||||||
|
//
|
||||||
|
// **An unchanged count is not logged.** That is emitStatus' rule one
|
||||||
|
// package over: a healthy player is silent, so anything in the log is
|
||||||
|
// news, and the line appears exactly while it is popping. Reading it
|
||||||
|
// off a device means `make android-logs` with the audio audible.
|
||||||
|
//
|
||||||
|
// **It is Info rather than Debug**, because the default level is Info
|
||||||
|
// and a phone has no convenient way to set YJ_LOG_LEVEL -- a debug
|
||||||
|
// line here would be a counter nobody on the affected platform can
|
||||||
|
// read, which is the shape of the bug that made #160 necessary.
|
||||||
|
func (p *Player) reportUnderrunsLocked() {
|
||||||
|
if p.buffered == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
stats := p.buffered.Underruns()
|
||||||
|
if stats == p.lastUnderruns {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
since := underrunDelta(stats, p.lastUnderruns)
|
||||||
|
p.lastUnderruns = stats
|
||||||
|
|
||||||
|
slog.Info("audio underrun",
|
||||||
|
"runs", since.Runs,
|
||||||
|
"calls", since.Calls,
|
||||||
|
"silenceMs", speakerSampleRate.D(int(since.Samples)).Milliseconds(),
|
||||||
|
"trackRuns", stats.Runs,
|
||||||
|
"trackSilenceMs", speakerSampleRate.D(int(stats.Samples)).Milliseconds(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// emitPositionLocked pushes the current position to the frontend.
|
// emitPositionLocked pushes the current position to the frontend.
|
||||||
// Must be called with p.mu held.
|
// Must be called with p.mu held.
|
||||||
func (p *Player) emitPositionLocked() {
|
func (p *Player) emitPositionLocked() {
|
||||||
@@ -484,6 +558,12 @@ func (p *Player) updateStreamers(
|
|||||||
p.resampled, int(speakerSampleRate)*2,
|
p.resampled, int(speakerSampleRate)*2,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// The counter belongs to the streamer, so the baseline it is
|
||||||
|
// reported against has to go with it -- otherwise the first report
|
||||||
|
// of a new track is the previous track's total subtracted from
|
||||||
|
// zero, which is negative and looks like the instrument is broken.
|
||||||
|
p.lastUnderruns = UnderrunStats{}
|
||||||
|
|
||||||
// wrap in ctrl streamer to allow play/pause
|
// wrap in ctrl streamer to allow play/pause
|
||||||
p.control = &beep.Ctrl{Streamer: p.buffered}
|
p.control = &beep.Ctrl{Streamer: p.buffered}
|
||||||
|
|
||||||
|
|||||||
@@ -52,6 +52,75 @@ func UseHomeOverride(base string) {
|
|||||||
_ = os.Setenv(envHomeOverride, base)
|
_ = os.Setenv(envHomeOverride, base)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// envTempDir is the variable Go's os.TempDir() reads, and through it
|
||||||
|
// every library in the process that asks for a temporary file.
|
||||||
|
const envTempDir = "TMPDIR"
|
||||||
|
|
||||||
|
// tempDirName is the subdirectory of the app's own storage that
|
||||||
|
// becomes that answer.
|
||||||
|
const tempDirName = "tmp"
|
||||||
|
|
||||||
|
// UseTempDir gives the process a temporary directory that exists.
|
||||||
|
//
|
||||||
|
// **Android has no /tmp and hands an app no TMPDIR**, and Go's
|
||||||
|
// os.TempDir() falls back to "/tmp" when the variable is unset -- so
|
||||||
|
// every library in the process that wants scratch space is handed a
|
||||||
|
// path that has never existed. SQLite is the one that noticed: an
|
||||||
|
// INSERT ... SELECT large enough to spill returned
|
||||||
|
// SQLITE_IOERR_GETTEMPPATH (disk I/O error 6410), which is how the
|
||||||
|
// champion search index came to fail its rebuild on every launch while
|
||||||
|
// the app otherwise looked healthy (#190).
|
||||||
|
//
|
||||||
|
// It is the *class* that is fixed here rather than that statement.
|
||||||
|
// Anything that spills fails the same way on that platform -- large
|
||||||
|
// sorts, large joins, VACUUM -- so the repair belongs at the process's
|
||||||
|
// one answer to the question rather than at each caller. The
|
||||||
|
// alternative considered was PRAGMA temp_store = MEMORY, which is
|
||||||
|
// cheaper and more local and is a promise that every future spill fits
|
||||||
|
// in RAM on a phone; the catalog is the largest thing in this app and
|
||||||
|
// that is not a promise worth making silently.
|
||||||
|
//
|
||||||
|
// The rules are UseHomeOverride's, for the same reasons. **An empty
|
||||||
|
// base is a no-op**, because that is what
|
||||||
|
// application.Mobile.StoragePath() returns on desktop -- so this needs
|
||||||
|
// no build tag and changes nothing off mobile, where /tmp is real. And
|
||||||
|
// **an explicit TMPDIR wins**, so anyone who set one deliberately gets
|
||||||
|
// what they asked for; nothing sets it on the platform this exists for.
|
||||||
|
//
|
||||||
|
// It returns its error rather than swallowing it because a temp
|
||||||
|
// directory that could not be created is the same silent failure one
|
||||||
|
// step earlier, and since #160 a log line on that platform is
|
||||||
|
// something a person can actually read.
|
||||||
|
func UseTempDir(base string) error {
|
||||||
|
if base == "" || os.Getenv(envTempDir) != "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
dir := filepath.Join(base, tempDirName)
|
||||||
|
|
||||||
|
if err := os.MkdirAll(dir, os.ModePerm); err != nil {
|
||||||
|
return fmt.Errorf("could not make the temp directory %s: %w", dir, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Writability is checked rather than assumed: the whole failure
|
||||||
|
// this repairs is a directory that is named and cannot be used, and
|
||||||
|
// MkdirAll on an existing unwritable directory succeeds.
|
||||||
|
probe, err := os.CreateTemp(dir, "probe")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("temp directory %s is not writable: %w", dir, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
name := probe.Name()
|
||||||
|
_ = probe.Close()
|
||||||
|
_ = os.Remove(name)
|
||||||
|
|
||||||
|
if err := os.Setenv(envTempDir, dir); err != nil {
|
||||||
|
return fmt.Errorf("could not set %s: %w", envTempDir, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// getUserDirPath returns and creates the path for a user directory.
|
// getUserDirPath returns and creates the path for a user directory.
|
||||||
func getUserDirPath(dt dirType) (string, error) {
|
func getUserDirPath(dt dirType) (string, error) {
|
||||||
path, err := resolveUserDirPath(dt)
|
path, err := resolveUserDirPath(dt)
|
||||||
|
|||||||
@@ -87,3 +87,116 @@ func TestUseHomeOverride(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UseTempDir carries UseHomeOverride's two rules for the same reasons,
|
||||||
|
// plus one of its own: the directory it names has to be usable.
|
||||||
|
//
|
||||||
|
// **The only tier that can compile the platform this exists for is a
|
||||||
|
// phone**, so everything decidable off one is decided here -- which is
|
||||||
|
// androidpayload.go's discipline, and is why the platform call is a
|
||||||
|
// parameter rather than something this package reaches for. The
|
||||||
|
// device's half is a single measurement: no /tmp, no TMPDIR (#190).
|
||||||
|
func TestUseTempDir(t *testing.T) {
|
||||||
|
t.Run("an empty base is a no-op", func(t *testing.T) {
|
||||||
|
// This is the desktop case in full: StoragePath() answers ""
|
||||||
|
// off mobile, where /tmp is real and must be left alone.
|
||||||
|
t.Setenv(envTempDir, "")
|
||||||
|
|
||||||
|
if err := UseTempDir(""); err != nil {
|
||||||
|
t.Fatalf("UseTempDir(\"\") = %v, want nil", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := os.Getenv(envTempDir); got != "" {
|
||||||
|
t.Errorf("%s = %q, want it untouched", envTempDir, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("an explicit TMPDIR wins", func(t *testing.T) {
|
||||||
|
const chosen = "/somewhere/deliberate"
|
||||||
|
|
||||||
|
// The base is taken before TMPDIR moves, because t.TempDir()
|
||||||
|
// reads TMPDIR too -- which is the same fact this function is
|
||||||
|
// about, met from the other side.
|
||||||
|
base := t.TempDir()
|
||||||
|
|
||||||
|
t.Setenv(envTempDir, chosen)
|
||||||
|
|
||||||
|
if err := UseTempDir(base); err != nil {
|
||||||
|
t.Fatalf("UseTempDir = %v, want nil", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := os.Getenv(envTempDir); got != chosen {
|
||||||
|
t.Errorf("%s = %q, want the explicit %q", envTempDir, got, chosen)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("points at a real directory under the base", func(t *testing.T) {
|
||||||
|
base := t.TempDir()
|
||||||
|
|
||||||
|
t.Setenv(envTempDir, "")
|
||||||
|
|
||||||
|
if err := UseTempDir(base); err != nil {
|
||||||
|
t.Fatalf("UseTempDir = %v, want nil", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got := os.Getenv(envTempDir)
|
||||||
|
|
||||||
|
want := filepath.Join(base, tempDirName)
|
||||||
|
if got != want {
|
||||||
|
t.Fatalf("%s = %q, want %q", envTempDir, got, want)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The whole failure being repaired is a temp directory that is
|
||||||
|
// named and does not exist, so naming one is not enough.
|
||||||
|
info, err := os.Stat(got)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the temp directory was named but not created: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !info.IsDir() {
|
||||||
|
t.Fatalf("%s is not a directory", got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("os.TempDir then answers with it", func(t *testing.T) {
|
||||||
|
// The point of setting the variable at all: this is what every
|
||||||
|
// library in the process reads, SQLite's driver included.
|
||||||
|
base := t.TempDir()
|
||||||
|
|
||||||
|
t.Setenv(envTempDir, "")
|
||||||
|
|
||||||
|
if err := UseTempDir(base); err != nil {
|
||||||
|
t.Fatalf("UseTempDir = %v, want nil", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := os.TempDir(); got != filepath.Join(base, tempDirName) {
|
||||||
|
t.Errorf("os.TempDir() = %q, want the directory we made", got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("an unwritable directory is an error, not a silent success", func(t *testing.T) {
|
||||||
|
if os.Getuid() == 0 {
|
||||||
|
t.Skip("root can write anywhere, so there is nothing to refuse")
|
||||||
|
}
|
||||||
|
|
||||||
|
base := t.TempDir()
|
||||||
|
|
||||||
|
// MkdirAll on an existing directory succeeds whatever its
|
||||||
|
// mode, so without the write probe this case would set TMPDIR
|
||||||
|
// to a directory nothing can use -- which is the bug again,
|
||||||
|
// one directory over.
|
||||||
|
if err := os.Mkdir(filepath.Join(base, tempDirName), 0o500); err != nil {
|
||||||
|
t.Fatalf("prepare the unwritable directory: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Setenv(envTempDir, "")
|
||||||
|
|
||||||
|
if err := UseTempDir(base); err == nil {
|
||||||
|
t.Fatal("UseTempDir accepted a directory it cannot write to")
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := os.Getenv(envTempDir); got != "" {
|
||||||
|
t.Errorf("%s was set to %q despite the failure", envTempDir, got)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,127 +0,0 @@
|
|||||||
import { test, expect } from '../support/fixtures.js';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Long-press is the touch route to a context menu (plan 016 B2 phase 3).
|
|
||||||
*
|
|
||||||
* The component tier proves the gesture in isolation, against markup it
|
|
||||||
* built itself. What it cannot prove is the half that made this one
|
|
||||||
* listener instead of six: that the synthetic event reaches the handler
|
|
||||||
* a *real* component bound — `track-list` delegates its `contextmenu`
|
|
||||||
* on the `lit-virtualizer` rather than binding one per row — and that
|
|
||||||
* the real `wa-popup` menu opens from it, which is a path with its own
|
|
||||||
* history of opening and then refusing to work (see
|
|
||||||
* `menu-keyboard.spec.ts`).
|
|
||||||
*
|
|
||||||
* The pointer events are dispatched rather than performed: this project
|
|
||||||
* runs Desktop Chrome and Desktop Safari, neither of which has touch,
|
|
||||||
* and a device tier does not exist. So this is honest about what it
|
|
||||||
* checks — the app's own listeners, on the app's own DOM, from the
|
|
||||||
* events a touch would produce — and not about a real finger.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** A common small phone, as in `phone-shell.spec.ts`. */
|
|
||||||
const PHONE = { width: 390, height: 844 };
|
|
||||||
|
|
||||||
/** Comfortably past the module's 500ms hold. */
|
|
||||||
const HELD = 900;
|
|
||||||
|
|
||||||
type Page = import('@playwright/test').Page;
|
|
||||||
|
|
||||||
/** The track list's menu panel, or null while it is not rendered. */
|
|
||||||
const panel = (page: Page) =>
|
|
||||||
page.evaluate(() => {
|
|
||||||
const el = document
|
|
||||||
.querySelector('track-list')
|
|
||||||
?.shadowRoot?.querySelector('.context-menu-panel');
|
|
||||||
|
|
||||||
if (!el) return null;
|
|
||||||
|
|
||||||
return {
|
|
||||||
role: el.getAttribute('role'),
|
|
||||||
label: el.getAttribute('aria-label'),
|
|
||||||
items: el.querySelectorAll('[role="menuitem"]').length,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Press the first track row, optionally dragging partway through — the
|
|
||||||
* shape of a scroll that begins on a row, which must not open a menu.
|
|
||||||
*/
|
|
||||||
async function pressFirstRow(
|
|
||||||
page: Page,
|
|
||||||
opts: { driftY?: number } = {},
|
|
||||||
): Promise<void> {
|
|
||||||
await page.evaluate((drift) => {
|
|
||||||
// `.track-row`, not `[role="row"]`: the column header is a row too,
|
|
||||||
// and it is the *first* one -- a press on it is correctly ignored,
|
|
||||||
// which reads exactly like the gesture not working.
|
|
||||||
const row = document
|
|
||||||
.querySelector('track-list')
|
|
||||||
?.shadowRoot?.querySelector('.track-row');
|
|
||||||
|
|
||||||
if (!row) throw new Error('no track row to press');
|
|
||||||
|
|
||||||
const box = row.getBoundingClientRect();
|
|
||||||
const x = Math.round(box.left + box.width / 2);
|
|
||||||
const y = Math.round(box.top + box.height / 2);
|
|
||||||
const send = (type: string, dy = 0) =>
|
|
||||||
row.dispatchEvent(
|
|
||||||
new PointerEvent(type, {
|
|
||||||
bubbles: true,
|
|
||||||
composed: true,
|
|
||||||
cancelable: true,
|
|
||||||
pointerType: 'touch',
|
|
||||||
isPrimary: true,
|
|
||||||
clientX: x,
|
|
||||||
clientY: y + dy,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
send('pointerdown');
|
|
||||||
|
|
||||||
if (drift) send('pointermove', drift);
|
|
||||||
}, opts.driftY ?? 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
test.describe('long-press opens the track menu', () => {
|
|
||||||
test.beforeEach(async ({ app }) => {
|
|
||||||
await app.setViewportSize(PHONE);
|
|
||||||
await app.getByTestId('tab-tracks').click();
|
|
||||||
await expect(app.getByTestId('main-content')).toHaveAttribute(
|
|
||||||
'data-active-view',
|
|
||||||
'tracks',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test.afterEach(async ({ app }) => {
|
|
||||||
// Every other spec file runs against a desktop, and the viewport
|
|
||||||
// belongs to the shared context rather than to this file.
|
|
||||||
await app.setViewportSize({ width: 1440, height: 900 });
|
|
||||||
});
|
|
||||||
|
|
||||||
test('reaches the delegated handler and opens the real menu', async ({
|
|
||||||
app,
|
|
||||||
}) => {
|
|
||||||
await expect.poll(() => panel(app)).toBeNull();
|
|
||||||
|
|
||||||
await pressFirstRow(app);
|
|
||||||
|
|
||||||
await expect
|
|
||||||
.poll(() => panel(app), { timeout: HELD + 2000 })
|
|
||||||
.toMatchObject({ role: 'menu', label: 'Track actions' });
|
|
||||||
|
|
||||||
// The same panel Shift+F10 opens, items and all -- not an empty
|
|
||||||
// popup that happened to become visible.
|
|
||||||
expect((await panel(app))?.items).toBeGreaterThan(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('does not open one for a press that turns into a scroll', async ({
|
|
||||||
app,
|
|
||||||
}) => {
|
|
||||||
await pressFirstRow(app, { driftY: 40 });
|
|
||||||
|
|
||||||
await app.waitForTimeout(HELD);
|
|
||||||
|
|
||||||
expect(await panel(app)).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -0,0 +1,209 @@
|
|||||||
|
import { test, expect } from '../support/fixtures.js';
|
||||||
|
import type { Page } from '@playwright/test';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The album page on a phone (#66).
|
||||||
|
*
|
||||||
|
* Two faults, and neither was visible to `layout-overflow.spec.ts`:
|
||||||
|
* that spec asserts the *shell* needs no sideways scrolling, and the
|
||||||
|
* shell was correct throughout — `body.scrollWidth === clientWidth`
|
||||||
|
* while `explore-album-details` itself measured 443 inside a 424px box
|
||||||
|
* and clipped two of the album's three primary actions with its own
|
||||||
|
* `overflow: hidden`. So the measurement here is **per control against
|
||||||
|
* the component's box**, which is the same shape `top-bar-fit.spec.ts`
|
||||||
|
* needed for the same reason.
|
||||||
|
*
|
||||||
|
* The other half is the scroll: the page was a fixed header over a
|
||||||
|
* scrolling tracklist, so at the reference device's 424x439 the header
|
||||||
|
* owned 253 of the panel's 318px and the list scrolled in the 64 that
|
||||||
|
* were left. It is one scroll container below 600px, which is a
|
||||||
|
* property of the *host* rather than of `.content`.
|
||||||
|
*
|
||||||
|
* The engine is the caveat this tier cannot close: the reference device
|
||||||
|
* renders in Chrome 113 and this is Chromium/WebKit. A flex direction
|
||||||
|
* and a scroll container are nowhere near that engine's documented gaps
|
||||||
|
* (relaxed nesting, the Popover API, `light-dark()`), but "it renders
|
||||||
|
* at that size in Chromium" is not evidence about the phone.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** The phone this was measured on, in CSS pixels. */
|
||||||
|
const DEVICE = { width: 424, height: 439 };
|
||||||
|
|
||||||
|
const details = (page: Page) => page.locator('explore-album-details');
|
||||||
|
|
||||||
|
/** The page's own boxes, read from inside its shadow root. */
|
||||||
|
const geometry = (page: Page) =>
|
||||||
|
page.evaluate(() => {
|
||||||
|
const host = document.querySelector('explore-album-details');
|
||||||
|
const sr = host?.shadowRoot;
|
||||||
|
|
||||||
|
if (!host || !sr) return null;
|
||||||
|
|
||||||
|
const box = (sel: string) => {
|
||||||
|
const el = sr.querySelector(sel);
|
||||||
|
|
||||||
|
if (!el) return null;
|
||||||
|
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return { width: Math.round(r.width), right: Math.round(r.right) };
|
||||||
|
};
|
||||||
|
|
||||||
|
const content = sr.querySelector('.content');
|
||||||
|
|
||||||
|
return {
|
||||||
|
hostWidth: host.clientWidth,
|
||||||
|
hostScrollWidth: host.scrollWidth,
|
||||||
|
// The host is the scroller below 600px, so the page is taller
|
||||||
|
// than its box rather than the tracklist being a window inside it.
|
||||||
|
hostScrolls: host.scrollHeight > host.clientHeight,
|
||||||
|
contentScrolls: content
|
||||||
|
? content.scrollHeight > content.clientHeight
|
||||||
|
: null,
|
||||||
|
header: box('.album-header'),
|
||||||
|
play: box('[data-testid="album-play"]'),
|
||||||
|
shuffle: box('[data-testid="album-shuffle"]'),
|
||||||
|
queue: box('[data-testid="album-queue"]'),
|
||||||
|
title: (() => {
|
||||||
|
const el = sr.querySelector('.album-title-text');
|
||||||
|
|
||||||
|
return el ? el.scrollWidth <= el.clientWidth + 1 : null;
|
||||||
|
})(),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
test.describe('the album page on a phone', () => {
|
||||||
|
test.beforeEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize(DEVICE);
|
||||||
|
await openFirstAlbum(app);
|
||||||
|
});
|
||||||
|
|
||||||
|
test.afterEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize({ width: 1440, height: 900 });
|
||||||
|
await app.getByTestId('nav-tracks').click();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('keeps every action inside its own box', async ({ app }) => {
|
||||||
|
const geo = await geometry(app);
|
||||||
|
|
||||||
|
expect(geo).not.toBeNull();
|
||||||
|
// "Shuffle album" ended at x=443 in a 424px component and could not
|
||||||
|
// be reached by any gesture; "Add to queue" at 440.
|
||||||
|
for (const action of ['play', 'shuffle', 'queue'] as const) {
|
||||||
|
expect(
|
||||||
|
geo?.[action],
|
||||||
|
`${action} is rendered`,
|
||||||
|
).not.toBeNull();
|
||||||
|
expect(
|
||||||
|
geo?.[action]?.right ?? 0,
|
||||||
|
`${action} ends inside the page`,
|
||||||
|
).toBeLessThanOrEqual(geo?.hostWidth ?? 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(geo?.hostScrollWidth).toBe(geo?.hostWidth);
|
||||||
|
expect(geo?.header?.width).toBe(geo?.hostWidth);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('gives the title the row rather than one glyph of it', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
// `.album-info` was squeezed to 112px beside the art, so an album
|
||||||
|
// called *Glass Harbour* drew as `G…`. It carries `min-width: 0`
|
||||||
|
// and was shrinking as asked — the row had to stack.
|
||||||
|
expect(await geometry(app).then((g) => g?.title)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('scrolls as one page, with the header scrolling away', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
const before = await geometry(app);
|
||||||
|
|
||||||
|
expect(before?.hostScrolls).toBe(true);
|
||||||
|
expect(before?.contentScrolls).toBe(false);
|
||||||
|
|
||||||
|
const headerTop = () =>
|
||||||
|
app.evaluate(
|
||||||
|
() =>
|
||||||
|
document
|
||||||
|
.querySelector('explore-album-details')
|
||||||
|
?.shadowRoot?.querySelector('.album-header')
|
||||||
|
?.getBoundingClientRect().top ?? 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(await headerTop()).toBeGreaterThanOrEqual(0);
|
||||||
|
|
||||||
|
// A wheel gesture, not `scrollTop`: `overflow: hidden` still permits
|
||||||
|
// programmatic scrolling, so a probe that assigns it passes on the
|
||||||
|
// build this exists to fail.
|
||||||
|
await details(app).hover();
|
||||||
|
await app.mouse.wheel(0, 250);
|
||||||
|
|
||||||
|
await expect.poll(headerTop).toBeLessThan(-100);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('is the desktop arrangement again above the breakpoint', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
await app.setViewportSize({ width: 1024, height: 800 });
|
||||||
|
|
||||||
|
// The same element, re-laid-out: one component with two
|
||||||
|
// arrangements, not a phone-only copy.
|
||||||
|
await expect
|
||||||
|
.poll(async () => (await geometry(app))?.hostScrolls)
|
||||||
|
.toBe(false);
|
||||||
|
|
||||||
|
const arrangement = await app.evaluate(() => {
|
||||||
|
const sr = document.querySelector('explore-album-details')?.shadowRoot;
|
||||||
|
const header = sr?.querySelector('.album-header');
|
||||||
|
const content = sr?.querySelector('.content');
|
||||||
|
|
||||||
|
return {
|
||||||
|
direction: header ? getComputedStyle(header).flexDirection : null,
|
||||||
|
contentOverflow: content ? getComputedStyle(content).overflowY : null,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(arrangement.direction).toBe('row');
|
||||||
|
expect(arrangement.contentOverflow).toBe('auto');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Albums → the second card, which navigates to the album page. */
|
||||||
|
async function openFirstAlbum(app: Page): Promise<void> {
|
||||||
|
// Below 600px the sidebar is gone; the tab bar is the navigation.
|
||||||
|
await app.getByTestId('tab-albums').click();
|
||||||
|
await expect(app.getByTestId('main-content')).toHaveAttribute(
|
||||||
|
'data-active-view',
|
||||||
|
'albums',
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect.poll(() => cardCount(app)).toBeGreaterThan(1);
|
||||||
|
|
||||||
|
// Dispatched rather than clicked: the card lives in a virtualizer
|
||||||
|
// inside a shadow root, and Enter expands the dropdown instead.
|
||||||
|
await app.evaluate(() => {
|
||||||
|
document
|
||||||
|
.querySelector('cover-grid')
|
||||||
|
?.shadowRoot?.querySelectorAll('.album-card')[1]
|
||||||
|
?.dispatchEvent(
|
||||||
|
new MouseEvent('click', { bubbles: true, composed: true }),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(app.getByTestId('main-content')).toHaveAttribute(
|
||||||
|
'data-active-view',
|
||||||
|
'explore-album-details',
|
||||||
|
);
|
||||||
|
await expect(
|
||||||
|
details(app).locator('[data-testid="album-play"]'),
|
||||||
|
).toBeVisible();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function cardCount(app: Page): Promise<number> {
|
||||||
|
return app.evaluate(
|
||||||
|
() =>
|
||||||
|
document
|
||||||
|
.querySelector('cover-grid')
|
||||||
|
?.shadowRoot?.querySelectorAll('.album-card').length ?? 0,
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,283 @@
|
|||||||
|
import { test, expect } from '../support/fixtures.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Now Playing on a short screen (#51).
|
||||||
|
*
|
||||||
|
* #51 asks for a layout that "survives" ~424x439 with the controls
|
||||||
|
* never scrolling off. #172 measured why it did not — the stacked
|
||||||
|
* layout's budget is fixed, so the art gets whatever is left, and that
|
||||||
|
* was 39px before #64 and 53px after it.
|
||||||
|
*
|
||||||
|
* **Two separate claims are asserted here, and only one of them is
|
||||||
|
* about the phone.**
|
||||||
|
*
|
||||||
|
* The first is that the art is *square*. It was not: `aspect-ratio` is
|
||||||
|
* specified not to re-derive the width when `max-height` clamps the
|
||||||
|
* height, so the art was drawn as a letterbox band and `object-fit:
|
||||||
|
* cover` cropped the cover to it — 264x53 on the reference device. The
|
||||||
|
* leftover only exceeds the width above ~843px of viewport, so this
|
||||||
|
* was every height from ~500 to ~843 as well: most phones, and any
|
||||||
|
* short window. That is ordinary CSS rather than a Chrome 113 quirk,
|
||||||
|
* so this tier can see it, and the heights below are chosen to cover
|
||||||
|
* the range rather than the one device.
|
||||||
|
*
|
||||||
|
* The second is the reflow: below 500px the art and the names sit side
|
||||||
|
* by side, which is what takes the art from 53px to 143px. That is
|
||||||
|
* asserted as a *relation between boxes* — the art beside the names,
|
||||||
|
* not above them — because the pixel count is a consequence of the
|
||||||
|
* arrangement and would pin this file to one device's chrome.
|
||||||
|
*
|
||||||
|
* **What this tier cannot see** is the device's engine: CI's Chromium
|
||||||
|
* and WebKit are current, and #60's clipping showed what that costs.
|
||||||
|
* Nothing here depends on Chrome 113 behaviour — the sizing rules were
|
||||||
|
* checked against the device itself, at column heights of 288, 300,
|
||||||
|
* 451, 600 and 800, and the numbers are on #51.
|
||||||
|
*/
|
||||||
|
type Page = import('@playwright/test').Page;
|
||||||
|
|
||||||
|
/** The reference device's real viewport. */
|
||||||
|
const DEVICE = { width: 424, height: 439 };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A tall phone, above the reflow's 500px. Roughly a Pixel 7, which is
|
||||||
|
* #51's other named device and was not attached — so what is checked
|
||||||
|
* here is the layout it *should* get, not that device.
|
||||||
|
*/
|
||||||
|
const TALL_PHONE = { width: 412, height: 869 };
|
||||||
|
|
||||||
|
/** Inside the crop's old range and above the reflow: a short window. */
|
||||||
|
const SHORT_WINDOW = { width: 390, height: 700 };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The height the layout reflows at. Written down once here because the
|
||||||
|
* specs have to know which arrangement to *wait* for, not only which
|
||||||
|
* to assert.
|
||||||
|
*/
|
||||||
|
const REFLOW_AT = 500;
|
||||||
|
|
||||||
|
/** Put a track in the player, so the view has art and names to lay out. */
|
||||||
|
async function stageATrack(page: Page): Promise<void> {
|
||||||
|
await page.evaluate(async () => {
|
||||||
|
const tracks = (await window.__yjEvents.call(
|
||||||
|
'library.Library.GetTracks',
|
||||||
|
[0],
|
||||||
|
10_000,
|
||||||
|
)) as { FilePath: string }[];
|
||||||
|
|
||||||
|
await window.__yjEvents.call(
|
||||||
|
'queue.Queue.SetQueue',
|
||||||
|
[tracks.slice(0, 4).map((t) => t.FilePath), 0, false, { type: '', id: 0, label: '' }],
|
||||||
|
10_000,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Open the full-screen view and wait for the shell to say so. */
|
||||||
|
async function openNowPlaying(page: Page): Promise<void> {
|
||||||
|
await page.evaluate(() => {
|
||||||
|
document.dispatchEvent(
|
||||||
|
new CustomEvent('navigate', {
|
||||||
|
detail: { view: 'now-playing' },
|
||||||
|
bubbles: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(page.getByTestId('main-content')).toHaveAttribute(
|
||||||
|
'data-active-view',
|
||||||
|
'now-playing',
|
||||||
|
);
|
||||||
|
|
||||||
|
// The attribute is the shell's bookkeeping and lands before the view
|
||||||
|
// has a track, so measuring on it alone races the first layout --
|
||||||
|
// which showed up as a 60x5 art on the first spec of a cold run.
|
||||||
|
//
|
||||||
|
// Waiting for a non-zero box is not enough on its own either: a
|
||||||
|
// previous test leaves the *other* arrangement on screen, and a
|
||||||
|
// stale column satisfies "has a size" perfectly. So the wait is for
|
||||||
|
// the arrangement this viewport should have, which is the thing
|
||||||
|
// every assertion below depends on. Found by this file passing one
|
||||||
|
// test at a time and failing in file order.
|
||||||
|
const wantRow = (page.viewportSize()?.height ?? 0) <= REFLOW_AT;
|
||||||
|
|
||||||
|
await page.waitForFunction(
|
||||||
|
(row: boolean) => {
|
||||||
|
const v = document.querySelector('now-playing-view');
|
||||||
|
const stack = v?.shadowRoot?.querySelector('.stack');
|
||||||
|
const el = v?.shadowRoot?.querySelector('.art img, .art .placeholder');
|
||||||
|
const t = v?.shadowRoot?.querySelector('.transport');
|
||||||
|
|
||||||
|
if (!el || !t) return false;
|
||||||
|
|
||||||
|
// A build with no `.stack` at all is the one before this change,
|
||||||
|
// and the squareness assertions are still meaningful against it
|
||||||
|
// -- so this waits for the arrangement only where there is one to
|
||||||
|
// wait for. Otherwise reverting the component to check that these
|
||||||
|
// tests bite produces eight timeouts instead of the measurements
|
||||||
|
// that make the case.
|
||||||
|
if (stack) {
|
||||||
|
const dir = getComputedStyle(stack).flexDirection;
|
||||||
|
|
||||||
|
if (dir !== (row ? 'row' : 'column')) return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return r.width > 0 && r.height > 0 && t.getBoundingClientRect().height > 0;
|
||||||
|
},
|
||||||
|
wantRow,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The boxes this file reasons about, read in one evaluate.
|
||||||
|
*
|
||||||
|
* It reaches into the view's shadow root rather than using locators
|
||||||
|
* because the question is geometric — where these boxes are *relative
|
||||||
|
* to each other* — and a testid per edge would be four locators and
|
||||||
|
* four round trips to say one thing.
|
||||||
|
*/
|
||||||
|
async function boxes(page: Page) {
|
||||||
|
return page.evaluate(() => {
|
||||||
|
const v = document.querySelector('now-playing-view');
|
||||||
|
|
||||||
|
if (!v || !v.shadowRoot) return null;
|
||||||
|
|
||||||
|
const rect = (sel: string) => {
|
||||||
|
const el = v.shadowRoot!.querySelector(sel);
|
||||||
|
|
||||||
|
if (!el) return null;
|
||||||
|
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return {
|
||||||
|
left: r.left, right: r.right, top: r.top, bottom: r.bottom,
|
||||||
|
width: r.width, height: r.height,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
return {
|
||||||
|
// Whichever of the two the track has; both carry the sizing.
|
||||||
|
art: rect('.art img') ?? rect('.art .placeholder'),
|
||||||
|
artBox: rect('.art'),
|
||||||
|
stack: rect('.stack'),
|
||||||
|
meta: rect('.meta'),
|
||||||
|
transport: rect('.transport'),
|
||||||
|
scrollHeight: v.scrollHeight,
|
||||||
|
clientHeight: v.clientHeight,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
test.describe('Now Playing survives a short screen', () => {
|
||||||
|
test.beforeEach(async ({ app }) => {
|
||||||
|
await stageATrack(app);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The crop, at four heights spanning the range it covered. This is
|
||||||
|
* the assertion that fails on the build before this change: at
|
||||||
|
* 424x439 the art measured 264x53.
|
||||||
|
*/
|
||||||
|
for (const vp of [DEVICE, SHORT_WINDOW, TALL_PHONE, { width: 900, height: 500 }]) {
|
||||||
|
test(`draws the art square at ${vp.width}x${vp.height}`, async ({ app }) => {
|
||||||
|
await app.setViewportSize(vp);
|
||||||
|
await openNowPlaying(app);
|
||||||
|
|
||||||
|
const b = await boxes(app);
|
||||||
|
|
||||||
|
expect(b, 'now-playing-view did not mount').not.toBeNull();
|
||||||
|
expect(b!.art, 'neither art nor placeholder rendered').not.toBeNull();
|
||||||
|
|
||||||
|
const { width, height } = b!.art!;
|
||||||
|
|
||||||
|
expect(width, 'the art has no width').toBeGreaterThan(0);
|
||||||
|
// One pixel of slack for sub-pixel layout, and no more: the
|
||||||
|
// defect this guards was a 5:1 band.
|
||||||
|
expect(
|
||||||
|
Math.abs(width - height),
|
||||||
|
`art is ${Math.round(width)}x${Math.round(height)}, not square`,
|
||||||
|
).toBeLessThanOrEqual(1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The promise #51 states and plan 018's matrix repeats. A floor on
|
||||||
|
* the art with the block scrolling was the other option on #172 and
|
||||||
|
* this is why it was not taken.
|
||||||
|
*/
|
||||||
|
test('never scrolls the transport off the bottom', async ({ app }) => {
|
||||||
|
await app.setViewportSize(DEVICE);
|
||||||
|
await openNowPlaying(app);
|
||||||
|
|
||||||
|
const b = await boxes(app);
|
||||||
|
|
||||||
|
expect(b!.transport!.bottom).toBeLessThanOrEqual(DEVICE.height);
|
||||||
|
expect(
|
||||||
|
b!.scrollHeight,
|
||||||
|
'the view scrolls, so the transport can be moved off screen',
|
||||||
|
).toBeLessThanOrEqual(b!.clientHeight + 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The reflow itself, as a relation rather than a measurement: below
|
||||||
|
* 500px the names are *beside* the art, above it they are below.
|
||||||
|
*/
|
||||||
|
test('puts the names beside the art below 500px', async ({ app }) => {
|
||||||
|
await app.setViewportSize(DEVICE);
|
||||||
|
await openNowPlaying(app);
|
||||||
|
|
||||||
|
const b = await boxes(app);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
b!.meta!.left,
|
||||||
|
'the names are not to the right of the art',
|
||||||
|
).toBeGreaterThanOrEqual(b!.artBox!.right - 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('keeps the names below the art on a tall phone', async ({ app }) => {
|
||||||
|
await app.setViewportSize(TALL_PHONE);
|
||||||
|
await openNowPlaying(app);
|
||||||
|
|
||||||
|
const b = await boxes(app);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
b!.meta!.top,
|
||||||
|
'the names are not below the art',
|
||||||
|
).toBeGreaterThanOrEqual(b!.artBox!.bottom - 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What the reflow actually does, stated as a mechanism rather than
|
||||||
|
* as a number: in a row the art is bounded by the row's *height*,
|
||||||
|
* so it fills it — where in a column it is the leftover after the
|
||||||
|
* names, which is what made it 53px.
|
||||||
|
*
|
||||||
|
* **The pixel count is deliberately not asserted here.** Two drafts
|
||||||
|
* tried. The first compared the art against the column's leftover
|
||||||
|
* computed from the boxes on screen and passed on the broken build,
|
||||||
|
* because the subtraction goes negative when the names are taller
|
||||||
|
* than the art — precisely the defect. The second put a floor of
|
||||||
|
* 100px on it, passed locally at 114 and **failed in CI at 64**: this
|
||||||
|
* app is long-lived, so a job staged by an earlier spec is still on
|
||||||
|
* screen, and the volume control renders here where it does not on
|
||||||
|
* Android. Both are chrome above and below this view, and both move
|
||||||
|
* the leftover. A test that asserts how much room CI happened to
|
||||||
|
* have is a test about the runner.
|
||||||
|
*
|
||||||
|
* The device numbers — 53px to 143px — are on #51, measured there,
|
||||||
|
* which is the only tier that can honestly produce them.
|
||||||
|
*/
|
||||||
|
test('fills the row with the art rather than the leftover', async ({ app }) => {
|
||||||
|
await app.setViewportSize(DEVICE);
|
||||||
|
await openNowPlaying(app);
|
||||||
|
|
||||||
|
const b = await boxes(app);
|
||||||
|
|
||||||
|
expect(b!.stack, 'there is no row to fill').not.toBeNull();
|
||||||
|
expect(
|
||||||
|
Math.abs(b!.artBox!.height - b!.stack!.height),
|
||||||
|
'the art does not fill the row, so it is still a leftover',
|
||||||
|
).toBeLessThanOrEqual(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
import {
|
||||||
|
test,
|
||||||
|
expect,
|
||||||
|
callBinding,
|
||||||
|
resetEvents,
|
||||||
|
waitForEvent,
|
||||||
|
LONG_TRACK,
|
||||||
|
NO_QUEUE_SOURCE,
|
||||||
|
} from '../support/fixtures.js';
|
||||||
|
import type { Page } from '@playwright/test';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The phone's progress line (#58).
|
||||||
|
*
|
||||||
|
* The component tier already pins what the line *says* — that it
|
||||||
|
* renders the backend's reported position and never a count of its own.
|
||||||
|
* What only a real shell can answer is **where it is**: the issue asks
|
||||||
|
* for a line on the border between the mini player and the tab bar, and
|
||||||
|
* "on the border" is two adjacencies in a grid that no component-level
|
||||||
|
* render has around it.
|
||||||
|
*
|
||||||
|
* It also asserts the line is not there on a desktop, which is the
|
||||||
|
* other half of the same fact: above 600px there is no tab bar for it
|
||||||
|
* to sit on the border of, and the bar carries a real seek bar.
|
||||||
|
*/
|
||||||
|
type Rect = { x: number; y: number; width: number; height: number };
|
||||||
|
|
||||||
|
/** The reference device's real viewport. */
|
||||||
|
const DEVICE = { width: 424, height: 439 };
|
||||||
|
const DESKTOP = { width: 1280, height: 800 };
|
||||||
|
|
||||||
|
async function rectOf(app: Page, selector: string): Promise<Rect | null> {
|
||||||
|
return app.evaluate((sel) => {
|
||||||
|
const el = document.querySelector(sel);
|
||||||
|
|
||||||
|
if (!el) return null;
|
||||||
|
|
||||||
|
const r = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return { x: r.x, y: r.y, width: r.width, height: r.height };
|
||||||
|
}, selector);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put the 90-second fixture on and wait for the first position report.
|
||||||
|
*
|
||||||
|
* The long track rather than any track: every other fixture is 2-6
|
||||||
|
* seconds, which is shorter than the time this spec takes to measure
|
||||||
|
* three rectangles.
|
||||||
|
*/
|
||||||
|
async function play(app: Page): Promise<void> {
|
||||||
|
const tracks = await callBinding<{ FilePath: string; TrackName: string }[]>(
|
||||||
|
app,
|
||||||
|
'library.Library.GetTracks',
|
||||||
|
[0],
|
||||||
|
);
|
||||||
|
|
||||||
|
// `TrackName`, not `Title`: that is what the library model calls it.
|
||||||
|
const long = tracks.find((t) => t.TrackName === LONG_TRACK);
|
||||||
|
|
||||||
|
expect(long, `no fixture track named ${LONG_TRACK}`).toBeTruthy();
|
||||||
|
|
||||||
|
await callBinding(app, 'queue.Queue.Clear');
|
||||||
|
await resetEvents(app);
|
||||||
|
await callBinding(app, 'queue.Queue.SetQueue', [
|
||||||
|
[long!.FilePath],
|
||||||
|
0,
|
||||||
|
false,
|
||||||
|
NO_QUEUE_SOURCE,
|
||||||
|
]);
|
||||||
|
await waitForEvent(app, 'QueueChanged');
|
||||||
|
await callBinding(app, 'queue.Queue.Play');
|
||||||
|
await waitForEvent(app, 'PlaybackPositionChanged', { timeoutMs: 15_000 });
|
||||||
|
}
|
||||||
|
|
||||||
|
test.describe('the progress line sits on the border between the bars', () => {
|
||||||
|
test.beforeEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize(DEVICE);
|
||||||
|
await play(app);
|
||||||
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Every test here starts a LONG_TRACK and the suite is workers: 1,
|
||||||
|
* fullyParallel: false against one long-lived app — so without this
|
||||||
|
* the four phone-* specs that follow alphabetically inherit a playing
|
||||||
|
* queue. phone-transport.spec.ts records where that lesson came from:
|
||||||
|
* the fault first showed up as a flake in a spec about something else.
|
||||||
|
*/
|
||||||
|
test.afterEach(async ({ app }) => {
|
||||||
|
await callBinding(app, 'queue.Queue.Clear').catch(() => {
|
||||||
|
/* already empty */
|
||||||
|
});
|
||||||
|
await app.setViewportSize(DESKTOP);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('spans the width, between the mini player and the tab bar', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
const line = await rectOf(app, 'player-progress-line');
|
||||||
|
const bar = await rectOf(app, '.bottom-bar');
|
||||||
|
const nav = await rectOf(app, 'bottom-nav');
|
||||||
|
|
||||||
|
expect(line, 'no progress line on the phone').not.toBeNull();
|
||||||
|
expect(bar).not.toBeNull();
|
||||||
|
expect(nav).not.toBeNull();
|
||||||
|
|
||||||
|
// A border, not a band: 2px, the full width, and touching both.
|
||||||
|
expect(line!.height).toBeCloseTo(2, 0);
|
||||||
|
expect(line!.width).toBeCloseTo(bar!.width, 0);
|
||||||
|
expect(line!.y).toBeCloseTo(bar!.y + bar!.height, 0);
|
||||||
|
expect(nav!.y).toBeCloseTo(line!.y + line!.height, 0);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* It is 2px on the top edge of the tab bar, which is exactly where a
|
||||||
|
* thumb aiming at a tab lands. A line that sometimes seeks is worse
|
||||||
|
* than one that never does, so it must take no part in hit testing
|
||||||
|
* at all.
|
||||||
|
*/
|
||||||
|
test('takes no taps', async ({ app }) => {
|
||||||
|
const line = await rectOf(app, 'player-progress-line');
|
||||||
|
|
||||||
|
const hit = await app.evaluate(
|
||||||
|
({ x, y }) => document.elementFromPoint(x, y)?.tagName ?? '',
|
||||||
|
{ x: line!.x + line!.width / 2, y: line!.y + 1 },
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(hit).not.toBe('PLAYER-PROGRESS-LINE');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('is not there on a desktop', async ({ app }) => {
|
||||||
|
await app.setViewportSize(DESKTOP);
|
||||||
|
|
||||||
|
await expect(app.locator('player-progress-line')).toBeHidden();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -179,8 +179,8 @@ test.describe('the queue is a screen where it covers the content', () => {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* With the panel spanning the whole width the scrim has no uncovered
|
* With the panel spanning the whole width there is no scrim here at
|
||||||
* pixels, so the close button is the only pointer route out of a
|
* all (#171), so the close button is the only pointer route out of a
|
||||||
* full-screen surface. Measured at 424×439 before #55: **25×21px**.
|
* full-screen surface. Measured at 424×439 before #55: **25×21px**.
|
||||||
*/
|
*/
|
||||||
test('offers a way out a thumb can hit', async ({ app }) => {
|
test('offers a way out a thumb can hit', async ({ app }) => {
|
||||||
@@ -194,6 +194,33 @@ test.describe('the queue is a screen where it covers the content', () => {
|
|||||||
expect(box!.width).toBeGreaterThanOrEqual(44);
|
expect(box!.width).toBeGreaterThanOrEqual(44);
|
||||||
expect(box!.height).toBeGreaterThanOrEqual(44);
|
expect(box!.height).toBeGreaterThanOrEqual(44);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* #171 — and it draws no scrim, because there is nowhere to tap.
|
||||||
|
*
|
||||||
|
* `.panel-content` is `width: 100%` here, so the scrim sat entirely
|
||||||
|
* underneath it: measured at 424×439, host, panel and scrim all
|
||||||
|
* 424×318. #24's tap-outside-to-close cannot exist on a surface with
|
||||||
|
* no outside, and a `cursor: pointer` layer nobody can reach is a
|
||||||
|
* claim the component cannot keep.
|
||||||
|
*
|
||||||
|
* Asserted as absence rather than by clicking, for the reason the
|
||||||
|
* issue gives: a naive phone case clicks the scrim's centre and hits
|
||||||
|
* the panel, so it passes on the build this exists to fail. The scrim
|
||||||
|
* is still real between 600 and 899px, which `queue-overlay.spec.ts`
|
||||||
|
* asserts at 900×600 by clicking it.
|
||||||
|
*/
|
||||||
|
test('draws no scrim, because a screen has no outside to tap', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
await openTheQueue(app);
|
||||||
|
|
||||||
|
const scrim = await queue(app).evaluate(
|
||||||
|
(el) => el.shadowRoot!.querySelector('.scrim') !== null,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(scrim).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,311 @@
|
|||||||
|
import { test, expect, callBinding } from '../support/fixtures.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The touch gestures against the real app (plan 019, #63; long-press
|
||||||
|
* from plan 016 B2).
|
||||||
|
*
|
||||||
|
* The component tier proves the gestures in isolation, against markup
|
||||||
|
* it built itself. What it cannot prove is the half that made this one
|
||||||
|
* document listener instead of six: that the announced gesture reaches
|
||||||
|
* the handler a *real* component bound — `track-list` delegates on the
|
||||||
|
* `lit-virtualizer` rather than binding per row — and that the real
|
||||||
|
* menu opens from it, a path with its own history of opening and then
|
||||||
|
* refusing to work (see `menu-keyboard.spec.ts`).
|
||||||
|
*
|
||||||
|
* **Both halves of the reassignment are here, and the second is the
|
||||||
|
* one that matters.** #63 makes a hold on a *track row* mean selection
|
||||||
|
* mode; every other surface in the app keeps the context menu it has
|
||||||
|
* had, because an unclaimed `yj-long-press` still becomes a
|
||||||
|
* `contextmenu`. A spec that only checked the row would pass on a
|
||||||
|
* build that had silently broken the other thirteen menus.
|
||||||
|
*
|
||||||
|
* The pointer events are dispatched rather than performed: this
|
||||||
|
* project runs Desktop Chrome and Desktop Safari, neither of which has
|
||||||
|
* touch. So this is honest about what it checks — the app's own
|
||||||
|
* listeners, on the app's own DOM, from the events a touch would
|
||||||
|
* produce — and not about a real finger. The finger is the Android
|
||||||
|
* tier, and it found something this cannot see: Chrome 113's WebView
|
||||||
|
* fires its own `contextmenu` on a long press, which is why the module
|
||||||
|
* announces the gesture from a native event rather than standing down.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** A common small phone, as in `phone-shell.spec.ts`. */
|
||||||
|
const PHONE = { width: 390, height: 844 };
|
||||||
|
|
||||||
|
/** Comfortably past the module's 500ms hold. */
|
||||||
|
const HELD = 900;
|
||||||
|
|
||||||
|
type Page = import('@playwright/test').Page;
|
||||||
|
|
||||||
|
/** A component's menu panel, or null while it is not rendered. */
|
||||||
|
const panel = (page: Page, host: string) =>
|
||||||
|
page.evaluate((tag) => {
|
||||||
|
const el = document
|
||||||
|
.querySelector(tag)
|
||||||
|
?.shadowRoot?.querySelector('.context-menu-panel');
|
||||||
|
|
||||||
|
if (!el) return null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
role: el.getAttribute('role'),
|
||||||
|
label: el.getAttribute('aria-label'),
|
||||||
|
items: el.querySelectorAll('[role="menuitem"]').length,
|
||||||
|
};
|
||||||
|
}, host);
|
||||||
|
|
||||||
|
/** How many tracks the selection bar says are selected, or null. */
|
||||||
|
const selectionCount = (page: Page) =>
|
||||||
|
page.evaluate(() => {
|
||||||
|
const bar = document
|
||||||
|
.querySelector('track-list')
|
||||||
|
?.shadowRoot?.querySelector('selection-bar');
|
||||||
|
|
||||||
|
return bar ? (bar as unknown as { count: number }).count : null;
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Press an element, optionally dragging partway through — the shape of
|
||||||
|
* a scroll that begins on a row, which must be neither gesture — and
|
||||||
|
* optionally lifting, which is what makes it a tap rather than a hold.
|
||||||
|
*/
|
||||||
|
async function press(
|
||||||
|
page: Page,
|
||||||
|
selector: { host: string; inner: string },
|
||||||
|
opts: { driftY?: number; lift?: boolean } = {},
|
||||||
|
): Promise<void> {
|
||||||
|
await page.evaluate(
|
||||||
|
({ host, inner, drift, lift }) => {
|
||||||
|
const el = document
|
||||||
|
.querySelector(host)
|
||||||
|
?.shadowRoot?.querySelector(inner);
|
||||||
|
|
||||||
|
if (!el) throw new Error(`no ${inner} in ${host} to press`);
|
||||||
|
|
||||||
|
const box = el.getBoundingClientRect();
|
||||||
|
const x = Math.round(box.left + box.width / 2);
|
||||||
|
const y = Math.round(box.top + box.height / 2);
|
||||||
|
const send = (type: string, dy = 0) =>
|
||||||
|
el.dispatchEvent(
|
||||||
|
new PointerEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
pointerType: 'touch',
|
||||||
|
isPrimary: true,
|
||||||
|
clientX: x,
|
||||||
|
clientY: y + dy,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
send('pointerdown');
|
||||||
|
|
||||||
|
if (drift) send('pointermove', drift);
|
||||||
|
if (lift) send('pointerup');
|
||||||
|
},
|
||||||
|
{
|
||||||
|
host: selector.host,
|
||||||
|
inner: selector.inner,
|
||||||
|
drift: opts.driftY ?? 0,
|
||||||
|
lift: opts.lift ?? false,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// `.track-row`, not `[role="row"]`: the column header is a row too, and
|
||||||
|
// it is the *first* one — a press on it is correctly ignored, which
|
||||||
|
// reads exactly like the gesture not working.
|
||||||
|
const TRACK_ROW = { host: 'track-list', inner: '.track-row' };
|
||||||
|
|
||||||
|
test.describe('a hold on a track row selects it', () => {
|
||||||
|
test.beforeEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize(PHONE);
|
||||||
|
await app.getByTestId('tab-tracks').click();
|
||||||
|
await expect(app.getByTestId('main-content')).toHaveAttribute(
|
||||||
|
'data-active-view',
|
||||||
|
'tracks',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test.afterEach(async ({ app }) => {
|
||||||
|
// Every other spec file runs against a desktop, and the viewport
|
||||||
|
// belongs to the shared context rather than to this file.
|
||||||
|
await app.setViewportSize({ width: 1440, height: 900 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('raises the selection bar rather than the context menu', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
await expect.poll(() => selectionCount(app)).toBeNull();
|
||||||
|
|
||||||
|
await press(app, TRACK_ROW);
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(() => selectionCount(app), { timeout: HELD + 2000 })
|
||||||
|
.toBe(1);
|
||||||
|
|
||||||
|
// The gesture is claimed, so the menu this hold used to open must
|
||||||
|
// not also be up -- on a phone that would be a sheet over the bar.
|
||||||
|
expect(await panel(app, 'track-list')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('is neither gesture when the press turns into a scroll', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
await press(app, TRACK_ROW, { driftY: 40 });
|
||||||
|
await app.waitForTimeout(HELD);
|
||||||
|
|
||||||
|
expect(await selectionCount(app)).toBeNull();
|
||||||
|
expect(await panel(app, 'track-list')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test.describe('a hold anywhere else still opens the menu', () => {
|
||||||
|
test.beforeEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize(PHONE);
|
||||||
|
await app.getByTestId('tab-albums').click();
|
||||||
|
await expect(app.getByTestId('main-content')).toHaveAttribute(
|
||||||
|
'data-active-view',
|
||||||
|
'albums',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test.afterEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize({ width: 1440, height: 900 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test('reaches the delegated handler and opens the real menu', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
// The property that let #63 reassign the hold without touching one
|
||||||
|
// of the fourteen context menus: unclaimed, it is what it was.
|
||||||
|
// Without this half, breaking all of them passes the suite.
|
||||||
|
await expect.poll(() => panel(app, 'cover-grid')).toBeNull();
|
||||||
|
|
||||||
|
await press(app, { host: 'cover-grid', inner: '[role="option"]' });
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(() => panel(app, 'cover-grid'), { timeout: HELD + 2000 })
|
||||||
|
.toMatchObject({ role: 'menu' });
|
||||||
|
|
||||||
|
// The same panel Shift+F10 opens, items and all -- not an empty
|
||||||
|
// popup that happened to become visible.
|
||||||
|
expect((await panel(app, 'cover-grid'))?.items).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Swipe right on a track row to queue it (plan 019 phase 2, #63).
|
||||||
|
*
|
||||||
|
* The component tier has the rule this obeys — one row is a position,
|
||||||
|
* several are a choice — against a queue that is a fake. What is only
|
||||||
|
* true here is that the gesture reaches the *real* queue: `AddTracks`
|
||||||
|
* is a Go method, the queue is persisted, and "the row was added"
|
||||||
|
* is a question only the backend can answer.
|
||||||
|
*
|
||||||
|
* **It is Chromium-only, and that is a property of the browser rather
|
||||||
|
* than a gap.** The gesture runs on touch events, because Chrome 113's
|
||||||
|
* WebView cancels the pointer stream ~16px into any drag whatever
|
||||||
|
* `touch-action` says. Desktop WebKit implements no `TouchEvent`
|
||||||
|
* constructor at all — touch events are a mobile-Safari surface — so
|
||||||
|
* the events this needs cannot be built there. Skipping loudly is
|
||||||
|
* better than a spec that quietly asserts nothing on half the matrix,
|
||||||
|
* which is what `layout-overflow.spec.ts` and `back-navigation.spec.ts`
|
||||||
|
* were each doing when they were green on a broken build.
|
||||||
|
*/
|
||||||
|
test.describe('a swipe right on a track row queues it', () => {
|
||||||
|
test.beforeEach(async ({ app, browserName }) => {
|
||||||
|
test.skip(
|
||||||
|
browserName !== 'chromium',
|
||||||
|
'desktop WebKit has no TouchEvent constructor to build the gesture from',
|
||||||
|
);
|
||||||
|
|
||||||
|
await app.setViewportSize(PHONE);
|
||||||
|
await app.getByTestId('tab-tracks').click();
|
||||||
|
await expect(app.getByTestId('main-content')).toHaveAttribute(
|
||||||
|
'data-active-view',
|
||||||
|
'tracks',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test.afterEach(async ({ app }) => {
|
||||||
|
await app.setViewportSize({ width: 1440, height: 900 });
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Drag the first row sideways by a fraction of its own width and
|
||||||
|
* lift. `fraction` is against the row, because the commit threshold
|
||||||
|
* is — a number of pixels here would be a second declaration of it,
|
||||||
|
* right on one viewport and wrong on the next.
|
||||||
|
*/
|
||||||
|
const swipeFirstRow = (page: Page, fraction: number) =>
|
||||||
|
page.evaluate((f) => {
|
||||||
|
const row = document
|
||||||
|
.querySelector('track-list')
|
||||||
|
?.shadowRoot?.querySelector('.track-row');
|
||||||
|
|
||||||
|
if (!row) throw new Error('no track row to swipe');
|
||||||
|
|
||||||
|
const box = row.getBoundingClientRect();
|
||||||
|
const y = box.top + box.height / 2;
|
||||||
|
const at = (x: number) =>
|
||||||
|
new Touch({
|
||||||
|
identifier: 1,
|
||||||
|
target: row,
|
||||||
|
clientX: box.left + x,
|
||||||
|
clientY: y,
|
||||||
|
});
|
||||||
|
const send = (type: string, points: Touch[]) =>
|
||||||
|
row.dispatchEvent(
|
||||||
|
new TouchEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
touches: points,
|
||||||
|
changedTouches: points.length > 0 ? points : [at(0)],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
send('touchstart', [at(0)]);
|
||||||
|
|
||||||
|
for (const step of [0.25, 0.5, 0.75, 1]) {
|
||||||
|
send('touchmove', [at(box.width * f * step)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
send('touchend', []);
|
||||||
|
}, fraction);
|
||||||
|
|
||||||
|
/** How many tracks the backend says are in the queue. */
|
||||||
|
const queueLength = async (page: Page) => {
|
||||||
|
const state = await callBinding<{ tracks: unknown[] }>(
|
||||||
|
page,
|
||||||
|
'queue.Queue.GetState',
|
||||||
|
);
|
||||||
|
|
||||||
|
return state.tracks?.length ?? 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
test('adds exactly one track to the real queue', async ({ app }) => {
|
||||||
|
const before = await queueLength(app);
|
||||||
|
|
||||||
|
await swipeFirstRow(app, 0.6);
|
||||||
|
|
||||||
|
await expect.poll(() => queueLength(app)).toBe(before + 1);
|
||||||
|
|
||||||
|
// Queued, not played: a swipe is not a tap, and the difference is
|
||||||
|
// what is on screen afterwards.
|
||||||
|
expect(
|
||||||
|
await app.getByTestId('main-content').getAttribute('data-active-view'),
|
||||||
|
).toBe('tracks');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('does nothing when the finger did not get far enough', async ({
|
||||||
|
app,
|
||||||
|
}) => {
|
||||||
|
const before = await queueLength(app);
|
||||||
|
|
||||||
|
await swipeFirstRow(app, 0.1);
|
||||||
|
await app.waitForTimeout(400);
|
||||||
|
|
||||||
|
expect(await queueLength(app)).toBe(before);
|
||||||
|
});
|
||||||
|
});
|
||||||
+27
-3
@@ -426,6 +426,7 @@ body div.sidebar {
|
|||||||
"jobs-band" auto
|
"jobs-band" auto
|
||||||
"main-panel" 1fr
|
"main-panel" 1fr
|
||||||
"bottom-bar" auto
|
"bottom-bar" auto
|
||||||
|
"progress-line" auto
|
||||||
"bottom-nav" auto
|
"bottom-nav" auto
|
||||||
/ 1fr;
|
/ 1fr;
|
||||||
/* Nothing may scroll sideways here. On a desktop the shell is
|
/* Nothing may scroll sideways here. On a desktop the shell is
|
||||||
@@ -501,7 +502,8 @@ body div.sidebar {
|
|||||||
expression of the same fact is a second thing to keep in step.
|
expression of the same fact is a second thing to keep in step.
|
||||||
The view carries its own queue button, because this is where
|
The view carries its own queue button, because this is where
|
||||||
that one lived. */
|
that one lived. */
|
||||||
body:has(#main-content[data-active-view="now-playing"]) .bottom-bar {
|
body:has(#main-content[data-active-view="now-playing"]) .bottom-bar,
|
||||||
|
body:has(#main-content[data-active-view="now-playing"]) player-progress-line {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -568,8 +570,12 @@ body div.sidebar {
|
|||||||
/* Out of the desktop grid entirely. `job-band` renders nothing above
|
/* Out of the desktop grid entirely. `job-band` renders nothing above
|
||||||
600px anyway, but an in-flow grid child with no named area is
|
600px anyway, but an in-flow grid child with no named area is
|
||||||
auto-placed into a row of the shell -- the same trap the skip link is
|
auto-placed into a row of the shell -- the same trap the skip link is
|
||||||
absolutely positioned to avoid. */
|
absolutely positioned to avoid. `player-progress-line` (#58) is the
|
||||||
body job-band {
|
same element in the same position for the same reason: below 600px it
|
||||||
|
has a named row, and above it there is no border for it to sit on --
|
||||||
|
the desktop bar carries a real, interactive seek bar. */
|
||||||
|
body job-band,
|
||||||
|
body player-progress-line {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -602,3 +608,21 @@ body job-band {
|
|||||||
background-color: var(--yj-bg-elevated, #343a40);
|
background-color: var(--yj-bg-elevated, #343a40);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* #58. How far through the song we are, in its own grid row between
|
||||||
|
the two bars -- so the line is *on* the border rather than inside
|
||||||
|
either of them, and in flow rather than over it. The row is `auto`
|
||||||
|
and the element renders nothing while no track is loaded, so it costs
|
||||||
|
no height at all until there is something to say.
|
||||||
|
|
||||||
|
**This block is below the `display: none` above and has to be**, for
|
||||||
|
the reason the band's rule is: a media query adds no specificity, so
|
||||||
|
`body player-progress-line { display: block }` written before that
|
||||||
|
rule loses to it at equal specificity and the line never appears at
|
||||||
|
any width. Nothing fails; it is simply not there. */
|
||||||
|
@media (max-width: 599px) {
|
||||||
|
body player-progress-line {
|
||||||
|
display: block;
|
||||||
|
grid-area: progress-line;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -81,6 +81,16 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
<!-- How far through the song we are, on the border between the two
|
||||||
|
bars (#58). The shell's element rather than either bar's:
|
||||||
|
they are separate components stacked in this grid, so a line
|
||||||
|
on the border between them is a row of it, and neither one has
|
||||||
|
to reach into the other's box for two pixels. It renders
|
||||||
|
nothing above 600px and nothing with no track, is `aria-hidden`
|
||||||
|
(Now Playing's seek bar is what announces the position) and
|
||||||
|
takes no pointer events at all -- a thin line that sometimes
|
||||||
|
seeks is worse than one that never does. -->
|
||||||
|
<player-progress-line></player-progress-line>
|
||||||
<!-- The phone's primary navigation, hidden above 600px by
|
<!-- The phone's primary navigation, hidden above 600px by
|
||||||
index.css. Eager rather than a chunk, for the reason
|
index.css. Eager rather than a chunk, for the reason
|
||||||
notification-host is: it is the only way to move around the
|
notification-host is: it is the only way to move around the
|
||||||
|
|||||||
+12
-5
@@ -21,6 +21,10 @@ import '@components/audio-player/audio-player.ts';
|
|||||||
// In the bar rather than inside `audio-player` since #42, so the shell
|
// In the bar rather than inside `audio-player` since #42, so the shell
|
||||||
// is what has to register it.
|
// is what has to register it.
|
||||||
import '@components/audio-player/volume-control/volume-control.ts';
|
import '@components/audio-player/volume-control/volume-control.ts';
|
||||||
|
// The phone's progress line (#58), on the border between the mini
|
||||||
|
// player and the tab bar. In the shell for the same reason the volume
|
||||||
|
// is, and eager because it is part of the bottom bar's first paint.
|
||||||
|
import '@components/audio-player/progress-line/progress-line.ts';
|
||||||
import '@components/track-list/track-list.ts';
|
import '@components/track-list/track-list.ts';
|
||||||
import '@components/now-playing/now-playing.ts';
|
import '@components/now-playing/now-playing.ts';
|
||||||
import '@components/sidebar/app-sidebar.ts';
|
import '@components/sidebar/app-sidebar.ts';
|
||||||
@@ -66,7 +70,7 @@ import '@store/theme-store';
|
|||||||
// registers the document keydown listener for global shortcuts.
|
// registers the document keydown listener for global shortcuts.
|
||||||
import './src/services/keyboard-shortcut-service';
|
import './src/services/keyboard-shortcut-service';
|
||||||
import { activateView, deactivateView } from '@utils/view-lifecycle';
|
import { activateView, deactivateView } from '@utils/view-lifecycle';
|
||||||
import { installLongPressContextMenu } from '@utils/long-press';
|
import { installTouchGestures } from '@utils/touch-gestures';
|
||||||
import { openQueue, queuePanelElement } from '@utils/open-queue';
|
import { openQueue, queuePanelElement } from '@utils/open-queue';
|
||||||
import { installTopBarFit } from './src/services/top-bar-fit';
|
import { installTopBarFit } from './src/services/top-bar-fit';
|
||||||
import {
|
import {
|
||||||
@@ -83,10 +87,13 @@ setBasePath('/dist/webawesome');
|
|||||||
// the session.
|
// the session.
|
||||||
registerBundledIcons();
|
registerBundledIcons();
|
||||||
|
|
||||||
// The touch equivalent of a right-click, installed once for every menu
|
// Every touch gesture in the app, installed once rather than per
|
||||||
// in the app rather than per component. Harmless on a desktop: it acts
|
// component (plan 019). Harmless on a desktop: it acts on
|
||||||
// on `pointerType === 'touch'` only.
|
// `pointerType === 'touch'` only, per event, so a mouse on a
|
||||||
installLongPressContextMenu();
|
// touchscreen keeps click-selects / double-click-plays on the very
|
||||||
|
// same row. An unclaimed long press still becomes a `contextmenu`,
|
||||||
|
// which is what leaves all fourteen menus untouched by #63.
|
||||||
|
installTouchGestures();
|
||||||
|
|
||||||
// The top bar decides what it can afford to show (#143). Here rather
|
// The top bar decides what it can afford to show (#143). Here rather
|
||||||
// than in a component because the bar is light DOM in index.html and
|
// than in a component because the bar is light DOM in index.html and
|
||||||
|
|||||||
@@ -23,97 +23,23 @@
|
|||||||
* as the literal contains an unterminated `/*`. Nothing else produces
|
* as the literal contains an unterminated `/*`. Nothing else produces
|
||||||
* that, and a legitimate literal cannot contain one.
|
* that, and a legitimate literal cannot contain one.
|
||||||
*/
|
*/
|
||||||
import { readFileSync } from 'node:fs';
|
import { globSync, readFileSync } from 'node:fs';
|
||||||
import { globSync } from 'node:fs';
|
|
||||||
|
import { taggedLiterals } from './css-literals.mjs';
|
||||||
|
|
||||||
const TAGS = ['css', 'html', 'svg'];
|
const TAGS = ['css', 'html', 'svg'];
|
||||||
|
|
||||||
/**
|
|
||||||
* Find the end of a template literal that starts at `start` (the index
|
|
||||||
* of its opening backtick), respecting escapes and `${}` substitutions.
|
|
||||||
* Returns the index of the closing backtick, or -1.
|
|
||||||
*/
|
|
||||||
function endOfTemplate(src, start) {
|
|
||||||
let depth = 0;
|
|
||||||
|
|
||||||
for (let i = start + 1; i < src.length; i++) {
|
|
||||||
const c = src[i];
|
|
||||||
|
|
||||||
if (c === '\\') {
|
|
||||||
i++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (c === '$' && src[i + 1] === '{') {
|
|
||||||
depth++;
|
|
||||||
i++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (c === '}' && depth > 0) {
|
|
||||||
depth--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (c === '`' && depth === 0) return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Strip `${...}` substitutions, which may legitimately contain anything. */
|
|
||||||
function stripSubstitutions(text) {
|
|
||||||
let out = '';
|
|
||||||
let depth = 0;
|
|
||||||
|
|
||||||
for (let i = 0; i < text.length; i++) {
|
|
||||||
if (text[i] === '$' && text[i + 1] === '{') {
|
|
||||||
depth++;
|
|
||||||
i++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (text[i] === '}' && depth > 0) {
|
|
||||||
depth--;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (depth === 0) out += text[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
function lineOf(src, index) {
|
|
||||||
return src.slice(0, index).split('\n').length;
|
|
||||||
}
|
|
||||||
|
|
||||||
const files = globSync('src/**/*.ts', { cwd: process.cwd() });
|
const files = globSync('src/**/*.ts', { cwd: process.cwd() });
|
||||||
const problems = [];
|
const problems = [];
|
||||||
|
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
const src = readFileSync(file, 'utf8');
|
const src = readFileSync(file, 'utf8');
|
||||||
const tagPattern = new RegExp(`(^|[^\\w$.])(${TAGS.join('|')})\``, 'g');
|
|
||||||
|
|
||||||
let match;
|
for (const { tag, body, line } of taggedLiterals(src, TAGS)) {
|
||||||
|
|
||||||
while ((match = tagPattern.exec(src)) !== null) {
|
|
||||||
const open = match.index + match[0].length - 1;
|
|
||||||
const close = endOfTemplate(src, open);
|
|
||||||
|
|
||||||
if (close === -1) continue;
|
|
||||||
|
|
||||||
const body = stripSubstitutions(src.slice(open + 1, close));
|
|
||||||
const opens = (body.match(/\/\*/g) ?? []).length;
|
const opens = (body.match(/\/\*/g) ?? []).length;
|
||||||
const closes = (body.match(/\*\//g) ?? []).length;
|
const closes = (body.match(/\*\//g) ?? []).length;
|
||||||
|
|
||||||
if (opens > closes) {
|
if (opens > closes) problems.push({ file, line, tag });
|
||||||
problems.push({
|
|
||||||
file,
|
|
||||||
line: lineOf(src, open),
|
|
||||||
tag: match[2],
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,79 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* Fail on a nested rule whose selector starts with an element name.
|
||||||
|
*
|
||||||
|
* See `css-nesting.mjs` for what the phone does with one. No tier here
|
||||||
|
* can see it: the component tier, the e2e tier and `make ui-visual` all
|
||||||
|
* run a current Chromium, where the rule applies normally, so the only
|
||||||
|
* report is a screenshot of the device — which is how the bottom bar's
|
||||||
|
* title came to have never truncated there.
|
||||||
|
*
|
||||||
|
* It covers `index.css` and the `css` literals in the components alike,
|
||||||
|
* because a shadow-root stylesheet is parsed by the same engine.
|
||||||
|
*/
|
||||||
|
import { globSync, readFileSync } from 'node:fs';
|
||||||
|
|
||||||
|
import { taggedLiterals } from './css-literals.mjs';
|
||||||
|
import { findBareNestedRules } from './css-nesting.mjs';
|
||||||
|
|
||||||
|
const problems = [];
|
||||||
|
|
||||||
|
// Every stylesheet, not `index.css` by name: the hook that runs this
|
||||||
|
// fires on `frontend/**/*.{ts,css}`, so naming one file promises a
|
||||||
|
// coverage the sweep does not deliver -- a second stylesheet would be
|
||||||
|
// silently unswept while the hook still went green over it. There is
|
||||||
|
// only `index.css` today, which is exactly when this is free to fix.
|
||||||
|
const stylesheets = globSync('*.css', { cwd: process.cwd() });
|
||||||
|
|
||||||
|
if (stylesheets.length === 0) {
|
||||||
|
console.error('css-nesting-check: no stylesheet matched *.css');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const file of stylesheets) {
|
||||||
|
for (const { line, selector } of findBareNestedRules(
|
||||||
|
readFileSync(file, 'utf8'),
|
||||||
|
)) {
|
||||||
|
problems.push({ file, line, selector });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const sources = globSync('src/**/*.ts', { cwd: process.cwd() });
|
||||||
|
|
||||||
|
// A sweep over an empty glob passes, and this one is expected to find
|
||||||
|
// nothing, so "it found nothing" has to mean it looked.
|
||||||
|
if (sources.length === 0) {
|
||||||
|
console.error('css-nesting-check: no sources matched src/**/*.ts');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const file of sources) {
|
||||||
|
const src = readFileSync(file, 'utf8');
|
||||||
|
|
||||||
|
for (const literal of taggedLiterals(src, ['css'])) {
|
||||||
|
for (const { line, selector } of findBareNestedRules(literal.body)) {
|
||||||
|
problems.push({ file, line: literal.line + line - 1, selector });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (problems.length > 0) {
|
||||||
|
for (const p of problems) {
|
||||||
|
console.error(
|
||||||
|
`${p.file}:${p.line}: nested rule "${p.selector.split('\n')[0]}" starts ` +
|
||||||
|
'with an element name — write it as "& ' +
|
||||||
|
`${p.selector.split('\n')[0]}"`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error(
|
||||||
|
`\ncss-nesting-check: ${problems.length} problem(s). ` +
|
||||||
|
'Chrome 113 (the device) drops a nested rule that does not start ' +
|
||||||
|
'with a symbol; the leading & is valid in both syntaxes.',
|
||||||
|
);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`css-nesting-check: ${stylesheets.length} stylesheet(s) + ${sources.length} files, no bare nested rules`,
|
||||||
|
);
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
/**
|
||||||
|
* Finding the `css` tagged templates in a TypeScript source.
|
||||||
|
*
|
||||||
|
* Two checks read them — the unterminated-comment one and the nesting
|
||||||
|
* one — and a second scanner would be a second thing to keep in step
|
||||||
|
* with how a template literal actually ends.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the end of a template literal that starts at `start` (the index
|
||||||
|
* of its opening backtick), respecting escapes and `${}` substitutions.
|
||||||
|
* Returns the index of the closing backtick, or -1.
|
||||||
|
*/
|
||||||
|
export function endOfTemplate(src, start) {
|
||||||
|
let depth = 0;
|
||||||
|
|
||||||
|
for (let i = start + 1; i < src.length; i++) {
|
||||||
|
const c = src[i];
|
||||||
|
|
||||||
|
if (c === '\\') {
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '$' && src[i + 1] === '{') {
|
||||||
|
depth++;
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '}' && depth > 0) {
|
||||||
|
depth--;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '`' && depth === 0) return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Strip `${...}` substitutions, which may legitimately contain anything.
|
||||||
|
*
|
||||||
|
* Newlines inside them are kept, so a line number taken from the
|
||||||
|
* stripped text still names the right line of the file it came from.
|
||||||
|
*/
|
||||||
|
export function stripSubstitutions(text) {
|
||||||
|
let out = '';
|
||||||
|
let depth = 0;
|
||||||
|
|
||||||
|
for (let i = 0; i < text.length; i++) {
|
||||||
|
if (text[i] === '$' && text[i + 1] === '{') {
|
||||||
|
depth++;
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (text[i] === '}' && depth > 0) {
|
||||||
|
depth--;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (depth === 0) out += text[i];
|
||||||
|
else if (text[i] === '\n') out += '\n';
|
||||||
|
}
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The 1-based line number of `index` in `src`. */
|
||||||
|
export function lineOf(src, index) {
|
||||||
|
return src.slice(0, index).split('\n').length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every tagged template literal in `src` whose tag is in `tags`.
|
||||||
|
*
|
||||||
|
* `body` has its substitutions stripped and `line` is the line its
|
||||||
|
* opening backtick sits on, so `line + (n - 1)` is the file line of the
|
||||||
|
* body's own line `n`.
|
||||||
|
*/
|
||||||
|
export function taggedLiterals(src, tags) {
|
||||||
|
const pattern = new RegExp(`(^|[^\\w$.])(${tags.join('|')})\``, 'g');
|
||||||
|
const found = [];
|
||||||
|
|
||||||
|
let match;
|
||||||
|
|
||||||
|
while ((match = pattern.exec(src)) !== null) {
|
||||||
|
const open = match.index + match[0].length - 1;
|
||||||
|
const close = endOfTemplate(src, open);
|
||||||
|
|
||||||
|
if (close === -1) continue;
|
||||||
|
|
||||||
|
found.push({
|
||||||
|
tag: match[2],
|
||||||
|
body: stripSubstitutions(src.slice(open + 1, close)),
|
||||||
|
line: lineOf(src, open),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return found;
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
/**
|
||||||
|
* A nested rule whose selector starts with an element name is silently
|
||||||
|
* dropped on the phone.
|
||||||
|
*
|
||||||
|
* The device renders in Chrome 113, which predates relaxed CSS nesting
|
||||||
|
* (Chrome 120): before that a nested selector had to start with
|
||||||
|
* something that could not be read as the beginning of a declaration,
|
||||||
|
* so `.bottom-bar { audio-player { … } }` is not a parse error anyone
|
||||||
|
* would notice — the inner rule simply does not exist, on the phone and
|
||||||
|
* only on the phone. Three were live in `index.css`, one of them the
|
||||||
|
* `text-overflow: ellipsis` on the bottom bar's title, which had
|
||||||
|
* therefore never truncated on the device.
|
||||||
|
*
|
||||||
|
* `& audio-player` is valid in both syntaxes, so no nested rule here
|
||||||
|
* has any reason to omit it.
|
||||||
|
*
|
||||||
|
* Two things the detection has to get right:
|
||||||
|
*
|
||||||
|
* - **A rule directly inside an at-rule is not nested.**
|
||||||
|
* `@media (…) { bottom-nav { … } }` at the top level is an ordinary
|
||||||
|
* rule and is fine — and it is the majority of the matches a regex
|
||||||
|
* over the file would produce. What decides it is whether a *style*
|
||||||
|
* rule is somewhere above, not what the immediate parent is: inside
|
||||||
|
* `.bar { @media (…) { audio-player { … } } }` the inner rule is
|
||||||
|
* nested, at-rule in between or not.
|
||||||
|
* - **A declaration is not a rule.** `background: url(…)` and any
|
||||||
|
* string or comment can hold a brace, so this tracks them rather than
|
||||||
|
* matching lines.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Does this selector start with an identifier, rather than a symbol? */
|
||||||
|
function startsWithIdent(selector) {
|
||||||
|
return /^[A-Za-z_\u00A0-\uFFFF]/.test(selector);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every nested style rule in `css` whose selector starts with an
|
||||||
|
* element name, as `{ line, selector }` with a 1-based line.
|
||||||
|
*/
|
||||||
|
export function findBareNestedRules(css) {
|
||||||
|
const found = [];
|
||||||
|
/** The blocks we are inside, innermost last: 'style' or 'at'. */
|
||||||
|
const stack = [];
|
||||||
|
/** The text since the last `{`, `}` or `;` — a prelude, if a `{` follows. */
|
||||||
|
let prelude = '';
|
||||||
|
let preludeLine = 1;
|
||||||
|
let line = 1;
|
||||||
|
|
||||||
|
const startPrelude = () => {
|
||||||
|
prelude = '';
|
||||||
|
preludeLine = line;
|
||||||
|
};
|
||||||
|
|
||||||
|
for (let i = 0; i < css.length; i++) {
|
||||||
|
const c = css[i];
|
||||||
|
|
||||||
|
if (c === '\n') {
|
||||||
|
line++;
|
||||||
|
if (prelude.trim() === '') preludeLine = line;
|
||||||
|
prelude += c;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '/' && css[i + 1] === '*') {
|
||||||
|
const end = css.indexOf('*/', i + 2);
|
||||||
|
const comment = css.slice(i, end === -1 ? css.length : end + 2);
|
||||||
|
|
||||||
|
line += (comment.match(/\n/g) ?? []).length;
|
||||||
|
i += comment.length - 1;
|
||||||
|
if (prelude.trim() === '') preludeLine = line;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '"' || c === "'") {
|
||||||
|
let j = i + 1;
|
||||||
|
|
||||||
|
while (j < css.length && css[j] !== c) {
|
||||||
|
if (css[j] === '\\') j++;
|
||||||
|
j++;
|
||||||
|
}
|
||||||
|
|
||||||
|
prelude += css.slice(i, j + 1);
|
||||||
|
i = j;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '{') {
|
||||||
|
const selector = prelude.trim();
|
||||||
|
const kind = selector.startsWith('@') ? 'at' : 'style';
|
||||||
|
|
||||||
|
if (
|
||||||
|
kind === 'style' &&
|
||||||
|
stack.includes('style') &&
|
||||||
|
startsWithIdent(selector)
|
||||||
|
) {
|
||||||
|
found.push({ line: preludeLine, selector });
|
||||||
|
}
|
||||||
|
|
||||||
|
stack.push(kind);
|
||||||
|
startPrelude();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === '}') {
|
||||||
|
stack.pop();
|
||||||
|
startPrelude();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c === ';') {
|
||||||
|
startPrelude();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
prelude += c;
|
||||||
|
}
|
||||||
|
|
||||||
|
return found;
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import {
|
|||||||
import '@awesome.me/webawesome/dist/components/icon/icon.js';
|
import '@awesome.me/webawesome/dist/components/icon/icon.js';
|
||||||
import '@components/cover-grid/cover-grid.js';
|
import '@components/cover-grid/cover-grid.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { backButton } from '../../styles/back-button.css';
|
||||||
|
|
||||||
@customElement('artist-details')
|
@customElement('artist-details')
|
||||||
export class ArtistDetails extends LitElement {
|
export class ArtistDetails extends LitElement {
|
||||||
@@ -40,7 +41,7 @@ export class ArtistDetails extends LitElement {
|
|||||||
/** Tracks the store's cached array reference to detect refreshes. */
|
/** Tracks the store's cached array reference to detect refreshes. */
|
||||||
private lastAlbumsRef: library.Album[] | null = null;
|
private lastAlbumsRef: library.Album[] | null = null;
|
||||||
|
|
||||||
static override styles = [designTokens, css`
|
static override styles = [designTokens, backButton, css`
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -66,31 +67,6 @@ export class ArtistDetails extends LitElement {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(
|
|
||||||
--yj-bg-overlay,
|
|
||||||
rgba(255, 255, 255, 0.06)
|
|
||||||
);
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button:hover {
|
|
||||||
background: var(
|
|
||||||
--yj-bg-hover,
|
|
||||||
rgba(255, 255, 255, 0.12)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button wa-icon {
|
.back-button wa-icon {
|
||||||
font-size: 16px; /* back button — outside type scale */
|
font-size: 16px; /* back button — outside type scale */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,204 @@
|
|||||||
|
import { LitElement, html, css, nothing } from 'lit';
|
||||||
|
import { customElement, state } from 'lit/decorators.js';
|
||||||
|
|
||||||
|
import { PlayerController } from '@store/controllers/player-controller';
|
||||||
|
import { designTokens } from '../../../styles/tokens.css';
|
||||||
|
import { PHONE_QUERY } from '../../../utils/breakpoints';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How far through the song we are, on the border between the mini
|
||||||
|
* player and the tab bar (#58).
|
||||||
|
*
|
||||||
|
* The phone's bottom bar carries three controls and no seek bar — plan
|
||||||
|
* 016 B2 took it out, because 4px of height is not a thumb target and the
|
||||||
|
* full-screen `now-playing-view` is where seeking belongs. What went
|
||||||
|
* with it is the one thing a mini player is expected to say without
|
||||||
|
* being opened: how far through the song it is. This is that, and
|
||||||
|
* only that.
|
||||||
|
*
|
||||||
|
* Four things about it are load-bearing.
|
||||||
|
*
|
||||||
|
* **It is the shell's element, not either bar's.** The mini player and
|
||||||
|
* `<bottom-nav>` are separate components stacked in the shell's grid,
|
||||||
|
* so a line on the border between them is a row of the grid — either
|
||||||
|
* one drawing it means reaching into the other's box for two pixels.
|
||||||
|
*
|
||||||
|
* **It never counts.** The position is pushed at 1 Hz by the backend
|
||||||
|
* (`PlaybackPositionChanged`), and the interval here interpolates
|
||||||
|
* *between* those reports and is stopped and restarted by every one of
|
||||||
|
* them — the seek bar's rule, for the reason the seek bar has it: a
|
||||||
|
* local clock drifted 30 s away from the backend across four keyboard
|
||||||
|
* seeks. The `trackChangeId` and `seq` guards come along for the same
|
||||||
|
* reason: the store is a singleton, so a report about the previous
|
||||||
|
* track must not be adopted, and the same second reported twice still
|
||||||
|
* has to reset the interpolation.
|
||||||
|
*
|
||||||
|
* **It is not a control and cannot become one.** `aria-hidden` on the
|
||||||
|
* host and `pointer-events: none` throughout: the real progress is
|
||||||
|
* announced by the seek bar on Now Playing, and a 2px strip on the top
|
||||||
|
* edge of the tab bar that sometimes seeks is worse than one that
|
||||||
|
* never does. It is also where a thumb aiming at a tab lands.
|
||||||
|
*
|
||||||
|
* **It renders nothing above 600px**, from `matchMedia` rather than a
|
||||||
|
* media query, because that decides whether the element *exists* — and
|
||||||
|
* with it whether a 1 Hz interval runs for the life of every desktop
|
||||||
|
* session about a line nobody can see. `job-band`, `search-trigger`
|
||||||
|
* and `player-controls` are the same pattern for the same reason.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The reporting cadence, matched. This is not the clock: it exists
|
||||||
|
* only so the line moves in the second between two reports, and its
|
||||||
|
* error is discarded by the next one rather than carried.
|
||||||
|
*/
|
||||||
|
const InterpolationIntervalMillis = 1000;
|
||||||
|
|
||||||
|
@customElement('player-progress-line')
|
||||||
|
export class PlayerProgressLine extends LitElement {
|
||||||
|
private player = new PlayerController(this);
|
||||||
|
|
||||||
|
/** Phone width. See the class comment: existence, not paint. */
|
||||||
|
@state() private phone = false;
|
||||||
|
|
||||||
|
/** Seconds into the track, from the last report plus interpolation. */
|
||||||
|
@state() private elapsed = 0;
|
||||||
|
|
||||||
|
private previousTrackChangeId = -1;
|
||||||
|
|
||||||
|
/** The sequence number of the last backend report applied. */
|
||||||
|
private previousPositionSeq = -1;
|
||||||
|
|
||||||
|
private timerID = -1;
|
||||||
|
|
||||||
|
private media?: MediaQueryList;
|
||||||
|
|
||||||
|
private onMedia = (e: MediaQueryListEvent) => {
|
||||||
|
this.phone = e.matches;
|
||||||
|
};
|
||||||
|
|
||||||
|
static override styles = [
|
||||||
|
designTokens,
|
||||||
|
css`
|
||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
/* Not a target, at any depth. */
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.track {
|
||||||
|
height: 2px;
|
||||||
|
background-color: var(--yj-bg-surface, #212529);
|
||||||
|
}
|
||||||
|
|
||||||
|
.fill {
|
||||||
|
height: 100%;
|
||||||
|
background-color: var(--yj-accent, #ffd43b);
|
||||||
|
/* scaleX off a full-width box rather than a width in
|
||||||
|
percent, so the moving thing is a transform and the
|
||||||
|
line costs no layout once a second. */
|
||||||
|
transform-origin: left center;
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
];
|
||||||
|
|
||||||
|
private get trackLength(): number {
|
||||||
|
return this.player.currentTrack?.trackLength ?? 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
override connectedCallback(): void {
|
||||||
|
super.connectedCallback();
|
||||||
|
|
||||||
|
// Decorative in full: the seek bar on Now Playing is what
|
||||||
|
// announces the position, and this says the same thing without
|
||||||
|
// a name, a value or a way to act on it.
|
||||||
|
this.setAttribute('aria-hidden', 'true');
|
||||||
|
|
||||||
|
this.media = window.matchMedia(PHONE_QUERY);
|
||||||
|
this.phone = this.media.matches;
|
||||||
|
this.media.addEventListener('change', this.onMedia);
|
||||||
|
}
|
||||||
|
|
||||||
|
override disconnectedCallback(): void {
|
||||||
|
super.disconnectedCallback();
|
||||||
|
this.stopInterpolating();
|
||||||
|
this.media?.removeEventListener('change', this.onMedia);
|
||||||
|
}
|
||||||
|
|
||||||
|
override updated(): void {
|
||||||
|
// A track change resets the line, and `trackChangeId` is what
|
||||||
|
// reveals one when the same file plays twice in a row.
|
||||||
|
const currentChangeId = this.player.currentTrack?.trackChangeId ?? -1;
|
||||||
|
|
||||||
|
if (currentChangeId !== this.previousTrackChangeId) {
|
||||||
|
this.previousTrackChangeId = currentChangeId;
|
||||||
|
this.elapsed = this.player.currentTrack?.seekPosition ?? 0;
|
||||||
|
this.stopInterpolating();
|
||||||
|
}
|
||||||
|
|
||||||
|
// The backend's own position wins over anything counted here,
|
||||||
|
// and a report for a track that is no longer loaded is stale by
|
||||||
|
// definition.
|
||||||
|
const position = this.player.position;
|
||||||
|
|
||||||
|
if (
|
||||||
|
position &&
|
||||||
|
position.trackChangeId === currentChangeId &&
|
||||||
|
position.seq !== this.previousPositionSeq
|
||||||
|
) {
|
||||||
|
this.previousPositionSeq = position.seq;
|
||||||
|
this.elapsed = position.positionSeconds;
|
||||||
|
this.stopInterpolating();
|
||||||
|
}
|
||||||
|
|
||||||
|
// One owner for the interval, as in `seek-bar`: everything that
|
||||||
|
// wants it started or stopped says so by changing state that
|
||||||
|
// brings us back here.
|
||||||
|
if (this.phone && this.player.isPlaying && currentChangeId !== -1) {
|
||||||
|
this.startInterpolating();
|
||||||
|
} else {
|
||||||
|
this.stopInterpolating();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private stopInterpolating(): void {
|
||||||
|
if (this.timerID !== -1) {
|
||||||
|
clearInterval(this.timerID);
|
||||||
|
this.timerID = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private startInterpolating(): void {
|
||||||
|
if (this.timerID !== -1) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.timerID = window.setInterval(() => {
|
||||||
|
if (this.elapsed < this.trackLength) {
|
||||||
|
this.elapsed += 1;
|
||||||
|
}
|
||||||
|
}, InterpolationIntervalMillis);
|
||||||
|
}
|
||||||
|
|
||||||
|
override render() {
|
||||||
|
// Nothing playing is nothing to say, and the grid row is `auto`
|
||||||
|
// so an empty render costs no height at all -- `job-band`'s
|
||||||
|
// rule one row down.
|
||||||
|
if (!this.phone || this.player.currentTrack === null) return nothing;
|
||||||
|
|
||||||
|
const length = this.trackLength;
|
||||||
|
const fraction =
|
||||||
|
length > 0 ? Math.min(1, Math.max(0, this.elapsed / length)) : 0;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<div class="track" data-testid="progress-line">
|
||||||
|
<div class="fill" style="transform: scaleX(${fraction})"></div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface HTMLElementTagNameMap {
|
||||||
|
'player-progress-line': PlayerProgressLine;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -45,18 +45,6 @@ export class SeekBar extends LitElement {
|
|||||||
private showRemaining: boolean = true;
|
private showRemaining: boolean = true;
|
||||||
|
|
||||||
static override styles = [designTokens, waSliderLabel, css`
|
static override styles = [designTokens, waSliderLabel, css`
|
||||||
/* 12px below the phone breakpoint. The bottom bar's seek bar is
|
|
||||||
display:none there (016 B2 phase 1), so the only instance a
|
|
||||||
viewport media query can reach at that width is the full-screen
|
|
||||||
now-playing view's -- which is exactly the one a thumb uses.
|
|
||||||
The track size lives on wa-slider inside this shadow root, so a
|
|
||||||
custom property set by the host would not reach it. */
|
|
||||||
@media (max-width: 599px) {
|
|
||||||
wa-slider {
|
|
||||||
--track-size: 12px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
wa-slider {
|
wa-slider {
|
||||||
--track-size: 6px;
|
--track-size: 6px;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@@ -80,6 +68,57 @@ export class SeekBar extends LitElement {
|
|||||||
background: var(--yj-bg-base, black);
|
background: var(--yj-bg-base, black);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The phone's seek bar, and this block is last on purpose.
|
||||||
|
|
||||||
|
A media query adds no specificity, so this lived above the plain
|
||||||
|
"wa-slider" rule and lost to it at every width: the 12px track it
|
||||||
|
asks for had never once applied, and the bar measured 261x6 on
|
||||||
|
the device while the source said 12. That is index.css's rule
|
||||||
|
("the phone section is last on purpose") met inside a component's
|
||||||
|
own stylesheet, and nothing renders differently in any tier here
|
||||||
|
to say so.
|
||||||
|
|
||||||
|
The bottom bar's seek bar is display:none below this width (016
|
||||||
|
B2 phase 1), so the only instance a viewport media query can
|
||||||
|
reach is the full-screen now-playing view's -- which is exactly
|
||||||
|
the one a thumb uses. The desktop bar keeps its 6px, where a
|
||||||
|
mouse is precise and the thickness is right.
|
||||||
|
|
||||||
|
The painted track and the thing you can hit are allowed to
|
||||||
|
differ, and a slider is the clearest case where they should: 12px
|
||||||
|
is a progress bar you can see, and 44px is the app's touch floor
|
||||||
|
(#56). A 44px-*thick* bar would be wrong-looking and would cost
|
||||||
|
the album art the vertical space #51 spent an issue recovering.
|
||||||
|
|
||||||
|
Two things about how the target is built.
|
||||||
|
|
||||||
|
The padding goes on ::part(slider) rather than on the host,
|
||||||
|
because that inner div is what carries the gesture -- it has the
|
||||||
|
listener and the touch-action: none, and it is exactly the host's
|
||||||
|
size, so padding the host would grow a box that does not take the
|
||||||
|
press.
|
||||||
|
|
||||||
|
The padding is asymmetric and the margins cancel it, so the row
|
||||||
|
does not grow by the difference. Both halves are measured: the
|
||||||
|
seek row is 19px (its clocks, not the track, decide that) and the
|
||||||
|
play button's top edge is 8px below it, so the target takes the
|
||||||
|
space *above*, where .art is a non-interactive div. Growing the
|
||||||
|
row instead cost the art 25px of 143. Verified on the device at
|
||||||
|
424x439: hit area 44px, painted track 12px, row still 19px, art
|
||||||
|
still 143px, 8px of clearance left under the play button, a press
|
||||||
|
26px above the track seeks, and a hit test on the play button's
|
||||||
|
top edge still reaches the play button. */
|
||||||
|
@media (max-width: 599px) {
|
||||||
|
wa-slider {
|
||||||
|
--track-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
wa-slider::part(slider) {
|
||||||
|
padding-block: 28px 4px;
|
||||||
|
margin-block: -28px -4px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#seek-bar-container {
|
#seek-bar-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|||||||
@@ -250,13 +250,20 @@ export class AutotagView extends ViewLifecycleMixin(LitElement) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Collapsible-section toggle used in the Pending header —
|
/* Collapsible-section toggle used in the Pending header —
|
||||||
transparent button that inherits the header's type. */
|
transparent button that inherits the header's type.
|
||||||
|
|
||||||
|
187x**15** before this (#186), which was the smallest
|
||||||
|
control measured anywhere in the app until the column
|
||||||
|
arrows were counted. It is transparent and full-width
|
||||||
|
already, so the floor costs it a height and nothing
|
||||||
|
else. */
|
||||||
.section-toggle {
|
.section-toggle {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.35rem;
|
gap: 0.35rem;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
|
min-block-size: 44px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: 0;
|
border: 0;
|
||||||
@@ -274,6 +281,8 @@ export class AutotagView extends ViewLifecycleMixin(LitElement) {
|
|||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 32x18, and it has no background until hover -- so the
|
||||||
|
padding out to a square target is invisible (#186). */
|
||||||
.folders-menu-trigger {
|
.folders-menu-trigger {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
border: 0;
|
border: 0;
|
||||||
@@ -281,6 +290,8 @@ export class AutotagView extends ViewLifecycleMixin(LitElement) {
|
|||||||
font-size: 1.1rem;
|
font-size: 1.1rem;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
padding: 0.1rem 0.4rem;
|
padding: 0.1rem 0.4rem;
|
||||||
|
min-inline-size: 44px;
|
||||||
|
min-block-size: 44px;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
@@ -293,7 +304,10 @@ export class AutotagView extends ViewLifecycleMixin(LitElement) {
|
|||||||
.folders-refresh-trigger {
|
.folders-refresh-trigger {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
font-size: 0.95rem;
|
font-size: 0.95rem;
|
||||||
|
min-inline-size: 44px;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.folders-refresh-trigger:disabled {
|
.folders-refresh-trigger:disabled {
|
||||||
|
|||||||
@@ -85,6 +85,21 @@ export class ConfigField extends LitElement {
|
|||||||
gap: 0.5em;
|
gap: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Every control here meets the app's 44px touch floor (#186).
|
||||||
|
|
||||||
|
This is the shape every row in Settings uses, so it is the
|
||||||
|
one rule that covers the most controls -- and it is the
|
||||||
|
*cheapest* place to reach the floor, because there is no
|
||||||
|
overflow fit on this page. The page header's had one (#69),
|
||||||
|
which is why that pass had to grow padding and hand the
|
||||||
|
width back with a negative margin; here the control is a
|
||||||
|
block in a column and a taller box costs nothing but the
|
||||||
|
height it takes.
|
||||||
|
|
||||||
|
Measured on the reference device before this: the select
|
||||||
|
335x30, the text and number inputs the same, the browse
|
||||||
|
button 30 tall, the colour swatch 33x33 and the toggle
|
||||||
|
**34x19**. */
|
||||||
input[type='text'],
|
input[type='text'],
|
||||||
input[type='number'] {
|
input[type='number'] {
|
||||||
background: var(--yj-bg-elevated, #343a40);
|
background: var(--yj-bg-elevated, #343a40);
|
||||||
@@ -95,6 +110,7 @@ export class ConfigField extends LitElement {
|
|||||||
font-size: 0.85em;
|
font-size: 0.85em;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
|
min-block-size: 44px;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,6 +133,7 @@ export class ConfigField extends LitElement {
|
|||||||
font-size: 0.85em;
|
font-size: 0.85em;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
min-block-size: 44px;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,6 +156,7 @@ export class ConfigField extends LitElement {
|
|||||||
font-size: 0.85em;
|
font-size: 0.85em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
button:hover {
|
button:hover {
|
||||||
@@ -158,8 +176,12 @@ export class ConfigField extends LitElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
input[type='color'] {
|
input[type='color'] {
|
||||||
width: 2.5em;
|
/* border-box, or the 2px border makes this 48 and the
|
||||||
height: 2.5em;
|
assertion below reads as passing by four pixels of
|
||||||
|
border rather than by the rule. */
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
border: 2px solid var(--yj-border, #444);
|
border: 2px solid var(--yj-border, #444);
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
@@ -187,12 +209,32 @@ export class ConfigField extends LitElement {
|
|||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The toggle is the one control here whose target and paint
|
||||||
|
must differ, and it is also the one no sweep can see.
|
||||||
|
|
||||||
|
Its <input> is opacity: 0; width: 0; height: 0, so a
|
||||||
|
walk of every input on the page skips it as a zero-sized
|
||||||
|
node -- the thing a finger actually hits is this <label>,
|
||||||
|
which measured **34x19**. That is smaller than anything in
|
||||||
|
#186's original table and it is absent from it for exactly
|
||||||
|
that reason.
|
||||||
|
|
||||||
|
A 44px pill is not what a switch should look like, so the
|
||||||
|
box is 44px and the paint is not: .toggle-slider is a
|
||||||
|
2.5em x 1.4em child centred in it rather than an absolute
|
||||||
|
fill. The negative inline margins hand the extra width back
|
||||||
|
to the layout, so the pill stays flush with the right edge
|
||||||
|
of the inputs in the rows above it -- the header pass's
|
||||||
|
shape, used here for alignment rather than for a fit. */
|
||||||
.toggle-switch {
|
.toggle-switch {
|
||||||
position: relative;
|
display: grid;
|
||||||
width: 2.5em;
|
place-items: center;
|
||||||
height: 1.4em;
|
inline-size: 44px;
|
||||||
|
block-size: 44px;
|
||||||
|
margin-inline: calc((2.5em - 44px) / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
.toggle-switch input {
|
.toggle-switch input {
|
||||||
@@ -202,9 +244,10 @@ export class ConfigField extends LitElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.toggle-slider {
|
.toggle-slider {
|
||||||
position: absolute;
|
position: relative;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
inset: 0;
|
inline-size: 2.5em;
|
||||||
|
block-size: 1.4em;
|
||||||
background: var(--yj-bg-overlay, #495057);
|
background: var(--yj-bg-overlay, #495057);
|
||||||
border-radius: 1em;
|
border-radius: 1em;
|
||||||
transition: background 0.2s;
|
transition: background 0.2s;
|
||||||
|
|||||||
@@ -176,6 +176,13 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
transition: background-color 0.15s ease;
|
transition: background-color 0.15s ease;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
/* The app's 44px touch floor (#56, #186), stated once for
|
||||||
|
all 41 buttons this page renders rather than per class.
|
||||||
|
Height is free here: Settings has no overflow fit, so
|
||||||
|
the header's "only width is contested" rule does not
|
||||||
|
bind, and the two classes that need more than a height
|
||||||
|
say so below. */
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
button:disabled {
|
button:disabled {
|
||||||
@@ -509,11 +516,24 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The two column lists are the densest thing in the app, and
|
||||||
|
the density argument is why they are shaped the way they
|
||||||
|
are rather than simply grown (#186).
|
||||||
|
|
||||||
|
Measured on the reference device: the row was already
|
||||||
|
335x36 -- it is the controls *inside* it that were 16x16 and
|
||||||
|
**16x14**, the smallest anywhere in this app, 36 of them.
|
||||||
|
So the fix grows the controls into the row they already
|
||||||
|
occupy and only takes the row from 36 to 44, which over the
|
||||||
|
two lists (10 and 19 items) is 232px of extra scroll on a
|
||||||
|
439px screen. Growing each control to its own 44px row
|
||||||
|
instead would have cost four screens. */
|
||||||
.column-item {
|
.column-item {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: stretch;
|
||||||
gap: 0.5em;
|
gap: 0.5em;
|
||||||
padding: 0.5em 0.75em;
|
padding: 0 0.75em;
|
||||||
|
min-block-size: 44px;
|
||||||
border-bottom: 1px solid
|
border-bottom: 1px solid
|
||||||
var(--yj-border-subtle, #333);
|
var(--yj-border-subtle, #333);
|
||||||
font-size: 0.85em;
|
font-size: 0.85em;
|
||||||
@@ -531,8 +551,19 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* A native checkbox cannot grow its hit area without growing
|
||||||
|
its paint, and a 44px checkbox is not what anyone wants. So
|
||||||
|
the target is the label instead: .column-label is a real
|
||||||
|
<label for> now, which makes the column's *name* the thing
|
||||||
|
you tap -- ~250x44 rather than 16x16.
|
||||||
|
|
||||||
|
That is the argument config-field already makes one file
|
||||||
|
over for its own labels: "a real label association also
|
||||||
|
makes the label text a click target for the control, which
|
||||||
|
is behaviour, not annotation". Here it is the whole fix. */
|
||||||
.column-toggle {
|
.column-toggle {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
align-self: center;
|
||||||
accent-color: var(
|
accent-color: var(
|
||||||
--yj-accent,
|
--yj-accent,
|
||||||
#ffd43b
|
#ffd43b
|
||||||
@@ -541,20 +572,32 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
|
|
||||||
.column-label {
|
.column-label {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
cursor: pointer;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.view-note {
|
.view-note {
|
||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
font-size: var(--yj-font-size-sm, 0.85rem);
|
font-size: var(--yj-font-size-sm, 0.85rem);
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
|
/* The row stretches its children so the label can be a
|
||||||
|
full-height target; this is text, not a target. */
|
||||||
|
align-self: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.column-arrows {
|
.column-arrows {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
align-items: stretch;
|
||||||
gap: 0.15em;
|
gap: 0.15em;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 16x14 before this, and they carry background: none and a
|
||||||
|
transparent border -- so padding out to 44px grows the
|
||||||
|
target and changes nothing anyone can see until hover,
|
||||||
|
which is precisely what #186's Direction asks for. */
|
||||||
.column-arrow-btn {
|
.column-arrow-btn {
|
||||||
background: none;
|
background: none;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
@@ -564,6 +607,8 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
font-size: 0.65em;
|
font-size: 0.65em;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
padding: 0.2em 0.35em;
|
padding: 0.2em 0.35em;
|
||||||
|
min-inline-size: 44px;
|
||||||
|
min-block-size: 44px;
|
||||||
transition:
|
transition:
|
||||||
color 0.15s,
|
color 0.15s,
|
||||||
border-color 0.15s;
|
border-color 0.15s;
|
||||||
@@ -711,6 +756,11 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
padding: 0.2em 0.4em;
|
padding: 0.2em 0.4em;
|
||||||
letter-spacing: 2px;
|
letter-spacing: 2px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
|
/* Square, so it needs the width too -- the shared rule
|
||||||
|
above only gives it a height. It was 31x31, and it is
|
||||||
|
the only route to "Remove library", which is the case
|
||||||
|
#55 settled one component over: the way out is 44px. */
|
||||||
|
min-inline-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.overflow-btn:hover {
|
.overflow-btn:hover {
|
||||||
@@ -2003,6 +2053,7 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
class="column-item ${checked ? 'enabled' : 'disabled'}"
|
class="column-item ${checked ? 'enabled' : 'disabled'}"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
|
id="view-${v.id}"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
class="column-toggle"
|
class="column-toggle"
|
||||||
aria-label="Show ${v.label} in the navigation"
|
aria-label="Show ${v.label} in the navigation"
|
||||||
@@ -2014,9 +2065,9 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
(e.target as HTMLInputElement).checked,
|
(e.target as HTMLInputElement).checked,
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
<span class="column-label">
|
<label class="column-label" for="view-${v.id}">
|
||||||
${v.label}
|
${v.label}
|
||||||
</span>
|
</label>
|
||||||
${note
|
${note
|
||||||
? html`<span class="view-note">${note}</span>`
|
? html`<span class="view-note">${note}</span>`
|
||||||
: nothing}
|
: nothing}
|
||||||
@@ -2212,6 +2263,7 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
class="column-item ${checked ? 'enabled' : 'disabled'}"
|
class="column-item ${checked ? 'enabled' : 'disabled'}"
|
||||||
>
|
>
|
||||||
<input
|
<input
|
||||||
|
id="column-${id}"
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
class="column-toggle"
|
class="column-toggle"
|
||||||
aria-label="Show the ${columnLabel} column"
|
aria-label="Show the ${columnLabel} column"
|
||||||
@@ -2222,11 +2274,12 @@ export class ConfigPage extends ViewLifecycleMixin(LitElement) {
|
|||||||
id,
|
id,
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
<span
|
<label
|
||||||
class="column-label"
|
class="column-label"
|
||||||
|
for="column-${id}"
|
||||||
>
|
>
|
||||||
${columnLabel}
|
${columnLabel}
|
||||||
</span>
|
</label>
|
||||||
<span
|
<span
|
||||||
class="column-arrows"
|
class="column-arrows"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import '@awesome.me/webawesome/dist/components/switch/switch.js';
|
|||||||
import '@awesome.me/webawesome/dist/components/spinner/spinner.js';
|
import '@awesome.me/webawesome/dist/components/spinner/spinner.js';
|
||||||
import '@awesome.me/webawesome/dist/components/callout/callout.js';
|
import '@awesome.me/webawesome/dist/components/callout/callout.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { waTouchFloor } from '../../styles/wa-touch-floor.css';
|
||||||
import type {
|
import type {
|
||||||
DownloadDescriptor,
|
DownloadDescriptor,
|
||||||
DownloadProvider,
|
DownloadProvider,
|
||||||
@@ -136,6 +137,7 @@ export class DownloadClients extends LitElement {
|
|||||||
|
|
||||||
static override styles = [
|
static override styles = [
|
||||||
designTokens,
|
designTokens,
|
||||||
|
waTouchFloor,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
display: block;
|
display: block;
|
||||||
@@ -239,12 +241,17 @@ export class DownloadClients extends LitElement {
|
|||||||
margin-top: 0.4em;
|
margin-top: 0.4em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The checkbox is 16x16 and cannot grow without becoming
|
||||||
|
a 44px checkbox, but it is already wrapped in the label
|
||||||
|
that names it -- so the label is the target and only
|
||||||
|
needs the height (#186). Eight of them. */
|
||||||
.format-option {
|
.format-option {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.4em;
|
gap: 0.4em;
|
||||||
font-size: 0.9em;
|
font-size: 0.9em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
`,
|
`,
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -25,6 +25,11 @@ export class ShortcutCapture extends LitElement {
|
|||||||
:host {
|
:host {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
/* 80x25, twenty-six of them -- the most numerous control on
|
||||||
|
the Settings page after the column lists (#186). The floor
|
||||||
|
is a height here and nothing else: the width was already
|
||||||
|
past it, and the type stays where it is so a shortcut still
|
||||||
|
reads as a key rather than as a button. */
|
||||||
button {
|
button {
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
font-size: var(--yj-text-sm, 13px);
|
font-size: var(--yj-text-sm, 13px);
|
||||||
@@ -35,6 +40,7 @@ export class ShortcutCapture extends LitElement {
|
|||||||
color: var(--yj-text-primary, #eee);
|
color: var(--yj-text-primary, #eee);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
min-width: 80px;
|
min-width: 80px;
|
||||||
|
min-height: 44px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
transition:
|
transition:
|
||||||
border-color 0.15s,
|
border-color 0.15s,
|
||||||
@@ -61,6 +67,11 @@ export class ShortcutCapture extends LitElement {
|
|||||||
opacity: 0.7;
|
opacity: 0.7;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* Reset renders only for a rebound shortcut, so a sweep of a
|
||||||
|
freshly-installed app never sees it -- it is not in #186's
|
||||||
|
tables for that reason, and it is a touch target the moment
|
||||||
|
anybody uses the feature. It also has no background, so the
|
||||||
|
padding out to 44px is invisible. */
|
||||||
.reset-btn {
|
.reset-btn {
|
||||||
font-size: var(--yj-text-xs, 11px);
|
font-size: var(--yj-text-xs, 11px);
|
||||||
padding: 2px 6px;
|
padding: 2px 6px;
|
||||||
@@ -69,7 +80,8 @@ export class ShortcutCapture extends LitElement {
|
|||||||
background: transparent;
|
background: transparent;
|
||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
min-width: auto;
|
min-width: 44px;
|
||||||
|
min-height: 44px;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.15s;
|
transition: opacity 0.15s;
|
||||||
}
|
}
|
||||||
@@ -79,6 +91,17 @@ export class ShortcutCapture extends LitElement {
|
|||||||
.reset-btn:hover {
|
.reset-btn:hover {
|
||||||
color: var(--yj-accent-text, #ffd43b);
|
color: var(--yj-accent-text, #ffd43b);
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* Reset is the only way to put a rebound shortcut back, so where
|
||||||
|
* the device has no hover it is always visible rather than an
|
||||||
|
* invisible button holding its hit area. The inverse of #68's
|
||||||
|
* rule, which applies where the hover control is redundant.
|
||||||
|
*/
|
||||||
|
@media not all and (hover: hover) {
|
||||||
|
.reset-btn {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
private handleClick = () => {
|
private handleClick = () => {
|
||||||
|
|||||||
@@ -93,8 +93,26 @@ export class DownloadsView extends ViewLifecycleMixin(LitElement) {
|
|||||||
border-bottom: 1px solid var(--yj-bg-overlay, rgba(255, 255, 255, 0.08));
|
border-bottom: 1px solid var(--yj-bg-overlay, rgba(255, 255, 255, 0.08));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 85x34 and 96x34 before this (#186). A tab is the only
|
||||||
|
route to the panel it names, so it is the last control
|
||||||
|
that should be hard to hit -- and the underline that
|
||||||
|
marks the active one is drawn on the bottom border,
|
||||||
|
which a taller box moves further from the label. So the
|
||||||
|
height goes on *padding*, keeping the border against
|
||||||
|
the label rather than 10px below a centred one.
|
||||||
|
|
||||||
|
The min-size is the floor and is not redundant: padding
|
||||||
|
alone made this 44px here and **43px in CI**, because
|
||||||
|
the total is 13 + 13 + 2 + whatever line box the font
|
||||||
|
gives 13px text, and ubuntu:24.04's is a pixel shorter
|
||||||
|
than this machine's. A height computed from a font's
|
||||||
|
line box is not a height you control -- the same
|
||||||
|
mistake #195 made about a layout property measured on
|
||||||
|
one engine, one layer down, and caught here by the test
|
||||||
|
rather than by a person. */
|
||||||
.tab {
|
.tab {
|
||||||
padding: 8px 14px;
|
min-block-size: 44px;
|
||||||
|
padding: 13px 14px;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: var(--yj-text-secondary, #b3b3b3);
|
color: var(--yj-text-secondary, #b3b3b3);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { LitElement, html, css, nothing } from 'lit';
|
|||||||
import { customElement, property, state, query } from 'lit/decorators.js';
|
import { customElement, property, state, query } from 'lit/decorators.js';
|
||||||
import { classMap } from 'lit/directives/class-map.js';
|
import { classMap } from 'lit/directives/class-map.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { backButton } from '../../styles/back-button.css';
|
||||||
import { srOnly } from '../../styles/sr-only.css';
|
import { srOnly } from '../../styles/sr-only.css';
|
||||||
import { unownedLabel, unownedStyles } from '@utils/ownership';
|
import { unownedLabel, unownedStyles } from '@utils/ownership';
|
||||||
import {
|
import {
|
||||||
@@ -355,6 +356,7 @@ export class ExploreAlbumDetails extends LitElement implements ContextMenuHost {
|
|||||||
|
|
||||||
static override styles = [
|
static override styles = [
|
||||||
designTokens,
|
designTokens,
|
||||||
|
backButton,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
srOnly,
|
srOnly,
|
||||||
@@ -379,25 +381,6 @@ export class ExploreAlbumDetails extends LitElement implements ContextMenuHost {
|
|||||||
var(--yj-border-subtle, rgba(255, 255, 255, 0.06));
|
var(--yj-border-subtle, rgba(255, 255, 255, 0.06));
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button:hover {
|
|
||||||
background: var(--yj-bg-hover, rgba(255, 255, 255, 0.12));
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button wa-icon {
|
.back-button wa-icon {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
@@ -892,6 +875,67 @@ export class ExploreAlbumDetails extends LitElement implements ContextMenuHost {
|
|||||||
.track-row .track-request {
|
.track-row .track-request {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ── The phone (#66) ──
|
||||||
|
*
|
||||||
|
* **This block is last on purpose**, for index.css's
|
||||||
|
* reason: a media query adds no specificity, so a rule
|
||||||
|
* written above the plain one it overrides loses to it and
|
||||||
|
* every declaration here is silently dead.
|
||||||
|
*
|
||||||
|
* Two faults, one shape. The page is a fixed header over a
|
||||||
|
* scrolling tracklist — the desktop arrangement — so at the
|
||||||
|
* reference device's 424x439 the header owned 253 of the
|
||||||
|
* panel's 318px and the tracklist scrolled inside the 64px
|
||||||
|
* that were left. And the header's flex row squeezed
|
||||||
|
* .album-info to 112px, so the title drew as one ellipsised
|
||||||
|
* glyph and two of the album's three primary actions were
|
||||||
|
* clipped by the host's own overflow: Shuffle album ended
|
||||||
|
* at x=443 in a 424px box, unreachable by any gesture.
|
||||||
|
*
|
||||||
|
* .album-info carries min-width: 0 and was shrinking as
|
||||||
|
* asked, so another one is not the fix — the row has to
|
||||||
|
* stack, or the info column has nothing to be wide with.
|
||||||
|
*
|
||||||
|
* The scroller moves to the host and .content stops being
|
||||||
|
* one, which is what makes the header scroll away; the
|
||||||
|
* tracklist is plain DOM rather than a virtualizer, so
|
||||||
|
* nothing inside wants a scroll window of its own. */
|
||||||
|
@media (max-width: 599px) {
|
||||||
|
:host {
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.album-header {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 12px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Stacked, the art is the whole of the header's width
|
||||||
|
* budget and its 200px square is 45% of the reference
|
||||||
|
* device's height. It is still what identifies the
|
||||||
|
* album, so it shrinks rather than going. */
|
||||||
|
.cover-art-container {
|
||||||
|
width: 140px;
|
||||||
|
height: 140px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* A column flex item takes its content's width from
|
||||||
|
* align-items: flex-start above, which would leave the
|
||||||
|
* actions wrapping inside a box narrower than the row
|
||||||
|
* they now have to themselves. */
|
||||||
|
.album-info {
|
||||||
|
align-self: stretch;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
overflow-y: visible;
|
||||||
|
padding: 16px 16px 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
`,
|
`,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { LitElement, html, css, nothing } from 'lit';
|
|||||||
import { customElement, property, state, query } from 'lit/decorators.js';
|
import { customElement, property, state, query } from 'lit/decorators.js';
|
||||||
import { classMap } from 'lit/directives/class-map.js';
|
import { classMap } from 'lit/directives/class-map.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { backButton } from '../../styles/back-button.css';
|
||||||
import {
|
import {
|
||||||
LookupArtist,
|
LookupArtist,
|
||||||
BrowseReleaseGroups,
|
BrowseReleaseGroups,
|
||||||
@@ -266,6 +267,7 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
|
|
||||||
static override styles = [
|
static override styles = [
|
||||||
designTokens,
|
designTokens,
|
||||||
|
backButton,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
unownedStyles,
|
unownedStyles,
|
||||||
@@ -289,25 +291,6 @@ export class ExploreArtistDetails extends LitElement implements ContextMenuHost
|
|||||||
var(--yj-border-subtle, rgba(255, 255, 255, 0.06));
|
var(--yj-border-subtle, rgba(255, 255, 255, 0.06));
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button:hover {
|
|
||||||
background: var(--yj-bg-hover, rgba(255, 255, 255, 0.12));
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button wa-icon {
|
.back-button wa-icon {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,15 +256,18 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 89x26 and 79x26 before this (#186). */
|
||||||
.search-mode-tab {
|
.search-mode-tab {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
background: none;
|
background: none;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
min-block-size: 44px;
|
||||||
padding: 5px 12px;
|
padding: 5px 12px;
|
||||||
font-size: var(--yj-text-sm);
|
font-size: var(--yj-text-sm);
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
@@ -289,7 +292,7 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
padding: 0 12px;
|
padding: 0 12px;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
height: 36px;
|
min-height: 44px;
|
||||||
max-width: 520px;
|
max-width: 520px;
|
||||||
transition: border-color 0.15s ease;
|
transition: border-color 0.15s ease;
|
||||||
}
|
}
|
||||||
@@ -364,8 +367,15 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The input measured 325x**18** and the box around it 36,
|
||||||
|
which is two faults rather than one (#186): the row was
|
||||||
|
under the floor, and the input did not fill it, so eight
|
||||||
|
of those pixels were not a target at all. The container
|
||||||
|
is 44 and the input stretches to it -- a tap anywhere in
|
||||||
|
the box now lands on the input rather than beside it. */
|
||||||
input {
|
input {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
align-self: stretch;
|
||||||
background: none;
|
background: none;
|
||||||
border: none;
|
border: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
@@ -379,15 +389,21 @@ export class ExploreView extends ViewLifecycleMixin(LitElement) implements Conte
|
|||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* No background until hover, so the target grows and the
|
||||||
|
glyph does not. It is inside a 44px box already, hence
|
||||||
|
the width alone. */
|
||||||
.clear-button {
|
.clear-button {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
align-self: stretch;
|
||||||
background: none;
|
background: none;
|
||||||
border: none;
|
border: none;
|
||||||
color: var(--yj-text-tertiary, #888);
|
color: var(--yj-text-tertiary, #888);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
min-inline-size: 44px;
|
||||||
|
margin-inline-end: -12px;
|
||||||
font-size: var(--yj-text-sm);
|
font-size: var(--yj-text-sm);
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { describeError } from '@utils/describe-error';
|
|||||||
import '@awesome.me/webawesome/dist/components/icon/icon.js';
|
import '@awesome.me/webawesome/dist/components/icon/icon.js';
|
||||||
import '@components/track-list/track-list.js';
|
import '@components/track-list/track-list.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { backButton } from '../../styles/back-button.css';
|
||||||
import { list } from '@utils/binding';
|
import { list } from '@utils/binding';
|
||||||
|
|
||||||
@customElement('genre-details')
|
@customElement('genre-details')
|
||||||
@@ -37,7 +38,7 @@ export class GenreDetails extends LitElement {
|
|||||||
private scanCompleteCleanup: (() => void) | null =
|
private scanCompleteCleanup: (() => void) | null =
|
||||||
null;
|
null;
|
||||||
|
|
||||||
static override styles = [designTokens, css`
|
static override styles = [designTokens, backButton, css`
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -77,31 +78,6 @@ export class GenreDetails extends LitElement {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(
|
|
||||||
--yj-bg-overlay,
|
|
||||||
rgba(255, 255, 255, 0.06)
|
|
||||||
);
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button:hover {
|
|
||||||
background: var(
|
|
||||||
--yj-bg-hover,
|
|
||||||
rgba(255, 255, 255, 0.12)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button wa-icon {
|
.back-button wa-icon {
|
||||||
font-size: 16px; /* back button — outside type scale */
|
font-size: 16px; /* back button — outside type scale */
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ export class HomeView extends ViewLifecycleMixin(LitElement) {
|
|||||||
* gated on the device having hover rather than on width. A
|
* gated on the device having hover rather than on width. A
|
||||||
* touch long-press synthesises a hover state in the WebView,
|
* touch long-press synthesises a hover state in the WebView,
|
||||||
* so on a phone it flashed into view during the 500ms hold
|
* so on a phone it flashed into view during the 500ms hold
|
||||||
* that utils/long-press.ts is measuring for a context menu —
|
* that utils/touch-gestures.ts is measuring for a long press —
|
||||||
* a control appearing because you were reaching for a
|
* a control appearing because you were reaching for a
|
||||||
* different one. A phone user taps the album and plays from
|
* different one. A phone user taps the album and plays from
|
||||||
* the detail view, so there is nothing to replace it with.
|
* the detail view, so there is nothing to replace it with.
|
||||||
|
|||||||
@@ -23,8 +23,14 @@ export class LibraryFilter extends LitElement {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 120x32 on the reference device (#186). This control has two
|
||||||
|
placements since #57 -- the desktop top bar and Settings ->
|
||||||
|
Libraries -- and it is the only route to setSelectedLibrary
|
||||||
|
in either, so it is one of the controls #148 argued must not
|
||||||
|
simply be taken away. It is one component, so it reaches the
|
||||||
|
floor in one place. */
|
||||||
select {
|
select {
|
||||||
height: 32px;
|
min-height: 44px;
|
||||||
padding: 0 8px;
|
padding: 0 8px;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
border: 1px solid
|
border: 1px solid
|
||||||
|
|||||||
@@ -105,6 +105,19 @@ export class NowPlayingView extends LitElement {
|
|||||||
color: var(--yj-text-secondary, #adb5bd);
|
color: var(--yj-text-secondary, #adb5bd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The art and the names are one block, so that a short
|
||||||
|
screen can lay them out side by side without either of them
|
||||||
|
knowing about the other's box. Vertically it is exactly what
|
||||||
|
the host used to do -- same gap, art flexible, names fixed --
|
||||||
|
so the tall layout is unchanged. */
|
||||||
|
.stack {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.75em;
|
||||||
|
flex: 1 1 auto;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.art {
|
.art {
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -113,38 +126,89 @@ export class NowPlayingView extends LitElement {
|
|||||||
min-height: 0;
|
min-height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.art img,
|
.art img {
|
||||||
.art .placeholder {
|
/* Square, and never larger than the room left over --
|
||||||
/* Square, and never taller than the room left over: the
|
where "square" is a property of what is painted and not
|
||||||
art is the one thing here that would happily push the
|
just of what was asked for.
|
||||||
transport off the bottom of a short phone.
|
|
||||||
|
|
||||||
**max-height is what actually keeps that promise**, and
|
The previous rule asked for a square and did not get
|
||||||
it was missing. With a definite width and
|
one. width: min(100%, 60vh) makes the width definite,
|
||||||
a 1:1 aspect-ratio the height is *derived from the width*
|
aspect-ratio: 1 derives the height from it, and
|
||||||
and is bounded by nothing: at the reference device's
|
max-height: 100% then clamps that height **without
|
||||||
424x439 that is a 263px square (60vh) in a box with far
|
re-deriving the width** -- which is how the
|
||||||
less than 263px left, so the art overflowed its own
|
aspect-ratio property is specified to behave, unlike
|
||||||
centred flex item and drew over the header above and the
|
an intrinsic ratio. So whenever the room left over was
|
||||||
title below it. The comment claimed this was handled;
|
shorter than the box was wide, the art was drawn as a
|
||||||
60vh is a bound on the *viewport*, not on the room left
|
letterbox strip and object-fit: cover cropped the
|
||||||
over, and those differ by however much chrome is above
|
cover to it. Measured on the reference device at
|
||||||
and below.
|
424x439: **264x53**, a 5:1 band of a square image.
|
||||||
|
|
||||||
Pre-existing -- screenshotted on main -- and made acute
|
That is not only the phone. The leftover exceeds the
|
||||||
by #56, which gives the transport 95px more than it had.
|
width only above ~843px of viewport, so every height
|
||||||
Found by reading a screenshot, which is the only tier
|
from ~500 to ~843 -- most phones, and any small window
|
||||||
that can see it: nothing fails, nothing overflows the
|
-- drew a cropped strip too.
|
||||||
*shell*, and every control is still hittable. */
|
|
||||||
width: min(100%, 60vh);
|
Both maxes with auto sizes is the fix, and it is the
|
||||||
|
replaced-element path rather than the aspect-ratio
|
||||||
|
one: the used size preserves the ratio under *both*
|
||||||
|
bounds (CSS2.1 10.4), so the art is square at every
|
||||||
|
height. Checked against Chrome 113 itself -- the
|
||||||
|
device's engine -- at column heights of 288, 300, 451,
|
||||||
|
600 and 800: square at all five, where the old rule
|
||||||
|
cropped at four.
|
||||||
|
|
||||||
|
A corollary worth knowing: auto will not upscale past
|
||||||
|
the image's natural size, and the largest tier
|
||||||
|
saveCoverArt keeps is 400px. Drawing it larger was
|
||||||
|
upscaling, so nothing is lost. */
|
||||||
|
max-width: 100%;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
|
width: auto;
|
||||||
|
height: auto;
|
||||||
aspect-ratio: 1;
|
aspect-ratio: 1;
|
||||||
object-fit: cover;
|
object-fit: cover;
|
||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
background-color: var(--yj-bg-elevated, #343a40);
|
background-color: var(--yj-bg-elevated, #343a40);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* The placeholder is not a replaced element, so it cannot use
|
||||||
|
the rule above: with no intrinsic size, auto/auto collapses
|
||||||
|
it to its icon -- measured at 13x58 in Chrome 113, which is
|
||||||
|
neither square nor the art's size.
|
||||||
|
|
||||||
|
So it is sized from the height, and then bounded by the
|
||||||
|
width in the one way a box like this can be. A non-replaced
|
||||||
|
element cannot express "the largest square that fits" in a
|
||||||
|
single rule: aspect-ratio derives the second axis from the
|
||||||
|
first, and whichever max clamps it does not re-derive the
|
||||||
|
other, which is the same trap the image rule above is about.
|
||||||
|
Driving it from the height alone is right until the column
|
||||||
|
is taller than it is wide -- ~843px of viewport, which is a
|
||||||
|
tall phone and #51's other named device -- and there it went
|
||||||
|
380x484.
|
||||||
|
|
||||||
|
max-height in viewport units is what closes it, and it is
|
||||||
|
sound here for the reason 60vh was not: this view is a
|
||||||
|
phone-width detail view, so its content box really is the
|
||||||
|
viewport less the host's own 1rem gutters. It is a *max*, so
|
||||||
|
the failure mode if that ever stopped being true is a square
|
||||||
|
bounded slightly early rather than a crop. rem and not em --
|
||||||
|
this box sets font-size: 3rem for the icon, so 2em here
|
||||||
|
would be 96px. */
|
||||||
.art .placeholder {
|
.art .placeholder {
|
||||||
|
height: 100%;
|
||||||
|
width: auto;
|
||||||
|
max-width: 100%;
|
||||||
|
max-height: calc(100vw - 2rem);
|
||||||
|
/* A flex item's automatic minimum is its content, so
|
||||||
|
without this the icon's own width becomes a floor and
|
||||||
|
the box goes wider than it is tall the moment the row is
|
||||||
|
shorter than the icon -- which is exactly the state a
|
||||||
|
job band puts this screen in. */
|
||||||
|
min-width: 0;
|
||||||
|
aspect-ratio: 1;
|
||||||
|
border-radius: 12px;
|
||||||
|
background-color: var(--yj-bg-elevated, #343a40);
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@@ -232,6 +296,60 @@ export class NowPlayingView extends LitElement {
|
|||||||
color: var(--yj-text-secondary, #adb5bd);
|
color: var(--yj-text-secondary, #adb5bd);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Below 500px of viewport the art and the names sit side by
|
||||||
|
side, and that is the whole of this screen's answer to a
|
||||||
|
short phone (#51).
|
||||||
|
|
||||||
|
The stacked layout cannot be rescued by sizing alone. Its
|
||||||
|
budget is fixed -- 48px of header, 143px of transport since
|
||||||
|
#64, 78px of names, 68px of padding and gaps -- so the art
|
||||||
|
gets height - 386, which on the reference device's 424x439
|
||||||
|
is **53px**. #172 measured 39px before #64 and named the
|
||||||
|
two options: give the art a floor and let the block scroll,
|
||||||
|
or reflow. A floor scrolls the transport off the bottom,
|
||||||
|
and "controls never scroll off" is #51's own Direction and
|
||||||
|
plan 018's promise -- so it is the reflow.
|
||||||
|
|
||||||
|
Sideways the art is bounded by the row's height rather than
|
||||||
|
by the column's leftover, which is the whole gain: the same
|
||||||
|
439px screen goes from a 53px sliver to **143px**, measured
|
||||||
|
on the device, with nothing scrolling and the transport
|
||||||
|
untouched.
|
||||||
|
|
||||||
|
500 is where the two layouts cross rather than a round
|
||||||
|
number. In a row the art is height - 296 and the names get
|
||||||
|
what is left of 392px, so the names hold 176px at exactly
|
||||||
|
500 and less above it; stacked, the art is height - 386,
|
||||||
|
which passes 176px at 562. Below 500 the row is the bigger
|
||||||
|
art *and* the readable one -- above it the column is, which
|
||||||
|
is why a tall phone (a Pixel 7's ~869) keeps the layout it
|
||||||
|
has. Unverified on that device: none was attached.
|
||||||
|
|
||||||
|
It is keyed on height alone, not on the phone's width,
|
||||||
|
because it is an answer to vertical room -- a 900x450 window
|
||||||
|
has the same problem and the same fix. */
|
||||||
|
@media (max-height: 500px) {
|
||||||
|
.stack {
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* A square of the row's height. The box has to carry the
|
||||||
|
ratio here rather than the image, because in a row the
|
||||||
|
art's width is what the ratio has to produce -- and the
|
||||||
|
image's own rule then fits it to a box that is already
|
||||||
|
square. */
|
||||||
|
.art {
|
||||||
|
flex: 0 1 auto;
|
||||||
|
height: 100%;
|
||||||
|
aspect-ratio: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.meta {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
`];
|
`];
|
||||||
|
|
||||||
private back() {
|
private back() {
|
||||||
@@ -283,55 +401,57 @@ export class NowPlayingView extends LitElement {
|
|||||||
return html`
|
return html`
|
||||||
${this.renderHeader()}
|
${this.renderHeader()}
|
||||||
|
|
||||||
<div class="art">
|
<div class="stack">
|
||||||
${art
|
<div class="art">
|
||||||
? html`<img
|
${art
|
||||||
src=${art}
|
? html`<img
|
||||||
alt=""
|
src=${art}
|
||||||
decoding="async"
|
alt=""
|
||||||
data-testid="npv-art"
|
decoding="async"
|
||||||
/>`
|
data-testid="npv-art"
|
||||||
: html`<div class="placeholder" aria-hidden="true">
|
/>`
|
||||||
<wa-icon name="compact-disc"></wa-icon>
|
: html`<div class="placeholder" aria-hidden="true">
|
||||||
</div>`}
|
<wa-icon name="compact-disc"></wa-icon>
|
||||||
</div>
|
</div>`}
|
||||||
|
|
||||||
<div class="meta">
|
|
||||||
<div class="names">
|
|
||||||
<h2 class="title" data-testid="npv-title">
|
|
||||||
${track.title || track.fileName}
|
|
||||||
</h2>
|
|
||||||
<p class="artist">
|
|
||||||
${creditLink(
|
|
||||||
creditStore.credits(track.recordingMbid),
|
|
||||||
track.artist,
|
|
||||||
track.artistMbid,
|
|
||||||
)}
|
|
||||||
</p>
|
|
||||||
${track.album
|
|
||||||
? html`<p class="album">
|
|
||||||
${albumLink(
|
|
||||||
track.album,
|
|
||||||
track.releaseGroupMbid,
|
|
||||||
undefined,
|
|
||||||
track.artist,
|
|
||||||
)}
|
|
||||||
</p>`
|
|
||||||
: nothing}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<div class="meta">
|
||||||
type="button"
|
<div class="names">
|
||||||
class="favorite ${favorited ? 'on' : ''}"
|
<h2 class="title" data-testid="npv-title">
|
||||||
data-testid="npv-favorite"
|
${track.title || track.fileName}
|
||||||
aria-pressed=${favorited ? 'true' : 'false'}
|
</h2>
|
||||||
aria-label=${favorited
|
<p class="artist">
|
||||||
? `Remove ${track.title} from ${this.favCtrl.playlistName}`
|
${creditLink(
|
||||||
: `Add ${track.title} to ${this.favCtrl.playlistName}`}
|
creditStore.credits(track.recordingMbid),
|
||||||
@click=${this.toggleFavorite}
|
track.artist,
|
||||||
>
|
track.artistMbid,
|
||||||
<wa-icon name=${this.favCtrl.iconFor(favorited)}></wa-icon>
|
)}
|
||||||
</button>
|
</p>
|
||||||
|
${track.album
|
||||||
|
? html`<p class="album">
|
||||||
|
${albumLink(
|
||||||
|
track.album,
|
||||||
|
track.releaseGroupMbid,
|
||||||
|
undefined,
|
||||||
|
track.artist,
|
||||||
|
)}
|
||||||
|
</p>`
|
||||||
|
: nothing}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="favorite ${favorited ? 'on' : ''}"
|
||||||
|
data-testid="npv-favorite"
|
||||||
|
aria-pressed=${favorited ? 'true' : 'false'}
|
||||||
|
aria-label=${favorited
|
||||||
|
? `Remove ${track.title} from ${this.favCtrl.playlistName}`
|
||||||
|
: `Add ${track.title} to ${this.favCtrl.playlistName}`}
|
||||||
|
@click=${this.toggleFavorite}
|
||||||
|
>
|
||||||
|
<wa-icon name=${this.favCtrl.iconFor(favorited)}></wa-icon>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="transport">
|
<div class="transport">
|
||||||
|
|||||||
@@ -298,6 +298,47 @@ export class PageHeader extends LitElement {
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Every control in this header meets the app's 44px touch
|
||||||
|
floor -- the number #56 set for the transport and the
|
||||||
|
queue header already keeps (#186).
|
||||||
|
|
||||||
|
It is min-size rather than padding with a negative
|
||||||
|
margin, which is what the seek bar needed (#187), and
|
||||||
|
the difference is worth stating because it decides
|
||||||
|
whether targets can collide. There the painted track had
|
||||||
|
to stay thin, so the target was grown past its own box
|
||||||
|
and had to be checked against its neighbours. Here the
|
||||||
|
control *is* the target: the boxes are flex items, so
|
||||||
|
the gap keeps them apart and no two can overlap by
|
||||||
|
construction.
|
||||||
|
|
||||||
|
There is no phone branch. With the target being the box,
|
||||||
|
a 44px control on a desktop is merely large, and a
|
||||||
|
second declaration of what a phone shows is a second
|
||||||
|
thing to keep in step -- which is the reason this
|
||||||
|
component has never had one. It also avoids a media
|
||||||
|
query that no tier here renders, which is exactly how
|
||||||
|
the seek bar's phone rule came to be dead for months.
|
||||||
|
|
||||||
|
**The height is the box and the width is not**, and that
|
||||||
|
asymmetry is the whole of what the overflow fit below
|
||||||
|
cares about. That pass measures inline size, so a taller
|
||||||
|
control costs it nothing and a wider one costs it
|
||||||
|
directly. Growing the two square controls to 44px wide
|
||||||
|
added 22px, which fits at every width Chromium was
|
||||||
|
checked at and clipped the overflow trigger at 320px in
|
||||||
|
**WebKit** -- the engine closest to what actually ships,
|
||||||
|
and the one no machine here can run. So the horizontal
|
||||||
|
half is padding with the margin cancelling it, which is
|
||||||
|
what the issue asked for in the first place: the target
|
||||||
|
grows and the layout does not.
|
||||||
|
|
||||||
|
The cost is that a horizontal target can now overlap a
|
||||||
|
neighbour, which the box version could not. The arrow's
|
||||||
|
is deliberately lopsided for the seek bar's reason
|
||||||
|
(#187): the select is 6px to its left and there is open
|
||||||
|
space to its right, so it takes the side with nothing to
|
||||||
|
steal from. */
|
||||||
.sort select {
|
.sort select {
|
||||||
font: inherit;
|
font: inherit;
|
||||||
color: inherit;
|
color: inherit;
|
||||||
@@ -306,6 +347,7 @@ export class PageHeader extends LitElement {
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
padding: 3px 6px;
|
padding: 3px 6px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sort-dir {
|
.sort-dir {
|
||||||
@@ -318,6 +360,18 @@ export class PageHeader extends LitElement {
|
|||||||
color: inherit;
|
color: inherit;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 3px 5px;
|
padding: 3px 5px;
|
||||||
|
/* 28x21 before this, the smallest control in the
|
||||||
|
header and the only one that failed the floor in
|
||||||
|
both directions.
|
||||||
|
|
||||||
|
Vertically the box grows, because the header has the
|
||||||
|
room and nothing measures it. Horizontally the box
|
||||||
|
must not: 28 + 2 + 14 is a 44px target over a 28px
|
||||||
|
layout box, weighted right because the select is 6px
|
||||||
|
to the left. */
|
||||||
|
min-block-size: 44px;
|
||||||
|
padding-inline: 5px 21px;
|
||||||
|
margin-inline: 0 -16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sort-dir:hover {
|
.sort-dir:hover {
|
||||||
@@ -377,10 +431,20 @@ export class PageHeader extends LitElement {
|
|||||||
gap: 6px;
|
gap: 6px;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
justify-content: center;
|
||||||
|
min-block-size: 44px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.more-button {
|
.more-button {
|
||||||
padding: 6px 10px;
|
padding: 6px 10px;
|
||||||
|
/* 38x27, and it is the route to every collapsed
|
||||||
|
action, so it is the last control that should be
|
||||||
|
hard to hit -- and the one WebKit clipped at 320px
|
||||||
|
when this was 6px wider as a box. 38 + 3 + 3 is a
|
||||||
|
44px target over a 38px layout box; the actions row
|
||||||
|
has an 8px gap, so this one can be symmetric. */
|
||||||
|
padding-inline: 13px;
|
||||||
|
margin-inline: -3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The display: flex above outranks the UA stylesheet's
|
/* The display: flex above outranks the UA stylesheet's
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ import {
|
|||||||
} from '@utils/context-menu-controller.js';
|
} from '@utils/context-menu-controller.js';
|
||||||
import type { ContextMenuHost, MenuTarget } from '@utils/context-menu-controller.js';
|
import type { ContextMenuHost, MenuTarget } from '@utils/context-menu-controller.js';
|
||||||
import { focusRovingRow, nextRovingIndex } from '@utils/roving-rows';
|
import { focusRovingRow, nextRovingIndex } from '@utils/roving-rows';
|
||||||
|
import type { GestureEvent } from '@utils/touch-gestures';
|
||||||
|
import { SwipeToQueue, swipeRevealStyles } from '@utils/swipe-to-queue';
|
||||||
|
import '@components/selection-bar/selection-bar';
|
||||||
|
import type { SelectionAction } from '@components/selection-bar/selection-bar';
|
||||||
import { FavoritesController } from '@store/controllers/favorites-controller';
|
import { FavoritesController } from '@store/controllers/favorites-controller';
|
||||||
import { notificationStore } from '@store/notification-store';
|
import { notificationStore } from '@store/notification-store';
|
||||||
import { describeError } from '@utils/describe-error';
|
import { describeError } from '@utils/describe-error';
|
||||||
@@ -71,10 +75,14 @@ import {
|
|||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
} from '@utils/explore-link';
|
} from '@utils/explore-link';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { srOnly } from '../../styles/sr-only.css';
|
||||||
|
import { backButton } from '../../styles/back-button.css';
|
||||||
import { list } from '@utils/binding';
|
import { list } from '@utils/binding';
|
||||||
import {
|
import {
|
||||||
|
ICON_PLAY,
|
||||||
ICON_PLAYLIST,
|
ICON_PLAYLIST,
|
||||||
ICON_QUEUE,
|
ICON_QUEUE,
|
||||||
|
ICON_REMOVE,
|
||||||
} from '@utils/icon-language';
|
} from '@utils/icon-language';
|
||||||
|
|
||||||
/** One playlist row: the track and its position in the *playlist*,
|
/** One playlist row: the track and its position in the *playlist*,
|
||||||
@@ -421,6 +429,127 @@ export class PlaylistDetails
|
|||||||
queueStore.setQueue(filePaths, trackIndex, false, { type: 'playlist', id: this.playlistId, label: this.playlistName });
|
queueStore.setQueue(filePaths, trackIndex, false, { type: 'playlist', id: this.playlistId, label: this.playlistName });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// A finger on a playlist row (plan 019 phase 3, #63)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
/** The row an announced gesture is on, with its track. */
|
||||||
|
private rowFromGesture(
|
||||||
|
e: Event,
|
||||||
|
): { index: number; track: playlist.Track } | null {
|
||||||
|
const row = (e.target as HTMLElement).closest(
|
||||||
|
'.track-item',
|
||||||
|
) as HTMLElement | null;
|
||||||
|
|
||||||
|
if (!row) return null;
|
||||||
|
|
||||||
|
const index = Number(row.dataset.index);
|
||||||
|
const track = this.tracks[index];
|
||||||
|
|
||||||
|
if (Number.isNaN(index) || !track) return null;
|
||||||
|
|
||||||
|
return { index, track };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A tap plays the playlist from that row.
|
||||||
|
*
|
||||||
|
* The same thing a double-click does, which is the rule the whole
|
||||||
|
* app follows: activating one row plays the list the row is in,
|
||||||
|
* from that row, rather than a queue of one that stops when the
|
||||||
|
* song ends.
|
||||||
|
*/
|
||||||
|
private onRowTap = (e: GestureEvent) => {
|
||||||
|
const hit = this.rowFromGesture(e);
|
||||||
|
|
||||||
|
if (!hit) return;
|
||||||
|
|
||||||
|
if (this.selection.selectionMode) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.selection.toggleInMode(String(hit.index), hit.index);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A missing file has nothing to play, so the tap is left
|
||||||
|
// unclaimed and falls through to the click that selects it --
|
||||||
|
// which is what a mouse does here and the only useful thing a
|
||||||
|
// phantom row can answer.
|
||||||
|
if (hit.track.Phantom) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.handleTrackDblClick(hit.index);
|
||||||
|
};
|
||||||
|
|
||||||
|
private onRowLongPress = (e: GestureEvent) => {
|
||||||
|
const hit = this.rowFromGesture(e);
|
||||||
|
|
||||||
|
if (!hit) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.selection.enterSelectionMode(String(hit.index), hit.index);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Swipe a row right to queue it.
|
||||||
|
*
|
||||||
|
* `track-list`'s rule, one list over: one row is a position and
|
||||||
|
* several rows are an explicit choice, and a swipe never changes
|
||||||
|
* the selection it reads.
|
||||||
|
*/
|
||||||
|
private swipe = new SwipeToQueue(this, {
|
||||||
|
resolve: (e) => {
|
||||||
|
const hit = this.rowFromGesture(e);
|
||||||
|
|
||||||
|
// A phantom has no file to queue, so there is nothing for
|
||||||
|
// the reveal to promise.
|
||||||
|
if (!hit || hit.track.Phantom) return null;
|
||||||
|
|
||||||
|
const selected = this.selection.getSelectedIndices();
|
||||||
|
const many =
|
||||||
|
selected.length > 1 && selected.includes(hit.index);
|
||||||
|
const filePaths = many
|
||||||
|
? this.getSelectedFilePaths()
|
||||||
|
: [hit.track.FilePath];
|
||||||
|
|
||||||
|
return { index: hit.index, filePaths, label: hit.track.Title };
|
||||||
|
},
|
||||||
|
repaint: () => this.virtualizer?.requestUpdate(),
|
||||||
|
});
|
||||||
|
|
||||||
|
/** The three worth a thumb; the sheet behind "More" is the rest. */
|
||||||
|
private static readonly SELECTION_ACTIONS: SelectionAction[] = [
|
||||||
|
{ id: 'play', label: 'Play', icon: ICON_PLAY },
|
||||||
|
{ id: 'add-to-queue', label: 'Add to queue', icon: ICON_QUEUE },
|
||||||
|
{ id: 'remove', label: 'Remove', icon: ICON_REMOVE, danger: true },
|
||||||
|
];
|
||||||
|
|
||||||
|
private renderSelectionBar() {
|
||||||
|
if (!this.selection.selectionMode) return nothing;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<selection-bar
|
||||||
|
.count=${this.selection.selectionCount}
|
||||||
|
.actions=${PlaylistDetails.SELECTION_ACTIONS}
|
||||||
|
@selection-exit=${this.onSelectionExit}
|
||||||
|
@selection-action=${(e: CustomEvent<{ id: string }>) =>
|
||||||
|
this.onContextMenuAction(e.detail.id)}
|
||||||
|
@selection-more=${(e: CustomEvent<{ x: number; y: number }>) =>
|
||||||
|
this.ctxMenu.openAt(e.detail.x, e.detail.y)}
|
||||||
|
></selection-bar>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private onSelectionExit = () => {
|
||||||
|
this.selection.exitSelectionMode();
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
private handleTrackContextMenu(
|
private handleTrackContextMenu(
|
||||||
e: MouseEvent,
|
e: MouseEvent,
|
||||||
trackIndex: number,
|
trackIndex: number,
|
||||||
@@ -954,8 +1083,11 @@ export class PlaylistDetails
|
|||||||
|
|
||||||
static override styles = [
|
static override styles = [
|
||||||
designTokens,
|
designTokens,
|
||||||
|
srOnly,
|
||||||
|
backButton,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
|
swipeRevealStyles,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -981,31 +1113,6 @@ export class PlaylistDetails
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(
|
|
||||||
--yj-bg-overlay,
|
|
||||||
rgba(255, 255, 255, 0.06)
|
|
||||||
);
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button:hover {
|
|
||||||
background: var(
|
|
||||||
--yj-bg-hover,
|
|
||||||
rgba(255, 255, 255, 0.12)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button wa-icon {
|
.back-button wa-icon {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
@@ -1159,6 +1266,9 @@ export class PlaylistDetails
|
|||||||
.track-item {
|
.track-item {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
/* The swipe reveal is absolute inside the row. */
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.track-header {
|
.track-header {
|
||||||
@@ -1456,6 +1566,9 @@ export class PlaylistDetails
|
|||||||
<div class="header-cell col-album">Album</div>
|
<div class="header-cell col-album">Album</div>
|
||||||
<div class="header-cell col-duration">Duration</div>
|
<div class="header-cell col-duration">Duration</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="sr-only" role="status" aria-live="polite">
|
||||||
|
${this.swipe.announcement}
|
||||||
|
</div>
|
||||||
<lit-virtualizer
|
<lit-virtualizer
|
||||||
class="track-scroller"
|
class="track-scroller"
|
||||||
role="listbox"
|
role="listbox"
|
||||||
@@ -1465,7 +1578,13 @@ export class PlaylistDetails
|
|||||||
.renderItem=${this.renderRow}
|
.renderItem=${this.renderRow}
|
||||||
.keyFunction=${this.rowKey}
|
.keyFunction=${this.rowKey}
|
||||||
.layout=${this.flowLayout}
|
.layout=${this.flowLayout}
|
||||||
|
@yj-tap=${this.onRowTap}
|
||||||
|
@yj-long-press=${this.onRowLongPress}
|
||||||
|
@yj-swipe-start=${this.swipe.onSwipeStart}
|
||||||
|
@yj-swipe-move=${this.swipe.onSwipeMove}
|
||||||
|
@yj-swipe-end=${this.swipe.onSwipeEnd}
|
||||||
></lit-virtualizer>
|
></lit-virtualizer>
|
||||||
|
${this.renderSelectionBar()}
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1487,6 +1606,7 @@ export class PlaylistDetails
|
|||||||
active ? 'active' : '',
|
active ? 'active' : '',
|
||||||
selected ? 'selected' : '',
|
selected ? 'selected' : '',
|
||||||
isPhantom ? 'phantom' : '',
|
isPhantom ? 'phantom' : '',
|
||||||
|
this.swipe.isSwiping(trackIndex) ? 'swiping' : '',
|
||||||
]
|
]
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
.join(' ');
|
.join(' ');
|
||||||
@@ -1497,6 +1617,7 @@ export class PlaylistDetails
|
|||||||
role="option"
|
role="option"
|
||||||
aria-selected=${selected}
|
aria-selected=${selected}
|
||||||
data-index=${trackIndex}
|
data-index=${trackIndex}
|
||||||
|
data-swipe
|
||||||
tabindex=${trackIndex === this.focusedIndex ? 0 : -1}
|
tabindex=${trackIndex === this.focusedIndex ? 0 : -1}
|
||||||
@keydown=${(e: KeyboardEvent) =>
|
@keydown=${(e: KeyboardEvent) =>
|
||||||
this.onRowKeydown(e, trackIndex)}
|
this.onRowKeydown(e, trackIndex)}
|
||||||
@@ -1543,6 +1664,7 @@ export class PlaylistDetails
|
|||||||
? nothing
|
? nothing
|
||||||
: this.onTrackDragEnd}
|
: this.onTrackDragEnd}
|
||||||
>
|
>
|
||||||
|
${this.swipe.renderReveal(trackIndex)}
|
||||||
${isPhantom
|
${isPhantom
|
||||||
? html`<div
|
? html`<div
|
||||||
class="phantom-row"
|
class="phantom-row"
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import type { MenuSurface } from '../menu-surface/menu-surface';
|
|||||||
import '../menu-surface/menu-surface';
|
import '../menu-surface/menu-surface';
|
||||||
import '@awesome.me/webawesome/dist/components/dropdown-item/dropdown-item.js';
|
import '@awesome.me/webawesome/dist/components/dropdown-item/dropdown-item.js';
|
||||||
import { QueueController } from '@store/controllers/queue-controller';
|
import { QueueController } from '@store/controllers/queue-controller';
|
||||||
|
import { PHONE_QUERY } from '@utils/breakpoints';
|
||||||
import { creditStore } from '@store/credit-store';
|
import { creditStore } from '@store/credit-store';
|
||||||
import {
|
import {
|
||||||
describeQueueSource,
|
describeQueueSource,
|
||||||
@@ -63,9 +64,14 @@ import {
|
|||||||
} from '@utils/explore-link';
|
} from '@utils/explore-link';
|
||||||
import {
|
import {
|
||||||
ICON_NEW,
|
ICON_NEW,
|
||||||
|
ICON_PLAY,
|
||||||
ICON_PLAYLIST,
|
ICON_PLAYLIST,
|
||||||
ICON_QUEUE,
|
ICON_QUEUE,
|
||||||
|
ICON_REMOVE,
|
||||||
} from '@utils/icon-language';
|
} from '@utils/icon-language';
|
||||||
|
import type { GestureEvent } from '@utils/touch-gestures';
|
||||||
|
import '@components/selection-bar/selection-bar';
|
||||||
|
import type { SelectionAction } from '@components/selection-bar/selection-bar';
|
||||||
/** Above this many tracks, clearing the queue asks first. */
|
/** Above this many tracks, clearing the queue asks first. */
|
||||||
const CLEAR_CONFIRM_THRESHOLD = 20;
|
const CLEAR_CONFIRM_THRESHOLD = 20;
|
||||||
|
|
||||||
@@ -120,6 +126,25 @@ export class QueuePanel
|
|||||||
@property({ type: Boolean, reflect: true })
|
@property({ type: Boolean, reflect: true })
|
||||||
overlay = false;
|
overlay = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Phone width, from `matchMedia` rather than from a media query,
|
||||||
|
* because it decides whether the scrim *exists* (#171) —
|
||||||
|
* `job-band`'s rule, and a stylesheet cannot express it: a
|
||||||
|
* `display: none` scrim is still an element with a click handler.
|
||||||
|
*
|
||||||
|
* Below 600px the panel spans the whole content area, so the scrim
|
||||||
|
* has no uncovered pixels: measured at 424x439, host, panel and
|
||||||
|
* scrim are all 424x318 with the scrim entirely underneath. It dims
|
||||||
|
* nothing and dismisses nothing there, and the queue is a *screen*
|
||||||
|
* at that width anyway (#55) — back and a 44px close button are its
|
||||||
|
* ways out. Between 600 and 899 the panel is a 320px column of a
|
||||||
|
* wider content area, the scrim is reachable, and #24's
|
||||||
|
* tap-outside-to-close is real; that band is untouched.
|
||||||
|
*/
|
||||||
|
@state() private phone = false;
|
||||||
|
|
||||||
|
private phoneQuery?: MediaQueryList;
|
||||||
|
|
||||||
@state()
|
@state()
|
||||||
private isDragging = false;
|
private isDragging = false;
|
||||||
|
|
||||||
@@ -391,6 +416,8 @@ export class QueuePanel
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Overlay only, and above 600px only -- see the phone field,
|
||||||
|
which is where that half is decided (#171). */
|
||||||
.scrim {
|
.scrim {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
@@ -414,10 +441,10 @@ export class QueuePanel
|
|||||||
|
|
||||||
/* A screen's way out has to be hittable with a thumb.
|
/* A screen's way out has to be hittable with a thumb.
|
||||||
Measured at 424x439 before #55: these were **25x21px**,
|
Measured at 424x439 before #55: these were **25x21px**,
|
||||||
and with the panel spanning the whole width the scrim
|
and with the panel spanning the whole width there is no
|
||||||
underneath has no uncovered pixels at all -- so it was
|
scrim here at all (#171) -- so this is the only pointer
|
||||||
the only pointer route out of a full-screen surface.
|
route out of a full-screen surface. Back answers it now
|
||||||
Back answers it now as well, which is the other half.
|
as well, which is the other half.
|
||||||
|
|
||||||
Sized only in overlay mode: inline these sit in a 320px
|
Sized only in overlay mode: inline these sit in a 320px
|
||||||
column beside the content, where a mouse is what reaches
|
column beside the content, where a mouse is what reaches
|
||||||
@@ -639,23 +666,42 @@ export class QueuePanel
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The per-row remove is a hover affordance, and on a device
|
||||||
|
* without hover it is redundant rather than missing: the row's
|
||||||
|
* context menu is a bottom sheet since #60 and carries "Remove
|
||||||
|
* from Queue", so the action is one long-press away. An
|
||||||
|
* always-visible X would instead spend part of a 424px row on
|
||||||
|
* something already reachable. #68's treatment, for #68's reason.
|
||||||
|
*
|
||||||
|
* display:none outside the query rather than visibility:hidden:
|
||||||
|
* a hidden button still occupies its hit area and is still in
|
||||||
|
* the accessibility tree, so a phone would keep a target for a
|
||||||
|
* control it can never see.
|
||||||
|
*/
|
||||||
.remove-button {
|
.remove-button {
|
||||||
background: none;
|
display: none;
|
||||||
border: none;
|
|
||||||
color: var(--yj-text-tertiary, #888);
|
|
||||||
cursor: pointer;
|
|
||||||
padding: 4px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
visibility: hidden;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.track-item:hover .remove-button {
|
@media (hover: hover) and (pointer: fine) {
|
||||||
visibility: visible;
|
.remove-button {
|
||||||
}
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--yj-text-tertiary, #888);
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 4px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.remove-button:hover {
|
.track-item:hover .remove-button {
|
||||||
color: var(--yj-error-text, #ff8787);
|
visibility: visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
.remove-button:hover {
|
||||||
|
color: var(--yj-error-text, #ff8787);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.list-area.drag-over {
|
.list-area.drag-over {
|
||||||
@@ -803,6 +849,8 @@ export class QueuePanel
|
|||||||
virtEl.addEventListener('dragstart', this.onDelegatedDragStart);
|
virtEl.addEventListener('dragstart', this.onDelegatedDragStart);
|
||||||
virtEl.addEventListener('dragend', this.onTrackDragEnd);
|
virtEl.addEventListener('dragend', this.onTrackDragEnd);
|
||||||
virtEl.addEventListener('keydown', this.onDelegatedKeydown);
|
virtEl.addEventListener('keydown', this.onDelegatedKeydown);
|
||||||
|
virtEl.addEventListener('yj-tap', this.onRowTap);
|
||||||
|
virtEl.addEventListener('yj-long-press', this.onRowLongPress);
|
||||||
this.delegationAttached = true;
|
this.delegationAttached = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -828,6 +876,12 @@ export class QueuePanel
|
|||||||
// desktop width rather than the minimum.
|
// desktop width rather than the minimum.
|
||||||
this.updateOverlayMode();
|
this.updateOverlayMode();
|
||||||
|
|
||||||
|
// Read here rather than in a field initialiser, so a test can
|
||||||
|
// install its own matchMedia before the element is created.
|
||||||
|
this.phoneQuery = window.matchMedia?.(PHONE_QUERY);
|
||||||
|
this.phone = this.phoneQuery?.matches ?? false;
|
||||||
|
this.phoneQuery?.addEventListener('change', this.onPhoneMedia);
|
||||||
|
|
||||||
if (this.parentElement) {
|
if (this.parentElement) {
|
||||||
this.spaceObserver = new ResizeObserver(() =>
|
this.spaceObserver = new ResizeObserver(() =>
|
||||||
this.updateOverlayMode(),
|
this.updateOverlayMode(),
|
||||||
@@ -870,6 +924,8 @@ export class QueuePanel
|
|||||||
this.creditsUnsub = undefined;
|
this.creditsUnsub = undefined;
|
||||||
this.spaceObserver?.disconnect();
|
this.spaceObserver?.disconnect();
|
||||||
this.spaceObserver = undefined;
|
this.spaceObserver = undefined;
|
||||||
|
this.phoneQuery?.removeEventListener('change', this.onPhoneMedia);
|
||||||
|
this.phoneQuery = undefined;
|
||||||
document.removeEventListener('keydown', this.onOverlayKeydown);
|
document.removeEventListener('keydown', this.onOverlayKeydown);
|
||||||
document.removeEventListener(
|
document.removeEventListener(
|
||||||
'mousemove',
|
'mousemove',
|
||||||
@@ -913,6 +969,8 @@ export class QueuePanel
|
|||||||
virtEl.removeEventListener('dragstart', this.onDelegatedDragStart);
|
virtEl.removeEventListener('dragstart', this.onDelegatedDragStart);
|
||||||
virtEl.removeEventListener('dragend', this.onTrackDragEnd);
|
virtEl.removeEventListener('dragend', this.onTrackDragEnd);
|
||||||
virtEl.removeEventListener('keydown', this.onDelegatedKeydown);
|
virtEl.removeEventListener('keydown', this.onDelegatedKeydown);
|
||||||
|
virtEl.removeEventListener('yj-tap', this.onRowTap);
|
||||||
|
virtEl.removeEventListener('yj-long-press', this.onRowLongPress);
|
||||||
}
|
}
|
||||||
this.delegationAttached = false;
|
this.delegationAttached = false;
|
||||||
}
|
}
|
||||||
@@ -936,6 +994,10 @@ export class QueuePanel
|
|||||||
this.overlay = available - this.panelWidth < MAIN_PANEL_FLOOR;
|
this.overlay = available - this.panelWidth < MAIN_PANEL_FLOOR;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private onPhoneMedia = (e: MediaQueryListEvent): void => {
|
||||||
|
this.phone = e.matches;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Escape closes a scrimmed overlay, which is the one keyboard rule
|
* Escape closes a scrimmed overlay, which is the one keyboard rule
|
||||||
* every dialog in this app already follows.
|
* every dialog in this app already follows.
|
||||||
@@ -1194,6 +1256,92 @@ export class QueuePanel
|
|||||||
this.queue.playAtIndex(index);
|
this.queue.playAtIndex(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// A finger on a queue row (plan 019 phase 3, #63)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A tap plays this position in the queue.
|
||||||
|
*
|
||||||
|
* `track-list`'s tap sets the queue to the list it was made in;
|
||||||
|
* copying that here would rebuild the queue from the queue, which
|
||||||
|
* is not the no-op it looks like -- it would discard the queue's
|
||||||
|
* source, its shuffle order and everything a user had inserted by
|
||||||
|
* hand. `playAtIndex` is what a double-click already does, and it
|
||||||
|
* is what a tap means.
|
||||||
|
*/
|
||||||
|
private onRowTap = (e: GestureEvent) => {
|
||||||
|
const idx = this.resolveTrackIndexFromEvent(e);
|
||||||
|
|
||||||
|
if (idx === null) return;
|
||||||
|
|
||||||
|
// A control inside the row owns its own tap -- the same rule
|
||||||
|
// the shortcut service has for a focused control that owns a
|
||||||
|
// key. The remove button is the one here.
|
||||||
|
if ((e.target as HTMLElement).closest('.remove-button')) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
// The roving tab stop follows the finger, or Tab returns to
|
||||||
|
// wherever the arrows last were rather than to the row that was
|
||||||
|
// just touched.
|
||||||
|
this.focusedIndex = idx;
|
||||||
|
|
||||||
|
if (this.selection.selectionMode) {
|
||||||
|
this.selection.toggleInMode(String(idx), idx);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.selection.clear();
|
||||||
|
this.queue.playAtIndex(idx);
|
||||||
|
};
|
||||||
|
|
||||||
|
private onRowLongPress = (e: GestureEvent) => {
|
||||||
|
const idx = this.resolveTrackIndexFromEvent(e);
|
||||||
|
|
||||||
|
if (idx === null) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = idx;
|
||||||
|
this.selection.enterSelectionMode(String(idx), idx);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The two worth a thumb, and "More" for the rest.
|
||||||
|
*
|
||||||
|
* Remove is here rather than left to the overflow because it is
|
||||||
|
* what a selection in a *queue* is most often made for, and it is
|
||||||
|
* the action the row's own × offers one row at a time.
|
||||||
|
*/
|
||||||
|
private static readonly SELECTION_ACTIONS: SelectionAction[] = [
|
||||||
|
{ id: 'play', label: 'Play', icon: ICON_PLAY },
|
||||||
|
{ id: 'remove', label: 'Remove', icon: ICON_REMOVE, danger: true },
|
||||||
|
];
|
||||||
|
|
||||||
|
private renderSelectionBar() {
|
||||||
|
if (!this.selection.selectionMode) return nothing;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<selection-bar
|
||||||
|
.count=${this.selection.selectionCount}
|
||||||
|
.actions=${QueuePanel.SELECTION_ACTIONS}
|
||||||
|
@selection-exit=${this.onSelectionExit}
|
||||||
|
@selection-action=${(e: CustomEvent<{ id: string }>) =>
|
||||||
|
this.onContextMenuAction(e.detail.id)}
|
||||||
|
@selection-more=${(e: CustomEvent<{ x: number; y: number }>) =>
|
||||||
|
this.ctxMenu.openAt(e.detail.x, e.detail.y)}
|
||||||
|
></selection-bar>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private onSelectionExit = () => {
|
||||||
|
this.selection.exitSelectionMode();
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
private handleTrackContextMenu(
|
private handleTrackContextMenu(
|
||||||
e: MouseEvent,
|
e: MouseEvent,
|
||||||
index: number,
|
index: number,
|
||||||
@@ -1972,7 +2120,7 @@ export class QueuePanel
|
|||||||
const tracks = this.queue.tracks;
|
const tracks = this.queue.tracks;
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
${this.overlay
|
${this.overlay && !this.phone
|
||||||
? html`<div
|
? html`<div
|
||||||
class="scrim"
|
class="scrim"
|
||||||
part="scrim"
|
part="scrim"
|
||||||
@@ -2104,6 +2252,7 @@ export class QueuePanel
|
|||||||
></lit-virtualizer>
|
></lit-virtualizer>
|
||||||
`}
|
`}
|
||||||
</div>
|
</div>
|
||||||
|
${this.renderSelectionBar()}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<menu-surface
|
<menu-surface
|
||||||
|
|||||||
@@ -61,11 +61,32 @@ export class SearchTrigger extends LitElement {
|
|||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
/* The smallest a touch target should be. The header's
|
/* The app's touch floor, from #56 -- and this is the
|
||||||
own action buttons are smaller because they carry a
|
control that should least have to argue for it: #57
|
||||||
label; this one is a glyph. */
|
created it as the phone's replacement for the header
|
||||||
min-width: 40px;
|
search box, so it exists *only* where there is a
|
||||||
min-height: 40px;
|
thumb.
|
||||||
|
|
||||||
|
It shipped at 40px under a comment calling that "the
|
||||||
|
smallest a touch target should be", which was the
|
||||||
|
floor being restated four pixels short rather than a
|
||||||
|
second opinion about it (#186). The rest of that
|
||||||
|
comment said the header's own action buttons are
|
||||||
|
smaller because they carry a label; they are 44px
|
||||||
|
now too, so that no longer distinguishes anything.
|
||||||
|
|
||||||
|
The extra width is a target rather than a box, for
|
||||||
|
page-header's reason: this button sits in that
|
||||||
|
header, whose overflow fit (#69) measures inline
|
||||||
|
size, and four pixels there is four pixels the
|
||||||
|
trigger for every collapsed action does not get at
|
||||||
|
320px. Height is free -- nothing measures it. */
|
||||||
|
min-width: 44px;
|
||||||
|
min-height: 44px;
|
||||||
|
/* Border-box, so the 44 above is the whole target and
|
||||||
|
the margin is what hands the four extra pixels back
|
||||||
|
to the row. */
|
||||||
|
margin-inline: -2px;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
background: none;
|
background: none;
|
||||||
border: 1px solid var(--yj-border-subtle, #555);
|
border: 1px solid var(--yj-border-subtle, #555);
|
||||||
|
|||||||
@@ -0,0 +1,218 @@
|
|||||||
|
import { LitElement, html, css, nothing } from 'lit';
|
||||||
|
import { customElement, property } from 'lit/decorators.js';
|
||||||
|
import '@awesome.me/webawesome/dist/components/icon/icon.js';
|
||||||
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { ICON_MORE_ACTIONS } from '@utils/icon-language';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What a selection can have done to it, while a finger is holding one.
|
||||||
|
*
|
||||||
|
* This is the context menu (plan 019, #63). Not a second surface
|
||||||
|
* beside it — the same actions, contextualised to whatever is
|
||||||
|
* selected, in the shape Android puts them in.
|
||||||
|
*
|
||||||
|
* #63 asked for a double tap to open the menu instead. That mapping
|
||||||
|
* costs the app's primary interaction 250ms on every play, because the
|
||||||
|
* first tap of a double tap is indistinguishable from a single tap
|
||||||
|
* until the interval expires, and playing a track is ~100ms end to end
|
||||||
|
* on the reference device. So there is no double tap: a long press
|
||||||
|
* selects, this says what can be done, and the sheet behind "More" is
|
||||||
|
* the same `menu-surface` every other menu in the app opens.
|
||||||
|
*
|
||||||
|
* Four things about it are load-bearing.
|
||||||
|
*
|
||||||
|
* **It is presentational.** It takes a count and a list of actions and
|
||||||
|
* emits `selection-action` / `selection-exit`; it holds no selection
|
||||||
|
* and calls no store. The host already owns a `SelectionController`
|
||||||
|
* and an action handler, and a bar that reached for either would be a
|
||||||
|
* second definition of what "play the selection" means — the fault
|
||||||
|
* `utils/library-status.ts` exists to have fixed one feature over.
|
||||||
|
*
|
||||||
|
* **The bar is only what fits, and "More" is the rest.** A context
|
||||||
|
* menu can be nine items because it is a sheet; a bar is one row on a
|
||||||
|
* 424px screen. So the host passes the two or three worth a thumb and
|
||||||
|
* the overflow opens the menu it already renders, which is what keeps
|
||||||
|
* every action reachable at every size — plan 018's promise, and the
|
||||||
|
* reason this cannot simply drop the long tail.
|
||||||
|
*
|
||||||
|
* **Its controls are 44px** (#56, #186), and the count is a live
|
||||||
|
* region: the number changes under the user's finger as they tap rows,
|
||||||
|
* and nothing else on screen announces it.
|
||||||
|
*
|
||||||
|
* **Escape leaves the mode, from here rather than from each host.**
|
||||||
|
* This element exists only while the mode does, so it is the one place
|
||||||
|
* a dismissal can be attached and detached with the thing it
|
||||||
|
* dismisses. It is the same exception the overlaid queue's Escape is.
|
||||||
|
*
|
||||||
|
* **It renders nothing at zero.** The mode ends when the last row is
|
||||||
|
* deselected — `SelectionController.toggleInMode` is where that is
|
||||||
|
* decided — so a bar with a count of none is a state this should never
|
||||||
|
* be asked to draw, and drawing it anyway would hide the fact that it
|
||||||
|
* has been.
|
||||||
|
*/
|
||||||
|
export interface SelectionAction {
|
||||||
|
id: string;
|
||||||
|
label: string;
|
||||||
|
icon: string;
|
||||||
|
danger?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
@customElement('selection-bar')
|
||||||
|
export class SelectionBar extends LitElement {
|
||||||
|
static override styles = [
|
||||||
|
designTokens,
|
||||||
|
css`
|
||||||
|
:host {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bar {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.25em;
|
||||||
|
padding: 0.25em 0.5em;
|
||||||
|
background: var(--yj-bg-elevated, #343a40);
|
||||||
|
border-top: 1px solid var(--yj-border-subtle, #333);
|
||||||
|
}
|
||||||
|
|
||||||
|
.count {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
font-size: var(--yj-text-md);
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--yj-text-primary, #fff);
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 44px, from #56 and #186 -- this is a bar a thumb uses. */
|
||||||
|
button {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
min-inline-size: 44px;
|
||||||
|
min-block-size: 44px;
|
||||||
|
padding: 0 0.5em;
|
||||||
|
border: none;
|
||||||
|
border-radius: 4px;
|
||||||
|
background: none;
|
||||||
|
color: var(--yj-text-primary, #fff);
|
||||||
|
font-family: inherit;
|
||||||
|
font-size: var(--yj-text-md);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
button:hover {
|
||||||
|
background: var(--yj-bg-overlay, #495057);
|
||||||
|
}
|
||||||
|
|
||||||
|
button.danger {
|
||||||
|
color: var(--yj-error-text, #ff8787);
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
];
|
||||||
|
|
||||||
|
/** How many items are selected. Zero renders nothing. */
|
||||||
|
@property({ type: Number }) count = 0;
|
||||||
|
|
||||||
|
/** The actions worth a thumb. The rest live behind "More". */
|
||||||
|
@property({ attribute: false }) actions: SelectionAction[] = [];
|
||||||
|
|
||||||
|
private emit(name: string, detail?: unknown) {
|
||||||
|
this.dispatchEvent(
|
||||||
|
new CustomEvent(name, { detail, bubbles: true, composed: true }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Escape leaves the mode.
|
||||||
|
*
|
||||||
|
* A mode changes what a tap means, so it has to have an exit that
|
||||||
|
* is not "find the ×" -- and this is the documented exception to
|
||||||
|
* the app's one-keyboard-authority rule, on exactly the grounds
|
||||||
|
* the overlaid queue's Escape is: **it is a dismissal, not a
|
||||||
|
* shortcut**, so it is not a panel-scoped binding and it is
|
||||||
|
* attached only while there is something to dismiss. Putting it
|
||||||
|
* here rather than in each host is what gives all four surfaces
|
||||||
|
* the same answer, since this element exists only while the mode
|
||||||
|
* does.
|
||||||
|
*
|
||||||
|
* The platform's own back gesture is the other half of that and is
|
||||||
|
* deliberately *not* here: the shell owns the history stack
|
||||||
|
* (#6/#55), and a component reaching for `history` itself is how
|
||||||
|
* two stacks come to disagree about what one press means -- the
|
||||||
|
* fault that deleted `navStack`. See #200.
|
||||||
|
*/
|
||||||
|
private onKeydown = (e: KeyboardEvent) => {
|
||||||
|
if (e.key !== 'Escape' || this.count <= 0) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
this.emit('selection-exit');
|
||||||
|
};
|
||||||
|
|
||||||
|
override connectedCallback() {
|
||||||
|
super.connectedCallback();
|
||||||
|
document.addEventListener('keydown', this.onKeydown, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
override disconnectedCallback() {
|
||||||
|
super.disconnectedCallback();
|
||||||
|
document.removeEventListener('keydown', this.onKeydown, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
override render() {
|
||||||
|
if (this.count <= 0) return nothing;
|
||||||
|
|
||||||
|
const noun = this.count === 1 ? 'track' : 'tracks';
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<div class="bar" role="toolbar" aria-label="Selection actions">
|
||||||
|
<button
|
||||||
|
aria-label="Leave selection"
|
||||||
|
@click=${() => this.emit('selection-exit')}
|
||||||
|
>
|
||||||
|
<wa-icon name="xmark"></wa-icon>
|
||||||
|
</button>
|
||||||
|
<span class="count" role="status" aria-live="polite">
|
||||||
|
${this.count.toLocaleString()} ${noun} selected
|
||||||
|
</span>
|
||||||
|
${this.actions.map(
|
||||||
|
(action) => html`
|
||||||
|
<button
|
||||||
|
class=${action.danger ? 'danger' : ''}
|
||||||
|
aria-label=${action.label}
|
||||||
|
title=${action.label}
|
||||||
|
@click=${() =>
|
||||||
|
this.emit('selection-action', { id: action.id })}
|
||||||
|
>
|
||||||
|
<wa-icon name=${action.icon}></wa-icon>
|
||||||
|
</button>
|
||||||
|
`,
|
||||||
|
)}
|
||||||
|
<button
|
||||||
|
aria-label="More actions"
|
||||||
|
@click=${(e: MouseEvent) => {
|
||||||
|
const box = (
|
||||||
|
e.currentTarget as HTMLElement
|
||||||
|
).getBoundingClientRect();
|
||||||
|
|
||||||
|
this.emit('selection-more', {
|
||||||
|
x: box.left,
|
||||||
|
y: box.top,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<wa-icon name=${ICON_MORE_ACTIONS}></wa-icon>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface HTMLElementTagNameMap {
|
||||||
|
'selection-bar': SelectionBar;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,6 +28,10 @@ import {
|
|||||||
} from '@utils/context-menu-controller.js';
|
} from '@utils/context-menu-controller.js';
|
||||||
import type { ContextMenuHost, MenuTarget } from '@utils/context-menu-controller.js';
|
import type { ContextMenuHost, MenuTarget } from '@utils/context-menu-controller.js';
|
||||||
import { focusRovingRow, nextRovingIndex } from '@utils/roving-rows';
|
import { focusRovingRow, nextRovingIndex } from '@utils/roving-rows';
|
||||||
|
import type { GestureEvent } from '@utils/touch-gestures';
|
||||||
|
import { SwipeToQueue, swipeRevealStyles } from '@utils/swipe-to-queue';
|
||||||
|
import '@components/selection-bar/selection-bar';
|
||||||
|
import type { SelectionAction } from '@components/selection-bar/selection-bar';
|
||||||
import { FavoritesController } from '@store/controllers/favorites-controller';
|
import { FavoritesController } from '@store/controllers/favorites-controller';
|
||||||
import {
|
import {
|
||||||
setDragPayload,
|
setDragPayload,
|
||||||
@@ -62,8 +66,12 @@ import {
|
|||||||
} from '@utils/explore-link';
|
} from '@utils/explore-link';
|
||||||
import '@components/smart-playlist-editor/smart-playlist-editor.js';
|
import '@components/smart-playlist-editor/smart-playlist-editor.js';
|
||||||
import { designTokens } from '../../styles/tokens.css';
|
import { designTokens } from '../../styles/tokens.css';
|
||||||
|
import { backButton } from '../../styles/back-button.css';
|
||||||
|
import { srOnly } from '../../styles/sr-only.css';
|
||||||
import { list } from '@utils/binding';
|
import { list } from '@utils/binding';
|
||||||
import {
|
import {
|
||||||
|
ICON_PLAY,
|
||||||
|
ICON_PLAY_NEXT,
|
||||||
ICON_PLAYLIST,
|
ICON_PLAYLIST,
|
||||||
ICON_QUEUE,
|
ICON_QUEUE,
|
||||||
ICON_SMART_PLAYLIST,
|
ICON_SMART_PLAYLIST,
|
||||||
@@ -242,8 +250,11 @@ export class SmartPlaylistDetails
|
|||||||
|
|
||||||
static override styles = [
|
static override styles = [
|
||||||
designTokens,
|
designTokens,
|
||||||
|
srOnly,
|
||||||
|
backButton,
|
||||||
contextMenuStyles,
|
contextMenuStyles,
|
||||||
exploreLinkStyles,
|
exploreLinkStyles,
|
||||||
|
swipeRevealStyles,
|
||||||
css`
|
css`
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -269,31 +280,6 @@ export class SmartPlaylistDetails
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
.back-button {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(
|
|
||||||
--yj-bg-overlay,
|
|
||||||
rgba(255, 255, 255, 0.06)
|
|
||||||
);
|
|
||||||
color: var(--yj-text-primary, #fff);
|
|
||||||
cursor: pointer;
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background-color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button:hover {
|
|
||||||
background: var(
|
|
||||||
--yj-bg-hover,
|
|
||||||
rgba(255, 255, 255, 0.12)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
.back-button wa-icon {
|
.back-button wa-icon {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
@@ -467,6 +453,9 @@ export class SmartPlaylistDetails
|
|||||||
.track-item {
|
.track-item {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
/* The swipe reveal is absolute inside the row. */
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.track-header {
|
.track-header {
|
||||||
@@ -943,6 +932,110 @@ export class SmartPlaylistDetails
|
|||||||
// Context menu actions
|
// Context menu actions
|
||||||
// =================================================================
|
// =================================================================
|
||||||
|
|
||||||
|
// =================================================================
|
||||||
|
// A finger on a smart playlist row (plan 019 phase 3, #63)
|
||||||
|
// =================================================================
|
||||||
|
|
||||||
|
/** The row an announced gesture is on, with its track. */
|
||||||
|
private rowFromGesture(
|
||||||
|
e: Event,
|
||||||
|
): { index: number; track: playlist.Track } | null {
|
||||||
|
const row = (e.target as HTMLElement).closest(
|
||||||
|
'.track-item',
|
||||||
|
) as HTMLElement | null;
|
||||||
|
|
||||||
|
if (!row) return null;
|
||||||
|
|
||||||
|
const index = Number(row.dataset.index);
|
||||||
|
const track = this.tracks[index];
|
||||||
|
|
||||||
|
if (Number.isNaN(index) || !track) return null;
|
||||||
|
|
||||||
|
return { index, track };
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A tap plays the playlist from that row -- `playlist-details`'
|
||||||
|
* rule, and the app's: activating a row plays the list it is in. */
|
||||||
|
private onRowTap = (e: GestureEvent) => {
|
||||||
|
const hit = this.rowFromGesture(e);
|
||||||
|
|
||||||
|
if (!hit) return;
|
||||||
|
|
||||||
|
if (this.selection.selectionMode) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.selection.toggleInMode(String(hit.index), hit.index);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A missing file has nothing to play, so the tap falls through
|
||||||
|
// to the click that selects it.
|
||||||
|
if (hit.track.Phantom) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.handleTrackDblClick(hit.index);
|
||||||
|
};
|
||||||
|
|
||||||
|
private onRowLongPress = (e: GestureEvent) => {
|
||||||
|
const hit = this.rowFromGesture(e);
|
||||||
|
|
||||||
|
if (!hit) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.selection.enterSelectionMode(String(hit.index), hit.index);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
|
private swipe = new SwipeToQueue(this, {
|
||||||
|
resolve: (e) => {
|
||||||
|
const hit = this.rowFromGesture(e);
|
||||||
|
|
||||||
|
if (!hit || hit.track.Phantom) return null;
|
||||||
|
|
||||||
|
const selected = this.selection.getSelectedIndices();
|
||||||
|
const many =
|
||||||
|
selected.length > 1 && selected.includes(hit.index);
|
||||||
|
const filePaths = many
|
||||||
|
? this.getSelectedFilePaths()
|
||||||
|
: [hit.track.FilePath];
|
||||||
|
|
||||||
|
return { index: hit.index, filePaths, label: hit.track.Title };
|
||||||
|
},
|
||||||
|
repaint: () => this.virtualizer?.requestUpdate(),
|
||||||
|
});
|
||||||
|
|
||||||
|
/** The three worth a thumb; the sheet behind "More" is the rest. */
|
||||||
|
private static readonly SELECTION_ACTIONS: SelectionAction[] = [
|
||||||
|
{ id: 'play', label: 'Play', icon: ICON_PLAY },
|
||||||
|
{ id: 'add-to-queue', label: 'Add to queue', icon: ICON_QUEUE },
|
||||||
|
{ id: 'play-next', label: 'Play next', icon: ICON_PLAY_NEXT },
|
||||||
|
];
|
||||||
|
|
||||||
|
private renderSelectionBar() {
|
||||||
|
if (!this.selection.selectionMode) return nothing;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<selection-bar
|
||||||
|
.count=${this.selection.selectionCount}
|
||||||
|
.actions=${SmartPlaylistDetails.SELECTION_ACTIONS}
|
||||||
|
@selection-exit=${this.onSelectionExit}
|
||||||
|
@selection-action=${(e: CustomEvent<{ id: string }>) =>
|
||||||
|
this.onContextMenuAction(e.detail.id)}
|
||||||
|
@selection-more=${(e: CustomEvent<{ x: number; y: number }>) =>
|
||||||
|
this.ctxMenu.openAt(e.detail.x, e.detail.y)}
|
||||||
|
></selection-bar>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private onSelectionExit = () => {
|
||||||
|
this.selection.exitSelectionMode();
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
private onContextMenuAction(action: string) {
|
private onContextMenuAction(action: string) {
|
||||||
const filePaths = this.getSelectedFilePaths();
|
const filePaths = this.getSelectedFilePaths();
|
||||||
|
|
||||||
@@ -1357,6 +1450,9 @@ export class SmartPlaylistDetails
|
|||||||
<div class="header-cell col-album">Album</div>
|
<div class="header-cell col-album">Album</div>
|
||||||
<div class="header-cell col-duration">Duration</div>
|
<div class="header-cell col-duration">Duration</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="sr-only" role="status" aria-live="polite">
|
||||||
|
${this.swipe.announcement}
|
||||||
|
</div>
|
||||||
<lit-virtualizer
|
<lit-virtualizer
|
||||||
role="listbox"
|
role="listbox"
|
||||||
aria-label="Smart playlist tracks"
|
aria-label="Smart playlist tracks"
|
||||||
@@ -1365,7 +1461,13 @@ export class SmartPlaylistDetails
|
|||||||
.renderItem=${this.renderRow}
|
.renderItem=${this.renderRow}
|
||||||
.keyFunction=${this.rowKey}
|
.keyFunction=${this.rowKey}
|
||||||
.layout=${this.flowLayout}
|
.layout=${this.flowLayout}
|
||||||
|
@yj-tap=${this.onRowTap}
|
||||||
|
@yj-long-press=${this.onRowLongPress}
|
||||||
|
@yj-swipe-start=${this.swipe.onSwipeStart}
|
||||||
|
@yj-swipe-move=${this.swipe.onSwipeMove}
|
||||||
|
@yj-swipe-end=${this.swipe.onSwipeEnd}
|
||||||
></lit-virtualizer>
|
></lit-virtualizer>
|
||||||
|
${this.renderSelectionBar()}
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1387,6 +1489,7 @@ export class SmartPlaylistDetails
|
|||||||
active ? 'active' : '',
|
active ? 'active' : '',
|
||||||
selected ? 'selected' : '',
|
selected ? 'selected' : '',
|
||||||
isPhantom ? 'phantom' : '',
|
isPhantom ? 'phantom' : '',
|
||||||
|
this.swipe.isSwiping(trackIndex) ? 'swiping' : '',
|
||||||
]
|
]
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
.join(' ');
|
.join(' ');
|
||||||
@@ -1397,6 +1500,7 @@ export class SmartPlaylistDetails
|
|||||||
role="option"
|
role="option"
|
||||||
aria-selected=${selected}
|
aria-selected=${selected}
|
||||||
data-index=${trackIndex}
|
data-index=${trackIndex}
|
||||||
|
data-swipe
|
||||||
tabindex=${trackIndex === this.focusedIndex ? 0 : -1}
|
tabindex=${trackIndex === this.focusedIndex ? 0 : -1}
|
||||||
@keydown=${(e: KeyboardEvent) =>
|
@keydown=${(e: KeyboardEvent) =>
|
||||||
this.onRowKeydown(e, trackIndex)}
|
this.onRowKeydown(e, trackIndex)}
|
||||||
@@ -1431,6 +1535,7 @@ export class SmartPlaylistDetails
|
|||||||
? nothing
|
? nothing
|
||||||
: this.onTrackDragEnd}
|
: this.onTrackDragEnd}
|
||||||
>
|
>
|
||||||
|
${this.swipe.renderReveal(trackIndex)}
|
||||||
${isPhantom
|
${isPhantom
|
||||||
? html`<div class="phantom-row">
|
? html`<div class="phantom-row">
|
||||||
<wa-icon
|
<wa-icon
|
||||||
|
|||||||
@@ -529,6 +529,44 @@ export class TrackDetails extends LitElement {
|
|||||||
background: var(--yj-error, #e03131);
|
background: var(--yj-error, #e03131);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Both are the *only* route to changing or removing a track's
|
||||||
|
* cover art, so where the device has no hover they are always
|
||||||
|
* visible rather than hidden — the inverse of #68's rule, which
|
||||||
|
* applies where the hover control is redundant. Revealed by
|
||||||
|
* opacity, so what is on screen is what the desktop reveal shows
|
||||||
|
* and nothing about the layout moves.
|
||||||
|
*/
|
||||||
|
@media not all and (hover: hover) {
|
||||||
|
/* The × is genuinely the only route to removing the art, so
|
||||||
|
on a device that cannot hover it is simply always there.
|
||||||
|
|
||||||
|
The pen is not: .cover-art-edit carries the click that
|
||||||
|
opens the file picker, so tapping the artwork already
|
||||||
|
worked while the overlay was invisible. It is a discovery
|
||||||
|
hint — and paying for discovery by covering the artwork
|
||||||
|
being edited in 50% black, permanently, on every touch
|
||||||
|
device, is heavier than the hint is worth. It becomes a
|
||||||
|
corner chip in the remove button's own visual language
|
||||||
|
instead: same size, same disc, same alpha. */
|
||||||
|
.cover-art-remove {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cover-art-overlay {
|
||||||
|
opacity: 1;
|
||||||
|
inset: auto 4px 4px auto;
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: rgba(0, 0, 0, 0.7);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cover-art-overlay wa-icon {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Error message */
|
/* Error message */
|
||||||
.error-message {
|
.error-message {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ import {
|
|||||||
} from 'lit/decorators.js';
|
} from 'lit/decorators.js';
|
||||||
import { SelectionController } from '@utils/selection-controller';
|
import { SelectionController } from '@utils/selection-controller';
|
||||||
import type { SelectionHost } from '@utils/selection-controller';
|
import type { SelectionHost } from '@utils/selection-controller';
|
||||||
|
import type { GestureEvent } from '@utils/touch-gestures';
|
||||||
|
import { SwipeToQueue, swipeRevealStyles } from '@utils/swipe-to-queue';
|
||||||
|
import '@components/selection-bar/selection-bar';
|
||||||
|
import type { SelectionAction } from '@components/selection-bar/selection-bar';
|
||||||
import { ViewLifecycleMixin } from '@utils/view-lifecycle';
|
import { ViewLifecycleMixin } from '@utils/view-lifecycle';
|
||||||
import { PHONE_QUERY } from '@utils/breakpoints';
|
import { PHONE_QUERY } from '@utils/breakpoints';
|
||||||
import {
|
import {
|
||||||
@@ -77,7 +81,9 @@ import '@components/playlist-picker/playlist-picker.js';
|
|||||||
import type { TrackDetails } from '@components/track-details/track-details.js';
|
import type { TrackDetails } from '@components/track-details/track-details.js';
|
||||||
import type { CoverArtUrls } from '@components/track-details/track-details.js';
|
import type { CoverArtUrls } from '@components/track-details/track-details.js';
|
||||||
import {
|
import {
|
||||||
|
ICON_PLAY,
|
||||||
ICON_PLAYLIST,
|
ICON_PLAYLIST,
|
||||||
|
ICON_PLAY_NEXT,
|
||||||
ICON_QUEUE,
|
ICON_QUEUE,
|
||||||
} from '@utils/icon-language';
|
} from '@utils/icon-language';
|
||||||
|
|
||||||
@@ -277,6 +283,29 @@ export class TrackList
|
|||||||
* path into it at all (H-5). */
|
* path into it at all (H-5). */
|
||||||
@state() private focusedIndex = 0;
|
@state() private focusedIndex = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Swipe a row right to queue it (plan 019 phase 2, #63).
|
||||||
|
*
|
||||||
|
* The affordance and the arithmetic are `utils/swipe-to-queue.ts`,
|
||||||
|
* shared with both playlist detail views; what stays here is what
|
||||||
|
* only this list knows -- which row an event is on, and what a
|
||||||
|
* swipe on it means when other rows are selected.
|
||||||
|
*/
|
||||||
|
private swipe = new SwipeToQueue(this, {
|
||||||
|
resolve: (e) => {
|
||||||
|
const hit = this.resolveTrackFromEvent(e);
|
||||||
|
|
||||||
|
if (!hit) return null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
index: hit.index,
|
||||||
|
filePaths: this.swipeTargetKeys(hit.track.FilePath),
|
||||||
|
label: hit.track.TrackName,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
repaint: () => this.virtualizer?.requestUpdate(),
|
||||||
|
});
|
||||||
|
|
||||||
private handleSelectAll = (): void => {
|
private handleSelectAll = (): void => {
|
||||||
this.selection.selectAll();
|
this.selection.selectAll();
|
||||||
};
|
};
|
||||||
@@ -1011,7 +1040,7 @@ export class TrackList
|
|||||||
this.requestUpdate();
|
this.requestUpdate();
|
||||||
};
|
};
|
||||||
|
|
||||||
static override styles = [designTokens, srOnly, contextMenuStyles, exploreLinkStyles, css`
|
static override styles = [designTokens, srOnly, contextMenuStyles, exploreLinkStyles, swipeRevealStyles, css`
|
||||||
:host {
|
:host {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -1208,6 +1237,7 @@ export class TrackList
|
|||||||
background-color: var(--yj-selection-bg, rgba(100, 160, 255, 0.15));
|
background-color: var(--yj-selection-bg, rgba(100, 160, 255, 0.15));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.cell {
|
.cell {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
@@ -1304,6 +1334,11 @@ export class TrackList
|
|||||||
virt.removeEventListener('click', this.onDelegatedClick);
|
virt.removeEventListener('click', this.onDelegatedClick);
|
||||||
virt.removeEventListener('dblclick', this.onDelegatedDblClick);
|
virt.removeEventListener('dblclick', this.onDelegatedDblClick);
|
||||||
virt.removeEventListener('contextmenu', this.onDelegatedContextMenu);
|
virt.removeEventListener('contextmenu', this.onDelegatedContextMenu);
|
||||||
|
virt.removeEventListener('yj-tap', this.onRowTap);
|
||||||
|
virt.removeEventListener('yj-long-press', this.onRowLongPress);
|
||||||
|
virt.removeEventListener('yj-swipe-start', this.swipe.onSwipeStart);
|
||||||
|
virt.removeEventListener('yj-swipe-move', this.swipe.onSwipeMove);
|
||||||
|
virt.removeEventListener('yj-swipe-end', this.swipe.onSwipeEnd);
|
||||||
virt.removeEventListener('dragstart', this.onDelegatedDragStart);
|
virt.removeEventListener('dragstart', this.onDelegatedDragStart);
|
||||||
virt.removeEventListener('dragend', this.onTrackDragEnd);
|
virt.removeEventListener('dragend', this.onTrackDragEnd);
|
||||||
}
|
}
|
||||||
@@ -1445,6 +1480,14 @@ export class TrackList
|
|||||||
virt.addEventListener('contextmenu', this.onDelegatedContextMenu);
|
virt.addEventListener('contextmenu', this.onDelegatedContextMenu);
|
||||||
virt.addEventListener('dragstart', this.onDelegatedDragStart);
|
virt.addEventListener('dragstart', this.onDelegatedDragStart);
|
||||||
virt.addEventListener('dragend', this.onTrackDragEnd);
|
virt.addEventListener('dragend', this.onTrackDragEnd);
|
||||||
|
// Delegated like the rest: the gesture layer dispatches on the
|
||||||
|
// element the finger landed on, composed, so it arrives here
|
||||||
|
// through the same path a real click takes (plan 019).
|
||||||
|
virt.addEventListener('yj-tap', this.onRowTap);
|
||||||
|
virt.addEventListener('yj-long-press', this.onRowLongPress);
|
||||||
|
virt.addEventListener('yj-swipe-start', this.swipe.onSwipeStart);
|
||||||
|
virt.addEventListener('yj-swipe-move', this.swipe.onSwipeMove);
|
||||||
|
virt.addEventListener('yj-swipe-end', this.swipe.onSwipeEnd);
|
||||||
this.delegationAttached = true;
|
this.delegationAttached = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1708,6 +1751,86 @@ export class TrackList
|
|||||||
if (hit) this.onTrackContextMenu(e, hit.track);
|
if (hit) this.onTrackContextMenu(e, hit.track);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A finger tapped a row (plan 019, #63).
|
||||||
|
*
|
||||||
|
* On a desktop a click selects and a double-click plays; a finger
|
||||||
|
* inverts that, because there is no second button and no modifier
|
||||||
|
* key, so the primary action has to be the primary gesture.
|
||||||
|
*
|
||||||
|
* Claiming the gesture (`preventDefault`) is what tells the layer
|
||||||
|
* to swallow the click behind it -- otherwise playing a track
|
||||||
|
* would also select it, and the row would end up in both states.
|
||||||
|
* A tap this does *not* claim falls through as an ordinary click,
|
||||||
|
* which is what keeps the favourite icon working.
|
||||||
|
*/
|
||||||
|
private onRowTap = (e: GestureEvent) => {
|
||||||
|
const hit = this.resolveTrackFromEvent(e);
|
||||||
|
|
||||||
|
if (!hit) return;
|
||||||
|
|
||||||
|
// A control inside the row owns its own tap. The same rule the
|
||||||
|
// shortcut service has for a focused control that owns a key,
|
||||||
|
// and without it the 44px favourite target (#56) becomes a
|
||||||
|
// 44px play target.
|
||||||
|
if ((e.target as HTMLElement).closest('.fav-icon')) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
|
||||||
|
if (this.selection.selectionMode) {
|
||||||
|
this.selection.toggleInMode(hit.track.FilePath, hit.index);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.playFromRow(hit.index);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A finger held a row still for half a second.
|
||||||
|
*
|
||||||
|
* Claiming this is what makes it *selection mode* rather than the
|
||||||
|
* context menu it has been since plan 016 -- an unclaimed
|
||||||
|
* `yj-long-press` still becomes a `contextmenu`, which is how the
|
||||||
|
* card grids and Explore keep the behaviour they have.
|
||||||
|
*/
|
||||||
|
private onRowLongPress = (e: GestureEvent) => {
|
||||||
|
const hit = this.resolveTrackFromEvent(e);
|
||||||
|
|
||||||
|
if (!hit) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
this.focusedIndex = hit.index;
|
||||||
|
this.selection.enterSelectionMode(hit.track.FilePath, hit.index);
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What a swipe on this row would queue.
|
||||||
|
*
|
||||||
|
* The same rule the context menu answers with, and it has to be:
|
||||||
|
* **one row is a position, several rows are an explicit choice.**
|
||||||
|
* A finger that swipes a row which is part of a selection of forty
|
||||||
|
* has not un-made that selection, and queueing the one row it
|
||||||
|
* touched would quietly contradict the bar above saying forty are
|
||||||
|
* selected. A swipe on a row *outside* the selection is a statement
|
||||||
|
* about that row, exactly as a right-click on one is -- and unlike
|
||||||
|
* a right-click it does not move the selection, because a swipe is
|
||||||
|
* not a way of selecting anything.
|
||||||
|
*/
|
||||||
|
private swipeTargetKeys(filePath: string): string[] {
|
||||||
|
if (
|
||||||
|
this.selection.selectionCount > 1 &&
|
||||||
|
this.selection.isSelected(filePath)
|
||||||
|
) {
|
||||||
|
return this.selection.getSelectedKeysOrdered();
|
||||||
|
}
|
||||||
|
|
||||||
|
return [filePath];
|
||||||
|
}
|
||||||
|
|
||||||
private onDelegatedDragStart = (e: DragEvent) => {
|
private onDelegatedDragStart = (e: DragEvent) => {
|
||||||
const hit = this.resolveTrackFromEvent(e);
|
const hit = this.resolveTrackFromEvent(e);
|
||||||
|
|
||||||
@@ -2129,6 +2252,7 @@ export class TrackList
|
|||||||
'track-row': true,
|
'track-row': true,
|
||||||
active,
|
active,
|
||||||
selected,
|
selected,
|
||||||
|
swiping: this.swipe.isSwiping(index),
|
||||||
})}
|
})}
|
||||||
role="row"
|
role="row"
|
||||||
aria-rowindex=${index + 1}
|
aria-rowindex=${index + 1}
|
||||||
@@ -2138,8 +2262,10 @@ export class TrackList
|
|||||||
draggable="true"
|
draggable="true"
|
||||||
data-index=${index}
|
data-index=${index}
|
||||||
data-testid="track-row"
|
data-testid="track-row"
|
||||||
|
data-swipe
|
||||||
data-file-path=${track.FilePath}
|
data-file-path=${track.FilePath}
|
||||||
>
|
>
|
||||||
|
${this.swipe.renderReveal(index)}
|
||||||
<div
|
<div
|
||||||
role="gridcell"
|
role="gridcell"
|
||||||
class=${classMap({
|
class=${classMap({
|
||||||
@@ -2238,6 +2364,45 @@ export class TrackList
|
|||||||
this.saveSortPreferences();
|
this.saveSortPreferences();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The three worth a thumb. Everything else is behind "More",
|
||||||
|
* which opens the context menu this list already renders.
|
||||||
|
*
|
||||||
|
* A bar is one row on a 424px screen and the menu is nine items,
|
||||||
|
* so this is a subset by necessity rather than a second opinion
|
||||||
|
* about what matters -- and plan 018's promise that no action is
|
||||||
|
* unreachable is kept by the overflow, not by this list.
|
||||||
|
*/
|
||||||
|
private static readonly SELECTION_ACTIONS: SelectionAction[] = [
|
||||||
|
{ id: 'play', label: 'Play', icon: ICON_PLAY },
|
||||||
|
{ id: 'add-to-queue', label: 'Add to queue', icon: ICON_QUEUE },
|
||||||
|
{ id: 'play-next', label: 'Play next', icon: ICON_PLAY_NEXT },
|
||||||
|
];
|
||||||
|
|
||||||
|
private renderSelectionBar() {
|
||||||
|
// Only in selection mode: a mouse selection is modeless and
|
||||||
|
// shows its actions on right-click, which is where a desktop
|
||||||
|
// user looks for them.
|
||||||
|
if (!this.selection.selectionMode) return nothing;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<selection-bar
|
||||||
|
.count=${this.selection.selectionCount}
|
||||||
|
.actions=${TrackList.SELECTION_ACTIONS}
|
||||||
|
@selection-exit=${this.onSelectionExit}
|
||||||
|
@selection-action=${(e: CustomEvent<{ id: string }>) =>
|
||||||
|
this.onContextMenuAction(e.detail.id)}
|
||||||
|
@selection-more=${(e: CustomEvent<{ x: number; y: number }>) =>
|
||||||
|
this.ctxMenu.openAt(e.detail.x, e.detail.y)}
|
||||||
|
></selection-bar>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private onSelectionExit = () => {
|
||||||
|
this.selection.exitSelectionMode();
|
||||||
|
this.virtualizer?.requestUpdate();
|
||||||
|
};
|
||||||
|
|
||||||
override render() {
|
override render() {
|
||||||
const visibleTracks = this.cachedSortedTracks;
|
const visibleTracks = this.cachedSortedTracks;
|
||||||
const cols = this.activeColumns;
|
const cols = this.activeColumns;
|
||||||
@@ -2247,6 +2412,9 @@ export class TrackList
|
|||||||
<div class="sr-only" role="status" aria-live="polite">
|
<div class="sr-only" role="status" aria-live="polite">
|
||||||
${this.liveStatus(visibleTracks.length)}
|
${this.liveStatus(visibleTracks.length)}
|
||||||
</div>
|
</div>
|
||||||
|
<div class="sr-only" role="status" aria-live="polite">
|
||||||
|
${this.swipe.announcement}
|
||||||
|
</div>
|
||||||
${this.tracks.length === 0
|
${this.tracks.length === 0
|
||||||
? this.renderPlaceholder()
|
? this.renderPlaceholder()
|
||||||
: html`
|
: html`
|
||||||
@@ -2322,6 +2490,7 @@ export class TrackList
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
${this.renderSelectionBar()}
|
||||||
`}
|
`}
|
||||||
|
|
||||||
<menu-surface
|
<menu-surface
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import { css } from 'lit';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The way out of a detail view, at the app's 44px touch floor.
|
||||||
|
*
|
||||||
|
* #186's second table names `artist-details`' back button at
|
||||||
|
* **32x32**. It is the same declaration in **six** components —
|
||||||
|
* `artist-details`, `genre-details`, `playlist-details`,
|
||||||
|
* `smart-playlist-details`, `explore-artist-details` and
|
||||||
|
* `explore-album-details` — byte-identical, 32px in all six, and the
|
||||||
|
* sweep that filed the issue visited one of them.
|
||||||
|
*
|
||||||
|
* That is the argument for this file rather than six edits. A device
|
||||||
|
* sweep walks the views somebody thought to open, so six copies of a
|
||||||
|
* control is six chances for the next pass to miss five; the arrows
|
||||||
|
* and the toggles were each one declaration covering 36 and 29
|
||||||
|
* controls, and this is the same shape stated the other way round.
|
||||||
|
*
|
||||||
|
* **It is a real 44px box, not padding with the width handed back.**
|
||||||
|
* The header pass had to grow a hit area past its own layout box
|
||||||
|
* because `page-header` measures itself for #69's overflow fit; a
|
||||||
|
* detail view's header does not, so the control can simply be the
|
||||||
|
* target. It also *should* be — this button has a visible background,
|
||||||
|
* so a hit area larger than the circle would be a control that is
|
||||||
|
* bigger than it looks, which is the thing #187 accepts only where a
|
||||||
|
* thin painted track is the point.
|
||||||
|
*
|
||||||
|
* The size is #55's, arrived at for the same reason one component
|
||||||
|
* over: "the way out is 44px on a phone", when the queue panel's close
|
||||||
|
* button was 25x21 and, at phone width, the only pointer route off a
|
||||||
|
* full-screen surface. A detail view has the platform's back gesture
|
||||||
|
* as well, so this is less severe than the queue was — it is the same
|
||||||
|
* control wearing the same mistake.
|
||||||
|
*/
|
||||||
|
export const backButton = css`
|
||||||
|
.back-button {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--yj-bg-overlay, rgba(255, 255, 255, 0.06));
|
||||||
|
color: var(--yj-text-primary, #fff);
|
||||||
|
cursor: pointer;
|
||||||
|
flex-shrink: 0;
|
||||||
|
transition: background-color 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.back-button:hover {
|
||||||
|
background: var(--yj-bg-hover, rgba(255, 255, 255, 0.12));
|
||||||
|
}
|
||||||
|
`;
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import { css } from 'lit';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A Web Awesome form control is at least the app's 44px touch floor.
|
||||||
|
*
|
||||||
|
* #56 named 44px and #186 found nothing but the transport had reached
|
||||||
|
* it. Web Awesome's form controls are the part of Settings this app
|
||||||
|
* does not draw: measured on the reference device (TLP301, 424x439),
|
||||||
|
* `wa-input`'s control is **204x20** and `wa-button` **185x21** — the
|
||||||
|
* shortest controls on the page, and the only ones whose height is
|
||||||
|
* decided inside somebody else's shadow root.
|
||||||
|
*
|
||||||
|
* `--wa-form-control-height` is that decision, and it is the library's
|
||||||
|
* own theming variable rather than a part or an internal — the default
|
||||||
|
* theme sets it at `:root` and every control that has a height reads
|
||||||
|
* it (button, input, select, radio). So this is `wa-slider-label`'s
|
||||||
|
* better half: the API first, and no reach into a shadow root at all.
|
||||||
|
*
|
||||||
|
* Three things about it are load-bearing.
|
||||||
|
*
|
||||||
|
* **A custom property inherits through a shadow boundary**, which is
|
||||||
|
* what lets a `:host` declaration reach a `wa-input` the host renders.
|
||||||
|
* That is also why it is a stylesheet a component adopts rather than a
|
||||||
|
* `:root` rule in `index.css`: a `:root` rule would cover every wa
|
||||||
|
* control in the app in one line and be invisible to the component
|
||||||
|
* tier, which renders a component and no page stylesheet. Here the
|
||||||
|
* floor is measurable where it is applied.
|
||||||
|
*
|
||||||
|
* **It is a flat 44px rather than a floor over the library's own
|
||||||
|
* expression.** The default is `round(calc(2 * padding-block + 1em *
|
||||||
|
* line-height), 1px)` — em-based, so `size="small"` is what produced
|
||||||
|
* the 20px above — and a `max(44px, …)` would have to restate that
|
||||||
|
* formula here, which is a copy of somebody else's arithmetic that
|
||||||
|
* goes stale silently. A flat value is safe because this app uses
|
||||||
|
* exactly two sizes, `small` and the default, and both are under the
|
||||||
|
* floor; a `size="large"` added later would be pinned down to 44 and
|
||||||
|
* should take that as the prompt to revisit this.
|
||||||
|
*
|
||||||
|
* **Only the height is pinned.** The font size still comes from
|
||||||
|
* `size="small"`, so a control grows its hit area without growing its
|
||||||
|
* visual weight — which is what #186's Direction asks for and what the
|
||||||
|
* page header's second pass had to be corrected to do.
|
||||||
|
*/
|
||||||
|
export const waTouchFloor = css`
|
||||||
|
:host {
|
||||||
|
--wa-form-control-height: 44px;
|
||||||
|
}
|
||||||
|
`;
|
||||||
@@ -1,201 +0,0 @@
|
|||||||
/**
|
|
||||||
* Long-press as the touch equivalent of a right-click (plan 016 B2,
|
|
||||||
* phase 3).
|
|
||||||
*
|
|
||||||
* Every context menu in the app opens from a `contextmenu` event —
|
|
||||||
* `track-list` and `queue-panel` delegate one on their virtualizer,
|
|
||||||
* the card grids and both playlist detail views bind one per row, and
|
|
||||||
* `explore-artist-details` binds three. A phone has no right-click, so
|
|
||||||
* a phone reached none of them.
|
|
||||||
*
|
|
||||||
* **This is one document listener, not six components' worth of touch
|
|
||||||
* handling.** A press that stays still for `LONG_PRESS_MS` dispatches a
|
|
||||||
* synthetic `contextmenu` at the touch point on the element the touch
|
|
||||||
* actually landed on, and every existing handler — delegated or
|
|
||||||
* per-row, in any shadow root — runs unchanged. Six implementations of
|
|
||||||
* a gesture is exactly the fault `ContextMenuController` exists to
|
|
||||||
* prevent, and a seam that needs no component to opt in cannot be
|
|
||||||
* forgotten by the next component.
|
|
||||||
*
|
|
||||||
* Three things about it are load-bearing.
|
|
||||||
*
|
|
||||||
* **The target comes from `composedPath()[0]`, not from
|
|
||||||
* `elementFromPoint`**, which stops at the outermost shadow host: every
|
|
||||||
* menu in this app is bound inside one, so a synthetic event dispatched
|
|
||||||
* on the host reaches a delegated listener and no per-row one.
|
|
||||||
*
|
|
||||||
* **A browser that already does this must win.** Chromium fires a
|
|
||||||
* `contextmenu` on long-press itself; WebKitGTK and the Android WebView
|
|
||||||
* vary. So one arriving during the press cancels ours, and one arriving
|
|
||||||
* just after ours is swallowed at document capture — where nothing else
|
|
||||||
* has seen it yet. The two are told apart by **identity** (a `WeakSet`
|
|
||||||
* of the events this module made) rather than by `isTrusted`, so the
|
|
||||||
* suppressor cannot eat the event it exists to deliver, the rule holds
|
|
||||||
* for anything else in the app that synthesises one, and a test can
|
|
||||||
* stand in for a browser that fires its own.
|
|
||||||
*
|
|
||||||
* **The click that ends the gesture is swallowed.** A row's click
|
|
||||||
* selects, and a card's plays; without this, opening a menu also
|
|
||||||
* activates the thing under it. It is keyed on the gesture (cleared by
|
|
||||||
* the next `pointerdown`) rather than on a time window, so a quick tap
|
|
||||||
* on the menu that just opened is not eaten too.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** How long a press must hold still to mean "menu". */
|
|
||||||
export const LONG_PRESS_MS = 500;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* How far a press may drift and still count. Below a finger's own
|
|
||||||
* jitter is a gesture nobody can perform; above ~12px it starts
|
|
||||||
* stealing the first frames of a scroll.
|
|
||||||
*/
|
|
||||||
export const MOVE_TOLERANCE_PX = 10;
|
|
||||||
|
|
||||||
/** The active installation, so a second call is a no-op rather than a
|
|
||||||
* second listener set. */
|
|
||||||
let uninstall: (() => void) | null = null;
|
|
||||||
|
|
||||||
/** The events this module dispatched. Identity, not `isTrusted`: see
|
|
||||||
* the note above. */
|
|
||||||
const ours = new WeakSet<Event>();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Install the gesture. Idempotent; returns the uninstaller (which the
|
|
||||||
* tests use — the app installs once and never removes it).
|
|
||||||
*/
|
|
||||||
export function installLongPressContextMenu(): () => void {
|
|
||||||
if (uninstall) return uninstall;
|
|
||||||
|
|
||||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
|
||||||
let originX = 0;
|
|
||||||
let originY = 0;
|
|
||||||
let target: EventTarget | null = null;
|
|
||||||
|
|
||||||
/** A trusted `contextmenu` arrived for this press: the browser has
|
|
||||||
* it covered. */
|
|
||||||
let nativeSeen = false;
|
|
||||||
|
|
||||||
/** We opened a menu, and the click ending that gesture is not a
|
|
||||||
* click on anything. */
|
|
||||||
let swallowClick = false;
|
|
||||||
|
|
||||||
/** We dispatched one, so a trusted one arriving now is a duplicate. */
|
|
||||||
let justFired = false;
|
|
||||||
|
|
||||||
const cancel = (): void => {
|
|
||||||
if (timer !== null) clearTimeout(timer);
|
|
||||||
|
|
||||||
timer = null;
|
|
||||||
target = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const fire = (): void => {
|
|
||||||
timer = null;
|
|
||||||
|
|
||||||
const el = target;
|
|
||||||
|
|
||||||
target = null;
|
|
||||||
|
|
||||||
if (nativeSeen || !el) return;
|
|
||||||
|
|
||||||
justFired = true;
|
|
||||||
swallowClick = true;
|
|
||||||
|
|
||||||
const menu = new MouseEvent('contextmenu', {
|
|
||||||
bubbles: true,
|
|
||||||
cancelable: true,
|
|
||||||
// Or it stops at the shadow root the row lives in, and the
|
|
||||||
// delegated listeners never see it.
|
|
||||||
composed: true,
|
|
||||||
clientX: originX,
|
|
||||||
clientY: originY,
|
|
||||||
button: 2,
|
|
||||||
});
|
|
||||||
|
|
||||||
ours.add(menu);
|
|
||||||
el.dispatchEvent(menu);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onPointerDown = (e: PointerEvent): void => {
|
|
||||||
// A new gesture: whatever the last one left behind is stale.
|
|
||||||
swallowClick = false;
|
|
||||||
justFired = false;
|
|
||||||
nativeSeen = false;
|
|
||||||
cancel();
|
|
||||||
|
|
||||||
if (e.pointerType !== 'touch' || !e.isPrimary) return;
|
|
||||||
|
|
||||||
originX = e.clientX;
|
|
||||||
originY = e.clientY;
|
|
||||||
target = e.composedPath()[0] ?? e.target;
|
|
||||||
timer = setTimeout(fire, LONG_PRESS_MS);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onPointerMove = (e: PointerEvent): void => {
|
|
||||||
if (timer === null) return;
|
|
||||||
|
|
||||||
const drifted =
|
|
||||||
Math.abs(e.clientX - originX) > MOVE_TOLERANCE_PX ||
|
|
||||||
Math.abs(e.clientY - originY) > MOVE_TOLERANCE_PX;
|
|
||||||
|
|
||||||
if (drifted) cancel();
|
|
||||||
};
|
|
||||||
|
|
||||||
const onContextMenu = (e: Event): void => {
|
|
||||||
// Ours. Everything below is about somebody else's.
|
|
||||||
if (ours.has(e)) return;
|
|
||||||
|
|
||||||
if (timer !== null) {
|
|
||||||
// The browser got there first, so stand down rather than
|
|
||||||
// opening the same menu twice.
|
|
||||||
nativeSeen = true;
|
|
||||||
cancel();
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (justFired) {
|
|
||||||
justFired = false;
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopImmediatePropagation();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onClick = (e: Event): void => {
|
|
||||||
if (!swallowClick) return;
|
|
||||||
|
|
||||||
swallowClick = false;
|
|
||||||
e.preventDefault();
|
|
||||||
e.stopImmediatePropagation();
|
|
||||||
};
|
|
||||||
|
|
||||||
// Capture throughout: a component handler that stops propagation
|
|
||||||
// (every context-menu handler in the app does) must not be able to
|
|
||||||
// hide the gesture from this, and the suppressors have to run
|
|
||||||
// before anything that would act on the event.
|
|
||||||
const opts = { capture: true } as const;
|
|
||||||
|
|
||||||
document.addEventListener('pointerdown', onPointerDown, opts);
|
|
||||||
document.addEventListener('pointermove', onPointerMove, opts);
|
|
||||||
document.addEventListener('pointerup', cancel, opts);
|
|
||||||
document.addEventListener('pointercancel', cancel, opts);
|
|
||||||
document.addEventListener('contextmenu', onContextMenu, opts);
|
|
||||||
document.addEventListener('click', onClick, opts);
|
|
||||||
// A scroll started by something other than the finger (momentum, a
|
|
||||||
// programmatic reveal) still means the press was not a press.
|
|
||||||
document.addEventListener('scroll', cancel, { capture: true, passive: true });
|
|
||||||
|
|
||||||
uninstall = () => {
|
|
||||||
cancel();
|
|
||||||
document.removeEventListener('pointerdown', onPointerDown, opts);
|
|
||||||
document.removeEventListener('pointermove', onPointerMove, opts);
|
|
||||||
document.removeEventListener('pointerup', cancel, opts);
|
|
||||||
document.removeEventListener('pointercancel', cancel, opts);
|
|
||||||
document.removeEventListener('contextmenu', onContextMenu, opts);
|
|
||||||
document.removeEventListener('click', onClick, opts);
|
|
||||||
document.removeEventListener('scroll', cancel, opts);
|
|
||||||
uninstall = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
return uninstall;
|
|
||||||
}
|
|
||||||
@@ -19,6 +19,29 @@ export class SelectionController implements ReactiveController {
|
|||||||
private host: SelectionHost;
|
private host: SelectionHost;
|
||||||
private _selectedItems: Set<string> = new Set();
|
private _selectedItems: Set<string> = new Set();
|
||||||
private lastSelectedIndex: number | null = null;
|
private lastSelectedIndex: number | null = null;
|
||||||
|
private _mode = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the list is in *selection mode* (plan 019, #63).
|
||||||
|
*
|
||||||
|
* A finger has no modifier keys, so the ctrl/shift semantics this
|
||||||
|
* controller was written for cannot be expressed by touch at all.
|
||||||
|
* Selection mode is the platform's answer: a long press enters it,
|
||||||
|
* and while it is on, a tap toggles a row instead of playing it.
|
||||||
|
*
|
||||||
|
* It is a flag *here* rather than a fifth concept beside the
|
||||||
|
* controller because all four surfaces that select
|
||||||
|
* (`track-list`, `queue-panel` and both playlist detail views)
|
||||||
|
* already share this class -- so "is this list selecting" has one
|
||||||
|
* answer per list, in the object that already owns the selection
|
||||||
|
* it would otherwise contradict.
|
||||||
|
*
|
||||||
|
* A mouse never sets it. Desktop selection is unchanged and stays
|
||||||
|
* modeless, which is what `handleItemClick` still implements.
|
||||||
|
*/
|
||||||
|
get selectionMode(): boolean {
|
||||||
|
return this._mode;
|
||||||
|
}
|
||||||
|
|
||||||
constructor(host: SelectionHost) {
|
constructor(host: SelectionHost) {
|
||||||
this.host = host;
|
this.host = host;
|
||||||
@@ -136,8 +159,64 @@ export class SelectionController implements ReactiveController {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enter selection mode with `key` selected.
|
||||||
|
*
|
||||||
|
* The row the gesture was made on is selected, rather than the
|
||||||
|
* mode opening empty: a long press is a statement about *that*
|
||||||
|
* row, and an action bar with nothing in it is a mode the user has
|
||||||
|
* to make a second gesture to escape.
|
||||||
|
*/
|
||||||
|
enterSelectionMode(key: string, index: number): void {
|
||||||
|
this._mode = true;
|
||||||
|
this._selectedItems = new Set([key]);
|
||||||
|
this.lastSelectedIndex = index;
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.host.onSelectionChanged?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle one row, and leave the mode when the last one goes.
|
||||||
|
*
|
||||||
|
* Deselecting everything is how Android's own list surfaces exit
|
||||||
|
* selection mode, and it matters more here than convention: the
|
||||||
|
* mode changes what a tap *means*, so a mode with an empty
|
||||||
|
* selection is a list where tapping does nothing and nothing on
|
||||||
|
* screen says why.
|
||||||
|
*/
|
||||||
|
toggleInMode(key: string, index: number): void {
|
||||||
|
const next = new Set(this._selectedItems);
|
||||||
|
|
||||||
|
if (next.has(key)) next.delete(key);
|
||||||
|
else next.add(key);
|
||||||
|
|
||||||
|
this._selectedItems = next;
|
||||||
|
this.lastSelectedIndex = index;
|
||||||
|
|
||||||
|
if (next.size === 0) this._mode = false;
|
||||||
|
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.host.onSelectionChanged?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Leave selection mode, dropping the selection with it. */
|
||||||
|
exitSelectionMode(): void {
|
||||||
|
if (!this._mode && this._selectedItems.size === 0) return;
|
||||||
|
|
||||||
|
this._mode = false;
|
||||||
|
this._selectedItems = new Set();
|
||||||
|
this.lastSelectedIndex = null;
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.host.onSelectionChanged?.();
|
||||||
|
}
|
||||||
|
|
||||||
/** Clear the entire selection. */
|
/** Clear the entire selection. */
|
||||||
clear(): void {
|
clear(): void {
|
||||||
|
// The mode goes with it: every caller of this means "the
|
||||||
|
// selection is no longer meaningful", and a mode outliving the
|
||||||
|
// selection it was showing is the empty-mode trap above.
|
||||||
|
this._mode = false;
|
||||||
|
|
||||||
if (this._selectedItems.size === 0) return;
|
if (this._selectedItems.size === 0) return;
|
||||||
|
|
||||||
this._selectedItems = new Set();
|
this._selectedItems = new Set();
|
||||||
@@ -176,6 +255,13 @@ export class SelectionController implements ReactiveController {
|
|||||||
if (next.size === this._selectedItems.size) return;
|
if (next.size === this._selectedItems.size) return;
|
||||||
|
|
||||||
this._selectedItems = next;
|
this._selectedItems = next;
|
||||||
|
|
||||||
|
// A refetch that emptied the selection also ends the mode --
|
||||||
|
// otherwise removing the last selected track from the library
|
||||||
|
// leaves the list in a state where a tap selects and the bar
|
||||||
|
// is gone.
|
||||||
|
if (next.size === 0) this._mode = false;
|
||||||
|
|
||||||
this.host.requestUpdate();
|
this.host.requestUpdate();
|
||||||
this.host.onSelectionChanged?.();
|
this.host.onSelectionChanged?.();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,362 @@
|
|||||||
|
import { css, html, nothing } from 'lit';
|
||||||
|
import type { ReactiveController, ReactiveControllerHost } from 'lit';
|
||||||
|
import { classMap } from 'lit/directives/class-map.js';
|
||||||
|
|
||||||
|
import { queueStore } from '@store/queue-store';
|
||||||
|
import { ICON_QUEUE } from '@utils/icon-language';
|
||||||
|
import type { SwipeEvent } from '@utils/touch-gestures';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Swipe a row right to add it to the queue (plan 019, #63).
|
||||||
|
*
|
||||||
|
* This is the *affordance* and the arithmetic, written once, because
|
||||||
|
* three lists want it: `track-list` and both playlist detail views.
|
||||||
|
* It was `track-list`'s own for one phase and is here rather than
|
||||||
|
* copied twice, on the rule the rest of this app is built on — three
|
||||||
|
* copies of "how far is far enough" is three chances for them to
|
||||||
|
* disagree, which is what `utils/library-status.ts` and
|
||||||
|
* `utils/ownership.ts` each exist to have stopped happening.
|
||||||
|
*
|
||||||
|
* The host keeps three things: what a row *is*, what a swipe on it
|
||||||
|
* would queue, and what to call it afterwards. Everything else —
|
||||||
|
* the threshold, the reveal, the settle, the announcement, the
|
||||||
|
* repaint — is here.
|
||||||
|
*
|
||||||
|
* **The queue panel deliberately does not use it.** A right swipe means
|
||||||
|
* *add to the queue* everywhere it exists, and a queue row is already
|
||||||
|
* in the queue; the only thing it could sensibly mean there is
|
||||||
|
* *remove*, which is the same gesture with the opposite effect one
|
||||||
|
* screen away. Removing a queue row is on its own row (the ×), on its
|
||||||
|
* bottom sheet since #60, and on the selection bar #63 gave it.
|
||||||
|
*
|
||||||
|
* Five things about it are load-bearing.
|
||||||
|
*
|
||||||
|
* **Both halves of the device fix are here or next door.**
|
||||||
|
* `swipeRevealStyles` carries `touch-action: pan-y` on `[data-swipe]`,
|
||||||
|
* and `utils/touch-gestures.ts` carries the non-passive
|
||||||
|
* `preventDefault`. Chrome 113's WebView cancels the pointer stream
|
||||||
|
* ~16px into any drag whatever `touch-action` says, and with the
|
||||||
|
* `preventDefault` alone but `touch-action` at `auto` the gesture dies
|
||||||
|
* after one move. Neither works without the other and **both are
|
||||||
|
* correct in Chromium either way**, which is why the component tier
|
||||||
|
* asserts the stylesheet rather than the rendering.
|
||||||
|
*
|
||||||
|
* **The row does not move; its cells do.** A row here is
|
||||||
|
* `contain: strict` with `overflow: hidden`, so translating the row
|
||||||
|
* and counter-translating a pane inside it puts that pane at a
|
||||||
|
* negative offset inside a clipping box, where it is simply not
|
||||||
|
* painted. Sliding the children instead leaves the pane where it was
|
||||||
|
* drawn, clips the cells off the right edge, and needs no wrapper
|
||||||
|
* element in a row that is already a grid.
|
||||||
|
*
|
||||||
|
* **The travel is written to the row's own style, never rendered.**
|
||||||
|
* One render when the gesture starts, one when it crosses the
|
||||||
|
* threshold, one when it ends — a virtualizer re-rendering every
|
||||||
|
* visible row per frame of one finger's travel is exactly what audit
|
||||||
|
* `perf.m1` is about.
|
||||||
|
*
|
||||||
|
* **The threshold is a fraction of the row**, with a floor. The row is
|
||||||
|
* 424x52 on the reference device, so a threshold in bare pixels is a
|
||||||
|
* fraction of a row height on one screen and a third of the width on
|
||||||
|
* the next.
|
||||||
|
*
|
||||||
|
* **It is not only a colour** (WCAG 1.4.1, the rule the playing-row
|
||||||
|
* marker exists for). The pane carries the queue icon and words, the
|
||||||
|
* words change at the threshold, and the outcome goes to a live
|
||||||
|
* region — one glyph throughout, because a tick is `ICON_IN_LIBRARY`
|
||||||
|
* and means *you own this*.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** How far along the row a swipe has to reach to mean it. */
|
||||||
|
export const SWIPE_COMMIT_FRACTION = 0.3;
|
||||||
|
|
||||||
|
/** … and a floor, for a narrow list embedded in a detail page. */
|
||||||
|
export const SWIPE_COMMIT_MIN_PX = 72;
|
||||||
|
|
||||||
|
/** How long the reveal holds its confirmation before snapping back. */
|
||||||
|
const CONFIRM_MS = 550;
|
||||||
|
|
||||||
|
/** The snap itself. `swipeRevealStyles` states the same number. */
|
||||||
|
const SETTLE_MS = 180;
|
||||||
|
|
||||||
|
/** What a swipe on one row would do, as the host understands it. */
|
||||||
|
export interface SwipeTarget {
|
||||||
|
/** Which row draws the reveal. */
|
||||||
|
index: number;
|
||||||
|
|
||||||
|
/** The file paths a commit queues, in the order they are shown. */
|
||||||
|
filePaths: string[];
|
||||||
|
|
||||||
|
/** What to call a single track when saying it was added. */
|
||||||
|
label: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface SwipeToQueueOptions {
|
||||||
|
/**
|
||||||
|
* The row the gesture is on, or null for anything that is not a
|
||||||
|
* swipeable row — a header, a gap, a track with no file.
|
||||||
|
*/
|
||||||
|
resolve(e: SwipeEvent): SwipeTarget | null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Repaint the rows. A `<lit-virtualizer>` renders through the
|
||||||
|
* `virtualize` directive and reacts to its *own* properties, so a
|
||||||
|
* host update alone leaves the rows exactly as they were.
|
||||||
|
*/
|
||||||
|
repaint(): void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SwipeToQueue implements ReactiveController {
|
||||||
|
private host: ReactiveControllerHost;
|
||||||
|
private opts: SwipeToQueueOptions;
|
||||||
|
|
||||||
|
/** Which row is being swiped, and therefore draws a reveal. */
|
||||||
|
private index: number | null = null;
|
||||||
|
|
||||||
|
/** Past the commit threshold: the reveal says so, in words. */
|
||||||
|
private armed = false;
|
||||||
|
|
||||||
|
/** Committed, and holding its confirmation. */
|
||||||
|
private done = false;
|
||||||
|
|
||||||
|
private row: HTMLElement | null = null;
|
||||||
|
private keys: string[] = [];
|
||||||
|
private commitPx = 0;
|
||||||
|
private settleTimer = 0;
|
||||||
|
|
||||||
|
/** What the gesture did, for anyone not watching the row. */
|
||||||
|
announcement = '';
|
||||||
|
|
||||||
|
constructor(host: ReactiveControllerHost, opts: SwipeToQueueOptions) {
|
||||||
|
this.host = host;
|
||||||
|
this.opts = opts;
|
||||||
|
host.addController(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
hostConnected(): void {
|
||||||
|
// No-op; state is component-local.
|
||||||
|
}
|
||||||
|
|
||||||
|
hostDisconnected(): void {
|
||||||
|
window.clearTimeout(this.settleTimer);
|
||||||
|
this.forget();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether this row is the one under the finger. */
|
||||||
|
isSwiping(index: number): boolean {
|
||||||
|
return this.index === index;
|
||||||
|
}
|
||||||
|
|
||||||
|
onSwipeStart = (e: SwipeEvent): void => {
|
||||||
|
// Rightward only. Nothing is bound to a leftward swipe, and
|
||||||
|
// claiming one would take a gesture away to do nothing with it.
|
||||||
|
if (e.detail.dx <= 0) return;
|
||||||
|
|
||||||
|
const target = this.opts.resolve(e);
|
||||||
|
|
||||||
|
if (!target || target.filePaths.length === 0) return;
|
||||||
|
|
||||||
|
const row = (e.target as HTMLElement).closest(
|
||||||
|
'[data-swipe]',
|
||||||
|
) as HTMLElement | null;
|
||||||
|
|
||||||
|
if (!row) return;
|
||||||
|
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
this.row = row;
|
||||||
|
this.keys = target.filePaths;
|
||||||
|
this.trackLabel = target.label;
|
||||||
|
this.commitPx = Math.max(
|
||||||
|
SWIPE_COMMIT_MIN_PX,
|
||||||
|
row.getBoundingClientRect().width * SWIPE_COMMIT_FRACTION,
|
||||||
|
);
|
||||||
|
this.armed = false;
|
||||||
|
this.done = false;
|
||||||
|
this.index = target.index;
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.opts.repaint();
|
||||||
|
this.offset(0);
|
||||||
|
};
|
||||||
|
|
||||||
|
onSwipeMove = (e: SwipeEvent): void => {
|
||||||
|
if (this.index === null) return;
|
||||||
|
|
||||||
|
const dx = Math.min(Math.max(e.detail.dx, 0), this.commitPx * 2);
|
||||||
|
const armed = dx >= this.commitPx;
|
||||||
|
|
||||||
|
if (armed !== this.armed) {
|
||||||
|
this.armed = armed;
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.opts.repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.offset(dx);
|
||||||
|
};
|
||||||
|
|
||||||
|
onSwipeEnd = (e: SwipeEvent): void => {
|
||||||
|
if (this.index === null) return;
|
||||||
|
|
||||||
|
if (e.detail.canceled || e.detail.dx < this.commitPx) {
|
||||||
|
this.settle(0);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
queueStore.addTracksToQueue(this.keys);
|
||||||
|
|
||||||
|
const count = this.keys.length;
|
||||||
|
|
||||||
|
// The reveal is the only thing on screen that says this
|
||||||
|
// happened -- the queue panel may well be closed -- so it holds
|
||||||
|
// its confirmation for a moment rather than vanishing the
|
||||||
|
// instant the finger lifts.
|
||||||
|
this.done = true;
|
||||||
|
this.announcement =
|
||||||
|
count === 1
|
||||||
|
? `Added ${this.label()} to the queue.`
|
||||||
|
: `Added ${count} tracks to the queue.`;
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.opts.repaint();
|
||||||
|
this.settle(CONFIRM_MS);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** What is revealed behind the row, in three states. */
|
||||||
|
renderReveal(index: number) {
|
||||||
|
if (this.index !== index) return nothing;
|
||||||
|
|
||||||
|
const count = this.keys.length;
|
||||||
|
const what = count === 1 ? 'to queue' : `${count} tracks to queue`;
|
||||||
|
const words = this.done
|
||||||
|
? 'Added'
|
||||||
|
: this.armed
|
||||||
|
? 'Release to add'
|
||||||
|
: `Add ${what}`;
|
||||||
|
|
||||||
|
return html`
|
||||||
|
<div
|
||||||
|
class=${classMap({ 'swipe-reveal': true, armed: this.armed })}
|
||||||
|
aria-hidden="true"
|
||||||
|
data-testid="swipe-reveal"
|
||||||
|
>
|
||||||
|
<wa-icon name=${ICON_QUEUE}></wa-icon>
|
||||||
|
<span>${words}</span>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What to call a single track, taken when the gesture starts.
|
||||||
|
*
|
||||||
|
* Held rather than looked up at the end, because a swipe outlives
|
||||||
|
* a refetch: the store replaces its array when a play count
|
||||||
|
* changes, which is once a song.
|
||||||
|
*/
|
||||||
|
private trackLabel = '';
|
||||||
|
|
||||||
|
private label(): string {
|
||||||
|
return this.trackLabel === '' ? 'the track' : this.trackLabel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Write the travel to the row itself, with no render. */
|
||||||
|
private offset(dx: number): void {
|
||||||
|
this.row?.style.setProperty('--yj-swipe-dx', `${dx}px`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Put the row back, after `delay`, and forget the swipe.
|
||||||
|
*
|
||||||
|
* The row element is held rather than looked up again: a
|
||||||
|
* virtualizer recycles its rows, and by the time this runs the
|
||||||
|
* element may be drawing a different track. Clearing the property
|
||||||
|
* off whatever it holds now is right either way, since `index` is
|
||||||
|
* what decides who draws the reveal.
|
||||||
|
*/
|
||||||
|
private settle(delay: number): void {
|
||||||
|
const row = this.row;
|
||||||
|
|
||||||
|
window.clearTimeout(this.settleTimer);
|
||||||
|
|
||||||
|
this.settleTimer = window.setTimeout(() => {
|
||||||
|
row?.classList.add('settling');
|
||||||
|
this.offset(0);
|
||||||
|
|
||||||
|
this.settleTimer = window.setTimeout(() => {
|
||||||
|
row?.classList.remove('settling');
|
||||||
|
row?.style.removeProperty('--yj-swipe-dx');
|
||||||
|
this.forget();
|
||||||
|
this.host.requestUpdate();
|
||||||
|
this.opts.repaint();
|
||||||
|
}, SETTLE_MS);
|
||||||
|
}, delay);
|
||||||
|
}
|
||||||
|
|
||||||
|
private forget(): void {
|
||||||
|
this.row = null;
|
||||||
|
this.index = null;
|
||||||
|
this.armed = false;
|
||||||
|
this.done = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The reveal, and the `touch-action` half of what makes the gesture
|
||||||
|
* reach us on the device.
|
||||||
|
*
|
||||||
|
* Keyed on `[data-swipe]` rather than on a class name, so one
|
||||||
|
* stylesheet serves three lists whose rows are called three different
|
||||||
|
* things.
|
||||||
|
*/
|
||||||
|
export const swipeRevealStyles = css`
|
||||||
|
/* Half of what makes the gesture reach us on Chrome 113's WebView:
|
||||||
|
auto lets it commit to a horizontal pan on the first move past
|
||||||
|
slop, and the pointer stream is cancelled before any threshold
|
||||||
|
can be crossed. The other half is the non-passive preventDefault
|
||||||
|
in utils/touch-gestures.ts, and neither works alone -- both were
|
||||||
|
measured three ways on the phone. Never none: that takes the
|
||||||
|
list's own vertical scrolling with it. */
|
||||||
|
[data-swipe] {
|
||||||
|
touch-action: pan-y;
|
||||||
|
}
|
||||||
|
|
||||||
|
.swipe-reveal {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
width: var(--yj-swipe-dx, 0px);
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.4em;
|
||||||
|
padding-left: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
pointer-events: none;
|
||||||
|
font-size: var(--yj-text-xs);
|
||||||
|
background-color: var(--yj-bg-elevated, #343a40);
|
||||||
|
color: var(--yj-text-secondary, #b3b3b3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.swipe-reveal.armed {
|
||||||
|
background-color: var(--yj-success, #2f9e44);
|
||||||
|
color: var(--yj-success-fg, #fff);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The children move, not the row -- see the header. */
|
||||||
|
[data-swipe].swiping > :not(.swipe-reveal) {
|
||||||
|
transform: translateX(var(--yj-swipe-dx, 0px));
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-swipe].settling > * {
|
||||||
|
transition:
|
||||||
|
transform 160ms ease-out,
|
||||||
|
width 160ms ease-out;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
[data-swipe].settling > * {
|
||||||
|
transition: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
@@ -0,0 +1,619 @@
|
|||||||
|
/**
|
||||||
|
* The touch gestures, as one document listener (plan 019, #63).
|
||||||
|
*
|
||||||
|
* This replaces `utils/long-press.ts` rather than sitting beside it,
|
||||||
|
* and that is the point: two document listeners both claiming the
|
||||||
|
* 500ms hold is exactly the fault that file's own header warns about.
|
||||||
|
* What it did — one capture listener, the target from
|
||||||
|
* `composedPath()[0]`, the browser's own gesture winning, the trailing
|
||||||
|
* click swallowed — is kept whole. What changes is what the gesture
|
||||||
|
* *means*.
|
||||||
|
*
|
||||||
|
* **A gesture is announced, not acted on.** Two composed, cancelable
|
||||||
|
* events are dispatched on the element the finger actually landed on:
|
||||||
|
*
|
||||||
|
* `yj-tap` a short press that did not drift
|
||||||
|
* `yj-long-press` a press that held still for LONG_PRESS_MS
|
||||||
|
* `yj-swipe-start` a press that has travelled decisively sideways
|
||||||
|
*
|
||||||
|
* A claimed swipe is then followed by `yj-swipe-move` and one
|
||||||
|
* `yj-swipe-end`, which is guaranteed: a swipe that the browser or a
|
||||||
|
* second finger takes away still ends, with `canceled` set, so the
|
||||||
|
* affordance a component put on screen always has something to snap
|
||||||
|
* back from.
|
||||||
|
*
|
||||||
|
* A component that wants the gesture handles it and calls
|
||||||
|
* `preventDefault()`. Nothing else changes. That shape is what lets
|
||||||
|
* this reassign the hold without touching a single one of the fourteen
|
||||||
|
* context menus downstream of it: **an unclaimed `yj-long-press` still
|
||||||
|
* becomes a synthetic `contextmenu`**, so a card grid, an Explore
|
||||||
|
* result or a playlist row behaves exactly as it did, and only the
|
||||||
|
* lists that opt in get selection mode.
|
||||||
|
*
|
||||||
|
* The same rule keeps taps honest. An unclaimed `yj-tap` does nothing
|
||||||
|
* at all and the browser's click follows normally, so every button,
|
||||||
|
* link and checkbox in the app is untouched by this file. Only a
|
||||||
|
* claimed tap has its click swallowed — otherwise playing a track
|
||||||
|
* would also select it.
|
||||||
|
*
|
||||||
|
* Five things are load-bearing.
|
||||||
|
*
|
||||||
|
* **The predicate is the pointer, not the platform** (plan 019,
|
||||||
|
* decision 1). `pointerType === 'touch'`, per event — so an Android
|
||||||
|
* tablet over 600px, a touchscreen laptop with a mouse also plugged
|
||||||
|
* in, and a narrow desktop window are all right for free, and there is
|
||||||
|
* no second declaration of what a phone does. Keyed on a viewport
|
||||||
|
* width, the first of those three gets desktop semantics on a
|
||||||
|
* touchscreen, which is the inversion #63 exists to fix, on the
|
||||||
|
* platform it exists for.
|
||||||
|
*
|
||||||
|
* **There is no double-tap**, and it is not an omission — see plan
|
||||||
|
* 019, decision 2. Measured on the reference device, the play command
|
||||||
|
* to `TrackChanged` is ~100ms; a double-tap discriminator has to hold
|
||||||
|
* every tap for the app's own `DOUBLE_CLICK_GRACE_MS` of 250 before it
|
||||||
|
* can act, which is 3.5x the primary interaction in the app to reach a
|
||||||
|
* menu that long-press already reaches.
|
||||||
|
*
|
||||||
|
* **The target comes from `composedPath()[0]`**, not
|
||||||
|
* `elementFromPoint`, which stops at the outermost shadow host: every
|
||||||
|
* list in this app delegates inside one, so an event dispatched on the
|
||||||
|
* host reaches a delegated listener and no per-row one.
|
||||||
|
*
|
||||||
|
* **A browser that fires its own `contextmenu` is a trigger, not a
|
||||||
|
* competitor**, and that is a change from `long-press.ts` rather than
|
||||||
|
* an inherited rule. It used to stand down when a trusted
|
||||||
|
* `contextmenu` arrived, because both paths ended in the same place: a
|
||||||
|
* context menu. They no longer do — ours may end in selection mode —
|
||||||
|
* so standing down means the gesture silently does the *old* thing.
|
||||||
|
*
|
||||||
|
* Measured on the reference device, which is the only tier that can
|
||||||
|
* see this: Chrome 113's WebView fires its own `contextmenu` on a long
|
||||||
|
* press, so a hold on a track row opened the context menu and
|
||||||
|
* `yj-long-press` was never announced at all. Every test in the
|
||||||
|
* component tier passed, because dispatched pointer events do not make
|
||||||
|
* a browser synthesise one.
|
||||||
|
*
|
||||||
|
* So a trusted `contextmenu` arriving mid-press *becomes* the long
|
||||||
|
* press: `yj-long-press` is announced from it, and only if a component
|
||||||
|
* claims it is the native event suppressed. Unclaimed, it propagates
|
||||||
|
* untouched and opens the menu it always did — which is the same
|
||||||
|
* "browser wins" outcome, now reached by asking rather than assuming.
|
||||||
|
*
|
||||||
|
* Ours and the browser's are still told apart by identity rather than
|
||||||
|
* `isTrusted` — a `WeakSet` of the events this module made — so the
|
||||||
|
* suppressor cannot eat the event it exists to deliver, and a test can
|
||||||
|
* stand in for a browser that fires one.
|
||||||
|
*
|
||||||
|
* **The click swallow is keyed on the gesture**, cleared by the next
|
||||||
|
* `pointerdown` rather than by a time window, so the first tap on a
|
||||||
|
* sheet that just opened is not eaten too.
|
||||||
|
*
|
||||||
|
* ## The swipe runs on touch events, and that is not a style choice
|
||||||
|
*
|
||||||
|
* Everything above is Pointer Events. The swipe is not, and the reason
|
||||||
|
* is measured on the reference device rather than reasoned about:
|
||||||
|
* **Chrome 113's Android WebView cancels the pointer stream ~16px into
|
||||||
|
* any drag, whatever `touch-action` says.** Three values were tried on
|
||||||
|
* a track row, driving a real finger with `adb shell input swipe`:
|
||||||
|
*
|
||||||
|
* ```
|
||||||
|
* touch-action: auto pointerdown, 1 move, pointercancel
|
||||||
|
* touch-action: pan-y pointerdown, 2 moves, pointercancel
|
||||||
|
* touch-action: none pointerdown, 2 moves, pointercancel
|
||||||
|
* ```
|
||||||
|
*
|
||||||
|
* `touchmove` kept firing throughout all three. So a swipe recognised
|
||||||
|
* from `pointermove` is a swipe that dies 16px in — plan 019 predicted
|
||||||
|
* the class of failure ("works in Chromium and not on the phone") and
|
||||||
|
* named `touch-action: pan-y` as the fix; it is half of it.
|
||||||
|
*
|
||||||
|
* The other half is that **a non-passive `touchmove` that calls
|
||||||
|
* `preventDefault()` is what keeps the gesture ours**. With it, the
|
||||||
|
* same swipe ran to 12 moves and a `pointerup` at full travel.
|
||||||
|
*
|
||||||
|
* Both halves are required, and that was measured too: with the
|
||||||
|
* `preventDefault` in place but `touch-action` back at `auto`, the
|
||||||
|
* gesture died after **one** move. The reading is that `auto` lets the
|
||||||
|
* browser commit to a horizontal pan on the first move past slop —
|
||||||
|
* before any threshold of ours can have been crossed — while `pan-y`
|
||||||
|
* leaves it undecided long enough for the second move to claim it.
|
||||||
|
*
|
||||||
|
* So a surface that wants a horizontal swipe declares
|
||||||
|
* `touch-action: pan-y` (`track-list`'s `.track-row` does) *and* gets
|
||||||
|
* this module's `preventDefault`. Neither alone works on the device,
|
||||||
|
* and **both work in Chromium either way**, which is exactly why this
|
||||||
|
* paragraph exists rather than a test.
|
||||||
|
*
|
||||||
|
* `touch-action: none` is the one value to avoid: it also takes the
|
||||||
|
* list's vertical scrolling away, which was measured as a list that
|
||||||
|
* would not move.
|
||||||
|
*
|
||||||
|
* Two consequences of the touch listener worth knowing.
|
||||||
|
*
|
||||||
|
* **It is non-passive, which costs the compositor's scroll fast path**
|
||||||
|
* for the first touchmoves of every scroll, until the browser starts
|
||||||
|
* scrolling and stops waiting on us. That is the standard price of a
|
||||||
|
* horizontal gesture in a scroller and it is paid once per gesture,
|
||||||
|
* not per frame; a vertical drag on the device still scrolls the
|
||||||
|
* virtualizer 81px on the same measurement that the horizontal one
|
||||||
|
* survives.
|
||||||
|
*
|
||||||
|
* **The tie breaks toward scrolling**, deliberately and in that order:
|
||||||
|
* vertical drift past the tolerance vetoes the swipe outright, and a
|
||||||
|
* gesture that is not *strictly* more horizontal than vertical is the
|
||||||
|
* scroller's. A list that will not scroll is unusable; a swipe that
|
||||||
|
* needs a second try is not.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** How long a press must hold still to mean "long press". */
|
||||||
|
export const LONG_PRESS_MS = 500;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How far a press may drift and still count. Below a finger's own
|
||||||
|
* jitter is a gesture nobody can perform; above ~12px it starts
|
||||||
|
* stealing the first frames of a scroll.
|
||||||
|
*/
|
||||||
|
export const MOVE_TOLERANCE_PX = 10;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* How far a press must travel sideways before it is a swipe.
|
||||||
|
*
|
||||||
|
* It has a ceiling the other constants do not: the browser's own
|
||||||
|
* decision is made a little past this, so a threshold much higher is a
|
||||||
|
* gesture the device never delivers. Measured, the second `touchmove`
|
||||||
|
* of an `adb input swipe` lands at ~19px and the pointer stream dies
|
||||||
|
* just after it, so 12 is inside that window with room for a slower
|
||||||
|
* finger.
|
||||||
|
*/
|
||||||
|
export const SWIPE_START_PX = 12;
|
||||||
|
|
||||||
|
/** Detail carried by both gesture events. */
|
||||||
|
export interface GestureDetail {
|
||||||
|
/** Where the finger was, in client coordinates — a menu opens here. */
|
||||||
|
x: number;
|
||||||
|
y: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Detail carried by the three swipe events. */
|
||||||
|
export interface SwipeDetail {
|
||||||
|
/** Travel from where the finger landed. Signed: right is positive. */
|
||||||
|
dx: number;
|
||||||
|
dy: number;
|
||||||
|
/**
|
||||||
|
* The gesture was taken away rather than finished — a second
|
||||||
|
* finger, a `touchcancel`, a scroll underneath. Only ever true on
|
||||||
|
* `yj-swipe-end`, and it is the difference between "do the thing"
|
||||||
|
* and "put the row back".
|
||||||
|
*/
|
||||||
|
canceled: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type GestureEvent = CustomEvent<GestureDetail>;
|
||||||
|
export type SwipeEvent = CustomEvent<SwipeDetail>;
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface HTMLElementEventMap {
|
||||||
|
'yj-tap': GestureEvent;
|
||||||
|
'yj-long-press': GestureEvent;
|
||||||
|
'yj-swipe-start': SwipeEvent;
|
||||||
|
'yj-swipe-move': SwipeEvent;
|
||||||
|
'yj-swipe-end': SwipeEvent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The active installation, so a second call is a no-op rather than a
|
||||||
|
* second listener set. */
|
||||||
|
let uninstall: (() => void) | null = null;
|
||||||
|
|
||||||
|
/** The events this module dispatched. Identity, not `isTrusted`. */
|
||||||
|
const ours = new WeakSet<Event>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Install the gestures. Idempotent; returns the uninstaller (which the
|
||||||
|
* tests use — the app installs once and never removes it).
|
||||||
|
*/
|
||||||
|
export function installTouchGestures(): () => void {
|
||||||
|
if (uninstall) return uninstall;
|
||||||
|
|
||||||
|
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
let originX = 0;
|
||||||
|
let originY = 0;
|
||||||
|
let target: EventTarget | null = null;
|
||||||
|
|
||||||
|
/** The press is still a candidate for a tap: it has neither
|
||||||
|
* drifted nor become a long press. */
|
||||||
|
let tapCandidate = false;
|
||||||
|
|
||||||
|
/** A trusted `contextmenu` arrived for this press: the browser has
|
||||||
|
* it covered. */
|
||||||
|
let nativeSeen = false;
|
||||||
|
|
||||||
|
/** A gesture was claimed, and the click ending it is not a click on
|
||||||
|
* anything. */
|
||||||
|
let swallowClick = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This press has already produced its outcome, so a trusted
|
||||||
|
* `contextmenu` arriving now is a duplicate of it.
|
||||||
|
*
|
||||||
|
* It covers **both** outcomes, and that is a fix rather than a
|
||||||
|
* tidy-up. `nativeSeen` handles the browser's menu arriving
|
||||||
|
* *during* the hold; the reverse order was never handled, and it
|
||||||
|
* happens: measured on the reference device over four holds, two
|
||||||
|
* of them fired our 500ms timer and then delivered a trusted
|
||||||
|
* `contextmenu` 50-70ms later, which nothing suppressed — so the
|
||||||
|
* context menu opened on top of the selection bar, intermittently,
|
||||||
|
* on exactly the surface #63 exists to have changed. Neither the
|
||||||
|
* component tier nor the e2e tier can see it: no browser they run
|
||||||
|
* in synthesises a `contextmenu` from a dispatched press at all.
|
||||||
|
*/
|
||||||
|
let justFired = false;
|
||||||
|
|
||||||
|
// --- the swipe, which runs on touch events; see the header ------
|
||||||
|
|
||||||
|
/** Where the finger landed, and what it landed on. */
|
||||||
|
let swipeTarget: EventTarget | null = null;
|
||||||
|
let swipeOriginX = 0;
|
||||||
|
let swipeOriginY = 0;
|
||||||
|
|
||||||
|
/** The last travel, kept so a `touchcancel` — which carries no
|
||||||
|
* coordinates for a touch that is already gone — can still say how
|
||||||
|
* far the row had moved. */
|
||||||
|
let lastDx = 0;
|
||||||
|
let lastDy = 0;
|
||||||
|
|
||||||
|
/** A component claimed the swipe: it is ours until the finger
|
||||||
|
* lifts, and every `touchmove` is prevented. */
|
||||||
|
let swiping = false;
|
||||||
|
|
||||||
|
/** This press can no longer become a swipe — it went vertical, a
|
||||||
|
* second finger arrived, or nobody claimed it. */
|
||||||
|
let swipeVetoed = false;
|
||||||
|
|
||||||
|
const cancel = (): void => {
|
||||||
|
if (timer !== null) clearTimeout(timer);
|
||||||
|
|
||||||
|
timer = null;
|
||||||
|
target = null;
|
||||||
|
tapCandidate = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Announce a gesture on the element the finger landed on.
|
||||||
|
* Returns whether a component claimed it.
|
||||||
|
*/
|
||||||
|
const announce = (name: 'yj-tap' | 'yj-long-press', el: EventTarget): boolean => {
|
||||||
|
const event: GestureEvent = new CustomEvent<GestureDetail>(name, {
|
||||||
|
bubbles: true,
|
||||||
|
cancelable: true,
|
||||||
|
// Or it stops at the shadow root the row lives in, and the
|
||||||
|
// delegated listeners never see it.
|
||||||
|
composed: true,
|
||||||
|
detail: { x: originX, y: originY },
|
||||||
|
});
|
||||||
|
|
||||||
|
ours.add(event);
|
||||||
|
el.dispatchEvent(event);
|
||||||
|
|
||||||
|
return event.defaultPrevented;
|
||||||
|
};
|
||||||
|
|
||||||
|
const fireContextMenu = (el: EventTarget): void => {
|
||||||
|
justFired = true;
|
||||||
|
|
||||||
|
const menu = new MouseEvent('contextmenu', {
|
||||||
|
bubbles: true,
|
||||||
|
cancelable: true,
|
||||||
|
composed: true,
|
||||||
|
clientX: originX,
|
||||||
|
clientY: originY,
|
||||||
|
button: 2,
|
||||||
|
});
|
||||||
|
|
||||||
|
ours.add(menu);
|
||||||
|
el.dispatchEvent(menu);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onLongPress = (): void => {
|
||||||
|
timer = null;
|
||||||
|
tapCandidate = false;
|
||||||
|
|
||||||
|
const el = target;
|
||||||
|
|
||||||
|
target = null;
|
||||||
|
|
||||||
|
if (nativeSeen || !el) return;
|
||||||
|
|
||||||
|
// The gesture happened either way, so the click that ends it is
|
||||||
|
// never a click on anything -- whether a list claimed it for
|
||||||
|
// selection mode or a card grid let it fall through to a menu.
|
||||||
|
swallowClick = true;
|
||||||
|
|
||||||
|
// The press is answered, so a trusted `contextmenu` for it is
|
||||||
|
// late rather than new. `fireContextMenu` sets this too; it is
|
||||||
|
// set here as well so the *claimed* branch is covered, which
|
||||||
|
// is the branch that was showing a menu over the bar.
|
||||||
|
justFired = true;
|
||||||
|
|
||||||
|
// An unclaimed long press is what it has always been. This is
|
||||||
|
// the whole reason the fourteen context menus need no change.
|
||||||
|
if (!announce('yj-long-press', el)) fireContextMenu(el);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPointerDown = (e: PointerEvent): void => {
|
||||||
|
// A new gesture: whatever the last one left behind is stale.
|
||||||
|
swallowClick = false;
|
||||||
|
justFired = false;
|
||||||
|
nativeSeen = false;
|
||||||
|
cancel();
|
||||||
|
|
||||||
|
if (e.pointerType !== 'touch' || !e.isPrimary) return;
|
||||||
|
|
||||||
|
originX = e.clientX;
|
||||||
|
originY = e.clientY;
|
||||||
|
target = e.composedPath()[0] ?? e.target;
|
||||||
|
tapCandidate = true;
|
||||||
|
timer = setTimeout(onLongPress, LONG_PRESS_MS);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Announce a swipe on the element the finger landed on.
|
||||||
|
* Returns whether a component claimed it (only `start` asks).
|
||||||
|
*/
|
||||||
|
const announceSwipe = (
|
||||||
|
name: 'yj-swipe-start' | 'yj-swipe-move' | 'yj-swipe-end',
|
||||||
|
el: EventTarget,
|
||||||
|
canceled = false,
|
||||||
|
): boolean => {
|
||||||
|
const event: SwipeEvent = new CustomEvent<SwipeDetail>(name, {
|
||||||
|
bubbles: true,
|
||||||
|
cancelable: name === 'yj-swipe-start',
|
||||||
|
composed: true,
|
||||||
|
detail: { dx: lastDx, dy: lastDy, canceled },
|
||||||
|
});
|
||||||
|
|
||||||
|
ours.add(event);
|
||||||
|
el.dispatchEvent(event);
|
||||||
|
|
||||||
|
return event.defaultPrevented;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* End a claimed swipe, once.
|
||||||
|
*
|
||||||
|
* Every exit from a swipe comes through here so that `yj-swipe-end`
|
||||||
|
* is guaranteed: a component that has put a reveal on screen and a
|
||||||
|
* row half off its own left edge has no other way to learn the
|
||||||
|
* gesture is over.
|
||||||
|
*/
|
||||||
|
const endSwipe = (canceled: boolean): void => {
|
||||||
|
const el = swipeTarget;
|
||||||
|
|
||||||
|
swipeTarget = null;
|
||||||
|
|
||||||
|
if (!swiping) return;
|
||||||
|
|
||||||
|
swiping = false;
|
||||||
|
|
||||||
|
if (!el) return;
|
||||||
|
|
||||||
|
// The gesture happened, so the click that ends it is not a
|
||||||
|
// click on the row it ended over.
|
||||||
|
swallowClick = true;
|
||||||
|
announceSwipe('yj-swipe-end', el, canceled);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onTouchStart = (e: TouchEvent): void => {
|
||||||
|
endSwipe(true);
|
||||||
|
|
||||||
|
lastDx = 0;
|
||||||
|
lastDy = 0;
|
||||||
|
|
||||||
|
// A second finger is a pinch or a scroll, never one of ours.
|
||||||
|
swipeVetoed = e.touches.length !== 1;
|
||||||
|
|
||||||
|
if (swipeVetoed) return;
|
||||||
|
|
||||||
|
const touch = e.touches[0];
|
||||||
|
|
||||||
|
if (!touch) return;
|
||||||
|
|
||||||
|
swipeOriginX = touch.clientX;
|
||||||
|
swipeOriginY = touch.clientY;
|
||||||
|
// `composedPath()[0]` for the reason the press path uses it: a
|
||||||
|
// list delegates inside its own shadow root.
|
||||||
|
swipeTarget = e.composedPath()[0] ?? e.target;
|
||||||
|
};
|
||||||
|
|
||||||
|
const onTouchMove = (e: TouchEvent): void => {
|
||||||
|
if (swipeVetoed || !swipeTarget) return;
|
||||||
|
|
||||||
|
if (e.touches.length !== 1) {
|
||||||
|
endSwipe(true);
|
||||||
|
swipeVetoed = true;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const touch = e.touches[0];
|
||||||
|
|
||||||
|
if (!touch) return;
|
||||||
|
|
||||||
|
lastDx = touch.clientX - swipeOriginX;
|
||||||
|
lastDy = touch.clientY - swipeOriginY;
|
||||||
|
|
||||||
|
if (swiping) {
|
||||||
|
// This is what keeps the stream alive on the device. It is
|
||||||
|
// only ever reached for a *claimed* swipe, so nothing that
|
||||||
|
// scrolls is ever prevented.
|
||||||
|
e.preventDefault();
|
||||||
|
announceSwipe('yj-swipe-move', swipeTarget);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vertical first: past the tolerance the list has it, and a
|
||||||
|
// gesture that is exactly diagonal is the list's too.
|
||||||
|
if (
|
||||||
|
Math.abs(lastDy) > MOVE_TOLERANCE_PX &&
|
||||||
|
Math.abs(lastDy) >= Math.abs(lastDx)
|
||||||
|
) {
|
||||||
|
swipeVetoed = true;
|
||||||
|
swipeTarget = null;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
Math.abs(lastDx) < SWIPE_START_PX ||
|
||||||
|
Math.abs(lastDx) <= Math.abs(lastDy)
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!announceSwipe('yj-swipe-start', swipeTarget)) {
|
||||||
|
// Nobody wants it. Leave the gesture to the browser rather
|
||||||
|
// than holding it open for the rest of the press.
|
||||||
|
swipeVetoed = true;
|
||||||
|
swipeTarget = null;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
swiping = true;
|
||||||
|
|
||||||
|
// It is not a tap and it is not a hold.
|
||||||
|
cancel();
|
||||||
|
e.preventDefault();
|
||||||
|
};
|
||||||
|
|
||||||
|
const onTouchEnd = (): void => {
|
||||||
|
endSwipe(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onTouchCancel = (): void => {
|
||||||
|
endSwipe(true);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPointerMove = (e: PointerEvent): void => {
|
||||||
|
if (timer === null) return;
|
||||||
|
|
||||||
|
const drifted =
|
||||||
|
Math.abs(e.clientX - originX) > MOVE_TOLERANCE_PX ||
|
||||||
|
Math.abs(e.clientY - originY) > MOVE_TOLERANCE_PX;
|
||||||
|
|
||||||
|
// A drifted press is neither gesture -- it is a scroll, and the
|
||||||
|
// virtualizer's, not ours.
|
||||||
|
if (drifted) cancel();
|
||||||
|
};
|
||||||
|
|
||||||
|
const onPointerUp = (): void => {
|
||||||
|
const el = target;
|
||||||
|
const wasTap = tapCandidate && timer !== null;
|
||||||
|
|
||||||
|
// Clears the long-press timer, so a tap cannot also become one.
|
||||||
|
cancel();
|
||||||
|
|
||||||
|
if (!wasTap || !el) return;
|
||||||
|
|
||||||
|
// Only a *claimed* tap swallows its click. An unclaimed one has
|
||||||
|
// to fall through untouched, or every button in the app stops
|
||||||
|
// working.
|
||||||
|
if (announce('yj-tap', el)) swallowClick = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
const onContextMenu = (e: Event): void => {
|
||||||
|
// Ours. Everything below is about somebody else's.
|
||||||
|
if (ours.has(e)) return;
|
||||||
|
|
||||||
|
if (timer !== null) {
|
||||||
|
// The browser recognised the same hold this was timing.
|
||||||
|
// Use its event as the trigger rather than racing it --
|
||||||
|
// and rather than standing down, which is what the old
|
||||||
|
// rule did and which now silently means "do the thing this
|
||||||
|
// gesture used to do".
|
||||||
|
const el = e.composedPath()[0] ?? e.target;
|
||||||
|
|
||||||
|
nativeSeen = true;
|
||||||
|
cancel();
|
||||||
|
|
||||||
|
if (!el) return;
|
||||||
|
|
||||||
|
swallowClick = true;
|
||||||
|
|
||||||
|
// Claimed: the component wants selection mode, so the
|
||||||
|
// browser's menu must not also open. Unclaimed: let it
|
||||||
|
// through exactly as before.
|
||||||
|
if (announce('yj-long-press', el)) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (justFired) {
|
||||||
|
justFired = false;
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const onClick = (e: Event): void => {
|
||||||
|
if (!swallowClick) return;
|
||||||
|
|
||||||
|
swallowClick = false;
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopImmediatePropagation();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Capture throughout: a component handler that stops propagation
|
||||||
|
// (every context-menu handler in the app does) must not be able to
|
||||||
|
// hide the gesture from this, and the suppressors have to run
|
||||||
|
// before anything that would act on the event.
|
||||||
|
const opts = { capture: true } as const;
|
||||||
|
|
||||||
|
// Non-passive, because `onTouchMove` has to be able to prevent the
|
||||||
|
// default for a claimed swipe -- see the header. The other three
|
||||||
|
// are passive: they only read.
|
||||||
|
const blocking = { capture: true, passive: false } as const;
|
||||||
|
const listening = { capture: true, passive: true } as const;
|
||||||
|
|
||||||
|
/** A surface moved under the finger: neither gesture survives it. */
|
||||||
|
const abort = (): void => {
|
||||||
|
endSwipe(true);
|
||||||
|
cancel();
|
||||||
|
};
|
||||||
|
|
||||||
|
document.addEventListener('pointerdown', onPointerDown, opts);
|
||||||
|
document.addEventListener('pointermove', onPointerMove, opts);
|
||||||
|
document.addEventListener('pointerup', onPointerUp, opts);
|
||||||
|
document.addEventListener('pointercancel', cancel, opts);
|
||||||
|
document.addEventListener('contextmenu', onContextMenu, opts);
|
||||||
|
document.addEventListener('click', onClick, opts);
|
||||||
|
document.addEventListener('touchstart', onTouchStart, listening);
|
||||||
|
document.addEventListener('touchmove', onTouchMove, blocking);
|
||||||
|
document.addEventListener('touchend', onTouchEnd, listening);
|
||||||
|
document.addEventListener('touchcancel', onTouchCancel, listening);
|
||||||
|
// A scroll started by something other than the finger (momentum, a
|
||||||
|
// programmatic reveal) still means the press was not a press.
|
||||||
|
document.addEventListener('scroll', abort, listening);
|
||||||
|
|
||||||
|
uninstall = () => {
|
||||||
|
abort();
|
||||||
|
document.removeEventListener('pointerdown', onPointerDown, opts);
|
||||||
|
document.removeEventListener('pointermove', onPointerMove, opts);
|
||||||
|
document.removeEventListener('pointerup', onPointerUp, opts);
|
||||||
|
document.removeEventListener('pointercancel', cancel, opts);
|
||||||
|
document.removeEventListener('contextmenu', onContextMenu, opts);
|
||||||
|
document.removeEventListener('click', onClick, opts);
|
||||||
|
document.removeEventListener('touchstart', onTouchStart, opts);
|
||||||
|
document.removeEventListener('touchmove', onTouchMove, opts);
|
||||||
|
document.removeEventListener('touchend', onTouchEnd, opts);
|
||||||
|
document.removeEventListener('touchcancel', onTouchCancel, opts);
|
||||||
|
document.removeEventListener('scroll', abort, opts);
|
||||||
|
uninstall = null;
|
||||||
|
};
|
||||||
|
|
||||||
|
return uninstall;
|
||||||
|
}
|
||||||
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.5 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.3 KiB |
@@ -0,0 +1,230 @@
|
|||||||
|
/**
|
||||||
|
* The controls #186's second table found, outside Settings.
|
||||||
|
*
|
||||||
|
* Six one-off controls across four surfaces, and the reason they are a
|
||||||
|
* test rather than six stylesheet edits is `back-button`. The issue
|
||||||
|
* names it in `artist-details` at **32x32**; it is the same
|
||||||
|
* declaration, byte-identical, in *six* components — because a device
|
||||||
|
* sweep walks the views somebody thought to open, and five of them
|
||||||
|
* were not opened.
|
||||||
|
*
|
||||||
|
* So the assertion is over the whole set rather than over the one that
|
||||||
|
* was measured. That is `icon-language.test.ts`'s shape and it is here
|
||||||
|
* for the same reason: checking one call site checks one call site.
|
||||||
|
*
|
||||||
|
* | control | before | where |
|
||||||
|
* |---|---|---|
|
||||||
|
* | `.folders-menu-trigger` | **32x18** | autotag |
|
||||||
|
* | `.section-toggle` | 187x**15** | autotag |
|
||||||
|
* | `.back-button` | 32x32 | six detail views |
|
||||||
|
* | Requests / Downloads tabs | 85x**34**, 96x**34** | downloads |
|
||||||
|
* | `.search-mode-tab` | 89x**26**, 79x**26** | explore |
|
||||||
|
* | explore search input | 325x**18** in a 36px box | explore |
|
||||||
|
*
|
||||||
|
* `page-action-check-now` (113x29) is in that table and is **not**
|
||||||
|
* here: it is a `PageAction`, so #195 raised it with the rest of the
|
||||||
|
* page header's actions, and `touch-targets.test.ts` already covers
|
||||||
|
* it. Re-asserting it here would be a second statement of one rule.
|
||||||
|
*/
|
||||||
|
import { beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/artist-details/artist-details';
|
||||||
|
import '@components/autotag-view/autotag-view';
|
||||||
|
import '@components/downloads-view/downloads-view';
|
||||||
|
import '@components/explore-album-details/explore-album-details';
|
||||||
|
import '@components/explore-artist-details/explore-artist-details';
|
||||||
|
import '@components/explore-view/explore-view';
|
||||||
|
import '@components/genre-details/genre-details';
|
||||||
|
import '@components/playlist-details/playlist-details';
|
||||||
|
import '@components/smart-playlist-details/smart-playlist-details';
|
||||||
|
|
||||||
|
import { flush, stub } from '@test/support/harness';
|
||||||
|
import { fixture, shadow, shadowAll } from '@test/support/render';
|
||||||
|
|
||||||
|
/** The app's touch floor, from #56. */
|
||||||
|
const FLOOR = 44;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every component that draws a back button.
|
||||||
|
*
|
||||||
|
* The list is here rather than derived because deriving it means
|
||||||
|
* reading the source, and this tier renders instead — but it is
|
||||||
|
* checked against the source by `the back button is one declaration`
|
||||||
|
* below, so a seventh view cannot join quietly.
|
||||||
|
*/
|
||||||
|
const BACK_BUTTON_VIEWS = [
|
||||||
|
'artist-details',
|
||||||
|
'genre-details',
|
||||||
|
'playlist-details',
|
||||||
|
'smart-playlist-details',
|
||||||
|
'explore-artist-details',
|
||||||
|
'explore-album-details',
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
function boxOf(el: Element | null | undefined): { w: number; h: number } {
|
||||||
|
if (!el) return { w: 0, h: 0 };
|
||||||
|
|
||||||
|
const box = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return { w: Math.round(box.width), h: Math.round(box.height) };
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('the way out of a detail view', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
for (const path of [
|
||||||
|
'library.Library.GetTracks',
|
||||||
|
'library.Library.GetAlbums',
|
||||||
|
'library.Library.GetArtists',
|
||||||
|
'library.Library.GetGenres',
|
||||||
|
'playlist.Service.GetAllPlaylists',
|
||||||
|
'playlist.Service.GetAllPlaylistsWithTracks',
|
||||||
|
]) {
|
||||||
|
stub(path, []);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each(BACK_BUTTON_VIEWS)('is 44px in <%s>', async (tag) => {
|
||||||
|
// #55 settled this one component over, when the queue panel's
|
||||||
|
// close button was 25x21 and, at phone width, the only pointer
|
||||||
|
// route off a full-screen surface: "the way out is 44px". A detail
|
||||||
|
// view has the platform's back gesture as well, so it is less
|
||||||
|
// severe -- and it is the same control wearing the same mistake.
|
||||||
|
const el = await fixture(tag);
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const back = shadow(el, '.back-button');
|
||||||
|
|
||||||
|
expect(back, `${tag} draws a back button`).toBeTruthy();
|
||||||
|
expect(boxOf(back)).toEqual({ w: FLOOR, h: FLOOR });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is one declaration, so a seventh view cannot miss it', async () => {
|
||||||
|
// The regression this exists for is not a size changing -- it is
|
||||||
|
// somebody adding a detail view and writing `.back-button` out
|
||||||
|
// again at 32px, which is exactly how there came to be six copies.
|
||||||
|
// A sweep of the running app would not catch it either, because a
|
||||||
|
// sweep visits the views you think to open.
|
||||||
|
const sources = import.meta.glob('../../src/components/**/*.ts', {
|
||||||
|
query: '?raw',
|
||||||
|
import: 'default',
|
||||||
|
eager: true,
|
||||||
|
}) as Record<string, string>;
|
||||||
|
|
||||||
|
expect(Object.keys(sources).length, 'the glob read something').toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const redeclared = Object.entries(sources)
|
||||||
|
.filter(([, src]) => /^\s*\.back-button\s*(?::[a-z-]+\s*)?\{/m.test(src))
|
||||||
|
.map(([path]) => path);
|
||||||
|
|
||||||
|
expect(redeclared).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('autotag', () => {
|
||||||
|
it('raises the two smallest controls the sweep found', async () => {
|
||||||
|
// 187x15 and 32x18. The section toggle was the smallest control
|
||||||
|
// measured anywhere in the app until the column arrows were
|
||||||
|
// counted, and autotag is off by default (#25), which is
|
||||||
|
// presumably why nobody had met either.
|
||||||
|
const el = await fixture('autotag-view');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
for (const selector of ['.section-toggle', '.folders-menu-trigger']) {
|
||||||
|
const control = shadowAll<HTMLElement>(el, selector).find(
|
||||||
|
(c) => c.getBoundingClientRect().height > 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!control) continue;
|
||||||
|
|
||||||
|
expect(boxOf(control).h, `${selector} height`).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
}
|
||||||
|
|
||||||
|
// The stylesheet is the assertion for whichever of the two this
|
||||||
|
// fixture does not render -- both are behind state a bare mount
|
||||||
|
// does not reach, and a test that silently checked nothing is the
|
||||||
|
// trap icon-language.test.ts's first assertion exists for.
|
||||||
|
const sheet = (el.constructor as typeof HTMLElement & { styles?: unknown })
|
||||||
|
.styles;
|
||||||
|
|
||||||
|
expect(String(sheet)).toContain('min-block-size: 44px');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the Downloads tabs', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
stub('download.Service.ListDownloads', []);
|
||||||
|
stub('download.Service.ListRequests', []);
|
||||||
|
stub('download.Service.ListProviders', []);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('are the only route to their panels, and are 44px', async () => {
|
||||||
|
const el = await fixture('downloads-view');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const tabs = shadowAll<HTMLElement>(el, '[role="tab"]');
|
||||||
|
|
||||||
|
expect(tabs).toHaveLength(2);
|
||||||
|
|
||||||
|
for (const tab of tabs) {
|
||||||
|
expect(boxOf(tab).h, tab.textContent?.trim()).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the active underline against the label', async () => {
|
||||||
|
// The height is padding rather than a min-size, because the mark
|
||||||
|
// for the selected tab is the bottom border -- a min-size would
|
||||||
|
// centre the label and leave the underline 10px below it.
|
||||||
|
const el = await fixture('downloads-view');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const tab = shadowAll<HTMLElement>(el, '[role="tab"]')[0]!;
|
||||||
|
const style = getComputedStyle(tab);
|
||||||
|
|
||||||
|
expect(parseFloat(style.paddingBlockStart)).toBeGreaterThan(8);
|
||||||
|
expect(style.paddingBlockStart).toBe(style.paddingBlockEnd);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("Explore's own search row", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
stub('explore.Service.GetShelves', { State: 'ready', Shelves: [] });
|
||||||
|
stub('explore.Service.GetIndexStatus', {});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('raises the mode tabs', async () => {
|
||||||
|
const el = await fixture('explore-view');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const tabs = shadowAll<HTMLElement>(el, '.search-mode-tab');
|
||||||
|
|
||||||
|
expect(tabs.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
for (const tab of tabs) {
|
||||||
|
expect(boxOf(tab).h, tab.textContent?.trim()).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('makes the whole search box the input, not the middle 18px of it', async () => {
|
||||||
|
// Two faults, not one: the row was 36px and the input inside it
|
||||||
|
// was **18**, so half the box was not a target at all -- a tap
|
||||||
|
// near the top or bottom edge landed on the container and did
|
||||||
|
// nothing. The container is 44 and the input stretches to fill it.
|
||||||
|
const el = await fixture('explore-view');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const box = shadow(el, '.search-container');
|
||||||
|
const input = shadow(el, '.search-container input');
|
||||||
|
|
||||||
|
expect(box, 'the search row renders').toBeTruthy();
|
||||||
|
expect(input, 'it holds an input').toBeTruthy();
|
||||||
|
|
||||||
|
expect(boxOf(box).h).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
expect(boxOf(input).h).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* A hover affordance is gated on the device having hover.
|
* A hover affordance is gated on the device having hover — in whichever
|
||||||
|
* direction keeps the action reachable.
|
||||||
*
|
*
|
||||||
* The home page's cover cards reveal a play button on :hover. A touch
|
* The home page's cover cards reveal a play button on :hover. A touch
|
||||||
* long-press synthesises a hover state in the WebView, so on a phone
|
* long-press synthesises a hover state in the WebView, so on a phone
|
||||||
@@ -7,6 +8,15 @@
|
|||||||
* utils/long-press.ts is measuring for a context menu — a control
|
* utils/long-press.ts is measuring for a context menu — a control
|
||||||
* appearing because the user was reaching for a different one.
|
* appearing because the user was reaching for a different one.
|
||||||
*
|
*
|
||||||
|
* #137 is the same sweep with the opposite answer for two of its three
|
||||||
|
* cases. Where the revealed control is the *only* route to its action,
|
||||||
|
* hiding it removes the action, so it is always visible where there is
|
||||||
|
* no hover: `track-details`'s cover-art overlay and remove, and
|
||||||
|
* `shortcut-capture`'s reset. The queue's per-row remove is the third,
|
||||||
|
* and is the redundant kind — since #60 the row's context menu is a
|
||||||
|
* bottom sheet carrying "Remove from Queue" — so it takes #68's
|
||||||
|
* treatment here.
|
||||||
|
*
|
||||||
* This is asserted against the *parsed stylesheet* rather than by
|
* This is asserted against the *parsed stylesheet* rather than by
|
||||||
* emulating a touch device, and that is a limitation worth stating
|
* emulating a touch device, and that is a limitation worth stating
|
||||||
* rather than hiding. CDP's Emulation.setEmulatedMedia does not reach
|
* rather than hiding. CDP's Emulation.setEmulatedMedia does not reach
|
||||||
@@ -24,6 +34,9 @@
|
|||||||
import { describe, expect, it } from 'vitest';
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
import '@components/home-view/home-view';
|
import '@components/home-view/home-view';
|
||||||
|
import '@components/queue-panel/queue-panel';
|
||||||
|
import '@components/track-details/track-details';
|
||||||
|
import '@components/config-page/shortcut-capture';
|
||||||
import { fixture } from '@test/support/render';
|
import { fixture } from '@test/support/render';
|
||||||
|
|
||||||
/** Every rule in the element's own adopted stylesheets, flattened. */
|
/** Every rule in the element's own adopted stylesheets, flattened. */
|
||||||
@@ -83,3 +96,91 @@ describe('the home card play button', () => {
|
|||||||
expect(unconditional.some((r) => /display:\s*none/.test(r.text))).toBe(true);
|
expect(unconditional.some((r) => /display:\s*none/.test(r.text))).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("the queue row's remove button", () => {
|
||||||
|
it('is absent where the device has no hover, the menu carrying the action', async () => {
|
||||||
|
const el = await fixture('queue-panel', {});
|
||||||
|
const rules = rulesOf(el);
|
||||||
|
|
||||||
|
expect(rules.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
// visibility:hidden alone would leave an invisible button holding
|
||||||
|
// its hit area on a phone, which is the trap #68's commit names.
|
||||||
|
const unconditional = rules.filter(
|
||||||
|
(r) => r.condition === null && r.text.startsWith('.remove-button'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(unconditional.length).toBeGreaterThan(0);
|
||||||
|
expect(unconditional.some((r) => /display:\s*none/.test(r.text))).toBe(true);
|
||||||
|
|
||||||
|
const reveals = rules.filter(
|
||||||
|
(r) =>
|
||||||
|
r.text.includes('.remove-button') && /visibility:\s*visible/.test(r.text),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(reveals.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
for (const rule of reveals) {
|
||||||
|
expect(rule.condition).toMatch(/hover:\s*hover/);
|
||||||
|
expect(rule.condition).toMatch(/pointer:\s*fine/);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The two affordances that are the only route to their action.
|
||||||
|
*
|
||||||
|
* Asserted as "there is a rule showing it, and its condition is a
|
||||||
|
* *negated* hover query" — the same stylesheet reading as above, for
|
||||||
|
* the same reason: this tier's iframe cannot be emulated as a touch
|
||||||
|
* device, and the regression worth catching is someone folding the rule
|
||||||
|
* away as redundant on the desktop it does nothing on.
|
||||||
|
*/
|
||||||
|
describe('an affordance with no other route', () => {
|
||||||
|
const cases: Array<[string, string, string[]]> = [
|
||||||
|
['track-details', 'track-details', ['.cover-art-overlay', '.cover-art-remove']],
|
||||||
|
['shortcut-capture', 'shortcut-capture', ['.reset-btn']],
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const [name, tag, selectors] of cases) {
|
||||||
|
it(`${name} shows it where the device has no hover`, async () => {
|
||||||
|
const el = await fixture(tag, {});
|
||||||
|
const rules = rulesOf(el);
|
||||||
|
|
||||||
|
expect(rules.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
for (const selector of selectors) {
|
||||||
|
const shown = rules.filter(
|
||||||
|
(r) =>
|
||||||
|
r.condition !== null &&
|
||||||
|
r.text.includes(selector) &&
|
||||||
|
/opacity:\s*1/.test(r.text),
|
||||||
|
);
|
||||||
|
|
||||||
|
const touch = shown.filter((r) => /not[\s\S]*hover:\s*hover/.test(r.condition!));
|
||||||
|
|
||||||
|
expect(touch.length).toBeGreaterThan(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// The one half this tier can measure rather than read: the query is
|
||||||
|
// negated, so on the hover-capable browser running these tests the
|
||||||
|
// control must still be revealed by hover and by nothing else. A rule
|
||||||
|
// written without the `not` would show it here, permanently, on every
|
||||||
|
// desktop.
|
||||||
|
it('leaves the desktop reveal alone, where the device does have hover', async () => {
|
||||||
|
expect(matchMedia('(hover: hover)').matches).toBe(true);
|
||||||
|
|
||||||
|
const el = await fixture('shortcut-capture', {
|
||||||
|
action: 'player.next',
|
||||||
|
label: 'Next Track',
|
||||||
|
currentKey: 'X',
|
||||||
|
defaultKey: 'N',
|
||||||
|
});
|
||||||
|
const btn = el.shadowRoot?.querySelector('.reset-btn');
|
||||||
|
|
||||||
|
expect(btn).not.toBeNull();
|
||||||
|
expect(getComputedStyle(btn!).opacity).toBe('0');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -1,212 +0,0 @@
|
|||||||
/**
|
|
||||||
* Long-press as the touch route to a context menu (plan 016 B2 phase 3).
|
|
||||||
*
|
|
||||||
* These run in a real browser with real event dispatch, which is the
|
|
||||||
* only place the two things that make this hard are true: the synthetic
|
|
||||||
* event has to cross a shadow boundary to reach the listener a
|
|
||||||
* component actually bound, and the suppressors have to tell a trusted
|
|
||||||
* event from ours at document capture without eating the one they exist
|
|
||||||
* to deliver.
|
|
||||||
*
|
|
||||||
* The timings are real rather than faked, because the thing under test
|
|
||||||
* *is* a timing, and 600 ms twice is cheaper than a fake-timer harness
|
|
||||||
* that would also have to fake the pointer events.
|
|
||||||
*/
|
|
||||||
import { describe, expect, it, afterEach, beforeEach } from 'vitest';
|
|
||||||
|
|
||||||
import {
|
|
||||||
installLongPressContextMenu,
|
|
||||||
LONG_PRESS_MS,
|
|
||||||
MOVE_TOLERANCE_PX,
|
|
||||||
} from '@utils/long-press';
|
|
||||||
|
|
||||||
/** A press that has certainly resolved, either way. */
|
|
||||||
const HELD = LONG_PRESS_MS + 120;
|
|
||||||
|
|
||||||
/** A press that has certainly not. */
|
|
||||||
const BRIEF = Math.round(LONG_PRESS_MS / 4);
|
|
||||||
|
|
||||||
const wait = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
|
||||||
|
|
||||||
let uninstall: (() => void) | null = null;
|
|
||||||
let host: HTMLElement;
|
|
||||||
let inner: HTMLElement;
|
|
||||||
|
|
||||||
/** A row inside a shadow root, which is where every menu in this app
|
|
||||||
* is bound — an element in the light DOM would pass a weaker test. */
|
|
||||||
function mountRow(): { host: HTMLElement; inner: HTMLElement } {
|
|
||||||
const el = document.createElement('div');
|
|
||||||
const root = el.attachShadow({ mode: 'open' });
|
|
||||||
const row = document.createElement('div');
|
|
||||||
|
|
||||||
row.textContent = 'a track';
|
|
||||||
root.append(row);
|
|
||||||
document.body.append(el);
|
|
||||||
|
|
||||||
return { host: el, inner: row };
|
|
||||||
}
|
|
||||||
|
|
||||||
function press(
|
|
||||||
el: EventTarget,
|
|
||||||
type: string,
|
|
||||||
init: PointerEventInit = {},
|
|
||||||
): void {
|
|
||||||
el.dispatchEvent(
|
|
||||||
new PointerEvent(type, {
|
|
||||||
bubbles: true,
|
|
||||||
composed: true,
|
|
||||||
cancelable: true,
|
|
||||||
pointerType: 'touch',
|
|
||||||
isPrimary: true,
|
|
||||||
clientX: 40,
|
|
||||||
clientY: 60,
|
|
||||||
...init,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Record every `contextmenu` that reaches the listener, *as the
|
|
||||||
* listener sees it*.
|
|
||||||
*
|
|
||||||
* `target` is retargeted for the scope reading it, so an assertion made
|
|
||||||
* after dispatch has finished reports the shadow host however the event
|
|
||||||
* was dispatched - which is the same answer a broken implementation
|
|
||||||
* gives. It has to be read from inside the handler, where the component
|
|
||||||
* reads it.
|
|
||||||
*/
|
|
||||||
function recordMenus(el: EventTarget): { event: MouseEvent; target: EventTarget | null }[] {
|
|
||||||
const seen: { event: MouseEvent; target: EventTarget | null }[] = [];
|
|
||||||
|
|
||||||
el.addEventListener('contextmenu', (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
// Every real handler does this; the gesture must work anyway.
|
|
||||||
e.stopPropagation();
|
|
||||||
seen.push({ event: e as MouseEvent, target: e.target });
|
|
||||||
});
|
|
||||||
|
|
||||||
return seen;
|
|
||||||
}
|
|
||||||
|
|
||||||
describe('long-press opens a context menu', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
uninstall = installLongPressContextMenu();
|
|
||||||
({ host, inner } = mountRow());
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
uninstall?.();
|
|
||||||
uninstall = null;
|
|
||||||
host.remove();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('dispatches one at the touch point, on the element touched', async () => {
|
|
||||||
const seen = recordMenus(inner);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
expect(seen).toHaveLength(1);
|
|
||||||
expect(seen[0]?.event.clientX).toBe(40);
|
|
||||||
expect(seen[0]?.event.clientY).toBe(60);
|
|
||||||
// Dispatched on the row itself, not on its shadow host - which is
|
|
||||||
// the difference between a per-row handler firing and only a
|
|
||||||
// delegated one firing.
|
|
||||||
expect(seen[0]?.target).toBe(inner);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('is cancelled by a press that moves', async () => {
|
|
||||||
const seen = recordMenus(inner);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
press(inner, 'pointermove', {
|
|
||||||
clientX: 40 + MOVE_TOLERANCE_PX + 5,
|
|
||||||
clientY: 60,
|
|
||||||
});
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
expect(seen).toHaveLength(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('tolerates the jitter a finger cannot help', async () => {
|
|
||||||
const seen = recordMenus(inner);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
press(inner, 'pointermove', { clientX: 43, clientY: 62 });
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
expect(seen).toHaveLength(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('is cancelled by lifting early, and by a scroll', async () => {
|
|
||||||
const seen = recordMenus(inner);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
await wait(BRIEF);
|
|
||||||
press(inner, 'pointerup');
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
expect(seen).toHaveLength(0);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
press(inner, 'pointercancel');
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
expect(seen).toHaveLength(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('ignores a mouse, which has a right button of its own', async () => {
|
|
||||||
const seen = recordMenus(inner);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown', { pointerType: 'mouse' });
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
expect(seen).toHaveLength(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('swallows the click that ends the gesture, and only that one', async () => {
|
|
||||||
let clicks = 0;
|
|
||||||
|
|
||||||
inner.addEventListener('click', () => {
|
|
||||||
clicks += 1;
|
|
||||||
});
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
await wait(HELD);
|
|
||||||
press(inner, 'pointerup');
|
|
||||||
inner.click();
|
|
||||||
|
|
||||||
expect(clicks).toBe(0);
|
|
||||||
|
|
||||||
// The next tap is a tap: on a phone that is the user choosing an
|
|
||||||
// item in the menu that just opened, so eating it would make the
|
|
||||||
// gesture useless.
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
press(inner, 'pointerup');
|
|
||||||
inner.click();
|
|
||||||
|
|
||||||
expect(clicks).toBe(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('stands down where the browser fires its own', async () => {
|
|
||||||
const seen = recordMenus(inner);
|
|
||||||
|
|
||||||
press(inner, 'pointerdown');
|
|
||||||
await wait(BRIEF);
|
|
||||||
// Chromium does this itself on touch; WebKit and the Android
|
|
||||||
// WebView vary, which is the whole reason both halves exist. A
|
|
||||||
// test cannot dispatch a *trusted* event, which is why the module
|
|
||||||
// tells its own apart by identity rather than by `isTrusted`.
|
|
||||||
inner.dispatchEvent(
|
|
||||||
new MouseEvent('contextmenu', {
|
|
||||||
bubbles: true,
|
|
||||||
composed: true,
|
|
||||||
cancelable: true,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
await wait(HELD);
|
|
||||||
|
|
||||||
// One menu: the browser's. Not two.
|
|
||||||
expect(seen).toHaveLength(1);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -0,0 +1,258 @@
|
|||||||
|
/**
|
||||||
|
* The phone's progress line (#58).
|
||||||
|
*
|
||||||
|
* **What this tier can and cannot see.** It can see the whole of what
|
||||||
|
* the issue asks for that is not a pixel: that the line exists only on
|
||||||
|
* a phone and only with a track, that it renders the position the
|
||||||
|
* backend reported rather than a count of its own, and that it is
|
||||||
|
* neither announced nor touchable. It cannot see where it sits — that
|
||||||
|
* is the shell's grid, and it is asserted in
|
||||||
|
* `e2e/specs/phone-progress-line.spec.ts` where there is a real bar
|
||||||
|
* with a real tab bar under it.
|
||||||
|
*/
|
||||||
|
import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/audio-player/progress-line/progress-line';
|
||||||
|
import { Events } from '../../src/events';
|
||||||
|
import { emit, flush } from '@test/support/harness';
|
||||||
|
import { fixture, shadow } from '@test/support/render';
|
||||||
|
|
||||||
|
const TRACK = {
|
||||||
|
fileName: 'song.mp3',
|
||||||
|
filePath: '/music/song.mp3',
|
||||||
|
trackLength: 90,
|
||||||
|
seekPosition: 0,
|
||||||
|
state: 'playing',
|
||||||
|
title: 'Song',
|
||||||
|
artist: 'Artist',
|
||||||
|
album: 'Album',
|
||||||
|
coverArt: '',
|
||||||
|
coverArtSmall: '',
|
||||||
|
coverArtMedium: '',
|
||||||
|
coverArtLarge: '',
|
||||||
|
trackChangeId: 1,
|
||||||
|
artistMbid: '',
|
||||||
|
releaseGroupMbid: '',
|
||||||
|
recordingMbid: '',
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Answer `matchMedia` for the phone query, since the runner's own
|
||||||
|
* window is whatever size the browser provider gives it. Stubbed rather
|
||||||
|
* than resized for `transport-context.test.ts`'s reason: what is under
|
||||||
|
* test is the component's reaction to the answer.
|
||||||
|
*/
|
||||||
|
const realMatchMedia = window.matchMedia;
|
||||||
|
|
||||||
|
function pretendPhone(phone: boolean): void {
|
||||||
|
window.matchMedia = ((query: string) => ({
|
||||||
|
matches: phone && query.includes('599'),
|
||||||
|
media: query,
|
||||||
|
addEventListener: () => {},
|
||||||
|
removeEventListener: () => {},
|
||||||
|
})) as unknown as typeof window.matchMedia;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The horizontal scale of the fill, or null if there is no line. */
|
||||||
|
function scale(el: Element): number | null {
|
||||||
|
const fill = shadow<HTMLElement>(el, '.fill');
|
||||||
|
|
||||||
|
if (!fill) return null;
|
||||||
|
|
||||||
|
const match = /scaleX\(([^)]+)\)/.exec(fill.style.transform);
|
||||||
|
|
||||||
|
return match ? Number(match[1]) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('<player-progress-line>', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
emit(Events.TrackChanged, null);
|
||||||
|
emit(Events.PlaybackStateChanged, { state: 'stopped' });
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
window.matchMedia = realMatchMedia;
|
||||||
|
vi.useRealTimers();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('draws nothing above the phone breakpoint', async () => {
|
||||||
|
pretendPhone(false);
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 2 });
|
||||||
|
emit(Events.PlaybackPositionChanged, {
|
||||||
|
positionSeconds: 45,
|
||||||
|
trackLength: 90,
|
||||||
|
trackChangeId: 2,
|
||||||
|
seq: 1,
|
||||||
|
playing: true,
|
||||||
|
});
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
// The desktop bar carries a real seek bar, and there is no tab
|
||||||
|
// bar for this to sit on the border of.
|
||||||
|
expect(el.shadowRoot!.querySelector('.track')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('draws nothing until there is a track', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
expect(el.shadowRoot!.querySelector('.track')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders the fraction the backend reported', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 3 });
|
||||||
|
emit(Events.PlaybackPositionChanged, {
|
||||||
|
positionSeconds: 45,
|
||||||
|
trackLength: 90,
|
||||||
|
trackChangeId: 3,
|
||||||
|
seq: 1,
|
||||||
|
playing: true,
|
||||||
|
});
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(scale(el)).toBeCloseTo(0.5, 3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resumes mid-track at the position the track arrived with', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, {
|
||||||
|
...TRACK,
|
||||||
|
seekPosition: 30,
|
||||||
|
trackChangeId: 4,
|
||||||
|
});
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(scale(el)).toBeCloseTo(1 / 3, 3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('interpolates between reports, and every report resets it', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
vi.useFakeTimers();
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 5 });
|
||||||
|
emit(Events.PlaybackStateChanged, { state: 'playing' });
|
||||||
|
await vi.advanceTimersByTimeAsync(3000);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(scale(el)).toBeCloseTo(3 / 90, 3);
|
||||||
|
|
||||||
|
// The user seeks; the backend lands somewhere else and says so.
|
||||||
|
// The local count is discarded, never added to -- the seek
|
||||||
|
// bar's rule, and the reason it has it.
|
||||||
|
emit(Events.PlaybackPositionChanged, {
|
||||||
|
positionSeconds: 40,
|
||||||
|
trackLength: 90,
|
||||||
|
trackChangeId: 5,
|
||||||
|
seq: 2,
|
||||||
|
playing: true,
|
||||||
|
});
|
||||||
|
await vi.advanceTimersByTimeAsync(1000);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(scale(el)).toBeCloseTo(41 / 90, 3);
|
||||||
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The reason this component asks `matchMedia` instead of letting a
|
||||||
|
* stylesheet hide it: a media query cannot stop a 1 Hz interval
|
||||||
|
* running for the life of every desktop session. That claim is
|
||||||
|
* load-bearing in CLAUDE.md, so it is asserted rather than
|
||||||
|
* described — the timer count, because a desktop render is empty
|
||||||
|
* either way and so cannot tell the two apart.
|
||||||
|
*/
|
||||||
|
it('runs no interpolation timer above the breakpoint', async () => {
|
||||||
|
pretendPhone(false);
|
||||||
|
vi.useFakeTimers();
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 9 });
|
||||||
|
emit(Events.PlaybackStateChanged, { state: 'playing' });
|
||||||
|
emit(Events.PlaybackPositionChanged, {
|
||||||
|
positionSeconds: 3,
|
||||||
|
trackLength: 90,
|
||||||
|
trackChangeId: 9,
|
||||||
|
seq: 9,
|
||||||
|
playing: true,
|
||||||
|
});
|
||||||
|
await vi.advanceTimersByTimeAsync(5000);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(scale(el)).toBeNull();
|
||||||
|
expect(vi.getTimerCount()).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ignores a report about a track that is no longer loaded', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 6 });
|
||||||
|
emit(Events.PlaybackPositionChanged, {
|
||||||
|
positionSeconds: 60,
|
||||||
|
trackLength: 90,
|
||||||
|
trackChangeId: 5,
|
||||||
|
seq: 3,
|
||||||
|
playing: true,
|
||||||
|
});
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
// The store is a singleton, so a line mounting late must not
|
||||||
|
// adopt a report about the previous track.
|
||||||
|
expect(scale(el)).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('counts nothing while the player is paused', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
vi.useFakeTimers();
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 7 });
|
||||||
|
emit(Events.PlaybackPositionChanged, {
|
||||||
|
positionSeconds: 10,
|
||||||
|
trackLength: 90,
|
||||||
|
trackChangeId: 7,
|
||||||
|
seq: 1,
|
||||||
|
playing: false,
|
||||||
|
});
|
||||||
|
emit(Events.PlaybackStateChanged, { state: 'paused' });
|
||||||
|
await vi.advanceTimersByTimeAsync(5000);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(scale(el)).toBeCloseTo(10 / 90, 3);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is decorative and cannot be touched', async () => {
|
||||||
|
pretendPhone(true);
|
||||||
|
|
||||||
|
const el = await fixture('player-progress-line');
|
||||||
|
|
||||||
|
emit(Events.TrackChanged, { ...TRACK, trackChangeId: 8 });
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
// The seek bar on Now Playing is what announces the position;
|
||||||
|
// this says the same thing with no name and no way to act on
|
||||||
|
// it, and it sits exactly where a thumb aiming at a tab lands.
|
||||||
|
expect(el.getAttribute('aria-hidden')).toBe('true');
|
||||||
|
expect(getComputedStyle(el).pointerEvents).toBe('none');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -29,8 +29,61 @@ import { shadow } from '@test/support/render';
|
|||||||
|
|
||||||
const wrappers: HTMLElement[] = [];
|
const wrappers: HTMLElement[] = [];
|
||||||
|
|
||||||
|
let restoreMedia: (() => void) | null = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Answer the shell's phone query with `phone` until restored.
|
||||||
|
*
|
||||||
|
* Stubbed rather than emulated, for the reason `search-dialog.test.ts`
|
||||||
|
* gives: the runner's viewport is fixed at 1280x800, and the panel
|
||||||
|
* reads `matchMedia` in `connectedCallback` precisely so a test can
|
||||||
|
* answer it first.
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* Answering the phone query is not enough on its own: what decides
|
||||||
|
* whether the scrim exists is a `change` listener, and a stub whose
|
||||||
|
* `addEventListener` is a no-op leaves that listener untested — the
|
||||||
|
* whole suite stays green with it deleted. So the stub records the
|
||||||
|
* listeners and hands back a way to fire them.
|
||||||
|
*/
|
||||||
|
function stubPhone(phone: boolean): (next: boolean) => void {
|
||||||
|
const real = window.matchMedia.bind(window);
|
||||||
|
const listeners = new Set<(e: MediaQueryListEvent) => void>();
|
||||||
|
let matches = phone;
|
||||||
|
|
||||||
|
window.matchMedia = ((q: string) =>
|
||||||
|
q.includes('max-width: 599px')
|
||||||
|
? {
|
||||||
|
get matches() {
|
||||||
|
return matches;
|
||||||
|
},
|
||||||
|
media: q,
|
||||||
|
addEventListener(_: string, fn: (e: MediaQueryListEvent) => void) {
|
||||||
|
listeners.add(fn);
|
||||||
|
},
|
||||||
|
removeEventListener(_: string, fn: (e: MediaQueryListEvent) => void) {
|
||||||
|
listeners.delete(fn);
|
||||||
|
},
|
||||||
|
}
|
||||||
|
: real(q)) as typeof window.matchMedia;
|
||||||
|
|
||||||
|
restoreMedia = () => {
|
||||||
|
window.matchMedia = real;
|
||||||
|
};
|
||||||
|
|
||||||
|
return (next: boolean) => {
|
||||||
|
matches = next;
|
||||||
|
|
||||||
|
for (const fn of listeners) {
|
||||||
|
fn({ matches: next } as MediaQueryListEvent);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
for (const w of wrappers.splice(0)) w.remove();
|
for (const w of wrappers.splice(0)) w.remove();
|
||||||
|
restoreMedia?.();
|
||||||
|
restoreMedia = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -157,6 +210,78 @@ describe('the queue panel decides whether it can be a column', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* #171 — the scrim is a dismissal target, so it exists only where it
|
||||||
|
* has pixels to be tapped.
|
||||||
|
*
|
||||||
|
* Below 600px `.panel-content` is `width: 100%`, so the scrim is
|
||||||
|
* entirely underneath an opaque panel: measured at 424x439, host,
|
||||||
|
* panel and scrim all 424x318. Drawing it there is a `cursor:
|
||||||
|
* pointer` click target nobody can reach, and the queue is a screen
|
||||||
|
* at that width anyway (#55) — back and the close button are its ways
|
||||||
|
* out. Existence rather than `display: none`, because a hidden scrim
|
||||||
|
* is still an element carrying the handler.
|
||||||
|
*/
|
||||||
|
it('draws no scrim at phone width, where it would have no reachable pixels', async () => {
|
||||||
|
stubPhone(true);
|
||||||
|
|
||||||
|
const el = await panelIn(424);
|
||||||
|
|
||||||
|
expect(el.overlay).toBe(true);
|
||||||
|
expect(el.shadowRoot?.querySelector('.scrim')).toBeNull();
|
||||||
|
|
||||||
|
// The way out a thumb can hit is still there.
|
||||||
|
expect(
|
||||||
|
shadow(el, '[data-testid="queue-close"]')?.getAttribute('aria-label'),
|
||||||
|
).toBe('Close queue');
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The 600–899 band is where the panel is a 320px column of a wider
|
||||||
|
* content area, so the scrim has uncovered pixels and #24's
|
||||||
|
* tap-outside-to-close is real. Same width as the overlay tests
|
||||||
|
* above, with the phone query explicitly answered `false`, so this
|
||||||
|
* fails if the scrim is ever dropped for every overlay.
|
||||||
|
*/
|
||||||
|
it('keeps the scrim above phone width, where it can be tapped', async () => {
|
||||||
|
stubPhone(false);
|
||||||
|
|
||||||
|
const el = await panelIn(700);
|
||||||
|
|
||||||
|
expect(el.overlay).toBe(true);
|
||||||
|
|
||||||
|
shadow<HTMLElement>(el, '.scrim')?.click();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(el.open).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The scrim's existence comes from `matchMedia` rather than a
|
||||||
|
* stylesheet, which only holds up if the query is *listened* to — a
|
||||||
|
* panel opened on a desktop and carried across the breakpoint (a
|
||||||
|
* resized window, an unfolded phone) has to lose its scrim without
|
||||||
|
* being reopened. Nothing else in this file fires `change`, so
|
||||||
|
* deleting the listener leaves the whole suite green.
|
||||||
|
*/
|
||||||
|
it('drops the scrim when the viewport crosses the breakpoint', async () => {
|
||||||
|
const setPhone = stubPhone(false);
|
||||||
|
|
||||||
|
const el = await panelIn(700);
|
||||||
|
|
||||||
|
expect(el.shadowRoot?.querySelector('.scrim')).not.toBeNull();
|
||||||
|
|
||||||
|
setPhone(true);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(el.shadowRoot?.querySelector('.scrim')).toBeNull();
|
||||||
|
|
||||||
|
setPhone(false);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(el.shadowRoot?.querySelector('.scrim')).not.toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Escape belongs to the overlay, not to the queue. An inline panel is
|
* Escape belongs to the overlay, not to the queue. An inline panel is
|
||||||
* beside the content rather than over it, so there is nothing to
|
* beside the content rather than over it, so there is nothing to
|
||||||
|
|||||||
@@ -99,6 +99,25 @@ describe('<search-trigger>', () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('meets the touch floor it was shipped four pixels under', async () => {
|
||||||
|
stubPhone(true);
|
||||||
|
|
||||||
|
// #57 created this as the phone's replacement for the header search
|
||||||
|
// box, so it exists *only* where there is a thumb -- and it shipped
|
||||||
|
// at 40x40 under a comment calling that "the smallest a touch
|
||||||
|
// target should be", which was the app's own 44px floor (#56)
|
||||||
|
// restated short rather than a second opinion about it. #186.
|
||||||
|
const el = await fixture('search-trigger');
|
||||||
|
const button = shadow<HTMLButtonElement>(el, '[data-testid="search-trigger"]');
|
||||||
|
|
||||||
|
expect(button).not.toBeNull();
|
||||||
|
|
||||||
|
const box = button!.getBoundingClientRect();
|
||||||
|
|
||||||
|
expect(Math.round(box.width)).toBeGreaterThanOrEqual(44);
|
||||||
|
expect(Math.round(box.height)).toBeGreaterThanOrEqual(44);
|
||||||
|
});
|
||||||
|
|
||||||
it('names what the button will search', async () => {
|
it('names what the button will search', async () => {
|
||||||
stubPhone(true);
|
stubPhone(true);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,211 @@
|
|||||||
|
/**
|
||||||
|
* The seek bar's painted track and the thing you can hit are allowed to
|
||||||
|
* differ, and a slider is the clearest case where they should.
|
||||||
|
*
|
||||||
|
* On `now-playing-view` — the screen that exists so a phone has
|
||||||
|
* somewhere to seek from — the slider measured 261x6 on the reference
|
||||||
|
* device (#187). Six pixels is the whole of the drag target on the
|
||||||
|
* app's primary seeking affordance, against a 44px floor the app set
|
||||||
|
* for itself in #56 and holds to in the queue panel.
|
||||||
|
*
|
||||||
|
* Two separate faults, and the first is why the second was not obvious.
|
||||||
|
*
|
||||||
|
* **The phone rule had never applied.** `seek-bar`'s stylesheet asked
|
||||||
|
* for a 12px track below 599px and then set 6px in a plain `wa-slider`
|
||||||
|
* rule *written after it*. A media query adds no specificity, so the
|
||||||
|
* plain rule won at every width — which is `index.css`'s documented
|
||||||
|
* rule ("the phone section is last on purpose") reproduced inside a
|
||||||
|
* component's own stylesheet. The source said 12 and the device said 6.
|
||||||
|
*
|
||||||
|
* **And 12px would still be under the floor**, so the target is built
|
||||||
|
* around the track rather than by thickening it: padding on the part
|
||||||
|
* that carries the gesture, with margins cancelling it so the row does
|
||||||
|
* not grow.
|
||||||
|
*
|
||||||
|
* This is asserted against the *parsed stylesheet*, on
|
||||||
|
* `hover-affordance.test.ts`'s precedent and with the same limitation
|
||||||
|
* stated rather than hidden: no tier here renders at a phone width with
|
||||||
|
* a real `wa-slider` laid out, so what can be checked is the shape the
|
||||||
|
* browser built from the css`` literal. The pixel measurements that
|
||||||
|
* chose these numbers were taken on the device and are recorded on
|
||||||
|
* #187 and in the stylesheet's own comment — a number measured on a
|
||||||
|
* phone is not a number CI can assert.
|
||||||
|
*
|
||||||
|
* Which is the regression worth catching anyway. Both failures are
|
||||||
|
* invisible on a desktop: hoisting the block back above the plain rule
|
||||||
|
* renders identically at every width CI runs at, and it is exactly what
|
||||||
|
* a tidy-up does.
|
||||||
|
*/
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/audio-player/seekbar/seek-bar';
|
||||||
|
import { fixture } from '@test/support/render';
|
||||||
|
|
||||||
|
/** The app's touch floor, from #56. */
|
||||||
|
const TOUCH_FLOOR = 44;
|
||||||
|
|
||||||
|
/** The width below which the phone's rules apply. */
|
||||||
|
const PHONE_QUERY = /max-width:\s*599px/;
|
||||||
|
|
||||||
|
type Rule = { text: string; condition: string | null };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every rule in the element's own adopted stylesheets, flattened **in
|
||||||
|
* order**, which is the whole point here: the fault being guarded is a
|
||||||
|
* rule sitting in the wrong place, not a rule being absent.
|
||||||
|
*/
|
||||||
|
function rulesOf(host: Element): Rule[] {
|
||||||
|
const sheets = host.shadowRoot?.adoptedStyleSheets ?? [];
|
||||||
|
const out: Rule[] = [];
|
||||||
|
|
||||||
|
for (const sheet of sheets) {
|
||||||
|
for (const rule of Array.from(sheet.cssRules)) {
|
||||||
|
if (rule instanceof CSSMediaRule) {
|
||||||
|
for (const inner of Array.from(rule.cssRules)) {
|
||||||
|
out.push({ text: inner.cssText, condition: rule.conditionText });
|
||||||
|
}
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
out.push({ text: rule.cssText, condition: null });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The two px numbers of a `*-block` declaration, as [start, end].
|
||||||
|
*
|
||||||
|
* A symmetric pair is **serialised back as one value** — `padding-block:
|
||||||
|
* 16px 16px` reads as `padding-block: 16px` — so a naive pair-reader
|
||||||
|
* fails on the shorthand rather than on the thing it is checking, and
|
||||||
|
* says the wrong thing about why. That is not hypothetical: it is what
|
||||||
|
* the symmetric-padding reversion did while this test was being
|
||||||
|
* proved.
|
||||||
|
*/
|
||||||
|
function blockPair(text: string, property: string): [number, number] | null {
|
||||||
|
const declaration = new RegExp(`${property}:\\s*([^;]+)`).exec(text)?.[1];
|
||||||
|
|
||||||
|
if (declaration === undefined) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const values = [...declaration.matchAll(/(-?[\d.]+)px/g)].map((m) =>
|
||||||
|
Number(m[1]),
|
||||||
|
);
|
||||||
|
|
||||||
|
const [start, end] = values;
|
||||||
|
|
||||||
|
if (start === undefined) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return [start, end ?? start];
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("the seek bar's phone rules", () => {
|
||||||
|
it('are last, so they are not silently overridden', async () => {
|
||||||
|
const el = await fixture('seek-bar', {});
|
||||||
|
const rules = rulesOf(el);
|
||||||
|
|
||||||
|
// A sweep that read nothing passes vacuously — the same first
|
||||||
|
// assertion icon-language.test.ts makes, for the same reason.
|
||||||
|
expect(rules.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const declaresTrackSize = (r: Rule) => /--track-size:/.test(r.text);
|
||||||
|
|
||||||
|
const lastUnconditional = rules.findLastIndex(
|
||||||
|
(r) => r.condition === null && declaresTrackSize(r),
|
||||||
|
);
|
||||||
|
const phoneOverride = rules.findLastIndex(
|
||||||
|
(r) => r.condition !== null && PHONE_QUERY.test(r.condition)
|
||||||
|
&& declaresTrackSize(r),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(lastUnconditional).toBeGreaterThanOrEqual(0);
|
||||||
|
expect(phoneOverride).toBeGreaterThanOrEqual(0);
|
||||||
|
|
||||||
|
// A media query adds no specificity. Written first, it loses.
|
||||||
|
expect(phoneOverride).toBeGreaterThan(lastUnconditional);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('give the slider a pointer target of at least the touch floor', async () => {
|
||||||
|
const el = await fixture('seek-bar', {});
|
||||||
|
const rules = rulesOf(el);
|
||||||
|
|
||||||
|
const track = rules.find(
|
||||||
|
(r) => r.condition !== null && PHONE_QUERY.test(r.condition)
|
||||||
|
&& /--track-size:/.test(r.text),
|
||||||
|
);
|
||||||
|
const target = rules.find(
|
||||||
|
(r) => r.condition !== null && PHONE_QUERY.test(r.condition)
|
||||||
|
&& r.text.includes('::part(slider)'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(track).toBeDefined();
|
||||||
|
expect(target).toBeDefined();
|
||||||
|
|
||||||
|
const trackSize = Number(
|
||||||
|
/--track-size:\s*(-?[\d.]+)px/.exec(track!.text)?.[1],
|
||||||
|
);
|
||||||
|
const padding = blockPair(target!.text, 'padding-block');
|
||||||
|
|
||||||
|
expect(padding).not.toBeNull();
|
||||||
|
|
||||||
|
// The padding is on ::part(slider) rather than on the host because
|
||||||
|
// that inner div is what carries the gesture: it has the listener
|
||||||
|
// and the touch-action, and it is exactly the host's size, so
|
||||||
|
// padding the host grows a box that does not take the press.
|
||||||
|
const hitArea = trackSize + padding![0] + padding![1];
|
||||||
|
|
||||||
|
expect(hitArea).toBeGreaterThanOrEqual(TOUCH_FLOOR);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('do not grow the row they sit in', async () => {
|
||||||
|
const el = await fixture('seek-bar', {});
|
||||||
|
|
||||||
|
const target = rulesOf(el).find(
|
||||||
|
(r) => r.condition !== null && PHONE_QUERY.test(r.condition)
|
||||||
|
&& r.text.includes('::part(slider)'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(target).toBeDefined();
|
||||||
|
|
||||||
|
const padding = blockPair(target!.text, 'padding-block');
|
||||||
|
const margin = blockPair(target!.text, 'margin-block');
|
||||||
|
|
||||||
|
expect(padding).not.toBeNull();
|
||||||
|
expect(margin).not.toBeNull();
|
||||||
|
|
||||||
|
// now-playing-view's vertical budget is fixed and #51 measured
|
||||||
|
// every pixel of it: letting the row grow by the difference cost
|
||||||
|
// the album art 25px of 143 when it was tried on the device.
|
||||||
|
expect(margin![0]).toBe(-padding![0]);
|
||||||
|
expect(margin![1]).toBe(-padding![1]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('take the space above, because what is below is the transport', async () => {
|
||||||
|
const el = await fixture('seek-bar', {});
|
||||||
|
|
||||||
|
const target = rulesOf(el).find(
|
||||||
|
(r) => r.condition !== null && PHONE_QUERY.test(r.condition)
|
||||||
|
&& r.text.includes('::part(slider)'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(target).toBeDefined();
|
||||||
|
|
||||||
|
const pair = blockPair(target!.text, 'padding-block');
|
||||||
|
|
||||||
|
expect(pair).not.toBeNull();
|
||||||
|
|
||||||
|
const [above, below] = pair!;
|
||||||
|
|
||||||
|
// Measured at 424x439: the seek row is 19px and the play button's
|
||||||
|
// top edge is 8px below it, while `.art` above is a non-interactive
|
||||||
|
// div. A symmetric target would reach into the play button — the
|
||||||
|
// most important control on the screen — so the growth is upward.
|
||||||
|
expect(above).toBeGreaterThan(below);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,425 @@
|
|||||||
|
/**
|
||||||
|
* Every control in Settings is at least 44px (#186, second pass).
|
||||||
|
*
|
||||||
|
* The header pass covered the five controls a user meets on every
|
||||||
|
* screen. Settings is the other half and is much the larger one: swept
|
||||||
|
* on the reference device (TLP301, 424x439) with all eleven
|
||||||
|
* `config-section`s expanded, **120 controls** were under the floor,
|
||||||
|
* not the 93 the issue's first table implies, and `config-field` — the
|
||||||
|
* row shape the issue names — is eight of them. The bulk is behind the
|
||||||
|
* disclosures:
|
||||||
|
*
|
||||||
|
* | control | size | count |
|
||||||
|
* |---|---|---|
|
||||||
|
* | `.column-arrow-btn` | **16x14** | 36 |
|
||||||
|
* | `.column-toggle` | 16x16 | 29 |
|
||||||
|
* | `shortcut-capture` button | 80x**25** | 26 |
|
||||||
|
* | download format checkbox | 16x16 | 8 |
|
||||||
|
* | `config-field` select | 335x**30** | 7 |
|
||||||
|
* | `wa-input` / `wa-button` | 204x**20**, 185x**21** | 6 |
|
||||||
|
* | `library-filter` select | 120x**32** | 1 |
|
||||||
|
* | `.overflow-btn` | 31x31 | 1 |
|
||||||
|
*
|
||||||
|
* **This tier can measure it, unlike #187's seek bar**, for the reason
|
||||||
|
* the header pass gives: the controls are real elements and the rules
|
||||||
|
* are min-sizes, so a real Chromium rendering a real component gives
|
||||||
|
* the actual answer at any width. And unlike the header there is no
|
||||||
|
* overflow fit on this page, so nothing here needs the negative-margin
|
||||||
|
* treatment — height is free and the two square controls can simply be
|
||||||
|
* square.
|
||||||
|
*
|
||||||
|
* **What the sweep cannot see is written down here as a test rather
|
||||||
|
* than as a comment**, because it is the trap this whole issue keeps
|
||||||
|
* setting. Two controls are invisible to a walk of `button, select,
|
||||||
|
* input`: `config-field`'s toggle, whose `<input>` is
|
||||||
|
* `opacity: 0; width: 0; height: 0` so the thing a finger hits is the
|
||||||
|
* `<label>` around it (34x19, smaller than anything in either of the
|
||||||
|
* issue's tables), and `shortcut-capture`'s reset button, which renders
|
||||||
|
* only for a shortcut somebody has already rebound. Both are asserted
|
||||||
|
* by name below.
|
||||||
|
*/
|
||||||
|
import { beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/config-page/config-field';
|
||||||
|
import '@components/config-page/config-page';
|
||||||
|
import '@components/config-page/download-clients';
|
||||||
|
import '@components/config-page/shortcut-capture';
|
||||||
|
import '@components/library-filter/library-filter';
|
||||||
|
|
||||||
|
import { flush, stub } from '@test/support/harness';
|
||||||
|
import { fixture, shadow, shadowAll } from '@test/support/render';
|
||||||
|
|
||||||
|
/** The app's touch floor, from #56. */
|
||||||
|
const FLOOR = 44;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Everything a finger can hit, through every shadow root under `root`.
|
||||||
|
*
|
||||||
|
* It descends rather than querying one root because Settings is a tree
|
||||||
|
* of components — `config-page` renders `config-section`s holding
|
||||||
|
* `config-field`s and `shortcut-capture`s — and the defect was
|
||||||
|
* distributed across all of them. This is the device sweep, run here.
|
||||||
|
*/
|
||||||
|
function controlsUnder(root: Document | ShadowRoot | Element): { name: string; el: HTMLElement }[] {
|
||||||
|
const SELECTOR = 'button, select, input, [role="button"], [role="tab"], [role="switch"]';
|
||||||
|
const found: { name: string; el: HTMLElement }[] = [];
|
||||||
|
const seen = new Set<Element>();
|
||||||
|
|
||||||
|
const walk = (node: ParentNode, depth: number): void => {
|
||||||
|
if (depth > 20) return;
|
||||||
|
|
||||||
|
for (const el of Array.from(node.querySelectorAll('*'))) {
|
||||||
|
if (el.matches(SELECTOR) && !seen.has(el)) {
|
||||||
|
seen.add(el);
|
||||||
|
|
||||||
|
const box = el.getBoundingClientRect();
|
||||||
|
const style = getComputedStyle(el);
|
||||||
|
const rendered =
|
||||||
|
(box.width > 0 || box.height > 0) &&
|
||||||
|
style.visibility !== 'hidden' &&
|
||||||
|
style.display !== 'none';
|
||||||
|
|
||||||
|
if (rendered) {
|
||||||
|
const host = (el.getRootNode() as ShadowRoot).host;
|
||||||
|
|
||||||
|
found.push({
|
||||||
|
name: `${host ? host.tagName.toLowerCase() : 'root'} ${
|
||||||
|
(typeof el.className === 'string' && el.className) || el.tagName.toLowerCase()
|
||||||
|
}`,
|
||||||
|
el: el as HTMLElement,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (el.shadowRoot) walk(el.shadowRoot, depth + 1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
walk(root as ParentNode, 0);
|
||||||
|
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What a finger actually hits for `el`.
|
||||||
|
*
|
||||||
|
* For everything in this app that is one element, that is the element.
|
||||||
|
* A native checkbox is the exception and is why this function exists:
|
||||||
|
* it cannot grow its hit area without growing its paint, and a 44px
|
||||||
|
* checkbox is not what anyone wants — so a checkbox that has a label
|
||||||
|
* is targeted *through* the label, which is the fix the column lists
|
||||||
|
* and the download formats both use.
|
||||||
|
*
|
||||||
|
* The fallback is the checkbox itself, deliberately: a checkbox with
|
||||||
|
* no label is a 16px target and this must still say so.
|
||||||
|
*/
|
||||||
|
function hitTarget(el: HTMLElement): HTMLElement {
|
||||||
|
const input = el as HTMLInputElement;
|
||||||
|
|
||||||
|
if (input.type !== 'checkbox' && input.type !== 'radio') return el;
|
||||||
|
|
||||||
|
const wrapping = el.closest('label');
|
||||||
|
const root = el.getRootNode() as ShadowRoot | Document;
|
||||||
|
const associated = input.id
|
||||||
|
? root.querySelector<HTMLLabelElement>(`label[for="${CSS.escape(input.id)}"]`)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return wrapping ?? associated ?? el;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The ones that miss the floor, reported with the numbers. */
|
||||||
|
function tooSmall(controls: { name: string; el: HTMLElement }[]): string[] {
|
||||||
|
return controls
|
||||||
|
.map(({ name, el }) => {
|
||||||
|
const box = hitTarget(el).getBoundingClientRect();
|
||||||
|
|
||||||
|
return { name, w: Math.round(box.width), h: Math.round(box.height) };
|
||||||
|
})
|
||||||
|
.filter((c) => c.w < FLOOR || c.h < FLOOR)
|
||||||
|
.map((c) => `${c.name} ${c.w}x${c.h}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open every disclosure under `host`, so the sweep can see the page.
|
||||||
|
*
|
||||||
|
* A collapsed `config-section` renders its body with `hidden`, so its
|
||||||
|
* controls measure 0x0 — which is exactly why the issue's first table
|
||||||
|
* lists seven Settings controls and the real count is 120.
|
||||||
|
*/
|
||||||
|
async function expandEverySection(host: HTMLElement & { updateComplete: Promise<unknown> }) {
|
||||||
|
const sections = shadowAll<HTMLElement>(host, 'config-section');
|
||||||
|
|
||||||
|
expect(sections.length, 'the page renders disclosures to open').toBeGreaterThan(0);
|
||||||
|
|
||||||
|
for (const section of sections) {
|
||||||
|
section.shadowRoot
|
||||||
|
?.querySelector<HTMLButtonElement>('button[aria-expanded="false"]')
|
||||||
|
?.click();
|
||||||
|
}
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
await host.updateComplete;
|
||||||
|
|
||||||
|
for (const section of sections) {
|
||||||
|
await (section as HTMLElement & { updateComplete?: Promise<unknown> }).updateComplete;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sections;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A control's own box, named so a failure says which and how small. */
|
||||||
|
function boxOf(el: Element | null | undefined): string {
|
||||||
|
if (!el) return 'missing';
|
||||||
|
|
||||||
|
const box = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return `${Math.round(box.width)}x${Math.round(box.height)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function meetsFloor(el: Element | null | undefined): boolean {
|
||||||
|
if (!el) return false;
|
||||||
|
|
||||||
|
const box = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return Math.round(box.width) >= FLOOR && Math.round(box.height) >= FLOOR;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('a config field is the shape every Settings row uses', () => {
|
||||||
|
it.each(['text', 'number', 'select', 'directory', 'color'] as const)(
|
||||||
|
'a %s field meets the floor',
|
||||||
|
async (type) => {
|
||||||
|
const el = await fixture('config-field', {
|
||||||
|
schema: {
|
||||||
|
key: 'k',
|
||||||
|
label: 'Music folder',
|
||||||
|
type,
|
||||||
|
options: [{ value: 'dark', label: 'Dark' }],
|
||||||
|
},
|
||||||
|
value: type === 'color' ? '#ffd43b' : '',
|
||||||
|
});
|
||||||
|
|
||||||
|
const controls = controlsUnder(el.shadowRoot!);
|
||||||
|
|
||||||
|
// A sweep that found nothing passes vacuously.
|
||||||
|
expect(controls.length).toBeGreaterThan(0);
|
||||||
|
expect(tooSmall(controls)).toEqual([]);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('grows the toggle, which no sweep of inputs can see', async () => {
|
||||||
|
// The `<input>` is opacity: 0; width: 0; height: 0, so the walk
|
||||||
|
// above skips it as a zero-sized node -- and the thing a finger
|
||||||
|
// hits is the styling <label> around it, which measured 34x19 on
|
||||||
|
// the device. It is absent from #186's tables for exactly that
|
||||||
|
// reason, and it is smaller than everything in them.
|
||||||
|
const el = await fixture('config-field', {
|
||||||
|
schema: { key: 'x', label: 'Scan on startup', type: 'toggle' },
|
||||||
|
value: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const target = shadow(el, '.toggle-switch');
|
||||||
|
|
||||||
|
expect(boxOf(target)).toBe('44x44');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the toggle painted at its old size, in its old place', async () => {
|
||||||
|
// A 44px pill is not what a switch should look like. The box is
|
||||||
|
// 44px and the paint is not: the slider is a child centred in it,
|
||||||
|
// and negative inline margins hand the extra width back so the
|
||||||
|
// pill stays flush with the inputs in the rows above.
|
||||||
|
const el = await fixture('config-field', {
|
||||||
|
schema: { key: 'x', label: 'Scan on startup', type: 'toggle' },
|
||||||
|
value: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const target = shadow(el, '.toggle-switch') as HTMLElement;
|
||||||
|
const slider = shadow(el, '.toggle-slider');
|
||||||
|
|
||||||
|
expect(slider!.getBoundingClientRect().height).toBeLessThan(FLOOR);
|
||||||
|
|
||||||
|
const style = getComputedStyle(target);
|
||||||
|
const handedBack =
|
||||||
|
parseFloat(style.marginInlineStart) + parseFloat(style.marginInlineEnd);
|
||||||
|
|
||||||
|
expect(handedBack).toBeLessThan(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the shortcut editor', () => {
|
||||||
|
it('meets the floor', async () => {
|
||||||
|
const el = await fixture('shortcut-capture', {
|
||||||
|
action: 'play.toggle',
|
||||||
|
label: 'Play/pause',
|
||||||
|
currentKey: 'Space',
|
||||||
|
defaultKey: 'Space',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(meetsFloor(shadow(el, 'button'))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('grows the reset button, which only a rebound shortcut renders', async () => {
|
||||||
|
// Not in either of #186's tables, and it cannot be: a sweep of a
|
||||||
|
// freshly-installed app never sees it. It appears the moment
|
||||||
|
// anybody uses the feature.
|
||||||
|
const el = await fixture('shortcut-capture', {
|
||||||
|
action: 'play.toggle',
|
||||||
|
label: 'Play/pause',
|
||||||
|
currentKey: 'K',
|
||||||
|
defaultKey: 'Space',
|
||||||
|
});
|
||||||
|
|
||||||
|
const reset = shadow(el, '.reset-btn');
|
||||||
|
|
||||||
|
expect(reset, 'a rebound shortcut renders a reset button').toBeTruthy();
|
||||||
|
expect(meetsFloor(reset)).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the library filter', () => {
|
||||||
|
it('meets the floor in both of its placements', async () => {
|
||||||
|
// One component, two mount points since #57 -- the desktop top bar
|
||||||
|
// and Settings -> Libraries -- so it reaches the floor once.
|
||||||
|
const el = await fixture('library-filter');
|
||||||
|
|
||||||
|
const select = shadow(el, 'select');
|
||||||
|
|
||||||
|
expect(select, 'the filter renders a select').toBeTruthy();
|
||||||
|
expect(Math.round(select!.getBoundingClientRect().height)).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('download clients', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
stub('download.Service.ListProviders', []);
|
||||||
|
stub('download.Service.ProviderKinds', []);
|
||||||
|
stub('config.Config.GetDownloadPreferences', {});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives Web Awesome form controls the floor through the library API', async () => {
|
||||||
|
// wa-input's control is inside somebody else's shadow root, so the
|
||||||
|
// height comes from --wa-form-control-height rather than from a
|
||||||
|
// rule of ours reaching in. A custom property inherits through a
|
||||||
|
// shadow boundary, which is what makes a :host declaration reach
|
||||||
|
// it -- and what makes it measurable here.
|
||||||
|
const el = await fixture('download-clients');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
await expandEverySection(el);
|
||||||
|
|
||||||
|
expect(getComputedStyle(el).getPropertyValue('--wa-form-control-height').trim()).toBe(
|
||||||
|
'44px',
|
||||||
|
);
|
||||||
|
|
||||||
|
// And the outcome, not only the mechanism. A sweep of `input`
|
||||||
|
// reports a wa-input at 204x**42** even when this is right,
|
||||||
|
// because the inner input sits *inside* the control's own 1px
|
||||||
|
// border -- Web Awesome sizes it
|
||||||
|
// `calc(--wa-form-control-height - border-width * 2)`. What a
|
||||||
|
// finger hits is `part=base`, measured at 238x44 on the device.
|
||||||
|
//
|
||||||
|
// This reaches into another library's shadow root, which
|
||||||
|
// `name-dialog.ts` only permits where the failure is bounded. It
|
||||||
|
// is bounded the other way here: this is a test, so a renamed
|
||||||
|
// part fails loudly rather than silently passing, which is the
|
||||||
|
// direction that costs nobody a device session.
|
||||||
|
const input = shadowAll<HTMLElement>(el, 'wa-input').find(
|
||||||
|
(w) => w.getBoundingClientRect().height > 0,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(input, 'the add form renders a wa-input').toBeTruthy();
|
||||||
|
|
||||||
|
const base = input!.shadowRoot?.querySelector('[part~="base"]');
|
||||||
|
|
||||||
|
expect(base, 'wa-input still calls its control box "base"').toBeTruthy();
|
||||||
|
expect(Math.round(base!.getBoundingClientRect().height)).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('makes each allowed-format checkbox label a target', async () => {
|
||||||
|
const el = await fixture('download-clients');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
// Every section starts collapsed, and a collapsed body is `hidden`
|
||||||
|
// — so its controls measure 0x0 and a sweep of an unexpanded page
|
||||||
|
// reports them all as fine. That is how the issue's first table
|
||||||
|
// came to list seven Settings controls when there are 120.
|
||||||
|
await expandEverySection(el);
|
||||||
|
|
||||||
|
const options = shadowAll<HTMLElement>(el, '.format-option');
|
||||||
|
|
||||||
|
expect(options.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
const short = options
|
||||||
|
.map((o) => ({ label: o.textContent?.trim(), h: Math.round(o.getBoundingClientRect().height) }))
|
||||||
|
.filter((o) => o.h < FLOOR);
|
||||||
|
|
||||||
|
expect(short).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the whole Settings page', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
for (const path of [
|
||||||
|
'library.Library.GetAllLibrariesWithTrackCounts',
|
||||||
|
'jobs.Service.GetJobs',
|
||||||
|
'download.Service.ListProviders',
|
||||||
|
'download.Service.ProviderKinds',
|
||||||
|
]) {
|
||||||
|
stub(path, []);
|
||||||
|
}
|
||||||
|
|
||||||
|
stub('config.Config.GetShortcuts', {});
|
||||||
|
stub('config.Config.GetDownloadPreferences', {});
|
||||||
|
stub('config.Config.GetThemeAccentColor', '#ffd43b');
|
||||||
|
stub('config.Config.GetThemeBackgroundShade', 'dark');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('has no control under the floor with every section expanded', async () => {
|
||||||
|
// The device sweep, run here: eleven collapsed sections is what
|
||||||
|
// made the first table look like seven controls. The density is
|
||||||
|
// behind the disclosures.
|
||||||
|
const el = await fixture('config-page');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
await expandEverySection(el);
|
||||||
|
|
||||||
|
const controls = controlsUnder(el.shadowRoot!);
|
||||||
|
|
||||||
|
expect(controls.length).toBeGreaterThan(0);
|
||||||
|
expect(tooSmall(controls)).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('makes a column row a target by naming it, not by growing the checkbox', async () => {
|
||||||
|
// A native checkbox cannot grow its hit area without growing its
|
||||||
|
// paint. The label is the target instead -- which is also the
|
||||||
|
// argument config-field already makes for its own labels, and it
|
||||||
|
// is behaviour rather than annotation: the column's name is now a
|
||||||
|
// click target for its checkbox.
|
||||||
|
const el = await fixture('config-page');
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
await expandEverySection(el);
|
||||||
|
|
||||||
|
const labels = shadowAll<HTMLLabelElement>(el, 'label.column-label');
|
||||||
|
|
||||||
|
expect(labels.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
for (const label of labels) {
|
||||||
|
const target = label.htmlFor
|
||||||
|
? el.shadowRoot!.getElementById(label.htmlFor)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
(target as HTMLInputElement | null)?.type,
|
||||||
|
`${label.textContent?.trim()} names its checkbox`,
|
||||||
|
).toBe('checkbox');
|
||||||
|
expect(
|
||||||
|
Math.round(label.getBoundingClientRect().height),
|
||||||
|
`${label.textContent?.trim()} is a target`,
|
||||||
|
).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,681 @@
|
|||||||
|
/**
|
||||||
|
* The touch gestures (plan 019, #63; long-press from plan 016 B2).
|
||||||
|
*
|
||||||
|
* These run in a real browser with real event dispatch, which is the
|
||||||
|
* only place the two things that make this hard are true: the synthetic
|
||||||
|
* event has to cross a shadow boundary to reach the listener a
|
||||||
|
* component actually bound, and the suppressors have to tell a trusted
|
||||||
|
* event from ours at document capture without eating the one they exist
|
||||||
|
* to deliver.
|
||||||
|
*
|
||||||
|
* The timings are real rather than faked, because the thing under test
|
||||||
|
* *is* a timing, and 600 ms twice is cheaper than a fake-timer harness
|
||||||
|
* that would also have to fake the pointer events.
|
||||||
|
*/
|
||||||
|
import { describe, expect, it, afterEach, beforeEach } from 'vitest';
|
||||||
|
|
||||||
|
import {
|
||||||
|
installTouchGestures,
|
||||||
|
LONG_PRESS_MS,
|
||||||
|
MOVE_TOLERANCE_PX,
|
||||||
|
} from '@utils/touch-gestures';
|
||||||
|
|
||||||
|
/** A press that has certainly resolved, either way. */
|
||||||
|
const HELD = LONG_PRESS_MS + 120;
|
||||||
|
|
||||||
|
/** A press that has certainly not. */
|
||||||
|
const BRIEF = Math.round(LONG_PRESS_MS / 4);
|
||||||
|
|
||||||
|
const wait = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
||||||
|
|
||||||
|
let uninstall: (() => void) | null = null;
|
||||||
|
let host: HTMLElement;
|
||||||
|
let inner: HTMLElement;
|
||||||
|
|
||||||
|
/** A row inside a shadow root, which is where every menu in this app
|
||||||
|
* is bound — an element in the light DOM would pass a weaker test. */
|
||||||
|
function mountRow(): { host: HTMLElement; inner: HTMLElement } {
|
||||||
|
const el = document.createElement('div');
|
||||||
|
const root = el.attachShadow({ mode: 'open' });
|
||||||
|
const row = document.createElement('div');
|
||||||
|
|
||||||
|
row.textContent = 'a track';
|
||||||
|
root.append(row);
|
||||||
|
document.body.append(el);
|
||||||
|
|
||||||
|
return { host: el, inner: row };
|
||||||
|
}
|
||||||
|
|
||||||
|
function press(
|
||||||
|
el: EventTarget,
|
||||||
|
type: string,
|
||||||
|
init: PointerEventInit = {},
|
||||||
|
): void {
|
||||||
|
el.dispatchEvent(
|
||||||
|
new PointerEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
pointerType: 'touch',
|
||||||
|
isPrimary: true,
|
||||||
|
clientX: 40,
|
||||||
|
clientY: 60,
|
||||||
|
...init,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Record every `contextmenu` that reaches the listener, *as the
|
||||||
|
* listener sees it*.
|
||||||
|
*
|
||||||
|
* `target` is retargeted for the scope reading it, so an assertion made
|
||||||
|
* after dispatch has finished reports the shadow host however the event
|
||||||
|
* was dispatched - which is the same answer a broken implementation
|
||||||
|
* gives. It has to be read from inside the handler, where the component
|
||||||
|
* reads it.
|
||||||
|
*/
|
||||||
|
function recordMenus(el: EventTarget): { event: MouseEvent; target: EventTarget | null }[] {
|
||||||
|
const seen: { event: MouseEvent; target: EventTarget | null }[] = [];
|
||||||
|
|
||||||
|
el.addEventListener('contextmenu', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
// Every real handler does this; the gesture must work anyway.
|
||||||
|
e.stopPropagation();
|
||||||
|
seen.push({ event: e as MouseEvent, target: e.target });
|
||||||
|
});
|
||||||
|
|
||||||
|
return seen;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('an unclaimed long press is still a context menu', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
({ host, inner } = mountRow());
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
host.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('dispatches one at the touch point, on the element touched', async () => {
|
||||||
|
const seen = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(1);
|
||||||
|
expect(seen[0]?.event.clientX).toBe(40);
|
||||||
|
expect(seen[0]?.event.clientY).toBe(60);
|
||||||
|
// Dispatched on the row itself, not on its shadow host - which is
|
||||||
|
// the difference between a per-row handler firing and only a
|
||||||
|
// delegated one firing.
|
||||||
|
expect(seen[0]?.target).toBe(inner);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is cancelled by a press that moves', async () => {
|
||||||
|
const seen = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
press(inner, 'pointermove', {
|
||||||
|
clientX: 40 + MOVE_TOLERANCE_PX + 5,
|
||||||
|
clientY: 60,
|
||||||
|
});
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('tolerates the jitter a finger cannot help', async () => {
|
||||||
|
const seen = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
press(inner, 'pointermove', { clientX: 43, clientY: 62 });
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is cancelled by lifting early, and by a scroll', async () => {
|
||||||
|
const seen = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(0);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
press(inner, 'pointercancel');
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ignores a mouse, which has a right button of its own', async () => {
|
||||||
|
const seen = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown', { pointerType: 'mouse' });
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('swallows the click that ends the gesture, and only that one', async () => {
|
||||||
|
let clicks = 0;
|
||||||
|
|
||||||
|
inner.addEventListener('click', () => {
|
||||||
|
clicks += 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
inner.click();
|
||||||
|
|
||||||
|
expect(clicks).toBe(0);
|
||||||
|
|
||||||
|
// The next tap is a tap: on a phone that is the user choosing an
|
||||||
|
// item in the menu that just opened, so eating it would make the
|
||||||
|
// gesture useless.
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
inner.click();
|
||||||
|
|
||||||
|
expect(clicks).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('stands down where the browser fires its own', async () => {
|
||||||
|
const seen = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
// Chromium does this itself on touch; WebKit and the Android
|
||||||
|
// WebView vary, which is the whole reason both halves exist. A
|
||||||
|
// test cannot dispatch a *trusted* event, which is why the module
|
||||||
|
// tells its own apart by identity rather than by `isTrusted`.
|
||||||
|
inner.dispatchEvent(
|
||||||
|
new MouseEvent('contextmenu', {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
// One menu: the browser's. Not two.
|
||||||
|
expect(seen).toHaveLength(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What plan 019 adds on top, and the one property that protects
|
||||||
|
* everything downstream: a long press nobody claims is unchanged.
|
||||||
|
*/
|
||||||
|
describe('a gesture is announced before it is acted on', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
({ host, inner } = mountRow());
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
host.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not synthesise a menu when the long press is claimed', async () => {
|
||||||
|
// This is the whole reason #63 could reassign the hold without
|
||||||
|
// touching one of the fourteen context menus: the lists that want
|
||||||
|
// selection mode claim it, and nothing else changes.
|
||||||
|
const menus = recordMenus(inner);
|
||||||
|
const presses: unknown[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-long-press', (e) => {
|
||||||
|
presses.push(e);
|
||||||
|
e.preventDefault();
|
||||||
|
});
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(presses).toHaveLength(1);
|
||||||
|
expect(menus).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('announces a tap on the element touched, at the touch point', async () => {
|
||||||
|
const taps: { target: EventTarget | null; x: number; y: number }[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', (e) => {
|
||||||
|
taps.push({ target: e.target, x: e.detail.x, y: e.detail.y });
|
||||||
|
});
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
|
||||||
|
expect(taps).toHaveLength(1);
|
||||||
|
// The row, not its shadow host -- the difference between a
|
||||||
|
// delegated handler firing and a per-row one never firing.
|
||||||
|
expect(taps[0]?.target).toBe(inner);
|
||||||
|
expect([taps[0]?.x, taps[0]?.y]).toEqual([40, 60]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('lets an unclaimed tap through as an ordinary click', async () => {
|
||||||
|
// Every button, link and checkbox in the app depends on this. Only
|
||||||
|
// a *claimed* tap has its click swallowed.
|
||||||
|
let clicks = 0;
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', () => {
|
||||||
|
/* seen, not claimed */
|
||||||
|
});
|
||||||
|
inner.addEventListener('click', () => {
|
||||||
|
clicks += 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
inner.click();
|
||||||
|
|
||||||
|
expect(clicks).toBe(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('swallows the click behind a claimed tap', async () => {
|
||||||
|
// Or playing a track would also select it, and the row would end
|
||||||
|
// up in both states at once.
|
||||||
|
let clicks = 0;
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', (e) => e.preventDefault());
|
||||||
|
inner.addEventListener('click', () => {
|
||||||
|
clicks += 1;
|
||||||
|
});
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
inner.click();
|
||||||
|
|
||||||
|
expect(clicks).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not announce a tap for a press that became a long press', async () => {
|
||||||
|
// A hold is one gesture, not a hold and then a tap on release.
|
||||||
|
const taps: unknown[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', (e) => taps.push(e));
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
|
||||||
|
expect(taps).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not announce a tap for a press that drifted', async () => {
|
||||||
|
// A drifted press is a scroll, and the virtualizer's -- not a tap
|
||||||
|
// that happened to move. This is the one that would make a list
|
||||||
|
// unscrollable if it were wrong.
|
||||||
|
const taps: unknown[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', (e) => taps.push(e));
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
press(inner, 'pointermove', {
|
||||||
|
clientX: 40,
|
||||||
|
clientY: 60 + MOVE_TOLERANCE_PX + 20,
|
||||||
|
});
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
|
||||||
|
expect(taps).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('ignores a mouse entirely, for both gestures', async () => {
|
||||||
|
// plan 019 decision 1: the predicate is the pointer, per event. A
|
||||||
|
// mouse on a touchscreen keeps click-selects / double-click-plays
|
||||||
|
// on the very same row, which no viewport width can express.
|
||||||
|
const seen: unknown[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', (e) => seen.push(e));
|
||||||
|
inner.addEventListener('yj-long-press', (e) => seen.push(e));
|
||||||
|
|
||||||
|
press(inner, 'pointerdown', { pointerType: 'mouse' });
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(inner, 'pointerup', { pointerType: 'mouse' });
|
||||||
|
press(inner, 'pointerdown', { pointerType: 'mouse' });
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The browser's own long press is a trigger, not a competitor.
|
||||||
|
*
|
||||||
|
* This is a device-only defect made checkable here. `long-press.ts`
|
||||||
|
* stood down when a trusted `contextmenu` arrived mid-press, which was
|
||||||
|
* right while both paths ended in a context menu. Once a hold can mean
|
||||||
|
* *selection mode*, standing down means the gesture silently does the
|
||||||
|
* old thing — and Chrome 113's Android WebView does fire its own, so
|
||||||
|
* on the reference device `yj-long-press` was never announced at all
|
||||||
|
* while every test in this tier passed.
|
||||||
|
*
|
||||||
|
* A test cannot dispatch a *trusted* event, which is exactly why the
|
||||||
|
* module tells its own apart by identity rather than by `isTrusted`:
|
||||||
|
* an untrusted one dispatched from here takes the same path the
|
||||||
|
* browser's does.
|
||||||
|
*/
|
||||||
|
describe("the browser's own long press", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
({ host, inner } = mountRow());
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
host.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Stand in for the browser recognising the hold itself. */
|
||||||
|
function browserContextMenu(el: EventTarget): MouseEvent {
|
||||||
|
const e = new MouseEvent('contextmenu', {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
el.dispatchEvent(e);
|
||||||
|
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
it('announces the gesture rather than standing down', async () => {
|
||||||
|
const presses: unknown[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-long-press', (e) => {
|
||||||
|
presses.push(e);
|
||||||
|
e.preventDefault();
|
||||||
|
});
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
browserContextMenu(inner);
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(presses, 'the hold reached the component').toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('suppresses its menu when a component claims the gesture', async () => {
|
||||||
|
const menus = recordMenus(inner);
|
||||||
|
|
||||||
|
inner.addEventListener('yj-long-press', (e) => e.preventDefault());
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
browserContextMenu(inner);
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
// The component wants selection mode, so the menu must not also
|
||||||
|
// open -- otherwise the device shows both at once.
|
||||||
|
expect(menus).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('suppresses a menu that arrives after the hold was claimed', async () => {
|
||||||
|
// The order the device actually produces, and the one that was
|
||||||
|
// missing: our 500ms timer fires first and a component claims it,
|
||||||
|
// then Chrome delivers its own `contextmenu` 50-70ms later.
|
||||||
|
// Measured over four holds on the reference phone, two took this
|
||||||
|
// order -- so the context menu opened over the selection bar,
|
||||||
|
// intermittently, on the one surface #63 changed.
|
||||||
|
const menus = recordMenus(inner);
|
||||||
|
|
||||||
|
inner.addEventListener('yj-long-press', (e) => e.preventDefault());
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
browserContextMenu(inner);
|
||||||
|
|
||||||
|
expect(menus, 'the menu is late, not new').toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still opens exactly one menu when nobody claims it', async () => {
|
||||||
|
// The old behaviour, reached by asking instead of assuming. This
|
||||||
|
// is what leaves the card grids, Explore and the playlist rows
|
||||||
|
// untouched by #63.
|
||||||
|
const menus = recordMenus(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
browserContextMenu(inner);
|
||||||
|
await wait(HELD);
|
||||||
|
|
||||||
|
expect(menus).toHaveLength(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The swipe half (plan 019 phase 2, #63).
|
||||||
|
*
|
||||||
|
* It runs on touch events rather than pointer events, and that is the
|
||||||
|
* one thing about it a browser tier cannot check. Measured on the
|
||||||
|
* reference device: Chrome 113's WebView cancels the *pointer* stream
|
||||||
|
* ~16px into any drag whatever `touch-action` says, while `touchmove`
|
||||||
|
* keeps firing — so what these assert is the shape that survives it,
|
||||||
|
* not that it survives.
|
||||||
|
*
|
||||||
|
* What they can hold is everything else: the axis rule, that the tie
|
||||||
|
* breaks toward the scroller, that an unclaimed swipe is left entirely
|
||||||
|
* alone, that a claimed one prevents the default (which is the half of
|
||||||
|
* the device fix that lives in code), and that an end always arrives.
|
||||||
|
*/
|
||||||
|
describe('a finger dragged sideways', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
({ host, inner } = mountRow());
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
host.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
/** One finger, at an offset from where it landed. */
|
||||||
|
function touch(el: EventTarget, type: string, dx = 0, dy = 0): TouchEvent {
|
||||||
|
const point = new Touch({
|
||||||
|
identifier: 1,
|
||||||
|
target: el as EventTarget as Element,
|
||||||
|
clientX: 40 + dx,
|
||||||
|
clientY: 60 + dy,
|
||||||
|
});
|
||||||
|
const event = new TouchEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
touches: type === 'touchend' || type === 'touchcancel' ? [] : [point],
|
||||||
|
changedTouches: [point],
|
||||||
|
});
|
||||||
|
|
||||||
|
el.dispatchEvent(event);
|
||||||
|
|
||||||
|
return event;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Record the swipe events a component would bind. */
|
||||||
|
function recordSwipes(
|
||||||
|
el: EventTarget,
|
||||||
|
opts: { claim?: boolean } = {},
|
||||||
|
): { type: string; dx: number; canceled: boolean }[] {
|
||||||
|
const seen: { type: string; dx: number; canceled: boolean }[] = [];
|
||||||
|
|
||||||
|
for (const name of ['yj-swipe-start', 'yj-swipe-move', 'yj-swipe-end']) {
|
||||||
|
el.addEventListener(name, (e) => {
|
||||||
|
const detail = (e as CustomEvent<{ dx: number; canceled: boolean }>)
|
||||||
|
.detail;
|
||||||
|
|
||||||
|
if (name === 'yj-swipe-start' && opts.claim !== false) {
|
||||||
|
e.preventDefault();
|
||||||
|
}
|
||||||
|
|
||||||
|
seen.push({ type: name, dx: detail.dx, canceled: detail.canceled });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return seen;
|
||||||
|
}
|
||||||
|
|
||||||
|
it('announces a swipe once it has travelled decisively sideways', () => {
|
||||||
|
const seen = recordSwipes(inner);
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 4);
|
||||||
|
expect(seen, 'a wobble is not a swipe').toHaveLength(0);
|
||||||
|
|
||||||
|
touch(inner, 'touchmove', 30);
|
||||||
|
touch(inner, 'touchmove', 60);
|
||||||
|
touch(inner, 'touchend');
|
||||||
|
|
||||||
|
expect(seen.map((s) => s.type)).toEqual([
|
||||||
|
'yj-swipe-start',
|
||||||
|
'yj-swipe-move',
|
||||||
|
'yj-swipe-end',
|
||||||
|
]);
|
||||||
|
expect(seen.at(-1)?.dx).toBe(60);
|
||||||
|
expect(seen.at(-1)?.canceled).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('prevents the default only for a claimed swipe', () => {
|
||||||
|
// This is the half of the device fix that lives in code: a
|
||||||
|
// non-passive `touchmove` calling `preventDefault` is what keeps
|
||||||
|
// the gesture ours on Chrome 113. Preventing anything else would
|
||||||
|
// be taking the list's scrolling away.
|
||||||
|
recordSwipes(inner);
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
|
||||||
|
const early = touch(inner, 'touchmove', 4);
|
||||||
|
|
||||||
|
expect(early.defaultPrevented, 'a wobble scrolls').toBe(false);
|
||||||
|
|
||||||
|
const claimed = touch(inner, 'touchmove', 30);
|
||||||
|
const after = touch(inner, 'touchmove', 60);
|
||||||
|
|
||||||
|
expect(claimed.defaultPrevented).toBe(true);
|
||||||
|
expect(after.defaultPrevented).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves an unclaimed swipe entirely alone', () => {
|
||||||
|
const seen = recordSwipes(inner, { claim: false });
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 30);
|
||||||
|
|
||||||
|
const later = touch(inner, 'touchmove', 60);
|
||||||
|
|
||||||
|
touch(inner, 'touchend');
|
||||||
|
|
||||||
|
// Asked once, refused, and then not asked again for the rest of
|
||||||
|
// the press -- and nothing prevented, so the browser still owns it.
|
||||||
|
expect(seen.map((s) => s.type)).toEqual(['yj-swipe-start']);
|
||||||
|
expect(later.defaultPrevented).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives a drag that went vertical to the scroller, and keeps it', () => {
|
||||||
|
// The veto is a *latch*, and that is the whole of it: a scroll
|
||||||
|
// that curves — which is what a thumb does — would otherwise
|
||||||
|
// become a swipe halfway down the list, snatching the list out
|
||||||
|
// from under itself. Without the latch the second move here is
|
||||||
|
// decisively horizontal and would claim the gesture.
|
||||||
|
const seen = recordSwipes(inner);
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 4, 30);
|
||||||
|
touch(inner, 'touchmove', 80, 35);
|
||||||
|
touch(inner, 'touchend');
|
||||||
|
|
||||||
|
expect(seen, 'the list has it').toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives the scroller the tie as well', () => {
|
||||||
|
// Exactly diagonal is not "decisively sideways". A list that will
|
||||||
|
// not scroll is unusable; a swipe that needs a second try is not.
|
||||||
|
const seen = recordSwipes(inner);
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 60, 60);
|
||||||
|
touch(inner, 'touchend');
|
||||||
|
|
||||||
|
expect(seen).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is not a tap and not a hold once it is a swipe', async () => {
|
||||||
|
const menus = recordMenus(inner);
|
||||||
|
const taps: Event[] = [];
|
||||||
|
|
||||||
|
inner.addEventListener('yj-tap', (e) => taps.push(e));
|
||||||
|
recordSwipes(inner);
|
||||||
|
|
||||||
|
press(inner, 'pointerdown');
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 40);
|
||||||
|
await wait(HELD);
|
||||||
|
touch(inner, 'touchend');
|
||||||
|
press(inner, 'pointerup');
|
||||||
|
|
||||||
|
expect(menus, 'the hold did not become a menu').toHaveLength(0);
|
||||||
|
expect(taps, 'the lift did not become a tap').toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('always ends, even when the gesture is taken away', () => {
|
||||||
|
// A component that has a row half off its own left edge has no
|
||||||
|
// other way to learn the finger is gone -- so `touchcancel` is an
|
||||||
|
// end with `canceled` set, not a silence.
|
||||||
|
const seen = recordSwipes(inner);
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 40);
|
||||||
|
touch(inner, 'touchcancel');
|
||||||
|
|
||||||
|
expect(seen.at(-1)?.type).toBe('yj-swipe-end');
|
||||||
|
expect(seen.at(-1)?.canceled).toBe(true);
|
||||||
|
expect(seen.at(-1)?.dx).toBe(40);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is never one gesture when there are two fingers', () => {
|
||||||
|
const seen = recordSwipes(inner);
|
||||||
|
const two = new TouchEvent('touchstart', {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
touches: [
|
||||||
|
new Touch({ identifier: 1, target: inner, clientX: 40, clientY: 60 }),
|
||||||
|
new Touch({ identifier: 2, target: inner, clientX: 90, clientY: 60 }),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
inner.dispatchEvent(two);
|
||||||
|
touch(inner, 'touchmove', 60);
|
||||||
|
|
||||||
|
expect(seen, 'a pinch is not a swipe').toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('swallows the click a claimed swipe ends on', () => {
|
||||||
|
const clicks: Event[] = [];
|
||||||
|
|
||||||
|
recordSwipes(inner);
|
||||||
|
inner.addEventListener('click', (e) => clicks.push(e));
|
||||||
|
|
||||||
|
touch(inner, 'touchstart');
|
||||||
|
touch(inner, 'touchmove', 40);
|
||||||
|
touch(inner, 'touchend');
|
||||||
|
inner.dispatchEvent(
|
||||||
|
new MouseEvent('click', { bubbles: true, composed: true }),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(clicks, 'the row was not also clicked').toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,396 @@
|
|||||||
|
/**
|
||||||
|
* What a finger does to a track list (plan 019, #63).
|
||||||
|
*
|
||||||
|
* The desktop semantics being diverged from are real and stay: a click
|
||||||
|
* selects, a double-click plays. A finger has no second button and no
|
||||||
|
* modifier keys, so the primary action has to be the primary gesture —
|
||||||
|
* and the inversion is decided **per event**, off `pointerType`, not
|
||||||
|
* off a viewport width or a platform flag (plan 019, decision 1).
|
||||||
|
*
|
||||||
|
* That is what these assert: the same row, in the same component, at
|
||||||
|
* the same width, answering a mouse one way and a finger the other.
|
||||||
|
*
|
||||||
|
* There is deliberately no double-tap. Measured on the reference
|
||||||
|
* device, playing a track is ~100ms end to end, and a double-tap
|
||||||
|
* discriminator has to hold every tap for the app's own
|
||||||
|
* `DOUBLE_CLICK_GRACE_MS` of 250 before it can act — 3.5x the primary
|
||||||
|
* interaction, to reach a menu a long press already reaches.
|
||||||
|
*/
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/track-list/track-list';
|
||||||
|
import '@components/selection-bar/selection-bar';
|
||||||
|
|
||||||
|
import { calls, flush, resetHarness, stub } from '@test/support/harness';
|
||||||
|
import { fixture, shadow, shadowAll } from '@test/support/render';
|
||||||
|
import { installTouchGestures, LONG_PRESS_MS } from '@utils/touch-gestures';
|
||||||
|
|
||||||
|
const HELD = LONG_PRESS_MS + 120;
|
||||||
|
|
||||||
|
/** Comfortably past `explore-link`'s own DOUBLE_CLICK_GRACE_MS of 250. */
|
||||||
|
const EXPLORE_LINK_GRACE = 400;
|
||||||
|
const BRIEF = Math.round(LONG_PRESS_MS / 4);
|
||||||
|
const wait = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
||||||
|
|
||||||
|
let uninstall: (() => void) | null = null;
|
||||||
|
|
||||||
|
function track(n: number) {
|
||||||
|
return {
|
||||||
|
FilePath: `/music/track-${n}.mp3`,
|
||||||
|
TrackName: `Track ${n}`,
|
||||||
|
ArtistName: 'An Artist',
|
||||||
|
Album: 'An Album',
|
||||||
|
Duration: 100 + n,
|
||||||
|
ID: n,
|
||||||
|
// Tagged, so the title's `explore-link` can actually navigate.
|
||||||
|
// Without an MBID it asks the backend for a local album first and
|
||||||
|
// gives up when nothing answers -- which makes "the tap did not
|
||||||
|
// navigate" true of every build, working or not.
|
||||||
|
ReleaseGroupMBID: 'e8f4b1d2-0000-4000-8000-00000000000' + n,
|
||||||
|
RecordingMBID: 'a1b2c3d4-0000-4000-8000-00000000000' + n,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const TRACKS = [track(1), track(2), track(3), track(4)];
|
||||||
|
|
||||||
|
/** Dispatch a pointer event as a finger would produce it. */
|
||||||
|
function press(el: EventTarget, type: string, init: PointerEventInit = {}) {
|
||||||
|
el.dispatchEvent(
|
||||||
|
new PointerEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
pointerType: 'touch',
|
||||||
|
isPrimary: true,
|
||||||
|
clientX: 40,
|
||||||
|
clientY: 60,
|
||||||
|
...init,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A whole finger tap: down, a moment, up, and **the click a browser
|
||||||
|
* fires afterwards**.
|
||||||
|
*
|
||||||
|
* That last event is not decoration. A tap the component claims has
|
||||||
|
* its click swallowed at document capture, and the click is the only
|
||||||
|
* thing that would otherwise select the row, follow the `explore-link`
|
||||||
|
* in its title, or press whatever the finger landed on. A helper that
|
||||||
|
* stops at `pointerup` asserts none of that and passes on a build with
|
||||||
|
* the swallow deleted.
|
||||||
|
*/
|
||||||
|
async function tap(el: EventTarget) {
|
||||||
|
press(el, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(el, 'pointerup');
|
||||||
|
el.dispatchEvent(
|
||||||
|
new MouseEvent('click', { bubbles: true, composed: true, cancelable: true }),
|
||||||
|
);
|
||||||
|
await wait(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A finger held still until the gesture resolves. */
|
||||||
|
async function hold(el: EventTarget) {
|
||||||
|
press(el, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
press(el, 'pointerup');
|
||||||
|
await wait(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function mountList() {
|
||||||
|
const el = await fixture('track-list');
|
||||||
|
|
||||||
|
(el as unknown as { tracks: unknown[] }).tracks = TRACKS;
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
await wait(60);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
|
||||||
|
function rows(el: HTMLElement): HTMLElement[] {
|
||||||
|
return shadowAll<HTMLElement>(el, '.track-row');
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('a finger on a track row', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
resetHarness();
|
||||||
|
stub('library.Library.GetTracks', TRACKS);
|
||||||
|
stub('library.Library.GetAllLibrariesWithTrackCounts', []);
|
||||||
|
stub('config.Config.GetShortcuts', {});
|
||||||
|
stub('queue.Queue.SetQueue', null);
|
||||||
|
stub('queue.Queue.AddTracksToQueue', null);
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('plays the row it taps, rather than selecting it', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
expect(row, 'the list rendered rows').toBeTruthy();
|
||||||
|
|
||||||
|
await tap(row!);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const queued = calls('queue.Queue.SetQueue');
|
||||||
|
|
||||||
|
expect(queued.length, 'a tap plays').toBe(1);
|
||||||
|
|
||||||
|
// From that row, in the list as displayed -- not a queue of one
|
||||||
|
// that stops when the song ends.
|
||||||
|
expect(queued[0]?.args[1]).toBe(1);
|
||||||
|
expect((queued[0]?.args[0] as string[]).length).toBe(TRACKS.length);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves the same row to a mouse, which still selects', async () => {
|
||||||
|
// The inversion is per event, so one component answers both
|
||||||
|
// pointers at the same width. A viewport rule cannot say this.
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
row!.dispatchEvent(
|
||||||
|
new MouseEvent('click', { bubbles: true, composed: true }),
|
||||||
|
);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.SetQueue').length, 'a click does not play').toBe(0);
|
||||||
|
expect(rows(el)[1]?.getAttribute('aria-selected')).toBe('true');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('enters selection mode on a long press, with that row selected', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
await hold(rows(el)[2]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
const bar = shadow(el, 'selection-bar');
|
||||||
|
|
||||||
|
expect(bar, 'the action bar appears').toBeTruthy();
|
||||||
|
expect((bar as unknown as { count: number }).count).toBe(1);
|
||||||
|
expect(rows(el)[2]?.getAttribute('aria-selected')).toBe('true');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not open a context menu when it enters the mode', async () => {
|
||||||
|
// The gesture is claimed, so the layer must not fall through to
|
||||||
|
// the synthetic `contextmenu` that every other surface still gets.
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
await hold(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
const menu = shadow(el, 'menu-surface');
|
||||||
|
|
||||||
|
expect((menu as unknown as { active?: boolean } | null)?.active ?? false).toBe(
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('toggles rows while the mode is on, instead of playing them', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
await hold(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
await tap(rows(el)[2]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.SetQueue').length, 'no track was played').toBe(0);
|
||||||
|
expect(
|
||||||
|
(shadow(el, 'selection-bar') as unknown as { count: number }).count,
|
||||||
|
).toBe(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves the mode when the last row is deselected', async () => {
|
||||||
|
// Android's own lists do this, and here it matters more than
|
||||||
|
// convention: the mode changes what a tap means, so a mode holding
|
||||||
|
// nothing is a list where tapping does nothing and the bar that
|
||||||
|
// would explain it is showing a count of zero.
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
await hold(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
await tap(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(shadow(el, 'selection-bar')).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the favourite icon a favourite icon', async () => {
|
||||||
|
// It is inside a row whose tap now plays, and it has been a 44px
|
||||||
|
// target since #56 -- so without the "a control inside the row
|
||||||
|
// owns its own tap" rule, that target silently becomes a second
|
||||||
|
// play button.
|
||||||
|
const el = await mountList();
|
||||||
|
const fav = rows(el)[1]?.querySelector('.fav-icon');
|
||||||
|
|
||||||
|
expect(fav, 'a row renders a favourite control').toBeTruthy();
|
||||||
|
|
||||||
|
await tap(fav!);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.SetQueue').length, 'tapping it does not play').toBe(
|
||||||
|
0,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not play a row the finger scrolled from', async () => {
|
||||||
|
// The failure this exists for makes the list unusable rather than
|
||||||
|
// merely wrong: every flick to scroll would start a track.
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
press(row!, 'pointerdown');
|
||||||
|
press(row!, 'pointermove', { clientX: 40, clientY: 200 });
|
||||||
|
press(row!, 'pointerup');
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.SetQueue').length).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('<selection-bar>', () => {
|
||||||
|
it('renders nothing with nothing selected', async () => {
|
||||||
|
const el = await fixture('selection-bar', { count: 0 });
|
||||||
|
|
||||||
|
expect(shadow(el, '.bar')).toBeFalsy();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('announces the count, which changes under the finger', async () => {
|
||||||
|
const el = await fixture('selection-bar', { count: 3, actions: [] });
|
||||||
|
const live = shadow(el, '[aria-live="polite"]');
|
||||||
|
|
||||||
|
expect(live?.textContent?.trim()).toContain('3 tracks selected');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('names one track in the singular', async () => {
|
||||||
|
const el = await fixture('selection-bar', { count: 1, actions: [] });
|
||||||
|
|
||||||
|
expect(shadow(el, '[aria-live="polite"]')?.textContent?.trim()).toContain(
|
||||||
|
'1 track selected',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps every control at the touch floor', async () => {
|
||||||
|
// #56 and #186. A bar a thumb uses, in the one mode that only a
|
||||||
|
// thumb can enter.
|
||||||
|
const el = await fixture('selection-bar', {
|
||||||
|
count: 2,
|
||||||
|
actions: [{ id: 'play', label: 'Play', icon: 'play' }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const buttons = shadowAll<HTMLElement>(el, 'button');
|
||||||
|
|
||||||
|
expect(buttons.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
for (const button of buttons) {
|
||||||
|
const box = button.getBoundingClientRect();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
Math.min(Math.round(box.width), Math.round(box.height)),
|
||||||
|
button.getAttribute('aria-label') ?? '',
|
||||||
|
).toBeGreaterThanOrEqual(44);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What the gestures leave behind (plan 019 phase 4, #63).
|
||||||
|
*
|
||||||
|
* Every track, album and artist name in a row is an `explore-link`,
|
||||||
|
* which navigates on a genuine single click — and a row's single
|
||||||
|
* *tap* now plays. That conflict is #67's to answer properly; what
|
||||||
|
* this plan committed to is the narrower half of it, that **tap-to-play
|
||||||
|
* wins on touch**, and it falls out of phase 1's design rather than
|
||||||
|
* needing a rule: a claimed tap has its click swallowed at document
|
||||||
|
* capture, so the link's own handler never runs.
|
||||||
|
*
|
||||||
|
* It falls out, which is exactly why it is asserted. Nothing else in
|
||||||
|
* the suite would fail if the swallow stopped covering the link, and
|
||||||
|
* the symptom — a tap on a track's title navigating to its album
|
||||||
|
* instead of playing it — is one a phone user meets constantly and a
|
||||||
|
* mouse user never does.
|
||||||
|
*/
|
||||||
|
describe('a tap on a name inside a row', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
resetHarness();
|
||||||
|
stub('library.Library.GetTracks', TRACKS);
|
||||||
|
stub('library.Library.GetAllLibrariesWithTrackCounts', []);
|
||||||
|
stub('config.Config.GetShortcuts', {});
|
||||||
|
stub('queue.Queue.SetQueue', null);
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Where the row's title is rendered, which is a link. */
|
||||||
|
function titleLink(el: HTMLElement, row: number): HTMLElement {
|
||||||
|
const link = rows(el)[row]?.querySelector('.explore-link');
|
||||||
|
|
||||||
|
expect(link, 'the row renders its title as a link').toBeTruthy();
|
||||||
|
|
||||||
|
return link as HTMLElement;
|
||||||
|
}
|
||||||
|
|
||||||
|
it('plays the row rather than navigating', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const navigations: Event[] = [];
|
||||||
|
|
||||||
|
document.addEventListener('navigate', (e) => navigations.push(e));
|
||||||
|
|
||||||
|
await tap(titleLink(el, 1));
|
||||||
|
await flush();
|
||||||
|
// `explore-link` holds a navigation for DOUBLE_CLICK_GRACE_MS, so
|
||||||
|
// asserting sooner passes on a build that is about to navigate.
|
||||||
|
await wait(EXPLORE_LINK_GRACE);
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.SetQueue').length, 'the row played').toBe(1);
|
||||||
|
expect(navigations, 'and nothing navigated').toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('toggles the row while selection mode is on', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const navigations: Event[] = [];
|
||||||
|
|
||||||
|
document.addEventListener('navigate', (e) => navigations.push(e));
|
||||||
|
|
||||||
|
await hold(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
await tap(titleLink(el, 2));
|
||||||
|
await el.updateComplete;
|
||||||
|
await wait(EXPLORE_LINK_GRACE);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
(shadow(el, 'selection-bar') as unknown as { count: number }).count,
|
||||||
|
).toBe(2);
|
||||||
|
expect(navigations).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves the mode on Escape', async () => {
|
||||||
|
// A mode changes what a tap means, so it needs an exit that is not
|
||||||
|
// "find the x". It is a dismissal rather than a shortcut, which is
|
||||||
|
// why it is not a panel-scoped binding.
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
await hold(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
document.dispatchEvent(
|
||||||
|
new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }),
|
||||||
|
);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(shadow(el, 'selection-bar')).toBeFalsy();
|
||||||
|
expect(rows(el)[0]?.getAttribute('aria-selected')).toBe('false');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,333 @@
|
|||||||
|
/**
|
||||||
|
* The other three selecting surfaces (plan 019 phase 3, #63).
|
||||||
|
*
|
||||||
|
* `track-list` got the gestures in phases 1 and 2; the queue panel and
|
||||||
|
* both playlist detail views are the rest, and phase 3 was "mostly
|
||||||
|
* wiring" only in the sense that they already share
|
||||||
|
* `SelectionController`. Two of them are not symmetric with the track
|
||||||
|
* list at all, and those two asymmetries are what this file is for:
|
||||||
|
*
|
||||||
|
* **A tap on a queue row plays that position in the queue.** Copying
|
||||||
|
* `track-list`'s tap — which sets the queue to the list the row is in —
|
||||||
|
* would rebuild the queue from the queue, discarding its source, its
|
||||||
|
* shuffle order and everything inserted by hand along the way. It is
|
||||||
|
* not the no-op it reads as.
|
||||||
|
*
|
||||||
|
* **The queue panel has no swipe, deliberately.** A right swipe means
|
||||||
|
* *add to the queue* everywhere it exists, and a queue row is already
|
||||||
|
* in the queue; the only thing it could mean there is *remove*, which
|
||||||
|
* is the same gesture with the opposite effect one screen away. So the
|
||||||
|
* assertion is that the rows do not opt in — a swipe there must not
|
||||||
|
* silently become a second meaning for the app's one horizontal
|
||||||
|
* gesture.
|
||||||
|
*
|
||||||
|
* The playlist views are the symmetric half, and they are here because
|
||||||
|
* they bind their gestures **per template** rather than through the
|
||||||
|
* `firstUpdated` delegation the two virtualized lists use, so "the
|
||||||
|
* handler is attached at all" is a different question in each.
|
||||||
|
*/
|
||||||
|
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/queue-panel/queue-panel';
|
||||||
|
import '@components/playlist-details/playlist-details';
|
||||||
|
|
||||||
|
import { Events } from '../../src/events';
|
||||||
|
import { calls, emit, flush, resetHarness, stub } from '@test/support/harness';
|
||||||
|
import { fixture, shadow, shadowAll } from '@test/support/render';
|
||||||
|
import { installTouchGestures, LONG_PRESS_MS } from '@utils/touch-gestures';
|
||||||
|
import type { QueueTrack } from '@store/queue-store';
|
||||||
|
|
||||||
|
const HELD = LONG_PRESS_MS + 120;
|
||||||
|
const BRIEF = Math.round(LONG_PRESS_MS / 4);
|
||||||
|
const wait = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
||||||
|
|
||||||
|
let uninstall: (() => void) | null = null;
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
// The layer is one document listener set, so a suite that leaves it
|
||||||
|
// installed makes the next file's gestures fire twice.
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
});
|
||||||
|
|
||||||
|
function queueTrack(n: number): QueueTrack {
|
||||||
|
return {
|
||||||
|
id: n,
|
||||||
|
audioFileId: n,
|
||||||
|
filePath: `/music/${n}.mp3`,
|
||||||
|
position: n,
|
||||||
|
title: `Track ${n}`,
|
||||||
|
artist: 'Artist',
|
||||||
|
album: 'Album',
|
||||||
|
coverArtPath: '',
|
||||||
|
artistMbid: '',
|
||||||
|
releaseGroupMbid: '',
|
||||||
|
recordingMbid: '',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const QUEUE = [1, 2, 3, 4].map(queueTrack);
|
||||||
|
|
||||||
|
function playlistTrack(n: number) {
|
||||||
|
return {
|
||||||
|
ID: n,
|
||||||
|
FilePath: `/music/${n}.mp3`,
|
||||||
|
Title: `Track ${n}`,
|
||||||
|
Artist: 'Artist',
|
||||||
|
Album: 'Album',
|
||||||
|
Duration: 100 + n,
|
||||||
|
Position: n,
|
||||||
|
Phantom: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const PLAYLIST_TRACKS = [1, 2, 3, 4].map(playlistTrack);
|
||||||
|
|
||||||
|
function press(el: EventTarget, type: string, init: PointerEventInit = {}) {
|
||||||
|
el.dispatchEvent(
|
||||||
|
new PointerEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
pointerType: 'touch',
|
||||||
|
isPrimary: true,
|
||||||
|
clientX: 40,
|
||||||
|
clientY: 60,
|
||||||
|
...init,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function tap(el: EventTarget) {
|
||||||
|
press(el, 'pointerdown');
|
||||||
|
await wait(BRIEF);
|
||||||
|
press(el, 'pointerup');
|
||||||
|
await wait(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function hold(el: EventTarget) {
|
||||||
|
press(el, 'pointerdown');
|
||||||
|
await wait(HELD);
|
||||||
|
press(el, 'pointerup');
|
||||||
|
await wait(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Drag a row sideways by `dx` and lift, as one finger. */
|
||||||
|
async function swipe(el: EventTarget, dx: number) {
|
||||||
|
const at = (x: number) =>
|
||||||
|
new Touch({
|
||||||
|
identifier: 1,
|
||||||
|
target: el as Element,
|
||||||
|
clientX: x,
|
||||||
|
clientY: 100,
|
||||||
|
});
|
||||||
|
const send = (type: string, points: Touch[]) =>
|
||||||
|
el.dispatchEvent(
|
||||||
|
new TouchEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
touches: points,
|
||||||
|
changedTouches: points.length > 0 ? points : [at(0)],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
send('touchstart', [at(0)]);
|
||||||
|
|
||||||
|
for (const step of [0.25, 0.5, 0.75, 1]) {
|
||||||
|
send('touchmove', [at(dx * step)]);
|
||||||
|
await Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
send('touchend', []);
|
||||||
|
await wait(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Past any commit threshold the row could compute. */
|
||||||
|
const FAR = 400;
|
||||||
|
|
||||||
|
describe('a finger on a queue row', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
resetHarness();
|
||||||
|
stub('config.Config.GetShortcuts', {});
|
||||||
|
stub('queue.Queue.PlayIndex', null);
|
||||||
|
stub('queue.Queue.SetQueue', null);
|
||||||
|
stub('queue.Queue.AddTracks', null);
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function panel() {
|
||||||
|
const el = await fixture('queue-panel', { open: true });
|
||||||
|
|
||||||
|
emit(Events.QueueChanged, {
|
||||||
|
tracks: QUEUE,
|
||||||
|
currentIndex: 0,
|
||||||
|
shuffleMode: false,
|
||||||
|
repeatMode: 'off',
|
||||||
|
sourcePlaylistId: 0,
|
||||||
|
});
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
await new Promise((r) => {
|
||||||
|
requestAnimationFrame(() => r(null));
|
||||||
|
});
|
||||||
|
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = (el: HTMLElement) => shadowAll<HTMLElement>(el, '.track-item');
|
||||||
|
|
||||||
|
it('plays that position rather than rebuilding the queue', async () => {
|
||||||
|
const el = await panel();
|
||||||
|
|
||||||
|
await tap(rows(el)[2]!);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.PlayIndex')[0]?.args[0]).toBe(2);
|
||||||
|
|
||||||
|
// The asymmetry with `track-list`: setting the queue here would
|
||||||
|
// discard its source, its shuffle order and anything inserted by
|
||||||
|
// hand, which is not the no-op it reads as.
|
||||||
|
expect(calls('queue.Queue.SetQueue').length).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('enters selection mode on a hold, with that row selected', async () => {
|
||||||
|
const el = await panel();
|
||||||
|
|
||||||
|
await hold(rows(el)[1]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
const bar = shadow(el, 'selection-bar');
|
||||||
|
|
||||||
|
expect(bar, 'the action bar appears').toBeTruthy();
|
||||||
|
expect((bar as unknown as { count: number }).count).toBe(1);
|
||||||
|
expect(calls('queue.Queue.PlayIndex').length, 'and nothing played').toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('toggles rows while the mode is on, instead of playing them', async () => {
|
||||||
|
const el = await panel();
|
||||||
|
|
||||||
|
await hold(rows(el)[0]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
await tap(rows(el)[2]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.PlayIndex').length).toBe(0);
|
||||||
|
expect(
|
||||||
|
(shadow(el, 'selection-bar') as unknown as { count: number }).count,
|
||||||
|
).toBe(2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('has no swipe, which is a decision and not an omission', async () => {
|
||||||
|
const el = await panel();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
rows(el)[1]?.hasAttribute('data-swipe'),
|
||||||
|
'the row does not opt into the shared rule',
|
||||||
|
).toBe(false);
|
||||||
|
|
||||||
|
await swipe(rows(el)[1]!, FAR);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
// A right swipe means "add to the queue" everywhere it exists.
|
||||||
|
// The only thing it could mean on a queue row is "remove", which
|
||||||
|
// is the same gesture with the opposite effect one screen away.
|
||||||
|
expect(calls('queue.Queue.AddTracks').length).toBe(0);
|
||||||
|
expect(calls('queue.Queue.RemoveTracks').length).toBe(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('a finger on a playlist row', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
resetHarness();
|
||||||
|
stub('config.Config.GetShortcuts', {});
|
||||||
|
stub('playlist.Service.GetPlaylist', {
|
||||||
|
ID: 1,
|
||||||
|
Name: 'A Playlist',
|
||||||
|
TrackCount: PLAYLIST_TRACKS.length,
|
||||||
|
});
|
||||||
|
stub('playlist.Service.GetPlaylistTracks', PLAYLIST_TRACKS);
|
||||||
|
stub('queue.Queue.SetQueue', null);
|
||||||
|
stub('queue.Queue.AddTracks', null);
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function details() {
|
||||||
|
const el = await fixture('playlist-details', {
|
||||||
|
playlistId: 1,
|
||||||
|
playlistName: 'A Playlist',
|
||||||
|
});
|
||||||
|
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
await wait(60);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = (el: HTMLElement) => shadowAll<HTMLElement>(el, '.track-item');
|
||||||
|
|
||||||
|
it('plays the playlist from the row it taps', async () => {
|
||||||
|
const el = await details();
|
||||||
|
|
||||||
|
expect(rows(el).length, 'the list rendered rows').toBeGreaterThan(2);
|
||||||
|
|
||||||
|
await tap(rows(el)[2]!);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const queued = calls('queue.Queue.SetQueue');
|
||||||
|
|
||||||
|
// The app's rule: activating one row plays the list that row is
|
||||||
|
// in, from that row -- not a queue of one that stops when the song
|
||||||
|
// ends.
|
||||||
|
expect(queued.length).toBe(1);
|
||||||
|
expect(queued[0]?.args[1]).toBe(2);
|
||||||
|
expect((queued[0]?.args[0] as string[]).length).toBe(
|
||||||
|
PLAYLIST_TRACKS.length,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('enters selection mode on a hold', async () => {
|
||||||
|
const el = await details();
|
||||||
|
|
||||||
|
await hold(rows(el)[1]!);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
(shadow(el, 'selection-bar') as unknown as { count: number } | null)
|
||||||
|
?.count,
|
||||||
|
).toBe(1);
|
||||||
|
expect(calls('queue.Queue.SetQueue').length, 'nothing played').toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queues the row a swipe crosses', async () => {
|
||||||
|
const el = await details();
|
||||||
|
|
||||||
|
await swipe(rows(el)[1]!, FAR);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.AddTracks')[0]?.args[0]).toEqual([
|
||||||
|
'/music/2.mp3',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opts its rows into the shared touch-action rule', async () => {
|
||||||
|
// Half of what makes the gesture reach us on the device, and
|
||||||
|
// invisible in this browser either way -- the other half is the
|
||||||
|
// non-passive preventDefault in `utils/touch-gestures.ts`.
|
||||||
|
const el = await details();
|
||||||
|
|
||||||
|
expect(rows(el)[0]?.hasAttribute('data-swipe')).toBe(true);
|
||||||
|
|
||||||
|
const css = (
|
||||||
|
customElements.get('playlist-details') as unknown as {
|
||||||
|
styles: { cssText: string }[];
|
||||||
|
}
|
||||||
|
).styles
|
||||||
|
.map((s) => s.cssText)
|
||||||
|
.join('\n');
|
||||||
|
|
||||||
|
expect(css).toContain('touch-action: pan-y');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,299 @@
|
|||||||
|
/**
|
||||||
|
* Swipe right on a track row to queue it (plan 019 phase 2, #63).
|
||||||
|
*
|
||||||
|
* `touch-gestures.test.ts` holds the recogniser — the axis rule, the
|
||||||
|
* claim, the guaranteed end. What is here is what the *list* does with
|
||||||
|
* it, and the two things that are only true of a list:
|
||||||
|
*
|
||||||
|
* **A swipe is not a selection.** It acts on the row it was made on,
|
||||||
|
* unless that row is one of several the user has explicitly chosen, in
|
||||||
|
* which case it acts on all of them — the same rule the context menu
|
||||||
|
* answers with, because a bar saying "40 selected" and a gesture that
|
||||||
|
* quietly queues one of them is two answers to the same question.
|
||||||
|
*
|
||||||
|
* **A short swipe is a no-op**, and that is the only thing standing
|
||||||
|
* between "add to queue" and a scroll that drifted sideways. The
|
||||||
|
* threshold is a fraction of the row, so it is measured from the row
|
||||||
|
* here rather than written down twice.
|
||||||
|
*
|
||||||
|
* What this tier cannot see is the device, and the reason is in the
|
||||||
|
* module's own header: Chrome 113's WebView cancels the pointer stream
|
||||||
|
* ~16px into any drag whatever `touch-action` says, so the gesture
|
||||||
|
* runs on touch events and needs `touch-action: pan-y` *and* a
|
||||||
|
* non-passive `preventDefault`. Both are correct in Chromium either
|
||||||
|
* way. The stylesheet half is asserted below for the same reason
|
||||||
|
* `hover-affordance.test.ts` reads a parsed stylesheet: the regression
|
||||||
|
* is someone tidying the declaration away, and nothing here renders
|
||||||
|
* differently when they do.
|
||||||
|
*/
|
||||||
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||||
|
|
||||||
|
import '@components/track-list/track-list';
|
||||||
|
|
||||||
|
import { calls, flush, resetHarness, stub } from '@test/support/harness';
|
||||||
|
import { fixture, shadow, shadowAll } from '@test/support/render';
|
||||||
|
import { installTouchGestures } from '@utils/touch-gestures';
|
||||||
|
|
||||||
|
const wait = (ms: number) => new Promise((r) => setTimeout(r, ms));
|
||||||
|
|
||||||
|
let uninstall: (() => void) | null = null;
|
||||||
|
|
||||||
|
function track(n: number) {
|
||||||
|
return {
|
||||||
|
FilePath: `/music/track-${n}.mp3`,
|
||||||
|
TrackName: `Track ${n}`,
|
||||||
|
ArtistName: 'An Artist',
|
||||||
|
Album: 'An Album',
|
||||||
|
Duration: 100 + n,
|
||||||
|
ID: n,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const TRACKS = [track(1), track(2), track(3), track(4)];
|
||||||
|
|
||||||
|
async function mountList() {
|
||||||
|
const el = await fixture('track-list');
|
||||||
|
|
||||||
|
// A definite width, because the commit threshold is a fraction of
|
||||||
|
// the row and a list that has not been given one is not a list.
|
||||||
|
el.style.display = 'block';
|
||||||
|
el.style.width = '400px';
|
||||||
|
|
||||||
|
(el as unknown as { tracks: unknown[] }).tracks = TRACKS;
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
await wait(60);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
return el;
|
||||||
|
}
|
||||||
|
|
||||||
|
function rows(el: HTMLElement): HTMLElement[] {
|
||||||
|
return shadowAll<HTMLElement>(el, '.track-row');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Drag a row sideways by `dx` and lift, as one finger.
|
||||||
|
*
|
||||||
|
* `onStep` runs after each move and is awaited, which is how the
|
||||||
|
* reveal is observed: the component writes the travel straight to the
|
||||||
|
* row's style but renders the pane through Lit, so it exists a frame
|
||||||
|
* after the move that asked for it, not during it.
|
||||||
|
*/
|
||||||
|
async function swipe(
|
||||||
|
el: EventTarget,
|
||||||
|
dx: number,
|
||||||
|
dy = 0,
|
||||||
|
onStep?: () => Promise<void> | void,
|
||||||
|
): Promise<void> {
|
||||||
|
const at = (x: number, y: number) =>
|
||||||
|
new Touch({
|
||||||
|
identifier: 1,
|
||||||
|
target: el as Element,
|
||||||
|
clientX: x,
|
||||||
|
clientY: y,
|
||||||
|
});
|
||||||
|
const send = (type: string, points: Touch[]) =>
|
||||||
|
el.dispatchEvent(
|
||||||
|
new TouchEvent(type, {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
cancelable: true,
|
||||||
|
touches: points,
|
||||||
|
changedTouches: points.length > 0 ? points : [at(0, 0)],
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
send('touchstart', [at(0, 100)]);
|
||||||
|
|
||||||
|
// Several steps, because the recogniser claims the gesture on the
|
||||||
|
// move that crosses its threshold and the component reads every one
|
||||||
|
// after it.
|
||||||
|
for (const step of [0.25, 0.5, 0.75, 1]) {
|
||||||
|
send('touchmove', [at(dx * step, 100 + dy * step)]);
|
||||||
|
if (onStep) await onStep();
|
||||||
|
}
|
||||||
|
|
||||||
|
send('touchend', []);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Where the commit threshold falls for the row as rendered. */
|
||||||
|
function threshold(row: HTMLElement): number {
|
||||||
|
return Math.max(72, row.getBoundingClientRect().width * 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('a finger swiped right across a track row', () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
resetHarness();
|
||||||
|
stub('library.Library.GetTracks', TRACKS);
|
||||||
|
stub('library.Library.GetAllLibrariesWithTrackCounts', []);
|
||||||
|
stub('config.Config.GetShortcuts', {});
|
||||||
|
stub('queue.Queue.SetQueue', null);
|
||||||
|
stub('queue.Queue.AddTracks', null);
|
||||||
|
uninstall = installTouchGestures();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
uninstall?.();
|
||||||
|
uninstall = null;
|
||||||
|
vi.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('adds that row to the queue', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
expect(row, 'the list rendered rows').toBeTruthy();
|
||||||
|
|
||||||
|
await swipe(row!, threshold(row!) + 40);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
const queued = calls('queue.Queue.AddTracks');
|
||||||
|
|
||||||
|
expect(queued.length, 'one swipe, one call').toBe(1);
|
||||||
|
expect(queued[0]?.args[0]).toEqual(['/music/track-2.mp3']);
|
||||||
|
|
||||||
|
// It queues; it does not play. The row that was playing keeps
|
||||||
|
// playing, which is the difference from a tap.
|
||||||
|
expect(calls('queue.Queue.SetQueue').length).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does nothing when the finger did not get far enough', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
await swipe(row!, Math.round(threshold(row!)) - 10);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.AddTracks').length).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves a scroll that began on a row to the list', async () => {
|
||||||
|
// The same shape as `touch-selection.test.ts`'s "does not play a
|
||||||
|
// row the finger scrolled from", one gesture over: the failure
|
||||||
|
// this guards against makes the list unusable rather than wrong.
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
await swipe(row!, 30, 200);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.AddTracks').length).toBe(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reveals what it will do, in words, while the finger is down', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
const reveals: (string | undefined)[] = [];
|
||||||
|
|
||||||
|
await swipe(row!, threshold(row!) + 40, 0, async () => {
|
||||||
|
await el.updateComplete;
|
||||||
|
reveals.push(
|
||||||
|
shadow(el, '[data-testid="swipe-reveal"]')?.textContent?.trim(),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Not only a colour (WCAG 1.4.1): the pane says what it is for,
|
||||||
|
// and says something different once the gesture would commit.
|
||||||
|
expect(reveals.some((t) => t?.includes('Add to queue'))).toBe(true);
|
||||||
|
expect(reveals.some((t) => t?.includes('Release to add'))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('says what it did, for anyone not watching the row', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
await swipe(row!, threshold(row!) + 40);
|
||||||
|
await flush();
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
const said = shadowAll(el, '[role="status"]')
|
||||||
|
.map((r) => r.textContent?.trim())
|
||||||
|
.join(' ');
|
||||||
|
|
||||||
|
expect(said).toContain('Track 2');
|
||||||
|
expect(said).toContain('queue');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queues the whole selection when the row is part of one', async () => {
|
||||||
|
// One row is a position; several rows are an explicit choice. A
|
||||||
|
// gesture that quietly queued the one row touched would contradict
|
||||||
|
// the bar above it saying how many are selected.
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
rows(el)[1]?.dispatchEvent(
|
||||||
|
new MouseEvent('click', { bubbles: true, composed: true }),
|
||||||
|
);
|
||||||
|
rows(el)[3]?.dispatchEvent(
|
||||||
|
new MouseEvent('click', {
|
||||||
|
bubbles: true,
|
||||||
|
composed: true,
|
||||||
|
ctrlKey: true,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
const row = rows(el)[1];
|
||||||
|
|
||||||
|
await swipe(row!, threshold(row!) + 40);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.AddTracks')[0]?.args[0]).toEqual([
|
||||||
|
'/music/track-2.mp3',
|
||||||
|
'/music/track-4.mp3',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('queues only the row it touched when that row is outside the selection', async () => {
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
rows(el)[3]?.dispatchEvent(
|
||||||
|
new MouseEvent('click', { bubbles: true, composed: true }),
|
||||||
|
);
|
||||||
|
await el.updateComplete;
|
||||||
|
|
||||||
|
const row = rows(el)[0];
|
||||||
|
|
||||||
|
await swipe(row!, threshold(row!) + 40);
|
||||||
|
await flush();
|
||||||
|
|
||||||
|
expect(calls('queue.Queue.AddTracks')[0]?.args[0]).toEqual([
|
||||||
|
'/music/track-1.mp3',
|
||||||
|
]);
|
||||||
|
|
||||||
|
// And it did not become a way of selecting anything.
|
||||||
|
expect(rows(el)[3]?.getAttribute('aria-selected')).toBe('true');
|
||||||
|
expect(rows(el)[0]?.getAttribute('aria-selected')).toBe('false');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('declares pan-y on the row, which is half of what makes it work', async () => {
|
||||||
|
// The other half is the gesture module's non-passive
|
||||||
|
// `preventDefault`. Neither works alone on Chrome 113 and both are
|
||||||
|
// irrelevant here, so this reads the stylesheet and the attribute
|
||||||
|
// rather than the rendering — the regression is someone tidying
|
||||||
|
// one of them away, and nothing in this browser looks different
|
||||||
|
// when they do.
|
||||||
|
const el = await mountList();
|
||||||
|
|
||||||
|
expect(
|
||||||
|
rows(el)[0]?.hasAttribute('data-swipe'),
|
||||||
|
'the row opts into the shared rule',
|
||||||
|
).toBe(true);
|
||||||
|
|
||||||
|
const sheets = (
|
||||||
|
customElements.get('track-list') as unknown as {
|
||||||
|
styles: { cssText: string }[];
|
||||||
|
}
|
||||||
|
).styles;
|
||||||
|
const css = sheets.map((s) => s.cssText).join('\n');
|
||||||
|
const rule = css
|
||||||
|
.split('}')
|
||||||
|
.find((block) => /\[data-swipe\]\s*\{/.test(block));
|
||||||
|
|
||||||
|
expect(rule, 'the shared rule is in this component').toBeTruthy();
|
||||||
|
expect(rule).toContain('touch-action: pan-y');
|
||||||
|
expect(css, 'never none: it takes the scrolling too').not.toContain(
|
||||||
|
'touch-action: none',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
/**
|
||||||
|
* Every control a finger meets is at least 44px (#186).
|
||||||
|
*
|
||||||
|
* #56 sized the playback transport for a thumb and named 44px; the
|
||||||
|
* queue header keeps it; nothing else was resized. So the controls a
|
||||||
|
* user meets on *every* screen — the sort control, its direction
|
||||||
|
* button, the page actions, the overflow trigger and the phone's search
|
||||||
|
* button — sat between a third and two thirds of the app's own floor.
|
||||||
|
* Measured on the reference device (TLP301, 424x439): `page-sort` 99x23,
|
||||||
|
* `page-sort-direction` **28x21**, `page-actions-more` 38x27,
|
||||||
|
* `search-trigger` 40x40.
|
||||||
|
*
|
||||||
|
* Unlike the seek bar's target (#187), this one can be measured here
|
||||||
|
* rather than inferred from the stylesheet. There the painted track had
|
||||||
|
* to stay thin, so the hit area was grown past its own box and only a
|
||||||
|
* phone-width layout of a third-party slider could show it. Here the
|
||||||
|
* control *is* the target, so a real Chromium rendering a real
|
||||||
|
* `page-header` gives the actual answer — and because it is a `min-size`
|
||||||
|
* rather than a media query, the answer is the same at every width,
|
||||||
|
* which is what makes it checkable in this tier at all.
|
||||||
|
*
|
||||||
|
* That is also why there is no phone branch to test: a 44px control on
|
||||||
|
* a desktop is merely large, and a second declaration of what a phone
|
||||||
|
* shows is a second thing to keep in step.
|
||||||
|
*/
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
import type { PageAction, PageHeader } from '@components/page-header/page-header';
|
||||||
|
|
||||||
|
import '@components/page-header/page-header';
|
||||||
|
import { fixture, shadowAll } from '@test/support/render';
|
||||||
|
|
||||||
|
/** The app's touch floor, from #56. */
|
||||||
|
const FLOOR = 44;
|
||||||
|
|
||||||
|
const SORTS = [
|
||||||
|
{ id: 'name', label: 'Name' },
|
||||||
|
{ id: 'tracks', label: 'Tracks' },
|
||||||
|
];
|
||||||
|
|
||||||
|
function actions(): PageAction[] {
|
||||||
|
return [
|
||||||
|
{ id: 'import', label: 'Import', icon: 'file-import', priority: 0, onSelect: () => {} },
|
||||||
|
{ id: 'new', label: 'New Playlist', icon: 'plus', priority: 2, onSelect: () => {} },
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Every visible control in the header's own shadow root. */
|
||||||
|
function controlsOf(el: PageHeader): { name: string; el: HTMLElement }[] {
|
||||||
|
return shadowAll<HTMLElement>(el, 'button, select')
|
||||||
|
.filter((c) => !(c as HTMLButtonElement).hidden)
|
||||||
|
.map((c) => ({
|
||||||
|
name: c.dataset.testid ?? (c.className || c.tagName.toLowerCase()),
|
||||||
|
el: c,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
function tooSmall(controls: { name: string; el: HTMLElement }[]): string[] {
|
||||||
|
return controls
|
||||||
|
.map(({ name, el }) => {
|
||||||
|
const b = el.getBoundingClientRect();
|
||||||
|
|
||||||
|
return { name, w: Math.round(b.width), h: Math.round(b.height) };
|
||||||
|
})
|
||||||
|
.filter((c) => c.w < FLOOR || c.h < FLOOR)
|
||||||
|
.map((c) => `${c.name} ${c.w}x${c.h}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("the page header's controls", () => {
|
||||||
|
it('all meet the touch floor', async () => {
|
||||||
|
const el = await fixture<PageHeader>('page-header', {
|
||||||
|
heading: 'Playlists',
|
||||||
|
count: 50,
|
||||||
|
countNoun: 'playlist',
|
||||||
|
sortOptions: SORTS,
|
||||||
|
sortField: 'name',
|
||||||
|
sortDirection: 'asc',
|
||||||
|
actions: actions(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const controls = controlsOf(el);
|
||||||
|
|
||||||
|
// A sweep that found no controls passes vacuously — the same first
|
||||||
|
// assertion icon-language.test.ts makes, for the same reason.
|
||||||
|
expect(controls.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
// The two that were smallest, named so a regression says which.
|
||||||
|
expect(controls.map((c) => c.name)).toContain('page-sort-direction');
|
||||||
|
expect(controls.map((c) => c.name)).toContain('page-sort');
|
||||||
|
|
||||||
|
expect(tooSmall(controls)).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('grows the target without growing the box, so the overflow fit is untouched', async () => {
|
||||||
|
// The regression this exists for, and it was a real one: growing
|
||||||
|
// the two square controls to 44px *wide* added 22px to the header,
|
||||||
|
// which fit at every width Chromium was checked at and clipped the
|
||||||
|
// overflow trigger at 320x600 in WebKit -- the engine closest to
|
||||||
|
// what ships, and the one no machine here can run. #69's fit pass
|
||||||
|
// measures inline size, so a taller control is free and a wider one
|
||||||
|
// is not.
|
||||||
|
//
|
||||||
|
// Negative inline margins are what keep the box out of it: the
|
||||||
|
// padding makes the target, and the margin gives the space back.
|
||||||
|
const el = await fixture<PageHeader>('page-header', {
|
||||||
|
heading: 'Playlists',
|
||||||
|
sortOptions: SORTS,
|
||||||
|
sortField: 'name',
|
||||||
|
actions: actions(),
|
||||||
|
});
|
||||||
|
|
||||||
|
el.style.width = '320px';
|
||||||
|
|
||||||
|
for (let frame = 0; frame < 3; frame += 1) {
|
||||||
|
await new Promise((r) => requestAnimationFrame(r));
|
||||||
|
await el.updateComplete;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const selector of ['.sort-dir', '.more-button']) {
|
||||||
|
const control = shadowAll<HTMLElement>(el, selector).filter(
|
||||||
|
(c) => !(c as HTMLButtonElement).hidden,
|
||||||
|
)[0];
|
||||||
|
|
||||||
|
expect(control, selector).toBeTruthy();
|
||||||
|
|
||||||
|
const style = getComputedStyle(control!);
|
||||||
|
const added =
|
||||||
|
parseFloat(style.marginInlineStart) + parseFloat(style.marginInlineEnd);
|
||||||
|
|
||||||
|
expect(added, `${selector} gives its extra width back`).toBeLessThan(0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('includes the overflow trigger, which is the route to the rest', async () => {
|
||||||
|
// At 320px the fit pass collapses actions into the menu, so the
|
||||||
|
// trigger is rendered — and it is then the only way to reach them,
|
||||||
|
// which makes it the last control that should be hard to hit.
|
||||||
|
const el = await fixture<PageHeader>('page-header', {
|
||||||
|
heading: 'Playlists',
|
||||||
|
sortOptions: SORTS,
|
||||||
|
sortField: 'name',
|
||||||
|
actions: actions(),
|
||||||
|
});
|
||||||
|
|
||||||
|
el.style.width = '320px';
|
||||||
|
|
||||||
|
for (let frame = 0; frame < 3; frame += 1) {
|
||||||
|
await new Promise((r) => requestAnimationFrame(r));
|
||||||
|
await el.updateComplete;
|
||||||
|
}
|
||||||
|
|
||||||
|
const more = shadowAll<HTMLButtonElement>(el, '.more-button').filter(
|
||||||
|
(b) => !b.hidden,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(more.length).toBe(1);
|
||||||
|
|
||||||
|
const box = more[0]!.getBoundingClientRect();
|
||||||
|
|
||||||
|
expect(Math.round(box.width)).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
expect(Math.round(box.height)).toBeGreaterThanOrEqual(FLOOR);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
/**
|
||||||
|
* The nesting check's own semantics.
|
||||||
|
*
|
||||||
|
* `make css-check` runs it over a tree that currently has no violation,
|
||||||
|
* so the check passing says nothing about whether it can still find
|
||||||
|
* one. What it has to get right is two distinctions, and both are the
|
||||||
|
* kind a regex over the file gets wrong: a rule directly inside an
|
||||||
|
* at-rule is not nested, and a brace inside a string or a comment is
|
||||||
|
* not a block.
|
||||||
|
*
|
||||||
|
* The rule it enforces is the device's: Chrome 113 predates relaxed CSS
|
||||||
|
* nesting, so a nested selector starting with an element name is
|
||||||
|
* dropped in silence. See `scripts/css-nesting.mjs`.
|
||||||
|
*/
|
||||||
|
import { describe, expect, it } from 'vitest';
|
||||||
|
|
||||||
|
import { findBareNestedRules } from '../../scripts/css-nesting.mjs';
|
||||||
|
|
||||||
|
describe('the nested-rule check', () => {
|
||||||
|
it('flags a nested rule that starts with an element name', () => {
|
||||||
|
const found = findBareNestedRules(
|
||||||
|
'.bottom-bar {\n color: red;\n\n audio-player { margin: 0 }\n}',
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(found).toEqual([{ line: 4, selector: 'audio-player' }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts the same rule written with a leading &', () => {
|
||||||
|
expect(
|
||||||
|
findBareNestedRules('.bottom-bar {\n & audio-player { margin: 0 }\n}'),
|
||||||
|
).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts a nested selector that starts with any other symbol', () => {
|
||||||
|
expect(
|
||||||
|
findBareNestedRules('.bar {\n #track-info { color: red }\n}'),
|
||||||
|
).toEqual([]);
|
||||||
|
expect(findBareNestedRules('.bar {\n :host { color: red }\n}')).toEqual(
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves a top-level rule alone, element name or not', () => {
|
||||||
|
expect(findBareNestedRules('p {\n margin: 0;\n}')).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The majority of what a naive sweep would report: a media query at
|
||||||
|
* the top level holds ordinary rules, not nested ones.
|
||||||
|
*/
|
||||||
|
it('leaves a rule directly inside an at-rule alone', () => {
|
||||||
|
expect(
|
||||||
|
findBareNestedRules(
|
||||||
|
'@media (max-width: 599px) {\n bottom-nav { display: flex }\n}',
|
||||||
|
),
|
||||||
|
).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* And the other half of that: what decides it is whether a style rule
|
||||||
|
* is anywhere above, not what the immediate parent is.
|
||||||
|
*/
|
||||||
|
it('flags one inside an at-rule that is itself inside a rule', () => {
|
||||||
|
expect(
|
||||||
|
findBareNestedRules(
|
||||||
|
'.bar {\n @media (min-width: 900px) {\n audio-player { margin: 0 }\n }\n}',
|
||||||
|
),
|
||||||
|
).toEqual([{ line: 3, selector: 'audio-player' }]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reads through a brace in a string or a comment', () => {
|
||||||
|
expect(
|
||||||
|
findBareNestedRules('.a {\n background: url("x{y}");\n}'),
|
||||||
|
).toEqual([]);
|
||||||
|
expect(
|
||||||
|
findBareNestedRules('.a {\n /* audio-player { x: y } */\n}'),
|
||||||
|
).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -58,6 +58,15 @@ pre-commit:
|
|||||||
root: "frontend/"
|
root: "frontend/"
|
||||||
run: node scripts/check-css-literals.mjs
|
run: node scripts/check-css-literals.mjs
|
||||||
|
|
||||||
|
# A nested rule whose selector starts with an element name is
|
||||||
|
# silently dropped by the device's Chrome 113, and by nothing else --
|
||||||
|
# so every tier here renders it correctly and only a screenshot of
|
||||||
|
# the phone disagrees. Instant.
|
||||||
|
css-nesting:
|
||||||
|
glob: "frontend/**/*.{ts,css}"
|
||||||
|
root: "frontend/"
|
||||||
|
run: node scripts/check-css-nesting.mjs
|
||||||
|
|
||||||
# Deliberately sequential, unlike pre-commit. `go test -race`
|
# Deliberately sequential, unlike pre-commit. `go test -race`
|
||||||
# saturates every core for the better part of a minute and the UI tier
|
# saturates every core for the better part of a minute and the UI tier
|
||||||
# is a real browser with wall-clock timeouts, so run together the
|
# is a real browser with wall-clock timeouts, so run together the
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
//go:build android
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
|
||||||
|
"yellowjacket/backend/androidlog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// newLogHandler builds the handler slog writes through.
|
||||||
|
//
|
||||||
|
// On Android stdout is /dev/null, so devslog here writes the app's
|
||||||
|
// entire diagnosis into a hole -- see backend/androidlog. logcat is
|
||||||
|
// the platform's sink and this is what reaches it.
|
||||||
|
func newLogHandler(opts *slog.HandlerOptions) slog.Handler {
|
||||||
|
return androidlog.New(opts)
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
//go:build !android
|
||||||
|
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/golang-cz/devslog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// newLogHandler builds the handler slog writes through.
|
||||||
|
//
|
||||||
|
// Off Android that is devslog to stdout, as it has always been. The
|
||||||
|
// selection is a build tag rather than a runtime check so that a
|
||||||
|
// desktop binary links no cgo for a platform it will never run on --
|
||||||
|
// backend/androidlog's write is -llog, which does not exist here.
|
||||||
|
func newLogHandler(opts *slog.HandlerOptions) slog.Handler {
|
||||||
|
return devslog.NewHandler(os.Stdout, &devslog.Options{HandlerOptions: opts})
|
||||||
|
}
|
||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
|
|
||||||
"github.com/golang-cz/devslog"
|
|
||||||
"github.com/wailsapp/wails/v3/pkg/application"
|
"github.com/wailsapp/wails/v3/pkg/application"
|
||||||
"github.com/wailsapp/wails/v3/pkg/events"
|
"github.com/wailsapp/wails/v3/pkg/events"
|
||||||
|
|
||||||
@@ -110,14 +109,23 @@ func main() {
|
|||||||
// create sLogger
|
// create sLogger
|
||||||
loglevel := resolveLogLevel(isDev)
|
loglevel := resolveLogLevel(isDev)
|
||||||
|
|
||||||
sLogger := slog.New(devslog.NewHandler(os.Stdout, &devslog.Options{
|
sLogger := slog.New(newLogHandler(&slog.HandlerOptions{Level: loglevel}))
|
||||||
HandlerOptions: &slog.HandlerOptions{
|
|
||||||
Level: loglevel,
|
|
||||||
},
|
|
||||||
}))
|
|
||||||
slog.SetDefault(sLogger)
|
slog.SetDefault(sLogger)
|
||||||
sLogger.Info("starting yellowjacket", "version", version, "commit", commit)
|
sLogger.Info("starting yellowjacket", "version", version, "commit", commit)
|
||||||
|
|
||||||
|
// Android has no /tmp and gives an app no TMPDIR, so anything in
|
||||||
|
// this process that spills to a temporary file is handed a path that
|
||||||
|
// does not exist -- see system.UseTempDir. It runs here rather than
|
||||||
|
// beside UseHomeOverride above because it has something to say when
|
||||||
|
// it fails and the logger does not exist up there; what matters is
|
||||||
|
// that it is before NewYellowJacketApp, which opens the database.
|
||||||
|
//
|
||||||
|
// A failure is not fatal: it leaves the platform's own answer in
|
||||||
|
// place, which is what every release before this one ran with.
|
||||||
|
if err := system.UseTempDir(application.Mobile.StoragePath()); err != nil {
|
||||||
|
sLogger.Error("could not set up a temp directory", "err", err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
// Start profiling server (pprof + trace). In production builds this
|
// Start profiling server (pprof + trace). In production builds this
|
||||||
// is a no-op — the compiler eliminates all profiling code.
|
// is a no-op — the compiler eliminates all profiling code.
|
||||||
stopProfiler := profiling.Start(sLogger)
|
stopProfiler := profiling.Start(sLogger)
|
||||||
|
|||||||
@@ -276,8 +276,14 @@ cmd_logs() {
|
|||||||
# The app's own tags plus the two that report its death. Chasing a
|
# The app's own tags plus the two that report its death. Chasing a
|
||||||
# raw logcat here is hopeless: the emulator emits thousands of lines
|
# raw logcat here is hopeless: the emulator emits thousands of lines
|
||||||
# a second, almost all of them WindowManager transitions.
|
# a second, almost all of them WindowManager transitions.
|
||||||
|
#
|
||||||
|
# `yellowjacket` is where the Go side's slog goes (backend/androidlog,
|
||||||
|
# #160). It is a fixed tag rather than "$PKG", which is the whole
|
||||||
|
# point of it being fixed: the debug build's id carries a ".dev"
|
||||||
|
# suffix, so a tag derived from the id would be filtered out on the
|
||||||
|
# one build anybody debugging this app is running.
|
||||||
"$ADB" logcat -v time \
|
"$ADB" logcat -v time \
|
||||||
WailsBridge:V "$PKG":V GoLog:V AndroidRuntime:E DEBUG:V libc:F ActivityManager:I '*:S'
|
yellowjacket:V WailsBridge:V "$PKG":V GoLog:V AndroidRuntime:E DEBUG:V libc:F ActivityManager:I '*:S'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Forward the WebView's devtools socket, so the page can be asked things.
|
# Forward the WebView's devtools socket, so the page can be asked things.
|
||||||
|
|||||||
Reference in New Issue
Block a user