Skip to content

feat(tabs): Add new variant to be used on issue details #75029

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

Merged
merged 4 commits into from
Jul 29, 2024
Merged

feat(tabs): Add new variant to be used on issue details #75029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eff6a7e
new tab variant
roggenkemper Jul 25, 2024
d60204e
rename
roggenkemper Jul 26, 2024
51ca6a7
rename
roggenkemper Jul 26, 2024
d3d6d86
edits
roggenkemper Jul 29, 2024
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
16 changes: 16 additions & 0 deletions static/app/components/tabs/index.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,22 @@ export default storyBook(Tabs, story => {
</TabPanels>
</Tabs>
</SizingWindow>
<br />
<p>You can also use the "floating" variant, which is used below</p>
<SizingWindow>
<Tabs>
<TabList variant="floating" hideBorder>
Copy link
Member

@ryan953 ryan953 Jul 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could use a Matrix to better show the different values along side each other, i'd use Matrix to compate with hideBorder and also with orientation

{TABS.map(tab => (
<TabList.Item key={tab.key}>{tab.label}</TabList.Item>
))}
</TabList>
<TabPanels>
{TABS.map(tab => (
<TabPanels.Item key={tab.key}>{tab.content}</TabPanels.Item>
))}
</TabPanels>
</Tabs>
</SizingWindow>
</div>
));
});
55 changes: 50 additions & 5 deletions static/app/components/tabs/tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export interface BaseTabProps {
*/
borderStyle?: 'solid' | 'dashed';
to?: string;
variant?: 'flat' | 'filled';
variant?: 'flat' | 'filled' | 'floating';
}

export const BaseTab = forwardRef(
Expand Down Expand Up @@ -99,13 +99,28 @@ export const BaseTab = forwardRef(
borderStyle={borderStyle}
ref={ref}
>
<FilledStyledInteractionStateLayer hasSelectedBackground={false} />
<FilledFocusLayer />
<VariantStyledInteractionStateLayer hasSelectedBackground={false} />
<VariantFocusLayer />
{props.children}
</FilledTabWrap>
);
}

if (variant === 'floating') {
return (
<FloatingTabWrap
{...tabProps}
hidden={hidden}
overflowing={overflowing}
ref={ref}
>
<VariantStyledInteractionStateLayer hasSelectedBackground={false} />
<VariantFocusLayer />
{props.children}
</FloatingTabWrap>
);
}

return (
<TabWrap
{...tabProps}
Expand Down Expand Up @@ -164,6 +179,36 @@ export const Tab = forwardRef(
}
);

const FloatingTabWrap = styled('li', {shouldForwardProp: tabsShouldForwardProp})<{
overflowing: boolean;
}>`
&[aria-selected='true'] {
${p =>
`
color: ${p.theme.purple400};
font-weight: ${p.theme.fontWeightBold};
background-color: ${p.theme.purple100};
`}
}
&[aria-selected='false'] {
border-top: 1px solid transparent;
}
color: ${p => p.theme.gray300};
border-radius: 6px;
padding: ${space(0.5)} ${space(1)};
transform: translateY(1px);
cursor: pointer;
&:focus {
outline: none;
}
${p =>
p.overflowing &&
`
opacity: 0;
pointer-events: none;
`}
`;

const FilledTabWrap = styled('li', {shouldForwardProp: tabsShouldForwardProp})<{
borderStyle: 'dashed' | 'solid';
overflowing: boolean;
Expand Down Expand Up @@ -289,7 +334,7 @@ const StyledInteractionStateLayer = styled(InteractionStateLayer)<{
bottom: ${p => (p.orientation === 'horizontal' ? space(0.75) : 0)};
`;

const FilledStyledInteractionStateLayer = styled(InteractionStateLayer)`
const VariantStyledInteractionStateLayer = styled(InteractionStateLayer)`
position: absolute;
width: auto;
height: auto;
Expand Down Expand Up @@ -319,7 +364,7 @@ const FocusLayer = styled('div')<{orientation: Orientation}>`
}
`;

const FilledFocusLayer = styled('div')`
const VariantFocusLayer = styled('div')`
position: absolute;
left: 0;
right: 0;
Expand Down
2 changes: 1 addition & 1 deletion static/app/components/tabs/tabList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ const TabListWrap = styled('ul', {shouldForwardProp: tabsShouldForwardProp})<{
? `
grid-auto-flow: column;
justify-content: start;
gap: ${p.variant === 'filled' ? space(0) : space(2)};
gap: ${p.variant === 'filled' || p.variant === 'floating' ? space(0) : space(2)};
${!p.hideBorder && `border-bottom: solid 1px ${p.theme.border};`}
`
: `
Expand Down