fix: merge fix

italia · Jan 17, 2024 · 4afaede · 4afaede
1 parent 3604b7f
commit 4afaede
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/projects/design-angular-kit/src/lib/components/form/autocomplete/autocomplete.component.html b/projects/design-angular-kit/src/lib/components/form/autocomplete/autocomplete.component.html
@@ -27,7 +27,7 @@
           <it-icon *ngIf="entry.icon" [name]="entry.icon" size="sm"></it-icon>
 
           <span class="autocomplete-list-text">
-            <span [innerHTML]="entry.value | markMatchingText: autocomplete.searchedValue"></span>
+            <span [innerHTML]="entry.value | itMarkMatchingText: autocomplete.searchedValue"></span>
             <em *ngIf="entry.label">{{ entry.label }}</em>
           </span>
         </a>

diff --git a/projects/design-angular-kit/src/lib/components/form/autocomplete/autocomplete.component.ts b/projects/design-angular-kit/src/lib/components/form/autocomplete/autocomplete.component.ts
@@ -3,15 +3,15 @@ import { debounceTime, distinctUntilChanged, map, Observable, of, switchMap } fr
 import { AsyncPipe, NgForOf, NgIf, NgTemplateOutlet } from '@angular/common';
 import { ReactiveFormsModule } from '@angular/forms';
 import { ItIconComponent } from '../../utils/icon/icon.component';
-import { MarkMatchingTextPipe } from '../../../pipes/mark-matching-text.pipe';
+import { ItMarkMatchingTextPipe } from '../../../pipes/mark-matching-text.pipe';
 import { ItAbstractFormComponent } from '../../../abstracts/abstract-form.component';
 import { AutocompleteItem } from '../../../interfaces/form';
 
 @Component({
   standalone: true,
   selector: 'it-autocomplete[autocompleteData]',
   templateUrl: './autocomplete.component.html',
-  imports: [AsyncPipe, ItIconComponent, MarkMatchingTextPipe, NgForOf, NgIf, NgTemplateOutlet, ReactiveFormsModule],
+  imports: [AsyncPipe, ItIconComponent, ItMarkMatchingTextPipe, NgForOf, NgIf, NgTemplateOutlet, ReactiveFormsModule],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ItAutocompleteComponent extends ItAbstractFormComponent<string | null | undefined> implements OnInit {

diff --git a/projects/design-angular-kit/src/public_api.ts b/projects/design-angular-kit/src/public_api.ts
@@ -56,6 +56,9 @@ export * from './lib/components/core/tab/tab-container/tab-container.component';
 export * from './lib/components/core/tab/tab-item/tab-item.component';
 
 export * from './lib/components/core/table/table.component';
+export * from './lib/components/core/table/sort/sort.directive';
+export * from './lib/components/core/table/sort/sort-header/sort-header.component';
+
 export * from './lib/components/core/tooltip/tooltip.directive';
 export * from './lib/components/core/avatar/avatar.directive';
 export * from './lib/components/core/avatar/avatar-dropdown/avatar-dropdown.component';