Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 17 additions & 21 deletions src/autocomplete/ResultList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,15 @@ export const ResultList = ({
noOptionClass,
noElFoundText,
onClick,
}: ResultListProps) => {
if (userInput && list.length) {
return (
<ul
id={ulContainerId}
className={ulContainerClass}
style={ulContainerStyle}
aria-live="polite"
>
{list.map((optionName: string, index: number) => (
}: ResultListProps) => (
<ul
id={ulContainerId}
className={ulContainerClass}
style={ulContainerStyle}
aria-live="polite"
>
{userInput && list.length > 0
? list.map((optionName: string, index: number) => (
<li
className={
index === activeOption && activeClass
Expand All @@ -55,14 +54,11 @@ export const ResultList = ({
>
{optionName}
</li>
))}
</ul>
);
} else {
return (
<div className={noOptionClass}>
<em>{noElFoundText || 'No Option!'}</em>
</div>
);
}
};
))
: noElFoundText && (
<li className={[liContainerClass, noOptionClass].join(' ')}>
{noElFoundText}
</li>
)}
</ul>
);
6 changes: 3 additions & 3 deletions src/autocomplete/__tests__/Autocomplete.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,12 @@ describe('FormInput', () => {

it('should not display available options', async () => {
const user = userEvent.setup();
render(<Autocomplete options={['first', 'isaac']} />);
const { container } = render(<Autocomplete options={['first', 'isaac']} />);
const input = screen.getByRole('textbox');
await user.type(input, 'test value');

const noOptionTag: any = screen.getByText('No Option!');
expect(noOptionTag.innerHTML).toBe('No Option!');
const el: any = container.querySelector('li');
expect(el).not.toBeInTheDocument();
});

it('should allow to select the first item', async () => {
Expand Down
25 changes: 6 additions & 19 deletions src/autocomplete/__tests__/ResultList.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,6 @@ describe('ResultList', () => {
expect(listItems[1].innerHTML).toBe('isaac');
});

it('should display the empty content', () => {
const handleClick = jest.fn();
const { container } = render(
<ResultList
list={[]}
userInput="da"
activeOption={1}
onClick={handleClick}
/>
);
const noOptionTag: any = container.querySelector('em');
expect(noOptionTag.innerHTML).toBe('No Option!');
});

it('should display optional properties', () => {
const handleClick = jest.fn();
const { container } = render(
Expand Down Expand Up @@ -94,19 +80,20 @@ describe('ResultList', () => {
);
});

it('should display optional properties when empty', () => {
it('should not display optional properties when empty', () => {
const handleClick = jest.fn();
const { container } = render(
<ResultList
list={[]}
userInput="d"
activeOption={1}
onClick={handleClick}
liContainerClass="liContainerClass"
noOptionClass="noOptionClass"
/>
);
const emEl: any = container.querySelector('div');
expect(emEl.className).toBe('noOptionClass');
const el: any = container.querySelector('li');
expect(el).not.toBeInTheDocument();
});

it('should display empty custom text', () => {
Expand All @@ -121,7 +108,7 @@ describe('ResultList', () => {
noElFoundText="nada de nada"
/>
);
const emEl: any = container.querySelector('em');
expect(emEl.innerHTML).toBe('nada de nada');
const el: any = container.querySelector('li');
expect(el.innerHTML).toBe('nada de nada');
});
});