@coolon/angular-ui-powerups 16.1.0-alpha.304 → 16.1.0-alpha.306

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.
@@ -19,29 +19,43 @@ export class HighlightPipe extends GarbageCollector {
19
19
  ngOnDestroy() {
20
20
  this.dispose();
21
21
  }
22
+ /** The markup last produced, and the trusted value wrapping it. */
23
+ lastHtml;
24
+ lastResult;
22
25
  /**
23
26
  * Highlights occurrences of `searchModel` within `value`.
24
27
  *
28
+ * The pipe is impure, so it runs on every change detection of its view. It hands back the same
29
+ * trusted value while the markup is unchanged: a fresh one each time would read as a new binding,
30
+ * and an `[innerHTML]` would replace its text on every pass though nothing about it had changed.
31
+ *
25
32
  * @param value The string to search within.
26
33
  * @param searchTextFilter Intercept the search text to allow matching against substrings.
27
34
  */
28
35
  transform(value, searchTextFilter) {
36
+ const html = this.highlight(value, searchTextFilter);
37
+ if (html !== this.lastHtml) {
38
+ this.lastHtml = html;
39
+ this.lastResult = this.sanitizer.bypassSecurityTrustHtml(html);
40
+ }
41
+ return this.lastResult;
42
+ }
43
+ highlight(value, searchTextFilter) {
29
44
  const sanitisedValue = escape(value);
30
45
  const rawModelValue = this.highlightContext?.aupHighlightTextModel?.value ?? '';
31
46
  const filtered = searchTextFilter ? searchTextFilter(rawModelValue) : rawModelValue;
32
47
  const searchText = escape(filtered ?? '');
33
48
  if (isEmpty(searchText) || !isString(value)) {
34
- return this.sanitizer.bypassSecurityTrustHtml(sanitisedValue);
49
+ return sanitisedValue;
35
50
  }
36
51
  // Match in a case insensitive manner
37
52
  const re = new RegExp(escapeStringRegexp(searchText), 'gi');
38
53
  const match = sanitisedValue.match(re);
39
54
  // If there's no match, just return the original value.
40
55
  if (!match) {
41
- return this.sanitizer.bypassSecurityTrustHtml(sanitisedValue);
56
+ return sanitisedValue;
42
57
  }
43
- const result = sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
44
- return this.sanitizer.bypassSecurityTrustHtml(result);
58
+ return sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
45
59
  }
46
60
  static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightPipe, deps: [{ token: i1.DomSanitizer }, { token: i2.HighlightTextModelDirective, optional: true }], target: i0.ɵɵFactoryTarget.Pipe });
47
61
  static ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "16.2.9", ngImport: i0, type: HighlightPipe, name: "aupHighlight", pure: false });
@@ -55,4 +69,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
55
69
  }], ctorParameters: function () { return [{ type: i1.DomSanitizer }, { type: i2.HighlightTextModelDirective, decorators: [{
56
70
  type: Optional
57
71
  }] }]; } });
