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): truncate container tab header text with ellipses #5035

Merged
merged 7 commits into from
Jan 15, 2020
Merged

fix(tabs): truncate container tab header text with ellipses #5035

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
87cbe2e
fix(tabs): truncate mobile tab text
emyarod Jan 14, 2020
ff6e8e7
fix(tabs): truncate container tab text
emyarod Jan 14, 2020
b645828
fix(tabs): absolutely position chevron
emyarod Jan 14, 2020
f1090b0
fix(tabs): replace glyph icon
emyarod Jan 14, 2020
70dad24
Merge branch 'master' into 5016-container-tabs-text-truncation
tw15egan Jan 14, 2020
c5757ac
Merge branch 'master' into 5016-container-tabs-text-truncation
asudoh Jan 15, 2020
13f598c
Merge branch 'master' into 5016-container-tabs-text-truncation
asudoh Jan 15, 2020
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
17 changes: 12 additions & 5 deletions packages/components/src/components/tabs/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 $spacing-05;
padding: 0 $spacing-09 0 $spacing-05;
height: rem(40px);
cursor: pointer;
color: $text-01;
Expand All @@ -60,8 +60,8 @@
}

.#{$prefix}--tabs-trigger svg {
width: rem(12px);
height: rem(7px);
position: absolute;
right: $spacing-05;
fill: $ui-05;
transition: transform $duration--fast-01 motion(standard, productive);
}
Expand Down Expand Up @@ -90,6 +90,9 @@
padding-top: 2px;
color: $text-01;
font-weight: 400;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.#{$prefix}--tabs-trigger-text:hover {
Expand Down Expand Up @@ -274,6 +277,9 @@
background-color: $ui-01;

.#{$prefix}--tabs__nav-link {
line-height: calc(
#{rem(48px)} - (#{$spacing-03} * 2)
); // height - vertical padding
// Draws the border without affecting the inner-content
box-shadow: inset 0 2px 0 0 $interactive-04;
border-bottom: none;
Expand Down Expand Up @@ -333,9 +339,10 @@

.#{$prefix}--tabs--container a.#{$prefix}--tabs__nav-link {
@include carbon--breakpoint(md) {
display: flex;
align-items: center;
height: rem(48px);
line-height: calc(
#{rem(48px)} - (#{$spacing-03} * 2)
); // height - vertical padding
border-bottom: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/tabs/tabs.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div data-tabs class="{{@root.prefix}}--tabs{{#if container}} {{@root.prefix}}--tabs--container{{/if}}">
<div class="{{@root.prefix}}--tabs-trigger" tabindex="0">
<a href="javascript:void(0)" class="{{@root.prefix}}--tabs-trigger-text" tabindex="-1"></a>
{{ carbon-icon 'ChevronDownGlyph' }}
{{ carbon-icon 'ChevronDown16' }}
</div>
<ul class="{{@root.prefix}}--tabs__nav {{@root.prefix}}--tabs__nav--hidden" role="tablist">
{{#each items}}
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/Tabs/Tabs-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React from 'react';
import { ChevronDownGlyph } from '@carbon/icons-react';
import { ChevronDown16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';
import { shallow, mount } from 'enzyme';
import Tabs from '../Tabs';
Expand Down Expand Up @@ -102,7 +102,7 @@ describe('Tabs', () => {
});

it('renders <Icon>', () => {
expect(trigger.find(ChevronDownGlyph).length).toBe(1);
expect(trigger.find(ChevronDown16).length).toBe(1);
});
});

Expand Down
6 changes: 3 additions & 3 deletions packages/react/src/components/Tabs/Tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import PropTypes from 'prop-types';
import React from 'react';
import classNames from 'classnames';
import { ChevronDownGlyph } from '@carbon/icons-react';
import { ChevronDown16 } from '@carbon/icons-react';
import { settings } from 'carbon-components';
import { keys, match, matches } from '../../internal/keyboard';

Expand Down Expand Up @@ -294,9 +294,9 @@ export default class Tabs extends React.Component {
onClick={this.handleDropdownClick}>
{selectedLabel}
</a>
<ChevronDownGlyph aria-hidden="true">
<ChevronDown16 aria-hidden="true">
{iconDescription && <title>{iconDescription}</title>}
</ChevronDownGlyph>
</ChevronDown16>
</div>
<ul role="tablist" className={classes.tablist}>
{tabsWithProps}
Expand Down