bm-core-ui 2.8.2 → 2.9.0

package/build/BMCollectionView/BMCollectionView.js

@@ -4,7 +4,7 @@ import {YES, NO, BMExtend, BMScrollBarGetSize, BMAddSmoothMousewheelInteractionT
 import {BMInset} from '../Core/BMInset'
 import {BMPointMake} from '../Core/BMPoint'
 import {BMSizeMake} from '../Core/BMSize'
-import {BMRect, BMRectMake, BMRectMakeWithNodeFrame, BMRectByInterpolatingRect} from '../Core/BMRect'
+import {BMRect, BMRectMake, BMRectMakeWithNodeFrame, BMRectMakeWithOrigin, BMRectByInterpolatingRect} from '../Core/BMRect'
 import {BMIndexPathNone} from '../Core/BMIndexPath'
 import {BMAnimateWithBlock, BMAnimationContextBeginStatic, BMAnimationContextGetCurrent, BMAnimationContextAddCompletionHandler, BMAnimationApply, __BMVelocityAnimate, BMHook} from '../Core/BMAnimationContext'
 import {BMView, BMViewLayoutQueue} from '../BMView/BMView_v2.5'
@@ -693,7 +693,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 	/**
 	 * Defaults to `YES`. When set to `NO`, keyboard navigation is disabled.
 	 */
-	_supportsKeyboardNavigation: YES, // <Boolean>
+	_supportsKeyboardNavigation: NO, // <Boolean>
 
 	get supportsKeyboardNavigation() {
 		return this._supportsKeyboardNavigation;
@@ -1024,8 +1024,6 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			this.__awaitsLayout = YES;
 			return;
 		}
-
-		this._blocksLayoutInvalidation = YES;
 	    
 	    // Do not invalidate the layout during an animated data update
 	    if (this.isUpdatingData) {
@@ -1033,6 +1031,8 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		    this.registerDataCompletionCallback(function () { self.invalidateLayout(); });
 		    return;
 		}
+
+		this._blocksLayoutInvalidation = YES;
 		
 		// If the layout supports animated changes and an animation context is active, make this change animated
 		let animation;
@@ -1185,8 +1185,13 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 	 * Should be invoked by layout objects when the content size changes, but no other aspect of the layout does.
 	 */
 	invalidateContentSize() {
-		// If an update is in progress, ignore this
-		if (!this._collectionEnabled) return;
+		// If an update is in progress, delay this until after the update
+		if (!this._collectionEnabled) {
+			this.registerDataCompletionCallback(() => {
+				this.invalidateContentSize();
+			})
+			return;
+		}
 
 	    var size = this._layout.contentSize();
 	    
@@ -1451,6 +1456,8 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			return;
 		}
 
+		const previousBounds = BMRectMakeWithOrigin(previousBoundsOffset, {size: this._bounds.size.copy()});
+
 		// Dequeue the layout queue after a minimal delay to minimize visual artifacts
 		(async () => {
 			await 0;
@@ -1459,19 +1466,21 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		
 		
 		// Invalidate the layout if the layout object requires invalidation when the bounds change
-		if (this._layout.shouldInvalidateLayoutForBoundsChange(this._bounds)) {
+		if (this._layout.shouldInvalidateLayoutForBoundsChange(this._bounds, {fromBounds: previousBounds})) {
 			this.invalidateLayoutForBoundsChange();
 		
 			// Let the delegate know that the bounds were updated
 			if (this.delegate && typeof this.delegate.collectionViewBoundsDidChange == 'function') {
-				this.delegate.collectionViewBoundsDidChange(this, this._bounds);
+				this.delegate.collectionViewBoundsDidChange(this, this._bounds, {fromBounds: previousBounds});
 			}
 			
 			// Let the layout know that the invalidation was successful.
 			this._layout.didInvalidateLayoutForBoundsChange();
 
 			// Prepare to request and apply the snapping offset from the layout
-			snapsScrollPosition && this._prepareForSnappingScrollOffsetWithPreviousOffset(previousBoundsOffset);
+			if (snapsScrollPosition) {
+				this._prepareForSnappingScrollOffsetWithPreviousOffset(previousBoundsOffset);
+			}
 
 			return;
 		}
@@ -1619,12 +1628,14 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		
 			// Let the delegate know that the bounds were updated
 			if (this.delegate && typeof this.delegate.collectionViewBoundsDidChange == 'function') {
-				this.delegate.collectionViewBoundsDidChange(this, this._bounds);
+				this.delegate.collectionViewBoundsDidChange(this, this._bounds, {fromBounds: previousBounds});
 			}
 		    
 
 			// Prepare to request and apply the snapping offset from the layout
-			snapsScrollPosition && this._prepareForSnappingScrollOffsetWithPreviousOffset(previousBoundsOffset);
+			if (snapsScrollPosition) {
+				this._prepareForSnappingScrollOffsetWithPreviousOffset(previousBoundsOffset);
+			}
 
 		    return;
 	    }
@@ -1644,13 +1655,15 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		
 		// Let the delegate know that the bounds were updated
 		if (this.delegate && typeof this.delegate.collectionViewBoundsDidChange == 'function') {
-			this.delegate.collectionViewBoundsDidChange(this, this._bounds);
+			this.delegate.collectionViewBoundsDidChange(this, this._bounds, {fromBounds: previousBounds});
 		}
 
 		// Prepare to request and apply the snapping offset from the layout, unless the collection view is performing an
 		// automated scrolling animation
 		if (!this._isPerformingAnimatedScrolling) {
-			snapsScrollPosition && this._prepareForSnappingScrollOffsetWithPreviousOffset(previousBoundsOffset);
+			if (snapsScrollPosition) {
+				this._prepareForSnappingScrollOffsetWithPreviousOffset(previousBoundsOffset);
+			}
 		}
 
 	    
@@ -3988,7 +4001,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		if (options && options.withEvent) options.withEvent._BMOriginalTarget = cell.node;
 
         // Acquire focus if not already owned
-        if (document.activeElement != this.node) {
+        if (document.activeElement != this.node && this._supportsKeyboardNavigation) {
             this.node.focus();
         }
 
@@ -4053,7 +4066,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		if (options && options.withEvent) options.withEvent._BMOriginalTarget = cell.node;
 
         // Acquire focus if not already owned
-        if (document.activeElement != this.node) {
+        if (document.activeElement != this.node && this._supportsKeyboardNavigation) {
             this.node.focus();
         }
 
@@ -4075,7 +4088,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		if (options && options.withEvent) options.withEvent._BMOriginalTarget = cell.node;
 
         // Acquire focus if not already owned
-        if (document.activeElement != this.node) {
+        if (document.activeElement != this.node && this._supportsKeyboardNavigation) {
             this.node.focus();
         }
 		
@@ -5028,6 +5041,10 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 				}
 			}
 			
+			if (options && options.completionHandler) {
+				options.completionHandler();
+			}
+			
 			this._executeDataCompletionCallbacks();
 			resolveUpdateData();
 			// Resolve the static animation context prior to returning

package/build/BMCollectionView/BMCollectionViewFlowLayout.js

@@ -1699,9 +1699,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 	 * When using automatic cell sizes, the generator will yield execution and only calculate portions of the layout on demand.
 	 * With the exeption of the first invocation, it is required to pass an index path to the iterator's `next` method. The layout process
 	 * will continue until it fully lays out the cell for that index path, at which point it will yield again.
-	 * @param useOffset <Boolean>			When set to `YES` the layout will take the scrollbar size into account.
+	 * @param useOffset <Boolean>							When set to `YES` the layout will take the scrollbar size into account.
+	 * {
+	 * 	@param targetRect <BMRect, nullable>				When computing a layout using automatic cell sizes, this is an optional rect up to which
+	 * 														to measure cells. This is reserved for when this is invoked as a delegate.
+	 * 	@param targetIndexPath <BMIndexPath, nullable>		When computing a layout using automatic cell sizes, this is an optional index path up to which
+	 * 														to measure cells. This is reserved for when this is invoked as a delegate.
+	 * }
 	 */
-	*_prepareLayoutWithScrollbarOffsetGenerator(useOffset) {
+	*_prepareLayoutWithScrollbarOffsetGenerator(useOffset, target) {
 		
 		// To standardize naming in order to support the orientation setting, the following terms are used:
 		// Length - refers to the dimension across the axis on which collection view scrolls: height for vertical and width for horizontal
@@ -1803,7 +1809,6 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 				targetRect?: BMRect;
 			}
 			*/
-			let target;
 
 			// The sections that contain the preliminary layout
 			const preliminarySections = [];
@@ -1977,15 +1982,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 							
 							numberOfColumns++;
 						} while (usedLength < maximumLength && expectedSize);
-
-						// Ensure that there is at least one column
-						numberOfColumns = Math.max(numberOfColumns, 1);
 					}
 					else {
 						// If there is no minimum spacing required, then the number of columns is simply the available space divided
 						// by the cell width
-						numberOfColumns = Math.max((maximumLength / expectedSize) | 0, 1);
+						numberOfColumns = (maximumLength / expectedSize) | 0;
 					}
+
+					// Ensure that there is at least one column
+					numberOfColumns = Math.max(numberOfColumns, 1);
 				}
 
 				// Create the preliminary sections
@@ -2069,7 +2074,12 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 
 					cachedLayout.size = BMSizeMake(this.collectionView.frame.size.width, height);
 	
-					target = yield;
+					// Yield after building the preliminary layout and wait for a target rect or index path up to which to measure
+					if (!target) {
+						// If a target is already supplied (as a parameter) this is a delegate generator and processing should continue
+						// until this target
+						target = yield;
+					}
 
 					// When requesting a rect initially, pre-measure the cells up to that rect
 					if (target.rect) {
@@ -2085,7 +2095,13 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 
 					cachedLayout.size = BMSizeMake(width, this.collectionView.frame.size.height);
 	
-					target = yield;
+					// Yield after building the preliminary layout and wait for a target rect or index path up to which to measure
+					if (!target) {
+						// If a target is already supplied (as a parameter) this is a delegate generator and processing should continue
+						// until this target
+						target = yield;
+					}
+
 					// When requesting a rect initially, pre-measure the cells up to that rect
 					if (target.rect) {
 						measureCellsInRect(target.rect);
@@ -2220,7 +2236,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 
 						// If the row height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 						if (row[rowStartAttribute] + rowBreadth > frameSize) {
-							if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+							if (this.collectionView.scrollBarSize && !useOffset) {
+								if (target) {
+									// With automatic cell size delegate iteration to the new invocation
+									return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+								}
+								else {
+									return this._prepareLayoutWithScrollbarOffset(YES);
+								}
+							}
 						}
 						
 						// if there is one
@@ -2383,7 +2407,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 						
 						// If the total height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 						if (height > frameHeight) {
-							if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+							if (this.collectionView.scrollBarSize && !useOffset) {
+								if (target) {
+									// With automatic cell size delegate iteration to the new invocation
+									return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+								}
+								else {
+									return this._prepareLayoutWithScrollbarOffset(YES);
+								}
+							}
 						}
 					}
 					else {
@@ -2404,7 +2436,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 						
 						// If the total height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 						if (width > frameWidth) {
-							if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+							if (this.collectionView.scrollBarSize && !useOffset) {
+								if (target) {
+									// With automatic cell size delegate iteration to the new invocation
+									return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+								}
+								else {
+									return this._prepareLayoutWithScrollbarOffset(YES);
+								}
+							}
 						}
 					}
 				}
