@cat-of-summer/st-script 1.5.0 → 1.6.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/app/datepicker.min.js +3 -3
- package/dist/app/datepicker.min.js.map +3 -3
- package/dist/app/form.min.js +1 -1
- package/dist/app/form.min.js.map +3 -3
- package/dist/app.esm.min.js +1 -1
- package/dist/app.esm.min.js.map +3 -3
- package/dist/app.min.js +1 -1
- package/dist/app.min.js.map +3 -3
- package/dist/core.esm.min.js +1 -1
- package/dist/core.esm.min.js.map +3 -3
- package/dist/core.min.js +1 -1
- package/dist/core.min.js.map +3 -3
- package/dist/loader.esm.min.js +1 -1
- package/dist/loader.esm.min.js.map +3 -3
- package/dist/loader.min.js +1 -1
- package/dist/loader.min.js.map +3 -3
- 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 +3 -3
- package/dist/observer.min.js +1 -1
- package/dist/observer.min.js.map +3 -3
- package/dist/route.esm.min.js.map +2 -2
- package/dist/route.min.js +1 -1
- 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/shape.esm.min.js +1 -1
- package/dist/shape.esm.min.js.map +3 -3
- package/dist/shape.min.js +1 -1
- package/dist/shape.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 +3 -3
- package/dist/typograf.min.js +1 -1
- package/dist/typograf.min.js.map +3 -3
- 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/docs/README.md +59 -5
- package/docs/src/app/index.js.md +91 -7
- package/docs/src/core/index.js.md +52 -6
- package/docs/src/loader/index.js.md +2 -1
- package/docs/src/mask/index.js.md +2 -1
- package/docs/src/modal/index.js.md +14 -2
- package/docs/src/observer/index.js.md +2 -2
- package/docs/src/select/index.js.md +1 -1
- package/docs/src/shape/index.js.md +2 -1
- package/docs/src/toggle/index.js.md +53 -21
- package/docs/src/typograf/index.js.md +2 -2
- package/docs/src/uploader/index.js.md +2 -1
- package/docs/src/validator/index.js.md +2 -1
- package/package.json +1 -1
- package/src/_traits/hasInstanceSymbol.js +14 -1
- package/src/app/index.js +102 -15
- package/src/core/index.js +84 -14
- package/src/loader/index.js +13 -3
- package/src/mask/index.js +21 -2
- package/src/modal/index.js +16 -6
- package/src/observer/index.js +3 -3
- package/src/select/index.js +24 -4
- package/src/shape/index.js +9 -0
- package/src/toggle/index.js +85 -28
- package/src/typograf/index.js +3 -3
- package/src/uploader/index.js +32 -9
- package/src/validator/index.js +20 -2
package/src/core/index.js
CHANGED
|
@@ -101,22 +101,85 @@ export default class Core {
|
|
|
101
101
|
setTimeout(() => URL.revokeObjectURL(url));
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
+
static #form(form) {
|
|
105
|
+
return {
|
|
106
|
+
url: form.getAttribute('action') || '',
|
|
107
|
+
method: form.getAttribute('method') || '',
|
|
108
|
+
data: new FormData(form),
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
// Объект → пары имя/значение в PHP-нотации, как их собирает $_POST: вложенность и массивы
|
|
113
|
+
// объектов — с индексами (RULES[0][FROM]), массив примитивов — DRIVERS[]. undefined
|
|
114
|
+
// пропускается, null — пустая строка, булевы — по bool (['1', '0']), File и Blob как есть.
|
|
115
|
+
static #pairs(value, bool, name = '', out = []) {
|
|
116
|
+
let leaf = v => v === null || typeof v != 'object' || v instanceof Date || v instanceof Blob;
|
|
117
|
+
|
|
118
|
+
if (value === undefined) return out;
|
|
119
|
+
if (typeof value == 'boolean') out.push([name, bool[value ? 0 : 1]]);
|
|
120
|
+
else if (value === null) out.push([name, '']);
|
|
121
|
+
else if (value instanceof Date) out.push([name, value.toISOString()]);
|
|
122
|
+
else if (value instanceof Blob) out.push([name, value]);
|
|
123
|
+
else if (typeof value == 'object') {
|
|
124
|
+
let flat = Array.isArray(value) && value.every(leaf);
|
|
125
|
+
for (let [key, item] of Object.entries(value))
|
|
126
|
+
Core.#pairs(item, bool, name ? `${name}[${flat ? '' : key}]` : key, out);
|
|
127
|
+
} else out.push([name, String(value)]);
|
|
128
|
+
|
|
129
|
+
return out;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
// Настроенный fetch: база API, постоянные заголовки и поля (sessid) без глобального
|
|
133
|
+
// состояния — Loader и app/form, которые сами вызывают Core.fetch, их не получают.
|
|
134
|
+
static {
|
|
135
|
+
this.fetch.with = ({ base, ...defaults }) => params => {
|
|
136
|
+
if (params instanceof HTMLFormElement) params = Core.#form(params);
|
|
137
|
+
params = { ...params };
|
|
138
|
+
|
|
139
|
+
let { data, url } = params, extra = defaults.data;
|
|
140
|
+
if (data instanceof HTMLFormElement) {
|
|
141
|
+
url ||= data.getAttribute('action') || '';
|
|
142
|
+
params.method ||= data.getAttribute('method') || '';
|
|
143
|
+
data = new FormData(data);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
// Поля по умолчанию не перекрывают переданные.
|
|
147
|
+
if (extra != null) {
|
|
148
|
+
if (data == null) data = extra;
|
|
149
|
+
else if (data instanceof FormData) {
|
|
150
|
+
let copy = new FormData();
|
|
151
|
+
for (let [key, value] of data) copy.append(key, value);
|
|
152
|
+
for (let [key, value] of Core.#pairs(extra, params.form_bool ?? defaults.form_bool ?? ['1', '0']))
|
|
153
|
+
if (!data.has(key)) copy.append(key, value);
|
|
154
|
+
data = copy;
|
|
155
|
+
} else if (Object.getPrototypeOf(data) === Object.prototype)
|
|
156
|
+
data = { ...extra, ...data };
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
let merged = { ...defaults, ...params, data, url, headers: { ...defaults.headers, ...params.headers } };
|
|
160
|
+
if (base && url) merged.url = new URL(url, new URL(base, window.location.href)).href;
|
|
161
|
+
|
|
162
|
+
// Колбэки по умолчанию идут первыми, затем переданные.
|
|
163
|
+
for (let name of ['before_send', 'on_send', 'on_success', 'on_complete', 'on_failed'])
|
|
164
|
+
merged[name] = [defaults[name], params[name]];
|
|
165
|
+
|
|
166
|
+
return Core.fetch(merged);
|
|
167
|
+
};
|
|
168
|
+
}
|
|
169
|
+
|
|
104
170
|
static fetch(params) {
|
|
105
171
|
if (params instanceof HTMLFormElement)
|
|
106
|
-
params =
|
|
107
|
-
url: params.getAttribute('action') || '',
|
|
108
|
-
method: params.getAttribute('method') || '',
|
|
109
|
-
data: new FormData(params),
|
|
110
|
-
};
|
|
172
|
+
params = Core.#form(params);
|
|
111
173
|
|
|
112
|
-
params = { url: '', method: '', data: null, headers: {}, timeout: 0, response_type: '', ...params };
|
|
174
|
+
params = { url: '', method: '', data: null, headers: {}, timeout: 0, response_type: '', encode: '', form_bool: ['1', '0'], ...params };
|
|
113
175
|
|
|
176
|
+
// Колбэк — функция или список функций (так их передаёт Core.fetch.with).
|
|
114
177
|
const events = {
|
|
115
|
-
beforeSend: [params.before_send],
|
|
116
|
-
onSend: [params.on_send],
|
|
117
|
-
onSuccess: [params.on_success],
|
|
118
|
-
onComplete: [params.on_complete],
|
|
119
|
-
onFailed: [params.on_failed],
|
|
178
|
+
beforeSend: [params.before_send].flat(),
|
|
179
|
+
onSend: [params.on_send].flat(),
|
|
180
|
+
onSuccess: [params.on_success].flat(),
|
|
181
|
+
onComplete: [params.on_complete].flat(),
|
|
182
|
+
onFailed: [params.on_failed].flat(),
|
|
120
183
|
};
|
|
121
184
|
|
|
122
185
|
let request, resolve, reject, done = false;
|
|
@@ -140,7 +203,7 @@ export default class Core {
|
|
|
140
203
|
const parse = (xhr) => {
|
|
141
204
|
if (xhr.responseType) return xhr.response;
|
|
142
205
|
const type = xhr.getResponseHeader('Content-Type') || params.response_type || '';
|
|
143
|
-
if (
|
|
206
|
+
if (/[/+]json\b/i.test(type))
|
|
144
207
|
try { return JSON.parse(xhr.responseText) } catch (e) { return xhr.responseText }
|
|
145
208
|
if (type.includes('/xml'))
|
|
146
209
|
return new DOMParser().parseFromString(xhr.responseText, 'application/xml');
|
|
@@ -178,12 +241,19 @@ export default class Core {
|
|
|
178
241
|
method = method ? method.toUpperCase() : 'GET';
|
|
179
242
|
|
|
180
243
|
if (body && typeof body == 'object') {
|
|
244
|
+
// encode: 'form' — объект как форма с PHP-нотацией вложенности (Bitrix, $_POST).
|
|
245
|
+
const pairs = params.encode == 'form' && !(body instanceof FormData)
|
|
246
|
+
? Core.#pairs(body, params.form_bool) : null;
|
|
247
|
+
|
|
181
248
|
if (method == 'GET') {
|
|
182
|
-
const query = body instanceof FormData
|
|
183
|
-
? new URLSearchParams(body).toString()
|
|
249
|
+
const query = body instanceof FormData || pairs
|
|
250
|
+
? new URLSearchParams(pairs ?? body).toString()
|
|
184
251
|
: Object.entries(body).map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`).join('&');
|
|
185
252
|
if (query) url += (/\?.+=/.test(url) ? '&' : '?') + query;
|
|
186
253
|
body = null;
|
|
254
|
+
} else if (pairs) {
|
|
255
|
+
body = new FormData();
|
|
256
|
+
for (const [name, value] of pairs) body.append(name, value);
|
|
187
257
|
} else if (!(body instanceof FormData)) {
|
|
188
258
|
body = JSON.stringify(params.data);
|
|
189
259
|
if (!Object.keys(params.headers).some(h => h.toLowerCase() == 'content-type'))
|
package/src/loader/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { disown, elements, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
import Core from '../core/index.js';
|
|
3
3
|
|
|
4
4
|
export default class Loader {
|
|
@@ -60,12 +60,22 @@ export default class Loader {
|
|
|
60
60
|
|
|
61
61
|
this.#config.before_init.call(this, this.#config);
|
|
62
62
|
|
|
63
|
-
this.
|
|
64
|
-
if (this.target) own(this.target, this);
|
|
63
|
+
this.refresh();
|
|
65
64
|
|
|
66
65
|
this.#config.on_init.call(this, this.#config);
|
|
67
66
|
}
|
|
68
67
|
|
|
68
|
+
// Найти контейнер заново по target (селектор или функция): прежний перерисовал App,
|
|
69
|
+
// Vue и т. п. Загрузка идёт в контейнер, найденный последним.
|
|
70
|
+
refresh() {
|
|
71
|
+
let target = elements(this.#config.target)[0] ?? null;
|
|
72
|
+
if (target !== this.target) {
|
|
73
|
+
if (this.target) disown(this.target, this);
|
|
74
|
+
this.target = own(target, this);
|
|
75
|
+
}
|
|
76
|
+
return this;
|
|
77
|
+
}
|
|
78
|
+
|
|
69
79
|
// тип ответа из распарсенных Core данных
|
|
70
80
|
#type(response) {
|
|
71
81
|
if (response instanceof Document) return 'html';
|
package/src/mask/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { disown, element, elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, element, elements, expose, find, linked, own, rescannable } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
import { build, run, run_all, render, caret_for, cap, prepare } from './_engine.js';
|
|
3
3
|
import { spans, type_ahead, settle, step, in_range } from './_groups.js';
|
|
4
4
|
|
|
@@ -40,6 +40,8 @@ export default class Mask {
|
|
|
40
40
|
#states = new WeakMap();
|
|
41
41
|
#inputs = [];
|
|
42
42
|
#abort = new AbortController();
|
|
43
|
+
// Подписки каждого поля: refresh() снимает ушедшее из DOM.
|
|
44
|
+
#listeners = new WeakMap();
|
|
43
45
|
|
|
44
46
|
static find = find;
|
|
45
47
|
|
|
@@ -135,6 +137,22 @@ export default class Mask {
|
|
|
135
137
|
this.#inputs = [];
|
|
136
138
|
}
|
|
137
139
|
|
|
140
|
+
// Пересканировать target (селектор или функция): отпустить поля, ушедшие из DOM, и
|
|
141
|
+
// привязать новые. Для полей, которые перерисовывает App, Vue и т. п.
|
|
142
|
+
refresh() {
|
|
143
|
+
for (let input of this.#inputs.filter(input => !input.isConnected)) {
|
|
144
|
+
this.#listeners.get(input)?.abort();
|
|
145
|
+
this.#states.delete(input);
|
|
146
|
+
disown(input, this, ['raw', 'state', 'set', 'clear', 'set_mask']);
|
|
147
|
+
}
|
|
148
|
+
this.#inputs = this.#inputs.filter(input => input.isConnected);
|
|
149
|
+
|
|
150
|
+
if (rescannable(this.#params.target))
|
|
151
|
+
for (let input of elements(this.#params.target))
|
|
152
|
+
if (!find(input)) this.#bind(input);
|
|
153
|
+
return this;
|
|
154
|
+
}
|
|
155
|
+
|
|
138
156
|
#only() {
|
|
139
157
|
if (this.#inputs.length != 1)
|
|
140
158
|
throw new Error(`Mask: маска привязана к ${this.#inputs.length} полям — укажите поле явно`);
|
|
@@ -186,7 +204,8 @@ export default class Mask {
|
|
|
186
204
|
if (find(input)) throw new Error("Маска уже привязана к этому полю");
|
|
187
205
|
own(input, this);
|
|
188
206
|
|
|
189
|
-
let
|
|
207
|
+
let listeners = linked(this.#abort.signal), signal = listeners.signal;
|
|
208
|
+
this.#listeners.set(input, listeners);
|
|
190
209
|
// Что поле теряет при привязке — destroy() вернёт.
|
|
191
210
|
let original = {
|
|
192
211
|
type: input.type,
|
package/src/modal/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { closestInPath, disown, element, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { closestInPath, disown, element, elements, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
export default class Modal {
|
|
4
4
|
modal;
|
|
@@ -25,6 +25,8 @@ export default class Modal {
|
|
|
25
25
|
#teardown = null;
|
|
26
26
|
#home = null;
|
|
27
27
|
#destroyed = false;
|
|
28
|
+
// Триггеры с обработчиком клика: refresh() не привязывает их второй раз.
|
|
29
|
+
#triggers = new WeakSet();
|
|
28
30
|
|
|
29
31
|
static find = find;
|
|
30
32
|
|
|
@@ -116,7 +118,7 @@ export default class Modal {
|
|
|
116
118
|
let locked = false;
|
|
117
119
|
|
|
118
120
|
for (let [key, value] of Object.entries(params))
|
|
119
|
-
if (typeof value == "function") {
|
|
121
|
+
if (typeof value == "function" && key != 'trigger') {
|
|
120
122
|
this[key] = value.bind(this);
|
|
121
123
|
|
|
122
124
|
this.#methods[key] = value;
|
|
@@ -404,14 +406,22 @@ export default class Modal {
|
|
|
404
406
|
if (this.#params.close_by_esc)
|
|
405
407
|
Modal.#bind_esc();
|
|
406
408
|
|
|
407
|
-
|
|
408
|
-
document.querySelectorAll(this.#params.trigger).forEach(trigger => {
|
|
409
|
-
trigger.addEventListener('click', () => this.show(trigger), { signal });
|
|
410
|
-
});
|
|
409
|
+
this.refresh();
|
|
411
410
|
|
|
412
411
|
this.on_init(this.#params);
|
|
413
412
|
}
|
|
414
413
|
|
|
414
|
+
// Привязать триггеры, появившиеся после создания окна: их перерисовал App, Vue и т. п.
|
|
415
|
+
// Селектор и функция пересчитываются заново; ушедшие из DOM отпадают сами вместе с узлами.
|
|
416
|
+
refresh() {
|
|
417
|
+
for (let trigger of elements(this.#params.trigger)) {
|
|
418
|
+
if (this.#triggers.has(trigger)) continue;
|
|
419
|
+
this.#triggers.add(trigger);
|
|
420
|
+
trigger.addEventListener('click', () => this.show(trigger), { signal: this.#abort.signal });
|
|
421
|
+
}
|
|
422
|
+
return this;
|
|
423
|
+
}
|
|
424
|
+
|
|
415
425
|
// Разобрать окно: снять обработчики и таймеры, вернуть прокрутку страницы, если окно её
|
|
416
426
|
// заблокировало, контент — на место в документе, откуда его взяли; разметку окна убрать.
|
|
417
427
|
// Ждущие open() получают null. Нужен, когда контент живёт меньше страницы: компонент
|
package/src/observer/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { element, elements, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { element, elements, find, own, rescannable } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
import { parse_zone, measure, state_of, progress_of, intersects, steps } from './_engine.js';
|
|
3
3
|
|
|
4
4
|
const CALLBACKS = ['before_init', 'on_init', 'on_enter', 'on_leave', 'on_progress', 'on_cross', 'on_uncross'];
|
|
@@ -82,7 +82,7 @@ export default class Observer {
|
|
|
82
82
|
this.#ro = new ResizeObserver(this.#schedule);
|
|
83
83
|
this.#ro.observe(this.#root ?? document.documentElement);
|
|
84
84
|
|
|
85
|
-
if (this.#params.live &&
|
|
85
|
+
if (this.#params.live && rescannable(this.#params.target)) {
|
|
86
86
|
let pending = false;
|
|
87
87
|
this.#mo = new MutationObserver(records => {
|
|
88
88
|
if (pending || !records.some(r => [...r.addedNodes, ...r.removedNodes].some(n => n instanceof Element)))
|
|
@@ -120,7 +120,7 @@ export default class Observer {
|
|
|
120
120
|
// Отпущенные через once / unobserve при пересканировании не берутся заново
|
|
121
121
|
refresh() {
|
|
122
122
|
for (let el of this.#states.keys()) if (!el.isConnected) this.#release(el);
|
|
123
|
-
if (
|
|
123
|
+
if (rescannable(this.#params.target))
|
|
124
124
|
for (let el of elements(this.#params.target)) if (!this.#done.has(el)) this.#bind(el);
|
|
125
125
|
this.#goals = elements(this.#params.cross);
|
|
126
126
|
for (let st of this.#states.values()) st.dirty = true;
|
package/src/select/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { disown, elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, elements, expose, find, linked, own, rescannable } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
export default class Select {
|
|
@@ -9,6 +9,8 @@ export default class Select {
|
|
|
9
9
|
// select → его контейнер и исходный style: для refresh() и destroy().
|
|
10
10
|
#built = new Map();
|
|
11
11
|
#abort = new AbortController();
|
|
12
|
+
// Подписки каждого select (и клик мимо на document): refresh() снимает ушедший из DOM.
|
|
13
|
+
#listeners = new WeakMap();
|
|
12
14
|
|
|
13
15
|
static find = find;
|
|
14
16
|
|
|
@@ -92,7 +94,8 @@ export default class Select {
|
|
|
92
94
|
toggle: () => this.toggle(select)
|
|
93
95
|
});
|
|
94
96
|
|
|
95
|
-
let
|
|
97
|
+
let listeners = linked(this.#abort.signal), signal = listeners.signal;
|
|
98
|
+
this.#listeners.set(select, listeners);
|
|
96
99
|
|
|
97
100
|
let container = document.createElement('select-container');
|
|
98
101
|
own(container, this);
|
|
@@ -155,8 +158,25 @@ export default class Select {
|
|
|
155
158
|
}
|
|
156
159
|
|
|
157
160
|
// Пересобрать пункты и текст триггера по нативному select: после смены <option> или
|
|
158
|
-
// значения из кода (select.value = …, v-model). Без аргумента — все свои select
|
|
159
|
-
|
|
161
|
+
// значения из кода (select.value = …, v-model). Без аргумента — все свои select, а ещё
|
|
162
|
+
// отпустить ушедшие из DOM и поднять новые по target (селектор или функция): их
|
|
163
|
+
// перерисовал App, Vue и т. п.
|
|
164
|
+
refresh(target) {
|
|
165
|
+
if (target === undefined) {
|
|
166
|
+
for (let [select, { container }] of this.#built)
|
|
167
|
+
if (!select.isConnected) {
|
|
168
|
+
this.#listeners.get(select)?.abort();
|
|
169
|
+
clearTimeout(this.#timers.get(container));
|
|
170
|
+
this.#built.delete(select);
|
|
171
|
+
disown(select, this, ['open', 'close', 'toggle']);
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
target = [...this.#built.keys()];
|
|
175
|
+
if (rescannable(this.#params.target))
|
|
176
|
+
for (let select of elements(this.#params.target))
|
|
177
|
+
if (!find(select)) this.#build(select);
|
|
178
|
+
}
|
|
179
|
+
|
|
160
180
|
for (let select of elements(target)) {
|
|
161
181
|
let built = this.#built.get(select);
|
|
162
182
|
if (!built) continue;
|
package/src/shape/index.js
CHANGED
|
@@ -137,8 +137,17 @@ export default class Shape {
|
|
|
137
137
|
}
|
|
138
138
|
|
|
139
139
|
// Перечитать атрибуты и перерисовать; новые элементы под target — взять под управление.
|
|
140
|
+
// Элементы, ушедшие из DOM (их перерисовал App, Vue и т. п.), отпускаются.
|
|
140
141
|
refresh(target = this.#params.target) {
|
|
142
|
+
for (let el of this.elements.filter(el => !el.isConnected)) {
|
|
143
|
+
this.#ro.unobserve(el);
|
|
144
|
+
this.#pending.delete(el);
|
|
145
|
+
this.#shapes.delete(el);
|
|
146
|
+
disown(el, this);
|
|
147
|
+
}
|
|
148
|
+
|
|
141
149
|
for (let el of elements(target)) {
|
|
150
|
+
if (!el.isConnected) continue;
|
|
142
151
|
if (!this.#shapes.has(el)) { this.#bind(el); continue; }
|
|
143
152
|
this.#read(el);
|
|
144
153
|
this.#draw(el);
|
package/src/toggle/index.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { disown, element, elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, element, elements, expose, find, own, rescannable } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
const active = el => ['active', 'activating'].includes(el.getAttribute('state'));
|
|
5
|
+
const init = el => el.hasAttribute('state') || el.setAttribute('state', 'inactive');
|
|
5
6
|
|
|
6
7
|
export default class Toggle {
|
|
7
8
|
|
|
@@ -11,6 +12,8 @@ export default class Toggle {
|
|
|
11
12
|
#pending = new Set();
|
|
12
13
|
#anchors = new Map();
|
|
13
14
|
#triggers = [];
|
|
15
|
+
// Слушатели каждого триггера: refresh() снимает ушедший из DOM, не трогая остальных.
|
|
16
|
+
#listeners = new Map();
|
|
14
17
|
#last = null;
|
|
15
18
|
#abort = new AbortController();
|
|
16
19
|
// Индикатор и триггер, за которым он следует (последний начавший активацию).
|
|
@@ -64,10 +67,10 @@ export default class Toggle {
|
|
|
64
67
|
...params
|
|
65
68
|
};
|
|
66
69
|
|
|
67
|
-
if (params.keep_history) params.anchor
|
|
70
|
+
if (params.keep_history) params.anchor ||= true;
|
|
68
71
|
|
|
69
72
|
for (let [key, value] of Object.entries(params))
|
|
70
|
-
if (typeof value == "function" && key != 'target' && key != 'indicator') {
|
|
73
|
+
if (typeof value == "function" && key != 'trigger' && key != 'target' && key != 'indicator') {
|
|
71
74
|
this[key] = value.bind(this);
|
|
72
75
|
|
|
73
76
|
this.#methods[key] = value;
|
|
@@ -76,29 +79,10 @@ export default class Toggle {
|
|
|
76
79
|
|
|
77
80
|
this.before_init(this.#params);
|
|
78
81
|
|
|
79
|
-
let init = el => el.hasAttribute('state') || el.setAttribute('state', 'inactive');
|
|
80
82
|
let signal = this.#abort.signal;
|
|
81
83
|
|
|
82
|
-
for (let trigger of elements(this.#params.trigger))
|
|
83
|
-
|
|
84
|
-
this.#triggers.push(trigger);
|
|
85
|
-
expose(trigger, {
|
|
86
|
-
toggle: () => this.toggle(trigger),
|
|
87
|
-
activate: () => this.activate(trigger),
|
|
88
|
-
deactivate: () => this.deactivate(trigger)
|
|
89
|
-
});
|
|
90
|
-
init(trigger);
|
|
91
|
-
this.#targets(trigger).forEach(init);
|
|
92
|
-
|
|
93
|
-
let id = this.#anchorId(trigger);
|
|
94
|
-
if (id) this.#anchors.set(id, trigger);
|
|
95
|
-
|
|
96
|
-
if (this.#params.action == 'hover') {
|
|
97
|
-
trigger.addEventListener('mouseenter', () => this.activate(trigger), { signal });
|
|
98
|
-
trigger.addEventListener('mouseleave', () => this.deactivate(trigger), { signal });
|
|
99
|
-
} else
|
|
100
|
-
trigger.addEventListener(this.#params.action, () => this.toggle(trigger), { signal });
|
|
101
|
-
}
|
|
84
|
+
for (let trigger of elements(this.#params.trigger))
|
|
85
|
+
this.#bind(trigger);
|
|
102
86
|
|
|
103
87
|
let indicator = this.#params.indicator;
|
|
104
88
|
this.#indicator = element(typeof indicator == 'function' ? indicator(this) : indicator) ?? null;
|
|
@@ -129,10 +113,69 @@ export default class Toggle {
|
|
|
129
113
|
this.on_init(this.#params);
|
|
130
114
|
}
|
|
131
115
|
|
|
116
|
+
#bind(trigger) {
|
|
117
|
+
own(trigger, this);
|
|
118
|
+
this.#triggers.push(trigger);
|
|
119
|
+
expose(trigger, {
|
|
120
|
+
toggle: () => this.toggle(trigger),
|
|
121
|
+
activate: () => this.activate(trigger),
|
|
122
|
+
deactivate: () => this.deactivate(trigger)
|
|
123
|
+
});
|
|
124
|
+
init(trigger);
|
|
125
|
+
this.#targets(trigger).forEach(init);
|
|
126
|
+
this.#aria(trigger, active(trigger));
|
|
127
|
+
|
|
128
|
+
let id = this.#anchorId(trigger);
|
|
129
|
+
if (id) this.#anchors.set(id, trigger);
|
|
130
|
+
|
|
131
|
+
let listeners = new AbortController(), signal = listeners.signal;
|
|
132
|
+
this.#listeners.set(trigger, listeners);
|
|
133
|
+
|
|
134
|
+
if (this.#params.action == 'hover') {
|
|
135
|
+
trigger.addEventListener('mouseenter', () => this.activate(trigger), { signal });
|
|
136
|
+
trigger.addEventListener('mouseleave', () => this.deactivate(trigger), { signal });
|
|
137
|
+
} else
|
|
138
|
+
trigger.addEventListener(this.#params.action, () => this.toggle(trigger), { signal });
|
|
139
|
+
|
|
140
|
+
this.#resize?.observe(trigger);
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
#unbind(trigger) {
|
|
144
|
+
this.#listeners.get(trigger)?.abort();
|
|
145
|
+
this.#listeners.delete(trigger);
|
|
146
|
+
this.#resize?.unobserve(trigger);
|
|
147
|
+
disown(trigger, this, ['toggle', 'activate', 'deactivate']);
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
// Пересканировать trigger (селектор или функция): ушедшие из DOM триггеры снять, новые
|
|
151
|
+
// привязать. Нужен, когда триггеры перерисовывает App, Vue и т. п.: о них Toggle не знает.
|
|
152
|
+
refresh() {
|
|
153
|
+
let gone = this.#triggers.filter(t => !t.isConnected);
|
|
154
|
+
gone.forEach(t => this.#unbind(t));
|
|
155
|
+
this.#triggers = this.#triggers.filter(t => t.isConnected);
|
|
156
|
+
for (let [id, t] of this.#anchors) if (!t.isConnected) this.#anchors.delete(id);
|
|
157
|
+
if (gone.includes(this.#last)) this.#last = null;
|
|
158
|
+
|
|
159
|
+
if (rescannable(this.#params.trigger))
|
|
160
|
+
for (let trigger of elements(this.#params.trigger))
|
|
161
|
+
if (!this.#triggers.includes(trigger)) this.#bind(trigger);
|
|
162
|
+
|
|
163
|
+
// Вкладки отрисовались после создания Toggle: таб из ссылки выбирается сейчас.
|
|
164
|
+
let linked = this.#params.anchor && this.#anchors.get(location.hash.slice(1));
|
|
165
|
+
if (linked && !active(linked)) this.#act(linked, true, true);
|
|
166
|
+
|
|
167
|
+
if (!this.#current?.isConnected)
|
|
168
|
+
this.#current = this.#triggers.filter(active).at(-1) ?? null;
|
|
169
|
+
this.#indicate(true);
|
|
170
|
+
return this;
|
|
171
|
+
}
|
|
172
|
+
|
|
132
173
|
// Разобрать: снять обработчики (в том числе hashchange на window), таймеры переходов и
|
|
133
174
|
// ResizeObserver. state на триггерах и целях и переменные индикатора остаются как есть.
|
|
134
175
|
destroy() {
|
|
135
176
|
this.#abort.abort();
|
|
177
|
+
this.#listeners.forEach(listeners => listeners.abort());
|
|
178
|
+
this.#listeners.clear();
|
|
136
179
|
this.#resize?.disconnect();
|
|
137
180
|
this.#resize = this.#deferred = this.#indicator = this.#current = null;
|
|
138
181
|
this.#pending.forEach(clearTimeout);
|
|
@@ -151,12 +194,24 @@ export default class Toggle {
|
|
|
151
194
|
return elements(target);
|
|
152
195
|
}
|
|
153
196
|
|
|
197
|
+
// anchor: true или 'trigger' — в hash id триггера, иначе id единственной цели;
|
|
198
|
+
// 'target' — наоборот: ссылка ведёт на панель, а не на кнопку вкладки.
|
|
154
199
|
#anchorId(trigger) {
|
|
155
|
-
|
|
156
|
-
if (
|
|
200
|
+
let anchor = this.#params.anchor;
|
|
201
|
+
if (!anchor) return null;
|
|
157
202
|
|
|
158
|
-
let
|
|
159
|
-
|
|
203
|
+
let target = () => {
|
|
204
|
+
let targets = this.#targets(trigger);
|
|
205
|
+
return targets.length === 1 && targets[0].id || null;
|
|
206
|
+
};
|
|
207
|
+
return anchor == 'target' ? target() || trigger.id || null : trigger.id || target();
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
// role="tab" — aria-selected; aria-expanded, заданный в разметке (аккордеон), — тоже.
|
|
211
|
+
// tabindex не трогается: без навигации стрелками неактивные вкладки ушли бы из Tab-обхода.
|
|
212
|
+
#aria(trigger, on) {
|
|
213
|
+
if (trigger.getAttribute('role') == 'tab') trigger.setAttribute('aria-selected', on);
|
|
214
|
+
if (trigger.hasAttribute('aria-expanded')) trigger.setAttribute('aria-expanded', on);
|
|
160
215
|
}
|
|
161
216
|
|
|
162
217
|
// history.state сохраняется: его держат роутеры SPA (vue-router хранит в нём позицию
|
|
@@ -325,6 +380,8 @@ export default class Toggle {
|
|
|
325
380
|
else if (moved)
|
|
326
381
|
this.#current = this.#triggers.filter(t => t !== trigger && active(t)).at(-1) ?? null;
|
|
327
382
|
|
|
383
|
+
this.#aria(trigger, on);
|
|
384
|
+
|
|
328
385
|
if (on && this.#params.group)
|
|
329
386
|
this.#triggers
|
|
330
387
|
.filter(t => t !== trigger && active(t))
|
package/src/typograf/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { element, elements, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { element, elements, find, own, rescannable } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
import { RULES, glue, text } from './_engine.js';
|
|
3
3
|
|
|
4
4
|
const CALLBACKS = ['before_init', 'on_init', 'on_apply'];
|
|
@@ -77,7 +77,7 @@ export default class Typograf {
|
|
|
77
77
|
}, { root, rootMargin: '100%' });
|
|
78
78
|
|
|
79
79
|
this.#mo = new MutationObserver(records => this.#mutated(records));
|
|
80
|
-
if (this.#params.live &&
|
|
80
|
+
if (this.#params.live && rescannable(this.#params.target))
|
|
81
81
|
this.#mo.observe(document.documentElement, { childList: true, subtree: true, characterData: true });
|
|
82
82
|
|
|
83
83
|
for (let el of elements(this.#params.target)) this.#bind(el);
|
|
@@ -122,7 +122,7 @@ export default class Typograf {
|
|
|
122
122
|
|
|
123
123
|
#scan() {
|
|
124
124
|
for (let el of this.#states.keys()) if (!el.isConnected) this.#release(el);
|
|
125
|
-
if (
|
|
125
|
+
if (rescannable(this.#params.target))
|
|
126
126
|
for (let el of elements(this.#params.target)) if (!this.#done.has(el)) this.#bind(el);
|
|
127
127
|
}
|
|
128
128
|
|
package/src/uploader/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { disown, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { disown, elements, find, linked, own, rescannable } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
export default class Uploader {
|
|
4
4
|
static find = find;
|
|
@@ -6,6 +6,10 @@ export default class Uploader {
|
|
|
6
6
|
#targets = [];
|
|
7
7
|
#pickers = [];
|
|
8
8
|
#abort = new AbortController();
|
|
9
|
+
// Корень → его подписки и поле выбора: refresh() отпускает корень, ушедший из DOM.
|
|
10
|
+
#bound = new WeakMap();
|
|
11
|
+
#target = null;
|
|
12
|
+
#setup = null;
|
|
9
13
|
|
|
10
14
|
// Убрать все файлы из всех загрузчиков этого экземпляра.
|
|
11
15
|
clear() {
|
|
@@ -22,6 +26,24 @@ export default class Uploader {
|
|
|
22
26
|
this.#targets = [];
|
|
23
27
|
}
|
|
24
28
|
|
|
29
|
+
// Пересканировать target (селектор или функция): отпустить корни, ушедшие из DOM, и
|
|
30
|
+
// поднять новые — их перерисовал App, Vue и т. п. Внутренность корня (записи, кнопки)
|
|
31
|
+
// ведёт сам Uploader, перерисовывать её снаружи нельзя.
|
|
32
|
+
refresh() {
|
|
33
|
+
for (let target of this.#targets.filter(target => !target.isConnected)) {
|
|
34
|
+
let { listeners, picker } = this.#bound.get(target);
|
|
35
|
+
listeners.abort();
|
|
36
|
+
this.#pickers = this.#pickers.filter(p => p !== picker);
|
|
37
|
+
disown(target, this);
|
|
38
|
+
}
|
|
39
|
+
this.#targets = this.#targets.filter(target => target.isConnected);
|
|
40
|
+
|
|
41
|
+
if (rescannable(this.#target))
|
|
42
|
+
for (let target of elements(this.#target))
|
|
43
|
+
if (!find(target)) this.#setup(target);
|
|
44
|
+
return this;
|
|
45
|
+
}
|
|
46
|
+
|
|
25
47
|
static formatSize(size) {
|
|
26
48
|
const units = ['Б', 'КБ', 'МБ', 'ГБ', 'ТБ'];
|
|
27
49
|
|
|
@@ -71,18 +93,16 @@ export default class Uploader {
|
|
|
71
93
|
params.input_name = input_name + (params.limits.files != 1 ? '[]' : '');
|
|
72
94
|
params.delete_name = (params.delete_name ? params.delete_name.replace(/\[\]$/, '') : input_name + '_to_delete') + (params.limits.files != 1 ? '[]' : '');
|
|
73
95
|
|
|
74
|
-
// target — селектор, элемент или список элементов.
|
|
75
|
-
|
|
76
|
-
? document.querySelectorAll(params.target)
|
|
77
|
-
: params.target instanceof Element ? [params.target] : Array.from(params.target ?? []);
|
|
96
|
+
// target — селектор, функция, элемент или список элементов.
|
|
97
|
+
this.#target = params.target;
|
|
78
98
|
|
|
79
|
-
|
|
99
|
+
this.#setup = target => {
|
|
80
100
|
if (find(target))
|
|
81
101
|
throw new Error("Already inited");
|
|
82
102
|
|
|
83
103
|
own(target, this);
|
|
84
104
|
this.#targets.push(target);
|
|
85
|
-
let
|
|
105
|
+
let listeners = linked(this.#abort.signal), signal = listeners.signal;
|
|
86
106
|
|
|
87
107
|
// События на корне загрузчика, всплывают: uploader:add, uploader:delete, uploader:error.
|
|
88
108
|
const emit = (name, detail, cancelable = false) => target.dispatchEvent(
|
|
@@ -90,7 +110,7 @@ export default class Uploader {
|
|
|
90
110
|
);
|
|
91
111
|
|
|
92
112
|
for (let [key, value] of Object.entries(params))
|
|
93
|
-
if (typeof value == "function")
|
|
113
|
+
if (typeof value == "function" && key != 'target')
|
|
94
114
|
target[key] = value.bind(target);
|
|
95
115
|
|
|
96
116
|
target.before_init(params);
|
|
@@ -347,10 +367,13 @@ export default class Uploader {
|
|
|
347
367
|
|
|
348
368
|
target.appendChild(picker);
|
|
349
369
|
this.#pickers.push(picker);
|
|
370
|
+
this.#bound.set(target, { listeners, picker });
|
|
350
371
|
|
|
351
372
|
target.querySelectorAll('*[add-button]').forEach(b => b.addEventListener('click', () => picker.click(), { signal }));
|
|
352
373
|
|
|
353
374
|
target.on_init(params);
|
|
354
|
-
}
|
|
375
|
+
};
|
|
376
|
+
|
|
377
|
+
elements(params.target).forEach(this.#setup);
|
|
355
378
|
}
|
|
356
379
|
}
|