Skip to content

Commit 7d45d01

Browse files
committed
integrate more feedback
1 parent 72792f7 commit 7d45d01

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "lite-form",
33
"description": "Form HOC for Web Components. It's also works for LitElement.",
4-
"version": "1.0.2",
4+
"version": "2.0.0",
55
"scripts": {},
66
"main": "dist/index.js",
77
"module": "dist/index.esm.js",

src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ export type FormElement = CustomElement<FormElementProps & {
2929
handleBlur: (event: Event | CustomEvent) => void;
3030
handleValidate: () => void;
3131
handleReset: () => void;
32-
setTouched: (name: string) => void;
32+
setTouched: (name: string, validate: boolean) => void;
3333
setValue: (name: string, value: InputValue, validate: boolean) => void;
3434
}>;

src/withField.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ const withFieldExtended = (config: FieldConfig = {captureBlur: true, listenChang
5050
}
5151
}
5252

53-
setTouched = (name: string): void => {
54-
this._formClass.setTouched(name);
53+
setTouched = (validate = false): void => {
54+
this._formClass.setTouched(this.name || this.id, validate);
5555
}
5656

5757
// Handle blur events.
5858
handleBlur = (): void => {
59-
this.setTouched(this.name || this.id)
59+
this.setTouched(true)
6060
}
6161

6262
connectedCallback(): void {

src/withForm.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ const withFormExtended = (config?:FormConfig) => <T extends Constructor<Connecta
136136
}
137137

138138
// Set touched and handleValidate if needed
139-
setTouched = (name: string): void => {
139+
setTouched = (name: string, validate = false): void => {
140140
this._touched = set(this._touched, name, true)
141-
if (this._validateOnBlur) {
141+
if (validate) {
142142
this.handleValidate()
143143
}
144144
}
@@ -147,15 +147,15 @@ const withFormExtended = (config?:FormConfig) => <T extends Constructor<Connecta
147147
handleBlur = (event: Event | CustomEvent): void => {
148148
const eventTarget = getEventTarget(event)
149149
if (eventTarget) {
150-
this.setTouched(eventTarget.name || eventTarget.id);
150+
this.setTouched(eventTarget.name || eventTarget.id, this._validateOnBlur);
151151
}
152152
}
153153

154154
// Set the value for the given name.
155155
// Triggers optional validation when validate is true.
156156
setValue = (name: string, value:InputValue, validate = false): void => {
157157
this._values = set(cloneDeep(this.values), name, value)
158-
if (validate && this._validateOnChange) {
158+
if (validate) {
159159
this.handleValidate()
160160
}
161161
}
@@ -165,7 +165,7 @@ const withFormExtended = (config?:FormConfig) => <T extends Constructor<Connecta
165165
const eventTarget = getEventTarget(event)
166166
if (eventTarget) {
167167
const value = getValueFromEventTarget(eventTarget)
168-
this.setValue(eventTarget.name || eventTarget.id, value, true)
168+
this.setValue(eventTarget.name || eventTarget.id, value, this._validateOnChange)
169169
}
170170
}
171171

0 commit comments

Comments
 (0)