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.

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

[Select] Accept non-component children #33530

Merged
merged 14 commits into from Dec 26, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
82 changes: 82 additions & 0 deletions packages/mui-material/src/Select/Select.test.js
Expand Up @@ -79,6 +79,88 @@ describe('<Select />', () => {
);
});

it('should support conditional rendering with empty string', () => {
boutahlilsoufiane marked this conversation as resolved.
Show resolved Hide resolved
render(
<Select open value={2}>
{'' && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with negative number', () => {
render(
<Select open value={2}>
{-1 && <MenuItem value={1}>One</MenuItem>}
boutahlilsoufiane marked this conversation as resolved.
Show resolved Hide resolved
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with zero', () => {
render(
<Select open value={2}>
{0 && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with NaN', () => {
render(
<Select open value={2}>
{NaN && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with boolean', () => {
render(
<Select open value={2}>
{true && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with undefined', () => {
render(
<Select open value={2}>
{undefined && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with null', () => {
render(
<Select open value={2}>
{null && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should support conditional rendering with false', () => {
render(
<Select open value={2}>
{false && <MenuItem value={1}>One</MenuItem>}
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should ignore primitive element', () => {
render(
<Select open value={2}>
{'Zero'}
<MenuItem value={1}>One</MenuItem>
<MenuItem value={2}>Two</MenuItem>
</Select>,
);
});

it('should have an input with [aria-hidden] by default', () => {
const { container } = render(
<Select value="10">
Expand Down
6 changes: 4 additions & 2 deletions packages/mui-material/src/Select/SelectInput.js
Expand Up @@ -401,7 +401,8 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
return selected;
}
const firstSelectableElement = arr.find(
(item) => item.props.value !== undefined && item.props.disabled !== true,
(item) =>
item && item.props && item.props.value !== undefined && item.props.disabled !== true,
boutahlilsoufiane marked this conversation as resolved.
Show resolved Hide resolved
);
if (child === firstSelectableElement) {
return true;
Expand All @@ -426,7 +427,8 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
},
role: 'option',
selected:
arr[0].props.value === undefined || arr[0].props.disabled === true
(arr[0] && arr[0].props && arr[0].props.value === undefined) ||
(arr[0] && arr[0].props && arr[0].props.disabled === true)
boutahlilsoufiane marked this conversation as resolved.
Show resolved Hide resolved
? isFirstSelectableElement()
: selected,
value: undefined, // The value is most likely not a valid HTML attribute.
Expand Down