58
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlnaGxpZ2h0LnBpcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL2FuZ3VsYXItdWktcG93ZXJ1cHMvc3JjL2xpYi9kaXJlY3RpdmVzL2hpZ2hsaWdodC5waXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtIQUFrSDtBQUNsSCxPQUFPLEVBQWEsUUFBUSxFQUFFLElBQUksRUFBaUIsTUFBTSxlQUFlLENBQUM7QUFDekUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxnQkFBZ0IsRUFBYyxNQUFNLGdCQUFnQixDQUFDO0FBQzlELE9BQU8sa0JBQWtCLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3RELE9BQU8sRUFBQywyQkFBMkIsRUFBQyxNQUFNLGtDQUFrQyxDQUFDOzs7O0FBTzdFLE1BQU0sT0FBTyxhQUFjLFNBQVEsZ0JBQWdCO0lBRTdCO0lBQ3FCO0lBRHpDLFlBQW9CLFNBQXVCLEVBQ0YsZ0JBQThDO1FBQ3JGLEtBQUssRUFBRSxDQUFDO1FBRlUsY0FBUyxHQUFULFNBQVMsQ0FBYztRQUNGLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBOEI7SUFFdkYsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDakIsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsU0FBUyxDQUFDLEtBQVUsRUFBRSxnQkFBNEQ7UUFFaEYsTUFBTSxjQUFjLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRXJDLE1BQU0sYUFBYSxHQUFXLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxxQkFBcUIsRUFBRSxLQUFLLElBQUksRUFBRSxDQUFDO1FBQ3hGLE1BQU0sUUFBUSxHQUFHLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDO1FBQ3BGLE1BQU0sVUFBVSxHQUFXLE1BQU0sQ0FBQyxRQUFRLElBQUksRUFBRSxDQUFDLENBQUM7UUFFbEQsSUFBSSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDM0MsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLHVCQUF1QixDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQy9EO1FBRUQscUNBQXFDO1FBQ3JDLE1BQU0sRUFBRSxHQUFHLElBQUksTUFBTSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVELE1BQU0sS0FBSyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFdkMsdURBQXVEO1FBQ3ZELElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDVixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsdUJBQXVCLENBQUMsY0FBYyxDQUFDLENBQUM7U0FDL0Q7UUFHRCxNQUFNLE1BQU0sR0FBRyxjQUFjLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxRQUFRLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQUFDO1FBQzNFLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyx1QkFBdUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4RCxDQUFDO3VHQXpDVSxhQUFhO3FHQUFiLGFBQWE7OzJGQUFiLGFBQWE7a0JBSnpCLElBQUk7bUJBQUM7b0JBQ0osSUFBSSxFQUFFLGNBQWM7b0JBQ3BCLElBQUksRUFBRSxLQUFLO2lCQUNaOzswQkFJYyxRQUFRIiwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgQHR5cGVzY3JpcHQtZXNsaW50L25vLWV4cGxpY2l0LWFueSAtLSBBbmd1bGFyIFBpcGUgdHJhbnNmb3JtIHNpZ25hdHVyZSB1c2VzIGFueSBieSBjb252ZW50aW9uICovXG5pbXBvcnQgeyBPbkRlc3Ryb3ksIE9wdGlvbmFsLCBQaXBlLCBQaXBlVHJhbnNmb3JtIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBEb21TYW5pdGl6ZXIgfSBmcm9tICdAYW5ndWxhci9wbGF0Zm9ybS1icm93c2VyJztcbmltcG9ydCB7IEdhcmJhZ2VDb2xsZWN0b3IsIFZhbHVlTW9kZWwgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgZXNjYXBlU3RyaW5nUmVnZXhwIGZyb20gJ2VzY2FwZS1zdHJpbmctcmVnZXhwJztcbmltcG9ydCB7IGVzY2FwZSwgaXNFbXB0eSwgaXNTdHJpbmcgfSBmcm9tICdsb2Rhc2gtZXMnO1xuaW1wb3J0IHtIaWdobGlnaHRUZXh0TW9kZWxEaXJlY3RpdmV9IGZyb20gJy4vaGlnaGxpZ2h0LXRleHQtbW9kZWwuZGlyZWN0aXZlJztcblxuXG5AUGlwZSh7XG4gIG5hbWU6ICdhdXBIaWdobGlnaHQnLFxuICBwdXJlOiBmYWxzZVxufSlcbmV4cG9ydCBjbGFzcyBIaWdobGlnaHRQaXBlIGV4dGVuZHMgR2FyYmFnZUNvbGxlY3RvciBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0sIE9uRGVzdHJveSB7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBzYW5pdGl6ZXI6IERvbVNhbml0aXplcixcbiAgICAgICAgICAgICAgQE9wdGlvbmFsKCkgcHJpdmF0ZSByZWFkb25seSBoaWdobGlnaHRDb250ZXh0PzogSGlnaGxpZ2h0VGV4dE1vZGVsRGlyZWN0aXZlKSB7XG4gICAgc3VwZXIoKTtcbiAgfVxuXG4gIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgIHRoaXMuZGlzcG9zZSgpO1xuICB9XG5cbiAgLyoqXG4gICAqIEhpZ2hsaWdodHMgb2NjdXJyZW5jZXMgb2YgYHNlYXJjaE1vZGVsYCB3aXRoaW4gYHZhbHVlYC5cbiAgICpcbiAgICogQHBhcmFtIHZhbHVlIFRoZSBzdHJpbmcgdG8gc2VhcmNoIHdpdGhpbi5cbiAgICogQHBhcmFtIHNlYXJjaFRleHRGaWx0ZXIgSW50ZXJjZXB0IHRoZSBzZWFyY2ggdGV4dCB0byBhbGxvdyBtYXRjaGluZyBhZ2FpbnN0IHN1YnN0cmluZ3MuXG4gICAqL1xuICB0cmFuc2Zvcm0odmFsdWU6IGFueSwgc2VhcmNoVGV4dEZpbHRlcj86IChyYXc6c3RyaW5nKSA9PiBzdHJpbmcgfCB1bmRlZmluZWQgfCBudWxsKTogYW55IHtcblxuICAgIGNvbnN0IHNhbml0aXNlZFZhbHVlID0gZXNjYXBlKHZhbHVlKTtcblxuICAgIGNvbnN0IHJhd01vZGVsVmFsdWU6IHN0cmluZyA9IHRoaXMuaGlnaGxpZ2h0Q29udGV4dD8uYXVwSGlnaGxpZ2h0VGV4dE1vZGVsPy52YWx1ZSA/PyAnJztcbiAgICBjb25zdCBmaWx0ZXJlZCA9IHNlYXJjaFRleHRGaWx0ZXIgPyBzZWFyY2hUZXh0RmlsdGVyKHJhd01vZGVsVmFsdWUpIDogcmF3TW9kZWxWYWx1ZTtcbiAgICBjb25zdCBzZWFyY2hUZXh0OiBzdHJpbmcgPSBlc2NhcGUoZmlsdGVyZWQgPz8gJycpO1xuXG4gICAgaWYgKGlzRW1wdHkoc2VhcmNoVGV4dCkgfHwgIWlzU3RyaW5nKHZhbHVlKSkge1xuICAgICAgcmV0dXJuIHRoaXMuc2FuaXRpemVyLmJ5cGFzc1NlY3VyaXR5VHJ1c3RIdG1sKHNhbml0aXNlZFZhbHVlKTtcbiAgICB9XG5cbiAgICAvLyBNYXRjaCBpbiBhIGNhc2UgaW5zZW5zaXRpdmUgbWFubmVyXG4gICAgY29uc3QgcmUgPSBuZXcgUmVnRXhwKGVzY2FwZVN0cmluZ1JlZ2V4cChzZWFyY2hUZXh0KSwgJ2dpJyk7XG4gICAgY29uc3QgbWF0Y2ggPSBzYW5pdGlzZWRWYWx1ZS5tYXRjaChyZSk7XG5cbiAgICAvLyBJZiB0aGVyZSdzIG5vIG1hdGNoLCBqdXN0IHJldHVybiB0aGUgb3JpZ2luYWwgdmFsdWUuXG4gICAgaWYgKCFtYXRjaCkge1xuICAgICAgcmV0dXJuIHRoaXMuc2FuaXRpemVyLmJ5cGFzc1NlY3VyaXR5VHJ1c3RIdG1sKHNhbml0aXNlZFZhbHVlKTtcbiAgICB9XG5cblxuICAgIGNvbnN0IHJlc3VsdCA9IHNhbml0aXNlZFZhbHVlLnJlcGxhY2UocmUsICc8bWFyaz4nICsgbWF0Y2hbMF0gKyAnPC9tYXJrPicpO1xuICAgIHJldHVybiB0aGlzLnNhbml0aXplci5ieXBhc3NTZWN1cml0eVRydXN0SHRtbChyZXN1bHQpO1xuICB9XG59XG4iXX0=
72
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlnaGxpZ2h0LnBpcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL2FuZ3VsYXItdWktcG93ZXJ1cHMvc3JjL2xpYi9kaXJlY3RpdmVzL2hpZ2hsaWdodC5waXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGtIQUFrSDtBQUNsSCxPQUFPLEVBQWEsUUFBUSxFQUFFLElBQUksRUFBaUIsTUFBTSxlQUFlLENBQUM7QUFDekUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxnQkFBZ0IsRUFBYyxNQUFNLGdCQUFnQixDQUFDO0FBQzlELE9BQU8sa0JBQWtCLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3RELE9BQU8sRUFBQywyQkFBMkIsRUFBQyxNQUFNLGtDQUFrQyxDQUFDOzs7O0FBTzdFLE1BQU0sT0FBTyxhQUFjLFNBQVEsZ0JBQWdCO0lBRTdCO0lBQ3FCO0lBRHpDLFlBQW9CLFNBQXVCLEVBQ0YsZ0JBQThDO1FBQ3JGLEtBQUssRUFBRSxDQUFDO1FBRlUsY0FBUyxHQUFULFNBQVMsQ0FBYztRQUNGLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBOEI7SUFFdkYsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDakIsQ0FBQztJQUVELG1FQUFtRTtJQUMzRCxRQUFRLENBQVU7SUFDbEIsVUFBVSxDQUFNO0lBRXhCOzs7Ozs7Ozs7T0FTRztJQUNILFNBQVMsQ0FBQyxLQUFVLEVBQUUsZ0JBQTREO1FBQ2hGLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLGdCQUFnQixDQUFDLENBQUM7UUFDckQsSUFBSSxJQUFJLEtBQUssSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUMxQixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQztZQUNyQixJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDaEU7UUFDRCxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUM7SUFDekIsQ0FBQztJQUVPLFNBQVMsQ0FBQyxLQUFVLEVBQUUsZ0JBQTREO1FBQ3hGLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUVyQyxNQUFNLGFBQWEsR0FBVyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUscUJBQXFCLEVBQUUsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUN4RixNQUFNLFFBQVEsR0FBRyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQztRQUNwRixNQUFNLFVBQVUsR0FBVyxNQUFNLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBRWxELElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzNDLE9BQU8sY0FBYyxDQUFDO1NBQ3ZCO1FBRUQscUNBQXFDO1FBQ3JDLE1BQU0sRUFBRSxHQUFHLElBQUksTUFBTSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVELE1BQU0sS0FBSyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFdkMsdURBQXVEO1FBQ3ZELElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDVixPQUFPLGNBQWMsQ0FBQztTQUN2QjtRQUVELE9BQU8sY0FBYyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsUUFBUSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUNyRSxDQUFDO3VHQXZEVSxhQUFhO3FHQUFiLGFBQWE7OzJGQUFiLGFBQWE7a0JBSnpCLElBQUk7bUJBQUM7b0JBQ0osSUFBSSxFQUFFLGNBQWM7b0JBQ3BCLElBQUksRUFBRSxLQUFLO2lCQUNaOzswQkFJYyxRQUFRIiwic291cmNlc0NvbnRlbnQiOlsiLyogZXNsaW50LWRpc2FibGUgQHR5cGVzY3JpcHQtZXNsaW50L25vLWV4cGxpY2l0LWFueSAtLSBBbmd1bGFyIFBpcGUgdHJhbnNmb3JtIHNpZ25hdHVyZSB1c2VzIGFueSBieSBjb252ZW50aW9uICovXG5pbXBvcnQgeyBPbkRlc3Ryb3ksIE9wdGlvbmFsLCBQaXBlLCBQaXBlVHJhbnNmb3JtIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBEb21TYW5pdGl6ZXIgfSBmcm9tICdAYW5ndWxhci9wbGF0Zm9ybS1icm93c2VyJztcbmltcG9ydCB7IEdhcmJhZ2VDb2xsZWN0b3IsIFZhbHVlTW9kZWwgfSBmcm9tICdAY29vbG9uL3BlY3Rpbic7XG5pbXBvcnQgZXNjYXBlU3RyaW5nUmVnZXhwIGZyb20gJ2VzY2FwZS1zdHJpbmctcmVnZXhwJztcbmltcG9ydCB7IGVzY2FwZSwgaXNFbXB0eSwgaXNTdHJpbmcgfSBmcm9tICdsb2Rhc2gtZXMnO1xuaW1wb3J0IHtIaWdobGlnaHRUZXh0TW9kZWxEaXJlY3RpdmV9IGZyb20gJy4vaGlnaGxpZ2h0LXRleHQtbW9kZWwuZGlyZWN0aXZlJztcblxuXG5AUGlwZSh7XG4gIG5hbWU6ICdhdXBIaWdobGlnaHQnLFxuICBwdXJlOiBmYWxzZVxufSlcbmV4cG9ydCBjbGFzcyBIaWdobGlnaHRQaXBlIGV4dGVuZHMgR2FyYmFnZUNvbGxlY3RvciBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0sIE9uRGVzdHJveSB7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBzYW5pdGl6ZXI6IERvbVNhbml0aXplcixcbiAgICAgICAgICAgICAgQE9wdGlvbmFsKCkgcHJpdmF0ZSByZWFkb25seSBoaWdobGlnaHRDb250ZXh0PzogSGlnaGxpZ2h0VGV4dE1vZGVsRGlyZWN0aXZlKSB7XG4gICAgc3VwZXIoKTtcbiAgfVxuXG4gIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgIHRoaXMuZGlzcG9zZSgpO1xuICB9XG5cbiAgLyoqIFRoZSBtYXJrdXAgbGFzdCBwcm9kdWNlZCwgYW5kIHRoZSB0cnVzdGVkIHZhbHVlIHdyYXBwaW5nIGl0LiAqL1xuICBwcml2YXRlIGxhc3RIdG1sPzogc3RyaW5nO1xuICBwcml2YXRlIGxhc3RSZXN1bHQ6IGFueTtcblxuICAvKipcbiAgICogSGlnaGxpZ2h0cyBvY2N1cnJlbmNlcyBvZiBgc2VhcmNoTW9kZWxgIHdpdGhpbiBgdmFsdWVgLlxuICAgKlxuICAgKiBUaGUgcGlwZSBpcyBpbXB1cmUsIHNvIGl0IHJ1bnMgb24gZXZlcnkgY2hhbmdlIGRldGVjdGlvbiBvZiBpdHMgdmlldy4gSXQgaGFuZHMgYmFjayB0aGUgc2FtZVxuICAgKiB0cnVzdGVkIHZhbHVlIHdoaWxlIHRoZSBtYXJrdXAgaXMgdW5jaGFuZ2VkOiBhIGZyZXNoIG9uZSBlYWNoIHRpbWUgd291bGQgcmVhZCBhcyBhIG5ldyBiaW5kaW5nLFxuICAgKiBhbmQgYW4gYFtpbm5lckhUTUxdYCB3b3VsZCByZXBsYWNlIGl0cyB0ZXh0IG9uIGV2ZXJ5IHBhc3MgdGhvdWdoIG5vdGhpbmcgYWJvdXQgaXQgaGFkIGNoYW5nZWQuXG4gICAqXG4gICAqIEBwYXJhbSB2YWx1ZSBUaGUgc3RyaW5nIHRvIHNlYXJjaCB3aXRoaW4uXG4gICAqIEBwYXJhbSBzZWFyY2hUZXh0RmlsdGVyIEludGVyY2VwdCB0aGUgc2VhcmNoIHRleHQgdG8gYWxsb3cgbWF0Y2hpbmcgYWdhaW5zdCBzdWJzdHJpbmdzLlxuICAgKi9cbiAgdHJhbnNmb3JtKHZhbHVlOiBhbnksIHNlYXJjaFRleHRGaWx0ZXI/OiAocmF3OnN0cmluZykgPT4gc3RyaW5nIHwgdW5kZWZpbmVkIHwgbnVsbCk6IGFueSB7XG4gICAgY29uc3QgaHRtbCA9IHRoaXMuaGlnaGxpZ2h0KHZhbHVlLCBzZWFyY2hUZXh0RmlsdGVyKTtcbiAgICBpZiAoaHRtbCAhPT0gdGhpcy5sYXN0SHRtbCkge1xuICAgICAgdGhpcy5sYXN0SHRtbCA9IGh0bWw7XG4gICAgICB0aGlzLmxhc3RSZXN1bHQgPSB0aGlzLnNhbml0aXplci5ieXBhc3NTZWN1cml0eVRydXN0SHRtbChodG1sKTtcbiAgICB9XG4gICAgcmV0dXJuIHRoaXMubGFzdFJlc3VsdDtcbiAgfVxuXG4gIHByaXZhdGUgaGlnaGxpZ2h0KHZhbHVlOiBhbnksIHNlYXJjaFRleHRGaWx0ZXI/OiAocmF3OnN0cmluZykgPT4gc3RyaW5nIHwgdW5kZWZpbmVkIHwgbnVsbCk6IHN0cmluZyB7XG4gICAgY29uc3Qgc2FuaXRpc2VkVmFsdWUgPSBlc2NhcGUodmFsdWUpO1xuXG4gICAgY29uc3QgcmF3TW9kZWxWYWx1ZTogc3RyaW5nID0gdGhpcy5oaWdobGlnaHRDb250ZXh0Py5hdXBIaWdobGlnaHRUZXh0TW9kZWw/LnZhbHVlID8/ICcnO1xuICAgIGNvbnN0IGZpbHRlcmVkID0gc2VhcmNoVGV4dEZpbHRlciA/IHNlYXJjaFRleHRGaWx0ZXIocmF3TW9kZWxWYWx1ZSkgOiByYXdNb2RlbFZhbHVlO1xuICAgIGNvbnN0IHNlYXJjaFRleHQ6IHN0cmluZyA9IGVzY2FwZShmaWx0ZXJlZCA/PyAnJyk7XG5cbiAgICBpZiAoaXNFbXB0eShzZWFyY2hUZXh0KSB8fCAhaXNTdHJpbmcodmFsdWUpKSB7XG4gICAgICByZXR1cm4gc2FuaXRpc2VkVmFsdWU7XG4gICAgfVxuXG4gICAgLy8gTWF0Y2ggaW4gYSBjYXNlIGluc2Vuc2l0aXZlIG1hbm5lclxuICAgIGNvbnN0IHJlID0gbmV3IFJlZ0V4cChlc2NhcGVTdHJpbmdSZWdleHAoc2VhcmNoVGV4dCksICdnaScpO1xuICAgIGNvbnN0IG1hdGNoID0gc2FuaXRpc2VkVmFsdWUubWF0Y2gocmUpO1xuXG4gICAgLy8gSWYgdGhlcmUncyBubyBtYXRjaCwganVzdCByZXR1cm4gdGhlIG9yaWdpbmFsIHZhbHVlLlxuICAgIGlmICghbWF0Y2gpIHtcbiAgICAgIHJldHVybiBzYW5pdGlzZWRWYWx1ZTtcbiAgICB9XG5cbiAgICByZXR1cm4gc2FuaXRpc2VkVmFsdWUucmVwbGFjZShyZSwgJzxtYXJrPicgKyBtYXRjaFswXSArICc8L21hcms+Jyk7XG4gIH1cbn1cbiJdfQ==
@@ -67,11 +67,16 @@ export class NavigationSession extends GarbageCollector {
67
67
  const snapshot = this.urlService.parseUrl(url);
68
68
  const filteredSegments = Array.from(this._visitSegments.values())
69
69
  .filter(it => snapshot.containsVisitSegment(it));
70
- const visit = Visit.fromSegments(filteredSegments);
70
+ const activeVisit = this.context.activeVisit;
71
+ // A redirect back to the place already showing ends on a route Angular never re-guards, so
72
+ // none of this session's segments survive the filter: the navigation is a return to the
73
+ // active visit.
74
+ const visit = filteredSegments.length > 0
75
+ ? Visit.fromSegments(filteredSegments)
76
+ : Visit.fromSegments(activeVisit?.segments.filter(it => snapshot.containsVisitSegment(it)) ?? []);
71
77
  // Angular only runs guards for routes whose parameters changed, so a place that stays active
72
78
  // (e.g. the parent when Back only changes the child) never reaches this session. Keep its
73
79
  // segment from the active visit, otherwise Visit fills it in with empty parameters.
74
- const activeVisit = this.context.activeVisit;
75
80
  const segments = visit.segments.map(segment => this._visitSegments.has(segment.placeDefinition)
76
81
  ? segment
77
82
  : activeVisit?.getSegmentFor(segment.placeDefinition) ?? segment);
@@ -190,4 +195,4 @@ export class NavigationSession extends GarbageCollector {
190
195
  return context;
191
196
  }
192
197
  }
