-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
Add containerPosition prop for ToastContainer #6316
Merged
kyletsang
merged 3 commits into
react-bootstrap:master
from
tkesgar:position-props-for-toast-container
May 3, 2022
Merged
Changes from 2 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 |
---|---|---|
@@ -1,53 +1,69 @@ | ||
import { render } from '@testing-library/react'; | ||
import ToastContainer, { ToastPosition } from '../src/ToastContainer'; | ||
|
||
const expectedClasses: Record<ToastPosition, Array<string>> = { | ||
'top-start': ['position-absolute', 'top-0', 'start-0'], | ||
'top-center': [ | ||
'position-absolute', | ||
'top-0', | ||
'start-50', | ||
'translate-middle-x', | ||
], | ||
'top-end': ['position-absolute', 'top-0', 'end-0'], | ||
'middle-start': [ | ||
'position-absolute', | ||
'top-50', | ||
'start-0', | ||
'translate-middle-y', | ||
], | ||
'middle-center': [ | ||
'position-absolute', | ||
'top-50', | ||
'start-50', | ||
'translate-middle', | ||
], | ||
'middle-end': ['position-absolute', 'top-50', 'end-0', 'translate-middle-y'], | ||
'bottom-start': ['position-absolute', 'bottom-0', 'start-0'], | ||
'bottom-center': [ | ||
'position-absolute', | ||
'bottom-0', | ||
'start-50', | ||
'translate-middle-x', | ||
], | ||
'bottom-end': ['position-absolute', 'bottom-0', 'end-0'], | ||
const expectedClassesWithoutPosition: Record<ToastPosition, Array<string>> = { | ||
'top-start': ['top-0', 'start-0'], | ||
'top-center': ['top-0', 'start-50', 'translate-middle-x'], | ||
'top-end': ['top-0', 'end-0'], | ||
'middle-start': ['top-50', 'start-0', 'translate-middle-y'], | ||
'middle-center': ['top-50', 'start-50', 'translate-middle'], | ||
'middle-end': ['top-50', 'end-0', 'translate-middle-y'], | ||
'bottom-start': ['bottom-0', 'start-0'], | ||
'bottom-center': ['bottom-0', 'start-50', 'translate-middle-x'], | ||
'bottom-end': ['bottom-0', 'end-0'], | ||
}; | ||
|
||
const createExpectedClasses = (containerPosition = 'absolute') => | ||
Object.fromEntries( | ||
Object.entries(expectedClassesWithoutPosition).map(([key, value]) => [ | ||
key, | ||
[`position-${containerPosition}`, ...value], | ||
]), | ||
); | ||
|
||
describe('ToastContainer', () => { | ||
it('should render a basic toast container', () => { | ||
const { container } = render(<ToastContainer />); | ||
container.firstElementChild!.classList.contains('toast-container').should.be | ||
.true; | ||
}); | ||
|
||
Object.keys(expectedClasses).forEach((position: ToastPosition) => { | ||
it(`should render position=${position}`, () => { | ||
const { container } = render(<ToastContainer position={position} />); | ||
expectedClasses[position].map( | ||
(className) => | ||
container.firstElementChild!.classList.contains(className).should.be | ||
.true, | ||
); | ||
describe('without containerPosition', () => { | ||
const expectedClasses = createExpectedClasses(); | ||
|
||
Object.keys(expectedClasses).forEach((position: ToastPosition) => { | ||
it(`should render classes for position=${position} with position-absolute`, () => { | ||
const { container } = render(<ToastContainer position={position} />); | ||
expectedClasses[position].map( | ||
(className) => | ||
container.firstElementChild!.classList.contains(className).should.be | ||
.true, | ||
); | ||
}); | ||
}); | ||
}); | ||
|
||
['absolute', 'fixed', 'relative', 'sticky', 'custom'].forEach( | ||
(containerPosition) => { | ||
describe(`with containerPosition=${containerPosition}`, () => { | ||
const expectedClasses = createExpectedClasses(containerPosition); | ||
|
||
Object.keys(expectedClasses).forEach((position: ToastPosition) => { | ||
it(`should render classes for position=${position} with position-${containerPosition}`, () => { | ||
const { container } = render( | ||
<ToastContainer | ||
position={position} | ||
containerPosition={containerPosition} | ||
/>, | ||
); | ||
expectedClasses[position].map( | ||
(className) => | ||
container.firstElementChild!.classList.contains(className) | ||
.should.be.true, | ||
); | ||
}); | ||
}); | ||
}); | ||
}, | ||
); | ||
}); |
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.
Doesn't this accept only strings?
I think providing an empty string would achieve what you want here 😄 (also it could be a good idea to add a test for that)
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.
Oh forget to update this 🙈 I initially allow
false
to remove theposition-*
class, but I feel it is simpler to just use"static"
or whatever utility class. Using an empty string should work as well, I'll update it.