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

feat(tabs): support contextual layout tokens (size & density) #13951

Merged
merged 8 commits into from
Jul 10, 2023
Merged

feat(tabs): support contextual layout tokens (size & density) #13951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebb80d6
feat(tabs): support contextual layout tokens (size & density))
janhassel Jun 7, 2023
a9bcf04
Merge branch 'main' into 13923-tabs
francinelucca Jun 7, 2023
5600f30
style(tabs): adjust label vertical position
janhassel Jun 9, 2023
ebc3d86
Merge branch 'main' into 13923-tabs
janhassel Jun 15, 2023
f9f5ca1
Merge branch 'main' into 13923-tabs
janhassel Jul 7, 2023
e64334c
Merge branch 'main' into 13923-tabs
tw15egan Jul 7, 2023
5e85604
Merge branch 'main' into 13923-tabs
francinelucca Jul 7, 2023
b92c1dc
Merge branch 'main' into 13923-tabs
janhassel Jul 10, 2023
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
2 changes: 1 addition & 1 deletion packages/react/src/components/Tabs/Tabs.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ export const Icon20Only = () => (

export const IconOnly = () => (
<Tabs>
<TabList iconSize="default" aria-label="List of tabs">
<TabList aria-label="List of tabs">
<IconTab label="Monster" disabled>
<Monster aria-label="Monster" />
</IconTab>
Expand Down
3 changes: 2 additions & 1 deletion packages/react/src/components/Tabs/Tabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ function TabList({
[`${prefix}--tabs--contained`]: contained,
[`${prefix}--tabs--light`]: light,
[`${prefix}--tabs__icon--default`]: iconSize === 'default',
[`${prefix}--tabs__icon--lg`]: iconSize === 'lg',
[`${prefix}--tabs__icon--lg`]: iconSize === 'lg', // TODO: V12 - Remove this class
[`${prefix}--layout--size-lg`]: iconSize === 'lg',
[`${prefix}--tabs--tall`]: hasSecondaryLabelTabs,
[`${prefix}--tabs--full-width`]: distributeWidth,
},
Expand Down
55 changes: 28 additions & 27 deletions packages/styles/scss/components/tabs/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,37 @@
@use '../../utilities/button-reset';
@use '../../utilities/high-contrast-mode' as *;
@use '../../utilities/convert' as *;

$icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
@use '../../utilities/layout';

/// Tabs styles
/// @access public
/// @group tabs
@mixin tabs {
.#{$prefix}--tabs,
.#{$prefix}--tab-content {
@include layout.use('density', $default: 'normal');
}

.#{$prefix}--tabs.#{$prefix}--tabs--tall,
.#{$prefix}--tabs.#{$prefix}--tabs--contained.#{$prefix}--tabs--tall {
@include layout.use('size', $min: 'lg', $max: 'xl', $default: 'xl');
}

.#{$prefix}--tabs {
@include reset;
@include type-style('body-compact-01');
@include layout.use('size', $min: 'sm', $max: 'lg', $default: 'md');

position: relative;
display: flex;
width: 100%;
height: auto;
min-height: rem(40px);
max-height: 4rem;
min-height: layout.size('height');
max-height: custom-property.get-var('layout-size-height-xl');
color: $text-primary;

&.#{$prefix}--tabs--contained {
min-height: rem(48px);
@include layout.use('size', $min: 'sm', $max: 'xl', $default: 'lg');
}

.#{$prefix}--tab--list {
Expand Down Expand Up @@ -241,6 +251,12 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
display: flex;
}

&:not(.#{$prefix}--tabs--contained)
.#{$prefix}--tabs__nav-item-label-wrapper {
position: relative;
top: rem(1px);
}

//-----------------------------
// Item
//-----------------------------
Expand Down Expand Up @@ -285,11 +301,6 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
.#{$prefix}--tabs__nav-item:not(.#{$prefix}--tabs__nav-item--disabled)
.#{$prefix}--tabs__nav-item--icon
.#{$prefix}--tabs__nav-item--close-icon {
padding: $spacing-05;
margin-top: -$spacing-03;
margin-right: -$spacing-05;
margin-left: -$spacing-05;

&:hover {
background-color: inherit;
}
Expand Down Expand Up @@ -343,7 +354,7 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
}

&.#{$prefix}--tabs--contained .#{$prefix}--tabs__nav-item--icon {
padding-left: $spacing-05;
padding-inline-start: layout.density('padding-inline');
}

//-----------------------------
Expand All @@ -355,9 +366,9 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
@include type-style('body-compact-01');

overflow: hidden;
padding: $spacing-04 $spacing-05 $spacing-03;
border-bottom: $tab-underline-color;
color: $text-secondary;
padding-inline: layout.density('padding-inline');
text-align: left;
text-decoration: none;
text-overflow: ellipsis;
Expand All @@ -372,9 +383,8 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
}

&.#{$prefix}--tabs--contained .#{$prefix}--tabs__nav-link {
height: rem(48px);
padding: $spacing-03 $spacing-05;
border-bottom: 0;
padding-inline: layout.density('padding-inline');
}

&.#{$prefix}--tabs--contained:not(.#{$prefix}--tabs--tall)
Expand All @@ -389,11 +399,6 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
min-height: rem(16px);
}

&.#{$prefix}--tabs--contained.#{$prefix}--tabs--tall
.#{$prefix}--tabs__nav-link {
height: rem(64px);
}

//-----------------------------
// Icon Item
//-----------------------------
Expand All @@ -405,8 +410,8 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
.#{$prefix}--tabs__nav-item--icon-only,
&.#{$prefix}--tabs--contained .#{$prefix}--tabs__nav-item--icon-only {
display: flex;
width: $icon-tab-size;
height: $icon-tab-size;
width: layout.size('height');
height: layout.size('height');
align-items: center;
justify-content: center;
padding: 0;
Expand All @@ -416,10 +421,6 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
}
}

&.#{$prefix}--tabs__icon--lg {
@include custom-property.declaration('icon-tab-size', rem(48px));
}

//-----------------------------
// Item Hover
//-----------------------------
Expand Down Expand Up @@ -558,7 +559,7 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
// Tab Content Container
//-----------------------------
.#{$prefix}--tab-content {
padding: $spacing-05;
padding: layout.density('padding-inline');

&:focus {
@include focus-outline('outline');
Expand Down Expand Up @@ -589,7 +590,7 @@ $icon-tab-size: custom-property.get-var('icon-tab-size', rem(40px));
width: 10rem;
height: 100%;
align-items: center;
padding: 0 1rem;
padding: 0 layout.density('padding-inline');
}

.#{$prefix}--tabs.#{$prefix}--skeleton .#{$prefix}--tabs__nav-link span {
Expand Down