@sudobility/music_drawing 0.0.32 → 0.0.34

package/dist/score-canvas.js

@@ -0,0 +1,541 @@
+import { displayScore, measureAtTick, measureIndexOf, } from '@sudobility/music_types';
+import { TRACK_INFO_WIDTH, boxForMeasureIndex, computeLayout, resolveZoom, } from './layout.js';
+import { eventIdAtPoint, eventIdsAtPoint, eventIdsInBox, measureAtPoint, measureIndexAtGutterPoint, pitchAtStavePoint, } from './hit-test.js';
+import { trackIdAtGutterPoint } from './track-gutter.js';
+import { noteColorsFor } from './note-colors.js';
+import { outOfRangeNoteIds } from './out-of-range.js';
+import { playbackScrollTarget } from './playback-scroll.js';
+import { tickForPoint } from './playhead.js';
+import { shouldShowTrackInfo } from './types.js';
+import { cursorGeometryAt, cursorPathFor, cursorTickAt, measureStartTicks, sameCursorPath, systemEndTick, systemIndexForTick, } from './cursor.js';
+/** A frame, the default for `presentLatencyMs`. */
+const FRAME_MS = 16;
+/** Highlight latency before anything has been measured: one frame. */
+const DEFAULT_HIGHLIGHT_LATENCY_SECONDS = 0.016;
+/** Measurements kept for the median. */
+const HIGHLIGHT_SAMPLES = 15;
+/** A change smaller than this is not worth telling the player about. */
+const HIGHLIGHT_REPORT_STEP_SECONDS = 0.003;
+/** Clear space kept between the playing bar and the edge it nears, in view px. */
+const FOLLOW_MARGIN = 40;
+const HELD = { tick: 0, atMs: 0, ticksPerSecond: 0 };
+export class ScoreCanvas {
+    constructor({ surface, scheduler }) {
+        this.score = null;
+        /** What `setStoredScore` was last given, so a repeat call does no work. */
+        this.stored = null;
+        this.pitchDisplay = 'concert';
+        this.view = null;
+        this.scrollLeft = 0;
+        this.scrollTop = 0;
+        this.activeTrackId = null;
+        this.playing = [];
+        this.selectedIds = [];
+        this.regenerated = false;
+        this.outOfRangeIds = [];
+        this.selectedMeasureIds = new Set();
+        this.lastFrame = null;
+        /** The plan the last frame was drawn against is only trusted while this matches. */
+        this.currentPlan = null;
+        this.starts = [];
+        this.cancelPaint = null;
+        /** What the drawn window last showed, so an invisible colour change skips the paint. */
+        this.paintedSignature = '';
+        /** When the lit notes last changed without being painted yet. */
+        this.highlightRequestedAt = null;
+        this.highlightSamples = [];
+        this.highlightLatency = DEFAULT_HIGHLIGHT_LATENCY_SECONDS;
+        this.highlightListeners = new Set();
+        this.motion = HELD;
+        this.path = null;
+        this.shownMotion = null;
+        this.cancelWrap = null;
+        this.surface = surface;
+        this.scheduler = scheduler;
+    }
+    // ---- what is drawn -------------------------------------------------------
+    /**
+     * The score as the store holds it — sounding pitch, before any lens — and
+     * the reading mode to draw it in.
+     *
+     * The preferred way in. The canvas applies `displayScore` itself and scans
+     * the stored score with `outOfRangeNoteIds`, so no host has to remember
+     * either half: the scan must see **stored** pitch (the compass is sounding
+     * pitch) while the paint must see the **display** score, and a host handed
+     * only one of the two was always one line away from colouring a clarinet's
+     * part a tone out, or from marking nothing at all.
+     *
+     * The ids it marks survive the lenses — both keep event ids — so they colour
+     * the drawn notes correctly in either mode. Calling again with the same
+     * score and mode does nothing. A later `setOutOfRangeNotes` overrides the
+     * marks until the stored score next changes.
+     */
+    setStoredScore(score, pitchDisplay = 'concert') {
+        if (score === this.stored && pitchDisplay === this.pitchDisplay)
+            return;
+        const scoreChanged = score !== this.stored;
+        this.stored = score;
+        this.pitchDisplay = pitchDisplay;
+        this.setScore(score ? displayScore(score, pitchDisplay) : null);
+        if (scoreChanged) {
+            this.outOfRangeIds = outOfRangeNoteIds(score).ids;
+            this.scheduleColourPaint();
+        }
+    }
+    /**
+     * The **display** score, lenses already applied.
+     *
+     * Lower level than `setStoredScore`: the host owns the lenses and, if it
+     * wants out-of-range marks, must pass them to `setOutOfRangeNotes` from a
+     * scan of the stored score. Kept for hosts that have not moved over.
+     */
+    setScore(score) {
+        if (score === this.score)
+            return;
+        this.score = score;
+        this.starts = score ? measureStartTicks(score) : [];
+        this.invalidateLayout();
+    }
+    setView(view) {
+        const previous = this.view;
+        this.view = view;
+        if (previous &&
+            previous.width === view.width &&
+            previous.zoom === view.zoom &&
+            previous.layoutMode === view.layoutMode &&
+            previous.theme === view.theme &&
+            sameIds(previous.trackIds, view.trackIds)) {
+            // Only the height or the pixel ratio moved: same layout, new window.
+            if (previous.height !== view.height ||
+                previous.devicePixelRatio !== view.devicePixelRatio) {
+                this.schedulePaint();
+            }
+            return;
+        }
+        this.invalidateLayout();
+    }
+    /** Content px. */
+    setScroll(left, top) {
+        if (left === this.scrollLeft && top === this.scrollTop)
+            return;
+        this.scrollLeft = left;
+        this.scrollTop = top;
+        this.schedulePaint();
+    }
+    // ---- 1–2. the cursor -----------------------------------------------------
+    setCursorTick(tick) {
+        this.animateCursor({ tick, atMs: this.scheduler.now(), ticksPerSecond: 0 });
+    }
+    animateCursor(motion) {
+        this.motion = motion;
+        this.refreshCursor();
+    }
+    // ---- 3–6. what colours the notation --------------------------------------
+    setActiveTrack(trackId) {
+        if (trackId === this.activeTrackId)
+            return;
+        this.activeTrackId = trackId;
+        // The stave tint changes with it, so this is always visible.
+        this.paintedSignature = '';
+        this.schedulePaint();
+    }
+    setPlayingNotes(notes) {
+        this.playing = notes;
+        // Stamped before scheduling: a host that paints synchronously measures
+        // inside `scheduleColourPaint`, and must find the stamp already there.
+        const stamped = this.highlightRequestedAt === null;
+        if (stamped)
+            this.highlightRequestedAt = this.scheduler.now();
+        if (!this.scheduleColourPaint() && stamped) {
+            this.highlightRequestedAt = null;
+        }
+    }
+    setSelectedNotes(ids, options = {}) {
+        this.selectedIds = ids;
+        this.regenerated = options.regenerated ?? false;
+        this.scheduleColourPaint();
+    }
+    setSelectedMeasures(ids) {
+        this.selectedMeasureIds = new Set(ids);
+        this.scheduleColourPaint();
+    }
+    setOutOfRangeNotes(ids) {
+        this.outOfRangeIds = ids;
+        this.scheduleColourPaint();
+    }
+    // ---- questions -----------------------------------------------------------
+    /** The layout the canvas draws against, or null with no score or view. */
+    get plan() {
+        if (this.currentPlan)
+            return this.currentPlan;
+        if (!this.score || !this.view)
+            return null;
+        this.currentPlan = computeLayout(this.score, this.layoutOptions(this.view));
+        return this.currentPlan;
+    }
+    /** What the last paint drew, while it still describes the current layout. */
+    get frame() {
+        return this.lastFrame;
+    }
+    get zoom() {
+        return resolveZoom(this.view?.zoom ?? 1);
+    }
+    /** How large the scrollable content is, in content px. */
+    contentSize() {
+        const plan = this.plan;
+        if (!plan)
+            return { width: 0, height: 0 };
+        return {
+            width: plan.totalWidth * this.zoom,
+            height: plan.totalHeight * this.zoom,
+        };
+    }
+    /** Content px. */
+    cursorGeometry(tick) {
+        const plan = this.plan;
+        if (!plan || !this.score)
+            return null;
+        return cursorGeometryAt(plan, this.score, this.zoom, tick, this.positions());
+    }
+    hitTest(point) {
+        const plan = this.plan;
+        const score = this.score;
+        const view = this.view;
+        if (!plan || !score || !view)
+            return null;
+        const zoom = this.zoom;
+        // 10. The gutter is pinned to the view, so it is tested in view px.
+        if (shouldShowTrackInfo(this.layoutOptions(view))) {
+            const trackId = trackIdAtGutterPoint(plan, zoom, this.scrollTop, point);
+            if (trackId)
+                return { kind: 'trackGutter', trackId };
+            if (point.x >= 0 && point.x <= TRACK_INFO_WIDTH * zoom)
+                return null;
+        }
+        const content = {
+            x: point.x + this.scrollLeft,
+            y: point.y + this.scrollTop,
+        };
+        const logical = { x: content.x / zoom, y: content.y / zoom };
+        // 11.
+        const measureIndex = measureIndexAtGutterPoint(plan, logical);
+        if (measureIndex !== null)
+            return { kind: 'measureNumber', measureIndex };
+        const measure = measureAtPoint(plan, logical);
+        if (!measure)
+            return null;
+        const tick = tickForPoint(plan, score, logical.x, logical.y, this.positions()) ?? 0;
+        // 12. Bounding boxes are content px.
+        const boxes = this.lastFrame?.idToBBox;
+        const noteId = boxes ? eventIdAtPoint(boxes, content) : null;
+        if (boxes && noteId) {
+            const chord = eventIdsAtPoint(boxes, content);
+            return {
+                kind: 'note',
+                eventIds: chord.length > 0 ? chord : [noteId],
+                trackId: measure.trackId,
+                measureIndex: measure.measureIndex,
+                tick,
+            };
+        }
+        // 13.
+        return {
+            kind: 'stave',
+            trackId: measure.trackId,
+            measureIndex: measure.measureIndex,
+            tick,
+            pitch: pitchAtStavePoint(plan, score, logical)?.pitch ?? null,
+        };
+    }
+    /** The tick under a view point: the inverse of the cursor. */
+    tickAt(point) {
+        const plan = this.plan;
+        if (!plan || !this.score)
+            return null;
+        const zoom = this.zoom;
+        return tickForPoint(plan, this.score, (point.x + this.scrollLeft) / zoom, (point.y + this.scrollTop) / zoom, this.positions());
+    }
+    /** Drawn notes inside a view-px rectangle spanned by two corners. */
+    noteIdsInRect(a, b) {
+        const boxes = this.lastFrame?.idToBBox;
+        if (!boxes)
+            return [];
+        const x = Math.min(a.x, b.x) + this.scrollLeft;
+        const y = Math.min(a.y, b.y) + this.scrollTop;
+        return eventIdsInBox(boxes, {
+            x,
+            y,
+            width: Math.abs(a.x - b.x),
+            height: Math.abs(a.y - b.y),
+        });
+    }
+    /** The bar index `tick` falls in, or null — following playback decides per bar. */
+    measureIndexAt(tick) {
+        const score = this.score;
+        const track = score?.tracks[0];
+        if (!score || !track)
+            return null;
+        const measure = measureAtTick(score, track.id, tick);
+        return measure ? measureIndexOf(score, measure.id) : null;
+    }
+    /**
+     * Ticks per second at `tick` from the written tempo — a first guess for a
+     * cursor that has just started moving, before the real rate is measured.
+     */
+    writtenTicksPerSecond(tick) {
+        const score = this.score;
+        if (!score)
+            return 0;
+        let bpm = 0;
+        for (const event of score.tempoMap) {
+            if (event.tick > tick)
+                break;
+            bpm = event.bpm;
+        }
+        return (bpm * score.ppq) / 60;
+    }
+    /** Where following playback should scroll for `tick`, or null to stay. */
+    followTarget(tick) {
+        const plan = this.plan;
+        const score = this.score;
+        const view = this.view;
+        const track = score?.tracks[0];
+        if (!plan || !score || !view || !track)
+            return null;
+        const measure = measureAtTick(score, track.id, tick);
+        const measureIndex = measure ? measureIndexOf(score, measure.id) : null;
+        if (measureIndex === null)
+            return null;
+        const box = boxForMeasureIndex(plan, 0, measureIndex);
+        if (!box)
+            return null;
+        return playbackScrollTarget({
+            plan,
+            layoutMode: view.layoutMode,
+            zoom: this.zoom,
+            measureIndex,
+            measureX: box.x,
+            measureWidth: box.width,
+            scrollLeft: this.scrollLeft,
+            viewportWidth: view.width,
+            scrollTop: this.scrollTop,
+            viewportHeight: view.height,
+            margin: FOLLOW_MARGIN,
+        });
+    }
+    /** Scroll so `tick` is in view: a jump for more than a screen, else smooth. */
+    scrollToFollow(tick) {
+        const target = this.followTarget(tick);
+        const view = this.view;
+        if (!target || !view)
+            return;
+        const relocating = Math.abs(target.top - this.scrollTop) > view.height ||
+            Math.abs(target.left - this.scrollLeft) > view.width;
+        this.surface.scrollTo?.(target, relocating ? 'jump' : 'smooth');
+    }
+    /**
+     * How long a change of lit notes takes to reach the screen here, in seconds:
+     * waiting for the frame, drawing, and presenting.
+     *
+     * Measured rather than assumed because it is a property of the host. A web
+     * canvas repaints a window of notation in a few milliseconds; the native app
+     * records a Skia picture and waits a React commit, measured at 45–70ms on a
+     * dense score. The player publishes the lit notes this far ahead
+     * (`setSoundingRenderDelay`), which is what keeps them with the sound on
+     * both. The median of recent paints, so one stalled frame does not move it.
+     */
+    get highlightLatencySeconds() {
+        return this.highlightLatency;
+    }
+    subscribeHighlightLatency(listener) {
+        this.highlightListeners.add(listener);
+        return () => this.highlightListeners.delete(listener);
+    }
+    /** Paint now rather than on the next frame — for a host that must, like a resize. */
+    paintNow() {
+        this.cancelPaint?.();
+        this.cancelPaint = null;
+        this.paint();
+    }
+    dispose() {
+        this.cancelPaint?.();
+        this.cancelPaint = null;
+        this.cancelWrap?.();
+        this.cancelWrap = null;
+    }
+    // ---- internals -----------------------------------------------------------
+    layoutOptions(view) {
+        return {
+            zoom: view.zoom,
+            layoutMode: view.layoutMode,
+            width: view.width,
+            theme: view.theme,
+            ...(view.trackIds ? { trackIds: view.trackIds } : {}),
+        };
+    }
+    positions() {
+        const frame = this.lastFrame;
+        return frame && frame.plan === this.plan
+            ? frame.measureNotePositions
+            : undefined;
+    }
+    invalidateLayout() {
+        this.currentPlan = null;
+        this.lastFrame = null;
+        this.paintedSignature = '';
+        this.schedulePaint();
+        this.refreshCursor();
+    }
+    /** Schedules a paint for a colour change; says whether one was needed. */
+    scheduleColourPaint() {
+        const frame = this.lastFrame;
+        if (frame) {
+            const signature = this.colourSignature(frame);
+            if (signature === this.paintedSignature)
+                return false;
+        }
+        this.schedulePaint();
+        return true;
+    }
+    colourSignature(frame) {
+        let signature = `a${this.activeTrackId ?? ''};`;
+        for (const [id, role] of this.noteColors()) {
+            if (frame.idToBBox.has(id))
+                signature += `${id}:${role};`;
+        }
+        for (const id of this.selectedMeasureIds) {
+            if (frame.measureIdToBBox.has(id))
+                signature += `m${id};`;
+        }
+        return signature;
+    }
+    noteColors() {
+        return noteColorsFor({
+            selectedIds: this.selectedIds,
+            outOfRangeIds: this.outOfRangeIds,
+            sounding: this.playing,
+            activeTrackId: this.activeTrackId,
+            regenerated: this.regenerated,
+        });
+    }
+    schedulePaint() {
+        if (this.cancelPaint)
+            return;
+        /*
+          The canceller is kept only if the callback has not already run. A host
+          may run a frame callback synchronously (a test's stubbed
+          `requestAnimationFrame` does), and storing the canceller *after* that
+          callback had cleared it left this guard set for good: the canvas never
+          painted again.
+        */
+        let ran = false;
+        const cancel = this.scheduler.frame(() => {
+            ran = true;
+            this.cancelPaint = null;
+            this.paint();
+        });
+        if (!ran)
+            this.cancelPaint = cancel;
+    }
+    paint() {
+        const score = this.score;
+        const view = this.view;
+        if (!score || !view)
+            return;
+        const zoom = this.zoom;
+        const noteColors = this.noteColors();
+        const frame = this.surface.paint(score, {
+            ...this.layoutOptions(view),
+            noteColors,
+            activeTrackId: this.activeTrackId,
+            selectedMeasureIds: this.selectedMeasureIds,
+            viewport: {
+                top: this.scrollTop / zoom,
+                bottom: (this.scrollTop + view.height) / zoom,
+                left: this.scrollLeft / zoom,
+                right: (this.scrollLeft + view.width) / zoom,
+            },
+            ...(view.devicePixelRatio
+                ? { devicePixelRatio: view.devicePixelRatio }
+                : {}),
+        });
+        this.measureHighlight();
+        if (!frame)
+            return;
+        // The renderer's plan is the one the notes were placed in.
+        this.currentPlan = frame.plan;
+        this.lastFrame = frame;
+        this.paintedSignature = this.colourSignature(frame);
+        // 6. A repaint can move the noteheads the path runs through.
+        this.refreshCursor();
+    }
+    measureHighlight() {
+        const requestedAt = this.highlightRequestedAt;
+        if (requestedAt === null)
+            return;
+        this.highlightRequestedAt = null;
+        const present = this.surface.presentLatencyMs ?? FRAME_MS;
+        const sample = (this.scheduler.now() - requestedAt + present) / 1000;
+        this.highlightSamples.push(sample);
+        if (this.highlightSamples.length > HIGHLIGHT_SAMPLES) {
+            this.highlightSamples.shift();
+        }
+        const sorted = [...this.highlightSamples].sort((a, b) => a - b);
+        const median = sorted[sorted.length >> 1] ?? sample;
+        const unreported = this.highlightSamples.length === 1;
+        if (unreported ||
+            Math.abs(median - this.highlightLatency) >= HIGHLIGHT_REPORT_STEP_SECONDS) {
+            this.highlightLatency = median;
+            for (const listener of this.highlightListeners)
+                listener(median);
+        }
+    }
+    refreshCursor() {
+        this.cancelWrap?.();
+        this.cancelWrap = null;
+        const plan = this.plan;
+        const score = this.score;
+        if (!plan || !score) {
+            this.show(null);
+            return;
+        }
+        const now = this.scheduler.now();
+        const tick = cursorTickAt(this.motion, now);
+        const systemIndex = systemIndexForTick(plan, this.starts, tick);
+        const path = systemIndex < 0
+            ? null
+            : cursorPathFor(plan, score, this.zoom, this.starts, systemIndex, this.positions());
+        this.show(path);
+        // 6. Hand over to the next system when the moving cursor gets there.
+        const rate = this.motion.ticksPerSecond;
+        if (path && rate > 0 && systemIndex < plan.systems.length - 1) {
+            const end = systemEndTick(plan, this.starts, systemIndex);
+            const ms = ((end - tick) / rate) * 1000;
+            // Kept only if not already run, for the reason `schedulePaint` gives.
+            let ran = false;
+            const cancel = this.scheduler.timeout(() => {
+                ran = true;
+                this.cancelWrap = null;
+                this.refreshCursor();
+            }, Math.max(0, ms) + 1);
+            if (!ran)
+                this.cancelWrap = cancel;
+        }
+    }
+    show(path) {
+        if (sameCursorPath(path, this.path) && this.shownMotion === this.motion) {
+            return;
+        }
+        this.path = path;
+        this.shownMotion = this.motion;
+        this.surface.showCursor(path, this.motion);
+    }
+}
+function sameIds(a, b) {
+    if (a === b)
+        return true;
+    if (!a || !b || a.length !== b.length)
+        return false;
+    return a.every((id, index) => id === b[index]);
+}
+//# sourceMappingURL=score-canvas.js.map

