Skip to content

fix(nav-item-link): remove fixed height to prevent issues with multi-line text #1085

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 2 commits into from
Aug 19, 2021
Merged

fix(nav-item-link): remove fixed height to prevent issues with multi-line text #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d18f5be
fix(nav-item-link): remove fixed height to prevent issues with multi-…
dbrugger Aug 16, 2021
2440670
Merge branch 'dev' into nav-item-height
clairek20 Aug 19, 2021
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
3 changes: 1 addition & 2 deletions src/__tests__/scss/__snapshots__/styles-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13567,9 +13567,8 @@ li.bx--accordion__item--disabled:last-of-type {
transition-timing-function: cubic-bezier(0.2, 0, 0.38, 0.9);
position: relative;
display: flex;
height: 2rem;
align-items: center;
padding: 0.25rem 0.25rem 0.25rem 2.5rem;
padding: 0.5rem 0.25rem 0.5rem 2.5rem;
color: var(--cds-text-01, #f4f4f4);
cursor: pointer;
text-decoration: none;
Expand Down
121 changes: 83 additions & 38 deletions src/components/Nav/Nav-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,88 @@ import React from 'react';
import { components } from '../../../.storybook';
import { Nav, NavItem, NavList } from '../..';

import { commerce } from 'faker';
const { name } = Nav;

storiesOf(components(name), module).add(
'Default',
() => (
<div style={{ width: '300px' }}>
<Nav heading="Nav example" label={Nav}>
<NavList title="Nav list 1">
<NavItem key="navitem_1-1" element="span" customprop="uniqueValue">
Nav item 1-1 (with a custom element)
</NavItem>
<NavItem key="navitem_1-2" onClick={action('onClick')}>
Nav item 1-2
</NavItem>
</NavList>
<NavList title="Nav list 2 expanded on page load" isExpandedOnPageload>
<NavItem key="navitem_2-1" href="#navitem_2-1">
Nav item 2-1
</NavItem>
<NavItem key="navitem_2-2" href="#navitem_2-2">
Nav item 2-2
</NavItem>
</NavList>
<NavList title="Nav list 3">
<NavItem key="navitem_3-1" href="#navitem_3-1">
Nav item 3-1
</NavItem>
<NavItem key="navitem_3-2" href="https://www.ibm.com/">
Nav item that is an external link and wraps to a new line
</NavItem>
</NavList>
</Nav>
</div>
),
{
info: {
text: `Basic implementation of the '${name}' component.`,
},
}
);
storiesOf(components(name), module)
.add(
'Default',
() => (
<div style={{ width: '300px' }}>
<Nav heading="Nav example" label="Navigation">
<NavList title="Nav list 1">
<NavItem key="navitem_1-1" element="span" customprop="uniqueValue">
Nav item 1-1 (with a custom element)
</NavItem>
<NavItem key="navitem_1-2" onClick={action('onClick')}>
Nav item 1-2
</NavItem>
</NavList>
<NavList
title="Nav list 2 expanded on page load"
isExpandedOnPageload>
<NavItem key="navitem_2-1" href="#navitem_2-1">
Nav item 2-1
</NavItem>
<NavItem key="navitem_2-2" href="#navitem_2-2">
Nav item 2-2
</NavItem>
</NavList>
<NavList title="Nav list 3">
<NavItem key="navitem_3-1" href="#navitem_3-1">
Nav item 3-1
</NavItem>
<NavItem key="navitem_3-2" href="https://www.ibm.com/">
Nav item that is an external link and wraps to a new line
</NavItem>
</NavList>
</Nav>
</div>
),
{
info: {
text: `Basic implementation of the '${name}' component.`,
},
}
)
.add(
'Long NavItem test case',
() => (
<div style={{ width: '300px' }}>
<Nav heading="Nav example" label="Navigation">
<NavList title="Nav list 1">
<NavItem key="navitem_1-1" element="span" customprop="uniqueValue">
Nav item 1-1 (with a custom element)
</NavItem>
<NavItem key="navitem_1-2" onClick={action('onClick')}>
Nav item 1-2
</NavItem>
</NavList>
<NavList
title="Nav list 2 expanded on page load"
isExpandedOnPageload>
<NavItem key="navitem_2-1" href="#navitem_2-1">
Nav item 2-1 - {commerce.productName()} - {commerce.productName()}{' '}
- {commerce.productName()}
</NavItem>
<NavItem key="navitem_2-2" href="#navitem_2-2">
Nav item 2-2
</NavItem>
</NavList>
<NavList title="Nav list 3">
<NavItem key="navitem_3-1" href="#navitem_3-1">
Nav item 3-1
</NavItem>
<NavItem key="navitem_3-2" href="https://www.ibm.com/">
Nav item that is an external link and wraps to a new line
</NavItem>
</NavList>
</Nav>
</div>
),
{
info: {
text: `Basic implementation of the '${name}' component.`,
},
}
);
3 changes: 1 addition & 2 deletions src/components/Nav/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,8 @@

position: relative;
display: flex;
height: $carbon--spacing-07;
align-items: center;
padding: $carbon--spacing-02 $carbon--spacing-02 $carbon--spacing-02
padding: $carbon--spacing-03 $carbon--spacing-02 $carbon--spacing-03
$carbon--spacing-08;
color: $text-01;
cursor: pointer;
Expand Down