193
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"navigation-session.js","sourceRoot":"","sources":["../../../../../../../../libs/angular-ui-powerups/src/lib/place/navigation/session/navigation-session.ts"],"names":[],"mappings":"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","sourcesContent":["import {NavigationCancel, NavigationEnd, NavigationError, NavigationStart, RouterEvent} from \"@angular/router\";\nimport {GarbageCollector, lang, Logger} from \"@coolon/pectin\";\nimport type {InteractionContext} from \"../../../interaction/interaction-context\";\nimport type {InteractionServiceRoutingAdapter} from \"../../../interaction/services/interaction-service-routing-adapter\";\nimport type {PlaceComponent} from \"../../place-component\";\nimport type {PlaceDefinition} from \"../../place-definition\";\nimport type {UrlService} from \"../../url-service\";\nimport type {UrlSnapshot} from \"../../url-snapshot\";\nimport {Visit} from \"../../visit\";\nimport type {VisitSegment} from \"../../visit-segment\";\nimport {PlaceComponentDeactivationHandler} from \"../place-component-deactivation-handler\";\nimport type {NavigationContext} from \"./navigation-context\";\n\n/**\n * Transient states\n */\nexport abstract class NavigationSession extends GarbageCollector {\n\n  debugPropertyKeys: string[] = [];\n  private _visitSegments = new Map<PlaceDefinition, VisitSegment>();\n\n  private componentDeactivationHandlers = new Map<PlaceComponent, PlaceComponentDeactivationHandler>();\n  abstract readonly isPopState: boolean;\n\n\n  private _interactionContext: InteractionContext;\n\n  constructor(readonly context: NavigationContext, readonly startingUrl: string) {\n    super();\n    // console.log(`new ${this.constructor.name}`)\n    // TODO: can I get away without creating one every time?\n    this._interactionContext = this.context.routerInteractionAdapter.createNavigationSessionInteractionContext();\n    this.onDispose(() => {\n      // the interaction context can be detached during the back button cancellation state transition\n      // as the transition is synchronous and activityCancellation isn't.  Otherwise dispose will be\n      // called before the context has been cancelled.  It might be work having the interaction context\n      // automatically cancel if the context is disposed so we don't have worry about detaching etc.\n      if (this._interactionContext) {\n        this._interactionContext.dispose(); // or do something like cancelAndDispose?\n      }\n    });\n  }\n\n  get isInteractionSync(): boolean {\n    return false;\n  }\n\n  /**\n   * Interruptible sessions are internal housekeeping navigations (e.g. interaction-id\n   * synchronisation). Historically only these queued an overlapping navigation while real\n   * navigations dropped it; ALL overlapping navigations now queue (see\n   * PlaceRouter.handleOverlappingNavigation), so this flag is diagnostic only.\n   */\n  get isInterruptible(): boolean {\n    return this.isInteractionSync;\n  }\n\n  get name(): string {\n    return this.constructor.name;\n  }\n\n  get urlService(): UrlService {\n    return this.context.urlService;\n  }\n\n  get interactionServiceAdapter(): InteractionServiceRoutingAdapter {\n    return this.context.routerInteractionAdapter;\n  }\n\n  initialiseVisitSegments(visit: Visit) {\n    visit.segments.forEach(it => this.updateVisitSegment(it))\n  }\n\n  updateVisitSegment(segment: VisitSegment) {\n    // console.log(`updateVisitSegment`, segment.toDebugString());\n    this._visitSegments.set(segment.placeDefinition, segment);\n  }\n\n\n  getVisitSegmentFor(placeDef: PlaceDefinition) {\n    const visit = this._visitSegments.get(placeDef);\n    // console.log(`Getting visit for ${placeDef.component.name}`, {visit});\n    return visit;\n  }\n\n  createUpdatedVisit(url: string) :Visit {\n    // The visit segments can have arbirary places in them after redirects\n    // so we have to filter them based on the final url.\n    const snapshot = this.urlService.parseUrl(url);\n    const filteredSegments = Array.from(this._visitSegments.values())\n      .filter(it => snapshot.containsVisitSegment(it));\n    const visit = Visit.fromSegments(filteredSegments);\n    // Angular only runs guards for routes whose parameters changed, so a place that stays active\n    // (e.g. the parent when Back only changes the child) never reaches this session. Keep its\n    // segment from the active visit, otherwise Visit fills it in with empty parameters.\n    const activeVisit = this.context.activeVisit;\n    const segments = visit.segments.map(segment => this._visitSegments.has(segment.placeDefinition)\n      ? segment\n      : activeVisit?.getSegmentFor(segment.placeDefinition) ?? segment);\n    return Visit.fromSegments(segments);\n  }\n\n  get canDeactivateInteractionContext(): InteractionContext {\n    return this._interactionContext;\n  }\n\n  notifyActive() {\n    // noop.\n  }\n\n  onRouterStarted(event: NavigationStart): void {\n    // navigation sessions can have many cancel start cycles due to place guard redirects\n    this.ignore(event);\n  }\n\n  // @Trace()\n  onUrlChange(url: string) {\n    // Normally we just ignore these but they are the only way of detecting if the back button\n    // was clicked during a canDeactivate promise.\n    // 1. a route is in progress and awaiting a canDeactivateGuard\n    // 2. the user the clicks the back button.\n    // So to handle that scenario we need to check if we've got a can deactivate interaction in\n    // progress and the do the appropriate clean up.\n    if (this.canDeactivateInteractionContext && this.canDeactivateInteractionContext.isActive()) {\n      this.cancelCanDeactivateInteraction(url);\n    }\n  }\n\n  onPopState(event: NavigationStart): void {\n    return this.illegalTransition(event);\n  }\n\n  onRouterCancelled(event: NavigationCancel): void {\n    return this.illegalTransition(event);\n  }\n\n  onRouterError(event: NavigationError): void {\n    return this.illegalTransition(event);\n  }\n\n  onRouterEnd(event: NavigationEnd): void {\n    return this.illegalTransition(event);\n  }\n\n  getVisitSegments(): VisitSegment[] {\n    return Array.from(this._visitSegments.values());\n  }\n\n  protected illegalTransition<R>(message: string | RouterEvent): R {\n    return lang.illegalState(`${message.toString()} not supported by ${this.toString()}`);\n  }\n\n  protected currentRouterUrl(): string {\n    return this.urlService.getCurrentRouterUrl();\n  }\n\n  resetBrowserLocation(url, options: { replaceCurrent: boolean } = { replaceCurrent: false }) {\n    // console.log(`---> resetting browser location to: ${url}`);\n    this.urlService.resetBrowserLocation(url, options);\n  }\n\n  // @Trace()\n  protected repairBrowserHistoryAndUrlAfterGuardCancellation(poppedHistoryToReplace: string, activeUrl: string): void {\n    // Important: I tried to perform this fix at a later point int he routing cycle but it created all kinds of\n    // strangeness.\n    Logger.get(this).info(\"WORK-AROUND: Updating browser location after pop state - see angular issue #13586\");\n    // console.log(`replacing ${this.urlService.getCurrentLocationUrlSnapshot().url} with ${poppedHistoryToReplace}`);\n    this.urlService.resetBrowserLocation(poppedHistoryToReplace, { replaceCurrent: true });\n    // console.log(`pushing ${activeUrl} back onto the history.`);\n    this.urlService.resetBrowserLocation(activeUrl, { replaceCurrent: false });\n  }\n\n\n  ignore(event: RouterEvent, reason?: string): void {\n    reason = reason ? ` -> ${reason}` : \"\";\n    // Logger.get(this).info(`Ignoring router event${reason}: ${event.constructor.name} -> ${event.url} :: ${this.toString()}`);\n  }\n\n  override toString(): string {\n    return `${this.constructor.name}(${this.debugState()})`;\n  }\n\n  protected debugState(properties?: string[]) {\n    return (properties || this.debugPropertyKeys).map(p => {\n      return `${p}: ${this[p]}`;\n    }).join(\", \");\n  }\n\n  async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {\n    // console.log(`---> canDeactivatePlace(${component.placeDefinition.path}, ${currentUrl.url} -> ${nextUrl.url})`);\n    // lookup the handler and create it if we've not seen it yet\n    let handler = this.componentDeactivationHandlers.get(component);\n    if (!handler) {\n      const isPrimaryHandler = this.componentDeactivationHandlers.size === 0; // only primary handler cancels the app model interations\n      handler = new PlaceComponentDeactivationHandler(component, this, isPrimaryHandler);\n      this.componentDeactivationHandlers.set(component, handler);\n    }\n    return handler.canDeactivate(currentUrl, nextUrl).then(result => {\n      // console.log(`<--- canDeactivatePlace(${component.placeDefinition.path}): ${result}`);\n      return result;\n    }).catch(error => {\n      throw error;\n    });\n  }\n\n  cancelCanDeactivateInteraction(newUrl: string): void {\n    Logger.get(this).info(`back button pressed during navigation session interaction promise`);\n    // detach the interaction from the session so it doesn't get disposed until the activity has finished\n    // all it's things.\n    const canDeactivateInteractionContext = this.detachCanDeactivateInteractionContext();\n    // TODO: I need to make the exclusive interaction context disallow nested activities or\n    //       that would mess things up entirely. Or, can I do a context.abortAll().then(..)\n    Logger.get(this).info(\"cancelling current navigation activity..\");\n    canDeactivateInteractionContext.cancelActiveActivity().then(() => {\n      canDeactivateInteractionContext.dispose();\n    });\n\n    this.handleCanDeactivateCancelledEventScenario(newUrl);\n  }\n\n  abstract handleCanDeactivateCancelledEventScenario(newUrl: string): void\n\n  protected reinstateUrlAfterAngularChangedItOnCancellation(url: string) {\n    // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.\n    // So this means that the top of the stack is the url we want to go back to, and not the one that was on\n    // it before the cancel event fired.\n    // So we need to:\n    // - replace the just inserted url with the one that used to be there.\n    // - push our actual url back onto the top of the stack.\n    this.resetBrowserLocation(url, { replaceCurrent: true });\n  }\n\n  protected detachCanDeactivateInteractionContext(): InteractionContext {\n    const context = this._interactionContext;\n    this._interactionContext = null;\n    return context;\n  }\n}\n"]}
198
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"navigation-session.js","sourceRoot":"","sources":["../../../../../../../../libs/angular-ui-powerups/src/lib/place/navigation/session/navigation-session.ts"],"names":[],"mappings":"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","sourcesContent":["import {NavigationCancel, NavigationEnd, NavigationError, NavigationStart, RouterEvent} from \"@angular/router\";\nimport {GarbageCollector, lang, Logger} from \"@coolon/pectin\";\nimport type {InteractionContext} from \"../../../interaction/interaction-context\";\nimport type {InteractionServiceRoutingAdapter} from \"../../../interaction/services/interaction-service-routing-adapter\";\nimport type {PlaceComponent} from \"../../place-component\";\nimport type {PlaceDefinition} from \"../../place-definition\";\nimport type {UrlService} from \"../../url-service\";\nimport type {UrlSnapshot} from \"../../url-snapshot\";\nimport {Visit} from \"../../visit\";\nimport type {VisitSegment} from \"../../visit-segment\";\nimport {PlaceComponentDeactivationHandler} from \"../place-component-deactivation-handler\";\nimport type {NavigationContext} from \"./navigation-context\";\n\n/**\n * Transient states\n */\nexport abstract class NavigationSession extends GarbageCollector {\n\n  debugPropertyKeys: string[] = [];\n  private _visitSegments = new Map<PlaceDefinition, VisitSegment>();\n\n  private componentDeactivationHandlers = new Map<PlaceComponent, PlaceComponentDeactivationHandler>();\n  abstract readonly isPopState: boolean;\n\n\n  private _interactionContext: InteractionContext;\n\n  constructor(readonly context: NavigationContext, readonly startingUrl: string) {\n    super();\n    // console.log(`new ${this.constructor.name}`)\n    // TODO: can I get away without creating one every time?\n    this._interactionContext = this.context.routerInteractionAdapter.createNavigationSessionInteractionContext();\n    this.onDispose(() => {\n      // the interaction context can be detached during the back button cancellation state transition\n      // as the transition is synchronous and activityCancellation isn't.  Otherwise dispose will be\n      // called before the context has been cancelled.  It might be work having the interaction context\n      // automatically cancel if the context is disposed so we don't have worry about detaching etc.\n      if (this._interactionContext) {\n        this._interactionContext.dispose(); // or do something like cancelAndDispose?\n      }\n    });\n  }\n\n  get isInteractionSync(): boolean {\n    return false;\n  }\n\n  /**\n   * Interruptible sessions are internal housekeeping navigations (e.g. interaction-id\n   * synchronisation). Historically only these queued an overlapping navigation while real\n   * navigations dropped it; ALL overlapping navigations now queue (see\n   * PlaceRouter.handleOverlappingNavigation), so this flag is diagnostic only.\n   */\n  get isInterruptible(): boolean {\n    return this.isInteractionSync;\n  }\n\n  get name(): string {\n    return this.constructor.name;\n  }\n\n  get urlService(): UrlService {\n    return this.context.urlService;\n  }\n\n  get interactionServiceAdapter(): InteractionServiceRoutingAdapter {\n    return this.context.routerInteractionAdapter;\n  }\n\n  initialiseVisitSegments(visit: Visit) {\n    visit.segments.forEach(it => this.updateVisitSegment(it))\n  }\n\n  updateVisitSegment(segment: VisitSegment) {\n    // console.log(`updateVisitSegment`, segment.toDebugString());\n    this._visitSegments.set(segment.placeDefinition, segment);\n  }\n\n\n  getVisitSegmentFor(placeDef: PlaceDefinition) {\n    const visit = this._visitSegments.get(placeDef);\n    // console.log(`Getting visit for ${placeDef.component.name}`, {visit});\n    return visit;\n  }\n\n  createUpdatedVisit(url: string) :Visit {\n    // The visit segments can have arbirary places in them after redirects\n    // so we have to filter them based on the final url.\n    const snapshot = this.urlService.parseUrl(url);\n    const filteredSegments = Array.from(this._visitSegments.values())\n      .filter(it => snapshot.containsVisitSegment(it));\n    const activeVisit = this.context.activeVisit;\n    // A redirect back to the place already showing ends on a route Angular never re-guards, so\n    // none of this session's segments survive the filter: the navigation is a return to the\n    // active visit.\n    const visit = filteredSegments.length > 0\n      ? Visit.fromSegments(filteredSegments)\n      : Visit.fromSegments(activeVisit?.segments.filter(it => snapshot.containsVisitSegment(it)) ?? []);\n    // Angular only runs guards for routes whose parameters changed, so a place that stays active\n    // (e.g. the parent when Back only changes the child) never reaches this session. Keep its\n    // segment from the active visit, otherwise Visit fills it in with empty parameters.\n    const segments = visit.segments.map(segment => this._visitSegments.has(segment.placeDefinition)\n      ? segment\n      : activeVisit?.getSegmentFor(segment.placeDefinition) ?? segment);\n    return Visit.fromSegments(segments);\n  }\n\n  get canDeactivateInteractionContext(): InteractionContext {\n    return this._interactionContext;\n  }\n\n  notifyActive() {\n    // noop.\n  }\n\n  onRouterStarted(event: NavigationStart): void {\n    // navigation sessions can have many cancel start cycles due to place guard redirects\n    this.ignore(event);\n  }\n\n  // @Trace()\n  onUrlChange(url: string) {\n    // Normally we just ignore these but they are the only way of detecting if the back button\n    // was clicked during a canDeactivate promise.\n    // 1. a route is in progress and awaiting a canDeactivateGuard\n    // 2. the user the clicks the back button.\n    // So to handle that scenario we need to check if we've got a can deactivate interaction in\n    // progress and the do the appropriate clean up.\n    if (this.canDeactivateInteractionContext && this.canDeactivateInteractionContext.isActive()) {\n      this.cancelCanDeactivateInteraction(url);\n    }\n  }\n\n  onPopState(event: NavigationStart): void {\n    return this.illegalTransition(event);\n  }\n\n  onRouterCancelled(event: NavigationCancel): void {\n    return this.illegalTransition(event);\n  }\n\n  onRouterError(event: NavigationError): void {\n    return this.illegalTransition(event);\n  }\n\n  onRouterEnd(event: NavigationEnd): void {\n    return this.illegalTransition(event);\n  }\n\n  getVisitSegments(): VisitSegment[] {\n    return Array.from(this._visitSegments.values());\n  }\n\n  protected illegalTransition<R>(message: string | RouterEvent): R {\n    return lang.illegalState(`${message.toString()} not supported by ${this.toString()}`);\n  }\n\n  protected currentRouterUrl(): string {\n    return this.urlService.getCurrentRouterUrl();\n  }\n\n  resetBrowserLocation(url, options: { replaceCurrent: boolean } = { replaceCurrent: false }) {\n    // console.log(`---> resetting browser location to: ${url}`);\n    this.urlService.resetBrowserLocation(url, options);\n  }\n\n  // @Trace()\n  protected repairBrowserHistoryAndUrlAfterGuardCancellation(poppedHistoryToReplace: string, activeUrl: string): void {\n    // Important: I tried to perform this fix at a later point int he routing cycle but it created all kinds of\n    // strangeness.\n    Logger.get(this).info(\"WORK-AROUND: Updating browser location after pop state - see angular issue #13586\");\n    // console.log(`replacing ${this.urlService.getCurrentLocationUrlSnapshot().url} with ${poppedHistoryToReplace}`);\n    this.urlService.resetBrowserLocation(poppedHistoryToReplace, { replaceCurrent: true });\n    // console.log(`pushing ${activeUrl} back onto the history.`);\n    this.urlService.resetBrowserLocation(activeUrl, { replaceCurrent: false });\n  }\n\n\n  ignore(event: RouterEvent, reason?: string): void {\n    reason = reason ? ` -> ${reason}` : \"\";\n    // Logger.get(this).info(`Ignoring router event${reason}: ${event.constructor.name} -> ${event.url} :: ${this.toString()}`);\n  }\n\n  override toString(): string {\n    return `${this.constructor.name}(${this.debugState()})`;\n  }\n\n  protected debugState(properties?: string[]) {\n    return (properties || this.debugPropertyKeys).map(p => {\n      return `${p}: ${this[p]}`;\n    }).join(\", \");\n  }\n\n  async canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot> {\n    // console.log(`---> canDeactivatePlace(${component.placeDefinition.path}, ${currentUrl.url} -> ${nextUrl.url})`);\n    // lookup the handler and create it if we've not seen it yet\n    let handler = this.componentDeactivationHandlers.get(component);\n    if (!handler) {\n      const isPrimaryHandler = this.componentDeactivationHandlers.size === 0; // only primary handler cancels the app model interations\n      handler = new PlaceComponentDeactivationHandler(component, this, isPrimaryHandler);\n      this.componentDeactivationHandlers.set(component, handler);\n    }\n    return handler.canDeactivate(currentUrl, nextUrl).then(result => {\n      // console.log(`<--- canDeactivatePlace(${component.placeDefinition.path}): ${result}`);\n      return result;\n    }).catch(error => {\n      throw error;\n    });\n  }\n\n  cancelCanDeactivateInteraction(newUrl: string): void {\n    Logger.get(this).info(`back button pressed during navigation session interaction promise`);\n    // detach the interaction from the session so it doesn't get disposed until the activity has finished\n    // all it's things.\n    const canDeactivateInteractionContext = this.detachCanDeactivateInteractionContext();\n    // TODO: I need to make the exclusive interaction context disallow nested activities or\n    //       that would mess things up entirely. Or, can I do a context.abortAll().then(..)\n    Logger.get(this).info(\"cancelling current navigation activity..\");\n    canDeactivateInteractionContext.cancelActiveActivity().then(() => {\n      canDeactivateInteractionContext.dispose();\n    });\n\n    this.handleCanDeactivateCancelledEventScenario(newUrl);\n  }\n\n  abstract handleCanDeactivateCancelledEventScenario(newUrl: string): void\n\n  protected reinstateUrlAfterAngularChangedItOnCancellation(url: string) {\n    // Angular calls _this.resetUrlToCurrentUrlTree() on cancelling and fucks our history.\n    // So this means that the top of the stack is the url we want to go back to, and not the one that was on\n    // it before the cancel event fired.\n    // So we need to:\n    // - replace the just inserted url with the one that used to be there.\n    // - push our actual url back onto the top of the stack.\n    this.resetBrowserLocation(url, { replaceCurrent: true });\n  }\n\n  protected detachCanDeactivateInteractionContext(): InteractionContext {\n    const context = this._interactionContext;\n    this._interactionContext = null;\n    return context;\n  }\n}\n"]}
@@ -673,29 +673,43 @@ class HighlightPipe extends GarbageCollector {
673
673
  ngOnDestroy() {
674
674
  this.dispose();
675
675
  }
676
+ /** The markup last produced, and the trusted value wrapping it. */
677
+ lastHtml;
678
+ lastResult;
676
679
  /**
677
680
  * Highlights occurrences of `searchModel` within `value`.
678
681
  *
682
+ * The pipe is impure, so it runs on every change detection of its view. It hands back the same
683
+ * trusted value while the markup is unchanged: a fresh one each time would read as a new binding,
684
+ * and an `[innerHTML]` would replace its text on every pass though nothing about it had changed.
685
+ *
679
686
  * @param value The string to search within.
680
687
  * @param searchTextFilter Intercept the search text to allow matching against substrings.
681
688
  */
682
689
  transform(value, searchTextFilter) {
690
+ const html = this.highlight(value, searchTextFilter);
691
+ if (html !== this.lastHtml) {
692
+ this.lastHtml = html;
693
+ this.lastResult = this.sanitizer.bypassSecurityTrustHtml(html);
694
+ }
695
+ return this.lastResult;
696
+ }
697
+ highlight(value, searchTextFilter) {
683
698
  const sanitisedValue = escape(value);
684
699
  const rawModelValue = this.highlightContext?.aupHighlightTextModel?.value ?? '';
685
700
  const filtered = searchTextFilter ? searchTextFilter(rawModelValue) : rawModelValue;
686
701
  const searchText = escape(filtered ?? '');
687
702
  if (isEmpty(searchText) || !isString(value)) {
688
- return this.sanitizer.bypassSecurityTrustHtml(sanitisedValue);
703
+ return sanitisedValue;
689
704
  }
690
705
  // Match in a case insensitive manner
691
706
  const re = new RegExp(escapeStringRegexp(searchText), 'gi');
692
707
  const match = sanitisedValue.match(re);
693
708
  // If there's no match, just return the original value.
694
709
  if (!match) {
695
- return this.sanitizer.bypassSecurityTrustHtml(sanitisedValue);
710
+ return sanitisedValue;
696
711
  }
697
- const result = sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
698
- return this.sanitizer.bypassSecurityTrustHtml(result);
712
+ return sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
699
713
  }
700
714
  static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightPipe, deps: [{ token: i1.DomSanitizer }, { token: HighlightTextModelDirective, optional: true }], target: i0.ɵɵFactoryTarget.Pipe });
