fix(combo knockout): update ds when new ds length is the same #1852

IgniteUI · Dec 6, 2018 · d30a3af · d30a3af
1 parent 7fe463e
commit d30a3af
Showing 1 changed file with 40 additions and 37 deletions.
diff --git a/src/js/extensions/infragistics.ui.combo.knockout-extensions.js b/src/js/extensions/infragistics.ui.combo.knockout-extensions.js
@@ -55,6 +55,41 @@
         }
     }
 
+    function applyListItemsBindings(valueAccessor) {
+        var combo = valueAccessor().combo,
+            $comboList = combo.igCombo("listItems"),
+            options = valueAccessor().options,
+            dataSource = ko.utils.unwrapObservable(valueAccessor().dataSource),
+            i;
+
+        for (i = 0; i < $comboList.length; i++) {
+            if (ko.isObservable($comboList[ i ])) {
+                ko.applyBindingsToNode($comboList[ i ], {
+                    igComboItem: {
+                        combo: combo,
+                        value: dataSource[ i ],
+                        index: i,
+                        options: options
+                    }
+                }, dataSource[ i ]);
+            }
+        }
+    }
+
+    function identicalDataSources(combo, viewModelDataSource) {
+        var valueKey = combo.igCombo("option", "valueKey"), comboDataSource, index;
+
+        if (valueKey !== undefined) {
+            comboDataSource = ko.utils.unwrapObservable(combo.igCombo("option", "dataSource").data());
+            for (index = 0; index < comboDataSource.length; index++) {
+                if (comboDataSource[index][valueKey] !== viewModelDataSource[index][valueKey]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     ko.bindingHandlers.igCombo = {
         init: function (element, valueAccessor) {
             var combo = $(element),
@@ -148,26 +183,7 @@
 
     ko.bindingHandlers.igComboList = {
         init: function (element, valueAccessor) {
-            var combo = valueAccessor().combo,
-				$comboList = combo.igCombo("listItems"),
-				options = valueAccessor().options,
-                dataSource = ko.utils.unwrapObservable(valueAccessor().dataSource),
-				i;
-
-            if (dataSource) {
-                for (i = 0; i < $comboList.length; i++) {
-                    if (ko.isObservable($comboList[ i ])) {
-                        ko.applyBindingsToNode($comboList[ i ], {
-                            igComboItem: {
-                                combo: combo,
-                                value: dataSource[ i ],
-                                index: i,
-                                options: options
-                            }
-                        }, dataSource[ i ]);
-                    }
-                }
-            }
+            applyListItemsBindings(valueAccessor);
         },
         update: function (element, valueAccessor) {
             var combo = $(valueAccessor().combo),
@@ -176,30 +192,17 @@
                 dataSource = ko.utils.unwrapObservable(valueAccessor().dataSource),
                 dropDownScroller = combo.data("igCombo")._options.$dropDownScrollCont,
                 lastScrollTop = dropDownScroller ? dropDownScroller.scrollTop() : 0,
-				$comboList, i;
+				$comboList;
 
-            if (listLength !== dataSource.length) {
+            if (listLength !== dataSource.length || !identicalDataSources(combo, dataSource)) {
                 combo.one("igcomboitemsrendered", function () {
                     $comboList = combo.igCombo("listItems");
-                    if (dataSource) {
-                        for (i = 0; i < $comboList.length; i++) {
-                            if (ko.isObservable($comboList[ i ])) {
-                                ko.applyBindingsToNode($comboList[ i ], {
-                                    igComboItem: {
-                                        combo: combo,
-                                        value: dataSource[ i ],
-                                        index: i,
-                                        options: options
-                                    }
-                                }, dataSource[ i ]);
-                            }
-                        }
-                    }
+                    applyListItemsBindings(valueAccessor);
                     selectItems(combo, valueAccessor().selectedItems);
                 });
 
                 // N.A. 8/5/2015 Bug #203826 Set datasource, cause in this case it is analyzed and then the dataBind happens.
-                // This necessay in cases, when data source was empty array initially.
+                // This necessary in cases, when data source was empty array initially.
                 combo.igCombo("option", "dataSource", dataSource);
 
                 // R.K. 29th November, 2017 #246482: When an item is selected from the bottom of the list,