motion-yapper 0.0.1 → 0.0.2

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/Internal/YapDatabaseViewPrivate.h

@@ -23,6 +23,9 @@
 **/
 #define YAP_DATABASE_VIEW_CLASS_VERSION 3
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 @interface YapDatabaseView () {
 @public
@@ -32,7 +35,7 @@
 	YapDatabaseViewBlockType groupingBlockType;
 	YapDatabaseViewBlockType sortingBlockType;
 	
-	int version;
+	NSString *versionTag;
 	
 	YapDatabaseViewOptions *options;
 }
@@ -103,6 +106,8 @@
 	YapMemoryTableTransaction *pageTableTransaction;
 	YapMemoryTableTransaction *pageMetadataTableTransaction;
 	
+	BOOL isRepopulate;
+	
 @protected
 	
 	__unsafe_unretained YapDatabaseViewConnection *viewConnection;
@@ -116,6 +121,7 @@
 
 // The following are declared for view subclasses (such as YapDatabaseFilteredView)
 
+- (void)dropTablesForOldClassVersion:(int)oldClassVersion;
 - (BOOL)createTables;
 
 - (NSString *)registeredName;
@@ -151,3 +157,14 @@
                     usingBlock:(void (^)(int64_t rowid, NSUInteger index, BOOL *stop))block;
 
 @end
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+@protocol YapDatabaseViewDependency <NSObject>
+@optional
+
+- (void)viewDidRepopulate:(NSString *)registeredName;
+
+@end

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/Utilities/YapDatabaseViewChange.h

@@ -86,8 +86,8 @@ typedef enum {
  *
  * YapDatabaseViewChangedMetadata means the metadata was changed.
  * This might have happend implicitly if the user invoked setObject:forKey:inCollection: (implicitly setting
- * the meatadata to nil). Or explicitly if the user invoked setObject:forKey:inCollection:withMetadata: or
- * setMetadata:forKey:inCollection:.
+ * the metadata to nil). Or explicitly if the user invoked setObject:forKey:inCollection:withMetadata: or
+ * replaceMetadata:forKey:inCollection:.
  * 
  * YapDatabaseViewChangedDependency means the row was flagged due to a cell drawing dependency configuration.
  * See YapDatabaseViewMappings: setCellDrawingDependencyForNeighboringCellWithOffset:forGroup:

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/Utilities/YapDatabaseViewChange.m

@@ -369,8 +369,9 @@
 	NSMutableArray *sectionChanges = [NSMutableArray arrayWithCapacity:1];
 	NSMutableArray *rowChanges = [NSMutableArray arrayWithCapacity:[changes count]];
 	
-	NSSet *groups = [NSSet setWithArray:[originalMappings allGroups]];
-	
+	NSSet *originalGroups = [NSSet setWithArray:[originalMappings allGroups]];
+	NSSet *finalGroups = [NSSet setWithArray:[finalMappings allGroups]];
+    
 	NSMutableDictionary *counts = [originalMappings counts];
 	NSDictionary *dependencies = [originalMappings dependencies];
 	
