Add support to move supplementary nodes with section position changes

Levi McCallum · Levi McCallum · commit 3f0092435afa · 2015-10-15T11:40:51.000-07:00
diff --git a/AsyncDisplayKit/Details/ASCollectionDataController.mm b/AsyncDisplayKit/Details/ASCollectionDataController.mm
@@ -141,7 +141,20 @@ - (void)willReloadSections:(NSIndexSet *)sections
 
 - (void)willMoveSection:(NSInteger)section toSection:(NSInteger)newSection
 {
-  // TODO: Implement
+  NSArray *elementKinds = [self.collectionDataSource supplementaryNodeKindsInDataController:self];
+  [elementKinds enumerateObjectsUsingBlock:^(NSString *kind, NSUInteger idx, BOOL *stop) {
+    NSArray *indexPaths = ASIndexPathsForMultidimensionalArrayAtIndexSet([self editingNodesOfKind:kind], [NSIndexSet indexSetWithIndex:section]);
+    NSArray *nodes = ASFindElementsInMultidimensionalArrayAtIndexPaths([self editingNodesOfKind:kind], indexPaths);
+    [self deleteNodesOfKind:kind atIndexPaths:indexPaths completion:nil];
+    
+    // update the section of indexpaths
+    NSIndexPath *sectionIndexPath = [[NSIndexPath alloc] initWithIndex:newSection];
+    NSMutableArray *updatedIndexPaths = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
+    [indexPaths enumerateObjectsUsingBlock:^(NSIndexPath *indexPath, NSUInteger idx, BOOL *stop) {
+      [updatedIndexPaths addObject:[sectionIndexPath indexPathByAddingIndex:[indexPath indexAtPosition:indexPath.length - 1]]];
+    }];
+    [self insertNodes:nodes ofKind:kind atIndexPaths:indexPaths completion:nil];
+  }];
 }
 
 - (void)_populateSupplementaryNodesOfKind:(NSString *)kind withMutableNodes:(NSMutableArray *)nodes mutableIndexPaths:(NSMutableArray *)indexPaths
diff --git a/AsyncDisplayKit/Details/ASDataController+Subclasses.h b/AsyncDisplayKit/Details/ASDataController+Subclasses.h
@@ -59,12 +59,12 @@
 /**
  * Read-only access to the underlying editing nodes of the given kind
  */
-- (NSArray *)editingNodesOfKind:(NSString *)kind;
+- (NSMutableArray *)editingNodesOfKind:(NSString *)kind;
 
 /**
  * Read only access to the underlying completed nodes of the given kind
  */
-- (NSArray *)completedNodesOfKind:(NSString *)kind;
+- (NSMutableArray *)completedNodesOfKind:(NSString *)kind;
 
 /**
  * Measure and layout the given nodes in optimized batches, constraining each to a given size in `constrainedSizeForNodeOfKind:atIndexPath:`.
diff --git a/AsyncDisplayKit/Details/ASDataController.mm b/AsyncDisplayKit/Details/ASDataController.mm
@@ -849,12 +849,12 @@ - (NSArray *)indexPathsForEditingNodesOfKind:(NSString *)kind
   return _editingNodes[kind] != nil ? ASIndexPathsForMultidimensionalArray(_editingNodes[kind]) : [NSArray array];
 }
 
-- (NSArray *)editingNodesOfKind:(NSString *)kind
+- (NSMutableArray *)editingNodesOfKind:(NSString *)kind
 {
-  return _editingNodes[kind] != nil ? _editingNodes[kind] : [NSArray array];
+  return _editingNodes[kind] != nil ? _editingNodes[kind] : [NSMutableArray array];
 }
 
-- (NSArray *)completedNodesOfKind:(NSString *)kind
+- (NSMutableArray *)completedNodesOfKind:(NSString *)kind
 {
   return _completedNodes[kind];
 }

Original file line number	Diff line number	Diff line change
`@@ -849,12 +849,12 @@ - (NSArray )indexPathsForEditingNodesOfKind:(NSString )kind`
`849`	`849`	`return _editingNodes[kind] != nil ? ASIndexPathsForMultidimensionalArray(_editingNodes[kind]) : [NSArray array];`
`850`	`850`	`}`
`851`	`851`
`852`		`-- (NSArray )editingNodesOfKind:(NSString )kind`
	`852`	`+- (NSMutableArray )editingNodesOfKind:(NSString )kind`
`853`	`853`	`{`
`854`		`- return _editingNodes[kind] != nil ? _editingNodes[kind] : [NSArray array];`
	`854`	`+ return _editingNodes[kind] != nil ? _editingNodes[kind] : [NSMutableArray array];`
`855`	`855`	`}`
`856`	`856`
`857`		`-- (NSArray )completedNodesOfKind:(NSString )kind`
	`857`	`+- (NSMutableArray )completedNodesOfKind:(NSString )kind`
`858`	`858`	`{`
`859`	`859`	`return _completedNodes[kind];`
`860`	`860`	`}`