Skip to content

Picker - usePickerLabel - revert fix fro string value #3169

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
merged 1 commit into from
Jul 9, 2024
Merged

Picker - usePickerLabel - revert fix fro string value #3169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/picker/helpers/__tests__/usePickerLabel.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ describe('usePickerLabel hook tests', () => {
expect(sut.result.current.label).toEqual('Red');
});

it('expect label to equal value when no items passed', () => {
it('expect label to equal empty string when no items passed', () => {
const sut = makeSUT({items: undefined, value: 'Some string', getLabel: undefined});
expect(sut.result.current.label).toEqual('Some string');
expect(sut.result.current.label).toEqual('');
});
});
10 changes: 2 additions & 8 deletions src/components/picker/helpers/usePickerLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,8 @@ const usePickerLabel = (props: UsePickerLabelProps) => {
return getLabelsFromArray(value);
}

if (!_.isEmpty(items)) {
const selectedItem = _.find(items, {value});
return _.get(selectedItem, 'label');
}

if (typeof value === 'string') {
return value;
}
const selectedItem = _.find(items, {value});
return _.get(selectedItem, 'label');
}, [getLabel, getLabelsFromArray, items]);

const accessibilityInfo = useMemo(() => {
Expand Down