@supersoniks/concorde 4.9.6 → 4.9.7
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/build-infos.json +1 -1
- package/concorde-core.bundle.js +161 -161
- package/concorde-core.es.js +2521 -2443
- package/dist/concorde-core.bundle.js +161 -161
- package/dist/concorde-core.es.js +2521 -2443
- package/dist/js/core/components/functional/queue/queue.js +178 -16
- package/dist/js/core/components/functional/queue/queue.js.map +1 -1
- package/dist/types/core/components/functional/queue/queue.d.ts +28 -2
- package/dist/types/core/components/functional/queue/queue.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/components/functional/queue/queue.ts +192 -19
|
@@ -78,6 +78,9 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
78
78
|
if (searchHash == this.searchHash && !this.isFirstRequest)
|
|
79
79
|
return;
|
|
80
80
|
this.searchHash = searchHash;
|
|
81
|
+
// Nouvelle recherche : ne pas restaurer l'ancienne position de scroll
|
|
82
|
+
this.storedScrollX = 0;
|
|
83
|
+
this.storedScrollY = 0;
|
|
81
84
|
/**
|
|
82
85
|
* on reset les données avant de lancer la requète
|
|
83
86
|
*/
|
|
@@ -98,10 +101,54 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
98
101
|
}, this.isFirstRequest ? 0 : this.filterTimeoutMs);
|
|
99
102
|
this.isFirstRequest = false;
|
|
100
103
|
};
|
|
101
|
-
/**
|
|
104
|
+
/**
|
|
105
|
+
* Conteneur scrollé (élément ou window) — Safari / iOS only.
|
|
106
|
+
* Stock = dernière position user (touch/wheel/pointer + settle inertie).
|
|
107
|
+
* Restore = updated (enfants Lit) + MutationObserver (subscribers / modal).
|
|
108
|
+
*/
|
|
102
109
|
this.scrollRoot = null;
|
|
103
110
|
this.storedScrollY = 0;
|
|
104
111
|
this.storedScrollX = 0;
|
|
112
|
+
this.userScrollEngaged = false;
|
|
113
|
+
this.restoringScroll = false;
|
|
114
|
+
this.scrollGuardActive = false;
|
|
115
|
+
this.mutationObserver = null;
|
|
116
|
+
this.boundScrollTarget = null;
|
|
117
|
+
this.restoreGeneration = 0;
|
|
118
|
+
this.markUserScrollEngaged = () => {
|
|
119
|
+
this.userScrollEngaged = true;
|
|
120
|
+
};
|
|
121
|
+
this.armScrollSettle = () => {
|
|
122
|
+
clearTimeout(this.scrollSettleTimer);
|
|
123
|
+
this.scrollSettleTimer = setTimeout(() => {
|
|
124
|
+
this.userScrollEngaged = false;
|
|
125
|
+
this.scrollSettleTimer = undefined;
|
|
126
|
+
}, Queue_1.SCROLL_SETTLE_MS);
|
|
127
|
+
};
|
|
128
|
+
this.onScrollRootScroll = () => {
|
|
129
|
+
if (!this.isSafari() || this.restoringScroll || !this.userScrollEngaged) {
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
this.captureScrollPosition();
|
|
133
|
+
// iOS : l’inertie continue après touchend → prolonger l’engagement
|
|
134
|
+
this.armScrollSettle();
|
|
135
|
+
};
|
|
136
|
+
this.onUserScrollIntent = () => {
|
|
137
|
+
if (!this.isSafari())
|
|
138
|
+
return;
|
|
139
|
+
this.markUserScrollEngaged();
|
|
140
|
+
};
|
|
141
|
+
this.onUserScrollIntentEnd = () => {
|
|
142
|
+
if (!this.isSafari())
|
|
143
|
+
return;
|
|
144
|
+
this.armScrollSettle();
|
|
145
|
+
};
|
|
146
|
+
this.onWheelIntent = () => {
|
|
147
|
+
if (!this.isSafari())
|
|
148
|
+
return;
|
|
149
|
+
this.markUserScrollEngaged();
|
|
150
|
+
this.armScrollSettle();
|
|
151
|
+
};
|
|
105
152
|
/**
|
|
106
153
|
* Cette expression est utilisée comme modèle par le composant Queue pour renseigngner le dataProvider de la [liste](./?path=/docs/core-components-functional-list-list--basic) créée.
|
|
107
154
|
* * l'expression *$offset* est alors remplacée par le numéro de l'élément à partir duquel démarrer
|
|
@@ -129,7 +176,7 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
129
176
|
this.requestId = 0;
|
|
130
177
|
this.isFirstRequest = true;
|
|
131
178
|
this.nextHadEvent = false;
|
|
132
|
-
this.
|
|
179
|
+
this.teardownScrollGuard();
|
|
133
180
|
this.publisher.set({});
|
|
134
181
|
super.disconnectedCallback();
|
|
135
182
|
return;
|
|
@@ -155,7 +202,8 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
155
202
|
HTML.getAncestorAttributeValue(this.parentElement, "dataProvider") ||
|
|
156
203
|
"";
|
|
157
204
|
}
|
|
158
|
-
this.
|
|
205
|
+
this.captureScrollPosition();
|
|
206
|
+
this.ensureScrollGuard();
|
|
159
207
|
super.connectedCallback();
|
|
160
208
|
this.publisher.set({});
|
|
161
209
|
this.key = this.getAttribute("key");
|
|
@@ -184,7 +232,8 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
184
232
|
}
|
|
185
233
|
return ancestor;
|
|
186
234
|
}
|
|
187
|
-
|
|
235
|
+
/** Lit la position courante — ne pas appeler sur un scroll “fantôme” Safari. */
|
|
236
|
+
captureScrollPosition() {
|
|
188
237
|
if (!this.isSafari()) {
|
|
189
238
|
return;
|
|
190
239
|
}
|
|
@@ -201,30 +250,138 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
201
250
|
}
|
|
202
251
|
}
|
|
203
252
|
restoreScrollPosition() {
|
|
253
|
+
if (!this.isSafari()) {
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
204
256
|
const root = this.scrollRoot ?? this.resolveScrollRoot();
|
|
205
257
|
const x = this.storedScrollX;
|
|
206
258
|
const y = this.storedScrollY;
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
259
|
+
this.restoringScroll = true;
|
|
260
|
+
try {
|
|
261
|
+
if (root === window) {
|
|
262
|
+
if (Math.abs(x - window.scrollX) > 10 ||
|
|
263
|
+
Math.abs(y - window.scrollY) > 10) {
|
|
264
|
+
window.scrollTo(x, y);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
else {
|
|
268
|
+
const el = root;
|
|
269
|
+
if (Math.abs(x - el.scrollLeft) > 10 ||
|
|
270
|
+
Math.abs(y - el.scrollTop) > 10) {
|
|
271
|
+
el.scrollLeft = x;
|
|
272
|
+
el.scrollTop = y;
|
|
273
|
+
}
|
|
211
274
|
}
|
|
212
|
-
return;
|
|
213
275
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
276
|
+
finally {
|
|
277
|
+
requestAnimationFrame(() => {
|
|
278
|
+
this.restoringScroll = false;
|
|
279
|
+
});
|
|
218
280
|
}
|
|
219
281
|
}
|
|
220
282
|
isSafari() {
|
|
221
283
|
return /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
|
|
222
284
|
}
|
|
285
|
+
ensureScrollGuard() {
|
|
286
|
+
if (!this.isSafari() || !this.isConnected) {
|
|
287
|
+
return;
|
|
288
|
+
}
|
|
289
|
+
const root = this.resolveScrollRoot();
|
|
290
|
+
const target = root === window ? window : root;
|
|
291
|
+
if (this.scrollGuardActive && this.boundScrollTarget === target) {
|
|
292
|
+
this.scrollRoot = root;
|
|
293
|
+
return;
|
|
294
|
+
}
|
|
295
|
+
this.teardownScrollGuard();
|
|
296
|
+
this.scrollRoot = root;
|
|
297
|
+
this.boundScrollTarget = target;
|
|
298
|
+
this.scrollGuardActive = true;
|
|
299
|
+
target.addEventListener("scroll", this.onScrollRootScroll, {
|
|
300
|
+
passive: true,
|
|
301
|
+
});
|
|
302
|
+
// Intent user : touch (iOS), wheel, pointer (scrollbar desktop Safari)
|
|
303
|
+
target.addEventListener("touchstart", this.onUserScrollIntent, {
|
|
304
|
+
passive: true,
|
|
305
|
+
});
|
|
306
|
+
target.addEventListener("touchend", this.onUserScrollIntentEnd, {
|
|
307
|
+
passive: true,
|
|
308
|
+
});
|
|
309
|
+
target.addEventListener("touchcancel", this.onUserScrollIntentEnd, {
|
|
310
|
+
passive: true,
|
|
311
|
+
});
|
|
312
|
+
target.addEventListener("wheel", this.onWheelIntent, { passive: true });
|
|
313
|
+
target.addEventListener("pointerdown", this.onUserScrollIntent, {
|
|
314
|
+
passive: true,
|
|
315
|
+
});
|
|
316
|
+
target.addEventListener("pointerup", this.onUserScrollIntentEnd, {
|
|
317
|
+
passive: true,
|
|
318
|
+
});
|
|
319
|
+
target.addEventListener("pointercancel", this.onUserScrollIntentEnd, {
|
|
320
|
+
passive: true,
|
|
321
|
+
});
|
|
322
|
+
this.mutationObserver = new MutationObserver(() => {
|
|
323
|
+
this.scheduleRestoreAfterChildren();
|
|
324
|
+
});
|
|
325
|
+
this.mutationObserver.observe(this, {
|
|
326
|
+
childList: true,
|
|
327
|
+
subtree: true,
|
|
328
|
+
characterData: true,
|
|
329
|
+
});
|
|
330
|
+
}
|
|
331
|
+
teardownScrollGuard() {
|
|
332
|
+
this.restoreGeneration++;
|
|
333
|
+
clearTimeout(this.scrollSettleTimer);
|
|
334
|
+
this.scrollSettleTimer = undefined;
|
|
335
|
+
this.userScrollEngaged = false;
|
|
336
|
+
this.restoringScroll = false;
|
|
337
|
+
if (this.boundScrollTarget) {
|
|
338
|
+
const target = this.boundScrollTarget;
|
|
339
|
+
target.removeEventListener("scroll", this.onScrollRootScroll);
|
|
340
|
+
target.removeEventListener("touchstart", this.onUserScrollIntent);
|
|
341
|
+
target.removeEventListener("touchend", this.onUserScrollIntentEnd);
|
|
342
|
+
target.removeEventListener("touchcancel", this.onUserScrollIntentEnd);
|
|
343
|
+
target.removeEventListener("wheel", this.onWheelIntent);
|
|
344
|
+
target.removeEventListener("pointerdown", this.onUserScrollIntent);
|
|
345
|
+
target.removeEventListener("pointerup", this.onUserScrollIntentEnd);
|
|
346
|
+
target.removeEventListener("pointercancel", this.onUserScrollIntentEnd);
|
|
347
|
+
this.boundScrollTarget = null;
|
|
348
|
+
}
|
|
349
|
+
this.mutationObserver?.disconnect();
|
|
350
|
+
this.mutationObserver = null;
|
|
351
|
+
this.scrollGuardActive = false;
|
|
352
|
+
this.scrollRoot = null;
|
|
353
|
+
}
|
|
354
|
+
/**
|
|
355
|
+
* Attend la fin des updates Lit de la queue + sonic-list, puis 2 rAF (layout Safari).
|
|
356
|
+
* Ne pas await updateComplete *dans* updated (deadlock) — on sort du cycle via void async.
|
|
357
|
+
*/
|
|
358
|
+
scheduleRestoreAfterChildren() {
|
|
359
|
+
if (!this.isSafari() || !this.isConnected) {
|
|
360
|
+
return;
|
|
361
|
+
}
|
|
362
|
+
const generation = ++this.restoreGeneration;
|
|
363
|
+
void (async () => {
|
|
364
|
+
await this.updateComplete;
|
|
365
|
+
if (generation !== this.restoreGeneration || !this.isConnected)
|
|
366
|
+
return;
|
|
367
|
+
const lists = Array.from(this.querySelectorAll("sonic-list"));
|
|
368
|
+
if (lists.length) {
|
|
369
|
+
await Promise.all(lists.map((list) => list.updateComplete));
|
|
370
|
+
}
|
|
371
|
+
if (generation !== this.restoreGeneration || !this.isConnected)
|
|
372
|
+
return;
|
|
373
|
+
await new Promise((r) => requestAnimationFrame(() => r()));
|
|
374
|
+
await new Promise((r) => requestAnimationFrame(() => r()));
|
|
375
|
+
if (generation !== this.restoreGeneration || !this.isConnected)
|
|
376
|
+
return;
|
|
377
|
+
this.restoreScrollPosition();
|
|
378
|
+
})();
|
|
379
|
+
}
|
|
223
380
|
updated(_changedProperties) {
|
|
224
381
|
if (this.isSafari()) {
|
|
382
|
+
this.ensureScrollGuard();
|
|
225
383
|
this.restoreScrollPosition();
|
|
226
|
-
|
|
227
|
-
window.requestAnimationFrame(() => this.restoreScrollPosition());
|
|
384
|
+
this.scheduleRestoreAfterChildren();
|
|
228
385
|
}
|
|
229
386
|
super.updated(_changedProperties);
|
|
230
387
|
}
|
|
@@ -313,7 +470,11 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
313
470
|
this.lastRequestTime = new Date().getTime();
|
|
314
471
|
}
|
|
315
472
|
render() {
|
|
316
|
-
|
|
473
|
+
// Ne pas écraser le stock avec un jump Safari : uniquement sync du root / guard.
|
|
474
|
+
if (this.isSafari()) {
|
|
475
|
+
this.scrollRoot = this.resolveScrollRoot();
|
|
476
|
+
this.ensureScrollGuard();
|
|
477
|
+
}
|
|
317
478
|
if (!Array.isArray(this.props)) {
|
|
318
479
|
return nothing;
|
|
319
480
|
}
|
|
@@ -358,6 +519,7 @@ let Queue = Queue_1 = class Queue extends Subscriber(LitElement, {}) {
|
|
|
358
519
|
}
|
|
359
520
|
};
|
|
360
521
|
Queue.instanceCounter = 0;
|
|
522
|
+
Queue.SCROLL_SETTLE_MS = 150;
|
|
361
523
|
__decorate([
|
|
362
524
|
property({ type: Array })
|
|
363
525
|
], Queue.prototype, "templates", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../../../src/core/components/functional/queue/queue.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../../../../src/core/components/functional/queue/queue.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAkB,MAAM,KAAK,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,UAAU,MAAM,8CAA8C,CAAC;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAqB,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACjG,OAAO,4DAA4D,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAenD,MAAM,OAAO,GAAG,aAAa,CAAC;AAC9B;;;;;;;GAOG;AAEY,IAAM,KAAK,aAAX,MAAM,KAAM,SAAQ,UAAU,CAAC,UAAU,EAAE,EAAgB,CAAC;IAA5D;;QACc,cAAS,GAClC,IAAI,CAAC;QACyC,UAAK,GAAqB,IAAI,CAAC;QAC/B,YAAO,GAAqB,IAAI,CAAC;QACjC,aAAQ,GAAqB,IAAI,CAAC;QAClF,oBAAe,GAAG,CAAC,CAAC;QACpB,QAAG,GAAG,EAAE,CAAC;QAEmB,oBAAe,GAAkB,IAAI,CAAC;QAClE;;WAEG;QACS,UAAK,GAAiB,SAAS,CAAC;QAChC,0BAAqB,GAAG,GAAG,CAAC;QACxC;;;WAGG;QACS,UAAK,GAAG,CAAC,CAAC;QACV,oBAAe,GAAG,CAAC,CAAC;QAEpB,WAAM,GAAG,CAAC,CAAC;QACX,gBAAW,GAAG,CAAC,CAAC;QACC,eAAU,GAAG,KAAK,CAAC;QAEpB,WAAM,GAAG,QAAQ,CAAC;QAElC,mBAAc,GAAG,EAAE,CAAC;QAuBhC,eAAU,GAAG,CAAC,CAAC;QACf,iBAAY,GAAG,UAAU,CAAC;QAsC1B,oBAAe,GAAwB,IAAI,CAAC;QAc5C,oBAAe,GAAG,GAAG,CAAC;QACtB,eAAU,GAAG,EAAE,CAAC;QAChB,cAAS,GAAG,CAAC,CAAC;QACd,mBAAc,GAAG,IAAI,CAAC;QACtB,0BAAqB,GAAG,GAAG,EAAE;YAC3B;;eAEG;YACH,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC;YACjD,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,MAAM,UAAU,GACd,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAE;YAC/B,MAAM,mBAAmB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3D,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;gBAC3B,IAAI,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;oBACtB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;gBACzD,IACE,CAAC,IAAI,CAAC,cAAc,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;oBACxD,KAAK,IAAI,IAAI;oBACb,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE;oBAEvB,SAAS;gBACX,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,UAAU,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,UAAU,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc;gBAAE,OAAO;YAClE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,sEAAsE;YACtE,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YAEvB;;eAEG;YAEH,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAClD,gBAAgB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACpD,uCAAuC;YACzC,CAAC;YACD,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACnC,IAAI,CAAC,eAAe,GAAG,UAAU,CAC/B,KAAK,IAAI,EAAE;gBACT,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,+DAA+D;gBAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;gBACzB,MAAM,gBAAgB,CAAC,WAAW,EAAE,CAAC,oBAAoB,CAAC;gBAC1D,MAAM,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAClD,CAAC,EACD,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAC/C,CAAC;YACF,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC9B,CAAC,CAAC;QAEF;;;;WAIG;QACH,eAAU,GAAgC,IAAI,CAAC;QAC/C,kBAAa,GAAG,CAAC,CAAC;QAClB,kBAAa,GAAG,CAAC,CAAC;QAEV,sBAAiB,GAAG,KAAK,CAAC;QAC1B,oBAAe,GAAG,KAAK,CAAC;QACxB,sBAAiB,GAAG,KAAK,CAAC;QAE1B,qBAAgB,GAA4B,IAAI,CAAC;QACjD,sBAAiB,GAAuB,IAAI,CAAC;QAC7C,sBAAiB,GAAG,CAAC,CAAC;QAoEtB,0BAAqB,GAAG,GAAG,EAAE;YACnC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC,CAAC;QAEM,oBAAe,GAAG,GAAG,EAAE;YAC7B,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACrC,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,GAAG,EAAE;gBACvC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;gBAC/B,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;YACrC,CAAC,EAAE,OAAK,CAAC,gBAAgB,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEM,uBAAkB,GAAG,GAAG,EAAE;YAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxE,OAAO;YACT,CAAC;YACD,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,mEAAmE;YACnE,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC;QAEM,uBAAkB,GAAG,GAAG,EAAE;YAChC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAAE,OAAO;YAC7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,CAAC,CAAC;QAEM,0BAAqB,GAAG,GAAG,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAAE,OAAO;YAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC;QAEM,kBAAa,GAAG,GAAG,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAAE,OAAO;YAC7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC;QAkHF;;;;;WAKG;QACyB,2BAAsB,GAAG,EAAE,CAAC;QAC3B,yBAAoB,GAAG,KAAK,CAAC;QAE9B,UAAK,GAAG,IAAI,CAAC;QAKzC,sBAAiB,GAAa,EAAE,CAAC;QAEjC,iBAAY,GAAG,KAAK,CAAC;IA6IvB,CAAC;IA3gBC,oBAAoB;QAClB,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAClD,gBAAgB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACpD,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACtE,uBAAuB;QAEvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvB,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAC7B,OAAO;IACT,CAAC;IAKD,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,UAAU,GAAG,OAAK,CAAC,eAAe,EAAE,CAAC;QAC1C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC;QAC3E,IAAI,CAAC,eAAe,GAAG,QAAQ,CAC7B,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAC9C,CAAC;QACF,2HAA2H;QAC3H,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;QACxD,oCAAoC;QACpC,IAAI,CAAC,IAAI,CAAC,YAAY;YACpB,IAAI,CAAC,YAAY;gBACf,IAAI,CAAC,sBAAsB;oBAC3B,cAAc;wBACZ,IAAI,CAAC,UAAU;wBACf,GAAG;wBACH,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACjC,IAAI,CAAC,sBAAsB;gBACzB,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,cAAc,CAAC;oBAClE,EAAE,CAAC;QACP,CAAC;QACD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,gBAAgB,CAAC,WAAW,EAAE,CAAC,oBAAoB,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,SAAS;YACjB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CACzB,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CACJ,CAAC;QAClC,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC5C,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,YAAY;QACV,MAAM,kBAAkB,GACtB,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,CAAC;QACvD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,IAAI,CAAC,eAAe;YAClB,gBAAgB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACzD,IAAI,CAAC,eAAe,EAAE,kBAAkB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACvE,CAAC;IA8ED,iBAAiB;QACf,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACjD,IACE,CAAC,QAAQ;YACT,QAAQ,KAAK,QAAQ,CAAC,eAAe;YACrC,QAAQ,KAAK,QAAQ,CAAC,IAAI,EAC1B,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,QAAuB,CAAC;IACjC,CAAC;IAED,gFAAgF;IAChF,qBAAqB;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;YACpC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,GAAG,IAAmB,CAAC;YAC/B,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC,UAAU,CAAC;YACnC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC,SAAS,CAAC;QACpC,CAAC;IACH,CAAC;IAED,qBAAqB;QACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzD,MAAM,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC;QAC7B,MAAM,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC;YACH,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpB,IACE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;oBACjC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,EACjC,CAAC;oBACD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,EAAE,GAAG,IAAmB,CAAC;gBAC/B,IACE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE;oBAChC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAC/B,CAAC;oBACD,EAAE,CAAC,UAAU,GAAG,CAAC,CAAC;oBAClB,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,qBAAqB,CAAC,GAAG,EAAE;gBACzB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;YAC/B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,QAAQ;QACN,OAAO,gCAAgC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACpE,CAAC;IAuCD,iBAAiB;QACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtC,MAAM,MAAM,GAAgB,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5D,IAAI,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC,iBAAiB,KAAK,MAAM,EAAE,CAAC;YAChE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC;QAChC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAE9B,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE;YACzD,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,uEAAuE;QACvE,MAAM,CAAC,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,kBAAkB,EAAE;YAC7D,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,EAAE;YAC9D,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,qBAAqB,EAAE;YACjE,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,gBAAgB,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,EAAE;YAC9D,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,EAAE;YAC/D,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QACH,MAAM,CAAC,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,qBAAqB,EAAE;YACnE,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE;YAChD,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE;YAClC,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;IACL,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACnC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACtC,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAC9D,MAAM,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClE,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACnE,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACtE,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACxD,MAAM,CAAC,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACnE,MAAM,CAAC,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACpE,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACxE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,gBAAgB,EAAE,UAAU,EAAE,CAAC;QACpC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,4BAA4B;QAC1B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAC1C,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC;QAC5C,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,IAAI,CAAC,cAAc,CAAC;YAC1B,IAAI,UAAU,KAAK,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO;YAEvE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CACtB,IAAI,CAAC,gBAAgB,CAAa,YAAY,CAAC,CAChD,CAAC;YACF,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;YAC9D,CAAC;YACD,IAAI,UAAU,KAAK,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO;YAEvE,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjE,IAAI,UAAU,KAAK,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,WAAW;gBAAE,OAAO;YAEvE,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAES,OAAO,CAAC,kBAAkC;QAClD,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACtC,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACpC,CAAC;IAaD,aAAa;QACX,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IAC9C,CAAC;IAID,IAAI,CAAC,CAAe;QAClB,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC;QAEvD;;;aAGK;QACL,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,CAAC,CAAC;YAC/B,uCAAuC;YACvC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;QAExB,IAAI,CAAC,EAAE,CAAC;YACN,IAAI,CAAC,SAAS,CAAC,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;YACtD,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;gBAAE,OAAO;YAChD,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,CAAC;YAEhD,IACE,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW;gBACrB,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM;gBACvB,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EACpD,CAAC;gBACD,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;gBAC9C,uCAAuC;gBACvC,OAAO;YACT,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAe,EAAE,CAAC;YAChC,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YACxC,QAAQ,CAAC,eAAe,GAAG,CAAC,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;YACvD,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAA6C,IAAI,CAAC,KAAK,CAAC;YACnE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACrC,MAAM;gBACJ,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,eAAe,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACnD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CACrB,CAAC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAC5D,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;YAAE,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE;YAAE,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QACrC,IAAI,YAAY,GAAG,IAAI,CAAC,sBAAsB;aAC3C,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC;aAC/B,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,UAAU,GAA2B,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC;QACvE,MAAM,mBAAmB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE3D,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;YAC3B,IACE,CAAC,IAAI,CAAC,cAAc,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxD,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI;gBACrB,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE;gBAEnB,SAAS;YACX,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QAChE,QAAQ,GAAG,QAAQ,GAAG,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;QACpD,YAAY,GAAG,YAAY,GAAG,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC;QACpE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAe;YAC3B,GAAG,IAAI,CAAC,KAAK;YACb;gBACE,EAAE,EAAE,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM;gBACrD,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,IAAI,CAAC,KAAK;aAClB;SACF,CAAC;QACF,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,QAAQ,CAAC,eAAe,GAAG,CAAC,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC;QAEvD,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IAC9C,CAAC;IAED,MAAM;QACJ,iFAAiF;QACjF,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3C,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,IAAI,QAAQ,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;QAChC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC3B,QAAQ,GAAG,KAAK,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC7B,OAAO,IAAI,CAAA;QACP,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAChC,MAAM,SAAS,GACb,KAAK,IAAI,CAAC;gBACR,CAAC,CAAC,IAAI,CAAC,SAAS;gBAChB,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,SAAS,CACrD,CAAC;YACR,OAAO,IAAI,CAAA;;;sBAGG,IAAI,CAAC,MAAM;oBACb,IAAI,CAAC,KAAK;;8BAEA,IAAI,CAAC,eAAe;wBAC1B,QAAQ;oCACI,IAAI,CAAC,oBAAoB;2BAClC,IAAI,CAAC,YAAY;wBACpB,IAAI,CAAC,SAAS;+BACP,IAAI,CAAC,eAAe;qBAC9B,IAAI,CAAC,aAAa,KAAK,IAAI;oBAC5B,IAAI,CAAC,IAAI;kBACX,IAAI,CAAC,GAAG;uBACH,IAAI,CAAC,aAAa;4BACb,IAAI,CAAC,YAAY;wBACrB,IAAI,CAAC,QAAQ;oBACjB,IAAI,CAAC,KAAK;yBACL,SAAS;qBACb,IAAI,CAAC,KAAK;uBACR,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;wBACpC,IAAI,CAAC,QAAQ;;;SAG5B,CAAC;QACJ,CAAC,CAAC;KACH,CAAC;IACJ,CAAC;;AArfM,qBAAe,GAAG,CAAC,AAAJ,CAAK;AAyHH,sBAAgB,GAAG,GAAG,AAAN,CAAO;AA1KpB;IAA1B,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;wCACnB;AACyC;IAA/C,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;oCAAgC;AAC/B;IAA/C,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;sCAAkC;AACjC;IAA/C,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;uCAAmC;AAItD;IAA3B,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;8CAAuC;AAItD;IAAX,QAAQ,EAAE;oCAAiC;AAChC;IAAX,QAAQ,EAAE;oDAA6B;AAK5B;IAAX,QAAQ,EAAE;oCAAW;AACV;IAAX,QAAQ,EAAE;8CAAqB;AAEpB;IAAX,QAAQ,EAAE;qCAAY;AACX;IAAX,QAAQ,EAAE;0CAAiB;AACC;IAA5B,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;yCAAoB;AAEpB;IAA3B,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;qCAAmB;AAElC;IAAX,QAAQ,EAAE;6CAAqB;AAqXJ;IAA3B,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;qDAA6B;AAC3B;IAA5B,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;mDAA8B;AAE9B;IAA3B,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;oCAAc;AApZtB,KAAK;IADzB,aAAa,CAAC,OAAO,CAAC;GACF,KAAK,CAwiBzB;eAxiBoB,KAAK"}
|
|
@@ -55,14 +55,40 @@ export default class Queue extends Queue_base {
|
|
|
55
55
|
requestId: number;
|
|
56
56
|
isFirstRequest: boolean;
|
|
57
57
|
updateFilteredContent: () => void;
|
|
58
|
-
/**
|
|
58
|
+
/**
|
|
59
|
+
* Conteneur scrollé (élément ou window) — Safari / iOS only.
|
|
60
|
+
* Stock = dernière position user (touch/wheel/pointer + settle inertie).
|
|
61
|
+
* Restore = updated (enfants Lit) + MutationObserver (subscribers / modal).
|
|
62
|
+
*/
|
|
59
63
|
scrollRoot: HTMLElement | Window | null;
|
|
60
64
|
storedScrollY: number;
|
|
61
65
|
storedScrollX: number;
|
|
66
|
+
private static readonly SCROLL_SETTLE_MS;
|
|
67
|
+
private userScrollEngaged;
|
|
68
|
+
private restoringScroll;
|
|
69
|
+
private scrollGuardActive;
|
|
70
|
+
private scrollSettleTimer?;
|
|
71
|
+
private mutationObserver;
|
|
72
|
+
private boundScrollTarget;
|
|
73
|
+
private restoreGeneration;
|
|
62
74
|
resolveScrollRoot(): HTMLElement | Window;
|
|
63
|
-
|
|
75
|
+
/** Lit la position courante — ne pas appeler sur un scroll “fantôme” Safari. */
|
|
76
|
+
captureScrollPosition(): void;
|
|
64
77
|
restoreScrollPosition(): void;
|
|
65
78
|
isSafari(): boolean;
|
|
79
|
+
private markUserScrollEngaged;
|
|
80
|
+
private armScrollSettle;
|
|
81
|
+
private onScrollRootScroll;
|
|
82
|
+
private onUserScrollIntent;
|
|
83
|
+
private onUserScrollIntentEnd;
|
|
84
|
+
private onWheelIntent;
|
|
85
|
+
ensureScrollGuard(): void;
|
|
86
|
+
teardownScrollGuard(): void;
|
|
87
|
+
/**
|
|
88
|
+
* Attend la fin des updates Lit de la queue + sonic-list, puis 2 rAF (layout Safari).
|
|
89
|
+
* Ne pas await updateComplete *dans* updated (deadlock) — on sort du cycle via void async.
|
|
90
|
+
*/
|
|
91
|
+
scheduleRestoreAfterChildren(): void;
|
|
66
92
|
protected updated(_changedProperties: PropertyValues): void;
|
|
67
93
|
/**
|
|
68
94
|
* Cette expression est utilisée comme modèle par le composant Queue pour renseigngner le dataProvider de la [liste](./?path=/docs/core-components-functional-list-list--basic) créée.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../../../../src/core/components/functional/queue/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,KAAK,CAAC;AAIhE,OAAO,YAAkC,MAAM,iDAAiD,CAAC;AACjG,OAAO,4DAA4D,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,4DAA4D,CAAC;AAEvF,KAAK,SAAS,GAAG;IACf,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,UAAU,GAAG,SAAS,EAAE,GAAG;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;;AAGF;;;;;;;GAOG;AAEH,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,UAAwC;IAC9C,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAChE;IACyC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAQ;IAC/B,OAAO,EAAE,SAAS,GAAG,IAAI,CAAQ;IACjC,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAQ;IAClF,eAAe,SAAK;IACpB,GAAG,SAAM;IAEmB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAQ;IAClE;;OAEG;IACS,KAAK,EAAE,YAAY,CAAa;IAChC,qBAAqB,SAAO;IAK5B,KAAK,SAAK;IACV,eAAe,SAAK;IAEpB,MAAM,SAAK;IACX,WAAW,SAAK;IACC,UAAU,UAAS;IAEpB,MAAM,SAAY;IAElC,cAAc,SAAM;IAChC,oBAAoB;IAqBpB,MAAM,CAAC,eAAe,SAAK;IAC3B,UAAU,SAAK;IACf,YAAY,SAAc;IAEpB,iBAAiB;
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../../../../../src/core/components/functional/queue/queue.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -74,7 +74,7 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
74
74
|
this.requestId = 0;
|
|
75
75
|
this.isFirstRequest = true;
|
|
76
76
|
this.nextHadEvent = false;
|
|
77
|
-
this.
|
|
77
|
+
this.teardownScrollGuard();
|
|
78
78
|
this.publisher.set({});
|
|
79
79
|
super.disconnectedCallback();
|
|
80
80
|
return;
|
|
@@ -106,7 +106,8 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
106
106
|
HTML.getAncestorAttributeValue(this.parentElement, "dataProvider") ||
|
|
107
107
|
"";
|
|
108
108
|
}
|
|
109
|
-
this.
|
|
109
|
+
this.captureScrollPosition();
|
|
110
|
+
this.ensureScrollGuard();
|
|
110
111
|
super.connectedCallback();
|
|
111
112
|
this.publisher.set({});
|
|
112
113
|
this.key = this.getAttribute("key");
|
|
@@ -162,6 +163,9 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
162
163
|
const searchHash = searchParams.toString();
|
|
163
164
|
if (searchHash == this.searchHash && !this.isFirstRequest) return;
|
|
164
165
|
this.searchHash = searchHash;
|
|
166
|
+
// Nouvelle recherche : ne pas restaurer l'ancienne position de scroll
|
|
167
|
+
this.storedScrollX = 0;
|
|
168
|
+
this.storedScrollY = 0;
|
|
165
169
|
|
|
166
170
|
/**
|
|
167
171
|
* on reset les données avant de lancer la requète
|
|
@@ -188,10 +192,22 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
188
192
|
this.isFirstRequest = false;
|
|
189
193
|
};
|
|
190
194
|
|
|
191
|
-
/**
|
|
195
|
+
/**
|
|
196
|
+
* Conteneur scrollé (élément ou window) — Safari / iOS only.
|
|
197
|
+
* Stock = dernière position user (touch/wheel/pointer + settle inertie).
|
|
198
|
+
* Restore = updated (enfants Lit) + MutationObserver (subscribers / modal).
|
|
199
|
+
*/
|
|
192
200
|
scrollRoot: HTMLElement | Window | null = null;
|
|
193
201
|
storedScrollY = 0;
|
|
194
202
|
storedScrollX = 0;
|
|
203
|
+
private static readonly SCROLL_SETTLE_MS = 150;
|
|
204
|
+
private userScrollEngaged = false;
|
|
205
|
+
private restoringScroll = false;
|
|
206
|
+
private scrollGuardActive = false;
|
|
207
|
+
private scrollSettleTimer?: ReturnType<typeof setTimeout>;
|
|
208
|
+
private mutationObserver: MutationObserver | null = null;
|
|
209
|
+
private boundScrollTarget: EventTarget | null = null;
|
|
210
|
+
private restoreGeneration = 0;
|
|
195
211
|
|
|
196
212
|
resolveScrollRoot(): HTMLElement | Window {
|
|
197
213
|
const ancestor = HTML.getScrollingAncestor(this);
|
|
@@ -205,7 +221,8 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
205
221
|
return ancestor as HTMLElement;
|
|
206
222
|
}
|
|
207
223
|
|
|
208
|
-
|
|
224
|
+
/** Lit la position courante — ne pas appeler sur un scroll “fantôme” Safari. */
|
|
225
|
+
captureScrollPosition() {
|
|
209
226
|
if (!this.isSafari()) {
|
|
210
227
|
return;
|
|
211
228
|
}
|
|
@@ -222,22 +239,35 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
222
239
|
}
|
|
223
240
|
|
|
224
241
|
restoreScrollPosition() {
|
|
242
|
+
if (!this.isSafari()) {
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
225
245
|
const root = this.scrollRoot ?? this.resolveScrollRoot();
|
|
226
246
|
const x = this.storedScrollX;
|
|
227
247
|
const y = this.storedScrollY;
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
248
|
+
this.restoringScroll = true;
|
|
249
|
+
try {
|
|
250
|
+
if (root === window) {
|
|
251
|
+
if (
|
|
252
|
+
Math.abs(x - window.scrollX) > 10 ||
|
|
253
|
+
Math.abs(y - window.scrollY) > 10
|
|
254
|
+
) {
|
|
255
|
+
window.scrollTo(x, y);
|
|
256
|
+
}
|
|
257
|
+
} else {
|
|
258
|
+
const el = root as HTMLElement;
|
|
259
|
+
if (
|
|
260
|
+
Math.abs(x - el.scrollLeft) > 10 ||
|
|
261
|
+
Math.abs(y - el.scrollTop) > 10
|
|
262
|
+
) {
|
|
263
|
+
el.scrollLeft = x;
|
|
264
|
+
el.scrollTop = y;
|
|
265
|
+
}
|
|
234
266
|
}
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
el.scrollLeft = x;
|
|
240
|
-
el.scrollTop = y;
|
|
267
|
+
} finally {
|
|
268
|
+
requestAnimationFrame(() => {
|
|
269
|
+
this.restoringScroll = false;
|
|
270
|
+
});
|
|
241
271
|
}
|
|
242
272
|
}
|
|
243
273
|
|
|
@@ -245,11 +275,150 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
245
275
|
return /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
|
|
246
276
|
}
|
|
247
277
|
|
|
278
|
+
private markUserScrollEngaged = () => {
|
|
279
|
+
this.userScrollEngaged = true;
|
|
280
|
+
};
|
|
281
|
+
|
|
282
|
+
private armScrollSettle = () => {
|
|
283
|
+
clearTimeout(this.scrollSettleTimer);
|
|
284
|
+
this.scrollSettleTimer = setTimeout(() => {
|
|
285
|
+
this.userScrollEngaged = false;
|
|
286
|
+
this.scrollSettleTimer = undefined;
|
|
287
|
+
}, Queue.SCROLL_SETTLE_MS);
|
|
288
|
+
};
|
|
289
|
+
|
|
290
|
+
private onScrollRootScroll = () => {
|
|
291
|
+
if (!this.isSafari() || this.restoringScroll || !this.userScrollEngaged) {
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
this.captureScrollPosition();
|
|
295
|
+
// iOS : l’inertie continue après touchend → prolonger l’engagement
|
|
296
|
+
this.armScrollSettle();
|
|
297
|
+
};
|
|
298
|
+
|
|
299
|
+
private onUserScrollIntent = () => {
|
|
300
|
+
if (!this.isSafari()) return;
|
|
301
|
+
this.markUserScrollEngaged();
|
|
302
|
+
};
|
|
303
|
+
|
|
304
|
+
private onUserScrollIntentEnd = () => {
|
|
305
|
+
if (!this.isSafari()) return;
|
|
306
|
+
this.armScrollSettle();
|
|
307
|
+
};
|
|
308
|
+
|
|
309
|
+
private onWheelIntent = () => {
|
|
310
|
+
if (!this.isSafari()) return;
|
|
311
|
+
this.markUserScrollEngaged();
|
|
312
|
+
this.armScrollSettle();
|
|
313
|
+
};
|
|
314
|
+
|
|
315
|
+
ensureScrollGuard() {
|
|
316
|
+
if (!this.isSafari() || !this.isConnected) {
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
const root = this.resolveScrollRoot();
|
|
320
|
+
const target: EventTarget = root === window ? window : root;
|
|
321
|
+
if (this.scrollGuardActive && this.boundScrollTarget === target) {
|
|
322
|
+
this.scrollRoot = root;
|
|
323
|
+
return;
|
|
324
|
+
}
|
|
325
|
+
this.teardownScrollGuard();
|
|
326
|
+
this.scrollRoot = root;
|
|
327
|
+
this.boundScrollTarget = target;
|
|
328
|
+
this.scrollGuardActive = true;
|
|
329
|
+
|
|
330
|
+
target.addEventListener("scroll", this.onScrollRootScroll, {
|
|
331
|
+
passive: true,
|
|
332
|
+
});
|
|
333
|
+
// Intent user : touch (iOS), wheel, pointer (scrollbar desktop Safari)
|
|
334
|
+
target.addEventListener("touchstart", this.onUserScrollIntent, {
|
|
335
|
+
passive: true,
|
|
336
|
+
});
|
|
337
|
+
target.addEventListener("touchend", this.onUserScrollIntentEnd, {
|
|
338
|
+
passive: true,
|
|
339
|
+
});
|
|
340
|
+
target.addEventListener("touchcancel", this.onUserScrollIntentEnd, {
|
|
341
|
+
passive: true,
|
|
342
|
+
});
|
|
343
|
+
target.addEventListener("wheel", this.onWheelIntent, { passive: true });
|
|
344
|
+
target.addEventListener("pointerdown", this.onUserScrollIntent, {
|
|
345
|
+
passive: true,
|
|
346
|
+
});
|
|
347
|
+
target.addEventListener("pointerup", this.onUserScrollIntentEnd, {
|
|
348
|
+
passive: true,
|
|
349
|
+
});
|
|
350
|
+
target.addEventListener("pointercancel", this.onUserScrollIntentEnd, {
|
|
351
|
+
passive: true,
|
|
352
|
+
});
|
|
353
|
+
|
|
354
|
+
this.mutationObserver = new MutationObserver(() => {
|
|
355
|
+
this.scheduleRestoreAfterChildren();
|
|
356
|
+
});
|
|
357
|
+
this.mutationObserver.observe(this, {
|
|
358
|
+
childList: true,
|
|
359
|
+
subtree: true,
|
|
360
|
+
characterData: true,
|
|
361
|
+
});
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
teardownScrollGuard() {
|
|
365
|
+
this.restoreGeneration++;
|
|
366
|
+
clearTimeout(this.scrollSettleTimer);
|
|
367
|
+
this.scrollSettleTimer = undefined;
|
|
368
|
+
this.userScrollEngaged = false;
|
|
369
|
+
this.restoringScroll = false;
|
|
370
|
+
if (this.boundScrollTarget) {
|
|
371
|
+
const target = this.boundScrollTarget;
|
|
372
|
+
target.removeEventListener("scroll", this.onScrollRootScroll);
|
|
373
|
+
target.removeEventListener("touchstart", this.onUserScrollIntent);
|
|
374
|
+
target.removeEventListener("touchend", this.onUserScrollIntentEnd);
|
|
375
|
+
target.removeEventListener("touchcancel", this.onUserScrollIntentEnd);
|
|
376
|
+
target.removeEventListener("wheel", this.onWheelIntent);
|
|
377
|
+
target.removeEventListener("pointerdown", this.onUserScrollIntent);
|
|
378
|
+
target.removeEventListener("pointerup", this.onUserScrollIntentEnd);
|
|
379
|
+
target.removeEventListener("pointercancel", this.onUserScrollIntentEnd);
|
|
380
|
+
this.boundScrollTarget = null;
|
|
381
|
+
}
|
|
382
|
+
this.mutationObserver?.disconnect();
|
|
383
|
+
this.mutationObserver = null;
|
|
384
|
+
this.scrollGuardActive = false;
|
|
385
|
+
this.scrollRoot = null;
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
/**
|
|
389
|
+
* Attend la fin des updates Lit de la queue + sonic-list, puis 2 rAF (layout Safari).
|
|
390
|
+
* Ne pas await updateComplete *dans* updated (deadlock) — on sort du cycle via void async.
|
|
391
|
+
*/
|
|
392
|
+
scheduleRestoreAfterChildren() {
|
|
393
|
+
if (!this.isSafari() || !this.isConnected) {
|
|
394
|
+
return;
|
|
395
|
+
}
|
|
396
|
+
const generation = ++this.restoreGeneration;
|
|
397
|
+
void (async () => {
|
|
398
|
+
await this.updateComplete;
|
|
399
|
+
if (generation !== this.restoreGeneration || !this.isConnected) return;
|
|
400
|
+
|
|
401
|
+
const lists = Array.from(
|
|
402
|
+
this.querySelectorAll<LitElement>("sonic-list")
|
|
403
|
+
);
|
|
404
|
+
if (lists.length) {
|
|
405
|
+
await Promise.all(lists.map((list) => list.updateComplete));
|
|
406
|
+
}
|
|
407
|
+
if (generation !== this.restoreGeneration || !this.isConnected) return;
|
|
408
|
+
|
|
409
|
+
await new Promise<void>((r) => requestAnimationFrame(() => r()));
|
|
410
|
+
await new Promise<void>((r) => requestAnimationFrame(() => r()));
|
|
411
|
+
if (generation !== this.restoreGeneration || !this.isConnected) return;
|
|
412
|
+
|
|
413
|
+
this.restoreScrollPosition();
|
|
414
|
+
})();
|
|
415
|
+
}
|
|
416
|
+
|
|
248
417
|
protected updated(_changedProperties: PropertyValues): void {
|
|
249
418
|
if (this.isSafari()) {
|
|
419
|
+
this.ensureScrollGuard();
|
|
250
420
|
this.restoreScrollPosition();
|
|
251
|
-
|
|
252
|
-
window.requestAnimationFrame(() => this.restoreScrollPosition());
|
|
421
|
+
this.scheduleRestoreAfterChildren();
|
|
253
422
|
}
|
|
254
423
|
|
|
255
424
|
super.updated(_changedProperties);
|
|
@@ -361,7 +530,11 @@ export default class Queue extends Subscriber(LitElement, {} as QueueProps) {
|
|
|
361
530
|
}
|
|
362
531
|
|
|
363
532
|
render() {
|
|
364
|
-
|
|
533
|
+
// Ne pas écraser le stock avec un jump Safari : uniquement sync du root / guard.
|
|
534
|
+
if (this.isSafari()) {
|
|
535
|
+
this.scrollRoot = this.resolveScrollRoot();
|
|
536
|
+
this.ensureScrollGuard();
|
|
537
|
+
}
|
|
365
538
|
if (!Array.isArray(this.props)) {
|
|
366
539
|
return nothing;
|
|
367
540
|
}
|