-
Notifications
You must be signed in to change notification settings - Fork 18
Added new Divider component
#1835
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
5b00769
Created Divider component
Mil4n0r 5cd1e7d
Missing story for 30% width in Divider
Mil4n0r 797cf80
Fixed divider according to new API configuration
Mil4n0r 49d048f
aria-role separator is already included in HR (redundant)
Mil4n0r 9f8d20b
Merge branch 'master' into Mil4n0r/divider-component
Mil4n0r e18ec15
Removed unused custom div
Mil4n0r 26a3a6f
Merge branch 'Mil4n0r/divider-component' of github.com:dxc-technology…
Mil4n0r 5dacbc3
Removed unused imports
Mil4n0r a6d3ee3
Merge branch 'master' into Mil4n0r/divider-component
Mil4n0r 075b16c
Added new color mode to divider
Mil4n0r 8a214b3
Adjusted Sidenav color
Mil4n0r 52d17a5
Added light grey examples to story
Mil4n0r e75324d
Merge branch 'master' into Mil4n0r/divider-component
Mil4n0r f795db0
Fixed typos
Mil4n0r 68fed0d
Merge branch 'master' into Mil4n0r/divider-component
Mil4n0r aa01375
Added decorative prop
Mil4n0r 6cd7d74
Merge branch 'Mil4n0r/divider-component' of github.com:dxc-technology…
Mil4n0r 746a705
Merge branch 'master' into Mil4n0r/divider-component
Mil4n0r 2025acb
Added new tests to address Divider decorative prop
Mil4n0r 4bb6cf1
Merge branch 'Mil4n0r/divider-component' of github.com:dxc-technology…
Mil4n0r File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| import React from "react"; | ||
| import Title from "../../.storybook/components/Title"; | ||
| import styled from "styled-components"; | ||
| import DxcDivider from "./Divider"; | ||
| import { DxcFlex, DxcParagraph } from "../main"; | ||
| import ExampleContainer from "../../.storybook/components/ExampleContainer"; | ||
|
|
||
| export default { | ||
| title: "Divider", | ||
| component: DxcDivider, | ||
| }; | ||
|
|
||
| export const Chromatic = () => ( | ||
| <> | ||
| <Title title="Default" level={4} /> | ||
| <ExampleContainer> | ||
| <DxcFlex gap="1rem" direction="column"> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| <DxcDivider /> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| </DxcFlex> | ||
| </ExampleContainer> | ||
| <Title title="Default strong" level={4} /> | ||
| <ExampleContainer> | ||
| <DxcFlex gap="1rem" direction="column"> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| <DxcDivider weight="strong" /> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| </DxcFlex> | ||
| </ExampleContainer> | ||
| <Title title="Default dark grey" level={4} /> | ||
| <ExampleContainer> | ||
| <DxcFlex gap="1rem" direction="column"> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| <DxcDivider color="darkGrey" /> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| </DxcFlex> | ||
| </ExampleContainer> | ||
| <Title title="Vertical" level={4} /> | ||
| <ExampleContainer> | ||
| <DxcFlex gap="1rem" direction="row"> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| <DxcDivider orientation="vertical" /> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| </DxcFlex> | ||
| </ExampleContainer> | ||
| <Title title="Vertical strong" level={4} /> | ||
| <ExampleContainer> | ||
| <DxcFlex gap="1rem" direction="row"> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| <DxcDivider orientation="vertical" weight="strong" /> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| </DxcFlex> | ||
| </ExampleContainer> | ||
| <Title title="Vertical dark grey" level={4} /> | ||
| <ExampleContainer> | ||
| <DxcFlex gap="1rem" direction="row"> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| <DxcDivider orientation="vertical" color="darkGrey" /> | ||
| <DxcParagraph> | ||
| Lorem ipsum dolor sit amet consectetur. Tincidunt sed pharetra mollis duis volutpat urna. Hendrerit aliquet et | ||
| arcu purus. Sodales elementum sollicitudin consequat elementum tortor. Lectus eget cursus ut ac pharetra | ||
| lobortis integer eu. Potenti amet ac id risus ac nunc orci nibh. Tempus vitae vitae aenean arcu. Nibh | ||
| tristique porta dui enim eget tristique rutrum. Quisque faucibus suscipit nibh est sed. Netus venenatis congue | ||
| diam in dui morbi dignissim lorem. Urna aliquet sem in tincidunt. Nunc arcu nec fringilla enim purus ut justo | ||
| nisi. Vel mus ut ornare faucibus blandit diam sit vestibulum massa. Semper nullam sit sagittis hendrerit | ||
| augue. In fermentum metus proin arcu faucibus proin nibh sit. Vel integer sed enim in sed vel nec ut vitae. | ||
| Commodo sagittis volutpat id lorem. | ||
| </DxcParagraph> | ||
| </DxcFlex> | ||
| </ExampleContainer> | ||
| </> | ||
| ); | ||
|
|
||
| const FixedHeightDiv = styled.div` | ||
| height: 240px; | ||
| `; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import React from "react"; | ||
| import { render } from "@testing-library/react"; | ||
| import DxcDivider from "./Divider"; | ||
|
|
||
| describe("Divider Component", () => { | ||
| test("Default renders horizontal divider correctly", () => { | ||
| const { getByRole } = render(<DxcDivider />); | ||
| const divider = getByRole("separator"); | ||
| expect(divider.getAttribute("aria-orientation")).toBe("horizontal"); | ||
| }); | ||
|
|
||
| test("Renders vertical divider correctly", () => { | ||
| const { getByRole } = render(<DxcDivider orientation="vertical" />); | ||
| const divider = getByRole("separator"); | ||
| expect(divider.getAttribute("aria-orientation")).toBe("vertical"); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import React from "react"; | ||
| import styled from "styled-components"; | ||
| import DividerPropsType from "./types"; | ||
| import CoreTokens from "../common/coreTokens"; | ||
|
|
||
| const DxcDivider = ({ | ||
| orientation = "horizontal", | ||
| weight = "regular", | ||
| color = "default", | ||
| }: DividerPropsType): JSX.Element => ( | ||
| <StyledDivider | ||
| orientation={orientation} | ||
| weight={weight} | ||
| color={color} | ||
| aria-orientation={orientation} | ||
| /> | ||
| ); | ||
|
|
||
| const StyledDivider = styled.hr<DividerPropsType>` | ||
| ${({ orientation, weight, color }) => ` | ||
| border-color: ${color === "default" ? CoreTokens.color_grey_400 : CoreTokens.color_grey_700}; | ||
| ${orientation === "horizontal" ? "width" : "min-height"}: 100%; | ||
| ${orientation === "horizontal" ? "height" : "width"}: 0px; | ||
| border-width: ${weight === "regular" ? "1px" : "2px"}; | ||
| margin: 0px; | ||
| `} | ||
| `; | ||
|
|
||
| export default DxcDivider; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| type Props = { | ||
| /** | ||
| * The divider can be showed in horizontal or vertical | ||
Mil4n0r marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| */ | ||
| orientation?: "horizontal" | "vertical"; | ||
| /** | ||
| * Modifies the thickness of the divider. | ||
| */ | ||
| weight?: "regular" | "strong"; | ||
| /** | ||
| * Modifies the color of the divider | ||
Mil4n0r marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| */ | ||
| color?: "default" | "darkGrey"; | ||
Mil4n0r marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }; | ||
|
|
||
| export default Props; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.