bm-core-ui 2.9.0 → 2.9.2

package/build/BMCollectionView/BMCollectionView.js

@@ -5532,7 +5532,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			if (self._droppedShadows) {
 				self._droppedShadows.forEach(shadow => {
 					if (shadow.transform) {
-						BMHook(shadow.node, {rotateZ: shadow.rotation});
+						BMHook(shadow.node, {rotateZ: shadow.rotation + 'deg', translateX: '0px', translateY: '0px'});
 						let controller = BMAnimationContextGetCurrent().controllerForObject(shadow, {node: shadow.node});
 						controller.registerBuiltInProperty('translateX', {withValue: shadow.transform.origin.x + 'px'});
 						controller.registerBuiltInProperty('translateY', {withValue: shadow.transform.origin.y + 'px'});
@@ -5542,7 +5542,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 						controller.registerBuiltInProperty('opacity', {withValue: 0});
 					}
 					else {
-						BMHook(shadow.node, {rotateZ: shadow.rotation});
+						BMHook(shadow.node, {rotateZ: shadow.rotation + 'deg'});
 						let controller = BMAnimationContextGetCurrent().controllerForObject(shadow, {node: shadow.node});
 						controller.registerBuiltInProperty('scaleX', {withValue: .33});
 						controller.registerBuiltInProperty('scaleY', {withValue: .33});

package/build/BMCollectionView/BMCollectionViewFlowLayout.js

@@ -1679,12 +1679,39 @@ BMCollectionViewFlowLayout.prototype = BMExtend(Object.create(BMCollectionViewLa
 			return;
 		}
 
+		// When the scrollbar offset is used, invalidate any measurement that exceeds the available space.
+		if (this._expectedCellSize && this._collectionView.scrollBarSize) {
+			switch (this.orientation) {
+				case BMCollectionViewFlowLayoutOrientation.Horizontal:
+					// Determine the available height.
+					const insetHeight = this._sectionInsets.top + this._sectionInsets.bottom;
+					const paddingHeight = this._topPadding + this._bottomPadding;
+					const height = this._collectionView.frame.size.height - insetHeight - paddingHeight - this._collectionView.scrollBarSize;
+
+					// In horizontal mode, invalidate the measurements for cells that are too tall.
+					this._collectionView.invalidateMeasuredSizeOfCellsWithBlock((size) => {
+						return size.height > height;
+					});
+					break;
+				default:
+					// Determine the available width.
+					const insetWidth = this._sectionInsets.left + this._sectionInsets.right;
+					const width = this._collectionView.frame.size.width - insetWidth - this.collectionView.scrollBarSize;
+
+					// In default (vertical) mode, invalidate the measurements for cells that are too wide.
+					this._collectionView.invalidateMeasuredSizeOfCellsWithBlock((size) => {
+						return size.width > width;
+					});
+					break;
+			}
+		}
+
 		let iterator = this._prepareLayoutWithScrollbarOffsetGenerator(useOffset);
 
 		// When not using automatic cell sizes, the generator function will run to finish from the first
-		// invocation of next
+		// invocation of `next`.
 		// When using automatic cell sizes, the first iteration will only build a rough outline of the expected layout
-		// and must be retained so different portions of the layout can subsequently be computed
+		// and must be retained so different portions of the layout can subsequently be computed.
 		let result = iterator.next();
 		if (!result.done) {
 			this._layoutIterator = iterator;

package/build/iScroll/iscroll-probe.js

@@ -447,7 +447,12 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault && !utils.isBadAndroid && !utils.preventDefaultException(e.target, this.options.preventDefaultException) ) {
+		if ( 
+			this.options.preventDefault && 
+			!utils.isBadAndroid && 
+			!utils.preventDefaultException(e.target, this.options.preventDefaultException) &&
+			!e.target.classList.contains('BMCollectionViewCellEventHandler') && !e.target.parentNode.classList.contains('BMCollectionViewCellEventHandler')
+		) {
 			e.preventDefault();
 		}
 
@@ -597,7 +602,10 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault && !utils.preventDefaultException(e.target, this.options.preventDefaultException) ) {
+		if (
+			this.options.preventDefault && !utils.preventDefaultException(e.target, this.options.preventDefaultException) &&
+			!e.target.classList.contains('BMCollectionViewCellEventHandler') && !e.target.parentNode.classList.contains('BMCollectionViewCellEventHandler')
+		) {
 			e.preventDefault();
 		}