diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index 5d989c9a3..760df563e 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -66,6 +66,15 @@ jobs: if: steps.changes.outputs.code == 'true' run: bun run test + - name: Install Storybook test browser + if: steps.changes.outputs.code == 'true' + working-directory: apps/storybook + run: bunx --no-install playwright install --with-deps chromium + + - name: Test stories in light and dark themes + if: steps.changes.outputs.code == 'true' + run: bun run --filter @avoid.quest/storybook test:stories + - name: Build apps and shared consumers if: steps.changes.outputs.code == 'true' run: bun run build diff --git a/.gitignore b/.gitignore index 4cb73efa0..e9ba86e79 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,6 @@ tmp temp apps/openDAW + +*storybook.log +storybook-static diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 764ee71e9..604ac89da 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -125,10 +125,10 @@ preserved. The mark identifies the repository link; it does not imply endorsemen ## Fonts and assets -Marketing bundles `@fontsource/geist-sans` and `@fontsource/geist-mono` **5.3.0**, -under **SIL OFL-1.1**. Their complete copyright and license files are copied into -its generated dependency notices. Font authors include Vercel, basement.studio -and the Geist Project Authors, as specified in those files. +Radio and marketing bundle `@fontsource-variable/geist-mono` **5.3.0** through +the shared UI theme, under **SIL OFL-1.1**. Its complete copyright and license file +is copied into each app's generated dependency notices. Copyright 2024 The Geist +Project Authors, as specified in that file. Original avoid.quest logos, favicons and application screenshots are under MIT. Third-party artwork or trademarks visible in screenshots remain their owners' diff --git a/apps/radio/README.md b/apps/radio/README.md index 3432278dc..bcc7d4b5d 100644 --- a/apps/radio/README.md +++ b/apps/radio/README.md @@ -67,7 +67,7 @@ play. See the [Mixcloud](../../packages/platforms/src/mixcloud/RESEARCH.md) and - **Throttling**: `@tanstack/react-pacer` (`useThrottledCallback`) - **DSP**: official openDAW Rust/WASM engine for supported active effect trees; radio AudioWorklet with `@opendaw/lib-dsp` primitives for compatibility - **Audio**: Web Audio API, AudioWorklet, HLS.js, HTML5 Audio -- **UI**: React 19, Tailwind CSS v4, shadcn/ui, Radix UI, dnd-kit +- **UI**: React 19, Tailwind CSS v4, shadcn/ui, Base UI, Vaul, dnd-kit - **Deploy**: Cloudflare Workers (Wrangler) - **Monitoring**: Sentry (browser via `/tunnel`, Worker via its SDK) diff --git a/apps/radio/package.json b/apps/radio/package.json index eb163ebae..e16a0a4bc 100644 --- a/apps/radio/package.json +++ b/apps/radio/package.json @@ -35,6 +35,7 @@ "@opendaw/studio-core": "^0.2.7", "@opendaw/studio-core-wasm": "^0.0.18", "@sentry/cloudflare": "11.8.0", + "@tabler/icons-react": "^3.50.0", "@tanstack/react-db": "^0.5.0", "@tanstack/react-pacer": "^0.24.0", "@tanstack/react-query": "^5.104.0", @@ -44,14 +45,12 @@ "@xyflow/react": "^12.12.0", "git-feedback": "^0.5.1", "hls.js": "^1.7.3", - "lucide-react": "catalog:", "lz-string": "^1.5.0", "next-themes": "catalog:", "p-queue": "^9.3.3", "react": "catalog:", "react-dom": "catalog:", "react-hook-form": "^7.89.0", - "sonner": "catalog:", "zod": "catalog:" }, "devDependencies": { @@ -59,6 +58,7 @@ "@rolldown/plugin-babel": "^0.2.4", "@sentry/core": "11.8.0", "@sentry/tanstackstart-react": "11.8.0", + "@storybook/react-vite": "catalog:", "@tailwindcss/vite": "catalog:", "@testing-library/dom": "^10.4.2", "@testing-library/react": "^16.3.3", @@ -69,6 +69,7 @@ "@vitejs/plugin-react": "catalog:", "babel-plugin-react-compiler": "^1.0.0", "jsdom": "^30.1.3", + "storybook": "catalog:", "typescript": "catalog:", "vite": "catalog:", "wrangler": "catalog:" diff --git a/apps/radio/scripts/check-node-chunk.ts b/apps/radio/scripts/check-node-chunk.ts index 783d77822..d4db24bb4 100644 --- a/apps/radio/scripts/check-node-chunk.ts +++ b/apps/radio/scripts/check-node-chunk.ts @@ -28,7 +28,7 @@ const LAZY_VENDORS = [ // Node mode's resizable shell. { markers: ['"data-separator"'], name: "react-resizable-panels" }, // Node mode's branch edges and the What's new popover. - { markers: ["PopoverTrigger"], name: "Radix Popover" }, + { markers: ["PopoverTrigger"], name: "Base UI Popover" }, // Audio effects load the Studio runtime on demand. { markers: ["WasmEngine.ensureReady must succeed"], name: "openDAW Studio" }, ]; @@ -200,8 +200,8 @@ for (const [name, source] of flowChunks) { } // The canvas is Node mode's only door to React Flow: the chunk that lazily -// loads it also draws the Stage, Rack and inspector, which a phone opens -// first, so it must not reach React Flow through static imports. +// loads it also draws the Rack and inspector, which load without React +// Flow, so it must not reach React Flow through static imports. const canvasChunks = [...chunks.keys()].filter( (name) => name.startsWith("node-canvas-") || name.startsWith("immutable-node-canvas-") diff --git a/apps/radio/src/components/audio/control-wheel.test.tsx b/apps/radio/src/components/audio/control-wheel.test.tsx index bd9d6e290..4f2d08c3a 100644 --- a/apps/radio/src/components/audio/control-wheel.test.tsx +++ b/apps/radio/src/components/audio/control-wheel.test.tsx @@ -100,7 +100,10 @@ describe("fine control wheel changes", () => { /> ); const view = render(control(1)); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); expect(wheel(knob, -120).defaultPrevented).toBe(true); wheel(knob, -120); @@ -120,7 +123,7 @@ describe("fine control wheel changes", () => { max={10} min={0} onValueChange={(next) => changes.push(next)} - onValueCommit={(next) => commits.push(next)} + onValueCommitted={(next) => commits.push(next)} step={1} value={[5]} /> @@ -134,7 +137,7 @@ describe("fine control wheel changes", () => { }); test("uncontrolled slider displays repeated fine wheel changes", () => { - const ref = createRef(); + const ref = createRef(); const view = render( ); @@ -143,9 +146,10 @@ describe("fine control wheel changes", () => { wheel(slider, -1); wheel(slider, -1); expect( - requireElement(view.container, '[role="slider"]').getAttribute( - "aria-valuenow" - ) + requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ).getAttribute("aria-valuenow") ).toBe("0.52"); }); @@ -161,7 +165,10 @@ describe("fine control wheel changes", () => { /> ); const view = render(renderKnob()); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); wheel(knob, -1); expect(changes).toEqual([1]); expect(wheel(knob, -1).defaultPrevented).toBe(false); @@ -177,7 +184,7 @@ describe("fine control wheel changes", () => { changes.push(next)} step={1} value={[8, 10]} @@ -212,7 +219,13 @@ describe("fine control wheel changes", () => { wheelStep={1} /> ); - wheel(requireElement(view.container, '[role="slider"]'), -1); + wheel( + requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ), + -1 + ); expect(changes).toEqual([9]); }); @@ -227,7 +240,10 @@ describe("fine control wheel changes", () => { value={0.5} /> ); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); wheel(knob, -1); act(() => knob.dispatchEvent( @@ -251,7 +267,10 @@ describe("fine control wheel changes", () => { value={[1]} /> ); - const thumb = requireElement(view.container, '[role="slider"]'); + const thumb = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); wheel(thumb, -1); expect(changes).toEqual([[1.01]]); }); @@ -272,7 +291,10 @@ describe("fine control wheel changes", () => { ); } const view = render(); - const thumb = requireElement(view.container, '[role="slider"]'); + const thumb = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); pressKey(thumb, "ArrowUp"); pressKey(thumb, "ArrowUp"); expect(thumb.getAttribute("aria-valuenow")).toBe("1.02"); @@ -297,7 +319,10 @@ describe("fine control wheel changes", () => { ); } const view = render(); - const thumb = requireElement(view.container, '[role="slider"]'); + const thumb = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); pressKey(thumb, "ArrowRight"); pressKey(thumb, "ArrowRight"); expect(changes).toEqual([0.51, 0.52]); @@ -331,7 +356,10 @@ describe("fine control wheel changes", () => { value={0} /> ); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); wheel(knob, -1); wheel(knob, -1); wheel(knob, -1); @@ -359,7 +387,10 @@ describe("immediate control input with throttled audio updates", () => { ); } const view = render(); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); act(() => { for (let index = 0; index < 5; index += 1) { knob.dispatchEvent( @@ -393,7 +424,10 @@ describe("immediate control input with throttled audio updates", () => { /> ); const view = render(control(0)); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); pressKey(knob, "ArrowUp"); pressKey(knob, "ArrowRight"); pressKey(knob, "ArrowUp"); @@ -425,7 +459,10 @@ describe("immediate control input with throttled audio updates", () => { /> ); const view = render(control(0.5)); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); Object.defineProperty(knob, "setPointerCapture", { value: () => undefined, }); @@ -475,7 +512,10 @@ describe("immediate control input with throttled audio updates", () => { /> ); const view = render(control(0.51)); - const knob = requireElement(view.container, '[role="slider"]'); + const knob = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); wheel(knob, -1); wheel(knob, 1); // Back to 0.51, so the parent skips both renders. act(() => { @@ -503,7 +543,10 @@ describe("immediate control input with throttled audio updates", () => { /> ); const view = render(control(0.5)); - const thumb = requireElement(view.container, '[role="slider"]'); + const thumb = requireElement( + view.container, + ':is([role="slider"], input[type="range"])' + ); pressKey(thumb, "ArrowUp"); pressKey(thumb, "ArrowUp"); pressKey(thumb, "ArrowUp"); diff --git a/apps/radio/src/components/audio/effect-chain.tsx b/apps/radio/src/components/audio/effect-chain.tsx index 2ca65315a..bb9a11f5d 100644 --- a/apps/radio/src/components/audio/effect-chain.tsx +++ b/apps/radio/src/components/audio/effect-chain.tsx @@ -21,7 +21,7 @@ import { verticalListSortingStrategy, } from "@dnd-kit/sortable"; import { CSS } from "@dnd-kit/utilities"; -import { PlusIcon } from "lucide-react"; +import { IconPlus } from "@tabler/icons-react"; import { type Dispatch, type FocusEvent, @@ -94,7 +94,7 @@ function EffectTempoControl({ return (
@@ -257,7 +257,7 @@ export function EffectChain({ {activeEffect ? ( -
+
- + Add effect @@ -382,7 +382,7 @@ function SortableEffectItem({ return (
= { - autotune: RadioIcon, - cheapReverb: WavesIcon, - compressor: FireExtinguisherIcon, - crusher: ZapIcon, - delay: ClockIcon, - distortion: ZapIcon, - fold: ZapIcon, - frequencySplit: FilterIcon, - fxComposite: FilterIcon, - gate: FireExtinguisherIcon, - limiter: GaugeIcon, - maximizer: GaugeIcon, - neuralAmp: ZapIcon, - pitchShifter: RadioIcon, - plateReverb: WavesIcon, - revamp: FilterIcon, - stereoSplit: RadioIcon, - stereoTool: RadioIcon, - tidal: WavesIcon, - vocoder: RadioIcon, - waveshaper: ZapIcon, - werkstatt: FilterIcon, +export const EFFECT_ICONS: Record = { + autotune: IconRadio, + cheapReverb: IconWaveSine, + compressor: IconFireExtinguisher, + crusher: IconBolt, + delay: IconClock, + distortion: IconBolt, + fold: IconBolt, + frequencySplit: IconFilter, + fxComposite: IconFilter, + gate: IconFireExtinguisher, + limiter: IconGauge, + maximizer: IconGauge, + neuralAmp: IconBolt, + pitchShifter: IconRadio, + plateReverb: IconWaveSine, + revamp: IconFilter, + stereoSplit: IconRadio, + stereoTool: IconRadio, + tidal: IconWaveSine, + vocoder: IconRadio, + waveshaper: IconBolt, + werkstatt: IconFilter, }; diff --git a/apps/radio/src/components/audio/effect-item.tsx b/apps/radio/src/components/audio/effect-item.tsx index 9db9f132a..61641225d 100644 --- a/apps/radio/src/components/audio/effect-item.tsx +++ b/apps/radio/src/components/audio/effect-item.tsx @@ -13,11 +13,11 @@ import type { DraggableSyntheticListeners, } from "@dnd-kit/core"; import { - FilterIcon, - GripVerticalIcon, - RotateCcwIcon, - XIcon, -} from "lucide-react"; + IconFilter, + IconGripVertical, + IconRotate, + IconX, +} from "@tabler/icons-react"; import type { SyntheticEvent } from "react"; import { createDefaultEffectConfig, @@ -71,7 +71,7 @@ export function EffectItem({ const metadata = getEffectMetadata(effect.type); const effectName = metadata?.name ?? effect.type; - const Icon = EFFECT_ICONS[effect.type] ?? FilterIcon; + const Icon = EFFECT_ICONS[effect.type] ?? IconFilter; function handleEnabledChange(enabled: boolean) { onUpdate({ enabled }); @@ -88,7 +88,7 @@ export function EffectItem({ return ( - + {/* Icon */}
- +
diff --git a/apps/radio/src/components/audio/effect-params/container-params.tsx b/apps/radio/src/components/audio/effect-params/container-params.tsx index e0b93b3a8..c19b65857 100644 --- a/apps/radio/src/components/audio/effect-params/container-params.tsx +++ b/apps/radio/src/components/audio/effect-params/container-params.tsx @@ -4,11 +4,11 @@ import { Input } from "@avoid.quest/ui/components/input"; import { Switch } from "@avoid.quest/ui/components/switch"; import { Toggle } from "@avoid.quest/ui/components/toggle"; import { - ChevronDownIcon, - ChevronRightIcon, - PlusIcon, - XIcon, -} from "lucide-react"; + IconChevronDown, + IconChevronRight, + IconPlus, + IconX, +} from "@tabler/icons-react"; import { type ChangeEvent, type Dispatch, @@ -186,7 +186,7 @@ function NestedEffect({ } return ( -
+
@@ -214,7 +214,7 @@ function NestedEffect({ size="icon" variant="ghost" > - +
{expanded && schema ? ( @@ -423,7 +423,7 @@ function ChainEditor({ ); return ( -
+
- + ) : null}
@@ -493,7 +493,7 @@ function ChainEditor({ size="sm" variant="outline" > - + Add nested effect ) : null} @@ -614,7 +614,7 @@ export function ContainerParams({ size="sm" variant="outline" > - + Add parallel chain )} diff --git a/apps/radio/src/components/audio/effect-params/declarative-params.tsx b/apps/radio/src/components/audio/effect-params/declarative-params.tsx index 1ca83d013..6d975180c 100644 --- a/apps/radio/src/components/audio/effect-params/declarative-params.tsx +++ b/apps/radio/src/components/audio/effect-params/declarative-params.tsx @@ -177,7 +177,7 @@ function TextControl({ return (