Fixed swap and move item not working when new data is set

ambischof · Aug 22, 2019 · cb2d38e · cb2d38e
1 parent d9bfe02
commit cb2d38e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/js/Field.js b/src/js/Field.js
@@ -1002,7 +1002,7 @@
 
                 // we bind data if we're in "edit" mode
                 // typically, we don't bind data if we're in "create" or any other mode
-                if (this.view.type && this.view.type === 'edit')
+                if (this.view.type && (this.view.type === 'edit' || this.view.type === 'create'))
                 {
                     this.bindData();
                 }
@@ -1901,7 +1901,7 @@
             {
                 newValue = this.data;
             }
-
+            
             this.setValue(newValue);
         },
 

diff --git a/src/js/fields/basic/ArrayField.js b/src/js/fields/basic/ArrayField.js
@@ -1684,14 +1684,16 @@
 
             var onComplete = function()
             {
-                var sourceChild = self.children[sourceIndex];
-                var targetChild = self.children[targetIndex];
+                var newData = self.getValue();
+                var sourceChild = newData[sourceIndex];
+                var targetChild = newData[targetIndex];
 
-                self.children[sourceIndex] = targetChild;
-                self.children[targetIndex] = sourceChild;
 
-                // copy back data and refresh
-                self.data = self.getValue();
+                newData[sourceIndex] = targetChild;
+                newData[targetIndex] = sourceChild;
+
+                self.setValue(newData);
+
                 self.refresh(function() {
 
                     // refresh validation state