-
Notifications
You must be signed in to change notification settings - Fork 1
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
Feat: Introduce alignment to Dropdown component #DS-1411 #1837
Open
crishpeen
wants to merge
3
commits into
integration/header
Choose a base branch
from
feature/dropdown-alignment
base: integration/header
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 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
This file contains 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 |
---|---|---|
|
@@ -19,14 +19,14 @@ describe('Dropdown', () => { | |
restPropsTest(Dropdown, '.Dropdown'); | ||
|
||
it('should render text children', () => { | ||
const dom = render( | ||
render( | ||
<Dropdown id="dropdown" isOpen={false} onToggle={() => {}}> | ||
<DropdownTrigger>Trigger</DropdownTrigger> | ||
<DropdownPopover>Hello World</DropdownPopover> | ||
<DropdownPopover data-testid="dropdown-popover">Hello World</DropdownPopover> | ||
</Dropdown>, | ||
); | ||
const trigger = screen.getByRole('button'); | ||
const element = dom.container.querySelector('.DropdownPopover') as HTMLElement; | ||
const element = screen.getByTestId('dropdown-popover') as HTMLElement; | ||
|
||
expect(trigger).toHaveTextContent('Trigger'); | ||
expect(element).toHaveTextContent('Hello World'); | ||
|
@@ -35,13 +35,13 @@ describe('Dropdown', () => { | |
it('should be opened', () => { | ||
const onToggle = jest.fn(); | ||
|
||
const dom = render( | ||
render( | ||
<Dropdown id="dropdown" isOpen onToggle={onToggle}> | ||
<DropdownTrigger>trigger</DropdownTrigger> | ||
<DropdownPopover>Hello World</DropdownPopover> | ||
<DropdownPopover data-testid="dropdown-popover">Hello World</DropdownPopover> | ||
</Dropdown>, | ||
); | ||
const element = dom.container.querySelector('.DropdownPopover') as HTMLElement; | ||
const element = screen.getByTestId('dropdown-popover') as HTMLElement; | ||
const trigger = screen.getByRole('button'); | ||
|
||
expect(element).toHaveClass('is-open'); | ||
|
@@ -51,16 +51,86 @@ describe('Dropdown', () => { | |
it('should call toggle function', () => { | ||
const onToggle = jest.fn(); | ||
|
||
const dom = render( | ||
render( | ||
<Dropdown id="dropdown" isOpen={false} onToggle={onToggle}> | ||
<DropdownTrigger>trigger</DropdownTrigger> | ||
<DropdownPopover>Hello World</DropdownPopover> | ||
</Dropdown>, | ||
); | ||
const trigger = dom.container.querySelector('button') as HTMLElement; | ||
const trigger = screen.getByRole('button') as HTMLElement; | ||
|
||
fireEvent.click(trigger); | ||
|
||
expect(onToggle).toHaveBeenCalled(); | ||
}); | ||
|
||
it('should render with horizontal alignment', () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe it would be more efficient via dataProvider and it.each? |
||
render(<Dropdown alignmentX="center" data-testid="dropdown" id="dropdown" isOpen={false} onToggle={() => {}} />); | ||
|
||
expect(screen.getByTestId('dropdown')).toHaveClass('Dropdown--alignmentXCenter'); | ||
}); | ||
|
||
it('should render with horizontal and vertical alignment', () => { | ||
render( | ||
<Dropdown | ||
alignmentX="center" | ||
alignmentY="center" | ||
data-testid="dropdown" | ||
id="dropdown" | ||
isOpen={false} | ||
onToggle={() => {}} | ||
/>, | ||
); | ||
|
||
expect(screen.getByTestId('dropdown')).toHaveClass('Dropdown--alignmentXCenter Dropdown--alignmentYCenter'); | ||
}); | ||
|
||
it('should render with some responsive horizontal alignments', () => { | ||
render( | ||
<Dropdown | ||
alignmentX={{ tablet: 'center', desktop: 'right' }} | ||
data-testid="dropdown" | ||
id="dropdown" | ||
isOpen={false} | ||
onToggle={() => {}} | ||
/>, | ||
); | ||
|
||
expect(screen.getByTestId('dropdown')).toHaveClass( | ||
'Dropdown Dropdown--tablet--alignmentXCenter Dropdown--desktop--alignmentXRight', | ||
); | ||
}); | ||
|
||
it('should render with all responsive horizontal alignments', () => { | ||
render( | ||
<Dropdown | ||
alignmentX={{ mobile: 'left', tablet: 'center', desktop: 'right' }} | ||
data-testid="dropdown" | ||
id="dropdown" | ||
isOpen={false} | ||
onToggle={() => {}} | ||
/>, | ||
); | ||
|
||
expect(screen.getByTestId('dropdown')).toHaveClass( | ||
'Dropdown Dropdown--alignmentXLeft Dropdown--tablet--alignmentXCenter Dropdown--desktop--alignmentXRight', | ||
); | ||
}); | ||
|
||
it('should render with responsive horizontal and vertical alignment', () => { | ||
render( | ||
<Dropdown | ||
alignmentX={{ mobile: 'left', tablet: 'center', desktop: 'right' }} | ||
alignmentY={{ mobile: 'top', tablet: 'center', desktop: 'bottom' }} | ||
data-testid="dropdown" | ||
id="dropdown" | ||
isOpen={false} | ||
onToggle={() => {}} | ||
/>, | ||
); | ||
|
||
expect(screen.getByTestId('dropdown')).toHaveClass( | ||
'Dropdown Dropdown--alignmentXLeft Dropdown--tablet--alignmentXCenter Dropdown--desktop--alignmentXRight Dropdown--alignmentYTop Dropdown--tablet--alignmentYCenter Dropdown--desktop--alignmentYBottom', | ||
); | ||
}); | ||
}); |
This file contains 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
35 changes: 35 additions & 0 deletions
35
packages/web-react/src/components/Dropdown/demo/DropdownAlignment.tsx
This file contains 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,35 @@ | ||
import React from 'react'; | ||
import { Button } from '../../Button'; | ||
import { Grid } from '../../Grid'; | ||
import { Item } from '../../Item'; | ||
import Dropdown from '../Dropdown'; | ||
import DropdownPopover from '../DropdownPopover'; | ||
import DropdownTrigger from '../DropdownTrigger'; | ||
|
||
const DropdownAlignment = () => { | ||
const [isOpen, setIsOpen] = React.useState(false); | ||
const onToggle = () => setIsOpen(!isOpen); | ||
|
||
return ( | ||
<Grid cols={2}> | ||
<Dropdown | ||
alignmentX={{ mobile: 'right', tablet: 'left', desktop: 'center' }} | ||
alignmentY="center" | ||
id="dropdown-alignment" | ||
isOpen={isOpen} | ||
onToggle={onToggle} | ||
placement="top-start" | ||
> | ||
<DropdownTrigger elementType={Button}>Button as anchor</DropdownTrigger> | ||
<DropdownPopover> | ||
<Item elementType="a" href="#" label="Action" /> | ||
<Item elementType="a" href="#" label="Another action" /> | ||
<Item elementType="a" href="#" label="Something else here" /> | ||
</DropdownPopover> | ||
</Dropdown> | ||
<div className="px-800 py-1700 bg-tertiary text-center">This a big unrelated box</div> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Box component? :D |
||
</Grid> | ||
); | ||
}; | ||
|
||
export default DropdownAlignment; |
This file contains 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
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are the props intentionally nullable? Do we have it like this in other components with alignment?