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

[material-ui][Avatar] Improve fallback when children is empty string or boolean #40766

Merged
merged 6 commits into from Jan 28, 2024
Merged

[material-ui][Avatar] Improve fallback when children is empty string or boolean #40766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26d9f32
[material-ui][Avatar] Improve fallback when children is empty string
mirus-ua Jan 23, 2024
51357be
chore: a few changes according to comments
mirus-ua Jan 24, 2024
67b0d2f
fix: test
mirus-ua Jan 25, 2024
593eabc
test: remove redundant test
mirus-ua Jan 27, 2024
150afd9
Merge branch 'master' into improve-avatar-fallback
ZeeshanTamboli Jan 28, 2024
f61a104
Merge branch 'improve-avatar-fallback' of https://github.com/mirus-ua…
ZeeshanTamboli Jan 28, 2024
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
2 changes: 1 addition & 1 deletion packages/mui-material/src/Avatar/Avatar.js
View file
Open in desktop
Expand Up @@ -183,7 +183,7 @@ const Avatar = React.forwardRef(function Avatar(inProps, ref) {
{...imgProps}
/>
);
} else if (childrenProp != null) {
} else if (childrenProp != null && childrenProp !== '' && typeof childrenProp !== 'boolean') {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can shorten the condition without making any test fail: #40834.

children = childrenProp;
} else if (hasImg && alt) {
children = alt[0];
Expand Down
14 changes: 14 additions & 0 deletions packages/mui-material/src/Avatar/Avatar.test.js
View file
Open in desktop
Expand Up @@ -212,6 +212,20 @@ describe('<Avatar />', () => {

expect(avatar).to.have.class(classes.colorDefault);
});

it('should fallback if children is empty string', () => {
const container = render(<Avatar>{''}</Avatar>).container;
const avatar = container.firstChild;

expect(avatar.firstChild).to.have.attribute('data-testid', 'PersonIcon');
});

it('should fallback if children is false', () => {
const container = render(<Avatar>{false}</Avatar>).container;
const avatar = container.firstChild;

expect(avatar.firstChild).to.have.attribute('data-testid', 'PersonIcon');
});
});

it('should not throw error when ownerState is used in styleOverrides', () => {
Expand Down