bm-core-ui 2.10.3 → 2.10.5

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.
@@ -4922,7 +4922,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 				targetOffset.x += self._offscreenBufferSize;
 				targetOffset.y += self._offscreenBufferSize;
 
-				let controller = BMAnimationContextGetCurrent().controllerForObject(self, {node: self._contentWrapper[0]});
+				let controller = BMAnimationContextGetCurrent().controllerForObject(self._contentWrapper[0], {node: self._contentWrapper[0]});
 				if (self.iScroll) {
 					//controller.registerCustomProperty('scrollOffset', {withHandler: fraction => {
 						//var offsetX = currentOffset.x + fraction * (targetOffset.x - currentOffset.x);
@@ -5625,7 +5625,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 				targetOffset.x += self._offscreenBufferSize;
 				targetOffset.y += self._offscreenBufferSize;
 
-				let controller = BMAnimationContextGetCurrent().controllerForObject(self, {node: self._container[0]});
+				let controller = BMAnimationContextGetCurrent().controllerForObject(self._container[0], {node: self._container[0]});
 				if (self.iScroll) {
 					controller.registerCustomProperty('scrollOffset', {withHandler: fraction => {
 						var offsetX = currentOffset.x + fraction * (targetOffset.x - currentOffset.x);

package/build/BMCollectionView/BMCollectionViewFlowLayout.js

@@ -1708,6 +1708,15 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 
 		let iterator = this._prepareLayoutWithScrollbarOffsetGenerator(useOffset);
 
+		// Determine if the result is a complete layout and disable iterators
+		// A complete layout has cached attributes for all sections and rows
+		const sectionCount = this.collectionView.numberOfSections();
+		const rowCount = sectionCount ? this.collectionView.numberOfObjectsInSectionAtIndex(sectionCount - 1) : 0;
+		let isCompleteLayout = !this._expectedCellSize || !sectionCount || (
+				this.cachedLayout?.sections?.length == sectionCount &&
+				this.cachedLayout?.sections[sectionCount - 1].rows?.length == rowCount
+		);
+
 		// When not using automatic cell sizes, the generator function will run to finish from the first
 		// invocation of `next`.
 		// When using automatic cell sizes, the first iteration will only build a rough outline of the expected layout
@@ -1717,6 +1726,28 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 			this._layoutIterator = iterator;
 			this.cachedLayout.iterator = iterator;
 		}
+		else if (!this.cachedLayout.iterator) {
+			// If the iterator is finished this means that either:
+			// - the layout is actually complete which can be verified by checking the cached attribute counts
+			// - the layout process had to be restarted with scrollbar offsets, in which case the cached layout
+			// 		will have been processed to have an iterator attached to it by the time the first iterator
+			//		step returns, in this case this branch should not execute
+
+			if (isCompleteLayout) {
+				// Of the result is done, update the resolved index path and size accordingly
+				this.cachedLayout.resolvedIndexPath = BMIndexPathMakeWithRow(rowCount - 1, {inSectionAtIndex: sectionCount - 1});
+	
+				const contentSize = this.contentSize();
+				this.cachedLayout.resolvedWidth = contentSize.width;
+				this.cachedLayout.resolvedHeight = contentSize.height;
+			}
+	
+			// TODO: The rest of the code must be updated to handle complete layout caches where there is no need to
+			if (!this._layoutIterator) {
+				this._layoutIterator = { next() {} };
+			}
+			this.cachedLayout.iterator = { next() {} };
+		}
 	},
 
 	/**
@@ -4664,7 +4695,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 +4704,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 +4835,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++;