@@ -2418,7 +2458,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 					
 					// If the total height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 					if (height > frameHeight) {
-						if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+						if (this.collectionView.scrollBarSize && !useOffset) {
+							if (target) {
+								// With automatic cell size delegate iteration to the new invocation
+								return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+							}
+							else {
+								return this._prepareLayoutWithScrollbarOffset(YES);
+							}
+						}
 					}
 				}
 				else {
@@ -2429,7 +2477,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 					
 					// If the total height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 					if (width > frameWidth) {
-						if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+						if (this.collectionView.scrollBarSize && !useOffset) {
+							if (target) {
+								// With automatic cell size delegate iteration to the new invocation
+								return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+							}
+							else {
+								return this._prepareLayoutWithScrollbarOffset(YES);
+							}
+						}
 					}
 				}
 				
@@ -2440,7 +2496,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 				
 				// If the total height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 				if (height > frameHeight) {
-					if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+					if (this.collectionView.scrollBarSize && !useOffset) {
+						if (target) {
+							// With automatic cell size delegate iteration to the new invocation
+							return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+						}
+						else {
+							return this._prepareLayoutWithScrollbarOffset(YES);
+						}
+					}
 				}
 			
 				// If the height is lower than the collection view's height, the content gravity must be applied to all cached attributes
