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-extended): change anchor-based tabs to button-based tabs #8365

Merged
merged 12 commits into from
Mar 8, 2022
Merged

fix(tabs-extended): change anchor-based tabs to button-based tabs #8365

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
136c907
fix(tabs-extended): change anchor-based tabs to button-based tabs
andy-blum Feb 23, 2022
eb6f053
fix(tabs-extended): fix stylelint errors
andy-blum Feb 24, 2022
e34775d
Merge branch 'main' into fix/tabs-extended-iOS-VO
andy-blum Feb 24, 2022
5c25157
Merge branch 'main' into fix/tabs-extended-iOS-VO
proeung Feb 24, 2022
619c45a
fix(tabs-extended): limit VO cursor to button boundaries
andy-blum Feb 25, 2022
8222b66
Merge branch 'fix/tabs-extended-iOS-VO' of https://github.com/andy-bl…
andy-blum Feb 25, 2022
faa23f8
Merge branch 'main' into fix/tabs-extended-iOS-VO
andy-blum Feb 25, 2022
70415b9
fix(tabs-extended): repace px/rem values with tokens
andy-blum Mar 4, 2022
074e053
Merge branch 'main' into fix/tabs-extended-iOS-VO
andy-blum Mar 4, 2022
e988ad1
Update packages/styles/scss/components/tabs-extended/_tabs-extended.scss
andy-blum Mar 7, 2022
1d41398
Update packages/styles/scss/components/tabs-extended/_tabs-extended.scss
andy-blum Mar 7, 2022
03aea70
Update packages/styles/scss/components/tabs-extended/_tabs-extended.scss
andy-blum Mar 7, 2022
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
83 changes: 80 additions & 3 deletions packages/styles/scss/components/tabs-extended/_tabs-extended.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,30 @@
height: auto;
overflow: visible;
white-space: normal;
background: none;
border: initial;
border-bottom: 2px solid var(--cds-ui-03, #e0e0e0);
andy-blum marked this conversation as resolved.
Show resolved Hide resolved
display: inline-flex;
width: $spacing-13;
text-align: left;

&[hasTooltip] {
@include tooltip--trigger('definition', top);
@include tooltip--placement('definition', 'bottom', 'start');

&::before,
&::after {
display: none;
}

&:hover,
&:focus {
&::before,
&::after {
display: flex;
}
}

&:focus {
@include focus-outline('outline');
}
Expand Down Expand Up @@ -129,9 +148,6 @@

.#{$prefix}--tabs__nav-link {
width: auto;
}

a.#{$prefix}--tabs__nav-link {
padding: 0;
border-bottom: carbon--rem(2px) solid transparent;
}
Expand Down Expand Up @@ -193,3 +209,64 @@
@include exports('tabs-extended') {
@include tabs-extended;
}

button.#{$prefix}--tabs__nav-link {
@include focus-outline('reset');

display: inline-block;
overflow: hidden;
width: calc(100% - 32px);
andy-blum marked this conversation as resolved.
Show resolved Hide resolved
height: rem(40px);
padding: $spacing-04 0;
border-bottom: 1px solid $ui-03;
margin: 0 $spacing-05;
color: $text-02;
font-weight: 400;
line-height: $spacing-05;
text-decoration: none;
text-overflow: ellipsis;
transition: border $duration--fast-01 motion(standard, productive),
outline $duration--fast-01 motion(standard, productive);
white-space: nowrap;

&:focus,
&:active {
@include focus-outline('outline');

width: 100%;
padding-left: $spacing-05;
margin: 0;
}

@include carbon--breakpoint(md) {
width: rem(160px);
padding: $spacing-04 $spacing-05 $spacing-03;
border-bottom: $tab-underline-color;
margin: 0;
line-height: inherit;

&:focus,
&:active {
width: rem(160px);
border-bottom: 2px;
andy-blum marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

.#{$prefix}--tabs--container button.#{$prefix}--tabs__nav-link {
@include carbon--breakpoint(md) {
height: rem(48px);
padding: $spacing-03 $spacing-05;
border-bottom: none;
}
}

.#{$prefix}--tabs__nav-item--disabled button.#{$prefix}--tabs__nav-link:active {
border-bottom: $tab-underline-disabled;
outline: none;
}

.#{$prefix}--tabs__nav-item:not(.#{$prefix}--tabs__nav-item--selected):not(.#{$prefix}--tabs__nav-item--disabled):not(.#{$prefix}--tabs__nav-item--selected)
button.#{$prefix}--tabs__nav-link:active {
color: $text-02;
}
7 changes: 3 additions & 4 deletions packages/web-components/src/components/tabs-extended/tabs-extended.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,17 @@ class DDSTabsExtended extends StableSelectorMixin(LitElement) {
});
return html`
<li class="${classes}" data-target=".tab-${index}-default" role="tab" ?disabled="${disabled}">
<a
<button
tabindex="${active ? '0' : '-1'}"
id="tab-link-${index}-default"
class="${prefix}--tabs__nav-link"
href="javascript:void(0)"
role="tab"
type="button"
aria-controls="tab-panel-${index}-default"
aria-selected="${active}"
@click="${e => this._handleClick(index, e)}"
>
<div><p>${label}</p></div>
</a>
</button>
</li>
`;
})}
Expand Down