@cat-of-summer/st-script 1.2.0 → 1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/loader.esm.min.js +1 -1
- package/dist/loader.esm.min.js.map +1 -1
- package/dist/loader.min.js +1 -1
- package/dist/loader.min.js.map +1 -1
- package/dist/mask.esm.min.js +1 -1
- package/dist/mask.esm.min.js.map +3 -3
- package/dist/mask.min.js +1 -1
- package/dist/mask.min.js.map +3 -3
- package/dist/modal.esm.min.js +1 -1
- package/dist/modal.esm.min.js.map +3 -3
- package/dist/modal.min.js +1 -1
- package/dist/modal.min.js.map +3 -3
- package/dist/observer.esm.min.js +1 -1
- package/dist/observer.esm.min.js.map +1 -1
- package/dist/observer.min.js +1 -1
- package/dist/observer.min.js.map +1 -1
- package/dist/route.esm.min.js.map +2 -2
- package/dist/route.min.js.map +2 -2
- package/dist/select.esm.min.js +1 -1
- package/dist/select.esm.min.js.map +3 -3
- package/dist/select.min.js +1 -1
- package/dist/select.min.js.map +3 -3
- package/dist/toggle.esm.min.js +1 -1
- package/dist/toggle.esm.min.js.map +3 -3
- package/dist/toggle.min.js +1 -1
- package/dist/toggle.min.js.map +3 -3
- package/dist/typograf.esm.min.js +1 -1
- package/dist/typograf.esm.min.js.map +1 -1
- package/dist/typograf.min.js +1 -1
- package/dist/typograf.min.js.map +1 -1
- package/dist/uploader.esm.min.js +1 -1
- package/dist/uploader.esm.min.js.map +3 -3
- package/dist/uploader.min.js +1 -1
- package/dist/uploader.min.js.map +3 -3
- package/dist/validator.esm.min.js +1 -1
- package/dist/validator.esm.min.js.map +3 -3
- package/dist/validator.min.js +1 -1
- package/dist/validator.min.js.map +3 -3
- package/package.json +1 -1
- package/src/_traits/hasInstanceSymbol.js +16 -0
- package/src/mask/index.js +41 -12
- package/src/modal/index.js +69 -15
- package/src/select/index.js +57 -12
- package/src/toggle/index.js +30 -13
- package/src/uploader/index.js +22 -8
- package/src/validator/index.js +21 -4
package/src/modal/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { closestInPath, element, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { closestInPath, disown, element, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
export default class Modal {
|
|
4
4
|
modal;
|
|
@@ -19,6 +19,12 @@ export default class Modal {
|
|
|
19
19
|
// Куда идёт окно. Меняется синхронно, а state — только в requestAnimationFrame,
|
|
20
20
|
// поэтому show() сразу после hide() видит закрытие по #target.
|
|
21
21
|
#target = 'hidden';
|
|
22
|
+
// destroy(): подписки окна, таймеры и блокировка прокрутки из замыкания конструктора,
|
|
23
|
+
// место контента в документе до переноса в окно.
|
|
24
|
+
#abort = new AbortController();
|
|
25
|
+
#teardown = null;
|
|
26
|
+
#home = null;
|
|
27
|
+
#destroyed = false;
|
|
22
28
|
|
|
23
29
|
static find = find;
|
|
24
30
|
|
|
@@ -107,6 +113,7 @@ export default class Modal {
|
|
|
107
113
|
let timeout;
|
|
108
114
|
let body_inline_styles;
|
|
109
115
|
let default_scroll_behavior;
|
|
116
|
+
let locked = false;
|
|
110
117
|
|
|
111
118
|
for (let [key, value] of Object.entries(params))
|
|
112
119
|
if (typeof value == "function") {
|
|
@@ -184,11 +191,13 @@ export default class Modal {
|
|
|
184
191
|
|
|
185
192
|
this.modal.append(this.area);
|
|
186
193
|
|
|
194
|
+
const signal = this.#abort.signal;
|
|
195
|
+
|
|
187
196
|
if (this.#params.close_by_overlay)
|
|
188
197
|
this.area.addEventListener('click', (e) => {
|
|
189
198
|
// composedPath, а не e.target: перерисовка могла вынуть цель из контейнера до всплытия.
|
|
190
199
|
if (!e.composedPath().includes(this.container)) this.hide(e);
|
|
191
|
-
});
|
|
200
|
+
}, { signal });
|
|
192
201
|
|
|
193
202
|
this.container = document.createElement('modal-container');
|
|
194
203
|
own(this.container, this);
|
|
@@ -217,6 +226,14 @@ export default class Modal {
|
|
|
217
226
|
throw new Error("Неудачная попытка вставить переданный контент в модальное окно");
|
|
218
227
|
}
|
|
219
228
|
|
|
229
|
+
// Контент из документа destroy() вернёт на прежнее место.
|
|
230
|
+
if (this.content.parentNode)
|
|
231
|
+
this.#home = {
|
|
232
|
+
parent: this.content.parentNode,
|
|
233
|
+
next: this.content.nextSibling,
|
|
234
|
+
transition: this.content.style.transition,
|
|
235
|
+
};
|
|
236
|
+
|
|
220
237
|
this.container.append(this.content);
|
|
221
238
|
own(this.content, this);
|
|
222
239
|
this.content.style.transition = 'inherit';
|
|
@@ -224,7 +241,7 @@ export default class Modal {
|
|
|
224
241
|
// Делегирование: кнопки, появившиеся или пересозданные позже (App, innerHTML), тоже работают.
|
|
225
242
|
this.content.addEventListener('click', e => {
|
|
226
243
|
if (closestInPath(e, '[action="close"]', this.content)) this.hide();
|
|
227
|
-
});
|
|
244
|
+
}, { signal });
|
|
228
245
|
|
|
229
246
|
let toggle = (params) => {
|
|
230
247
|
params.before_func(params.data);
|
|
@@ -298,7 +315,10 @@ export default class Modal {
|
|
|
298
315
|
data
|
|
299
316
|
});
|
|
300
317
|
|
|
301
|
-
|
|
318
|
+
// Уже заблокировано (show() прервал закрытие) — второй раз не снимаем стили:
|
|
319
|
+
// запомнились бы зафиксированные, и прокрутка не вернулась бы.
|
|
320
|
+
if (this.#params.overlay_scroll_lock && this.overlay && this.#params.blocking && !locked) {
|
|
321
|
+
locked = true;
|
|
302
322
|
default_scroll_behavior = document.documentElement.style.scrollBehavior;
|
|
303
323
|
|
|
304
324
|
body_inline_styles = document.body.style;
|
|
@@ -358,17 +378,27 @@ export default class Modal {
|
|
|
358
378
|
|
|
359
379
|
clearTimeout(timeout);
|
|
360
380
|
|
|
361
|
-
timeout = setTimeout(
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
381
|
+
timeout = setTimeout(unlock, this.#params.duration * 1000);
|
|
382
|
+
}
|
|
383
|
+
};
|
|
384
|
+
|
|
385
|
+
// Снять блокировку прокрутки: вернуть стили body и позицию страницы.
|
|
386
|
+
let unlock = () => {
|
|
387
|
+
if (!locked) return;
|
|
388
|
+
locked = false;
|
|
366
389
|
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
}, this.#params.duration * 1000);
|
|
390
|
+
if (body_inline_styles) {
|
|
391
|
+
Object.assign(document.body.style, body_inline_styles);
|
|
392
|
+
window.scrollTo(body_inline_styles.scroll_X, body_inline_styles.scroll_Y);
|
|
371
393
|
}
|
|
394
|
+
|
|
395
|
+
if (default_scroll_behavior != null)
|
|
396
|
+
document.documentElement.style.scrollBehavior = default_scroll_behavior;
|
|
397
|
+
};
|
|
398
|
+
|
|
399
|
+
this.#teardown = () => {
|
|
400
|
+
clearTimeout(timeout);
|
|
401
|
+
unlock();
|
|
372
402
|
};
|
|
373
403
|
|
|
374
404
|
if (this.#params.close_by_esc)
|
|
@@ -376,12 +406,36 @@ export default class Modal {
|
|
|
376
406
|
|
|
377
407
|
if (this.#params.trigger)
|
|
378
408
|
document.querySelectorAll(this.#params.trigger).forEach(trigger => {
|
|
379
|
-
trigger.addEventListener('click', () => this.show(trigger));
|
|
409
|
+
trigger.addEventListener('click', () => this.show(trigger), { signal });
|
|
380
410
|
});
|
|
381
|
-
|
|
411
|
+
|
|
382
412
|
this.on_init(this.#params);
|
|
383
413
|
}
|
|
384
414
|
|
|
415
|
+
// Разобрать окно: снять обработчики и таймеры, вернуть прокрутку страницы, если окно её
|
|
416
|
+
// заблокировало, контент — на место в документе, откуда его взяли; разметку окна убрать.
|
|
417
|
+
// Ждущие open() получают null. Нужен, когда контент живёт меньше страницы: компонент
|
|
418
|
+
// SPA, который уходит со сменой маршрута.
|
|
419
|
+
destroy() {
|
|
420
|
+
if (this.#destroyed) return;
|
|
421
|
+
this.#destroyed = true;
|
|
422
|
+
|
|
423
|
+
this.#abort.abort();
|
|
424
|
+
this.#teardown?.();
|
|
425
|
+
Modal.#open = Modal.#open.filter(modal => modal !== this);
|
|
426
|
+
this.#pending_show = null;
|
|
427
|
+
[...this.#resolvers.splice(0), ...this.#waiting.splice(0)].forEach(resolve => resolve(null));
|
|
428
|
+
|
|
429
|
+
disown(this.content, this);
|
|
430
|
+
if (this.#home) {
|
|
431
|
+
this.content.style.transition = this.#home.transition;
|
|
432
|
+
let { parent, next } = this.#home;
|
|
433
|
+
parent.insertBefore(this.content, next?.parentNode === parent ? next : null);
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
this.modal.remove();
|
|
437
|
+
}
|
|
438
|
+
|
|
385
439
|
// Фокус возвращается, только если он остался в окне или ушёл на body: пользователь,
|
|
386
440
|
// успевший перейти в другое место, его не теряет.
|
|
387
441
|
#restoreFocus() {
|
package/src/select/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
export default class Select {
|
|
@@ -6,6 +6,9 @@ export default class Select {
|
|
|
6
6
|
#params = {};
|
|
7
7
|
#methods = {};
|
|
8
8
|
#timers = new WeakMap();
|
|
9
|
+
// select → его контейнер и исходный style: для refresh() и destroy().
|
|
10
|
+
#built = new Map();
|
|
11
|
+
#abort = new AbortController();
|
|
9
12
|
|
|
10
13
|
static find = find;
|
|
11
14
|
|
|
@@ -89,6 +92,8 @@ export default class Select {
|
|
|
89
92
|
toggle: () => this.toggle(select)
|
|
90
93
|
});
|
|
91
94
|
|
|
95
|
+
let signal = this.#abort.signal;
|
|
96
|
+
|
|
92
97
|
let container = document.createElement('select-container');
|
|
93
98
|
own(container, this);
|
|
94
99
|
Object.assign(container.style, { position: 'relative', display: 'inline-block' });
|
|
@@ -102,6 +107,8 @@ export default class Select {
|
|
|
102
107
|
Object.assign(options.style, { transition: `all ${this.#params.duration}s` });
|
|
103
108
|
this.#locate(options);
|
|
104
109
|
|
|
110
|
+
this.#built.set(select, { container, style: select.getAttribute('style') });
|
|
111
|
+
|
|
105
112
|
Object.assign(select.style, {
|
|
106
113
|
position: 'absolute', width: '1px', height: '1px',
|
|
107
114
|
overflow: 'hidden', clip: 'rect(0 0 0 0)', clipPath: 'inset(50%)',
|
|
@@ -111,6 +118,26 @@ export default class Select {
|
|
|
111
118
|
container.append(trigger, select, options);
|
|
112
119
|
container.setAttribute('state', 'closed');
|
|
113
120
|
|
|
121
|
+
this.#items(container, select);
|
|
122
|
+
this.#render(select, trigger);
|
|
123
|
+
|
|
124
|
+
if (this.#params.action == 'hover') {
|
|
125
|
+
container.addEventListener('mouseenter', () => this.open(container), { signal });
|
|
126
|
+
container.addEventListener('mouseleave', () => this.close(container), { signal });
|
|
127
|
+
} else
|
|
128
|
+
trigger.addEventListener(this.#params.action, () => this.toggle(container), { signal });
|
|
129
|
+
|
|
130
|
+
if (this.#params.close_on_outside)
|
|
131
|
+
document.addEventListener('click', (e) => {
|
|
132
|
+
if (!e.composedPath().includes(container)) this.close(container);
|
|
133
|
+
}, { signal });
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
// Пункты списка — по <option> нативного select.
|
|
137
|
+
#items(container, select) {
|
|
138
|
+
let options = container.querySelector('select-options');
|
|
139
|
+
options.replaceChildren();
|
|
140
|
+
|
|
114
141
|
for (let option of [...select.options]) {
|
|
115
142
|
let item = document.createElement('select-option');
|
|
116
143
|
own(item, this);
|
|
@@ -121,23 +148,41 @@ export default class Select {
|
|
|
121
148
|
|
|
122
149
|
item.addEventListener('click', () => {
|
|
123
150
|
if (!option.disabled) this.#choose(container, select, option, item);
|
|
124
|
-
});
|
|
151
|
+
}, { signal: this.#abort.signal });
|
|
125
152
|
|
|
126
153
|
options.append(item);
|
|
127
154
|
}
|
|
155
|
+
}
|
|
128
156
|
|
|
129
|
-
|
|
157
|
+
// Пересобрать пункты и текст триггера по нативному select: после смены <option> или
|
|
158
|
+
// значения из кода (select.value = …, v-model). Без аргумента — все свои select.
|
|
159
|
+
refresh(target = [...this.#built.keys()]) {
|
|
160
|
+
for (let select of elements(target)) {
|
|
161
|
+
let built = this.#built.get(select);
|
|
162
|
+
if (!built) continue;
|
|
163
|
+
this.#items(built.container, select);
|
|
164
|
+
this.#render(select, built.container.querySelector('select-trigger'));
|
|
165
|
+
}
|
|
166
|
+
return this;
|
|
167
|
+
}
|
|
130
168
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
trigger.addEventListener(this.#params.action, () => this.toggle(container));
|
|
169
|
+
// Разобрать: снять обработчики (в том числе клик мимо на document), вернуть select на
|
|
170
|
+
// место контейнера с прежними инлайн-стилями, убрать свою разметку.
|
|
171
|
+
destroy() {
|
|
172
|
+
this.#abort.abort();
|
|
136
173
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
174
|
+
for (let [select, { container, style }] of this.#built) {
|
|
175
|
+
clearTimeout(this.#timers.get(container));
|
|
176
|
+
container.parentNode?.insertBefore(select, container);
|
|
177
|
+
container.remove();
|
|
178
|
+
|
|
179
|
+
if (style == null) select.removeAttribute('style');
|
|
180
|
+
else select.setAttribute('style', style);
|
|
181
|
+
|
|
182
|
+
disown(select, this, ['open', 'close', 'toggle']);
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
this.#built.clear();
|
|
141
186
|
}
|
|
142
187
|
|
|
143
188
|
#choose(container, select, option, item) {
|
package/src/toggle/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
export default class Toggle {
|
|
@@ -6,9 +6,11 @@ export default class Toggle {
|
|
|
6
6
|
#params = {};
|
|
7
7
|
#methods = {};
|
|
8
8
|
#timers = new WeakMap();
|
|
9
|
+
#pending = new Set();
|
|
9
10
|
#anchors = new Map();
|
|
10
11
|
#triggers = [];
|
|
11
12
|
#last = null;
|
|
13
|
+
#abort = new AbortController();
|
|
12
14
|
|
|
13
15
|
static find = find;
|
|
14
16
|
|
|
@@ -63,6 +65,7 @@ export default class Toggle {
|
|
|
63
65
|
this.before_init(this.#params);
|
|
64
66
|
|
|
65
67
|
let init = el => el.hasAttribute('state') || el.setAttribute('state', 'inactive');
|
|
68
|
+
let signal = this.#abort.signal;
|
|
66
69
|
|
|
67
70
|
for (let trigger of elements(this.#params.trigger)) {
|
|
68
71
|
own(trigger, this);
|
|
@@ -79,21 +82,32 @@ export default class Toggle {
|
|
|
79
82
|
if (id) this.#anchors.set(id, trigger);
|
|
80
83
|
|
|
81
84
|
if (this.#params.action == 'hover') {
|
|
82
|
-
trigger.addEventListener('mouseenter', () => this.activate(trigger));
|
|
83
|
-
trigger.addEventListener('mouseleave', () => this.deactivate(trigger));
|
|
85
|
+
trigger.addEventListener('mouseenter', () => this.activate(trigger), { signal });
|
|
86
|
+
trigger.addEventListener('mouseleave', () => this.deactivate(trigger), { signal });
|
|
84
87
|
} else
|
|
85
|
-
trigger.addEventListener(this.#params.action, () => this.toggle(trigger));
|
|
88
|
+
trigger.addEventListener(this.#params.action, () => this.toggle(trigger), { signal });
|
|
86
89
|
}
|
|
87
90
|
|
|
88
91
|
if (this.#params.anchor) {
|
|
89
92
|
this.#applyHash();
|
|
90
93
|
if (this.#params.keep_history)
|
|
91
|
-
window.addEventListener('hashchange', () => this.#applyHash());
|
|
94
|
+
window.addEventListener('hashchange', () => this.#applyHash(), { signal });
|
|
92
95
|
}
|
|
93
96
|
|
|
94
97
|
this.on_init(this.#params);
|
|
95
98
|
}
|
|
96
99
|
|
|
100
|
+
// Разобрать: снять обработчики (в том числе hashchange на window) и таймеры переходов.
|
|
101
|
+
// state на триггерах и целях остаётся как есть.
|
|
102
|
+
destroy() {
|
|
103
|
+
this.#abort.abort();
|
|
104
|
+
this.#pending.forEach(clearTimeout);
|
|
105
|
+
this.#pending.clear();
|
|
106
|
+
this.#triggers.forEach(trigger => disown(trigger, this, ['toggle', 'activate', 'deactivate']));
|
|
107
|
+
this.#triggers = [];
|
|
108
|
+
this.#anchors.clear();
|
|
109
|
+
}
|
|
110
|
+
|
|
97
111
|
#targets(trigger) {
|
|
98
112
|
let target = this.#params.target;
|
|
99
113
|
|
|
@@ -111,13 +125,15 @@ export default class Toggle {
|
|
|
111
125
|
return targets.length === 1 && targets[0].id ? targets[0].id : null;
|
|
112
126
|
}
|
|
113
127
|
|
|
128
|
+
// history.state сохраняется: его держат роутеры SPA (vue-router хранит в нём позицию
|
|
129
|
+
// и прокрутку), и затёртое состояние ломает им «назад».
|
|
114
130
|
#writeHash(id) {
|
|
115
131
|
let url = '#' + id;
|
|
116
132
|
if (location.hash === url) return;
|
|
117
133
|
|
|
118
134
|
this.#params.keep_history
|
|
119
|
-
? history.pushState(
|
|
120
|
-
: history.replaceState(
|
|
135
|
+
? history.pushState(history.state, '', url)
|
|
136
|
+
: history.replaceState(history.state, '', url);
|
|
121
137
|
}
|
|
122
138
|
|
|
123
139
|
#clearHash() {
|
|
@@ -125,8 +141,8 @@ export default class Toggle {
|
|
|
125
141
|
|
|
126
142
|
let base = location.pathname + location.search;
|
|
127
143
|
this.#params.keep_history
|
|
128
|
-
? history.pushState(
|
|
129
|
-
: history.replaceState(
|
|
144
|
+
? history.pushState(history.state, '', base)
|
|
145
|
+
: history.replaceState(history.state, '', base);
|
|
130
146
|
}
|
|
131
147
|
|
|
132
148
|
#applyHash() {
|
|
@@ -146,10 +162,11 @@ export default class Toggle {
|
|
|
146
162
|
els.forEach(el => el.setAttribute('state', process));
|
|
147
163
|
|
|
148
164
|
requestAnimationFrame(() => {
|
|
149
|
-
let timer = setTimeout(
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
);
|
|
165
|
+
let timer = setTimeout(() => {
|
|
166
|
+
this.#pending.delete(timer);
|
|
167
|
+
els.forEach(el => (el.setAttribute('state', final), after(el)));
|
|
168
|
+
}, this.#params.duration * 1000);
|
|
169
|
+
this.#pending.add(timer);
|
|
153
170
|
|
|
154
171
|
els.forEach(el => this.#timers.set(el, timer));
|
|
155
172
|
});
|
package/src/uploader/index.js
CHANGED
|
@@ -1,15 +1,27 @@
|
|
|
1
|
-
import { find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
export default class Uploader {
|
|
4
4
|
static find = find;
|
|
5
5
|
|
|
6
6
|
#targets = [];
|
|
7
|
+
#pickers = [];
|
|
8
|
+
#abort = new AbortController();
|
|
7
9
|
|
|
8
10
|
// Убрать все файлы из всех загрузчиков этого экземпляра.
|
|
9
11
|
clear() {
|
|
10
12
|
this.#targets.forEach(target => target.clear());
|
|
11
13
|
}
|
|
12
14
|
|
|
15
|
+
// Разобрать: снять обработчики и скрытое поле выбора файлов. Записи и поля с файлами
|
|
16
|
+
// остаются в разметке как есть.
|
|
17
|
+
destroy() {
|
|
18
|
+
this.#abort.abort();
|
|
19
|
+
this.#pickers.forEach(picker => picker.remove());
|
|
20
|
+
this.#targets.forEach(target => disown(target, this));
|
|
21
|
+
this.#pickers = [];
|
|
22
|
+
this.#targets = [];
|
|
23
|
+
}
|
|
24
|
+
|
|
13
25
|
static formatSize(size) {
|
|
14
26
|
const units = ['Б', 'КБ', 'МБ', 'ГБ', 'ТБ'];
|
|
15
27
|
|
|
@@ -70,6 +82,7 @@ export default class Uploader {
|
|
|
70
82
|
|
|
71
83
|
own(target, this);
|
|
72
84
|
this.#targets.push(target);
|
|
85
|
+
let signal = this.#abort.signal;
|
|
73
86
|
|
|
74
87
|
// События на корне загрузчика, всплывают: uploader:add, uploader:delete, uploader:error.
|
|
75
88
|
const emit = (name, detail, cancelable = false) => target.dispatchEvent(
|
|
@@ -155,7 +168,7 @@ export default class Uploader {
|
|
|
155
168
|
delete_button.forEach(b => b.addEventListener('click', () => {
|
|
156
169
|
if (target.before_file_delete(file) === false) return;
|
|
157
170
|
remove();
|
|
158
|
-
}));
|
|
171
|
+
}, { signal }));
|
|
159
172
|
|
|
160
173
|
let hidden = createFileInput();
|
|
161
174
|
|
|
@@ -208,7 +221,7 @@ export default class Uploader {
|
|
|
208
221
|
delete_button.forEach(b => b.addEventListener('click', () => {
|
|
209
222
|
if (target.before_file_delete(file) === false) return;
|
|
210
223
|
remove();
|
|
211
|
-
}));
|
|
224
|
+
}, { signal }));
|
|
212
225
|
|
|
213
226
|
input.remove();
|
|
214
227
|
} else
|
|
@@ -309,19 +322,19 @@ export default class Uploader {
|
|
|
309
322
|
target.before_drop();
|
|
310
323
|
wasDragOver = true;
|
|
311
324
|
}
|
|
312
|
-
}));
|
|
325
|
+
}, { signal }));
|
|
313
326
|
|
|
314
327
|
['dragleave', 'drop'].forEach(event_name => zone.addEventListener(event_name, e => {
|
|
315
328
|
e.preventDefault();
|
|
316
329
|
zone.removeAttribute('dragover');
|
|
317
330
|
wasDragOver = false;
|
|
318
|
-
}));
|
|
331
|
+
}, { signal }));
|
|
319
332
|
|
|
320
333
|
zone.addEventListener('drop', e => {
|
|
321
334
|
e.preventDefault();
|
|
322
335
|
target.on_drop();
|
|
323
336
|
handleFiles(e.dataTransfer.files);
|
|
324
|
-
});
|
|
337
|
+
}, { signal });
|
|
325
338
|
});
|
|
326
339
|
|
|
327
340
|
let picker = createFileInput();
|
|
@@ -330,11 +343,12 @@ export default class Uploader {
|
|
|
330
343
|
picker.addEventListener('change', () => {
|
|
331
344
|
handleFiles(picker.files);
|
|
332
345
|
picker.value = '';
|
|
333
|
-
});
|
|
346
|
+
}, { signal });
|
|
334
347
|
|
|
335
348
|
target.appendChild(picker);
|
|
349
|
+
this.#pickers.push(picker);
|
|
336
350
|
|
|
337
|
-
target.querySelectorAll('*[add-button]').forEach(b => b.addEventListener('click', () => picker.click()));
|
|
351
|
+
target.querySelectorAll('*[add-button]').forEach(b => b.addEventListener('click', () => picker.click(), { signal }));
|
|
338
352
|
|
|
339
353
|
target.on_init(params);
|
|
340
354
|
});
|
package/src/validator/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
export default class Validator {
|
|
4
4
|
|
|
@@ -7,6 +7,7 @@ export default class Validator {
|
|
|
7
7
|
#params = {};
|
|
8
8
|
#methods = {};
|
|
9
9
|
#elements = [];
|
|
10
|
+
#abort = new AbortController();
|
|
10
11
|
|
|
11
12
|
static find = find;
|
|
12
13
|
|
|
@@ -84,18 +85,34 @@ export default class Validator {
|
|
|
84
85
|
reset: () => this.reset(el)
|
|
85
86
|
});
|
|
86
87
|
|
|
88
|
+
let signal = this.#abort.signal;
|
|
89
|
+
|
|
87
90
|
for (let event of this.#params.events)
|
|
88
|
-
el.addEventListener(event, () => this.#check(el));
|
|
91
|
+
el.addEventListener(event, () => this.#check(el), { signal });
|
|
89
92
|
|
|
90
93
|
// Попытка отправить форму: браузер шлёт invalid каждому невалидному полю.
|
|
91
|
-
el.addEventListener('invalid', () => this.#check(el));
|
|
94
|
+
el.addEventListener('invalid', () => this.#check(el), { signal });
|
|
92
95
|
|
|
93
96
|
(el.form ?? el.closest('form'))
|
|
94
|
-
?.addEventListener('reset', () => queueMicrotask(() => this.reset(el)));
|
|
97
|
+
?.addEventListener('reset', () => queueMicrotask(() => this.reset(el)), { signal });
|
|
95
98
|
|
|
96
99
|
this.#sync(el);
|
|
97
100
|
}
|
|
98
101
|
|
|
102
|
+
// Разобрать: снять обработчики (в том числе reset на форме), state и customValidity
|
|
103
|
+
// со своих полей. На поле после этого можно поднять новый Validator.
|
|
104
|
+
destroy() {
|
|
105
|
+
this.#abort.abort();
|
|
106
|
+
|
|
107
|
+
for (let el of this.#elements) {
|
|
108
|
+
el.removeAttribute('state');
|
|
109
|
+
if (this.#native(el)) el.setCustomValidity('');
|
|
110
|
+
disown(el, this, ['check', 'reset']);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
this.#elements = [];
|
|
114
|
+
}
|
|
115
|
+
|
|
99
116
|
#check(el) {
|
|
100
117
|
if (this.before_check(el) === false) return el.getAttribute('state') != 'invalid';
|
|
101
118
|
|