Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
Custom exercises: a video plays only while it can be seen, and the editor says the size in the language's own unit
Duarte Santosdf2e13616372
diff --git a/frontend/src/components/CustomMedia.jsx b/frontend/src/components/CustomMedia.jsxindex c28e6b66d..045c74d55 100644--- a/frontend/src/components/CustomMedia.jsx+++ b/frontend/src/components/CustomMedia.jsx@@ -217,40 +217,55 @@ function CustomVideo({ m, id, cls, name, toggle, mini, still }) {const main = useMediaUrl(m, { auto: prefetchAllowed() })const ref = useRef(null)const box = useRef(null)- // A short clip loops by itself where it may; a long one, or one that may not, waits for a tap.- const [wantPlay, setWantPlay] = useState(loop && !still)+ // Whether the box is on screen. Taken as yes until the observer says otherwise, so a browser+ // without one simply plays; with one, the first answer comes within a frame.+ const [visible, setVisible] = useState(true)+ // What a tap asked for: null until the first tap, then play (true) or pause (false).+ const [asked, setAsked] = useState(null)const [playing, setPlaying] = useState(false)const [broken, setBroken] = useState(false)// A long video is playing with sound and controls since its tap.const [open, setOpen] = useState(false)+ // A short clip loops by itself where it may; a long one, or one that may not, waits for a tap.+ // Either way only while it can be seen: a card beside the one on screen (the swipe layout keeps+ // its neighbours rendered), one scrolled away in the list, or a sheet still sliding in does not+ // decode anything.+ const shouldPlay = visible && (asked ?? (loop && !still))useEffect(() => {const el = ref.currentif (!el || !main.url) return- if (wantPlay) el.play().then(() => setPlaying(true)).catch(() => { setPlaying(false); setWantPlay(false) })- else { el.pause(); setPlaying(false) }- }, [wantPlay, main.url])+ if (shouldPlay) {+ const p = el.play()+ // Refused (no user gesture where the browser wants one): it waits for a tap instead.+ if (p && typeof p.then === 'function') p.then(() => setPlaying(true), () => { setPlaying(false); setAsked(false) })+ } else el.pause()+ }, [shouldPlay, main.url])- // Scrolled out of view, a playing video stops: in the list layout it would otherwise go on- // decoding (and, for a long one, talking) below the fold.useEffect(() => {const el = box.currentif (!el || typeof IntersectionObserver !== 'function') return- const io = new IntersectionObserver(([e]) => { if (!e.isIntersecting && ref.current && !ref.current.paused) { ref.current.pause(); setPlaying(false); setWantPlay(false) } })+ const io = new IntersectionObserver(([e]) => {+ setVisible(e.isIntersecting)+ // A long video leaving the screen stays paused when it comes back: it has sound.+ if (!e.isIntersecting && !loopRef.current) setAsked(a => (a ? false : a))+ })io.observe(el)return () => io.disconnect()}, [])+ const loopRef = useRef(loop)+ loopRef.current = loop && !openconst onTap = () => {if (broken) { setBroken(false); main.load(); poster.load(); return }- if (!main.url) { main.load(); setWantPlay(true); if (!loop) setOpen(true); return }+ if (!main.url) { main.load(); setAsked(true); if (!loop) setOpen(true); return }if (!loop) {// The first tap on a long video hands it the browser's own controls, with sound; after// that the controls are the video's, and taps on it are theirs.- if (!open) { setOpen(true); setWantPlay(true) }+ if (!open) { setOpen(true); setAsked(true) }return}- setWantPlay(p => !p)+ setAsked(!shouldPlay)}const loading = !main.url && main.status === 'loading'@@ -259,7 +274,7 @@ function CustomVideo({ m, id, cls, name, toggle, mini, still }) {<div ref={box} className={cls + (broken || (!main.url && !poster.url) ? ' broken' : '')} id={id} onClick={open && main.url ? undefined : onTap}>{main.url && !broken? <video ref={el => { ref.current = el; if (el && !open) mute(el) }} src={main.url} poster={poster.url || undefined}- playsInline loop={loop && !open} autoPlay={loop && !still} controls={open} muted={!open}+ playsInline loop={loop && !open} controls={open} muted={!open}preload={loop ? 'auto' : 'metadata'} aria-label={name}onPlay={() => setPlaying(true)} onPause={() => setPlaying(false)} onError={() => setBroken(true)} />: poster.url && !brokendiff --git a/frontend/src/components/CustomMediaField.jsx b/frontend/src/components/CustomMediaField.jsxindex 74d187f5d..eebab2716 100644--- a/frontend/src/components/CustomMediaField.jsx+++ b/frontend/src/components/CustomMediaField.jsx@@ -81,7 +81,9 @@ export default function CustomMediaField({ media, url, onChange }) {}}- const sizeLine = m ? [m.dur != null && m.kind !== 'image' ? fmtClip(m.dur) : null, (Math.max(0.1, Math.round((m.size / MB) * 10) / 10)).toFixed(1) + ' MB'].filter(Boolean).join(' · ') : null+ // "0:07 · 2.4 MB": the length of a clip or an animation, and the size of the file itself (the+ // unit through the packs' own "{0} MB", so it reads Mo, МБ, م.ب where it should).+ const sizeLine = m ? [m.dur != null && m.kind !== 'image' ? fmtClip(m.dur) : null, t('{0} MB', Math.max(0.1, Math.round((m.size / MB) * 10) / 10).toFixed(1))].filter(Boolean).join(' · ') : nullconst subtitle = m? <span className="cmf-sub"><Icon name={KIND_ICON[m.kind]} />{sizeLine}</span>: t('Optional — a picture makes it easier to spot in a list.')diff --git a/frontend/src/components/Media.test.jsx b/frontend/src/components/Media.test.jsxindex de91754cd..ed2babc95 100644--- a/frontend/src/components/Media.test.jsx+++ b/frontend/src/components/Media.test.jsx@@ -157,6 +157,23 @@ describe('Media — a custom exercise', () => {expect(HTMLMediaElement.prototype.play).toHaveBeenCalled()})+ it('plays only while it can be seen: a card off screen stops, and a loop starts again on its return', async () => {+ const observers = []+ const IO = globalThis.IntersectionObserver+ globalThis.IntersectionObserver = class { constructor(cb) { this.cb = cb; observers.push(this) } observe() {} disconnect() {} }+ try {+ await holding(MAIN, POSTER)+ await mountCustom(custom({ media: clip(8) }))+ const plays = () => HTMLMediaElement.prototype.play.mock.calls.length+ const before = plays()+ expect(before).toBeGreaterThan(0)+ await act(async () => { observers.at(-1).cb([{ isIntersecting: false }]) })+ expect(HTMLMediaElement.prototype.pause).toHaveBeenCalled()+ await act(async () => { observers.at(-1).cb([{ isIntersecting: true }]) })+ expect(plays()).toBeGreaterThan(before)+ } finally { globalThis.IntersectionObserver = IO }+ })+it('a long video waits for a tap, then plays with sound and its own controls', async () => {await holding(MAIN, POSTER)await mountCustom(custom({ media: clip(45) }))