Fixes problem with collection view item moving.

kzaher · kzaher · commit 3928d6294397 · 2016-04-26T13:17:47.000+02:00
diff --git a/RxDataSources.xcodeproj/project.pbxproj b/RxDataSources.xcodeproj/project.pbxproj
@@ -105,6 +105,9 @@
 		C8BB76781C4C3E53002B21C8 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF3014C1C4AA6DA007376BD /* RxCocoa.framework */; };
 		C8BB767B1C4C3E53002B21C8 /* RxDataSources.h in Headers */ = {isa = PBXBuildFile; fileRef = C8984C5D1C36AF35001E4272 /* RxDataSources.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C8BB76831C4C3EC5002B21C8 /* RxDataSources.h in Headers */ = {isa = PBXBuildFile; fileRef = C8984C5D1C36AF35001E4272 /* RxDataSources.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C8CC634D1CCF8492006AE8CE /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8CC634C1CCF8492006AE8CE /* Array+Extensions.swift */; };
+		C8CC634E1CCF8492006AE8CE /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8CC634C1CCF8492006AE8CE /* Array+Extensions.swift */; };
+		C8CC634F1CCF8492006AE8CE /* Array+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8CC634C1CCF8492006AE8CE /* Array+Extensions.swift */; };
 		C8E946A01CC6DEC800C5559C /* EditingExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84FC6BED1CA4830A00D3C605 /* EditingExampleViewController.swift */; };
 		C8EC65C61C4C441B00FC9207 /* RxDataSources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8BB76811C4C3E53002B21C8 /* RxDataSources.framework */; };
 		C8EC65C71C4C441B00FC9207 /* RxDataSources.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C8BB76811C4C3E53002B21C8 /* RxDataSources.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -211,6 +214,7 @@
 		C8BB763E1C4C3D45002B21C8 /* NumberSection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NumberSection.swift; sourceTree = "<group>"; };
 		C8BB765B1C4C3DD4002B21C8 /* Example-Carthage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example-Carthage.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8BB76811C4C3E53002B21C8 /* RxDataSources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxDataSources.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C8CC634C1CCF8492006AE8CE /* Array+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+Extensions.swift"; sourceTree = "<group>"; };
 		E39CF67E2A16306B47BCE935 /* Pods_RxDataSources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RxDataSources.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E4DE8D6B18C8BF4D4C37DB03 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
 		E8A1509A86ADB3FDAEE200EF /* Pods-RxDataSources.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RxDataSources.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RxDataSources/Pods-RxDataSources.debug.xcconfig"; sourceTree = "<group>"; };
@@ -350,6 +354,7 @@
 				C85EE54E1C36F1FC0090614D /* SectionModelType.swift */,
 				C85EE54F1C36F1FC0090614D /* TableViewSectionedDataSource.swift */,
 				C8BB762B1C4C3CDF002B21C8 /* UI+SectionedViewType.swift */,
+				C8CC634C1CCF8492006AE8CE /* Array+Extensions.swift */,
 			);
 			path = DataSources;
 			sourceTree = "<group>";
@@ -758,6 +763,7 @@
 				9FCDA1761C3AF4A2000F5F94 /* RxTableViewSectionedAnimatedDataSource.swift in Sources */,
 				C8BB76391C4C3CDF002B21C8 /* ItemPath.swift in Sources */,
 				C8BB76311C4C3CDF002B21C8 /* AnimatableSectionModelType+ItemPath.swift in Sources */,
+				C8CC634F1CCF8492006AE8CE /* Array+Extensions.swift in Sources */,
 				9FCDA1751C3AF4A2000F5F94 /* RxCollectionViewSectionedReloadDataSource.swift in Sources */,
 				C8BB76351C4C3CDF002B21C8 /* IdentifiableType.swift in Sources */,
 				C8BB76331C4C3CDF002B21C8 /* DataSources.swift in Sources */,
@@ -786,6 +792,7 @@
 				C85EE5621C36F1FC0090614D /* RxTableViewSectionedAnimatedDataSource.swift in Sources */,
 				C8BB76381C4C3CDF002B21C8 /* ItemPath.swift in Sources */,
 				C8BB76301C4C3CDF002B21C8 /* AnimatableSectionModelType+ItemPath.swift in Sources */,
+				C8CC634E1CCF8492006AE8CE /* Array+Extensions.swift in Sources */,
 				C85EE5611C36F1FC0090614D /* RxCollectionViewSectionedReloadDataSource.swift in Sources */,
 				C8BB76341C4C3CDF002B21C8 /* IdentifiableType.swift in Sources */,
 				C8BB76321C4C3CDF002B21C8 /* DataSources.swift in Sources */,