701
715
  static ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "16.2.9", ngImport: i0, type: HighlightPipe, name: "aupHighlight", pure: false });
@@ -10026,11 +10040,16 @@ class NavigationSession extends GarbageCollector {
10026
10040
  const snapshot = this.urlService.parseUrl(url);
10027
10041
  const filteredSegments = Array.from(this._visitSegments.values())
10028
10042
  .filter(it => snapshot.containsVisitSegment(it));
10029
- const visit = Visit.fromSegments(filteredSegments);
10043
+ const activeVisit = this.context.activeVisit;
10044
+ // A redirect back to the place already showing ends on a route Angular never re-guards, so
10045
+ // none of this session's segments survive the filter: the navigation is a return to the
10046
+ // active visit.
10047
+ const visit = filteredSegments.length > 0
10048
+ ? Visit.fromSegments(filteredSegments)
10049
+ : Visit.fromSegments(activeVisit?.segments.filter(it => snapshot.containsVisitSegment(it)) ?? []);
10030
10050
  // Angular only runs guards for routes whose parameters changed, so a place that stays active
10031
10051
  // (e.g. the parent when Back only changes the child) never reaches this session. Keep its
10032
10052
  // segment from the active visit, otherwise Visit fills it in with empty parameters.
10033
- const activeVisit = this.context.activeVisit;
10034
10053
  const segments = visit.segments.map(segment => this._visitSegments.has(segment.placeDefinition)
10035
10054
  ? segment
10036
10055
  : activeVisit?.getSegmentFor(segment.placeDefinition) ?? segment);