Skip to content

fix(ui-link): fix Link outline styles and overrides #2248

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ui-link): fix Link outline styles and overrides #2248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 61 additions & 2 deletions packages/ui-link/src/Link/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,23 @@ describes: Link
---
type: example
---
<Text>The quick brown fox <Link href="https://instructure.github.io/instructure-ui/">jumps</Link> over the lazy dog.</Text>
<div>
<Text>The quick brown fox <Link href="https://instructure.github.io/instructure-ui/"
themeOverride={{
focusOutlineColor: 'pink'
}}>jumps</Link> over the lazy dog.</Text>
<Link color="link-inverse" href="https://instructure.github.io/instructure-ui/">jumps</Link>
</div>
```

```js
---
type: example
---
<View background="primary-inverse" as="div">
<Text color="primary-inverse">The quick brown fox <Link color="link-inverse" href="https://instructure.github.io/instructure-ui/">jumps</Link> over the lazy dog.</Text>
<Text color="primary-inverse">The quick brown fox <Link color="link-inverse" href="https://instructure.github.io/instructure-ui/" themeOverride={{
focusInverseIconOutlineColor: 'pink'
}}>jumps</Link> over the lazy dog.</Text>
</View>
```

Expand Down Expand Up @@ -154,6 +162,57 @@ type: example
</div>
```

### Theme overrides

Examples showing how theme overrides work for Link:

```js
---
type: example
---
<div>
<Text>The quick brown fox <Link
href="https://instructure.github.io/instructure-ui/"
themeOverride={{
focusOutlineWidth: '0.5rem',
focusOutlineStyle: 'dashed',
focusOutlineBorderRadius: '0',
focusOutlineColor: 'pink'
}}>jumps</Link> over the lazy dog.
</Text>
</div>
```

```js
---
type: example
---
<View background="primary-inverse" as="div">
<Text color="primary-inverse">The quick brown fox <Link
color="link-inverse"
href="https://instructure.github.io/instructure-ui/"
themeOverride={{
focusOutlineWidth: '0.5rem',
focusOutlineStyle: 'dashed',
focusOutlineBorderRadius: '0',
focusInverseOutlineColor: 'green'
}}
>jumps</Link> over the lazy dog.</Text>
<br />
<Text color="primary-inverse">The quick brown fox <Link
color="link-inverse"
href="https://instructure.github.io/instructure-ui/"
renderIcon={<IconUserLine />}
themeOverride={{
focusOutlineWidth: '0.5rem',
focusOutlineStyle: 'dashed',
focusOutlineBorderRadius: '0',
focusInverseIconOutlineColor: 'red'
}}
>jumps</Link> over the lazy dog.</Text>
</View>
```

### Guidelines

```js
Expand Down
23 changes: 14 additions & 9 deletions packages/ui-link/src/Link/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,8 @@ const generateStyle = (
fontWeight: componentTheme.fontWeight,
transition: 'outline-color 0.2s',
verticalAlign: 'baseline',

// set up focus styles
outlineColor: 'transparent',
outlineWidth: componentTheme.focusOutlineWidth,
outlineStyle: componentTheme.focusOutlineStyle,
borderRadius: componentTheme.focusOutlineBorderRadius,
outlineOffset: '0.25rem',
textUnderlineOffset: componentTheme.textUnderlineOffset,

Expand All @@ -96,7 +92,10 @@ const generateStyle = (
alignItems: 'center'
}),

'&:focus': {
'&&&&&&:focus': {
outlineWidth: componentTheme.focusOutlineWidth,
outlineStyle: componentTheme.focusOutlineStyle,
borderRadius: componentTheme.focusOutlineBorderRadius,
outlineColor: componentTheme.focusOutlineColor
},
'&[aria-disabled]': {
Expand All @@ -114,7 +113,8 @@ const generateStyle = (
...baseStyles,
cursor: 'pointer',
color: componentTheme.color,
'&:focus': {
// This needs stronger specificity than `View`
'&&&&&:focus': {
color: componentTheme.color,
outlineColor: componentTheme.focusOutlineColor
},
Expand Down Expand Up @@ -147,10 +147,15 @@ const generateStyle = (

const inverseStyles = {
color: componentTheme.colorInverse,
'&:focus': {
outlineColor: componentTheme.focusInverseIconOutlineColor
'&&&&&:focus': {
outlineColor: componentTheme.focusInverseOutlineColor
},
'&:hover, &:focus, &:active': {
...(renderIcon && {
'&&&&&:focus': {
outlineColor: componentTheme.focusInverseIconOutlineColor
}
}),
'&:hover, &&&&&:focus, &:active': {
color: componentTheme.colorInverse
}
}
Expand Down
Loading