@ni/nimble-angular 8.1.1 → 8.1.2

package/bundles/ni-nimble-angular.umd.js

@@ -856,7 +856,6 @@
             function NimbleComboboxControlValueAccessorDirective(_renderer, _elementRef) {
                 this._renderer = _renderer;
                 this._elementRef = _elementRef;
-                /** @internal */
                 this._optionMap = new Map();
                 this._compareWith = Object.is;
             }
@@ -880,8 +879,8 @@
              * @param value The ngValue set on the nimble-combobox
              */
             NimbleComboboxControlValueAccessorDirective.prototype.writeValue = function (value) {
-                var valueAsString = this.getValueStringFromValue(value);
-                this.setProperty('value', valueAsString !== null && valueAsString !== void 0 ? valueAsString : '');
+                this._modelValue = value;
+                this.updateDisplayValue();
             };
             /**
              * Registers a function called when the control value changes.
@@ -890,8 +889,8 @@
             NimbleComboboxControlValueAccessorDirective.prototype.registerOnChange = function (fn) {
                 var _this = this;
                 this.onChange = function (valueString) {
-                    var _a;
-                    var modelValue = (_a = _this._optionMap.get(valueString)) !== null && _a !== void 0 ? _a : OPTION_NOT_FOUND;
+                    var modelValue = _this._optionMap.has(valueString) ? _this._optionMap.get(valueString) : OPTION_NOT_FOUND;
+                    _this._modelValue = modelValue;
                     fn(modelValue);
                 };
             };
@@ -902,11 +901,28 @@
             NimbleComboboxControlValueAccessorDirective.prototype.registerOnTouched = function (fn) {
                 this.onTouched = fn;
             };
+            /**
+             * @internal
+             */
+            NimbleComboboxControlValueAccessorDirective.prototype.addOption = function (displayValue, modelValue) {
+                this._optionMap.set(displayValue, modelValue);
+                this.updateDisplayValue();
+            };
+            /**
+             * @internal
+             */
+            NimbleComboboxControlValueAccessorDirective.prototype.removeOption = function (displayValue) {
+                this._optionMap.delete(displayValue);
+            };
+            NimbleComboboxControlValueAccessorDirective.prototype.updateDisplayValue = function () {
+                var valueAsString = this.getValueStringFromValue(this._modelValue);
+                this.setProperty('value', valueAsString !== null && valueAsString !== void 0 ? valueAsString : '');
+            };
             NimbleComboboxControlValueAccessorDirective.prototype.getValueStringFromValue = function (value) {
-                var e_1, _b;
+                var e_1, _a;
                 try {
-                    for (var _c = __values(this._optionMap.entries()), _d = _c.next(); !_d.done; _d = _c.next()) {
-                        var _e = __read(_d.value, 2), optionKey = _e[0], optionValue = _e[1];
+                    for (var _b = __values(this._optionMap.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var _d = __read(_c.value, 2), optionKey = _d[0], optionValue = _d[1];
                         if (this._compareWith(optionValue, value)) {
                             return optionKey;
                         }
@@ -915,7 +931,7 @@
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -6288,19 +6304,19 @@
             NimbleComboboxListOptionDirective.prototype.ngAfterViewInit = function () {
                 if (this.combobox) {
                     this._currentTextContent = this.elementRef.nativeElement.textContent;
-                    this.combobox._optionMap.set(this._currentTextContent, this._modelValue);
+                    this.combobox.addOption(this._currentTextContent, this._modelValue);
                 }
             };
             NimbleComboboxListOptionDirective.prototype.ngOnDestroy = function () {
                 if (this.combobox) {
-                    this.combobox._optionMap.delete(this._currentTextContent);
+                    this.combobox.removeOption(this._currentTextContent);
                 }
             };
             NimbleComboboxListOptionDirective.prototype.updateComboboxValue = function (value) {
-                this.combobox._optionMap.delete(this._currentTextContent);
+                this.combobox.removeOption(this._currentTextContent);
                 this.changeDetector.detectChanges();
                 this._currentTextContent = this.elementRef.nativeElement.textContent;
-                this.combobox._optionMap.set(this._currentTextContent, value);
+                this.combobox.addOption(this._currentTextContent, value);
             };
             return NimbleComboboxListOptionDirective;
         }());