Skip to content

Commit

Permalink
Link: Add inline prop to tag links inside a text block (#3946)
Browse files Browse the repository at this point in the history
* wip

* cleanup code, add story and test

* add muted to story

* update snapshots

* Create selfish-beans-cheat.md

* split inline story into feature and dev

* add inline to docs.json

* Add Link e2e snapshots

* oops, left a debug!

* omg, remove debug statement

* use dev story for tests

* update snapshots for dev tests

* can't have hover state with multiple links

* oops duplicate

* remove outdated snapshots
  • Loading branch information
siddharthkp authored Nov 20, 2023
1 parent 7fa8b89 commit e08432d
Show file tree
Hide file tree
Showing 19 changed files with 316 additions and 109 deletions.
5 changes: 5 additions & 0 deletions .changeset/selfish-beans-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Link: Add `inline` prop to tag links inside a text block, underlined with accessibility setting `[data-a11y-link-underlines]`
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions e2e/components/Link.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,38 @@ test.describe('Link', () => {
})
}
})

test.describe('Dev: Inline', () => {
for (const theme of themes) {
test.describe(theme, () => {
test('default @vrt', async ({page}) => {
await visit(page, {
id: 'components-link-devonly--inline',
globals: {
colorScheme: theme,
},
})

// Default state
expect(await page.screenshot()).toMatchSnapshot(`Link.Inline.${theme}.png`)
})

test('axe @aat', async ({page}) => {
await visit(page, {
id: 'components-link-devonly--inline',
globals: {
colorScheme: theme,
},
})
await expect(page).toHaveNoViolations({
rules: {
'color-contrast': {
enabled: theme !== 'dark_dimmed',
},
},
})
})
})
}
})
})
83 changes: 83 additions & 0 deletions src/Link/Link.dev.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
import Link from '.'
import {Meta} from '@storybook/react'
import React from 'react'
import {ComponentProps} from '../utils/types'

export default {
title: 'Components/Link/DevOnly',
component: Link,
} as Meta<ComponentProps<typeof Link>>

export const Inline = () => (
<div>
<div style={{display: 'flex', flexDirection: 'column'}} data-a11y-link-underlines="true">
[data-a11y-link-underlines=true] (inline always underlines)
<Link href="#">inline: undefined, underline: undefined</Link>
<Link underline={true} href="#">
inline: undefined, underline: true
</Link>
<Link underline={false} href="#">
inline: undefined, underline: false
</Link>
<br />
<Link inline={true} href="#">
inline: true, underline: undefined
</Link>
<Link inline={false} href="#">
inline: false, underline: undefined
</Link>
<br />
<Link inline={true} underline={true} href="#">
inline: true, underline: true
</Link>
<Link inline={true} underline={false} href="#">
inline: true, underline: false
</Link>
<Link inline={false} underline={true} href="#">
inline: false, underline: true
</Link>
<Link inline={false} underline={false} href="#">
inline: false, underline: false
</Link>
<br />
<Link muted={true} inline={true} href="#">
inline: true, muted: true
</Link>
</div>
<br />
<div style={{display: 'flex', flexDirection: 'column'}} data-a11y-link-underlines="false">
[data-a11y-link-underlines=false] (inline does nothing)
<Link href="#">inline: undefined, underline: undefined</Link>
<Link underline={true} href="#">
inline: undefined, underline: true
</Link>
<Link underline={false} href="#">
inline: undefined, underline: false
</Link>
<br />
<Link inline={true} href="#">
inline: true, underline: undefined
</Link>
<Link inline={false} href="#">
inline: false, underline: undefined
</Link>
<br />
<Link inline={true} underline={true} href="#">
inline: true, underline: true
</Link>
<Link inline={true} underline={false} href="#">
inline: true, underline: false
</Link>
<Link inline={false} underline={true} href="#">
inline: false, underline: true
</Link>
<Link inline={false} underline={false} href="#">
inline: false, underline: false
</Link>
<br />
<Link muted={true} inline={true} href="#">
inline: true, muted: true
</Link>
</div>
</div>
)
8 changes: 7 additions & 1 deletion src/Link/Link.docs.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
"defaultValue": "false",
"description": "Uses a less prominent shade for Link color, and the default link shade on hover"
},
{
"name": "inline",
"type": "boolean",
"defaultValue": "false",
"description": "Tag link inside a text block"
},
{
"name": "underline",
"type": "boolean",
Expand Down Expand Up @@ -44,4 +50,4 @@
}
],
"subcomponents": []
}
}
8 changes: 8 additions & 0 deletions src/Link/Link.features.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,11 @@ export const Underline = () => (
Link
</Link>
)

export const Inline = () => (
<div data-a11y-link-underlines="true">
<Link inline={true} href="#">
Link
</Link>
</div>
)
1 change: 1 addition & 0 deletions src/Link/Link.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Playground.args = {
href: '#',
muted: false,
underline: false,
inline: false,
}

export const Default = () => <Link href="#">Link</Link>
17 changes: 16 additions & 1 deletion src/Link/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ type StyledLinkProps = {
hoverColor?: string
muted?: boolean
underline?: boolean
// Link inside a text block
inline?: boolean
} & SxProp

const hoverColor = system({
Expand All @@ -22,7 +24,19 @@ const hoverColor = system({

const StyledLink = styled.a<StyledLinkProps>`
color: ${props => (props.muted ? get('colors.fg.muted')(props) : get('colors.accent.fg')(props))};
text-decoration: ${props => (props.underline ? 'underline' : 'none')};
/* By default, Link does not have underline */
text-decoration: none;
/* You can add one by setting underline={true} */
text-decoration: ${props => (props.underline ? 'underline' : undefined)};
/* Inline links (inside a text block), however, should have underline based on accessibility setting set in data-attribute */
/* Note: setting underline={false} does not override this */
[data-a11y-link-underlines='true'] &[data-inline='true'] {
text-decoration: underline;
}
&:hover {
text-decoration: ${props => (props.muted ? 'none' : 'underline')};
${props => (props.hoverColor ? hoverColor : props.muted ? `color: ${get('colors.accent.fg')(props)}` : '')};
Expand Down Expand Up @@ -72,6 +86,7 @@ const Link = forwardRef(({as: Component = 'a', ...props}, forwardedRef) => {
return (
<StyledLink
as={Component}
data-inline={props.inline}
{...props}
// @ts-ignore shh
ref={innerRef}
Expand Down
Loading

0 comments on commit e08432d

Please sign in to comment.