Skip to content

fix: make Option's checkIcon slot render conditionally #27409

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

Merged
spmonahan merged 3 commits into from
Apr 3, 2023
+31 −1
Merged

fix: make Option's checkIcon slot render conditionally #27409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c039b9
fix: make Option's checkIcon slot render conditionally
spmonahan Mar 31, 2023
382bc2d
Merge branch 'master' into fix/option
spmonahan Apr 3, 2023
96f619a
Merge branch 'master' into fix/option
spmonahan Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/@fluentui-react-combobox-eae93813-cc10-40eb-9645-8d1ad072f062.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: make Option's checkIcon slot render conditionally",
"packageName": "@fluentui/react-combobox",
"email": "[email protected]",
"dependentChangeType": "patch"
}
23 changes: 23 additions & 0 deletions packages/react-components/react-combobox/src/components/Option/Option.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ListboxContext } from '../../contexts/ListboxContext';
import { Option } from './Option';
import type { OptionProps } from './Option.types';
import { isConformant } from '../../testing/isConformant';
import { optionClassNames } from './useOptionStyles';

describe('Option', () => {
isConformant<OptionProps>({
Expand Down Expand Up @@ -222,4 +223,26 @@ describe('Option', () => {
expect(setActiveOption).toHaveBeenCalledTimes(1);
expect(setActiveOption).toHaveBeenCalledWith(optionData);
});

describe('checkIcon slot', () => {
it('renders the `checkIcon` slot by default', () => {
render(
<Option id="optionId" value="foo">
Option 1
</Option>,
);

expect(document.querySelector(`.${optionClassNames.checkIcon}`)).toBeTruthy();
});

it('should not render the `checkIcon` slot when passed `null`', () => {
render(
<Option id="optionId" value="foo" checkIcon={null}>
Option 1
</Option>,
);

expect(document.querySelector(`.${optionClassNames.checkIcon}`)).toBeFalsy();
});
});
});
2 changes: 1 addition & 1 deletion packages/react-components/react-combobox/src/components/Option/renderOption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const renderOption_unstable = (state: OptionState) => {

return (
<slots.root {...slotProps.root}>
<slots.checkIcon {...slotProps.checkIcon} />
{slots.checkIcon && <slots.checkIcon {...slotProps.checkIcon} />}
{slotProps.root.children}
</slots.root>
);
Expand Down