Handle PR feedback.

ni · Mar 5, 2024 · 13b9f94 · 13b9f94
1 parent 5054609
commit 13b9f94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/nimble-components/src/select/index.ts b/packages/nimble-components/src/select/index.ts
@@ -50,7 +50,7 @@ declare global {
 // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
 type BooleanOrVoid = boolean | void;
 
-const isListOption = (el: Element): el is ListOption => {
+const isNimbleListOption = (el: Element): el is ListOption => {
     return el instanceof ListOption;
 };
 
@@ -353,15 +353,15 @@ export class Select extends FormAssociatedSelect implements ErrorPattern {
                 break;
             }
             case 'selected': {
-                if (isListOption(sourceElement)) {
+                if (isNimbleListOption(sourceElement)) {
                     this.selectedIndex = this.options.indexOf(sourceElement);
                 }
                 this.setSelectedOptions();
                 this.updateDisplayValue();
                 break;
             }
             case 'hidden': {
-                if (isListOption(sourceElement)) {
+                if (isNimbleListOption(sourceElement)) {
                     sourceElement.visuallyHidden = sourceElement.hidden;
                 }
                 this.updateDisplayValue();
@@ -773,7 +773,7 @@ export class Select extends FormAssociatedSelect implements ErrorPattern {
      */
     protected override setDefaultSelectedOption(): void {
         const options: ListboxOption[] = this.options
-            ?? Array.from(this.children).filter(o => isListOption(o));
+            ?? Array.from(this.children).filter(o => isNimbleListOption(o));
 
         const optionIsSelected = (option: ListboxOption): boolean => {
             return option.hasAttribute('selected') || option.selected;
@@ -845,10 +845,11 @@ export class Select extends FormAssociatedSelect implements ErrorPattern {
 
         if (filter) {
             this.filteredOptions = this.options.filter(option => {
+                const normalizedFilter = diacriticInsensitiveStringNormalizer(filter);
                 return (
                     !option.hidden
                     && diacriticInsensitiveStringNormalizer(option.text).includes(
-                        diacriticInsensitiveStringNormalizer(filter)
+                        normalizedFilter
                     )
                 );
             });
@@ -859,7 +860,7 @@ export class Select extends FormAssociatedSelect implements ErrorPattern {
         }
 
         this.options.forEach(o => {
-            if (isListOption(o)) {
+            if (isNimbleListOption(o)) {
                 if (!this.filteredOptions.includes(o)) {
                     o.visuallyHidden = true;
                 } else {

diff --git a/packages/nimble-components/src/select/testing/select.pageobject.ts b/packages/nimble-components/src/select/testing/select.pageobject.ts
@@ -96,7 +96,9 @@ export class SelectPageObject {
      * Click the option with the text provided by the 'displayText' parameter.
      * @param value The text of the option to be selected
      */
-    public async clickOptionWithDisplayText(displayText: string): Promise<void> {
+    public async clickOptionWithDisplayText(
+        displayText: string
+    ): Promise<void> {
         if (!this.selectElement.open) {
             await this.clickSelect();
         }