Skip to content

Commit 86ee675

Browse files
thetthet
committed
feat(pat-validation): Support dynamic forms.
Introduce event delegation and register input, change and focusout event handlers on the document level. This reduces the amount of registered event handlers which potentially improves performance and also supports dynamic forms where form elements can be added at any time.
1 parent 85f1959 commit 86ee675

File tree

4 files changed

+58
-41
lines changed

4 files changed

+58
-41
lines changed

‎src/pat/auto-suggest/auto-suggest.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ export default Base.extend({
122122
const val = $sel2.select2("val");
123123
if (val?.length === 0) {
124124
// catches "" and []
125-
// blur the input field so that pat-validate can kick in when
126-
// nothing was selected.
127-
this.el.dispatchEvent(events.blur_event());
125+
// focus-out the input field so that pat-validate can kick in
126+
// when nothing was selected.
127+
this.el.dispatchEvent(events.focusout_event());
128128
}
129129
};
130130
this.$el.on("select2-close", initiate_empty_check.bind(this));

‎src/pat/date-picker/date-picker.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ export default Base.extend({
173173
onSelect: () => this.dispatch_change_event(),
174174
onClose: () => {
175175
if (this.options.behavior === "styled" && !this.el.value) {
176-
// blur the input field so that pat-validate can kick in when
177-
// nothing was selected.
178-
el.dispatchEvent(events.blur_event());
176+
// focus-out the input field so that pat-validate can kick
177+
// in when nothing was selected.
178+
el.dispatchEvent(events.focusout_event());
179179
}
180180
},
181181
};

‎src/pat/validation/validation.js‎

Lines changed: 50 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,56 @@ class Pattern extends BasePattern {
6363
{ capture: true }
6464
);
6565

66-
this.initialize_inputs();
67-
$(this.form).on("pat-update", () => {
68-
this.initialize_inputs();
69-
});
66+
// Input debouncer map:
67+
// - key: input element
68+
// - value: debouncer function
69+
// 1) We want do debounce the validation checks to avoid validating
70+
// while typing.
71+
// 2) We want to debounce the input events individually, so that we can
72+
// do multiple checks in parallel and show multiple errors at once.
73+
const input_debouncer_map = new Map();
74+
const debounce_filter = (e) => {
75+
const input = e.target;
76+
if (input?.form !== this.form || ! this.inputs.includes(input)) {
77+
// Ignore events from other forms or from elements which are
78+
// not inputs.
79+
return;
80+
}
81+
82+
if (! input_debouncer_map.has(input)) {
83+
// Create a new cancelable debouncer for this input.
84+
input_debouncer_map.set(input, utils.debounce((e) => {
85+
logger.debug("Checking input for event", input, e);
86+
this.check_input({ input: input, event: e });
87+
}, this.options.delay));
88+
}
89+
90+
// Get the debouncer for this input.
91+
const debouncer = input_debouncer_map.get(input);
92+
// Debounce the validation check.
93+
debouncer(input, e);
94+
};
95+
96+
events.add_event_listener(
97+
document,
98+
"input",
99+
`pat-validation--${this.uuid}--input--validator`,
100+
(e) => debounce_filter(e)
101+
);
102+
103+
events.add_event_listener(
104+
document,
105+
"change",
106+
`pat-validation--${this.uuid}--change--validator`,
107+
(e) => debounce_filter(e)
108+
);
109+
110+
events.add_event_listener(
111+
document,
112+
"focusout",
113+
`pat-validation--${this.uuid}--focusout--validator`,
114+
(e) => debounce_filter(e)
115+
);
70116

71117
// Set ``novalidate`` attribute to disable the browser's validation
72118
// bubbles but not disable the validation API.
@@ -94,35 +140,6 @@ class Pattern extends BasePattern {
94140
}
95141
}
96142

97-
initialize_inputs() {
98-
for (const [cnt, input] of this.inputs.entries()) {
99-
// Cancelable debouncer.
100-
const debouncer = utils.debounce((e) => {
101-
logger.debug("Checking input for event", input, e);
102-
this.check_input({ input: input, event: e });
103-
}, this.options.delay);
104-
105-
events.add_event_listener(
106-
input,
107-
"input",
108-
`pat-validation--input-${input.name}--${cnt}--validator`,
109-
(e) => debouncer(e)
110-
);
111-
events.add_event_listener(
112-
input,
113-
"change",
114-
`pat-validation--change-${input.name}--${cnt}--validator`,
115-
(e) => debouncer(e)
116-
);
117-
events.add_event_listener(
118-
input,
119-
"blur",
120-
`pat-validation--blur-${input.name}--${cnt}--validator`,
121-
(e) => debouncer(e)
122-
);
123-
}
124-
}
125-
126143
check_input({
127144
input, // Input to check.
128145
event = null, // Optional event which triggered the check.

‎src/pat/validation/validation.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ describe("pat-validation", function () {
477477
const instance = new Pattern(el);
478478
await events.await_pattern_init(instance);
479479

480-
document.querySelector("[name=i1]").dispatchEvent(events.blur_event());
480+
document.querySelector("[name=i1]").dispatchEvent(events.focusout_event());
481481
await utils.timeout(1); // wait a tick for async to settle.
482482

483483
expect(el.querySelectorAll("em.warning").length).toBe(2);
@@ -498,7 +498,7 @@ describe("pat-validation", function () {
498498
const instance = new Pattern(el);
499499
await events.await_pattern_init(instance);
500500

501-
document.querySelector("[name=i1]").dispatchEvent(events.blur_event());
501+
document.querySelector("[name=i1]").dispatchEvent(events.focusout_event());
502502
await utils.timeout(1); // wait a tick for async to settle.
503503

504504
expect(el.querySelectorAll("em.warning").length).toBe(1);

0 commit comments

Comments
 (0)