@cat-of-summer/st-script 1.0.13 → 1.1.0

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.
@@ -3,6 +3,13 @@ import { find, own } from '../_traits/hasInstanceSymbol.js';
3
3
  export default class Uploader {
4
4
  static find = find;
5
5
 
6
+ #targets = [];
7
+
8
+ // Убрать все файлы из всех загрузчиков этого экземпляра.
9
+ clear() {
10
+ this.#targets.forEach(target => target.clear());
11
+ }
12
+
6
13
  static formatSize(size) {
7
14
  const units = ['Б', 'КБ', 'МБ', 'ГБ', 'ТБ'];
8
15
 
@@ -44,16 +51,30 @@ export default class Uploader {
44
51
  },
45
52
  };
46
53
 
54
+ if (!params.input_name)
55
+ throw new Error('Uploader: не задан input_name');
56
+
47
57
  let input_name = params.input_name.replace(/\[\]$/, '');
48
58
 
49
59
  params.input_name = input_name + (params.limits.files != 1 ? '[]' : '');
50
60
  params.delete_name = (params.delete_name ? params.delete_name.replace(/\[\]$/, '') : input_name + '_to_delete') + (params.limits.files != 1 ? '[]' : '');
51
61
 
52
- document.querySelectorAll(params.target).forEach(target => {
62
+ // target — селектор, элемент или список элементов.
63
+ let targets = typeof params.target == 'string'
64
+ ? document.querySelectorAll(params.target)
65
+ : params.target instanceof Element ? [params.target] : Array.from(params.target ?? []);
66
+
67
+ targets.forEach(target => {
53
68
  if (find(target))
54
69
  throw new Error("Already inited");
55
70
 
56
71
  own(target, this);
72
+ this.#targets.push(target);
73
+
74
+ // События на корне загрузчика, всплывают: uploader:add, uploader:delete, uploader:error.
75
+ const emit = (name, detail, cancelable = false) => target.dispatchEvent(
76
+ new CustomEvent(`uploader:${name}`, { bubbles: true, cancelable, detail })
77
+ );
57
78
 
58
79
  for (let [key, value] of Object.entries(params))
59
80
  if (typeof value == "function")
@@ -61,15 +82,15 @@ export default class Uploader {
61
82
 
62
83
  target.before_init(params);
63
84
 
85
+ // Ошибку получает handle_exception; без него — слушатели uploader:error, а если
86
+ // никто не вызвал preventDefault() — alert.
64
87
  const handleException = (file, message, code = null) => {
88
+ let error = Object.assign(new Error(message), { file, code });
89
+ let unhandled = emit('error', { error }, true);
90
+
65
91
  if (params.handle_exception)
66
- return target.handle_exception(Object.assign(
67
- new Error(message),{
68
- file,
69
- code
70
- }
71
- ));
72
- else
92
+ return target.handle_exception(error);
93
+ else if (unhandled)
73
94
  alert(message);
74
95
 
75
96
  return false;
@@ -88,6 +109,10 @@ export default class Uploader {
88
109
  target.files = new Map();
89
110
  target.total_size = 0;
90
111
  let last_id = 0;
112
+ // Удаление каждой записи по id файла: им пользуется clear().
113
+ let removers = new Map();
114
+
115
+ target.clear = () => [...removers.values()].forEach(remove => remove());
91
116
 
92
117
  const createFileEntry = (file) => {
93
118
  let entry = (new DOMParser()).parseFromString(entry_template, 'text/html').body.firstElementChild;
@@ -116,14 +141,20 @@ export default class Uploader {
116
141
  f.setAttribute('size', file.size);
117
142
  });
118
143
 
119
- delete_button.forEach(b => b.addEventListener('click', () => {
120
- if (target.before_file_delete(file) === false) return;
121
-
144
+ const remove = () => {
122
145
  target.total_size = Math.max(0, target.total_size - parseInt(file.size));
123
146
  target.files.delete(file._id);
147
+ removers.delete(file._id);
124
148
  entry.remove();
125
149
 
126
- target.on_file_delete(file)
150
+ target.on_file_delete(file);
151
+ emit('delete', { file });
152
+ };
153
+ removers.set(file._id, remove);
154
+
155
+ delete_button.forEach(b => b.addEventListener('click', () => {
156
+ if (target.before_file_delete(file) === false) return;
157
+ remove();
127
158
  }));
128
159
 
129
160
  let hidden = createFileInput();
@@ -156,9 +187,7 @@ export default class Uploader {
156
187
 
157
188
  target.files.set(file._id, file);
158
189
 
159
- delete_button.forEach(b => b.addEventListener('click', () => {
160
- if (target.before_file_delete(file) === false) return;
161
-
190
+ const remove = () => {
162
191
  let hidden = Object.assign(document.createElement('input'), {
163
192
  type: 'hidden',
164
193
  name: params.delete_name,
@@ -168,9 +197,17 @@ export default class Uploader {
168
197
  target.appendChild(hidden);
169
198
 
170
199
  target.files.delete(file._id);
200
+ removers.delete(file._id);
171
201
  target.on_file_delete(file);
202
+ emit('delete', { file });
172
203
 
173
204
  entry.remove();
205
+ };
206
+ removers.set(file._id, remove);
207
+
208
+ delete_button.forEach(b => b.addEventListener('click', () => {
209
+ if (target.before_file_delete(file) === false) return;
210
+ remove();
174
211
  }));
175
212
 
176
213
  input.remove();
@@ -238,6 +275,8 @@ export default class Uploader {
238
275
  }
239
276
 
240
277
  target.on_files_add(file_array);
278
+ if (file_array.length > 0)
279
+ emit('add', { files: file_array });
241
280
  };
242
281
 
243
282
  try {
@@ -254,6 +293,10 @@ export default class Uploader {
254
293
  } catch (e) {
255
294
  entry_template = params.entry;
256
295
  }
296
+ // Записей нет, а entry — селектор: шаблон берётся из <template entry> внутри.
297
+ entry_template ??= target.querySelector('template[entry]')?.innerHTML;
298
+ if (entry_template == null)
299
+ throw new Error('Uploader: нет шаблона записи — ни существующих записей, ни <template entry>, ни HTML в entry');
257
300
  entry_template = entry_template.trim();
258
301
 
259
302
  target.querySelectorAll('*[drop-zone]').forEach(zone => {