Skip to content

๐ŸŽจ Palette: [UX improvement] ๋น„ํ™œ์„ฑํ™”๋œ ๋‚ด๋น„๊ฒŒ์ด์…˜ ๋ฉ”๋‰ด์˜ ํˆดํŒ ์ ‘๊ทผ์„ฑ ๊ฐœ์„  #521

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

Closed
seonghobae wants to merge 1 commit into from
Closed

๐ŸŽจ Palette: [UX improvement] ๋น„ํ™œ์„ฑํ™”๋œ ๋‚ด๋น„๊ฒŒ์ด์…˜ ๋ฉ”๋‰ด์˜ ํˆดํŒ ์ ‘๊ทผ์„ฑ ๊ฐœ์„  #521

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
4 changes: 2 additions & 2 deletions apps/desktop/src/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ describe("App", () => {
expect(screen.getByText(/SYNCED โ€ข LOCAL/i)).toBeTruthy();
expect(screen.getByText(/Turn a song into a practical rehearsal view\./i)).toBeTruthy();
expect(screen.getByRole("button", { name: /^Workspace$/i })).toBeTruthy();
expect(screen.getByRole("button", { name: /^Import$/i })).toBeTruthy();
expect(screen.getByRole("button", { name: /^Export$/i })).toBeTruthy();
const comingSoonElements = screen.getAllByTitle("Coming soon", { exact: false });
expect(comingSoonElements.length).toBeGreaterThan(0);
Comment on lines 205 to +207
expect(screen.getByText(/^Tempo$/i)).toBeTruthy();
expect(screen.getByText(/^Key$/i)).toBeTruthy();
expect(screen.getByText(/Local-first/i)).toBeTruthy();
Expand Down
114 changes: 79 additions & 35 deletions apps/desktop/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,24 +492,45 @@ export function App() {
</div>

<nav aria-label="Primary rehearsal views" className="space-y-2">
{NAV_ITEMS.map(({ label, icon: Icon, active }) => (
<button
key={label}
type="button"
aria-current={active ? "page" : undefined}
aria-disabled={active ? undefined : true}
disabled={!active}
title={active ? undefined : "Coming soon"}
className={`flex min-h-11 w-full items-center gap-3 rounded-xl px-3 text-left text-sm font-semibold transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300 ${
active
? "bg-blue-600/70 text-white shadow-[0_12px_30px_rgba(37,99,235,0.32)]"
: "cursor-not-allowed text-slate-500 opacity-70"
}`}
>
<Icon className="size-5" aria-hidden="true" />
{label}
</button>
))}
{NAV_ITEMS.map(({ label, icon: Icon, active }) => {
const baseClass = `flex min-h-11 w-full items-center gap-3 rounded-xl px-3 text-left text-sm font-semibold transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300`;

if (active) {
return (
<button
key={label}
type="button"
aria-current="page"
className={`${baseClass} bg-blue-600/70 text-white shadow-[0_12px_30px_rgba(37,99,235,0.32)]`}
>
<Icon className="size-5" aria-hidden="true" />
{label}
</button>
);
}

return (
<span
key={label}
tabIndex={0}
role="button"
aria-disabled="true"
title="Coming soon"
className="block w-full cursor-not-allowed rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300"
>
<span className="sr-only">{label} coming soon</span>
<button
type="button"
disabled
aria-hidden="true"
className={`${baseClass} pointer-events-none cursor-not-allowed text-slate-500 opacity-70`}
>
<Icon className="size-5" aria-hidden="true" />
{label}
</button>
</span>
);
Comment on lines +512 to +532
})}
</nav>

<div className="mt-auto space-y-5">
Expand Down Expand Up @@ -553,23 +574,46 @@ export function App() {

<main id="main-content" className="max-h-screen min-w-0 flex-1 overflow-y-auto px-4 py-4 sm:px-6 lg:px-8">
<nav aria-label="Compact rehearsal views" className="mb-4 flex gap-2 overflow-x-auto rounded-2xl border border-white/10 bg-slate-950/72 p-2 backdrop-blur-xl lg:hidden">
{NAV_ITEMS.map(({ label, icon: Icon, active }) => (
<button
key={label}
type="button"
aria-current={active ? "page" : undefined}
aria-label={`${label} compact view`}
aria-disabled={active ? undefined : true}
disabled={!active}
title={active ? undefined : "Coming soon"}
className={`inline-flex min-h-10 shrink-0 items-center gap-2 rounded-xl px-3 text-sm font-semibold transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300 ${
active ? "bg-blue-600/70 text-white" : "cursor-not-allowed text-slate-500 opacity-70"
}`}
>
<Icon className="size-4" aria-hidden="true" />
{label}
</button>
))}
{NAV_ITEMS.map(({ label, icon: Icon, active }) => {
const baseClass = `inline-flex min-h-10 shrink-0 items-center gap-2 rounded-xl px-3 text-sm font-semibold transition focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300`;

if (active) {
return (
<button
key={label}
type="button"
aria-current="page"
aria-label={`${label} compact view`}
className={`${baseClass} bg-blue-600/70 text-white`}
>
<Icon className="size-4" aria-hidden="true" />
{label}
</button>
);
}

return (
<span
key={label}
tabIndex={0}
role="button"
aria-disabled="true"
title="Coming soon"
className="inline-block cursor-not-allowed rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-cyan-300"
>
<span className="sr-only">{label} coming soon</span>
<button
type="button"
disabled
aria-hidden="true"
className={`${baseClass} pointer-events-none cursor-not-allowed text-slate-500 opacity-70`}
>
<Icon className="size-4" aria-hidden="true" />
{label}
</button>
</span>
);
Comment on lines +595 to +615
})}
</nav>

<section aria-label="Source controls" className="mb-4 rounded-3xl border border-white/10 bg-slate-950/72 p-4 shadow-[0_18px_60px_rgba(0,0,0,0.25)] backdrop-blur-xl">
Expand Down
Loading