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.

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

Jump to bottom

[Masonry] Check if container or child exists to prevent error #29452

Merged
merged 10 commits into from
Nov 9, 2021
Merged

[Masonry] Check if container or child exists to prevent error #29452

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
25acaf0
[Masonry] Check if child exists to prevent error
hbjORbj Nov 1, 2021
9b2f371
[Masonry] check if masonry container exists for safety
hbjORbj Nov 1, 2021
62c878f
[Masonry] Replace regression test with unit test
hbjORbj Nov 2, 2021
6b9a2ce
[Masonry] Refactor
hbjORbj Nov 2, 2021
34ef8a1
[Masonry] Leverage resize observer props
hbjORbj Nov 2, 2021
6a06ab1
[Masonry] Clean code
hbjORbj Nov 2, 2021
7fc8cef
[Masonry] Refactor + Pass tests
hbjORbj Nov 2, 2021
b196b5a
[Masonry] Refactor + fix image masonry
hbjORbj Nov 3, 2021
256bbfc
[Masonry] Add safety to resize handler logic
hbjORbj Nov 3, 2021
70f5d59
[Masonry] Refactor
hbjORbj Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/mui-lab/src/Masonry/Masonry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ const Masonry = React.forwardRef(function Masonry(inProps, ref) {

React.useEffect(() => {
const handleResize = () => {
if (!masonryRef.current || !masonryRef.current.firstChild) {
hbjORbj marked this conversation as resolved.
Show resolved Hide resolved
return;
}
const parentWidth = masonryRef.current.clientWidth;
const childWidth = masonryRef.current.firstChild.clientWidth;
const firstChildComputedStyle = window.getComputedStyle(masonryRef.current.firstChild);
Expand Down
19 changes: 19 additions & 0 deletions packages/mui-lab/src/Masonry/Masonry.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,25 @@ describe('<Masonry />', () => {
width: `calc(${(100 / columns).toFixed(2)}% - ${theme.spacing(spacing)})`,
});
});

it('should throw console error when children are empty', function test() {
if (!/jsdom/.test(window.navigator.userAgent)) {
this.skip();
}
expect(() => render(<Masonry columns={3} spacing={1} />)).toErrorDev(
'Warning: Failed prop type: The prop `children` is marked as required in `ForwardRef(Masonry)`, but its value is `undefined`.',
);
});

it('should not throw type error when children are empty', function test() {
if (/jsdom/.test(window.navigator.userAgent)) {
this.skip();
}
expect(() => render(<Masonry columns={3} spacing={1} />)).toErrorDev(
'Warning: Failed prop type: The prop `children` is marked as required in `ForwardRef(Masonry)`, but its value is `undefined`.',
);
expect(() => render(<Masonry columns={3} spacing={1} />)).not.to.throw(new TypeError());
});
});

describe('style attribute:', () => {
Expand Down