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
Swipe: rows can be delete-only (no copy pane, a short rubber band the other way), name their own action, and step aside while something else owns the touch
Duarte Santosf77d902fab18
diff --git a/frontend/src/components/SwipeRow.jsx b/frontend/src/components/SwipeRow.jsxindex 305019c7d..03f299680 100644--- a/frontend/src/components/SwipeRow.jsx+++ b/frontend/src/components/SwipeRow.jsx@@ -6,17 +6,26 @@ import Icon from './Icon.jsx'// A set row you can swipe (v1.3.11): toward the start of the line deletes, toward the end copies.// The gesture lives in lib/use-swipe-row.js; this draws it. Two panes sit behind the row, one per// side, each growing with the swipe and holding a real button. While the row is shut they are-// zero wide (nothing shows through at the rounded corners, the SwipeToDelete lesson from QA-// 1.3.9), and while a pane is not the one showing it is inert, hidden from screen readers and out+// zero wide (nothing shows through at the rounded corners, a lesson from QA 1.3.9,+// when Plan's older swipe-to-delete drew a red hairline there), and while a pane is not the one showing it is inert, hidden from screen readers and out// of the tab order: a set row already has four to six tab stops, and the set-number menu is the// keyboard's and the screen reader's way to the same two actions.//// The row keeps an opaque background, so a done row's tint moves with it rather than letting the// panes show through. `data-swipe-ignore` keeps the Cards layout's own swipe (SwipeCards) off it:// on a set row a sideways swipe is about the set, everywhere else on the card it still turns it.-const SwipeRow = forwardRef(function SwipeRow({ children, canDelete = true, onDelete, onCopy, onBlocked, onStart, closeKey, flash, peek }, ref) {+//+// Plan's lists use it too (v1.3.11): a row without `onCopy` is delete-only, with no copy pane at+// all. `deleteLabel`/`copyLabel` and the icons name the action for the list it is in ("Remove"+// in a routine, "Duplicate" on a routine), and `className`, `style` and any data attributes land+// on the outer element, which is what a list's reorder measures and moves.+const SwipeRow = forwardRef(function SwipeRow({+ children, canDelete = true, onDelete, onCopy, onBlocked, onStart, canSwipe, closeKey, flash, peek,+ deleteLabel, copyLabel, deleteIcon = 'trash', copyIcon = 'copy', className, ...rest+}, ref) {+ const canCopy = typeof onCopy === 'function'const sw = useSwipeRow({- canDelete,+ canDelete, canCopy, canSwipe,onCommit: kind => (kind === 'delete' ? onDelete?.() : onCopy?.()),onBlocked, onStart, closeKey,})@@ -32,16 +41,16 @@ const SwipeRow = forwardRef(function SwipeRow({ children, canDelete = true, onDereturn () => clearTimeout(tm)}, [flash, sw.outerRef])const shut = side => sw.openSide !== side- return <div ref={sw.outerRef} className="swrow" data-swipe-ignore="" {...sw.handlers}>- <div ref={sw.cpRef} className="swpane cp" aria-hidden={shut('copy') || undefined} inert={shut('copy') ? true : undefined}>+ return <div {...rest} ref={sw.outerRef} className={'swrow' + (className ? ' ' + className : '')} data-swipe-ignore="" {...sw.handlers}>+ {canCopy && <div ref={sw.cpRef} className="swpane cp" aria-hidden={shut('copy') || undefined} inert={shut('copy') ? true : undefined}><button type="button" tabIndex={shut('copy') ? -1 : 0} onClick={sw.pressCopy}>{/* 'Copy set', not 'Copy': that key is the noun a copied routine is named with ("Kopie"). */}- <span className="lab"><Icon name="copy" /><b>{t('Copy set')}</b></span>+ <span className="lab"><Icon name={copyIcon} /><b>{copyLabel ?? t('Copy set')}</b></span></button>- </div>+ </div>}<div ref={sw.delRef} className={'swpane del' + (canDelete ? '' : ' dis')} aria-hidden={shut('delete') || undefined} inert={shut('delete') ? true : undefined}><button type="button" tabIndex={shut('delete') ? -1 : 0} onClick={sw.pressDelete}>- <span className="lab"><Icon name="trash" /><b>{t('Delete')}</b></span>+ <span className="lab"><Icon name={deleteIcon} /><b>{deleteLabel ?? t('Delete')}</b></span></button></div><div ref={sw.frontRef} className="swfront">{children}</div>diff --git a/frontend/src/lib/use-swipe-row.js b/frontend/src/lib/use-swipe-row.jsindex c57d23189..3da2bad2a 100644--- a/frontend/src/lib/use-swipe-row.js+++ b/frontend/src/lib/use-swipe-row.js@@ -5,7 +5,7 @@ import { vibrate } from './sound.js'// toward the start of the line (left in a left-to-right language, right in Arabic) deletes, toward// the end copies. A short swipe leaves the row open on a button; a long one, or a flick, acts on// release. Everything below is in that logical sense: a negative offset is toward the start and-// is turned into pixels only when painted, the way SwipeToDelete and SwipeCards do it.+// is turned into pixels only when painted, the way SwipeCards does it.//// The row is almost all controls (the set number, the steppers, the value fields, the tick), so a// swipe may start on any of them, and a tap must still be a tap. Nothing is captured until the@@ -19,6 +19,10 @@ import { vibrate } from './sound.js'// that, so the zone costs almost no row.//// Mouse drags are not swipes: a desktop has the set-number menu and the keyboard.+//+// Plan's lists use the same gesture (v1.3.11): routines (delete, duplicate), the loop and a+// routine's exercises (remove only). A row with nothing on the end side (`canCopy` false) only+// gives a short rubber band that way, so it still feels alive but never shows an empty pane.export const EDGE = 24export const SLOP = 8@@ -31,6 +35,8 @@ export const COPY_AT = 0.4export const COPY_FLING_AT = 0.25export const FLING = 0.5export const RESIST = 0.35+/** How far a row with no end-side action gives toward the end before it stops. */+export const BAND = 14const PEEK = 32/** +1 in a left-to-right page, -1 in a right-to-left one: logical offset × this = pixels. */@@ -47,7 +53,8 @@ export function axisOf(dx, dy) {/** Where the row sits for a raw logical drag `raw` on a row `w` wide: with the finger up to the* commit point, then at a third of the pace beyond it, never past the row's own width. */-export function shapeOffset(raw, w) {+export function shapeOffset(raw, w, canCopy = true) {+ if (raw > 0 && !canCopy) return Math.min(BAND, raw * RESIST)const at = (raw < 0 ? DELETE_AT : COPY_AT) * wconst d = Math.abs(raw)const out = d <= at ? d : at + (d - at) * RESIST@@ -55,16 +62,17 @@ export function shapeOffset(raw, w) {}/** Whether an offset is past the commit point, i.e. letting go now acts. */-export function armedFor(o, w) {+export function armedFor(o, w, canCopy = true) {if (o < 0) return -o >= DELETE_AT * w - 0.5 ? 'delete' : null- if (o > 0) return o >= COPY_AT * w - 0.5 ? 'copy' : null+ if (o > 0) return canCopy && o >= COPY_AT * w - 0.5 ? 'copy' : nullreturn null}/** What letting go does, for a row resting at logical offset `o` on a row `w` wide, released at* logical velocity `v` (px/ms): 'delete' | 'copy' act; 'open-delete' | 'open-copy' leave the row- * open on its button; 'close' snaps it shut. A flick back the other way always closes. */-export function commitFor(o, w, v = 0) {+ * open on its button; 'close' snaps it shut. A flick back the other way always closes. A row+ * with no end-side action (`canCopy` false) only ever closes from that side. */+export function commitFor(o, w, v = 0, canCopy = true) {if (o < 0) {const d = -oif (d >= DELETE_AT * w || (d >= DELETE_FLING_AT * w && -v > FLING)) return 'delete'@@ -72,6 +80,7 @@ export function commitFor(o, w, v = 0) {return d >= OPEN_MIN ? 'open-delete' : 'close'}if (o > 0) {+ if (!canCopy) return 'close'if (o >= COPY_AT * w || (o >= COPY_FLING_AT * w && v > FLING)) return 'copy'if (-v > FLING) return 'close'return o >= OPEN_MIN ? 'open-copy' : 'close'@@ -138,8 +147,11 @@ function install() {* side and turns a delete into a rubber band and `onBlocked()`. `closeKey` closes the row whenever* it changes (the entry's rows were added or removed, a tick, a timer start: the row under the* finger may no longer be the set it was). `onStart` runs when a swipe locks (the hint chip goes).+ * `canCopy` false is a delete-only row. `canSwipe()`, when given, is asked as a touch starts and+ * again before it locks: false leaves the touch to someone else (the routine editor's long-press+ * reorder, once it has picked a row up).*/-export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, closeKey }) {+export function useSwipeRow({ canDelete = true, canCopy = true, canSwipe, onCommit, onBlocked, onStart, closeKey }) {const outerRef = useRef(null)const frontRef = useRef(null)const delRef = useRef(null)@@ -152,7 +164,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clconst anim = useRef(null)const [openSide, setOpenSide] = useState(null)const props = useRef({})- props.current = { canDelete, onCommit, onBlocked, onStart }+ props.current = { canDelete, canCopy, canSwipe, onCommit, onBlocked, onStart }const later = (fn, ms) => { const id = setTimeout(fn, ms); timers.current.push(id); return id }const clearTimers = () => { timers.current.forEach(clearTimeout); timers.current = [] }@@ -161,7 +173,8 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clconst outer = outerRef.current, front = frontRef.currentif (!outer || !front) returnconst w = outer.clientWidth || 1- const prevArmed = armedFor(o.current, w)+ const copy = props.current.canCopy !== false+ const prevArmed = armedFor(o.current, w, copy)o.current = offconst tr = ms && !reducedMotion() ? `${ms}ms cubic-bezier(.32,.72,0,1)` : ''front.style.transition = tr ? `transform ${tr}` : 'none'@@ -172,7 +185,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clpane.style.transition = tr ? `width ${tr}` : 'none'pane.style.width = width + 'px'}- const armed = armedFor(off, w)+ const armed = armedFor(off, w, copy)del?.classList.toggle('armed', armed === 'delete')cp?.classList.toggle('armed', armed === 'copy')outer.classList.toggle('go-del', off < 0)@@ -244,6 +257,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, cl}const doCopy = () => {+ if (props.current.canCopy === false) { close(); return }if (shared.open?.el === outerRef.current) shared.open = nullsetOpenSide(null)vibrate(15)@@ -256,7 +270,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clconst release = v => {const outer = outerRef.currentif (!outer) return- const act = commitFor(o.current, outer.clientWidth || 1, v)+ const act = commitFor(o.current, outer.clientWidth || 1, v, props.current.canCopy !== false)if (act === 'delete') doDelete()else if (act === 'copy') doCopy()else if (act === 'open-delete') openTo('delete')@@ -269,8 +283,9 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, cluseEffect(() => () => { clearTimers(); clearTimeout(peeking.current); anim.current?.cancel?.(); if (shared.open?.el === outerRef.current) shared.open = null }, [])// touchmove is attached by hand and not passive, so a locked sideways swipe can keep the page- // from scrolling under it on browsers that do not honour touch-action on the row (see the- // comment block in SwipeToDelete.jsx). Before the lock it does nothing.+ // from scrolling under it on browsers that do not honour touch-action on the row: React's own+ // touch handlers are passive, and on iOS Safari a touch that starts on a row is claimed for the+ // page's scroll before a passive handler gets a say. Before the lock it does nothing.useEffect(() => {install()const el = outerRef.current@@ -284,6 +299,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clif (busy.current || g.current) returnif (e.pointerType !== 'touch' && e.pointerType !== 'pen') returnif (e.target.closest?.('.subrow,.swpane')) return+ if (props.current.canSwipe && !props.current.canSwipe()) returnconst width = typeof window !== 'undefined' ? window.innerWidth : 0if (width && inEdgeZone(e.clientX, width)) return// A real touch beats the first-use hint: it stops where it is and the row is the finger's@@ -299,6 +315,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clconst axis = axisOf(dx, dy)if (!axis) returnif (axis === 'y') { g.current = null; return }+ if (props.current.canSwipe && !props.current.canSwipe()) { g.current = null; return }d.lock = 'x'try { outerRef.current?.setPointerCapture?.(e.pointerId) } catch { /* the gesture still tracks */ }swallowNextClick()@@ -313,7 +330,7 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, cld.samples.push([now, logical])while (d.samples.length > 2 && now - d.samples[0][0] > 100) d.samples.shift()const w = outerRef.current?.clientWidth || 1- paint(Math.max(-w, Math.min(w, shapeOffset(d.o0 + logical, w))))+ paint(Math.max(-w, Math.min(w, shapeOffset(d.o0 + logical, w, props.current.canCopy !== false))))}const end = (e, cancelled) => {const d = g.current@@ -324,10 +341,11 @@ export function useSwipeRow({ canDelete = true, onCommit, onBlocked, onStart, clrelease(cancelled ? 0 : velocityOf(d.samples))}- // The first-use hint: a nudge toward the start (red shows), back, toward the end, back.+ // The first-use hint: a nudge toward the start (red shows), back, toward the end, back. A+ // delete-only row nudges toward the start only.const peek = useCallback(() => {if (reducedMotion() || busy.current || peeking.current || g.current) return- const steps = [[-PEEK, 250], [0, 250], [PEEK, 250], [0, 250]]+ const steps = [[-PEEK, 250], [0, 250], ...(props.current.canCopy === false ? [] : [[PEEK, 250], [0, 250]])]let k = 0const step = () => {if (k >= steps.length) { peeking.current = null; return }diff --git a/frontend/src/lib/use-swipe-row.test.js b/frontend/src/lib/use-swipe-row.test.jsindex c249c6192..1ca65d489 100644--- a/frontend/src/lib/use-swipe-row.test.js+++ b/frontend/src/lib/use-swipe-row.test.js@@ -1,5 +1,5 @@import { describe, it, expect } from 'vitest'-import { commitFor, shapeOffset, armedFor, axisOf, inEdgeZone, velocityOf, REVEAL, OPEN_MIN, EDGE } from './use-swipe-row.js'+import { commitFor, shapeOffset, armedFor, axisOf, inEdgeZone, velocityOf, REVEAL, OPEN_MIN, EDGE, BAND } from './use-swipe-row.js'// Offsets and velocities are logical (negative = toward the start of the line: left in English,// right in Arabic), so one table covers both directions; the component turns them into pixels.@@ -79,3 +79,20 @@ describe('velocityOf', () => {expect(velocityOf([[0, 0], [50, -40], [100, -80]])).toBeCloseTo(-0.8)})})++// Plan's remove-only rows (v1.3.11): the loop and a routine's exercises have nothing to copy.+describe('a row with nothing on the end side', () => {+ it('gives a short rubber band toward the end, and never more', () => {+ expect(shapeOffset(10, W, false)).toBeGreaterThan(0)+ expect(shapeOffset(10, W, false)).toBeLessThan(10)+ expect(shapeOffset(300, W, false)).toBe(BAND)+ expect(shapeOffset(-100, W, false)).toBe(shapeOffset(-100, W)) // the start side is untouched+ })+ it('never arms, opens or acts toward the end, however far or fast', () => {+ expect(armedFor(W, W, false)).toBeNull()+ expect(commitFor(BAND, W, 0, false)).toBe('close')+ expect(commitFor(W, W, 5, false)).toBe('close')+ expect(commitFor(-W * 0.7, W, 0, false)).toBe('delete')+ expect(commitFor(-REVEAL, W, 0, false)).toBe('open-delete')+ })+})