@cat-of-summer/st-script 1.3.1 → 1.3.2
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/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/package.json +1 -1
- package/src/mask/_engine.js +32 -8
- package/src/mask/index.js +105 -39
package/package.json
CHANGED
package/src/mask/_engine.js
CHANGED
|
@@ -212,6 +212,12 @@ function stop(s) {
|
|
|
212
212
|
if (s.stop_fmt < 0) s.stop_fmt = s.formatted.length + s.tail.length;
|
|
213
213
|
}
|
|
214
214
|
|
|
215
|
+
// Символ входа отброшен: не подошёл узлу, на котором стоит разбор. slot - номер слота, если отказал слот
|
|
216
|
+
function skip(s, slot = null) {
|
|
217
|
+
s.rejected.push({ at: s.ip, slot });
|
|
218
|
+
s.ip++;
|
|
219
|
+
}
|
|
220
|
+
|
|
215
221
|
function exhaust(s) {
|
|
216
222
|
s.complete = false;
|
|
217
223
|
s.done = true;
|
|
@@ -262,7 +268,7 @@ function walk(nodes, s, def) {
|
|
|
262
268
|
if (def.before_slot && !no_fix) {
|
|
263
269
|
let out = def.before_slot(s.ctx?.input,
|
|
264
270
|
{ char: c, slot: ordinal, cells: s.cells, raw: s.raw, node });
|
|
265
|
-
if (out === false) { s
|
|
271
|
+
if (out === false) { skip(s, ordinal); continue; }
|
|
266
272
|
if (typeof out == 'string' && out !== c) {
|
|
267
273
|
s.input.splice(s.ip, 1, ...out);
|
|
268
274
|
no_fix = true;
|
|
@@ -270,10 +276,10 @@ function walk(nodes, s, def) {
|
|
|
270
276
|
}
|
|
271
277
|
}
|
|
272
278
|
accept(s, c, c, 'char', ordinal, group);
|
|
273
|
-
} else if (c === fill) {
|
|
279
|
+
} else if (c === fill && s.ctx?.holes !== false) {
|
|
274
280
|
s.complete = false;
|
|
275
281
|
accept(s, c, c, 'hole', ordinal, group);
|
|
276
|
-
} else { s
|
|
282
|
+
} else { skip(s, ordinal); continue; }
|
|
277
283
|
s.ip++;
|
|
278
284
|
s.consumed++;
|
|
279
285
|
break;
|
|
@@ -291,7 +297,7 @@ function walk(nodes, s, def) {
|
|
|
291
297
|
s.ip += node.to.length, s.consumed += node.to.length;
|
|
292
298
|
else if (s.input[s.ip] === node.from)
|
|
293
299
|
s.ip++, s.consumed++;
|
|
294
|
-
else { s
|
|
300
|
+
else { skip(s); continue; }
|
|
295
301
|
if (!s.diverged) s.lead++;
|
|
296
302
|
accept(s, node.to, node.to);
|
|
297
303
|
break;
|
|
@@ -313,7 +319,7 @@ function walk(nodes, s, def) {
|
|
|
313
319
|
}
|
|
314
320
|
if (!consumes(node.children, s.input[s.ip], s)) {
|
|
315
321
|
if (!node.greedy && count >= node.min) break;
|
|
316
|
-
s
|
|
322
|
+
skip(s);
|
|
317
323
|
continue;
|
|
318
324
|
}
|
|
319
325
|
let before = s.ip;
|
|
@@ -337,7 +343,7 @@ function walk(nodes, s, def) {
|
|
|
337
343
|
break;
|
|
338
344
|
}
|
|
339
345
|
if (consumes(rest, c, s)) break;
|
|
340
|
-
s
|
|
346
|
+
skip(s);
|
|
341
347
|
}
|
|
342
348
|
if (!entered && s.ip >= s.input.length) stop(s);
|
|
343
349
|
}
|
|
@@ -418,20 +424,38 @@ export function run(def, input_string, ctx) {
|
|
|
418
424
|
ph_slots: [], units: [], cells: [],
|
|
419
425
|
groups: Object.fromEntries((def.names ?? []).map(name => [name, ''])), local: {},
|
|
420
426
|
consumed: 0, lead: 0, diverged: false, ordinal: 0,
|
|
421
|
-
complete: true, done: false, stop_fmt: -1
|
|
427
|
+
complete: true, done: false, stop_fmt: -1, rejected: []
|
|
422
428
|
};
|
|
423
429
|
|
|
424
430
|
walk(def.nodes, s, def);
|
|
425
431
|
if (s.stop_fmt < 0) s.stop_fmt = s.formatted.length;
|
|
426
432
|
if (def.valid) s.complete = s.complete && def.valid.test(s.raw);
|
|
427
433
|
|
|
434
|
+
// Почему отброшен символ: 'full' - шаблон кончился раньше ввода, 'literal' - разделитель
|
|
435
|
+
// шаблона не на своём месте (пробел, дефис), 'slot' - не подошёл позиции
|
|
436
|
+
let seps = def.seps ??= separators(def.nodes);
|
|
437
|
+
let rejected = s.rejected.map(({ at, slot }) =>
|
|
438
|
+
({ at, char: s.input[at], slot, reason: seps.has(s.input[at]) ? 'literal' : 'slot' }));
|
|
439
|
+
for (let at = s.ip; at < s.input.length; at++)
|
|
440
|
+
rejected.push({ at, char: s.input[at], slot: null, reason: 'full' });
|
|
441
|
+
|
|
428
442
|
return {
|
|
429
443
|
stream: s.stream, raw: s.raw, formatted: s.formatted, tail: s.tail,
|
|
430
444
|
ph: s.ph, ph_slots: s.ph_slots, complete: s.complete, consumed: s.consumed,
|
|
431
|
-
lead: s.lead, units: s.units, cells: s.cells, groups: s.groups, stop_fmt: s.stop_fmt
|
|
445
|
+
lead: s.lead, units: s.units, cells: s.cells, groups: s.groups, stop_fmt: s.stop_fmt,
|
|
446
|
+
rejected
|
|
432
447
|
};
|
|
433
448
|
}
|
|
434
449
|
|
|
450
|
+
// Разделители шаблона - литералы, не входящие в код маски (SIGNIFICANT)
|
|
451
|
+
function separators(nodes, set = new Set()) {
|
|
452
|
+
for (let node of nodes) {
|
|
453
|
+
if (node.type == 'literal' && !SIGNIFICANT.test(node.char)) set.add(node.char);
|
|
454
|
+
if (node.children) separators(node.children, set);
|
|
455
|
+
}
|
|
456
|
+
return set;
|
|
457
|
+
}
|
|
458
|
+
|
|
435
459
|
export function run_all(defs, input_string, ctx = {}) {
|
|
436
460
|
let resolved = [];
|
|
437
461
|
ctx = { ...ctx, stream: String(input_string ?? '') };
|
package/src/mask/index.js
CHANGED
|
@@ -3,7 +3,8 @@ import { build, run, run_all, render, caret_for, cap, prepare } from './_engine.
|
|
|
3
3
|
import { spans, type_ahead, settle, step, in_range } from './_groups.js';
|
|
4
4
|
|
|
5
5
|
const CALLBACKS = ['before_init', 'on_init', 'before_char', 'before_slot', 'before_input',
|
|
6
|
-
'on_input', 'before_paste', 'on_paste', 'on_accept', 'on_complete', 'on_incomplete', 'on_mask_change'
|
|
6
|
+
'on_input', 'before_paste', 'on_paste', 'on_accept', 'on_complete', 'on_incomplete', 'on_mask_change',
|
|
7
|
+
'on_reject'];
|
|
7
8
|
|
|
8
9
|
export default class Mask {
|
|
9
10
|
|
|
@@ -105,8 +106,11 @@ export default class Mask {
|
|
|
105
106
|
if (arguments.length < 2) [target, value] = [this.#only(), target];
|
|
106
107
|
|
|
107
108
|
for (let input of elements(target))
|
|
108
|
-
if (this.#states.has(input))
|
|
109
|
+
if (this.#states.has(input)) {
|
|
110
|
+
let was = input.value;
|
|
109
111
|
this.#reconcile(input, String(value ?? ''), { prefix: String(value ?? '') });
|
|
112
|
+
this.#emit(input, was, 'insertReplacementText');
|
|
113
|
+
}
|
|
110
114
|
}
|
|
111
115
|
|
|
112
116
|
clear(target = this.#inputs) { this.set(target, ''); }
|
|
@@ -147,10 +151,20 @@ export default class Mask {
|
|
|
147
151
|
if (!st) continue;
|
|
148
152
|
st.defs = defs;
|
|
149
153
|
st.seg = null;
|
|
154
|
+
let was = input.value;
|
|
150
155
|
this.#reconcile(input, st.stream, {});
|
|
156
|
+
this.#emit(input, was, 'insertReplacementText');
|
|
151
157
|
}
|
|
152
158
|
}
|
|
153
159
|
|
|
160
|
+
// Правка поменяла значение - всплывающий input для внешних слушателей (свой слушатель его
|
|
161
|
+
// пропускает по handled: значение уже приведено)
|
|
162
|
+
#emit(input, was, inputType, data = null) {
|
|
163
|
+
if (input.value === was) return;
|
|
164
|
+
this.#states.get(input).handled = true;
|
|
165
|
+
input.dispatchEvent(new InputEvent('input', { bubbles: true, inputType, data }));
|
|
166
|
+
}
|
|
167
|
+
|
|
154
168
|
#base() {
|
|
155
169
|
return {
|
|
156
170
|
filler: this.#params.filler,
|
|
@@ -222,8 +236,8 @@ export default class Mask {
|
|
|
222
236
|
input.addEventListener('beforeinput', event => this.#before(input, event), { signal });
|
|
223
237
|
|
|
224
238
|
let edits = [this.#params.edit, ...Object.values(this.#params.groups ?? {}).map(g => g?.edit)];
|
|
225
|
-
if (edits.includes('whole') && (this.#params.placeholder != 'always' || defs.some(d => !d.fixed && !d.fn)))
|
|
226
|
-
console.warn("Mask: edit: 'whole' работает с фиксированной маской и placeholder: 'always' - иначе ведёт себя как 'end'", input);
|
|
239
|
+
if (edits.includes('whole') && (this.#params.placeholder != 'always' || defs.length > 1 || defs.some(d => !d.fixed && !d.fn)))
|
|
240
|
+
console.warn("Mask: edit: 'whole' работает с одной фиксированной маской и placeholder: 'always' - иначе ведёт себя как 'end'", input);
|
|
227
241
|
|
|
228
242
|
if (edits.some(edit => edit && edit != 'free')) {
|
|
229
243
|
let pin = event => this.#pin(input, event.type == 'click');
|
|
@@ -278,10 +292,9 @@ export default class Mask {
|
|
|
278
292
|
start = end = this.#tail_of(input, st, g);
|
|
279
293
|
|
|
280
294
|
event.preventDefault();
|
|
281
|
-
st.handled = true;
|
|
282
295
|
|
|
283
296
|
let is_delete = type.startsWith('delete');
|
|
284
|
-
let insert = '';
|
|
297
|
+
let insert = '', rejected = [];
|
|
285
298
|
|
|
286
299
|
if (!is_delete) {
|
|
287
300
|
if (type == 'insertLineBreak' || type == 'insertParagraph') return;
|
|
@@ -294,8 +307,11 @@ export default class Mask {
|
|
|
294
307
|
}
|
|
295
308
|
|
|
296
309
|
if (st.numeric) {
|
|
297
|
-
let sign = st.defs.some(d => d.numeral?.sign);
|
|
298
|
-
|
|
310
|
+
let sign = st.defs.some(d => d.numeral?.sign), digits = '';
|
|
311
|
+
for (let char of insert)
|
|
312
|
+
if (char >= '0' && char <= '9' || sign && char == '-') digits += char;
|
|
313
|
+
else rejected.push({ char, slot: null, reason: 'slot' });
|
|
314
|
+
insert = digits;
|
|
299
315
|
}
|
|
300
316
|
}
|
|
301
317
|
|
|
@@ -303,14 +319,34 @@ export default class Mask {
|
|
|
303
319
|
|
|
304
320
|
let was = input.value;
|
|
305
321
|
|
|
306
|
-
if (edit == 'whole') this.#segment(input, type, is_delete ? '' : insert);
|
|
307
|
-
else if (this.#layout_of(st)) this.#grid(input, type, start, end, is_delete ? '' : insert);
|
|
308
|
-
else this.#edit(input, start, end, is_delete ? '' : insert, type);
|
|
322
|
+
if (edit == 'whole') rejected.push(...this.#segment(input, type, is_delete ? '' : insert));
|
|
323
|
+
else if (this.#layout_of(st)) rejected.push(...this.#grid(input, type, start, end, is_delete ? '' : insert));
|
|
324
|
+
else rejected.push(...this.#edit(input, start, end, is_delete ? '' : insert, type));
|
|
309
325
|
|
|
310
326
|
if (type == 'insertFromPaste') this.on_paste(input, this.#state_of(input, st));
|
|
311
327
|
|
|
312
|
-
|
|
313
|
-
|
|
328
|
+
for (let r of rejected) this.on_reject(input, { ...r, type });
|
|
329
|
+
|
|
330
|
+
if (event.defaultPrevented) this.#emit(input, was, type, insert || null);
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
// Какие из вставленных символов маска не приняла. Отказы движка - в координатах всего
|
|
334
|
+
// разобранного потока, вставка в нём - от длины разобранного префикса. Если поток срезан
|
|
335
|
+
// по max_raw, принятые символы вставки за срезом тоже отказ ('full')
|
|
336
|
+
#rejected(input, { def, full, cut }, before, insert) {
|
|
337
|
+
let ctx = { input };
|
|
338
|
+
let from = prepare(def, before, ctx).length, chars = prepare(def, insert, ctx);
|
|
339
|
+
let to = from + chars.length;
|
|
340
|
+
|
|
341
|
+
let list = (full.rejected ?? []).filter(r => r.at >= from && r.at < to);
|
|
342
|
+
if (cut != null) {
|
|
343
|
+
let kept = Math.max(0, cut - run(def, before, ctx).stream.length);
|
|
344
|
+
let accepted = chars.map((_, i) => from + i).filter(at => !list.some(r => r.at == at));
|
|
345
|
+
for (let at of accepted.slice(kept))
|
|
346
|
+
list.push({ at, char: chars[at - from], slot: null, reason: 'full' });
|
|
347
|
+
list.sort((a, b) => a.at - b.at);
|
|
348
|
+
}
|
|
349
|
+
return list.map(({ char, slot, reason }) => ({ char, slot, reason }));
|
|
314
350
|
}
|
|
315
351
|
|
|
316
352
|
#edit(input, fmt_start, fmt_end, insert, type) {
|
|
@@ -334,13 +370,14 @@ export default class Mask {
|
|
|
334
370
|
if (u.fmt_start < fmt_start) u.kind == 'literal' ? literal = u : unit = u;
|
|
335
371
|
unit ??= literal;
|
|
336
372
|
}
|
|
337
|
-
if (!unit) return;
|
|
373
|
+
if (!unit) return [];
|
|
338
374
|
del_start = unit.stream_start;
|
|
339
375
|
del_end = unit.stream_end;
|
|
340
376
|
}
|
|
341
377
|
|
|
342
|
-
let
|
|
343
|
-
this.#reconcile(input, prefix + st.stream.slice(del_end), { prefix });
|
|
378
|
+
let before = st.stream.slice(0, del_start), prefix = before + insert;
|
|
379
|
+
let out = this.#reconcile(input, prefix + st.stream.slice(del_end), { prefix });
|
|
380
|
+
return insert && out ? this.#rejected(input, out, before, insert) : [];
|
|
344
381
|
}
|
|
345
382
|
|
|
346
383
|
#grid(input, type, fmt_start, fmt_end, insert) {
|
|
@@ -361,12 +398,12 @@ export default class Mask {
|
|
|
361
398
|
if (type.includes('Forward')) {
|
|
362
399
|
k = at(fmt_start);
|
|
363
400
|
while (k < n && cells[k] == null) k++;
|
|
364
|
-
if (k >= n) return;
|
|
401
|
+
if (k >= n) return [];
|
|
365
402
|
} else {
|
|
366
403
|
k = -1;
|
|
367
404
|
for (let i = 0; i < n; i++) if (slots[i].fmt < fmt_start) k = i;
|
|
368
405
|
while (k >= 0 && cells[k] == null) k--;
|
|
369
|
-
if (k < 0) return;
|
|
406
|
+
if (k < 0) return [];
|
|
370
407
|
}
|
|
371
408
|
cells[k] = null;
|
|
372
409
|
} else {
|
|
@@ -374,13 +411,18 @@ export default class Mask {
|
|
|
374
411
|
if (k >= n && (k = cells.indexOf(null)) < 0) k = n;
|
|
375
412
|
}
|
|
376
413
|
|
|
414
|
+
let rejected = [];
|
|
377
415
|
for (let c of prepare(def, insert, { input })) {
|
|
378
|
-
if (k >= n)
|
|
416
|
+
if (k >= n) {
|
|
417
|
+
rejected.push({ char: c, slot: null, reason: 'full' });
|
|
418
|
+
continue;
|
|
419
|
+
}
|
|
379
420
|
|
|
380
421
|
if (!slots[k].node.test.test(c)) {
|
|
381
422
|
// Разделитель следующего блока переводит набор в этот блок
|
|
382
423
|
let end = parts.lastIndexOf(parts[k]);
|
|
383
424
|
if (end + 1 < n && gap(end + 1).includes(c)) k = end + 1;
|
|
425
|
+
else rejected.push(Mask.#refusal(def, c, k));
|
|
384
426
|
continue;
|
|
385
427
|
}
|
|
386
428
|
|
|
@@ -390,6 +432,12 @@ export default class Mask {
|
|
|
390
432
|
let stream = this.#stream(layout, cells);
|
|
391
433
|
let pos = Math.min(run(def, stream.slice(0, k), { input }).stream.length, n);
|
|
392
434
|
this.#reconcile(input, stream, { caret_fmt: pos < n ? slots[pos].fmt : slots[n - 1].fmt + 1 });
|
|
435
|
+
return rejected;
|
|
436
|
+
}
|
|
437
|
+
|
|
438
|
+
// Отказ слота: разделитель шаблона не на своём месте - 'literal', прочее - 'slot'
|
|
439
|
+
static #refusal(def, char, slot) {
|
|
440
|
+
return { char, slot, reason: def.seps?.has(char) ? 'literal' : 'slot' };
|
|
393
441
|
}
|
|
394
442
|
|
|
395
443
|
// edit: 'whole' - набор в выделенную группу как в <input type=date>: буфер группы
|
|
@@ -401,12 +449,12 @@ export default class Mask {
|
|
|
401
449
|
let cells = this.#cells(st, layout);
|
|
402
450
|
let part = g => cells.slice(g.first, g.last + 1);
|
|
403
451
|
let put = (g, values) => cells.splice(g.first, values.length, ...values);
|
|
404
|
-
let g = groups[seg.gi];
|
|
452
|
+
let g = groups[seg.gi], rejected = [];
|
|
405
453
|
|
|
406
454
|
if (type.startsWith('delete')) {
|
|
407
455
|
if (part(g).every(cell => cell == null)) {
|
|
408
456
|
if (type.includes('Backward') && seg.gi > 0) this.#select(input, seg.gi - 1);
|
|
409
|
-
return;
|
|
457
|
+
return [];
|
|
410
458
|
}
|
|
411
459
|
put(g, part(g).fill(null));
|
|
412
460
|
seg.buffer = '';
|
|
@@ -426,8 +474,11 @@ export default class Mask {
|
|
|
426
474
|
continue;
|
|
427
475
|
}
|
|
428
476
|
|
|
429
|
-
let
|
|
430
|
-
if (!
|
|
477
|
+
let i = g.first + Math.min(seg.buffer.length, g.fmts.length - 1);
|
|
478
|
+
if (!layout.slots[i].node.test.test(c)) {
|
|
479
|
+
rejected.push(Mask.#refusal(st.def, c, i));
|
|
480
|
+
continue;
|
|
481
|
+
}
|
|
431
482
|
|
|
432
483
|
let typed = type_ahead(g, seg.buffer, c);
|
|
433
484
|
put(g, typed.cells);
|
|
@@ -443,6 +494,7 @@ export default class Mask {
|
|
|
443
494
|
|
|
444
495
|
this.#reconcile(input, this.#stream(layout, cells), {});
|
|
445
496
|
this.#select(input, seg.gi, false);
|
|
497
|
+
return rejected;
|
|
446
498
|
}
|
|
447
499
|
|
|
448
500
|
// Клавиши режима 'whole': ←/→, Home/End и Tab/Shift+Tab ходят по группам (Tab с крайней
|
|
@@ -478,10 +530,7 @@ export default class Mask {
|
|
|
478
530
|
let was = input.value;
|
|
479
531
|
this.#reconcile(input, this.#stream(layout, cells), {});
|
|
480
532
|
this.#select(input, gi);
|
|
481
|
-
|
|
482
|
-
st.handled = true;
|
|
483
|
-
input.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'insertReplacementText' }));
|
|
484
|
-
}
|
|
533
|
+
this.#emit(input, was, 'insertReplacementText');
|
|
485
534
|
return;
|
|
486
535
|
}
|
|
487
536
|
default: return;
|
|
@@ -583,10 +632,11 @@ export default class Mask {
|
|
|
583
632
|
}
|
|
584
633
|
|
|
585
634
|
// Раскладка фиксированной маски со скелетом: позиции слотов, блоки между разделителями
|
|
586
|
-
// и группы. Без placeholder: 'always'
|
|
635
|
+
// и группы. Без placeholder: 'always', у маски переменной длины и у нескольких масок
|
|
636
|
+
// раскладки нет: ячейки одного шаблона не дали бы набору перейти в другой
|
|
587
637
|
#layout_of(st) {
|
|
588
638
|
let def = st.def;
|
|
589
|
-
if (this.#params.placeholder != 'always' || !def?.fixed) return null;
|
|
639
|
+
if (this.#params.placeholder != 'always' || st.defs.length > 1 || !def?.fixed) return null;
|
|
590
640
|
|
|
591
641
|
let layout = def.layout ??= Mask.#layout(def);
|
|
592
642
|
layout.spans ??= spans(layout, this.#params);
|
|
@@ -630,15 +680,18 @@ export default class Mask {
|
|
|
630
680
|
}
|
|
631
681
|
|
|
632
682
|
#reconcile(input, stream_next, { prefix = null, caret_fmt = null, silent = false } = {}) {
|
|
633
|
-
let st = this.#states.get(input);
|
|
634
|
-
let ctx = { raw: st.result?.raw ?? '', value: input.value, input };
|
|
683
|
+
let st = this.#states.get(input), holes = this.#holes(st);
|
|
684
|
+
let ctx = { raw: st.result?.raw ?? '', value: input.value, input, holes };
|
|
635
685
|
let best = run_all(st.defs, stream_next, ctx);
|
|
636
|
-
if (!best) return;
|
|
686
|
+
if (!best) return null;
|
|
637
687
|
|
|
638
688
|
let { result, def, mask_id } = best;
|
|
689
|
+
// Для отказов: разбор до среза по max_raw и место среза в потоке
|
|
690
|
+
let out = { def, full: result, cut: null };
|
|
639
691
|
|
|
640
692
|
if (st.max_raw != null && result.raw.length > st.max_raw) {
|
|
641
|
-
|
|
693
|
+
out.cut = cap(result, st.max_raw);
|
|
694
|
+
best = run_all(st.defs, result.stream.slice(0, out.cut), ctx);
|
|
642
695
|
({ result, def, mask_id } = best);
|
|
643
696
|
}
|
|
644
697
|
|
|
@@ -651,7 +704,7 @@ export default class Mask {
|
|
|
651
704
|
st.rendered = text;
|
|
652
705
|
|
|
653
706
|
if (caret_fmt == null && prefix != null && document.activeElement === input)
|
|
654
|
-
caret_fmt = caret_for(result, run(def, prefix, { input }).stream.length);
|
|
707
|
+
caret_fmt = caret_for(result, run(def, prefix, { input, holes }).stream.length);
|
|
655
708
|
if (caret_fmt != null && document.activeElement === input) {
|
|
656
709
|
caret_fmt = Math.min(caret_fmt, text.length);
|
|
657
710
|
input.setSelectionRange(caret_fmt, caret_fmt);
|
|
@@ -671,7 +724,7 @@ export default class Mask {
|
|
|
671
724
|
if (this.#validate_on(st) && input.setCustomValidity)
|
|
672
725
|
input.setCustomValidity(!result.stream || result.complete ? '' : this.#validation_message(input, st));
|
|
673
726
|
|
|
674
|
-
if (silent) return;
|
|
727
|
+
if (silent) return out;
|
|
675
728
|
|
|
676
729
|
let state = this.#state_of(input, st);
|
|
677
730
|
this.on_input(input, state);
|
|
@@ -679,15 +732,26 @@ export default class Mask {
|
|
|
679
732
|
if (result.complete && !prev?.complete) this.on_complete(input, state);
|
|
680
733
|
if (!result.complete && prev?.complete) this.on_incomplete(input, state);
|
|
681
734
|
if (prev && mask_id !== prev_id) this.on_mask_change(input, state);
|
|
735
|
+
return out;
|
|
736
|
+
}
|
|
737
|
+
|
|
738
|
+
// Символ-заполнитель встаёт в слот «дыркой» только в режиме ячеек: там пустая ячейка
|
|
739
|
+
// в середине потока - норма. В остальных режимах заполнитель - просто неподходящий символ,
|
|
740
|
+
// иначе позиционный filler-подсказка ('0000N') принимал бы набранную 'N' за пустую ячейку.
|
|
741
|
+
// Раскладку по st.def здесь не взять - маска выбирается этим же прогоном
|
|
742
|
+
#holes(st) {
|
|
743
|
+
let [def] = st.defs;
|
|
744
|
+
return this.#params.placeholder == 'always' && st.defs.length == 1 && !!(def.fixed || def.fn);
|
|
682
745
|
}
|
|
683
746
|
|
|
684
747
|
#text_for(input, result) {
|
|
748
|
+
let { placeholder } = this.#params;
|
|
685
749
|
if (!result.stream) {
|
|
686
750
|
if (document.activeElement !== input) return '';
|
|
687
|
-
if (
|
|
688
|
-
return
|
|
751
|
+
if (placeholder == 'always') return render(result, 'always');
|
|
752
|
+
return placeholder == false || placeholder == 'typed' ? '' : render(result, true);
|
|
689
753
|
}
|
|
690
|
-
return render(result,
|
|
754
|
+
return render(result, placeholder);
|
|
691
755
|
}
|
|
692
756
|
|
|
693
757
|
#state_of(input, st) {
|
|
@@ -697,7 +761,9 @@ export default class Mask {
|
|
|
697
761
|
complete: st.result?.complete ?? false,
|
|
698
762
|
mask_id: st.mask_id,
|
|
699
763
|
progress: st.result?.raw.length ?? 0,
|
|
700
|
-
groups: { ...st.result?.groups }
|
|
764
|
+
groups: { ...st.result?.groups },
|
|
765
|
+
empty: !st.stream,
|
|
766
|
+
skeleton: st.result ? render(st.result, 'always') : ''
|
|
701
767
|
};
|
|
702
768
|
}
|
|
703
769
|
|