@fundamental-ngx/core 0.65.0-rc.9 → 0.65.0

package/fesm2022/fundamental-ngx-core-multi-combobox.mjs

@@ -368,30 +368,18 @@ class BaseMultiCombobox {
         }, { injector: this._injector });
     }
     /** @hidden */
-    _setSelectedSuggestions() {
-        this._selectedSuggestions.set([]);
-        const selectedItems = this._selectedItems();
-        if (!selectedItems?.length) {
-            return;
-        }
-        const fullFlatSuggestions = this._fullFlatSuggestions();
-        const selectedSuggestions = [];
-        // Update immutably
-        const updatedSuggestions = fullFlatSuggestions.map((item) => {
-            const isSelected = selectedItems.some((selectedItem) => item.label === selectedItem || item.value === selectedItem);
-            if (isSelected) {
-                selectedSuggestions.push({ ...item, selected: true });
-                return { ...item, selected: true };
-            }
-            else if (item.selected) {
-                // Item was selected but is now deselected - must update to false
-                return { ...item, selected: false };
-            }
-            // Item was not and is not selected - no change needed
-            return item;
+    _setSelectedSuggestions(selectedItems = this._selectedItems()) {
+        const isSelected = (item) => selectedItems.some((selectedItem) => item.id === lookupValue(selectedItem, this.lookupKey()) || shallowEqual(item.value, selectedItem));
+        const updateSelection = (items) => items.map((item) => {
+            const children = item.children ? updateSelection(item.children) : undefined;
+            const selected = isSelected(item);
+            return { ...item, selected, children };
         });
-        this._selectedSuggestions.set(selectedSuggestions);
-        this._fullFlatSuggestions.set(updatedSuggestions);
+        const fullFlatSuggestions = updateSelection(this._fullFlatSuggestions());
+        this._selectedSuggestions.set(fullFlatSuggestions.filter((item) => item.selected));
+        this._suggestions.set(updateSelection(this._suggestions()));
+        this._flatSuggestions.set(updateSelection(this._flatSuggestions()));
+        this._fullFlatSuggestions.set(fullFlatSuggestions);
     }
     /**
      * Convert original data to SelectableOptionItems Interface
@@ -549,7 +537,6 @@ class BaseMultiCombobox {
         }
         this.writeValue(selectedItems);
         this._cva.onChange(selectedItems);
-        this._emitChangeEvent();
     }
     /**
      * @hidden
@@ -1341,13 +1328,9 @@ class MultiComboboxComponent extends BaseMultiCombobox {
     _toggleSelection(item, fromTokenCloseClick = false) {
         const selectedSuggestions = this._selectedSuggestions();
         const idx = getTokenIndexByIdlOrValue(item, selectedSuggestions);
-        if (idx === -1) {
-            this._selectedSuggestions.set([...selectedSuggestions, item]);
-        }
-        else {
-            this._selectedSuggestions.set(selectedSuggestions.filter((_, i) => i !== idx));
-        }
+        const updatedSelectedSuggestions = idx === -1 ? [...selectedSuggestions, item] : selectedSuggestions.filter((_, index) => index !== idx);
         item.selected = !item.selected;
+        this._setSelectedSuggestions(updatedSelectedSuggestions.map(({ value }) => value));
         this._propagateChange(fromTokenCloseClick);
         this._cd.detectChanges();
     }
@@ -1376,11 +1359,13 @@ class MultiComboboxComponent extends BaseMultiCombobox {
         if (event) {
             event.preventDefault();
         }
-        const optionItem = this._flatSuggestions().find((s) => s.value === token.value);
-        if (optionItem) {
-            this._toggleSelection(optionItem, true);
-            this._rangeSelector.reset();
+        const flatSuggestions = this._flatSuggestions();
+        const optionItemIndex = getTokenIndexByIdlOrValue(token, flatSuggestions);
+        if (optionItemIndex === -1) {
+            return;
         }
+        this._toggleSelection(flatSuggestions[optionItemIndex], true);
+        this._rangeSelector.reset();
     }
     /** @hidden */
     _moreClicked() {
@@ -1442,7 +1427,7 @@ class MultiComboboxComponent extends BaseMultiCombobox {
      * Handle dialog dismissing, closes popover and sets backup data.
      */
     _dialogDismiss(backup) {
-        this._selectedSuggestions.set([...backup]);
+        this._setSelectedSuggestions(backup.map(({ value }) => value));
         this._setInputText('');
         this._showList(false);
         this.selectedShown.set(false);