@@ -848,6 +855,7 @@
 				C8BB76601C4C3E53002B21C8 /* RxTableViewSectionedAnimatedDataSource.swift in Sources */,
 				C8BB76611C4C3E53002B21C8 /* ItemPath.swift in Sources */,
 				C8BB76621C4C3E53002B21C8 /* AnimatableSectionModelType+ItemPath.swift in Sources */,
+				C8CC634D1CCF8492006AE8CE /* Array+Extensions.swift in Sources */,
 				C8BB76631C4C3E53002B21C8 /* RxCollectionViewSectionedReloadDataSource.swift in Sources */,
 				C8BB76641C4C3E53002B21C8 /* IdentifiableType.swift in Sources */,
 				C8BB76651C4C3E53002B21C8 /* DataSources.swift in Sources */,
diff --git a/Sources/DataSources/Array+Extensions.swift b/Sources/DataSources/Array+Extensions.swift
@@ -0,0 +1,29 @@
+//
+//  Array+Extensions.swift
+//  RxDataSources
+//
+//  Created by Krunoslav Zaher on 4/26/16.
+//  Copyright © 2016 kzaher. All rights reserved.
+//
+
+import Foundation
+
+import Foundation
+
+extension Array where Element: SectionModelType {
+    mutating func moveFromSourceIndexPath(sourceIndexPath: NSIndexPath, destinationIndexPath: NSIndexPath) {
+        let sourceSection = self[sourceIndexPath.section]
+        var sourceItems = sourceSection.items
+
+        let sourceItem = sourceItems.removeAtIndex(sourceIndexPath.item)
+
+        let sourceSectionNew = Element(original: sourceSection, items: sourceItems)
+        self[sourceIndexPath.section] = sourceSectionNew
+
+        let destinationSection = self[destinationIndexPath.section]
+        var destinationItems = destinationSection.items
+        destinationItems.insert(sourceItem, atIndex: destinationIndexPath.item)
+
+        self[destinationIndexPath.section] = Element(original: destinationSection, items: destinationItems)
+    }
+}
diff --git a/Sources/DataSources/CollectionViewSectionedDataSource.swift b/Sources/DataSources/CollectionViewSectionedDataSource.swift
@@ -24,43 +24,43 @@ public class _CollectionViewSectionedDataSource
         return _numberOfSectionsInCollectionView(collectionView)
     }
 
-    func _collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+    func _rx_collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return 0
     }
     
     public func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return _collectionView(collectionView, numberOfItemsInSection: section)
+        return _rx_collectionView(collectionView, numberOfItemsInSection: section)
     }
 
-    func _collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
+    func _rx_collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
         return (nil as UICollectionViewCell?)!
     }
     
     public func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
-        return _collectionView(collectionView, cellForItemAtIndexPath: indexPath)
+        return _rx_collectionView(collectionView, cellForItemAtIndexPath: indexPath)
     }
 
-    func _collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
+    func _rx_collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
         return (nil as UICollectionReusableView?)!
     }
     
     public func collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
-        return _collectionView(collectionView, viewForSupplementaryElementOfKind: kind, atIndexPath: indexPath)
+        return _rx_collectionView(collectionView, viewForSupplementaryElementOfKind: kind, atIndexPath: indexPath)
     }
     
-    func _collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {
-        return false
+    func _rx_collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {
+        return true
     }
     
     public func collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {
-        return _collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
+        return _rx_collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
     }
     
-    func _collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
+    func _rx_collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
         
     }
     public func collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
-        _collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)
+        _rx_collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)
     }
     
 }
@@ -134,33 +134,30 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>
         return _sectionModels.count
     }
     
-    override func _collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+    override func _rx_collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return _sectionModels[section].items.count
     }
     
-    override func _collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
+    override func _rx_collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {
         precondition(indexPath.item < _sectionModels[indexPath.section].items.count)
         
         return cellFactory(self, collectionView, indexPath, itemAtIndexPath(indexPath))
     }
     
-    override func _collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
+    override func _rx_collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {
         return supplementaryViewFactory(self, collectionView, kind, indexPath)
     }
     
-    override func _collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {
+    override func _rx_collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {
         guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath: indexPath) else {
-            return super._collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
+            return super._rx_collectionView(collectionView, canMoveItemAtIndexPath: indexPath)
         }
         
         return canMoveItem
     }
     
-    override func _collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
-        guard let _ = moveItem?(self, sourceIndexPath:sourceIndexPath, destinationIndexPath: destinationIndexPath) else {
-            super._collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)
-            return
-        }
+    override func _rx_collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {
+        self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)
     }
     
 }
diff --git a/Sources/DataSources/TableViewSectionedDataSource.swift b/Sources/DataSources/TableViewSectionedDataSource.swift

