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.

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

fix(select-widget): select widget not able to select number value 0 #7254

Merged
merged 2 commits into from
Aug 1, 2024
Merged

fix(select-widget): select widget not able to select number value 0 #7254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc7860d
fix(select-widget): select widget not able to select number value `0`
imangd Jul 17, 2024
dba295d
Merge branch 'main' into 6515-fix-select-widget-empty-selection-with-…
martinjagodic Aug 1, 2024
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: 5 additions & 2 deletions packages/decap-cms-widget-select/src/SelectControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import { reactSelectStyles } from 'decap-cms-ui-default';
import { validations } from 'decap-cms-lib-widgets';

function optionToString(option) {
return option && option.value ? option.value : null;
return option && (typeof option.value === 'number' || typeof option.value === 'string')
? option.value
: null;
}

function convertToOption(raw) {
Expand Down Expand Up @@ -47,9 +49,10 @@ export default class SelectControl extends React.Component {
options: ImmutablePropTypes.listOf(
PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
ImmutablePropTypes.contains({
label: PropTypes.string.isRequired,
value: PropTypes.string.isRequired,
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
}),
]),
).isRequired,
Expand Down
33 changes: 33 additions & 0 deletions packages/decap-cms-widget-select/src/__tests__/select.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ const options = [
{ value: 'baz', label: 'Baz' },
];
const stringOptions = ['foo', 'bar', 'baz'];
const numberOptions = [
{ value: 0, label: 'Foo' },
{ value: 1, label: 'Bar' },
{ value: 2, label: 'Baz' },
];

class SelectController extends React.Component {
state = {
Expand Down Expand Up @@ -134,6 +139,18 @@ describe('Select widget', () => {
expect(getByText('baz')).toBeInTheDocument();
});

it('should call onChange with correct selectedItem when value is number 0', () => {
const field = fromJS({ options: numberOptions });
const { getByText, input, onChangeSpy } = setup({ field });

fireEvent.focus(input);
fireEvent.keyDown(input, { key: 'ArrowDown' });
fireEvent.click(getByText('Foo'));

expect(onChangeSpy).toHaveBeenCalledTimes(1);
expect(onChangeSpy).toHaveBeenCalledWith(numberOptions[0].value);
});

describe('with multiple', () => {
it('should call onChange with correct selectedItem', () => {
const field = fromJS({ options, multiple: true });
Expand Down Expand Up @@ -248,6 +265,22 @@ describe('Select widget', () => {
expect(getByText('bar')).toBeInTheDocument();
expect(getByText('baz')).toBeInTheDocument();
});

it('should call onChange with correct selectedItem when values are numbers including 0', () => {
const field = fromJS({ options: numberOptions, multiple: true });
const { getByText, input, onChangeSpy } = setup({ field });

fireEvent.keyDown(input, { key: 'ArrowDown' });
fireEvent.click(getByText('Foo'));
fireEvent.keyDown(input, { key: 'ArrowDown' });
fireEvent.click(getByText('Baz'));

expect(onChangeSpy).toHaveBeenCalledTimes(2);
expect(onChangeSpy).toHaveBeenCalledWith(fromJS([numberOptions[0].value]));
expect(onChangeSpy).toHaveBeenCalledWith(
fromJS([numberOptions[0].value, numberOptions[2].value]),
);
});
});
describe('validation', () => {
function validate(setupOpts) {
Expand Down
Loading