Dashboard motion: round dashboards page up and down, the ring eases to a notch or a reading, the slider tile to a value set elsewhere; reduced motion honoured by every tween; motion spec in the docs
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
5b2769c141
commit
b500af84ec
@@ -43,7 +43,7 @@ import {
|
||||
TITLE_WIDTH,
|
||||
useRingDraft,
|
||||
} from "./ui/core/ring"
|
||||
import { useAnimatedFraction } from "./ui/core/values"
|
||||
import { useEased } from "./ui/core/values"
|
||||
import type { Series } from "./widgets"
|
||||
|
||||
/** How much wheel a notch is: what one detent of a mouse wheel reports. */
|
||||
@@ -242,7 +242,8 @@ export function CentreReading({
|
||||
* which is the one thing a knob's ring can set and a circle's edge can show.
|
||||
* Turned by a drag along it or by the mouse wheel, a notch a step, an option
|
||||
* or a hue step; the value moves at once and one publish follows once the
|
||||
* turning stops (`useRingDraft`). Its reading is written large in the middle,
|
||||
* turning stops (`useRingDraft`). What is drawn along the ring eases to a
|
||||
* notch or a reading at the look's spring, and follows a drag exactly. Its reading is written large in the middle,
|
||||
* unless a slider reads something beside it: then that is in the middle, and
|
||||
* the slider's own title and value move to the gap's line.
|
||||
*
|
||||
@@ -272,16 +273,21 @@ export function Ring({
|
||||
widget.type === "slider" ? ((cfg.reading ?? {}) as Series) : {}
|
||||
const read = useBoundValue(beside.message || undefined)
|
||||
const dial = dialOf(widget, widget.type === "gauge" ? bound?.value : value)
|
||||
const { current, latest, move, commit } = useRingDraft(dial.value, (next) =>
|
||||
send(dial.wire(next)),
|
||||
const { current, held, latest, move, commit } = useRingDraft(
|
||||
dial.value,
|
||||
(next) => send(dial.wire(next)),
|
||||
)
|
||||
const svg = useRef<SVGSVGElement>(null)
|
||||
const face = useRef<HTMLDivElement>(null)
|
||||
const spin = useRef(0)
|
||||
const turns = Boolean(dial.notch) && !locked
|
||||
const at = dial.at(current)
|
||||
const animated = useAnimatedFraction(at ?? 0)
|
||||
const shown = useTransform(animated, (fraction) => (fraction > 0 ? 1 : 0))
|
||||
const along = useEased(at ?? 0, held, Boolean(dial.hue))
|
||||
// At the minimum the value arc is a zero-length dash whose round caps would
|
||||
// still paint a dot, so it is not drawn there.
|
||||
const shown = useTransform(along, (fraction) => (fraction > 0 ? 1 : 0))
|
||||
const handleX = useTransform(along, (fraction) => ringPoint(size, fraction).x)
|
||||
const handleY = useTransform(along, (fraction) => ringPoint(size, fraction).y)
|
||||
|
||||
const turn = (by: number) => {
|
||||
if (turns && dial.notch) move(dial.notch(latest(), by), true)
|
||||
@@ -327,17 +333,14 @@ export function Ring({
|
||||
// Written to the slider's own decimals and in its unit: the two are read
|
||||
// against each other.
|
||||
const other = beside.message ? dial.reading(read?.value ?? null) : null
|
||||
const handle = dial.handle && at !== null ? ringPoint(size, at) : null
|
||||
// The same reading, placed: a bar across the band where it sits on the
|
||||
// slider's scale, held to the sweep at either end.
|
||||
const actual = typeof read?.value === "number" ? dial.at(read.value) : null
|
||||
const across =
|
||||
actual === null
|
||||
? null
|
||||
: [
|
||||
ringPoint(size, actual, -RING_READING / 2),
|
||||
ringPoint(size, actual, RING_READING / 2),
|
||||
]
|
||||
const across = useTransform(useEased(actual ?? 0), (fraction) => {
|
||||
const from = ringPoint(size, fraction, -RING_READING / 2)
|
||||
const to = ringPoint(size, fraction, RING_READING / 2)
|
||||
return `M${from.x} ${from.y}L${to.x} ${to.y}`
|
||||
})
|
||||
const whole = ringArc(size, 0, 1)
|
||||
const name = widget.title || text(cfg.target, widget.id)
|
||||
|
||||
@@ -394,26 +397,16 @@ export function Ring({
|
||||
className="dui-ring-track"
|
||||
/>
|
||||
)}
|
||||
{/* A slider's reading follows the hand, so it is drawn where it
|
||||
is. A gauge eases to its reading, revealed rather than re-pathed
|
||||
as the gauge tile's arc is, and transparent at the minimum where
|
||||
its round caps would still paint a dot. */}
|
||||
{dial.fill && dial.notch && at ? (
|
||||
<path
|
||||
d={ringArc(size, 0, at)}
|
||||
fill="none"
|
||||
strokeWidth={RING_STROKE}
|
||||
strokeLinecap="round"
|
||||
className="dui-ring-fill"
|
||||
/>
|
||||
) : dial.fill && !dial.notch ? (
|
||||
{/* Revealed rather than re-pathed, as the gauge tile's arc is: `d`
|
||||
does not ease, and `pathLength` makes the reveal the fraction. */}
|
||||
{dial.fill ? (
|
||||
<motion.path
|
||||
d={whole}
|
||||
fill="none"
|
||||
strokeWidth={RING_STROKE}
|
||||
strokeLinecap="round"
|
||||
className="dui-ring-fill"
|
||||
style={{ pathLength: animated, opacity: shown }}
|
||||
style={{ pathLength: along, opacity: shown }}
|
||||
/>
|
||||
) : null}
|
||||
{dial.marks?.map((mark, index) => {
|
||||
@@ -430,20 +423,17 @@ export function Ring({
|
||||
)
|
||||
})}
|
||||
{/* Under the handle, so where the two meet the value being set wins. */}
|
||||
{across ? (
|
||||
<line
|
||||
x1={across[0].x}
|
||||
y1={across[0].y}
|
||||
x2={across[1].x}
|
||||
y2={across[1].y}
|
||||
{actual !== null ? (
|
||||
<motion.path
|
||||
d={across}
|
||||
strokeWidth={RING_READING_STROKE}
|
||||
className="dui-ring-reading"
|
||||
/>
|
||||
) : null}
|
||||
{handle ? (
|
||||
<circle
|
||||
cx={handle.x}
|
||||
cy={handle.y}
|
||||
{dial.handle && at !== null ? (
|
||||
<motion.circle
|
||||
cx={handleX}
|
||||
cy={handleY}
|
||||
r={RING_HANDLE / 2}
|
||||
className={cn("dui-ring-handle", dial.hue && "dui-ring-swatch")}
|
||||
style={dial.hue ? { fill: cssOf(current as Triple) } : undefined}
|
||||
|
||||
Reference in New Issue
Block a user