fix: highlighted text calculation

optimistex · Sep 30, 2018 · ad2f9a1 · ad2f9a1
1 parent 0c24833
commit ad2f9a1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/app/lib/ngx-select/ngx-select.classes.ts b/src/app/lib/ngx-select/ngx-select.classes.ts
@@ -7,7 +7,9 @@ const escapeString = escapeStringNs;
 export class NgxSelectOption implements INgxSelectOption, INgxSelectOptionBase {
     readonly type: TNgxSelectOptionType = 'option';
 
-    constructor(public value: number | string,
+  highlightedText: SafeHtml;
+
+  constructor(public value: number | string,
                 public text: string,
                 public disabled: boolean,
                 public data: any,

diff --git a/src/app/lib/ngx-select/ngx-select.component.html b/src/app/lib/ngx-select/ngx-select.component.html
@@ -92,7 +92,7 @@
                })"
                (click)="optionSelect(option, $event)">
                 <ng-container [ngTemplateOutlet]="templateOption || defaultTemplateOption"
-                              [ngTemplateOutletContext]="{$implicit: option, text: highlightOption(option),
+                              [ngTemplateOutletContext]="{$implicit: option, text: option.highlightedText,
                               index: idxGroup, subIndex: idxOption}"></ng-container>
             </a>
         </li>

diff --git a/src/app/lib/ngx-select/ngx-select.component.ts b/src/app/lib/ngx-select/ngx-select.component.ts
@@ -208,7 +208,19 @@ export class NgxSelectComponent implements INgxSelectOptions, ControlValueAccess
         this.subjOptions
             .combineLatest(this.subjOptionsSelected, this.subjSearchText,
                 (options: TSelectOption[], selectedOptions: NgxSelectOption[], search: string) => {
-                    this.optionsFiltered = this.filterOptions(search, options, selectedOptions);
+                    this.optionsFiltered = this.filterOptions(search, options, selectedOptions)
+                      .map(option => {
+                        if (option instanceof NgxSelectOption) {
+                          option.highlightedText = this.highlightOption(option);
+                        } else if (option instanceof NgxSelectOptGroup) {
+                          option.options.map(x => {
+                            x.highlightedText = this.highlightOption(x);
+                            return x;
+                          });
+                        }
+
+                        return option;
+                      });
                     this.cacheOptionsFilteredFlat = null;
                     this.navigateOption(ENavigation.firstIfOptionActiveInvisible);
                     return selectedOptions;