🚸 Improve ProjectHeader tab navigation user experience #3953
+217
−159
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,53 +6,7 @@ | |
| border-bottom: 1px solid var(--global-border); | ||
| } | ||
|
|
||
| .list { | ||
| display: flex; | ||
| gap: var(--spacing-2); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| .link { | ||
| position: relative; | ||
| display: flex; | ||
| gap: var(--spacing-1half); | ||
| align-items: center; | ||
| padding: var(--spacing-1half) var(--spacing-3) var(--spacing-1half) | ||
| var(--spacing-2); | ||
| font-size: var(--font-size-4); | ||
| font-weight: 500; | ||
| color: var(--global-mute-text); | ||
| cursor: pointer; | ||
| background: transparent; | ||
| border: none; | ||
| border-radius: var(--border-radius-md); | ||
| transition: all 0.2s ease; | ||
| } | ||
|
|
||
| .link[aria-disabled='true'] { | ||
| color: var(--button-disabled-foreground); | ||
| background-color: transparent; | ||
| } | ||
|
|
||
| .link:hover:not([aria-disabled='true']) { | ||
| color: var(--global-foreground); | ||
| background-color: var(--global-muted-background); | ||
| } | ||
|
|
||
| .link[data-active='true'] { | ||
| color: var(--global-foreground); | ||
| } | ||
|
|
||
| .link[data-active='true']::after { | ||
| position: absolute; | ||
| bottom: -6px; | ||
| left: 0; | ||
| width: 100%; | ||
| height: 1px; | ||
| content: ''; | ||
| background-color: var(--primary-accent); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import type { Meta, StoryObj } from '@storybook/nextjs' | ||
| import { PROJECT_TAB, type ProjectTab } from '../projectConstants' | ||
| import { TabItem } from './TabItem' | ||
|
|
||
| const TABS: readonly [ProjectTab, ProjectTab, ProjectTab] = [ | ||
| { value: PROJECT_TAB.PROJECT, label: 'Project' }, | ||
| { value: PROJECT_TAB.SCHEMA, label: 'Schema' }, | ||
| { value: PROJECT_TAB.SESSIONS, label: 'Sessions' }, | ||
| ] | ||
|
|
||
| const meta = { | ||
| component: TabItem, | ||
| parameters: { | ||
| layout: 'centered', | ||
| nextjs: { | ||
| appDirectory: true, | ||
| navigation: { | ||
| pathname: '/projects/123/ref/main', | ||
| }, | ||
| }, | ||
| }, | ||
| decorators: [ | ||
| (Story) => ( | ||
| <div style={{ display: 'flex', gap: '8px' }}> | ||
| <Story /> | ||
| </div> | ||
| ), | ||
| ], | ||
| argTypes: { | ||
| item: { | ||
| description: 'Tab item configuration', | ||
| }, | ||
| projectId: { | ||
| control: 'text', | ||
| description: 'Project ID', | ||
| }, | ||
| branchOrCommit: { | ||
| control: 'text', | ||
| description: 'Branch name or commit hash', | ||
| }, | ||
| schemaFilePath: { | ||
| control: 'text', | ||
| description: 'Schema file path (required for schema tab)', | ||
| }, | ||
| }, | ||
| args: { | ||
| projectId: 'my-project', | ||
| branchOrCommit: 'main', | ||
| item: TABS[0], | ||
| }, | ||
| } satisfies Meta<typeof TabItem> | ||
|
|
||
| export default meta | ||
| type Story = StoryObj<typeof TabItem> | ||
|
|
||
| export const Default: Story = { | ||
| render: (args) => { | ||
| const [projectTab, schemaTab, sessionsTab] = TABS | ||
| return ( | ||
| <> | ||
| <TabItem {...args} item={projectTab} /> | ||
| <TabItem {...args} item={schemaTab} schemaFilePath="schema.sql" /> | ||
| <TabItem {...args} item={sessionsTab} /> | ||
| </> | ||
| ) | ||
| }, | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| 'use client' | ||
|
|
||
| import { BookMarked, ErdIcon, MessagesSquare } from '@liam-hq/ui' | ||
| import Link from 'next/link' | ||
| import { usePathname } from 'next/navigation' | ||
| import { type FC, useMemo } from 'react' | ||
| import { match } from 'ts-pattern' | ||
| import { urlgen } from '../../../../libs/routes' | ||
| import type { ProjectTab, ProjectTabValue } from '../projectConstants' | ||
| import styles from './TabItem.module.css' | ||
|
|
||
| function getActiveTabFromPath(pathname: string): ProjectTabValue { | ||
| if (pathname.endsWith('/sessions')) return 'sessions' | ||
| if (pathname.includes('/schema/')) return 'schema' | ||
| return 'project' | ||
| } | ||
|
|
||
| function getIconComponent(tabValue: ProjectTabValue) { | ||
| return match(tabValue) | ||
| .with('project', () => BookMarked) | ||
| .with('schema', () => ErdIcon) | ||
| .with('sessions', () => MessagesSquare) | ||
| .exhaustive() | ||
| } | ||
|
|
||
| type Props = { | ||
| item: ProjectTab | ||
| projectId: string | ||
| branchOrCommit: string | ||
| schemaFilePath?: string | ||
| } | ||
|
|
||
| export const TabItem: FC<Props> = ({ | ||
| item, | ||
| projectId, | ||
| branchOrCommit, | ||
| schemaFilePath, | ||
| }) => { | ||
| const pathname = usePathname() | ||
| const activeTab = getActiveTabFromPath(pathname) | ||
|
|
||
| const Icon = getIconComponent(item.value) | ||
| const isSchemaTab = item.value === 'schema' | ||
| const isDisabled = isSchemaTab && !schemaFilePath | ||
| const isActive = item.value === activeTab | ||
|
|
||
| const href = useMemo(() => { | ||
| return match(item.value) | ||
| .with('project', () => | ||
| urlgen('projects/[projectId]/ref/[branchOrCommit]', { | ||
| projectId, | ||
| branchOrCommit, | ||
| }), | ||
| ) | ||
| .with('schema', () => | ||
| urlgen( | ||
| 'projects/[projectId]/ref/[branchOrCommit]/schema/[...schemaFilePath]', | ||
| { | ||
| projectId, | ||
| branchOrCommit, | ||
| schemaFilePath: schemaFilePath || '', | ||
| }, | ||
| ), | ||
junkisai marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ) | ||
| .with('sessions', () => | ||
| urlgen('projects/[projectId]/ref/[branchOrCommit]/sessions', { | ||
| projectId, | ||
| branchOrCommit, | ||
| }), | ||
| ) | ||
| .exhaustive() | ||
| }, [item, projectId, branchOrCommit, schemaFilePath]) | ||
|
|
||
| return ( | ||
| <Link | ||
| href={href} | ||
| data-active={isActive} | ||
| aria-disabled={isDisabled} | ||
| tabIndex={isDisabled ? -1 : undefined} | ||
| className={styles.link} | ||
| > | ||
| <Icon size={16} /> | ||
|
Comment on lines
+74
to
+82
There was a problem hiding this comment.
The new tab component keeps rendering a Useful? React with 👍 / 👎. |
||
| {item.label} | ||
| </Link> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export * from './TabItem' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.