Skip to content

Commit 896dd8f

Browse files
committed
Renamed deleted value to cleared value
1 parent 32d0be9 commit 896dd8f

File tree

12 files changed

+88
-88
lines changed

12 files changed

+88
-88
lines changed

packages/pf4-component-mapper/src/tests/field-array/__snapshots__/field-array.test.js.snap

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ exports[`FieldArray should render array field correctly 1`] = `
2424
buttonClassName=""
2525
buttonsLabels={Object {}}
2626
clearOnUnmount={false}
27+
clearedValue="foo"
2728
disableSubmit={Array []}
2829
formFieldsMapper={
2930
Object {
@@ -135,8 +136,8 @@ exports[`FieldArray should render array field correctly 1`] = `
135136
"blur": [Function],
136137
"change": [Function],
137138
"clearOnUnmount": false,
139+
"clearedValue": "foo",
138140
"concat": [Function],
139-
"deletedValue": undefined,
140141
"destroyOnUnregister": false,
141142
"focus": [Function],
142143
"getFieldState": [Function],
@@ -197,8 +198,8 @@ exports[`FieldArray should render array field correctly 1`] = `
197198
"blur": [Function],
198199
"change": [Function],
199200
"clearOnUnmount": false,
201+
"clearedValue": "foo",
200202
"concat": [Function],
201-
"deletedValue": undefined,
202203
"destroyOnUnregister": false,
203204
"focus": [Function],
204205
"getFieldState": [Function],
@@ -253,8 +254,8 @@ exports[`FieldArray should render array field correctly 1`] = `
253254
"blur": [Function],
254255
"change": [Function],
255256
"clearOnUnmount": false,
257+
"clearedValue": "foo",
256258
"concat": [Function],
257-
"deletedValue": undefined,
258259
"destroyOnUnregister": false,
259260
"focus": [Function],
260261
"getFieldState": [Function],
@@ -310,8 +311,8 @@ exports[`FieldArray should render array field correctly 1`] = `
310311
"blur": [Function],
311312
"change": [Function],
312313
"clearOnUnmount": false,
314+
"clearedValue": "foo",
313315
"concat": [Function],
314-
"deletedValue": undefined,
315316
"destroyOnUnregister": false,
316317
"focus": [Function],
317318
"getFieldState": [Function],
@@ -404,8 +405,8 @@ exports[`FieldArray should render array field correctly 1`] = `
404405
"blur": [Function],
405406
"change": [Function],
406407
"clearOnUnmount": false,
408+
"clearedValue": "foo",
407409
"concat": [Function],
408-
"deletedValue": undefined,
409410
"destroyOnUnregister": false,
410411
"focus": [Function],
411412
"getFieldState": [Function],

packages/react-form-renderer/demo/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const App = () => (
2727
initialValues={{
2828
text_box_1: 'hue'
2929
}}
30-
deletedValue={'bla'}
30+
clearedValue={'bla'}
3131
layoutMapper={layoutMapper}
3232
formFieldsMapper={formFieldsMapper}
3333
onSubmit={console.log}

packages/react-form-renderer/src/form-renderer/enhanced-on-change.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ const checkEmpty = value => {
6565
/**
6666
* Casts input value into selected data type
6767
*/
68-
const enhancedOnChange = ({ dataType, onChange, initial, deletedValue, dirty, ...rest }, value, ...args) => {
68+
const enhancedOnChange = ({ dataType, onChange, initial, clearedValue, dirty, ...rest }, value, ...args) => {
6969
const sanitizedValue = sanitizeValue(value);
7070
const result = Array.isArray(sanitizedValue)
7171
? sanitizedValue.map(item => convertType(dataType, sanitizeValue(item)))
7272
: convertType(dataType, sanitizedValue);
7373
if (checkEmpty(result) && typeof initial !== 'undefined') {
74-
return onChange(deletedValue, ...args);
74+
return onChange(clearedValue, ...args);
7575
}
7676

7777
return onChange(result, ...args);

packages/react-form-renderer/src/form-renderer/field-provider.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ class FieldProvider extends Component{
3333
...fieldsProps.meta,
3434
dataType,
3535
onChange,
36-
deletedValue: this.props.formOptions.deletedValue,
36+
clearedValue: this.props.formOptions.clearedValue,
3737
}, ...args);
38-
// enhancedOnChange(dataType, onChange, fieldsProps.meta.initial, this.props.formOptions.deletedValue, ...args);
3938
},
4039
}}
4140
/>
@@ -52,7 +51,7 @@ class FieldProvider extends Component{
5251
...fieldsProps.meta,
5352
dataType,
5453
onChange,
55-
deletedValue: this.props.formOptions.deletedValue,
54+
clearedValue: this.props.formOptions.clearedValue,
5655
}, ...args),
5756
},
5857
}) } />;
@@ -70,7 +69,7 @@ class FieldProvider extends Component{
7069
...fieldsProps.meta,
7170
dataType,
7271
onChange,
73-
deletedValue: this.props.formOptions.deletedValue,
72+
clearedValue: this.props.formOptions.clearedValue,
7473
}, ...args) }}
7574
/>
7675
) }
@@ -84,7 +83,7 @@ FieldProvider.propTypes = {
8483
clearOnUnmount: PropTypes.bool,
8584
change: PropTypes.func,
8685
getFieldState: PropTypes.func,
87-
deletedValue: PropTypes.any,
86+
clearedValue: PropTypes.any,
8887
}),
8988
component: PropTypes.oneOfType(PropTypes.node, PropTypes.element, PropTypes.func),
9089
render: PropTypes.func,

packages/react-form-renderer/src/form-renderer/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const FormRenderer = ({
4242
onStateUpdate,
4343
renderFormButtons,
4444
subscription,
45-
deletedValue,
45+
clearedValue,
4646
}) => {
4747
const inputSchema = schemaMapper(schemaType)(schema, uiSchema);
4848
let schemaError;
@@ -81,7 +81,7 @@ const FormRenderer = ({
8181
onCancel,
8282
getState,
8383
valid,
84-
deletedValue,
84+
clearedValue,
8585
submit,
8686
handleSubmit,
8787
reset,
@@ -141,7 +141,7 @@ FormRenderer.propTypes = {
141141
onStateUpdate: PropTypes.func,
142142
renderFormButtons: PropTypes.oneOfType([ PropTypes.node, PropTypes.element, PropTypes.func ]),
143143
subscription: PropTypes.shape({ [PropTypes.string]: PropTypes.bool }),
144-
deletedValue: PropTypes.any,
144+
clearedValue: PropTypes.any,
145145
};
146146

147147
FormRenderer.defaultProps = {

0 commit comments

Comments
 (0)