Skip to content

Commit 3217c00

Browse files
committed
fix(Form): internal logic fixes * 8
1 parent 407b262 commit 3217c00

File tree

3 files changed

+22
-69
lines changed

3 files changed

+22
-69
lines changed

src/components/form/Form/use-field/use-field-props.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@ export function useFieldProps<
8282

8383
// eslint-disable-next-line react-hooks/rules-of-hooks
8484
const onChangeEvent = useEvent((value, dontTouch: boolean) => {
85-
console.log(
86-
'! uikit onChange',
87-
value,
88-
dontTouch,
89-
field?.validateTrigger || defaultValidationTrigger,
90-
);
91-
9285
return field?.onChange?.(
9386
value,
9487
dontTouch,

src/components/form/Form/use-field/use-field.ts

Lines changed: 22 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useEffect, useMemo, useState } from 'react';
1+
import { useEffect, useState } from 'react';
22

33
import { ValidateTrigger } from '../../../../shared/index';
44
import { useEvent, useWarn } from '../../../../_internal/index';
@@ -127,16 +127,6 @@ export function useField<T extends FieldTypes, Props extends CubeFieldProps<T>>(
127127

128128
const field = form.getFieldInstance(fieldName);
129129

130-
console.log(
131-
'! uikit set field before',
132-
fieldName,
133-
val,
134-
!dontTouch,
135-
false,
136-
dontTouch,
137-
shouldUpdate,
138-
);
139-
140130
if (shouldUpdate) {
141131
const fieldsValue = form.getFieldsValue();
142132

@@ -156,15 +146,6 @@ export function useField<T extends FieldTypes, Props extends CubeFieldProps<T>>(
156146

157147
form.setFieldValue(fieldName, val, !dontTouch, false, dontTouch);
158148

159-
console.log(
160-
'! uikit set field after',
161-
fieldName,
162-
val,
163-
!dontTouch,
164-
false,
165-
dontTouch,
166-
);
167-
168149
if (
169150
!dontTouch &&
170151
(validateTrigger === 'onChange' ||
@@ -185,43 +166,25 @@ export function useField<T extends FieldTypes, Props extends CubeFieldProps<T>>(
185166

186167
let inputValue = field?.inputValue;
187168

188-
return useMemo(
189-
() => ({
190-
id: fieldId,
191-
name: fieldName,
192-
value: inputValue,
193-
validateTrigger,
194-
form,
195-
field,
196-
nonInput,
197-
198-
validationState:
199-
validationState ??
200-
(field?.errors?.length
201-
? 'invalid'
202-
: showValid && field?.status === 'valid'
203-
? 'valid'
204-
: undefined),
205-
...(isRequired && { isRequired }),
206-
message: message ?? (field?.status === 'invalid' && field?.errors?.[0]),
207-
onBlur: onBlurHandler,
208-
onChange: onChangeHandler,
209-
}),
210-
[
211-
form,
212-
field,
213-
field?.errors?.length,
214-
field?.status,
215-
inputValue,
216-
fieldId,
217-
fieldName,
218-
isRequired,
219-
onBlurHandler,
220-
onChangeHandler,
221-
validateTrigger,
222-
validationState,
223-
showValid,
224-
nonInput,
225-
],
226-
);
169+
return {
170+
id: fieldId,
171+
name: fieldName,
172+
value: inputValue,
173+
validateTrigger,
174+
form,
175+
field,
176+
nonInput,
177+
178+
validationState:
179+
validationState ??
180+
(field?.errors?.length
181+
? 'invalid'
182+
: showValid && field?.status === 'valid'
183+
? 'valid'
184+
: undefined),
185+
...(isRequired && { isRequired }),
186+
message: message ?? (field?.status === 'invalid' && field?.errors?.[0]),
187+
onBlur: onBlurHandler,
188+
onChange: onChangeHandler,
189+
};
227190
}

src/components/form/Form/use-form.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,7 @@ export class CubeFormInstance<
162162
const field = this.fields[name];
163163

164164
if (!field || isEqual(value, inputOnly ? field.inputValue : field.value)) {
165-
console.log('! uikit equal', field, value, inputOnly);
166165
return;
167-
} else {
168-
console.log('! uikit setting', field, value, inputOnly);
169166
}
170167

171168
if (!inputOnly) {

0 commit comments

Comments
 (0)