@@ -2534,7 +2598,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 			else {
 				// If the total height exceeds the collection view frame height, perform a second layout pass to account for the scrollbars
 				if (width > frameWidth) {
-					if (this.collectionView.scrollBarSize && !useOffset) return this._prepareLayoutWithScrollbarOffset(YES);
+					if (this.collectionView.scrollBarSize && !useOffset) {
+						if (target) {
+							// With automatic cell size delegate iteration to the new invocation
+							return yield *this._prepareLayoutWithScrollbarOffsetGenerator(YES, target);
+						}
+						else {
+							return this._prepareLayoutWithScrollbarOffset(YES);
+						}
+					}
 				}
 			
 				// If the height is lower than the collection view's height, the content gravity must be applied to all cached attributes
@@ -2607,7 +2679,7 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 								const scaledRowHeight = rowWidth * scaleFactor | 0;
 								for (const attribute of row.attributes) {
 									attribute.frame.origin.x += displacement;
-									attribute.frame.size.height = attribute.frame.size.height * scaleFactor | 0;
+									attribute.frame.size.width = attribute.frame.size.width * scaleFactor | 0;
 								}
 
 								// Advance the displacement based on the row's new width then displace the row end
@@ -2710,14 +2782,14 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 						
 						numberOfColumns++;
 					} while (usedLength < length && cellSize);
