adb-shared 3.0.23 → 3.0.24

package/fesm2020/adb-shared.mjs

@@ -727,11 +727,17 @@ class HighlightPipe {
                 const normalizedSearch = this.normalizeText(search);
                 const normalizedValue = this.normalizeText(value);
                 const start = normalizedValue ? normalizedValue.indexOf(normalizedSearch) : -1;
+                console.log('start', start);
                 if (start !== -1) {
-                    const matched = value.substring(start, start + search.length);
-                    value = value.replace('<mark>', '');
-                    value = value.replace('</mark>', '');
-                    value = value.replace(matched, `<mark>${matched}</mark>`);
+                    const regex = new RegExp(search + '|<[^>]*?(?:"[^"]*?"|\'[^\']*?\'|[^\'">]*?)+>|<\/[^>]*?>', 'gi');
+                    value = value.replace(regex, (match) => {
+                        if (match.startsWith('<')) {
+                            return match; // ignore HTML tags and their attributes
+                        }
+                        else {
+                            return `<mark>${match}</mark>`; // add <mark> tag around match
+                        }
+                    });
                 }
             }
         }
@@ -750,6 +756,55 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImpor
                 }]
         }] });
 
+class HighlightPipe2 {
+    constructor() {
+        this.forbiddenSymbols = /[`!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?~]/;
+    }
+    transform(value, searchs) {
+        if (!value) {
+            return value;
+        }
+        value = value + '';
+        if (searchs) {
+            if (!Array.isArray(searchs)) {
+                searchs = searchs.split(' ').filter(s => s);
+            }
+            for (let search of searchs) {
+                if (this.forbiddenSymbols.test(search)) {
+                    search = search.replace(this.forbiddenSymbols, '');
+                }
+                const normalizedSearch = this.normalizeText(search);
+                const normalizedValue = this.normalizeText(value);
+                const start = normalizedValue ? normalizedValue.indexOf(normalizedSearch) : -1;
+                console.log('start', start);
+                if (start !== -1) {
+                    const regex = new RegExp(search + '|<[^>]*?(?:"[^"]*?"|\'[^\']*?\'|[^\'">]*?)+>|<\/[^>]*?>', 'gi');
+                    value = value.replace(regex, (match) => {
+                        if (match.startsWith('<')) {
+                            return match; // ignore HTML tags and their attributes
+                        }
+                        else {
+                            return `<mark>${match}</mark>`; // add <mark> tag around match
+                        }
+                    });
+                }
+            }
+        }
+        return value;
+    }
+    normalizeText(text) {
+        return text?.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLocaleLowerCase();
+    }
+}
+/** @nocollapse */ HighlightPipe2.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: HighlightPipe2, deps: [], target: i0.ɵɵFactoryTarget.Pipe });
+/** @nocollapse */ HighlightPipe2.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: HighlightPipe2, name: "adbHighlight2" });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: HighlightPipe2, decorators: [{
+            type: Pipe,
+            args: [{
+                    name: 'adbHighlight2'
+                }]
+        }] });
+
 class NumberSpacingPipe {
     transform(value) {
         // If value is empty, 0 is falsy so perform an extra check to not make '0' to an empty string
@@ -772,14 +827,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImpor
 class AdbPipesModule {
 }
 /** @nocollapse */ AdbPipesModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: AdbPipesModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-/** @nocollapse */ AdbPipesModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: AdbPipesModule, declarations: [HighlightPipe, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe], exports: [HighlightPipe, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe] });
+/** @nocollapse */ AdbPipesModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: AdbPipesModule, declarations: [HighlightPipe, HighlightPipe2, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe], exports: [HighlightPipe, HighlightPipe2, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe] });
 /** @nocollapse */ AdbPipesModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: AdbPipesModule, imports: [[]] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: AdbPipesModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [],
-                    declarations: [HighlightPipe, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe],
-                    exports: [HighlightPipe, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe]
+                    declarations: [HighlightPipe, HighlightPipe2, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe],
+                    exports: [HighlightPipe, HighlightPipe2, NumberSpacingPipe, LocaleDatePipe, EmptyValuePipe]
                 }]
         }] });
 
@@ -1337,5 +1392,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ADBHeaderComponent, ADBHeaderModule, ADBNavComponent, AdbConfirmModal, AdbDatePickerComponent, AdbDatePickerDirective, AdbDatePickerModule, AdbDirectivesModule, AdbDropdownDirective, AdbDropdownModule, AdbModalModule, AdbModalService, AdbPagersModule, AdbPipesModule, AdbToast, AdbToastModule, AdbToastService, ClickOutsideDirective, EmptyValuePipe, FileUploadDirective, FocusDirective, HighlightPipe, InfiniteScrollComponent, LocaleDatePipe, NumberSpacingPipe, PagerComponent, RedListBadgeClassDirective, ToastType };
+export { ADBHeaderComponent, ADBHeaderModule, ADBNavComponent, AdbConfirmModal, AdbDatePickerComponent, AdbDatePickerDirective, AdbDatePickerModule, AdbDirectivesModule, AdbDropdownDirective, AdbDropdownModule, AdbModalModule, AdbModalService, AdbPagersModule, AdbPipesModule, AdbToast, AdbToastModule, AdbToastService, ClickOutsideDirective, EmptyValuePipe, FileUploadDirective, FocusDirective, HighlightPipe, HighlightPipe2, InfiniteScrollComponent, LocaleDatePipe, NumberSpacingPipe, PagerComponent, RedListBadgeClassDirective, ToastType };
 //# sourceMappingURL=adb-shared.mjs.map