Skip to content
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

fix: Tabs design update #427

Merged
merged 1 commit into from
Apr 15, 2021
Merged

fix: Tabs design update #427

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
Binary file modified packages/fuselage/.loki/reference/chrome_iphone7_Misc_Tabs_Default.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/fuselage/.loki/reference/chrome_iphone7_Misc_Tabs_Disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/fuselage/.loki/reference/chrome_iphone7_Misc_Tabs_Selected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ges/fuselage/.loki/reference/chrome_iphone7_Misc_Tabs_Selected_and_Disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/fuselage/.loki/reference/chrome_laptop_Misc_Tabs_Default.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/fuselage/.loki/reference/chrome_laptop_Misc_Tabs_Disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/fuselage/.loki/reference/chrome_laptop_Misc_Tabs_Selected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ages/fuselage/.loki/reference/chrome_laptop_Misc_Tabs_Selected_and_Disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 53 additions & 14 deletions packages/fuselage/src/components/Tabs/Tabs.stories.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,61 @@ import { Tabs } from '../..';

# Tabs

Tabs is a component to navigate around the UI using buttons arranged together with the selected tab highlighted.

<Canvas>
<Story name='Default'>
<>
<style>
{`body{
padding: 4px 0;
}`}
</style>
<Tabs>
<Tabs.Item selected>Tab text 1</Tabs.Item>
<Tabs.Item>Tab text 2</Tabs.Item>
<Tabs.Item>Tab text 3</Tabs.Item>
<Tabs.Item>Tab text 4</Tabs.Item>
<Tabs.Item>Tab text 5</Tabs.Item>
</Tabs>
</>
<Tabs>
<Tabs.Item>Tab text 1</Tabs.Item>
<Tabs.Item>Tab text 2</Tabs.Item>
<Tabs.Item>Tab text 3</Tabs.Item>
<Tabs.Item>Tab text 4</Tabs.Item>
<Tabs.Item>Tab text 5</Tabs.Item>
</Tabs>
</Story>
</Canvas>

### Selected

<Canvas>
<Story name='Selected'>
<Tabs>
<Tabs.Item selected>Tab text 1</Tabs.Item>
<Tabs.Item>Tab text 2</Tabs.Item>
<Tabs.Item>Tab text 3</Tabs.Item>
<Tabs.Item>Tab text 4</Tabs.Item>
<Tabs.Item>Tab text 5</Tabs.Item>
</Tabs>
</Story>
</Canvas>

### Disabled

<Canvas>
<Story name='Disabled'>
<Tabs>
<Tabs.Item disabled>Tab text 1</Tabs.Item>
<Tabs.Item>Tab text 2</Tabs.Item>
<Tabs.Item>Tab text 3</Tabs.Item>
<Tabs.Item>Tab text 4</Tabs.Item>
<Tabs.Item>Tab text 5</Tabs.Item>
</Tabs>
</Story>
</Canvas>

### Selected and Disabled

<Canvas>
<Story name='Selected and Disabled'>
<Tabs>
<Tabs.Item selected disabled>
Tab text 1
</Tabs.Item>
<Tabs.Item>Tab text 2</Tabs.Item>
<Tabs.Item>Tab text 3</Tabs.Item>
<Tabs.Item>Tab text 4</Tabs.Item>
<Tabs.Item>Tab text 5</Tabs.Item>
</Tabs>
</Story>
</Canvas>

Expand Down
5 changes: 4 additions & 1 deletion packages/fuselage/src/components/Tabs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ export function Tabs({ children, ...props }) {
}

