Skip to content

feat(studio): make presets the primary path into the FX rack #3274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanceingalls wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −10
Open

feat(studio): make presets the primary path into the FX rack #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/studio/src/components/editor/propertyPanelAudioFxGroup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ describe("AudioFxGroup dynamic carve", () => {
});
document.getElementById("bed")?.setAttribute("src", "bed.wav");
act(() => byTextButton(host, "Audio FX")?.click());
act(() => byTextButton(host, "Add effect")?.click());
act(() => byTextButton(host, "+ effect")?.click());
await act(async () => {
byTextButton(host, "Even Out Levels")?.click();
await new Promise((r) => setTimeout(r, 0));
Expand Down Expand Up @@ -581,7 +581,7 @@ describe("AudioFxGroup dynamic carve", () => {
const { release, decoded } = stubGatedDecode();
const { host, onSetAttributeLive } = mount({ "fx-chain": CHAIN });
document.getElementById("bed")?.setAttribute("src", "bed.wav");
act(() => byTextButton(host, "Add effect")?.click());
act(() => byTextButton(host, "+ effect")?.click());
const level = byTextButton(host, "Even Out Levels");
expect(level, "the levelling button was not offered").toBeTruthy();
act(() => level?.focus());
Expand Down Expand Up @@ -611,7 +611,7 @@ describe("AudioFxGroup dynamic carve", () => {
const { release, decoded } = stubGatedDecode();
const { host, onSetAttributeLive } = mount({ "fx-chain": CHAIN });
document.getElementById("bed")?.setAttribute("src", "bed.wav");
act(() => byTextButton(host, "Add effect")?.click());
act(() => byTextButton(host, "+ effect")?.click());
act(() => byTextButton(host, "Even Out Levels")?.focus());
// Straight to a neighbour, without ever leaving the shelf.
act(() =>
Expand Down
6 changes: 3 additions & 3 deletions packages/studio/src/components/editor/propertyPanelFxSection.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ describe("FxSection chain", () => {

click(host.querySelector(".hf-fx-add"));
expect(host.querySelector(".hf-fx-add-menu")).toBeNull();
expect(byText(host, "button", "Add effect")).toBeTruthy();
expect(byText(host, "button", "+ effect")).toBeTruthy();
});

it("opens one menu in place of the other", () => {
Expand Down Expand Up @@ -1046,7 +1046,7 @@ describe("FxSection chain", () => {

it("auditions an effect the add menu is offering", () => {
const { host, onChainPreview, onChainChange } = mount({ chain: chainOf("peaking") });
click(byText(host, "button", "Add effect"));
click(byText(host, "button", "+ effect"));
enter(byText(host, "button", EFFECT_COPY.reverb?.title ?? ""));

const heard = onChainPreview.mock.calls.at(-1)?.[0] as HfAudioFxChain;
Expand All @@ -1063,7 +1063,7 @@ describe("FxSection chain", () => {
onLevel: vi.fn(),
onAuditionLevel,
});
click(byText(host, "button", "Add effect"));
click(byText(host, "button", "+ effect"));
enter(byText(host, "button", "Even Out Levels"));
expect(onAuditionLevel).toHaveBeenLastCalledWith(true);
leave(host, ".hf-fx-add-menu");
Expand Down
8 changes: 4 additions & 4 deletions packages/studio/src/components/editor/propertyPanelFxSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,10 @@ export function FxSection({
opened one and changed their mind had no way back: picking something
was the only thing that set these false, so the only exits were adding
an effect they did not want or deselecting the clip. */}
<div className="flex gap-1">
<div className="flex flex-col gap-1">
<button
type="button"
className="hf-fx-preset w-full rounded-[4px] border border-dashed border-panel-border-input py-1 text-[11px] text-panel-text-2 hover:text-panel-text-0 disabled:opacity-40"
className="hf-fx-preset w-full rounded-[4px] border border-panel-text-0 py-1.5 text-[11px] font-semibold text-panel-text-0 disabled:opacity-40"
aria-expanded={picking}
disabled={disabled}
onClick={() => {
Expand All @@ -530,7 +530,7 @@ export function FxSection({
</button>
<button
type="button"
className="hf-fx-add w-full rounded-[4px] border border-dashed border-panel-border-input py-1 text-[11px] text-panel-text-2 hover:text-panel-text-0 disabled:opacity-40"
className="hf-fx-add self-end px-1 text-[10px] text-panel-text-2 hover:text-panel-text-0 disabled:opacity-40"
aria-expanded={adding}
disabled={disabled}
onClick={() => {
Expand All @@ -542,7 +542,7 @@ export function FxSection({
setPicking(false);
}}
>
{adding ? "Close" : "Add effect"}
{adding ? "Close" : "+ effect"}
</button>
</div>
</div>
Expand Down
Loading