@ni/nimble-angular 17.4.0 → 17.4.2

package/fesm2020/ni-nimble-angular.mjs

@@ -1239,7 +1239,8 @@ class NimbleComboboxControlValueAccessorDirective {
     constructor(_renderer, _elementRef) {
         this._renderer = _renderer;
         this._elementRef = _elementRef;
-        this._optionMap = new Map();
+        this._displayTextToOptionsMap = new Map();
+        this._optionToModelValueMap = new Map();
         this._optionUpdateQueue = [];
         this._compareWith = Object.is;
     }
@@ -1256,7 +1257,7 @@ class NimbleComboboxControlValueAccessorDirective {
     }
     ngAfterViewChecked() {
         for (const updateValue of this._optionUpdateQueue) {
-            this.addOption(updateValue.listOption.text, updateValue.modelValue);
+            this.addOption(updateValue.modelValue, updateValue.listOption);
         }
         this._optionUpdateQueue = [];
     }
@@ -1274,9 +1275,11 @@ class NimbleComboboxControlValueAccessorDirective {
      */
     registerOnChange(fn) {
         this.onChange = (valueString) => {
-            const modelValue = this._optionMap.has(valueString) ? this._optionMap.get(valueString) : OPTION_NOT_FOUND;
-            this._modelValue = modelValue;
-            fn(modelValue);
+            const options = this._displayTextToOptionsMap.get(valueString);
+            this._modelValue = options
+                ? this._optionToModelValueMap.get(options[0])
+                : OPTION_NOT_FOUND;
+            fn(this._modelValue);
         };
     }
     /**
@@ -1299,18 +1302,43 @@ class NimbleComboboxControlValueAccessorDirective {
     /**
      * @internal
      */
-    addOption(displayValue, modelValue) {
-        this._optionMap.set(displayValue, modelValue);
+    addOption(modelValue, option) {
+        this._optionToModelValueMap.set(option, modelValue);
+        const options = this._displayTextToOptionsMap.get(option.text);
+        if (options) {
+            const optionIndex = options.indexOf(option);
+            if (optionIndex < 0) {
+                options.push(option);
+            }
+        }
+        else {
+            this._displayTextToOptionsMap.set(option.text, [option]);
+        }
         this.updateDisplayValue();
     }
     /**
      * @internal
      */
-    removeOption(displayValue) {
-        this._optionMap.delete(displayValue);
+    removeOption(option) {
+        const options = this._displayTextToOptionsMap.get(option.text);
+        if (options) {
+            if (options.length > 1) {
+                const removeIndex = options.indexOf(option);
+                if (removeIndex >= 0) {
+                    options.splice(removeIndex, 1);
+                }
+            }
+            else {
+                this._displayTextToOptionsMap.delete(option.text);
+            }
+        }
+        this._optionToModelValueMap.delete(option);
     }
-    queueOptionUpdate(listOption, modelValue) {
-        this.removeOption(listOption.text);
+    /**
+     * @internal
+     */
+    queueOptionUpdate(modelValue, listOption) {
+        this.removeOption(listOption);
         this._optionUpdateQueue.push({ listOption, modelValue });
     }
     updateDisplayValue() {
@@ -1318,9 +1346,13 @@ class NimbleComboboxControlValueAccessorDirective {
         this.setProperty('value', valueAsString ?? '');
     }
     getValueStringFromValue(value) {
-        for (const [optionKey, optionValue] of this._optionMap.entries()) {
-            if (this._compareWith(optionValue, value)) {
-                return optionKey;
+        for (const [option, modelValue] of this._optionToModelValueMap.entries()) {
+            if (this._compareWith(modelValue, value)) {
+                for (const [displayText, options] of this._displayTextToOptionsMap.entries()) {
+                    if (options.includes(option)) {
+                        return displayText;
+                    }
+                }
             }
         }
         return undefined;
@@ -6534,17 +6566,16 @@ class NimbleComboboxListOptionDirective {
     }
     ngAfterViewInit() {
         if (this.combobox) {
-            this._currentTextContent = this.elementRef.nativeElement.text;
-            this.combobox.addOption(this._currentTextContent, this._modelValue);
+            this.combobox.addOption(this._modelValue, this.elementRef.nativeElement);
         }
     }
     ngOnDestroy() {
         if (this.combobox) {
-            this.combobox.removeOption(this._currentTextContent);
+            this.combobox.removeOption(this.elementRef.nativeElement);
         }
     }
     updateComboboxValue(value) {
-        this.combobox.queueOptionUpdate(this.elementRef.nativeElement, value);
+        this.combobox.queueOptionUpdate(value, this.elementRef.nativeElement);
     }
 }
 NimbleComboboxListOptionDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: NimbleComboboxListOptionDirective, deps: [{ token: i0.ElementRef }, { token: i0.Renderer2 }, { token: NimbleComboboxControlValueAccessorDirective, host: true, optional: true }], target: i0.ɵɵFactoryTarget.Directive });