-
-					numberOfColumns = Math.max(numberOfColumns, 1);
 				}
 				else {
 					// If there is no minimum spacing required, then the number of columns is simply the available space divided
 					// by the cell width
-					numberOfColumns = Math.max((length / cellSize) | 0, 1);
+					numberOfColumns = (length / cellSize) | 0;
 				}
+
+				numberOfColumns = Math.max(numberOfColumns, 1);
 			}
 			cachedLayout.numberOfColumns = numberOfColumns;
 			
@@ -3263,10 +3335,18 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 		// for the requested index path
 		if (this._expectedCellSize) {
 			if (this.cachedLayout.resolvedIndexPath.section < indexPath.section ||
-				(this.cachedLayout.resolvedIndexPath.section == indexPath.section && this.cachedLayout.resolvedIndexPath.row < indexPath.row)) {
-					// If the layout has not been resolved up to this index path, continue computing it until it has
-					this._layoutIterator.next({indexPath: indexPath});
+				(this.cachedLayout.resolvedIndexPath.section == indexPath.section && this.cachedLayout.resolvedIndexPath.row < indexPath.row)
+			) {
+				const currentResolvedHeight = this.cachedLayout.resolvedHeight;
+
+				// If the layout has not been resolved up to this index path, continue computing it until it has
+				this._layoutIterator.next({indexPath: indexPath});
+
+				// If the resolved height changes, invalidate the content size
+				if (currentResolvedHeight != this.cachedLayout.resolvedHeight) {
+					this.invalidateContentSize();
 				}
+			}
 		}
 	    
 	    // Return the cached attributes when using dynamic sizes
@@ -4252,22 +4332,33 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 		var attributes;
 		var self = this;
 		
