bm-core-ui 2.10.2 → 2.10.4

package/build/BMCollectionView/BMCollectionView.js

@@ -4344,7 +4344,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
         }
 
 		do {
-			const startingIndexPath = nextIndexPath;
+			const startingIndexPath = nextIndexPath ?? BMIndexPathNone;
 
 			if (!nextIndexPath) {
 				// If no index path is currently highlighted, highlight the first index path in the data set.
@@ -5888,6 +5888,10 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		else if (options.horizontalGravity == BMCollectionViewScrollingGravityHorizontal.Right) {
 			offset.x = rect.origin.x + rect.size.width - this.frame.size.width;
 		}
+
+		// Make sure the offset doesn't exceed the available area
+		offset.y = Math.min(Math.max(0, offset.y), this._size.height - this.frame.size.height);
+		offset.x = Math.min(Math.max(0, offset.x), this._size.width - this.frame.size.width);
 		
 		// Scroll to the offset point
 		if (options.animated) {

package/build/BMCollectionView/BMCollectionViewFlowLayout.js

@@ -4664,7 +4664,7 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 		let previousRow;
 
 		// Find the next row, if any
-		if (rowIndex >= 0) {
+		if (rowIndex > 0) {
 			const previousRowIndex = rowIndex - 1;
 			previousRow = sectionRows[previousRowIndex];
 		}
@@ -4673,7 +4673,8 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 			let sectionIndex = section - 1;
 			while (sectionIndex >= 0) {
 				if (this.collectionView.numberOfObjectsInSectionAtIndex(sectionIndex)) {
-					previousRow = this.cachedLayout.sections[sectionIndex].sectionRows[this.cachedLayout.sections[sectionIndex].sectionRows.length - 1];
+					// NOTE: When using automatic cell size, there can be fewer cached sections than there are in the data set
+					previousRow = this.cachedLayout.sections[sectionIndex]?.rows[(this.cachedLayout.sections[sectionIndex]?.rows.length || 0) - 1];
 					break;
 				}
 				sectionIndex--;
@@ -4803,7 +4804,7 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 			let sectionIndex = section + 1;
 			while (sectionIndex < sectionCount) {
 				if (this.collectionView.numberOfObjectsInSectionAtIndex(sectionIndex)) {
-					nextRow = this.cachedLayout.sections[sectionIndex].sectionRows[0];
+					nextRow = this.cachedLayout.sections[sectionIndex]?.rows[0];
 					break;
 				}
 				sectionIndex++;