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

package/build/@types/index.d.ts

@@ -9992,7 +9992,7 @@ export class BMMenu {
 	 * The menu items displayed by this menu.
 	 *     
 	 */
-	readonly items: BMMenuItem[];
+	items: BMMenuItem[];
 
 	/**
 	 * An optional delegate object that will receive callbacks events from this menu.
@@ -10076,7 +10076,7 @@ export class BMMenu {
 	 * The menu that opened this menu, if any.
 	 *     
 	 */
-	private _supermenu?: BMMenu | null | undefined;
+	readonly supermenu?: BMMenu | null | undefined;
 
 	/**
 	 * The menu's frame, relative to the viewport, available while this menu is visible.

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;
@@ -6059,14 +6071,18 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		
 		// If this update occurs because of a drag & drop operation, try to obtain the associated index paths from the data set
 		let dropPreviewMap;
+		/** @type {Map} */
+		let dropPreviewReverseMap;
 		if (this._dropPreviews && this.dataSet.indexPathForDragItem) {
 			dropPreviewMap = new Map();
+			dropPreviewReverseMap = new Map();
 
 			for (const preview of this._dropPreviews) {
 				const indexPath = this.dataSet.indexPathForDragItem(preview.item);
 
 				if (indexPath) {
 					dropPreviewMap.set(indexPath, preview);
+					dropPreviewReverseMap.set(preview, indexPath);
 				}
 			}
 		}
@@ -6464,6 +6480,18 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 				for (const cell of insertedCells) {
 					cell._dropPreview.performDropToNode(cell.node);
 
+					// Handle the cases where multiple drop previews target this cell
+					for (const [preview, indexPath] of dropPreviewReverseMap.entries()) {
+					    if (indexPath.isLooselyEqualToIndexPath(cell.indexPath, {usingComparator: self.identityComparator}) && preview != cell._dropPreview) {
+							preview.performDropToNode(cell.node);
+           					const index = self._dropPreviews.indexOf(cell._dropPreview);
+
+           					if (index != -1) {
+          						self._dropPreviews.splice(index, 1);
+           					}
+						}
+					}
+
 					const index = self._dropPreviews.indexOf(cell._dropPreview);
 
 					if (index != -1) {
@@ -6486,6 +6514,19 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 					// Play all drop animations
 					for (const cell of dropMovingCells) {
 						cell._dropPreview.performDropToNode(cell.node);
+
+    					// Handle the cases where multiple drop previews target this cell
+    					for (const [preview, indexPath] of dropPreviewReverseMap.entries()) {
+    					    if (indexPath.isLooselyEqualToIndexPath(cell.indexPath, {usingComparator: self.identityComparator}) && preview != cell._dropPreview) {
+    							preview.performDropToNode(cell.node);
+               					const index = self._dropPreviews.indexOf(cell._dropPreview);
+    
+               					if (index != -1) {
+              						self._dropPreviews.splice(index, 1);
+               					}
+    						}
+    					}
+						
 						const index = self._dropPreviews.indexOf(cell._dropPreview);
 
 						if (index != -1) {
@@ -7368,4 +7409,4 @@ class BMCollectionViewDataSetAdapter {
 	}
 }
 
-// #endregion
+// #endregion

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.

package/build/BMCoreUI.css

@@ -1353,6 +1353,12 @@ input:not(:checked) + .BMWindowSwitchGutter > .BMWindowSwitchKnob, .BMWindowSwit
 	pointer-events: none !important;
 }
 
+/* This allows clicking on an item with a submenu during the event delaying period
+after a submenu has just been opened */
+.BMMenuContainer.BMMenuContainerSubmenuActive .BMMenuItemHighlighted {
+    pointer-events: all !important;
+}
+
 .BMMenuContainerFullScreen {
 	background-color: rgba(0, 0, 0, .33);
 }

package/build/BMView/BMMenu.js

@@ -406,6 +406,42 @@ BMMenu.prototype = {
     get items() {
         return this._items.slice();
     },
+    set items(items) {
+        this._items = items.slice();
+
+        // If this menu was already open when items are updated, destroy
+        // and re-render it
+        if (this._node) {
+            if (this._supermenu) {
+                this._node.remove();
+            }
+            else {
+                this._containerNode.remove();
+            }
+            
+            this._renderMenu();
+
+            if (!this._supermenu) {
+                document.body.appendChild(this._containerNode);
+            }
+            
+            this._setAnchorRect(this._rect);
+
+            // Restore the highlighted menu item
+            if (this._highlightedIndex != -1) {
+                const item = this._items[this._highlightedIndex];
+                if (item && !item._isSeparator && item._enabled) {
+                    const index = this._highlightedIndex;
+                    this._highlightedIndex = -1;
+                    this.highlightedIndex = index;
+                }
+            }
+
+            for (const node of this._itemsContainerNode.children) {
+                BMHook(node, {opacity: 1, translateY: '0px'});
+            }
+        }
+    },
 
     /**
      * An optional delegate object that will receive callbacks events from this menu.
@@ -519,6 +555,9 @@ BMMenu.prototype = {
      * The menu that opened this menu, if any.
      */
     _supermenu: undefined, // <BMMenu, nullable>
+    get supermenu() {
+        return this._supermenu;
+    },
 
     /**
      * The menu's frame, relative to the viewport, available while this menu is visible.
@@ -1611,6 +1650,14 @@ BMMenu.prototype = {
     closeAnimated(animated = YES, {withSupermenu = NO} = {}) {
         // If the menu isn't visible this action has no effect.
         if (!this._node) return;
+        
+        const sourceNodeShadow = this._sourceNodeShadow;
+        const containerNode = this._containerNode;
+        const node = this._node;
+        const itemsContainerNode = this._itemsContainerNode;
+        const sourceNode = this._sourceNode;
+
+        this._node = undefined;
 
         this._containerNode.removeEventListener('keydown', this, {passive: true});
         this._containerNode.removeEventListener('keyup', this, {passive: true});
@@ -1655,8 +1702,8 @@ BMMenu.prototype = {
         }
 
         // Prevent interaction with the menu while its close animation is running
-        this._node.style.pointerEvents = 'none';
-        // this._node.inert = true;
+        node.style.pointerEvents = 'none';
+        // node.inert = true;
 
         if (!supermenu) {
             this._containerNode.style.pointerEvents = 'none';
@@ -1693,12 +1740,6 @@ BMMenu.prototype = {
             }
         }
 
-        const sourceNodeShadow = this._sourceNodeShadow;
-        const containerNode = this._containerNode;
-        const node = this._node;
-        const itemsContainerNode = this._itemsContainerNode;
-        const sourceNode = this._sourceNode;
-
         this._sourceNode = undefined;
         this._sourceNodeShadow = undefined;
 
@@ -1729,7 +1770,7 @@ BMMenu.prototype = {
 
         itemsContainerNode.style.overflow = 'hidden';
 
-        __BMVelocityAnimate(this._node, {
+        __BMVelocityAnimate(node, {
             scaleX: this._kind == BMMenuKind.PullDownMenu ? 1 : scale,
             scaleY: scale,
             opacity: (sourceNodeShadow && !supermenu) ? 1 : 0,

package/lib/@types/BMCoreUI.min.d.ts

@@ -9992,7 +9992,7 @@ declare class BMMenu {
 	 * The menu items displayed by this menu.
 	 *     
 	 */
-	readonly items: BMMenuItem[];
+	items: BMMenuItem[];
 
 	/**
 	 * An optional delegate object that will receive callbacks events from this menu.
@@ -10076,7 +10076,7 @@ declare class BMMenu {
 	 * The menu that opened this menu, if any.
 	 *     
 	 */
-	private _supermenu?: BMMenu | null | undefined;
+	readonly supermenu?: BMMenu | null | undefined;
 
 	/**
 	 * The menu's frame, relative to the viewport, available while this menu is visible.