-		this.collectionView.usingOldDataSet(function () {
-			// When using automatic cell sizes, it is important to ensure that the sizing information has been computed
-			// for the requested index path
-			if (self._expectedCellSize) {
-				if (self.previousLayout.resolvedIndexPath.section < indexPath.section ||
-					(self.previousLayout.resolvedIndexPath.section == indexPath.section && self.previousLayout.resolvedIndexPath.row < indexPath.row)) {
+		// When using automatic cell sizes, it is important to ensure that the sizing information has been computed
+		// for the requested index path
+		if (self._expectedCellSize) {
+			if (self.previousLayout.resolvedIndexPath.section < indexPath.section ||
+				(self.previousLayout.resolvedIndexPath.section == indexPath.section && self.previousLayout.resolvedIndexPath.row < indexPath.row)) {
+					self.collectionView.usingOldDataSet(function () {
 						// If the layout has not been resolved up to this index path, continue computing it until it has
 						self.previousLayout.iterator.next({indexPath: indexPath});
-					}
-			}
+					});
+				}
+		}
+		
+		this.collectionView.usingOldDataSet(function () {
 
 			if (self._cellSize && !self._expectedCellSize) {
 				attributes = self.computedAttributesForCellAtIndexPath(indexPath, {usingCache: self.previousLayout});
 			}
 			else {
 				attributes = self.cachedAttributesForCellAtIndexPath(indexPath, {usingCache: self.previousLayout});
+
+				if (!attributes) {
+					// When using automatic cell sizes, it is possible that the attributes for the moving cell were not computed
+					// in this case, return a copy of the current attributes, with the opacity set to 0
+					attributes = options.withTargetAttributes.copy();
+
+					attributes.style = Object.assign(attributes.style, {opacity: 0});
+				}
 			}
 		});
 		
@@ -4278,6 +4369,21 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 	initialAttributesForMovingSupplementaryViewWithIdentifier: function (identifier, options) {
 		var attributes;
 		var self = this;
+
+		// When using automatic cell sizes, ensure that the sizing information has been computed for the requested index path
+		if (self._expectedCellSize) {
+			if (self.cachedLayout.resolvedIndexPath.section < options.atIndexPath.section ||
+				(self.cachedLayout.resolvedIndexPath.section == options.atIndexPath.section && identifier == BMCollectionViewFlowLayoutSupplementaryView.Footer)) {
+					if (options.atIndexPath.section == self.collectionView.numberOfSections() - 1) {
+						// If there is no following section, compute until the last index path
+						self._layoutIterator.next({indexPath: self.collectionView.indexPathForObjectAtRow(self.collectionView.numberOfObjectsInSectionAtIndex(options.atIndexPath.section) - 1, {inSectionAtIndex: options.atIndexPath.section})});
+					}
+					else {
+						// If the layout has not been resolved up to this index path, continue computing up to the beginning of the next section
+						self._layoutIterator.next({indexPath: self.collectionView.indexPathForObjectAtRow(0, {inSectionAtIndex: options.atIndexPath.section + 1})});
+					}
+			}
+		}
 		
 		this.collectionView.usingOldDataSet(function () {
 			if (identifier === BMCollectionViewTableLayoutSupplementaryView.Empty) {
@@ -4288,6 +4394,14 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 			}
 			else {
 				attributes = self.cachedAttributesForSupplementaryViewWithIdentifier(identifier, {atIndexPath: options.atIndexPath, usingCache: self.previousLayout});
+
+				if (!attributes) {
+					// When using automatic cell sizes, it is possible that the attributes for the moving supplementary view were not computed
+					// in this case, return a copy of the current attributes, with the opacity set to 0
+					attributes = options.withTargetAttributes.copy();
+
+					attributes.style = Object.assign(attributes.style, {opacity: 0});
+				}
 			}
 		});
 		
@@ -4489,19 +4603,22 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 		const row = indexPath.row;
 
 		// Find the row where the current index path is
-		const sectionRows = this.cachedLayout.sections[section];
+		const cachedSection = this.cachedLayout.sections[section];
 
-		if (!sectionRows) return indexPath;
+		if (!cachedSection) return indexPath;
+
+		const sectionRows = cachedSection.rows;
 		
 		let rowIndex = 0;
 		const rowCount = sectionRows.length;
 		for (rowIndex; rowIndex < rowCount; rowIndex++) {
-			if (row.startIndex <= row && row.endIndex >= row) {
+			const sectionRow = sectionRows[rowIndex];
+			if (sectionRow.startIndex <= row && sectionRow.endIndex >= row) {
 				break;
 			}
 		}
 
-		const attributes = sectionRows[rowIndex].attributes;
+		const attributes = sectionRows[rowIndex].attributes.find(a => a.indexPath.row == row);
 		const positionProperty = this._orientation == BMCollectionViewFlowLayoutOrientation.Vertical ? 'x' : 'y';
 		const position = attributes.frame.center[positionProperty];
 
@@ -4616,19 +4733,22 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 		const row = indexPath.row;
 
 		// Find the row where the current index path is
-		const sectionRows = this.cachedLayout.sections[section];
+		const cachedSection = this.cachedLayout.sections[section];
+
+		if (!cachedSection) return indexPath;
 
-		if (!sectionRows) return indexPath;
+		const sectionRows = cachedSection.rows;
 		
 		let rowIndex = 0;
 		const rowCount = sectionRows.length;
 		for (rowIndex; rowIndex < rowCount; rowIndex++) {
-			if (row.startIndex <= row && row.endIndex >= row) {
+			const sectionRow = sectionRows[rowIndex];
+			if (sectionRow.startIndex <= row && sectionRow.endIndex >= row) {
 				break;
 			}
 		}
 
-		const attributes = sectionRows[rowIndex].attributes;
+		const attributes = sectionRows[rowIndex].attributes.find(a => a.indexPath.row == row);
 		const positionProperty = this._orientation == BMCollectionViewFlowLayoutOrientation.Vertical ? 'x' : 'y';
 		const position = attributes.frame.center[positionProperty];
 

package/build/BMCollectionView/BMCollectionViewLayout.js

@@ -659,9 +659,12 @@ BMCollectionViewLayout.prototype = {
      * Layout objects should return YES from this method if the new bounds require a new layout.
      * The default implementation returns NO in all cases.
      * @param bounds <BMRect>       The new bounds.
+	 * {
+	 * 	@param fromBounds <BMRect>	The previous bounds.
+	 * }
      * @return <Boolean>            True if the new frame requires a new layout, false otherwise.
      */
-    shouldInvalidateLayoutForBoundsChange: function (bounds) {
+    shouldInvalidateLayoutForBoundsChange: function (bounds, {fromBounds}) {
         return NO;
     },