Original file line number	Diff line number	Diff line change
`@@ -24,43 +24,43 @@ public class _CollectionViewSectionedDataSource`
`24`	`24`	`return _numberOfSectionsInCollectionView(collectionView)`
`25`	`25`	`}`
`26`	`26`
`27`		`- func _collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {`
	`27`	`+ func _rx_collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {`
`28`	`28`	`return 0`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public func collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {`
`32`		`- return _collectionView(collectionView, numberOfItemsInSection: section)`
	`32`	`+ return _rx_collectionView(collectionView, numberOfItemsInSection: section)`
`33`	`33`	`}`
`34`	`34`
`35`		`- func _collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {`
	`35`	`+ func _rx_collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {`
`36`	`36`	`return (nil as UICollectionViewCell?)!`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public func collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {`
`40`		`- return _collectionView(collectionView, cellForItemAtIndexPath: indexPath)`
	`40`	`+ return _rx_collectionView(collectionView, cellForItemAtIndexPath: indexPath)`
`41`	`41`	`}`
`42`	`42`
`43`		`- func _collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {`
	`43`	`+ func _rx_collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {`
`44`	`44`	`return (nil as UICollectionReusableView?)!`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public func collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {`
`48`		`- return _collectionView(collectionView, viewForSupplementaryElementOfKind: kind, atIndexPath: indexPath)`
	`48`	`+ return _rx_collectionView(collectionView, viewForSupplementaryElementOfKind: kind, atIndexPath: indexPath)`
`49`	`49`	`}`
`50`	`50`
`51`		`- func _collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {`
`52`		`- return false`
	`51`	`+ func _rx_collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {`
	`52`	`+ return true`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public func collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {`
`56`		`- return _collectionView(collectionView, canMoveItemAtIndexPath: indexPath)`
	`56`	`+ return _rx_collectionView(collectionView, canMoveItemAtIndexPath: indexPath)`
`57`	`57`	`}`
`58`	`58`
`59`		`- func _collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {`
	`59`	`+ func _rx_collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {`
`60`	`60`
`61`	`61`	`}`
`62`	`62`	`public func collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {`
`63`		`- _collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)`
	`63`	`+ _rx_collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`}`
`@@ -134,33 +134,30 @@ public class CollectionViewSectionedDataSource<S: SectionModelType>`
`134`	`134`	`return _sectionModels.count`
`135`	`135`	`}`
`136`	`136`
`137`		`- override func _collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {`
	`137`	`+ override func _rx_collectionView(collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {`
`138`	`138`	`return _sectionModels[section].items.count`
`139`	`139`	`}`
`140`	`140`
`141`		`- override func _collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {`
	`141`	`+ override func _rx_collectionView(collectionView: UICollectionView, cellForItemAtIndexPath indexPath: NSIndexPath) -> UICollectionViewCell {`
`142`	`142`	`precondition(indexPath.item < _sectionModels[indexPath.section].items.count)`
`143`	`143`
`144`	`144`	`return cellFactory(self, collectionView, indexPath, itemAtIndexPath(indexPath))`
`145`	`145`	`}`
`146`	`146`
`147`		`- override func _collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {`
	`147`	`+ override func _rx_collectionView(collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, atIndexPath indexPath: NSIndexPath) -> UICollectionReusableView {`
`148`	`148`	`return supplementaryViewFactory(self, collectionView, kind, indexPath)`
`149`	`149`	`}`
`150`	`150`
`151`		`- override func _collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {`
	`151`	`+ override func _rx_collectionView(collectionView: UICollectionView, canMoveItemAtIndexPath indexPath: NSIndexPath) -> Bool {`
`152`	`152`	`guard let canMoveItem = canMoveItemAtIndexPath?(self, indexPath: indexPath) else {`
`153`		`- return super._collectionView(collectionView, canMoveItemAtIndexPath: indexPath)`
	`153`	`+ return super._rx_collectionView(collectionView, canMoveItemAtIndexPath: indexPath)`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`return canMoveItem`
`157`	`157`	`}`
`158`	`158`
`159`		`- override func _collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {`
`160`		`- guard let _ = moveItem?(self, sourceIndexPath:sourceIndexPath, destinationIndexPath: destinationIndexPath) else {`
`161`		`- super._collectionView(collectionView, moveItemAtIndexPath: sourceIndexPath, toIndexPath: destinationIndexPath)`
`162`		`- return`
`163`		`- }`
	`159`	`+ override func _rx_collectionView(collectionView: UICollectionView, moveItemAtIndexPath sourceIndexPath: NSIndexPath, toIndexPath destinationIndexPath: NSIndexPath) {`
	`160`	`+ self._sectionModels.moveFromSourceIndexPath(sourceIndexPath, destinationIndexPath: destinationIndexPath)`
`164`	`161`	`}`
`165`	`162`
`166`	`163`	`}`