bm-core-ui 2.12.0-beta.16 → 2.12.0-beta.17

package/build/BMCollectionView/BMCollectionView.js

@@ -489,6 +489,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		// If this frame is assigned as part of a layout animation, don't perform any changes
 		if (this._layoutAnimator) {
 			Object.getOwnPropertyDescriptor(BMView.prototype, 'frame').set.call(this, frame);
+			
 			return;
 		}
 
@@ -1954,7 +1955,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			}
 			
 			if (cell._exclusivelyRendered) {
-				// If the cell was exclusively rendered, it should left alone
+				// If the cell was exclusively rendered, it should be left alone
 				cell._exclusivelyRendered = undefined;
 				continue;
 			}
@@ -2160,7 +2161,9 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		const iterators = indexPaths.map(p => this._measuredSizeOfCellAtIndexPathGenerator(p, {layoutQueue: queue, dequeue: NO}));
 
 		iterators.forEach(i => i.next());
+		BMAnimationContextBeginStatic();
 		queue.dequeue();
+		BMAnimationApply();
 		iterators.forEach(i => i.next());
 	},
 
@@ -2424,10 +2427,16 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			constraints.push(constraint);
 		}
 
+		cell._registerLayout();
+
 		yield;
 
 		// Run a layout pass to measure the cell's subview
-		if (dequeue) cell.layoutIfNeeded();
+		if (dequeue) {
+		    BMAnimationContextBeginStatic();
+		    cell.layoutQueue.dequeue();
+			BMAnimationApply();
+		}
 
 		cell.layoutQueue = layoutQueue;
 
@@ -2460,6 +2469,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		}
 
 		// If the cell is still retained, reapply the previous attibutes
+		BMAnimationContextBeginStatic();
 		if (cell.retainCount > 0 && previousAttributes) {
 			cell.attributes = previousAttributes;
 		}
@@ -2467,6 +2477,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			cell._attributes = undefined;
 			attributes._cell = undefined;
 		}
+		BMAnimationApply();
 
 		// Invalidate the cell's constraints to allow the next layout pass to correctly update the cells
 		cell._invalidatedConstraints = YES;
@@ -5343,9 +5354,12 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			this._bounds.size.width = this._frame.size.width + 2 * this._offscreenBufferSize;
 			this._bounds.size.height = this._frame.size.height + 2 * this._offscreenBufferSize;
 		}
+		
+		const oldLayout = this._layout;
 	    
 	    // Ask the new layout to prepare its layout
 	    layout.collectionView = this;
+		this._layout = layout;
 	    layout.prepareLayout();
 	    
 		var newSize = layout.contentSize();
@@ -5360,7 +5374,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		// }
 	    
 	    // Check to see if an offset is required
-	    var newOffset = layout.preferredScrollOffsetForTransitionFromLayout(this._layout, {withOffset: this.scrollOffset.copy()});
+	    var newOffset = layout.preferredScrollOffsetForTransitionFromLayout(oldLayout, {withOffset: this.scrollOffset.copy()});
 	    
 	    // Then ensure that the new offset is constrained to the visible area
 	    newOffset.x = Math.max(0, Math.min(newOffset.x, newSize.width - this.frame.size.width));
@@ -5465,7 +5479,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		    var attribute = newAttributes[newAttributes.length - 1];
 		    
 		    if (attribute.itemType === BMCollectionViewLayoutAttributesType.Cell) {
-			    var oldAttribute = this._layout.attributesForCellAtIndexPath(attribute.indexPath);
+			    var oldAttribute = oldLayout.attributesForCellAtIndexPath(attribute.indexPath);
 			    
 			    // Create the transition attributes for this cell
 			    var transitionAttribute = _BMCollectionViewTransitionLayoutAttributesMakeWithSourceAttributes(oldAttribute, {targetAttributes: attribute});
@@ -5493,10 +5507,8 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 	    var transitionLayout = new _BMCollectionViewTransitionLayout(transitionAttributes, this._size, newSize, layout);
 		transitionLayout.collectionView = this;
 	    
-	    var oldLayout = this._layout;
-	    
 	    // Unbind the old layout
-	    this._layout.collectionView = undefined;
+	    oldLayout.collectionView = undefined;
 	    
 	    // Temporarily make the transition layout the current layout
 	    this._layout = transitionLayout;

package/build/BMCollectionView/BMCollectionViewFlowLayout.js

@@ -3365,9 +3365,10 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 		}
 		else {
 			// Because the measured size of the cells can depend upon the size of collection view's frame, in addition
-			// to invalidating the layout, flow layout also invalidates the size of cells that are as wide as collection view's previous frame.
+			// to invalidating the layout, flow layout also invalidates the size of cells that are as wide as collection view's previous frame
+			// or wider than the new frame
 			this.collectionView.invalidateMeasuredSizeOfCellsWithBlock(size => {
-				return size.width >= this.cachedLayout.availableWidth;
+				return size.width >= this.cachedLayout.availableWidth || size.width >= frame.width;
 			});
 		}
 
@@ -4976,4 +4977,3 @@ BMCollectionViewFlowLayout.flowLayout = function () {
 }
 
 // @endtype
-

package/build/BMCollectionView/BMCollectionViewLayout.js

@@ -978,6 +978,11 @@ _BMCollectionViewTransitionLayout.prototype = BMExtend({}, BMCollectionViewLayou
 		return this.targetLayout.attributesForSupplementaryViewWithIdentifier(identifier, args);
 	}, 
 
+	// @override - BMCollectionViewLayout
+	constraintsForMeasuringCell(cell, args) {
+		return this.targetLayout.constraintsForMeasuringCell(cell, args);
+	},
+
 	/**
 	 * Invoked by the collection view at the end of a layout transition.
 	 * Causes the transition layout to apply the final attributes to all animated cells.