@@ -383,7 +384,7 @@
 			
 			if (immutableSectionChange->type == YapDatabaseViewChangeDelete)
 			{
-				if ([groups containsObject:immutableSectionChange->group])
+				if ([originalGroups containsObject:immutableSectionChange->group])
 				{
 					YapDatabaseViewSectionChange *sectionChange = [immutableSectionChange copy];
 					[sectionChanges addObject:sectionChange];
@@ -449,7 +450,7 @@
 			}
 			else if (immutableSectionChange->type == YapDatabaseViewChangeInsert)
 			{
-				if ([groups containsObject:immutableSectionChange->group])
+				if ([finalGroups containsObject:immutableSectionChange->group])
 				{
 					YapDatabaseViewSectionChange *sectionChange = [immutableSectionChange copy];
 					[sectionChanges addObject:sectionChange];
@@ -464,10 +465,10 @@
 			NSUInteger groupCount = 0;
 			NSUInteger groupIndex = 0;
 			BOOL wasDelete = 0;
-			
+
 			if (immutableRowChange->type == YapDatabaseViewChangeDelete)
 			{
-				if ([groups containsObject:immutableRowChange->originalGroup])
+				if ([originalGroups containsObject:immutableRowChange->originalGroup])
 				{
 					YapDatabaseViewRowChange *rowChange = [immutableRowChange copy];
 					[rowChanges addObject:rowChange];
@@ -484,7 +485,7 @@
 			}
 			else if (immutableRowChange->type == YapDatabaseViewChangeInsert)
 			{
-				if ([groups containsObject:immutableRowChange->finalGroup])
+				if ([finalGroups containsObject:immutableRowChange->finalGroup])
 				{
 					YapDatabaseViewRowChange *rowChange = [immutableRowChange copy];
 					[rowChanges addObject:rowChange];
@@ -499,7 +500,7 @@
 			}
 			else if (immutableRowChange->type == YapDatabaseViewChangeUpdate)
 			{
-				if ([groups containsObject:immutableRowChange->originalGroup])
+				if ([finalGroups containsObject:immutableRowChange->originalGroup])
 				{
 					YapDatabaseViewRowChange *rowChange = [immutableRowChange copy];
 					[rowChanges addObject:rowChange];
@@ -813,6 +814,7 @@
 					firstChangeForKey->type = YapDatabaseViewChangeMove;
 					firstChangeForKey->finalIndex = lastChangeForKey->finalIndex;
 					firstChangeForKey->finalGroup = lastChangeForKey->finalGroup;
+					firstChangeForKey->opFinalIndex = lastChangeForKey->opFinalIndex; // for postProcessing
 					
 					[changes removeObjectsAtIndexes:indexSet];
 					i++;
@@ -833,6 +835,7 @@
 					firstChangeForKey->type = YapDatabaseViewChangeMove;
 					firstChangeForKey->finalIndex = lastChangeForKey->finalIndex;
 					firstChangeForKey->finalGroup = lastChangeForKey->finalGroup;
+					firstChangeForKey->opFinalIndex = lastChangeForKey->opFinalIndex; // for postProcessing
 					
 					[changes removeObjectsAtIndexes:indexSet];
 					i++;
@@ -848,7 +851,6 @@
 					
 					[changes removeObjectsAtIndexes:indexSet];
 					[changes removeObjectAtIndex:i];
-					
 				}
 				else if (lastChangeForKey->type == YapDatabaseViewChangeInsert)
 				{
@@ -901,10 +903,13 @@
 					// then the tableView/collectionView will offset the update's index
 					// based on insertions & deletions at smaller indexes,
 					// and may ultimately update the wrong cell.
+					//
+					// The final location comes from the last update
 					
 					firstChangeForKey->type = YapDatabaseViewChangeMove;
 					firstChangeForKey->finalIndex = lastChangeForKey->finalIndex;
 					firstChangeForKey->finalGroup = lastChangeForKey->finalGroup;
+					firstChangeForKey->opFinalIndex = lastChangeForKey->opFinalIndex; // for postProcessing
 					
 					[changes removeObjectsAtIndexes:indexSet];
 					i++;
@@ -947,6 +952,7 @@
 						firstChangeForKey->type = YapDatabaseViewChangeMove;
 						firstChangeForKey->finalIndex = lastChangeForKey->finalIndex;
 						firstChangeForKey->finalGroup = lastChangeForKey->finalGroup;
+						firstChangeForKey->opFinalIndex = lastChangeForKey->opFinalIndex; // for postProcessing
 						
 						[changes removeObjectsAtIndexes:indexSet];
 						i++;

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/Utilities/YapDatabaseViewMappings.h

@@ -173,6 +173,8 @@ struct YapDatabaseViewRangePosition {
 };
 typedef struct YapDatabaseViewRangePosition YapDatabaseViewRangePosition;
 
+typedef BOOL (^YapDatabaseViewMappingGroupFilter)(NSString *group, YapDatabaseReadTransaction *transaction);
+typedef NSComparisonResult (^YapDatabaseViewMappingGroupSort)(NSString *group1, NSString *group2, YapDatabaseReadTransaction *transaction);
 
 @interface YapDatabaseViewMappings : NSObject <NSCopying>
 
@@ -203,6 +205,21 @@ typedef struct YapDatabaseViewRangePosition YapDatabaseViewRangePosition;
 - (id)initWithGroups:(NSArray *)allGroups
 				view:(NSString *)registeredViewName;
 
+
+/**
+ * Initializes a new mappings object that uses a filterBlock and a sortBlock to dynamically construct sections from view.
+ * @param filterBlock
+ *      Block that takes a string and returns a BOOL.  returning YES will include the group in the sections of the mapping.
+ * @param sortBlock
+ *      Block used to sort group names for groups that pass the filter.
+ * @param registeredViewName
+ *      This is the name of the view, as you registered it with the database system.
+ *
+**/
+- (id)initWithGroupFilterBlock:(YapDatabaseViewMappingGroupFilter)filterBlock
+                     sortBlock:(YapDatabaseViewMappingGroupSort)sortBlock
+                          view:(NSString *)registeredViewName;
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Accessors
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/Utilities/YapDatabaseViewMappings.m

@@ -24,15 +24,21 @@
 @implementation YapDatabaseViewMappings
 {
 	// Immutable init parameters
-	NSArray *allGroups;
 	NSString *registeredViewName;
-	
+    
+    NSArray *allGroups;
+    
+    BOOL viewGroupsAreDynamic;
+    YapDatabaseViewMappingGroupFilter groupFilterBlock;
+    YapDatabaseViewMappingGroupSort groupSort;
+    
 	// Mappings and cached counts
 	NSMutableArray *visibleGroups;
 	NSMutableDictionary *counts;
 	BOOL isUsingConsolidatedGroup;
 	BOOL autoConsolidationDisabled;
-	
+	BOOL isDynamicSectionForAllGroups;
+    
 	// Configuration
 	NSMutableSet *dynamicSections;
 	NSMutableSet *reverse;
@@ -60,38 +66,64 @@
 {
 	if ((self = [super init]))
 	{
-		allGroups = [[NSArray alloc] initWithArray:inGroups copyItems:YES];
-		registeredViewName = [inRegisteredViewName copy];
-		
+        allGroups = [[NSArray alloc] initWithArray:inGroups copyItems:YES];
 		NSUInteger allGroupsCount = [allGroups count];
+        viewGroupsAreDynamic = NO;
 		
 		visibleGroups = [[NSMutableArray alloc] initWithCapacity:allGroupsCount];
-		
 		dynamicSections = [[NSMutableSet alloc] initWithCapacity:allGroupsCount];
 		reverse         = [[NSMutableSet alloc] initWithCapacity:allGroupsCount];
 		
 		id sharedKeySet = [NSDictionary sharedKeySetForKeys:allGroups];
-		
 		counts       = [NSMutableDictionary dictionaryWithSharedKeySet:sharedKeySet];
-		rangeOptions = [NSMutableDictionary dictionaryWithSharedKeySet:sharedKeySet];
-		dependencies = [NSMutableDictionary dictionaryWithSharedKeySet:sharedKeySet];
+		rangeOptions = [NSMutableDictionary dictionaryWithCapacity:allGroupsCount];
+		dependencies = [NSMutableDictionary dictionaryWithCapacity:allGroupsCount];
 		
-		snapshotOfLastUpdate = UINT64_MAX;
+        [self _initWithView:inRegisteredViewName];
+
 	}
 	return self;
 }
 
+- (id)initWithGroupFilterBlock:(YapDatabaseViewMappingGroupFilter)inFilter sortBlock:(YapDatabaseViewMappingGroupSort)inSort view:(NSString *)inRegisteredViewName{
+    if (self = [super init]){
+        groupFilterBlock = inFilter;
+         groupSort = inSort;
+        viewGroupsAreDynamic = YES;
+
+        //we don't know what our capacity is going to be yet.
+        visibleGroups = [NSMutableArray new];
+        dynamicSections = [NSMutableSet new];
+        reverse = [NSMutableSet new];
+        rangeOptions = [NSMutableDictionary new];
+        dependencies = [NSMutableDictionary new];
+        
+        [self _initWithView:inRegisteredViewName];
+    }
+    return self;
+}
+
+- (void)_initWithView:(NSString *)inRegisteredViewName{
+    registeredViewName = [inRegisteredViewName copy];
+    snapshotOfLastUpdate = UINT64_MAX;
+}
+
 - (id)copyWithZone:(NSZone *)zone
 {
 	YapDatabaseViewMappings *copy = [[YapDatabaseViewMappings alloc] init];
 	copy->allGroups = allGroups;
 	copy->registeredViewName = registeredViewName;
+    
+    copy->viewGroupsAreDynamic = viewGroupsAreDynamic;
+    copy->groupFilterBlock = groupFilterBlock;
+    copy->groupSort = groupSort;
 	
 	copy->visibleGroups = [visibleGroups mutableCopy];
 	copy->counts = [counts mutableCopy];
 	copy->isUsingConsolidatedGroup = isUsingConsolidatedGroup;
 	copy->autoConsolidationDisabled = autoConsolidationDisabled;
 	
+    copy->isDynamicSectionForAllGroups = isDynamicSectionForAllGroups;
 	copy->dynamicSections = [dynamicSections mutableCopy];
 	copy->reverse = [reverse mutableCopy];
 	copy->rangeOptions = [rangeOptions mutableCopy];
@@ -110,20 +142,21 @@
 
 - (void)setIsDynamicSectionForAllGroups:(BOOL)isDynamic
 {
-	if (isDynamic)
-		[dynamicSections addObjectsFromArray:allGroups];
-	else
-		[dynamicSections removeAllObjects];
+	isDynamicSectionForAllGroups = isDynamic;
 }
 
 - (BOOL)isDynamicSectionForAllGroups
 {
-	return ([dynamicSections count] == [allGroups count]);
+    return isDynamicSectionForAllGroups;
+}
+
+- (BOOL)isGroupNameValid:(NSString *)group{
+    return viewGroupsAreDynamic || [allGroups containsObject:group];
 }
 
 - (void)setIsDynamicSection:(BOOL)isDynamic forGroup:(NSString *)group
 {
-	if (![allGroups containsObject:group]) {
+	if (![self isGroupNameValid:group]) {
 		YDBLogWarn(@"%@ - mappings doesn't contain group(%@), only: %@", THIS_METHOD, group, allGroups);
 		return;
 	}
@@ -145,8 +178,8 @@
 		[self removeRangeOptionsForGroup:group];
 		return;
 	}
-	
-	if (![allGroups containsObject:group]) {
+
+    if (![self isGroupNameValid:group]){
 		YDBLogWarn(@"%@ - mappings doesn't contain group(%@), only: %@", THIS_METHOD, group, allGroups);
 		return;
 	}
@@ -196,7 +229,8 @@
 
 - (void)setCellDrawingDependencyOffsets:(NSSet *)offsets forGroup:(NSString *)group
 {
-	if (![allGroups containsObject:group]) {
+
+    if (![self isGroupNameValid:group]){
 		YDBLogWarn(@"%@ - mappings doesn't contain group(%@), only: %@", THIS_METHOD, group, allGroups);
 		return;
 	}
@@ -249,7 +283,7 @@
 
 - (void)setIsReversed:(BOOL)isReversed forGroup:(NSString *)group
 {
-	if (![allGroups containsObject:group]) {
+    if (![self isGroupNameValid:group]){
 		YDBLogWarn(@"%@ - mappings doesn't contain group(%@), only: %@", THIS_METHOD, group, allGroups);
 		return;
 	}
@@ -267,24 +301,9 @@
 
 - (void)setAutoConsolidateGroupsThreshold:(NSUInteger)threshold withName:(NSString *)inConsolidatedGroupName
 {
-	if ([allGroups containsObject:inConsolidatedGroupName])
-	{
-		YDBLogWarn(@"%@ - consolidatedGroupName cannot match existing groupName", THIS_METHOD);
-		
-		autoConsolidateGroupsThreshold = 0;
-		consolidatedGroupName = nil;
-	}
-	
-	if (inConsolidatedGroupName == nil || threshold == 0)
-	{
-		autoConsolidateGroupsThreshold = 0;
-		consolidatedGroupName = nil;
-	}
-	else
-	{
-		autoConsolidateGroupsThreshold = threshold;
-		consolidatedGroupName = [inConsolidatedGroupName copy];
-	}
+    autoConsolidateGroupsThreshold = threshold;
+    consolidatedGroupName = [inConsolidatedGroupName copy];
+    [self validateAutoConsolidation];
 }
 
 - (NSUInteger)autoConsolidateGroupsThreshold
@@ -343,9 +362,18 @@
 		@throw [NSException exceptionWithName:@"YapDatabaseException" reason:reason userInfo:userInfo];
 	}
 	
+	YapDatabaseViewTransaction *viewTransaction = [transaction ext:registeredViewName];
+	if (viewGroupsAreDynamic)
+	{
+		NSArray *newGroups = [self filterAndSortGroups:[viewTransaction allGroups] withTransaction:transaction];
+		if ([self shouldUpdateAllGroupsWithNewGroups:newGroups]) {
+			[self updateMappingsWithNewGroups:newGroups];
+		}
+	}
+    
 	for (NSString *group in allGroups)
 	{
-		NSUInteger count = [[transaction ext:registeredViewName] numberOfKeysInGroup:group];
+		NSUInteger count = [viewTransaction numberOfKeysInGroup:group];
 		
 		[counts setObject:@(count) forKey:group];
 	}
@@ -359,12 +387,66 @@
 	[self updateVisibility];
 }
 
+- (void)updateMappingsWithNewGroups:(NSArray *)newAllGroups
+{
+	allGroups = [newAllGroups copy];
+    [self validateAutoConsolidation];
+    id sharedKeySet = [NSDictionary sharedKeySetForKeys:allGroups];
+    counts = [NSMutableDictionary dictionaryWithSharedKeySet:sharedKeySet];
+}
+
+- (void)validateAutoConsolidation{
+    if ([allGroups containsObject:consolidatedGroupName]){
+        YDBLogWarn(@"%@ - consolidatedGroupName cannot match existing groupName", THIS_METHOD);
+        consolidatedGroupName = nil;
+        autoConsolidateGroupsThreshold = 0;
+    }
+    
+    if (consolidatedGroupName == nil || autoConsolidateGroupsThreshold == 0){
+        consolidatedGroupName = nil;
+        autoConsolidateGroupsThreshold = 0;
+    }
+}
+
+- (NSArray *)filterAndSortGroups:(NSArray *)groups withTransaction:(YapDatabaseReadTransaction *)transaction
+{
+	NSMutableArray *newAllGroups = [NSMutableArray arrayWithCapacity:[groups count]];
+	for (NSString *group in groups)
+	{
+		if (groupFilterBlock(group, transaction)) {
+			[newAllGroups addObject:group];
+		}
+	}
+	
+	[newAllGroups sortUsingComparator:^NSComparisonResult(id obj1, id obj2) {
+		
+		return groupSort(obj1, obj2, transaction);
+	}];
+    
+    return [newAllGroups copy];
+}
+
+- (BOOL)shouldUpdateAllGroupsWithNewGroups:(NSArray *)newGroups{
+    return ![allGroups isEqualToArray:newGroups];
+}
+
+
 /**
  * This method is internal.
  * It is only for use by the unit tests in TestViewChangeLogic.
 **/
 - (void)updateWithCounts:(NSDictionary *)newCounts
 {
+	if (viewGroupsAreDynamic)
+	{
+		// The groups passed in the dictionary represent the new allGroups.
+		// This simulates as if we ran the groupFilterBlock & groupSortBlock.
+		
+		NSArray *newGroups = [newCounts allKeys];
+		if ([self shouldUpdateAllGroupsWithNewGroups:newGroups]) {
+			[self updateMappingsWithNewGroups:newGroups];
+        }
+    }
 	for (NSString *group in allGroups)
 	{
 		NSUInteger count = [[newCounts objectForKey:group] unsignedIntegerValue];
@@ -441,7 +523,7 @@
 		else
 			count = [[counts objectForKey:group] unsignedIntegerValue];
 		
-		if (count > 0 || ![dynamicSections containsObject:group]) {
+		if (count > 0 || ![self isGroupDynamic:group]) {
 			[visibleGroups addObject:group];
 		}
 		
@@ -454,6 +536,13 @@
 		isUsingConsolidatedGroup = NO;
 }
 
+-(BOOL)isGroupDynamic:(NSString *)group{
+    if (!isDynamicSectionForAllGroups){
+        return [dynamicSections containsObject:group];
+    }
+    return YES;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Internal
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -528,8 +617,13 @@
  * Returns the number of items in the given group.
  *
  * This is the cached value from the last time one of the following methods was invoked:
- * - updateWithTransaction:
- * - changesForNotifications:withMappings:
+ * - updateWithTransaction: 
+ * which should be invoked when the mapping is first created and then will be invoked whenever
+ * - (void)getSectionChanges:(NSArray **)sectionChangesPtr
+ *                rowChanges:(NSArray **)rowChangesPtr
+ *          forNotifications:(NSArray *)notifications
+ *              withMappings:(YapDatabaseViewMappings *)mappings 
+ * is called on the associated registered YapDatabaseView.
 **/
 - (NSUInteger)numberOfItemsInGroup:(NSString *)group
 {
@@ -1124,6 +1218,8 @@
 	return NO;
 }
 
+//- (NSUInteger)groupOffsetForGroup:
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Getters + RangeOptions
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1274,6 +1370,33 @@
 	return total;
 }
 
+/**
+ * When isUsingConsolidatedGroup, this method returns the offset of the given group
+ * within the flattened/consolidated group.
+**/
+- (NSUInteger)rowOffsetForGroup:(NSString *)searchGroup
+{
+	NSUInteger offset = 0;
+	
+	for (NSString *group in visibleGroups) // NOT [self visibleGroups]
+	{
+		if ([group isEqualToString:searchGroup])
+		{
+			return offset;
+		}
+		else
+		{
+			YapDatabaseViewRangeOptions *rangeOpts = [rangeOptions objectForKey:group];
+			if (rangeOpts)
+				offset += rangeOpts.length;
+			else
+				offset += [[counts objectForKey:group] unsignedIntegerValue];
+		}
+	}
+	
+	return 0;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Getters + Utilities
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1390,7 +1513,16 @@
 		groupIndex++;
 	}
 	
-	if (!foundGroup) return nil;
+	if (!foundGroup)
+	{
+		// The given group doesn't exist.
+		//
+		// Note: You should NOT be passing the consolidatedGroup to this method.
+		// You need to pass the proper database view group.
+		// If the mappings are consolidated, this method will automatically translate the result for you.
+		
+		return nil;
+	}
 	
 	BOOL isGroupVisible = NO;
 	NSUInteger visibleGroupIndex = 0;
@@ -1412,24 +1544,21 @@
 		NSUInteger rows = [self numberOfItemsInGroup:searchGroup];
 		if (rows > 0)
 		{
-			if (row < rows)
-			{
-			  #if TARGET_OS_IPHONE
-				return [NSIndexPath indexPathForRow:row inSection:visibleGroupIndex];
-			  #else
-				NSUInteger indexes[] = {visibleGroupIndex, row};
-				return [NSIndexPath indexPathWithIndexes:indexes length:2];
-			  #endif
-			}
-			else
+			NSUInteger _row = (row < rows) ? row : rows-1;
+			NSUInteger _section = visibleGroupIndex;
+			
+			if (isUsingConsolidatedGroup)
 			{
-			  #if TARGET_OS_IPHONE
-				return [NSIndexPath indexPathForRow:(rows-1) inSection:visibleGroupIndex];
-			  #else
-				NSUInteger indexes[] = {visibleGroupIndex, (rows-1)};
-				return [NSIndexPath indexPathWithIndexes:indexes length:2];
-			  #endif
+				_row += [self rowOffsetForGroup:searchGroup];
+				_section = 0;
 			}
+			
+		  #if TARGET_OS_IPHONE
+			return [NSIndexPath indexPathForRow:_row inSection:_section];
+		  #else
+			NSUInteger indexes[] = {_section, _row};
+			return [NSIndexPath indexPathWithIndexes:indexes length:2];
+		  #endif
 		}
 	}
 	
@@ -1449,10 +1578,19 @@
 			NSUInteger rows = [self numberOfItemsInGroup:nearbyGroup];
 			if (rows > 0)
 			{
+				NSUInteger _row = rows-1;
+				NSUInteger _section = section;
+				
+				if (isUsingConsolidatedGroup)
+				{
+					_row += [self rowOffsetForGroup:nearbyGroup];
+					_section = 0;
+				}
+				
 			  #if TARGET_OS_IPHONE
-				return [NSIndexPath indexPathForRow:(rows-1) inSection:section];
+				return [NSIndexPath indexPathForRow:_row inSection:_section];
 			  #else
-				NSUInteger indexes[] = {section, (rows-1)};
+				NSUInteger indexes[] = {_section, _row};
 				return [NSIndexPath indexPathWithIndexes:indexes length:2];
 			  #endif
 			}
@@ -1473,10 +1611,19 @@
 			NSUInteger rows = [self numberOfItemsInGroup:nearbyGroup];
 			if (rows > 0)
 			{
+				NSUInteger _row = 0;
+				NSUInteger _section = section;
+				
+				if (isUsingConsolidatedGroup)
+				{
+					_row += [self rowOffsetForGroup:nearbyGroup];
+					_section = 0;
+				}
+				
 			  #if TARGET_OS_IPHONE
-				return [NSIndexPath indexPathForRow:0 inSection:section];
+				return [NSIndexPath indexPathForRow:_row inSection:_section];
 			  #else
-				NSUInteger indexes[] = {section, 0};
+				NSUInteger indexes[] = {_section, _row};
 				return [NSIndexPath indexPathWithIndexes:indexes length:2];
 			  #endif
 			}