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

refactor(Link): ♻️ Move styling to link.css #1935

Merged
merged 5 commits into from
May 3, 2024
Merged

refactor(Link): ♻️ Move styling to link.css #1935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d9bd33
refactor(Link): :recycle: Move styling to `link.css`
mimarz May 2, 2024
3d19df1
updated css
mimarz May 2, 2024
a00f97d
updated css
mimarz May 2, 2024
02e9ea6
built css
mimarz May 2, 2024
57dd41f
fix tests
mimarz May 2, 2024
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
1 change: 1 addition & 0 deletions packages/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
@import url('./heading.css');
@import url('./paragraph.css');
@import url('./radio.css');
@import url('./link.css');
14 changes: 7 additions & 7 deletions ...react/src/components/Link/Link.module.css → packages/css/link.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@layer fds.link {
.link {
.fds-link {
color: var(--fds-semantic-text-action-default);
cursor: pointer;
text-decoration: underline;
Expand All @@ -10,27 +10,27 @@
gap: var(--fds-spacing-1);
}

.link:visited {
.fds-link:visited {
color: var(--fds-semantic-text-visited-default);
text-decoration: none;
}

.link:hover {
.fds-link:hover {
color: var(--fds-semantic-text-action-hover);
text-decoration-thickness: max(2px, 0.125rem, 0.12em);
}

.link:focus-visible {
.fds-link:focus-visible {
background: var(--fds-semantic-border-focus-outline);
box-shadow: 0 max(3px, 0.1875rem, 0.18em) var(--fds-semantic-border-focus-boxshadow);
color: var(--fds-semantic-text-action-active);
outline: none;
text-decoration: none;
}

.link.inverted:not(:focus-visible, :active),
.link.inverted:not(:focus-visible, :active):hover,
.link.inverted:not(:focus-visible, :active):visited {
.fds-link--inverted:not(:focus-visible, :active),
.fds-link--inverted:not(:focus-visible, :active):hover,
.fds-link--inverted:not(:focus-visible, :active):visited {
color: white;
}
}
37 changes: 0 additions & 37 deletions packages/css/react-css-modules.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,43 +212,6 @@
}
}

@layer fds.link {
.fds-link-link-7f2464f {
color: var(--fds-semantic-text-action-default);
cursor: pointer;
text-decoration: underline;
text-decoration-thickness: max(1px, 0.0625rem);
text-underline-offset: max(4px, 0.25rem);
display: inline-flex;
align-items: center;
gap: var(--fds-spacing-1);
}

.fds-link-link-7f2464f:visited {
color: var(--fds-semantic-text-visited-default);
text-decoration: none;
}

.fds-link-link-7f2464f:hover {
color: var(--fds-semantic-text-action-hover);
text-decoration-thickness: max(2px, 0.125rem, 0.12em);
}

.fds-link-link-7f2464f:focus-visible {
background: var(--fds-semantic-border-focus-outline);
box-shadow: 0 max(3px, 0.1875rem, 0.18em) var(--fds-semantic-border-focus-boxshadow);
color: var(--fds-semantic-text-action-active);
outline: none;
text-decoration: none;
}

.fds-link-link-7f2464f.fds-link-inverted-7f2464f:not(:focus-visible, :active),
.fds-link-link-7f2464f.fds-link-inverted-7f2464f:not(:focus-visible, :active):hover,
.fds-link-link-7f2464f.fds-link-inverted-7f2464f:not(:focus-visible, :active):visited {
color: white;
}
}

@layer fds.list {
.fds-list-small-a2926fcf {
padding-left: var(--fds-spacing-4);
Expand Down
10 changes: 2 additions & 8 deletions packages/react/src/components/Link/Link.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,14 @@ describe('Link', () => {
const className = 'foo';
render({ className });
const link = screen.getByRole('link');
expect(link).toHaveClass('link');
expect(link).toHaveClass('fds-link');
expect(link).toHaveClass(className);
});

it('Is not inverted by default', () => {
render();
const link = screen.getByRole('link');
expect(link).not.toHaveClass('inverted');
});

it('Is inverted when the `inverted` property is `true`', () => {
render({ inverted: true });
const link = screen.getByRole('link');
expect(link).toHaveClass('inverted');
expect(link).toHaveClass('fds-link--inverted');
});

it('Sets the ref on the anchor element if given', () => {
Expand Down
6 changes: 2 additions & 4 deletions packages/react/src/components/Link/Link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import type { AnchorHTMLAttributes, ReactNode } from 'react';
import { forwardRef } from 'react';
import cl from 'clsx';
import cl from 'clsx/lite';
import { Slot } from '@radix-ui/react-slot';

import classes from './Link.module.css';

export type LinkProps = {
/** The content to display inside the link. */
children: ReactNode;
Expand All @@ -30,7 +28,7 @@ export const Link = forwardRef<HTMLAnchorElement, LinkProps>(

return (
<Component
className={cl(classes.link, inverted && classes.inverted, className)}
className={cl('fds-link', inverted && 'fds-link--inverted', className)}
ref={ref}
{...rest}
>
Expand Down
Loading