@coolon/angular-ui-powerups 16.1.0-aplpha.127 → 16.1.0-aplpha.128
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/esm2022/lib/components/tables/renderer/default-cell-renderer/default-cell-renderer.component.mjs +3 -3
- package/esm2022/lib/directives/highlight.pipe.mjs +8 -5
- package/fesm2022/coolon-angular-ui-powerups.mjs +9 -7
- package/fesm2022/coolon-angular-ui-powerups.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -10,12 +10,12 @@ export class DefaultCellRendererComponent {
|
|
|
10
10
|
return this._value;
|
|
11
11
|
}
|
|
12
12
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
13
|
-
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString()| aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: i1.HighlightPipe, name: "aupHighlight" }] });
|
|
13
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: i1.HighlightPipe, name: "aupHighlight" }] });
|
|
14
14
|
}
|
|
15
15
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, decorators: [{
|
|
16
16
|
type: Component,
|
|
17
|
-
args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString()| aupHighlight\"></span>\n" }]
|
|
17
|
+
args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n" }]
|
|
18
18
|
}], propDecorators: { value: [{
|
|
19
19
|
type: Input
|
|
20
20
|
}] } });
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC1jZWxsLXJlbmRlcmVyLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvYW5ndWxhci11aS1wb3dlcnVwcy9zcmMvbGliL2NvbXBvbmVudHMvdGFibGVzL3JlbmRlcmVyL2RlZmF1bHQtY2VsbC1yZW5kZXJlci9kZWZhdWx0LWNlbGwtcmVuZGVyZXIuY29tcG9uZW50LnRzIiwiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vbGlicy9hbmd1bGFyLXVpLXBvd2VydXBzL3NyYy9saWIvY29tcG9uZW50cy90YWJsZXMvcmVuZGVyZXIvZGVmYXVsdC1jZWxsLXJlbmRlcmVyL2RlZmF1bHQtY2VsbC1yZW5kZXJlci5jb21wb25lbnQuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsU0FBUyxFQUFFLEtBQUssRUFBQyxNQUFNLGVBQWUsQ0FBQzs7O0FBUy9DLE1BQU0sT0FBTyw0QkFBNEI7SUFDL0IsTUFBTSxDQUFJO0lBRWxCLElBQ0ksS0FBSyxDQUFDLEtBQVE7UUFDaEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUM7SUFDdEIsQ0FBQztJQUVELElBQUksS0FBSztRQUNQLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDO3VHQVZVLDRCQUE0QjsyRkFBNUIsNEJBQTRCLDZGQ1R6QyxrRUFDQTs7MkZEUWEsNEJBQTRCO2tCQUx4QyxTQUFTOytCQUNFLDJCQUEyQjs4QkFRakMsS0FBSztzQkFEUixLQUFLIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtDb21wb25lbnQsIElucHV0fSBmcm9tIFwiQGFuZ3VsYXIvY29yZVwiO1xuaW1wb3J0IHtDZWxsUmVuZGVyZXJ9IGZyb20gXCIuLi9jZWxsLXJlbmRlcmVyXCI7XG5cblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiBcImF1cC1kZWZhdWx0LWNlbGwtcmVuZGVyZXJcIixcbiAgdGVtcGxhdGVVcmw6IFwiLi9kZWZhdWx0LWNlbGwtcmVuZGVyZXIuY29tcG9uZW50Lmh0bWxcIixcbiAgc3R5bGVVcmxzOiBbXCIuL2RlZmF1bHQtY2VsbC1yZW5kZXJlci5jb21wb25lbnQuc2Nzc1wiXVxufSlcbmV4cG9ydCBjbGFzcyBEZWZhdWx0Q2VsbFJlbmRlcmVyQ29tcG9uZW50PFQ+IGltcGxlbWVudHMgQ2VsbFJlbmRlcmVyPFQ+IHtcbiAgcHJpdmF0ZSBfdmFsdWU6IFQ7XG5cbiAgQElucHV0KClcbiAgc2V0IHZhbHVlKHZhbHVlOiBUKSB7XG4gICAgdGhpcy5fdmFsdWUgPSB2YWx1ZTtcbiAgfVxuXG4gIGdldCB2YWx1ZSgpOiBUIHtcbiAgICByZXR1cm4gdGhpcy5fdmFsdWU7XG4gIH1cbn1cbiIsIjxzcGFuIFtpbm5lckhUTUxdPVwidmFsdWU/LnRvU3RyaW5nKCkgfCBhdXBIaWdobGlnaHRcIj48L3NwYW4+XG4iXX0=
|
|
@@ -2,6 +2,7 @@ import { Optional, Pipe } from '@angular/core';
|
|
|
2
2
|
import { DomSanitizer } from '@angular/platform-browser';
|
|
3
3
|
import { GarbageCollector } from '@coolon/pectin';
|
|
4
4
|
import escapeStringRegexp from "escape-string-regexp";
|
|
5
|
+
import { escape } from "lodash-es";
|
|
5
6
|
import { isEmpty, isString } from 'lodash-es';
|
|
6
7
|
import { HighlightTextModelDirective } from './highlight-text-model.directive';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
@@ -19,19 +20,21 @@ export class HighlightPipe extends GarbageCollector {
|
|
|
19
20
|
this.dispose();
|
|
20
21
|
}
|
|
21
22
|
transform(value, searchModel) {
|
|
23
|
+
const sanitisedValue = escape(value);
|
|
24
|
+
console.log(sanitisedValue);
|
|
22
25
|
const model = searchModel ?? this.highlightContext?.aupHighlightTextModel;
|
|
23
26
|
const searchText = model?.value;
|
|
24
27
|
if (isEmpty(searchText) || !isString(value)) {
|
|
25
|
-
return
|
|
28
|
+
return sanitisedValue;
|
|
26
29
|
}
|
|
27
30
|
// Match in a case insensitive manner
|
|
28
31
|
const re = new RegExp(escapeStringRegexp(searchText), 'gi');
|
|
29
|
-
const match =
|
|
32
|
+
const match = sanitisedValue.match(re);
|
|
30
33
|
// If there's no match, just return the original value.
|
|
31
34
|
if (!match) {
|
|
32
|
-
return
|
|
35
|
+
return sanitisedValue;
|
|
33
36
|
}
|
|
34
|
-
const result =
|
|
37
|
+
const result = sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
|
|
35
38
|
return this.sanitizer.bypassSecurityTrustHtml(result);
|
|
36
39
|
}
|
|
37
40
|
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 });
|
|
@@ -46,4 +49,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
|
|
|
46
49
|
}], ctorParameters: function () { return [{ type: i1.DomSanitizer }, { type: i2.HighlightTextModelDirective, decorators: [{
|
|
47
50
|
type: Optional
|
|
48
51
|
}] }]; } });
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlnaGxpZ2h0LnBpcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL2FuZ3VsYXItdWktcG93ZXJ1cHMvc3JjL2xpYi9kaXJlY3RpdmVzL2hpZ2hsaWdodC5waXBlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBWSxRQUFRLEVBQUUsSUFBSSxFQUFpQyxNQUFNLGVBQWUsQ0FBQztBQUN4RixPQUFPLEVBQUMsWUFBWSxFQUFDLE1BQU0sMkJBQTJCLENBQUM7QUFDdkQsT0FBTyxFQUFDLGdCQUFnQixFQUFhLE1BQU0sZ0JBQWdCLENBQUM7QUFDNUQsT0FBTyxrQkFBa0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN0RCxPQUFPLEVBQUMsTUFBTSxFQUFDLE1BQU0sV0FBVyxDQUFDO0FBRWpDLE9BQU8sRUFBQyxPQUFPLEVBQUUsUUFBUSxFQUFDLE1BQU0sV0FBVyxDQUFDO0FBQzVDLE9BQU8sRUFBQywyQkFBMkIsRUFBQyxNQUFNLGtDQUFrQyxDQUFDOzs7O0FBTzdFLE1BQU0sT0FBTyxhQUFjLFNBQVEsZ0JBQWdCO0lBRTdCO0lBQ3FCO0lBRHpDLFlBQW9CLFNBQXVCLEVBQ0YsZ0JBQThDO1FBQ3JGLEtBQUssRUFBRSxDQUFDO1FBRlUsY0FBUyxHQUFULFNBQVMsQ0FBYztRQUNGLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBOEI7SUFFdkYsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDakIsQ0FBQztJQUVELFNBQVMsQ0FBQyxLQUFVLEVBQUUsV0FBZ0M7UUFFcEQsTUFBTSxjQUFjLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDNUIsTUFBTSxLQUFLLEdBQUcsV0FBVyxJQUFJLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxxQkFBcUIsQ0FBQztRQUUxRSxNQUFNLFVBQVUsR0FBVyxLQUFLLEVBQUUsS0FBSyxDQUFDO1FBRXhDLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzNDLE9BQU8sY0FBYyxDQUFDO1NBQ3ZCO1FBRUQscUNBQXFDO1FBQ3JDLE1BQU0sRUFBRSxHQUFHLElBQUksTUFBTSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVELE1BQU0sS0FBSyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFdkMsdURBQXVEO1FBQ3ZELElBQUksQ0FBQyxLQUFLLEVBQUU7WUFDVixPQUFPLGNBQWMsQ0FBQztTQUN2QjtRQUdELE1BQU0sTUFBTSxHQUFHLGNBQWMsQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLFFBQVEsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBQUM7UUFDM0UsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLHVCQUF1QixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3hELENBQUM7dUdBbkNVLGFBQWE7cUdBQWIsYUFBYTs7MkZBQWIsYUFBYTtrQkFKekIsSUFBSTttQkFBQztvQkFDSixJQUFJLEVBQUUsY0FBYztvQkFDcEIsSUFBSSxFQUFFLEtBQUs7aUJBQ1o7OzBCQUljLFFBQVEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge09uRGVzdHJveSwgT3B0aW9uYWwsIFBpcGUsIFBpcGVUcmFuc2Zvcm0sIFNlY3VyaXR5Q29udGV4dH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge0RvbVNhbml0aXplcn0gZnJvbSAnQGFuZ3VsYXIvcGxhdGZvcm0tYnJvd3Nlcic7XG5pbXBvcnQge0dhcmJhZ2VDb2xsZWN0b3IsIFZhbHVlTW9kZWx9IGZyb20gJ0Bjb29sb24vcGVjdGluJztcbmltcG9ydCBlc2NhcGVTdHJpbmdSZWdleHAgZnJvbSBcImVzY2FwZS1zdHJpbmctcmVnZXhwXCI7XG5pbXBvcnQge2VzY2FwZX0gZnJvbSBcImxvZGFzaC1lc1wiO1xuXG5pbXBvcnQge2lzRW1wdHksIGlzU3RyaW5nfSBmcm9tICdsb2Rhc2gtZXMnO1xuaW1wb3J0IHtIaWdobGlnaHRUZXh0TW9kZWxEaXJlY3RpdmV9IGZyb20gJy4vaGlnaGxpZ2h0LXRleHQtbW9kZWwuZGlyZWN0aXZlJztcblxuXG5AUGlwZSh7XG4gIG5hbWU6ICdhdXBIaWdobGlnaHQnLFxuICBwdXJlOiBmYWxzZVxufSlcbmV4cG9ydCBjbGFzcyBIaWdobGlnaHRQaXBlIGV4dGVuZHMgR2FyYmFnZUNvbGxlY3RvciBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0sIE9uRGVzdHJveSB7XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSBzYW5pdGl6ZXI6IERvbVNhbml0aXplcixcbiAgICAgICAgICAgICAgQE9wdGlvbmFsKCkgcHJpdmF0ZSByZWFkb25seSBoaWdobGlnaHRDb250ZXh0PzogSGlnaGxpZ2h0VGV4dE1vZGVsRGlyZWN0aXZlKSB7XG4gICAgc3VwZXIoKTtcbiAgfVxuXG4gIG5nT25EZXN0cm95KCk6IHZvaWQge1xuICAgIHRoaXMuZGlzcG9zZSgpO1xuICB9XG5cbiAgdHJhbnNmb3JtKHZhbHVlOiBhbnksIHNlYXJjaE1vZGVsPzogVmFsdWVNb2RlbDxzdHJpbmc+KTogYW55IHtcblxuICAgIGNvbnN0IHNhbml0aXNlZFZhbHVlID0gZXNjYXBlKHZhbHVlKVxuICAgIGNvbnNvbGUubG9nKHNhbml0aXNlZFZhbHVlKTtcbiAgICBjb25zdCBtb2RlbCA9IHNlYXJjaE1vZGVsID8/IHRoaXMuaGlnaGxpZ2h0Q29udGV4dD8uYXVwSGlnaGxpZ2h0VGV4dE1vZGVsO1xuXG4gICAgY29uc3Qgc2VhcmNoVGV4dDogc3RyaW5nID0gbW9kZWw/LnZhbHVlO1xuXG4gICAgaWYgKGlzRW1wdHkoc2VhcmNoVGV4dCkgfHwgIWlzU3RyaW5nKHZhbHVlKSkge1xuICAgICAgcmV0dXJuIHNhbml0aXNlZFZhbHVlO1xuICAgIH1cblxuICAgIC8vIE1hdGNoIGluIGEgY2FzZSBpbnNlbnNpdGl2ZSBtYW5uZXJcbiAgICBjb25zdCByZSA9IG5ldyBSZWdFeHAoZXNjYXBlU3RyaW5nUmVnZXhwKHNlYXJjaFRleHQpLCAnZ2knKTtcbiAgICBjb25zdCBtYXRjaCA9IHNhbml0aXNlZFZhbHVlLm1hdGNoKHJlKTtcblxuICAgIC8vIElmIHRoZXJlJ3Mgbm8gbWF0Y2gsIGp1c3QgcmV0dXJuIHRoZSBvcmlnaW5hbCB2YWx1ZS5cbiAgICBpZiAoIW1hdGNoKSB7XG4gICAgICByZXR1cm4gc2FuaXRpc2VkVmFsdWU7XG4gICAgfVxuXG5cbiAgICBjb25zdCByZXN1bHQgPSBzYW5pdGlzZWRWYWx1ZS5yZXBsYWNlKHJlLCAnPG1hcms+JyArIG1hdGNoWzBdICsgJzwvbWFyaz4nKTtcbiAgICByZXR1cm4gdGhpcy5zYW5pdGl6ZXIuYnlwYXNzU2VjdXJpdHlUcnVzdEh0bWwocmVzdWx0KTtcbiAgfVxufVxuIl19
|
|
@@ -45,7 +45,7 @@ import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl
|
|
|
45
45
|
import { __decorate, __metadata, __param } from 'tslib';
|
|
46
46
|
import * as i1 from '@angular/platform-browser';
|
|
47
47
|
import escapeStringRegexp from 'escape-string-regexp';
|
|
48
|
-
import { isEmpty, isString, isFunction, isNil, isInteger, isObject, isEqual, join, last, first, uniq, findLast, isNumber, isNaN as isNaN$1 } from 'lodash-es';
|
|
48
|
+
import { escape, isEmpty, isString, isFunction, isNil, isInteger, isObject, isEqual, join, last, first, uniq, findLast, isNumber, isNaN as isNaN$1 } from 'lodash-es';
|
|
49
49
|
import { marked } from 'marked';
|
|
50
50
|
import { MemoizeGet, lang as lang$1, assert as assert$1, Stringy, Klass, Opts } from '@coolon/typescript-utilities';
|
|
51
51
|
import { Enum } from 'typescript-string-enums';
|
|
@@ -498,19 +498,21 @@ class HighlightPipe extends GarbageCollector {
|
|
|
498
498
|
this.dispose();
|
|
499
499
|
}
|
|
500
500
|
transform(value, searchModel) {
|
|
501
|
+
const sanitisedValue = escape(value);
|
|
502
|
+
console.log(sanitisedValue);
|
|
501
503
|
const model = searchModel ?? this.highlightContext?.aupHighlightTextModel;
|
|
502
504
|
const searchText = model?.value;
|
|
503
505
|
if (isEmpty(searchText) || !isString(value)) {
|
|
504
|
-
return
|
|
506
|
+
return sanitisedValue;
|
|
505
507
|
}
|
|
506
508
|
// Match in a case insensitive manner
|
|
507
509
|
const re = new RegExp(escapeStringRegexp(searchText), 'gi');
|
|
508
|
-
const match =
|
|
510
|
+
const match = sanitisedValue.match(re);
|
|
509
511
|
// If there's no match, just return the original value.
|
|
510
512
|
if (!match) {
|
|
511
|
-
return
|
|
513
|
+
return sanitisedValue;
|
|
512
514
|
}
|
|
513
|
-
const result =
|
|
515
|
+
const result = sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
|
|
514
516
|
return this.sanitizer.bypassSecurityTrustHtml(result);
|
|
515
517
|
}
|
|
516
518
|
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 });
|
|
@@ -3545,11 +3547,11 @@ class DefaultCellRendererComponent {
|
|
|
3545
3547
|
return this._value;
|
|
3546
3548
|
}
|
|
3547
3549
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
3548
|
-
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString()| aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: HighlightPipe, name: "aupHighlight" }] });
|
|
3550
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: HighlightPipe, name: "aupHighlight" }] });
|
|
3549
3551
|
}
|
|
3550
3552
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, decorators: [{
|
|
3551
3553
|
type: Component,
|
|
3552
|
-
args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString()| aupHighlight\"></span>\n" }]
|
|
3554
|
+
args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n" }]
|
|
3553
3555
|
}], propDecorators: { value: [{
|
|
3554
3556
|
type: Input
|
|
3555
3557
|
}] } });
|