bm-core-ui 2.9.1 → 2.9.3

package/build/BMCollectionView/BMCollectionView.js

@@ -1799,12 +1799,12 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 			if (cell.retainCount > 0) {
 				if (cell.itemType === BMCollectionViewLayoutAttributesType.Cell) {
 					// Request and apply the new attributes for this cell
-					var attributes = this._layout.attributesForCellAtIndexPath(cell.indexPath);
+					let attributes = this._layout.attributesForCellAtIndexPath(cell.indexPath);
 					cell.attributes = attributes;
 				}
 				else if (cell.itemType === BMCollectionViewLayoutAttributesType.SupplementaryView) {
 					// Request and apply the new attributes for this supplementary view
-					var attributes = this._layout.attributesForSupplementaryViewWithIdentifier(cell.reuseIdentifier, {atIndexPath: cell.indexPath});
+					let attributes = this._layout.attributesForSupplementaryViewWithIdentifier(cell.reuseIdentifier, {atIndexPath: cell.indexPath});
 					cell.attributes = attributes;
 				}
 			}
@@ -2140,11 +2140,11 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 	 * If the cell was already measured, this will immediately return the cached measured size.
 	 * @param indexPath <BMIndexPath<T>>				The index path of the cell whose size should be measured.
 	 * {
-	 * 	@param layoutQueue <BMLayoutQueue>				The layout queue to use for this measurement.
+	 * 	@param layoutQueue <BMViewLayoutQueue>			The layout queue to use for this measurement.
 	 * 	@param dequeue <Boolean>						Whether the layout queue should be drained automatically or not. If set to `NO`,
 	 *													the layout queue must be drained after the first time this generator yields.
 	 * }
-	 * @return <Iterator<BMSize or undefiend>>			The iterator.
+	 * @return <Iterator<BMSize or undefined>>			The iterator.
 	 */
 	*_measuredSizeOfCellAtIndexPathGenerator(indexPath, {layoutQueue: queue, dequeue}) {
 		// Return the cached size if it is available.

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/BMView/BMView_v2.5.js

@@ -629,7 +629,7 @@ export function BMView() {} // <constructor>
 
         node: undefined, // <DOMNode>
 
-        _keyboardShortcuts: undefined, // <Dictionary<string, [BMKeyboardShortcut]>>
+        _keyboardShortcuts: undefined, // <Dictionary<[BMKeyboardShortcut]>>
 
         registerKeyboardShortcut(shortcut) {
             return BMView.prototype.registerKeyboardShortcut.apply(this, arguments);
@@ -2210,7 +2210,7 @@ BMView.prototype = BMExtend(BMView.prototype, {
 	/**
 	 * The keyboard shortcuts that have been registered to this view.
 	 */
-	_keyboardShortcuts: undefined, // <Dictionary<string, [BMKeyboardShortcut]>>
+	_keyboardShortcuts: undefined, // <Dictionary<BMKeyboardShortcut[]>>
 
 	/**
 	 * Registers a keyboard shortcut that can be activated when this view has keyboard focus.
@@ -2282,6 +2282,7 @@ BMView.prototype = BMExtend(BMView.prototype, {
 	_keyboardShortcutsEnabled: NO, // <Boolean>
 
 	/**
+     * @protected
 	 * Enables keyboard shortcut handling. This makes the view's `node` focusable and attaches
 	 * the relevant event handlers to it.
 	 */
@@ -3075,6 +3076,7 @@ BMView.prototype = BMExtend(BMView.prototype, {
 
     /**
      * A generator that is used internally by CoreUI to layout subviews.
+     * @returns <Iterator<undefined>>
      */
     *_layoutSubviewsGenerator() {
 

package/build/BMWindow/BMWindow.js

@@ -1087,6 +1087,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 	},
 
 	/**
+     * @protected
 	 * Enables keyboard shortcut handling. This makes the window's `node` focusable and attaches
 	 * the relevant event handlers to it. If this window is the key window and the keyboard focus
 	 * is outside of this window, this window will acquire keyboard focus.

package/build/Core/BMCoreUI.js

@@ -233,7 +233,7 @@ export function BMAddSmoothMousewheelInteractionToNode(node, args) {
  * The property descriptors will be copied in the order in which the parameters are specified. For example, if the third parameter has a property
  * with the same name as the second parameter, the target object will have the third parameter's definition of that property.
  * @param target <AnyObject, nullable>		The object to which properties will be copied. May be set to undefined, in which case a new object will be created.
- * @param ... <[AnyObject], nullable>		Additional objects may be specified. The property descriptors will be copied over to the target object.
+ * @param ... <[AnyObject]>					Additional objects may be specified. The property descriptors will be copied over to the target object.
  * @return <AnyObject>						The target object.
  */
 export function BMExtend(target) {
@@ -275,7 +275,7 @@ export function BMExtend(target) {
  * This will not redefine or reconfigure existing properties on the target object. For example, if any readonly property on the target object also exists on any of the
  * other objects, the target object's value for that property will not change.
  * @param target <AnyObject, nullable>		The object to which properties will be copied. May be set to undefined, in which case a new object will be created.
- * @param ... <[AnyObject], nullable>		Additional objects may be specified. The property values will be copied over to the target object.
+ * @param ... <[AnyObject]>					Additional objects may be specified. The property values will be copied over to the target object.
  * @return <AnyObject>						The target object.
  */
 export function BMCopyProperties(target) {