package/dist/score-canvas.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"score-canvas.js","sourceRoot":"","sources":["../src/score-canvas.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -79,6 +79,19 @@ export type RenderTheme = {
      * white paper.
      */
     printForeground?: string;
+    /**
+     * A piano key that is sounding (or held). Defaults to `notePlaying`, so a
+     * lit key and a playing note read as the same state.
+     *
+     * On the theme rather than in each app's keyboard, which is where it was:
+     * the web read `notePlaying` while the native app hard-coded its own blues,
+     * so the two keyboards lit in different colours for the same note.
+     * Optional so a theme written before the keyboard existed still type-checks.
+     * Read through `keyboardKeyFill`, which also applies the fallback.
+     */
+    keyboardLit?: string;
+    /** A piano key in the one selected chord. Defaults to `noteSelected`. */
+    keyboardSelected?: string;
 };
 /** Default high-contrast paper ink. */
 export declare const PRINT_INK = "#000000";

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,oGAAoG;AACpG,MAAM,MAAM,aAAa,GACvB,QAAQ,GAAG,UAAU,GAAG,aAAa,GAAG,SAAS,GAAG,YAAY,CAAC;AAEnE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE5C,KAAK,oBAAoB,GAAG;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,UAAU,CAIvE;AAED,yEAAyE;AACzE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAE1E;AAED;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,4EAA4E;IAC5E,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;OAUG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;OAUG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,mDAAmD;IACnD,aAAa,EAAE,MAAM,CAAC;IACtB,oHAAoH;IACpH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,uCAAuC;AACvC,eAAO,MAAM,SAAS,YAAY,CAAC;AAEnC;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,EAAE,WAazC,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,EAAE,WAkBxC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,iCAAkC,CAAC;AAE5D,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,MAAM,aAAa,GAAG;IAC1B,gGAAgG;IAChG,IAAI,EAAE,MAAM,CAAC;IACb,mGAAmG;IACnG,UAAU,EAAE,UAAU,CAAC;IACvB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kGAAkG;IAClG,KAAK,EAAE,MAAM,CAAC;IACd,sHAAsH;IACtH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAChD,sGAAsG;IACtG,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,4IAA4I;IAC5I,kBAAkB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,oGAAoG;AACpG,MAAM,MAAM,aAAa,GACvB,QAAQ,GAAG,UAAU,GAAG,aAAa,GAAG,SAAS,GAAG,YAAY,CAAC;AAEnE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE5C,KAAK,oBAAoB,GAAG;IAC1B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,UAAU,CAIvE;AAED,yEAAyE;AACzE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAE1E;AAED;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,4EAA4E;IAC5E,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;OAUG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;;;;;OAUG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,mDAAmD;IACnD,aAAa,EAAE,MAAM,CAAC;IACtB,oHAAoH;IACpH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,uCAAuC;AACvC,eAAO,MAAM,SAAS,YAAY,CAAC;AAEnC;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,EAAE,WAazC,CAAC;AAEF,uEAAuE;AACvE,eAAO,MAAM,0BAA0B,EAAE,WAkBxC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,iCAAkC,CAAC;AAE5D,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,MAAM,aAAa,GAAG;IAC1B,gGAAgG;IAChG,IAAI,EAAE,MAAM,CAAC;IACb,mGAAmG;IACnG,UAAU,EAAE,UAAU,CAAC;IACvB;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kGAAkG;IAClG,KAAK,EAAE,MAAM,CAAC;IACd,sHAAsH;IACtH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,4DAA4D;IAC5D,UAAU,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAChD,sGAAsG;IACtG,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,4IAA4I;IAC5I,kBAAkB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dist/types.js

