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.

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 DxcLink border radius #2039

Merged
merged 20 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions apps/website/screens/components/link/specs/LinkSpecsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import QuickNavContainerLayout from "@/common/QuickNavContainerLayout";
import Image from "@/common/Image";
import Code from "@/common/Code";
import linkSpecs from "./images/link_specs.png";
import linkStatesNoIcon from "./images/link_states_noIcon.png";
import linkStates from "./images/link_states.png";

const sections = [
{
Expand All @@ -26,7 +26,7 @@ const sections = [
<strong>visited</strong> and <strong>disabled</strong>.
</DxcParagraph>
<Figure caption="Link states">
<Image src={linkStatesNoIcon} alt="Link states" />
<Image src={linkStates} alt="Link states" />
</Figure>
</>
),
Expand Down
Binary file modified apps/website/screens/components/link/specs/images/link_specs.png
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.
Binary file not shown.
63 changes: 35 additions & 28 deletions packages/lib/src/link/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ import useTheme from "../useTheme";
import { LinkProps } from "./types";

const LinkContent = memo(
({ iconPosition, icon, children }: LinkProps): JSX.Element => (
<>
({ iconPosition, icon, inheritColor, children }: LinkProps): JSX.Element => (
<LinkContainer inheritColor>
{iconPosition === "after" && children}
{icon && (
<LinkIconContainer iconPosition={iconPosition}>
{typeof icon === "string" ? <DxcIcon icon={icon} /> : icon}
</LinkIconContainer>
)}
{iconPosition === "before" && children}
</>
</LinkContainer>
)
);

Expand Down Expand Up @@ -52,7 +52,7 @@ const DxcLink = forwardRef(
ref={ref}
{...otherProps}
>
<LinkContent iconPosition={iconPosition} icon={icon} children={children} />
<LinkContent iconPosition={iconPosition} icon={icon} children={children} inheritColor={inheritColor} />
</StyledLink>
</ThemeProvider>
);
Expand All @@ -77,45 +77,31 @@ const StyledLink = styled.div<{
props.margin && typeof props.margin === "object" && props.margin.left ? spaces[props.margin.left] : ""};
background: none;
border: none;
padding: 0;
cursor: pointer;
border-radius: 4px;
width: fit-content;
padding: 0 2px;
${(props) => `padding-bottom: ${props.theme.underlineSpacing};`}
font-size: ${(props) => props.theme.fontSize};
font-weight: ${(props) => props.theme.fontWeight};
font-style: ${(props) => props.theme.fontStyle};
font-family: ${(props) => props.theme.fontFamily};
text-decoration-color: transparent;
width: fit-content;
${(props) =>
`padding-bottom: ${props.theme.underlineSpacing};
border-bottom: ${props.theme.underlineThickness} ${props.theme.underlineStyle} transparent;`}
${(props) => props.disabled && "cursor: default;"}
text-decoration: none;
color: ${(props) =>
props.inheritColor ? "inherit" : !props.disabled ? props.theme.fontColor : props.theme.disabledFontColor};
${(props) => (props.disabled ? "cursor: default;" : "cursor: pointer;")}
${(props) => (props.disabled ? "pointer-events: none;" : "")}

&:visited {
color: ${(props) => (!props.inheritColor && !props.disabled ? props.theme.visitedFontColor : "")};
&:hover {
${(props) =>
`color: ${props.theme.visitedFontColor};
border-bottom-color: ${props.theme.visitedUnderlineColor};`}
& > span:hover {
${(props) => `color: ${props.theme.visitedFontColor};
border-bottom-color: ${props.theme.visitedUnderlineColor};`}
}
}
&:hover {
${(props) =>
`color: ${props.theme.hoverFontColor};
border-bottom-color: ${props.theme.hoverUnderlineColor};
cursor: pointer;`}
}
&:focus {
border-radius: 2px;
outline: 2px solid ${(props) => props.theme.focusColor};
${(props) => props.disabled && "outline: none"}
}
&:active {
${(props) =>
`color: ${props.theme.activeFontColor} !important;
border-bottom-color: ${props.theme.activeUnderlineColor} !important;`}
}
`;

const LinkIconContainer = styled.div<{ iconPosition: LinkProps["iconPosition"] }>`
Expand All @@ -132,4 +118,25 @@ const LinkIconContainer = styled.div<{ iconPosition: LinkProps["iconPosition"] }
}
`;

const LinkContainer = styled.span<{
inheritColor: LinkProps["inheritColor"];
}>`
display: inline-flex;
margin: 0;
padding: 0;
${(props) => `border-bottom: ${props.theme.underlineThickness} ${props.theme.underlineStyle};`}
border-bottom-color: transparent;

&:hover {
${(props) =>
`color: ${props.theme.hoverFontColor};
cursor: pointer;
border-bottom-color: ${props.theme.hoverUnderlineColor};`}
}
&:active {
${(props) => `color: ${props.theme.activeFontColor} !important;
border-bottom-color: ${props.theme.activeUnderlineColor} !important;`}
}
`;

export default DxcLink;
Loading