Skip to content

Commit 6f6d242

Browse files
feat(studio): audio meter faders for groups and master (#4203)
* feat(studio): audio meter faders for groups and master * fix(studio): meter's mid band uses amber-500, the theme's actual token yellow-500 was reset to nothing by palette-reset.css (--color-*: initial) and never redefined in theme.css, so the mask never revealed any color for -6 to -3dB; the token gate test already catches this and was red. * refactor(studio): rename YELLOW_AT to AMBER_AT to match the amber token * fix(studio): fader nudge and aria-valuenow match the visual dB position * refactor(studio): use core StereoLevel for meter channel shape * fix(core): emit levelTap in the packed core build * fix(studio): name the preview fader Monitor and share clampNumber * fix(studio): split the meter rAF tick and cover its branches * style(studio): oxfmt AudioMeterStrip tests * fix(studio): preserve authored gain in audio meter faders * fix(studio): make timeline audio meters opt-in
1 parent bf6cc7e commit 6f6d242

8 files changed

Lines changed: 604 additions & 57 deletions

File tree

‎packages/core/package-subpaths.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@
278278
"types": "./dist/runtime/webAudioRoute.d.ts",
279279
"environments": ["browser", "bun", "node"]
280280
},
281+
"./runtime/levelTap": {
282+
"source": "./src/runtime/levelTap.ts",
283+
"runtime": "./dist/runtime/levelTap.js",
284+
"types": "./dist/runtime/levelTap.d.ts",
285+
"environments": ["browser", "bun", "node"]
286+
},
281287
"./compiler/html-document": {
282288
"source": "./src/compiler/htmlDocument.ts",
283289
"runtime": "./dist/compiler/htmlDocument.js",

‎packages/core/package.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,12 @@
287287
"import": "./src/runtime/webAudioRoute.ts",
288288
"types": "./src/runtime/webAudioRoute.ts"
289289
},
290+
"./runtime/levelTap": {
291+
"bun": "./src/runtime/levelTap.ts",
292+
"node": "./dist/runtime/levelTap.js",
293+
"import": "./src/runtime/levelTap.ts",
294+
"types": "./src/runtime/levelTap.ts"
295+
},
290296
"./compiler/html-document": {
291297
"bun": "./src/compiler/htmlDocument.ts",
292298
"node": "./dist/compiler/htmlDocument.js",
@@ -609,6 +615,10 @@
609615
"import": "./dist/runtime/webAudioRoute.js",
610616
"types": "./dist/runtime/webAudioRoute.d.ts"
611617
},
618+
"./runtime/levelTap": {
619+
"import": "./dist/runtime/levelTap.js",
620+
"types": "./dist/runtime/levelTap.d.ts"
621+
},
612622
"./compiler/html-document": {
613623
"import": "./dist/compiler/htmlDocument.js",
614624
"types": "./dist/compiler/htmlDocument.d.ts"

‎packages/core/tsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"src/runtime/protocol.ts",
2222
"src/runtime/stackingContext.ts",
2323
"src/runtime/webAudioRoute.ts",
24+
"src/runtime/levelTap.ts",
2425
"src/runtime/wiggleEase.ts"
2526
],
2627
"include": ["src/**/*"],

‎packages/studio/src/components/TimelineToolbar.test.tsx‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ import { afterEach, describe, expect, it, vi } from "vitest";
66
import type { GsapAnimation } from "@hyperframes/core/gsap-parser";
77
import { usePlayerStore } from "../player/store/playerStore";
88
import { makeSelection } from "../hooks/domSelectionTestHarness";
9+
import { useAudioMetersVisible } from "../utils/audioMeterVisibility";
10+
import { readStudioUiPreferences } from "../utils/studioUiPreferences";
11+
import { AudioMeterStrip } from "./nle/AudioMeterStrip";
912
import { TimelineToolbar } from "./TimelineToolbar";
1013

1114
vi.mock("../contexts/StudioContext", () => ({
1215
useStudioShellContext: () => ({
16+
previewIframeRef: { current: null },
1317
editHistory: { canUndo: false, canRedo: false },
1418
handleUndo: vi.fn(),
1519
handleRedo: vi.fn(),
@@ -172,3 +176,41 @@ describe("TimelineToolbar — keyframes on audio tracks", () => {
172176
act(() => root.unmount());
173177
});
174178
});
179+
180+
describe("TimelineToolbar audio meters", () => {
181+
it("keeps fresh preferences hidden until the user opts in and persists the choice", () => {
182+
localStorage.clear();
183+
useAudioMetersVisible.setState(useAudioMetersVisible.getInitialState());
184+
usePlayerStore.setState({
185+
elements: [{ id: "music", key: "music", tag: "audio", start: 0, duration: 10, track: 1 }],
186+
});
187+
const host = document.createElement("div");
188+
document.body.append(host);
189+
const root = createRoot(host);
190+
try {
191+
act(() =>
192+
root.render(
193+
<>
194+
<TimelineToolbar />
195+
<AudioMeterStrip />
196+
</>,
197+
),
198+
);
199+
const button = host.querySelector<HTMLButtonElement>(
200+
'button[aria-label="Toggle audio meters"]',
201+
);
202+
expect(readStudioUiPreferences().audioMetersVisible).toBeUndefined();
203+
expect(button?.getAttribute("aria-pressed")).toBe("false");
204+
expect(host.querySelector('[data-testid="audio-meter-strip"]')).toBeNull();
205+
if (!button) throw new Error("audio meter toggle not rendered");
206+
act(() => button.click());
207+
expect(button.getAttribute("aria-pressed")).toBe("true");
208+
expect(host.querySelector('[data-testid="audio-meter-strip"]')).not.toBeNull();
209+
expect(readStudioUiPreferences().audioMetersVisible).toBe(true);
210+
} finally {
211+
act(() => root.unmount());
212+
useAudioMetersVisible.setState(useAudioMetersVisible.getInitialState());
213+
localStorage.clear();
214+
}
215+
});
216+
});

0 commit comments

Comments
 (0)