diff --git a/packages/core/src/audio/audioFxWorklets.ts b/packages/core/src/audio/audioFxWorklets.ts
index 003d3572a1..e421d34099 100644
--- a/packages/core/src/audio/audioFxWorklets.ts
+++ b/packages/core/src/audio/audioFxWorklets.ts
@@ -9,7 +9,7 @@
* Kept as a source string so it can be registered from a Blob URL without a
* separate bundled asset, which keeps the studio's build unchanged.
*/
-export const AUDIO_FX_WORKLET_SOURCE = `
+const AUDIO_FX_WORKLET_SOURCE = `
const dbToLin = (db) => Math.pow(10, db / 20);
/**
diff --git a/packages/studio/src/components/editor/propertyPanelFxControls.tsx b/packages/studio/src/components/editor/propertyPanelFxControls.tsx
index 3a3f780504..e435157427 100644
--- a/packages/studio/src/components/editor/propertyPanelFxControls.tsx
+++ b/packages/studio/src/components/editor/propertyPanelFxControls.tsx
@@ -184,5 +184,3 @@ export function FxParams({ def, params, onChange, onCommit, disabled }: FxParams
);
}
-
-export const __testables = { toSlider, fromSlider, display };
diff --git a/packages/studio/src/components/editor/propertyPanelFxSection.tsx b/packages/studio/src/components/editor/propertyPanelFxSection.tsx
index 5445d0145a..16e60ea5af 100644
--- a/packages/studio/src/components/editor/propertyPanelFxSection.tsx
+++ b/packages/studio/src/components/editor/propertyPanelFxSection.tsx
@@ -34,6 +34,160 @@ export interface AudioTrackOption {
label: string;
}
+interface FxNodeRowProps {
+ node: HfAudioFxNode;
+ index: number;
+ open: boolean;
+ /** Last in the chain, so it cannot move further down. */
+ last: boolean;
+ disabled?: boolean;
+ onToggleOpen(): void;
+ onUpdate(index: number, patch: Partial): void;
+ onMove(index: number, delta: number): void;
+ onRemove(index: number): void;
+ onPreview(index: number, params: HfAudioFxParamValues): void;
+}
+
+/** Reorder arrow. Disabled at the end of the chain it would move past. */
+function FxMoveButton({
+ label,
+ glyph,
+ disabled,
+ onClick,
+}: {
+ label: string;
+ glyph: string;
+ disabled: boolean;
+ onClick(): void;
+}) {
+ return (
+
+ {glyph}
+
+ );
+}
+
+/** Name, bypass, reorder and remove for one effect. */
+function FxNodeHeader({
+ label,
+ open,
+ bypassed,
+ first,
+ last,
+ disabled,
+ onToggleOpen,
+ onToggleBypass,
+ onMove,
+ onRemove,
+}: {
+ label: string;
+ open: boolean;
+ bypassed: boolean;
+ first: boolean;
+ last: boolean;
+ disabled?: boolean;
+ onToggleOpen(): void;
+ onToggleBypass(): void;
+ onMove(delta: number): void;
+ onRemove(): void;
+}) {
+ return (
+
+
+ {label}
+
+
+ {bypassed ? "Off" : "On"}
+
+ onMove(-1)}
+ />
+ onMove(1)}
+ />
+
+ ×
+
+
+ );
+}
+
+/** One effect in the chain: its header controls, and its knobs when open. */
+function FxNodeRow({
+ node,
+ index,
+ open,
+ last,
+ disabled,
+ onToggleOpen,
+ onUpdate,
+ onMove,
+ onRemove,
+ onPreview,
+}: FxNodeRowProps) {
+ const def = getAudioFxDef(node.type);
+ if (!def) return null;
+ const bypassed = node.enabled === false;
+ return (
+
+ onUpdate(index, { enabled: bypassed })}
+ onMove={(delta) => onMove(index, delta)}
+ onRemove={() => onRemove(index)}
+ />
+ {open ? (
+ onPreview(index, params)}
+ onCommit={(params: HfAudioFxParamValues) => onUpdate(index, { params })}
+ />
+ ) : null}
+
+ );
+}
+
export interface FxSectionProps {
chain: HfAudioFxChain;
/** Structural edits and gesture-end writes; this is the one that persists. */
@@ -128,76 +282,21 @@ export function FxSection({
No effects on this track.
) : (
- chain.nodes.map((node, i) => {
- const def = getAudioFxDef(node.type);
- if (!def) return null;
- const bypassed = node.enabled === false;
- const open = openNode === i;
- return (
-
-
- setOpenNode(open ? null : i)}
- >
- {def.label}
-
- updateNode(i, { enabled: bypassed })}
- >
- {bypassed ? "Off" : "On"}
-
- moveNode(i, -1)}
- >
- ↑
-
- moveNode(i, 1)}
- >
- ↓
-
- removeNode(i)}
- >
- ×
-
-
- {open ? (
-
previewNode(i, params)}
- onCommit={(params: HfAudioFxParamValues) => updateNode(i, { params })}
- />
- ) : null}
-
- );
- })
+ chain.nodes.map((node, i) => (
+ setOpenNode(openNode === i ? null : i)}
+ onUpdate={updateNode}
+ onMove={moveNode}
+ onRemove={removeNode}
+ onPreview={previewNode}
+ />
+ ))
)}