Skip to content

fix(enhancedOnChange): handle empty string clearedValue and update tests #1517

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(enhancedOnChange): handle empty string clearedValue and update tests #1517

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
28 changes: 18 additions & 10 deletions packages/react-form-renderer/src/tests/form-renderer/enhanced-on-change.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ describe('#enhancedOnChange', () => {
type: 'checkbox',
},
};
expect(enhancedOnChange({ onChange: (value) => value, clearedValue, initial }, valueFalse)).toEqual(valueFalse);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, valueFalse)).toEqual(valueFalse);

const valueTrue = {
target: {
checked: true,
type: 'checkbox',
},
};
expect(enhancedOnChange({ onChange: (value) => value, clearedValue, initial }, valueTrue)).toEqual(valueTrue);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, valueTrue)).toEqual(valueTrue);
});

it('should correctly convert array datatype from strings to integers', () => {
Expand All @@ -61,39 +61,47 @@ describe('#enhancedOnChange', () => {

it('should set delete value after sending empty string value', () => {
const value = undefined;
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(clearedValue);
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, '')).toEqual(clearedValue);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(clearedValue);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, '')).toEqual(clearedValue);
});

it('should not set delete value after sending date', () => {
const value = new Date(2021, 7, 20);
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(value);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(value);
});

it('should not set delete value after sending number 0', () => {
const value = 0;
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(value);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(value);
});

it('should set delete value after sending empty array', () => {
const value = [];
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(clearedValue);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(clearedValue);
});

it('should set delete value after sending empty object', () => {
const value = {};
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(clearedValue);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(clearedValue);
});

it('should not set delete value after sending array', () => {
const value = [1, 2, 'foo'];
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(value);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(value);
});

it('should not set delete value after sending object', () => {
const value = { foo: 'bar' };
expect(enhancedOnChange({ onChange: (value) => value, initial, clearedValue }, value)).toEqual(value);
expect(enhancedOnChange({ onChange: (value) => value, clearedValue }, value)).toEqual(value);
});
it('should keep empty string when clearedValue is empty string', () => {
const clearedValue = '';
const value = undefined;
const onChange = jest.fn();
enhancedOnChange({ onChange, clearedValue }, value);
expect(onChange).toHaveBeenCalledWith('');
});

});

describe('#input type file', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-form-renderer/src/use-field-api/enhanced-on-change.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const enhancedOnChange = ({ dataType, onChange, initial, clearedValue, dirty, ..
: convertType(dataType, sanitizedValue);
}

if (checkEmpty(result) && typeof initial !== 'undefined') {
if (checkEmpty(result)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if this is going to solve the issue without breaking existing behavior. I think we need to look at where the clearedValue is set/retrieved from, and if it really has the "" value when the onChange is called.

return onChange(clearedValue, ...args);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/react-renderer-demo/src/examples/components/cleared-value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ const ClearedValueExample = () => {
);
};

ClearedValueExample.displayName = 'Cleard value example';
ClearedValueExample.displayName = 'Cleared value example';

export default ClearedValueExample;