Skip to content

Commit

Permalink
Merge pull request #689 from Orfium/feat/NDS-817_progress_indicator_v5
Browse files Browse the repository at this point in the history
[NDS-817] feat: Progress Indicator component
  • Loading branch information
kostasdano authored Nov 1, 2023
2 parents a3e318c + 26477bd commit 1fd4ec3
Show file tree
Hide file tree
Showing 39 changed files with 1,388 additions and 560 deletions.
4 changes: 2 additions & 2 deletions src/components/Filter/Filter.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ describe('Generic Filter', () => {
).not.toBeInTheDocument();
});

it('should display loading dots when isLoading is true', async () => {
it('should display progress indicator when isLoading is true', async () => {
renderFilter({ isSearchable: true, isLoading: true });

const button = screen.getByTestId('filter');
Expand All @@ -99,7 +99,7 @@ describe('Generic Filter', () => {
const selectInput = screen.getByTestId('filter-input');
userEvent.type(selectInput, 'test');

await waitFor(() => expect(screen.getByTestId('dots-loading')).toBeVisible());
await waitFor(() => expect(screen.getByTestId('search_circular_progress_container')).toBeVisible());
});

it('should call onAsyncSearch when typing', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { generateTestDataId } from 'utils/helpers';

import { textFieldWrapper, iconWrapper } from './SearchInput.style';
import Icon from 'components/Icon';
import Loader from 'components/Loader';
import ProgressIndicator from 'components/ProgressIndicator';
import TextField from 'components/TextField';

export type SearchInputProps = {
Expand All @@ -21,7 +21,7 @@ const SearchInput = ({ onChange, value, dataTestId, isLoading }: SearchInputProp
const suffix = useMemo(
() => (
<div css={iconWrapper()}>
{isLoading && <Loader />}
{isLoading && <ProgressIndicator type="circular" dataTestPrefixId="search" />}
<Icon size={20} name="search" color={theme.utils.getColor('lightGrey', 650)} />
</div>
),
Expand Down
49 changes: 0 additions & 49 deletions src/components/Loader/Loader.stories.mdx

This file was deleted.

5 changes: 0 additions & 5 deletions src/components/Loader/Loader.style.tsx

This file was deleted.

21 changes: 0 additions & 21 deletions src/components/Loader/Loader.tsx

This file was deleted.

22 changes: 0 additions & 22 deletions src/components/Loader/Loader.utils.tsx

This file was deleted.

207 changes: 0 additions & 207 deletions src/components/Loader/__snapshots__/Loader.stories.storyshot

This file was deleted.

Loading

0 comments on commit 1fd4ec3

Please sign in to comment.