@@ -33,7 +33,7 @@ export const DEFAULT_SCREEN_RENDER_THEME = {
     noteSelected: '#050816',
     noteRegenerated: '#2563eb',
     notePlaying: '#0f766e',
-    noteOutOfRange: '#b91c1c',
+    noteOutOfRange: '#ea580c',
     measureSelection: '#f59e0b',
     staveActive: '#64748b',
     staveInactive: '#c3ccd8',

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAaH;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,OAA6B;IACzD,OAAO,CACL,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC/D,OAAO,OAAO,CAAC,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;AACtE,CAAC;AA6DD,uCAAuC;AACvC,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC;AAEnC;;;;GAIG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAgB;IACtD,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,SAAS;IACvB,eAAe,EAAE,SAAS;IAC1B,WAAW,EAAE,SAAS;IACtB,cAAc,EAAE,SAAS;IACzB,gBAAgB,EAAE,SAAS;IAC3B,WAAW,EAAE,SAAS;IACtB,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,SAAS;IAChB,eAAe,EAAE,SAAS;CAC3B,CAAC;AAEF,uEAAuE;AACvE,MAAM,CAAC,MAAM,0BAA0B,GAAgB;IACrD,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,SAAS;IACvB,eAAe,EAAE,SAAS;IAC1B,WAAW,EAAE,SAAS;IACtB;;;;MAIE;IACF,cAAc,EAAE,SAAS;IACzB,gBAAgB,EAAE,SAAS;IAC3B,WAAW,EAAE,SAAS;IACtB,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,SAAS;IAChB,eAAe,EAAE,SAAS;CAC3B,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,YAAY,CAAU,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAaH;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,OAA6B;IACzD,OAAO,CACL,OAAO,CAAC,UAAU,IAAI,CAAC,OAAO,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC/D,OAAO,OAAO,CAAC,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;AACtE,CAAC;AA0ED,uCAAuC;AACvC,MAAM,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC;AAEnC;;;;GAIG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAgB;IACtD,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,SAAS;IACvB,eAAe,EAAE,SAAS;IAC1B,WAAW,EAAE,SAAS;IACtB,cAAc,EAAE,SAAS;IACzB,gBAAgB,EAAE,SAAS;IAC3B,WAAW,EAAE,SAAS;IACtB,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,SAAS;IAChB,eAAe,EAAE,SAAS;CAC3B,CAAC;AAEF,uEAAuE;AACvE,MAAM,CAAC,MAAM,0BAA0B,GAAgB;IACrD,UAAU,EAAE,SAAS;IACrB,UAAU,EAAE,SAAS;IACrB,YAAY,EAAE,SAAS;IACvB,YAAY,EAAE,SAAS;IACvB,eAAe,EAAE,SAAS;IAC1B,WAAW,EAAE,SAAS;IACtB;;;;MAIE;IACF,cAAc,EAAE,SAAS;IACzB,gBAAgB,EAAE,SAAS;IAC3B,WAAW,EAAE,SAAS;IACtB,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,SAAS;IAChB,eAAe,EAAE,SAAS;CAC3B,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,YAAY,CAAU,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sudobility/music_drawing",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "Canvas score rendering for Moosiac: layout, VexFlow drawing and the paint loop.",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,11 +44,11 @@
     "vexflow": "^4.2.5"
   },
   "peerDependencies": {
-    "@sudobility/music_types": "^0.13.23"
+    "@sudobility/music_types": "^0.13.25"
   },
   "devDependencies": {
     "@eslint/js": "^9.38.0",
-    "@sudobility/music_types": "^0.13.23",
+    "@sudobility/music_types": "^0.13.25",
     "@sudobility/types": "^1.9.67",
     "@tonejs/midi": "^2.0.28",
     "@types/jsdom": "^30.0.0",