Skip to content

[Patch] Link with icon inline with text #1236

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 3 commits into from
Aug 25, 2022
Merged

[Patch] Link with icon inline with text #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fdb405
Fix Link with icon inline with text
marcialfps Aug 10, 2022
2c6f90d
Add icon after Link in story
marcialfps Aug 25, 2022
d09765f
Merge branch 'master' into marcialfps-issue-1218
marcialfps Aug 25, 2022
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
17 changes: 12 additions & 5 deletions lib/src/link/Link.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,18 @@ export const Chromatic = () => (
</ExampleContainer>
<ExampleContainer pseudoState="pseudo-hover">
<Title title="Long text with hover" theme="light" level={4} />
Lorem <DxcLink href="https://www.google.com">Test</DxcLink> ipsum dolor sit amet, consectetur adipiscing elit, sed
do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
officia deserunt mollit anim id est laborum.
Lorem{" "}
<DxcLink href="https://www.google.com" icon={icon}>
Test
</DxcLink>{" "}
ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit{" "}
<DxcLink href="https://www.google.com" icon={icon} iconPosition="after">
Test
</DxcLink>{" "}
anim id est laborum.
</ExampleContainer>
<ExampleContainer pseudoState="pseudo-focus">
<Title title="Long text with focus" theme="light" level={4} />
Expand Down
2 changes: 2 additions & 0 deletions lib/src/link/Link.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ type StyledLinkProps = {
};
const StyledLink = styled.div<StyledLinkProps>`
display: inline-flex;
align-items: baseline;

margin: ${(props) => (props.margin && typeof props.margin !== "object" ? spaces[props.margin] : "0px")};
margin-top: ${(props) =>
props.margin && typeof props.margin === "object" && props.margin.top ? spaces[props.margin.top] : ""};
Expand Down