export const TabsItem = forwardRef(function TabsItem(
{ selected, ...props },
{ selected, disabled, ...props },
ref
) {
return (
<Box
is='button'
rcx-tabs__item
rcx-tabs__item--selected={selected}
rcx-tabs__item--disabled={disabled}
rcx-tabs__item--selected--disabled={selected && disabled}
aria-selected={selected ? 'true' : 'false'}
ref={ref}
role='tab'
Expand All @@ -38,6 +40,7 @@ export const TabsItem = forwardRef(function TabsItem(

TabsItem.propTypes = {
selected: PropTypes.bool,
disabled: PropTypes.bool,
};

Tabs.Item = TabsItem;
104 changes: 69 additions & 35 deletions packages/fuselage/src/components/Tabs/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,46 @@
$tabs-background-color: theme('tabs-background-color', transparent);
$tabs-border-color: theme('tabs-border-color', transparent);
$tabs-color: theme('tabs-color', colors.neutral(600));
$tabs-delimiter-color: theme('tabs-color', colors.neutral(400));
$tabs-hover-color: theme('tabs-hover-border-color', colors.neutral(700));
$tabs-selected-color: theme('tabs-selected-color', colors.primary(500));
$tabs-selected-border-color: theme(
'tabs-selected-border-color',
colors.primary(500)
);
$tabs-hover-color: theme('tabs-hover-border-color', colors.neutral(700));
$tabs-hover-selected-color: theme(
'tabs-hover-selected-color',
colors.primary(600)
);
$tabs-hover-selected-border-color: theme(
'tabs-hover-selected-border-color',
colors.primary(600)
);
$tabs-active-color: theme('tabs-active-color', colors.neutral(800));
$tabs-active-selected-color: theme(
'tabs-active-selected-color',
colors.primary(700)
);
$tabs-active-selected-border-color: theme(
'tabs-active-selected-border-color',
colors.primary(700)
);
$tabs-focus-border-color: theme('tabs-focus-border-color', colors.primary(500));
$tabs-focus-shadow-color: theme('tabs-focus-shadow-color', colors.primary(100));
$tabs-disabled-color: theme('tabs-disabled-color', colors.neutral(500));
$tabs-disabled-selected-color: theme(
'tabs-disabled-selected-color',
colors.primary(200)
);
$tabs-disabled-selected-border-color: theme(
'tabs-disabled-selected-border-color',
colors.primary(200)
);

// TODO: Indication that there are more tab__items left to scroll (some sort of shadow maybe)
.rcx-tabs {
position: relative;

display: flex;

&::after {
position: absolute;
z-index: -1;
inset-block-end: lengths.inset(none);
inset-inline: lengths.inset(none);

height: lengths.border-width(2);

content: '';

background-color: $tabs-delimiter-color;
}
}

.rcx-tabs__scroll-box {
Expand Down Expand Up @@ -65,27 +75,21 @@ $tabs-disabled-color: theme('tabs-disabled-color', colors.neutral(500));

min-height: lengths.size(40);

padding: (lengths.padding(4) + lengths.border-width(2)) lengths.padding(16);
margin: lengths.margin(none) lengths.margin(12);
padding: (lengths.padding(4) + lengths.border-width(2)) lengths.padding(none);

color: $tabs-color;
border-width: lengths.border-width(2);

border-style: solid;
border-color: transparent;
background-color: transparent;
border-block-end-width: lengths.border-width(4);
border-inline-width: lengths.border-width(none);

@include clickable;
@include typography.use-font-scale(s2);

&--selected {
padding: lengths.padding(4) (lengths.padding(16) + lengths.border-width(2));

color: $tabs-selected-color;
border-block-end-color: $tabs-selected-border-color;
border-block-end-width: lengths.border-width(4);
border-inline-width: lengths.border-width(none);
}

&.hover,
&:hover {
color: $tabs-hover-color;
Expand All @@ -96,24 +100,54 @@ $tabs-disabled-color: theme('tabs-disabled-color', colors.neutral(500));
color: $tabs-active-color;
}

&--disabled {
color: $tabs-disabled-color;
}

@include on-focus-visible {
padding-inline: lengths.padding(16);

border-color: $tabs-focus-border-color;
border-radius: lengths.border-radius(2);
border-block-start-width: lengths.border-width(2);
border-inline-width: lengths.border-width(2);

@include use-focus-shadow($tabs-focus-shadow-color);
}
}

@include on-breakpoint('md') {
.rcx-tabs__wrapper {
margin-inline: lengths.margin(24);
&--disabled {
cursor: not-allowed;

color: $tabs-disabled-color;

&:hover {
color: $tabs-disabled-color;
}
}

&--selected {
padding: lengths.padding(4) lengths.padding(none);

color: $tabs-selected-color;
border-block-end-color: $tabs-selected-border-color;
border-block-end-width: lengths.border-width(4);
border-inline-width: lengths.border-width(none);

&:hover {
color: $tabs-hover-selected-color;
border-block-end-color: $tabs-hover-selected-border-color;
}

&.active,
&:active {
color: $tabs-active-selected-color;
border-block-end-color: $tabs-active-selected-border-color;
}

&--disabled {
cursor: not-allowed;

color: $tabs-disabled-selected-color;
border-block-end-color: $tabs-disabled-selected-border-color;

&:hover {
color: $tabs-disabled-selected-color;
border-block-end-color: $tabs-disabled-selected-border-color;
}
}
}
}