bm-core-ui 2.11.6 → 2.11.7

package/build/BMWindow/BMWindow.js

@@ -583,6 +583,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 	 * The window toolbar DOM node.
 	 */
 	_toolbar: undefined, // <DOMNode>
+	
 	get toolbar() {
 		return this._toolbar;
 	},
@@ -626,9 +627,9 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
         return this._anchorPoint;
     },
     set anchorPoint(point) {
-		this._anchorPoint = point && point.copy();
 		this.anchorNode = undefined;
 		this._anchorRect = undefined;
+		this._anchorPoint = point && point.copy();
     },
 
     /**
@@ -641,9 +642,9 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
         return this._anchorRect;
     },
     set anchorRect(rect) {
-		this._anchorRect = rect && rect.copy();
 		this.anchorNode = undefined;
 		this._anchorPoint = undefined;
+		this._anchorRect = rect && rect.copy();
     },
 
 
@@ -657,9 +658,21 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
         return this._anchorNode;
     },
     set anchorNode(node) {
+		if (this._keepsNodeHidden && this._visible) {
+			if (this._anchorNode) {
+				this._anchorNode.classList.remove('BMWindowAnchorNodeHidden');
+			}
+		}
+
 		this._anchorNode = node;
 		this._anchorPoint = undefined;
 		this._anchorRect = undefined;
+
+		if (this._keepsNodeHidden && this._visible) {
+			if (this._anchorNode) {
+				this._anchorNode.classList.add('BMWindowAnchorNodeHidden');
+			}
+		}
     },
 	
 	/**
@@ -1288,6 +1301,11 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		}
 	},
 
+	/**
+	 * When set to `YES`, the anchor node remains hidden while the window is visible.
+	 */
+	_keepsNodeHidden: NO, // <Boolean>
+
 	/**
 	 * @protected
 	 * This method is invoked during `bringToFrontAnimated()` to run the animations that will make this window visible.
@@ -1331,9 +1349,26 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 			// and then to the animation node, but inversed
 			const frame = self._fullScreen ? BMRectMake(0, 0, window.innerWidth, window.innerHeight) : self.frame;
 			const transformRect = frame.rectWithTransformToRect(rect);
+
+			let windowShouldKeepNodeHidden = NO;
+			if (self.delegate && self.delegate.windowShouldKeepNodeHidden) {
+				windowShouldKeepNodeHidden = self.delegate.windowShouldKeepNodeHidden(self, node);
+			}
 			
 			document.body.appendChild(animationNode);
-			node.style.display = 'none';
+			
+			if (windowShouldKeepNodeHidden) {
+				node.classList.add('BMWindowAnchorNodeHidden');
+				this._keepsNodeHidden = YES;
+			}
+			else {
+				node.animate([
+					{opacity: 0, easing: 'cubic-bezier(0.77, 0, 0.175, 1)'}, 
+					{opacity: 0, easing: 'cubic-bezier(0.77, 0, 0.175, 1)', offset: 0.5},
+					{opacity: 1}
+				], _BMWindowAnimationDurationDefault);
+				this._keepsNodeHidden = NO;
+			}
 			
 			__BMVelocityAnimate(this._window, {opacity: 1, translateX: ['0px', transformRect.origin.x + 'px'], translateY: ['0px', transformRect.origin.y + 'px'], 
 							scaleX: [1, transformRect.size.width], scaleY: [1, transformRect.size.height]}, {
@@ -1350,18 +1385,6 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 								easing: _BMWindowAnimationEasingDefault,
 								complete: function () { 
 									animationNode.remove(); 
-									var windowShouldKeepNodeHidden = NO;
-									if (self.delegate && self.delegate.windowShouldKeepNodeHidden) {
-										windowShouldKeepNodeHidden = self.delegate.windowShouldKeepNodeHidden(self, node);
-									}
-									if (windowShouldKeepNodeHidden) {
-										self._nodeDisplay = nodeDisplay;
-									}
-									else {
-										node.style.display = nodeDisplay;
-										self._nodeDisplay = undefined;
-									}
-
 									completionHandler();
 								}
 							}, YES);
@@ -1392,7 +1415,9 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 	bringToFrontAnimated: function (animated, args = {}) {
 		this._visible = YES;
 
-		this.becomeKeyWindow();
+		if (!this.isKeyWindow) {
+			this.becomeKeyWindow();
+		}
 
 		for (let window of this._toolWindows) {
 			if (window.opensAutomatically) window.bringToFrontAnimated(animated);
@@ -1450,7 +1475,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 					this.anchorRect = undefined;
 					this.anchorNode = undefined;
 
-					if (this._keyboardShortcutsEnabled) {
+					if (this._keyboardShortcutsEnabled && this.isKeyWindow) {
 						this.node.focus();
 					}
 				}
@@ -1521,16 +1546,13 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 			// Create a copy of the given node which will be used in the animation in place of the original node
 			const node = this._anchorNode;
 			
-			if (typeof self._nodeDisplay != 'undefined') {
-				node.style.display = self._nodeDisplay;
+			if (this._keepsNodeHidden) {
+				node.classList.remove('BMWindowAnchorNodeHidden');
 			}
 			
 			const rect = BMRectMakeWithNodeFrame(node);
 			const animationNode = node.cloneNode(YES);
 			
-			const nodeDisplay = (typeof self._nodeDisplay != 'undefined') ? self._nodeDisplay : node.style.display;
-			self._nodeDisplay = undefined;
-			
 			animationNode.style.position = 'fixed';
 			animationNode.style.zIndex = BM_WINDOW_Z_INDEX_MAX + 1;
 			animationNode.style.transform = '';
@@ -1548,7 +1570,17 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 							scaleX: 1 / transformRect.size.width, scaleY: 1 / transformRect.size.height, opacity: 0});
 			
 			document.body.appendChild(animationNode);
-			node.style.display = 'none';
+			
+			if (this._keepsNodeHidden) {
+				node.classList.add('BMWindowAnchorNodeHidden');
+			}
+			else {
+				node.animate([
+					{opacity: 1, easing: 'cubic-bezier(0.77, 0, 0.175, 1)'}, 
+					{opacity: 0, easing: 'cubic-bezier(0.77, 0, 0.175, 1)', offset: 0.5},
+					{opacity: 0}
+				], _BMWindowAnimationDurationDefault);
+			}
 			
 			__BMVelocityAnimate(this._window, {opacity: 0, translateX: transformRect.origin.x + 'px', translateY: transformRect.origin.y + 'px', 
 							scaleX: transformRect.size.width, scaleY: transformRect.size.height}, {
@@ -1563,7 +1595,10 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 							scaleX: [1, 1 / transformRect.size.width], scaleY: [1, 1 / transformRect.size.height]}, {
 								duration: _BMWindowAnimationDurationDefault,
 								easing: _BMWindowAnimationEasingDefault,
-								complete: function () { node.style.display = nodeDisplay; animationNode.remove(); }
+								complete: function () {
+									node.classList.remove('BMWindowAnchorNodeHidden');
+									animationNode.remove();
+								}
 							}, YES);
 		}
 		else {

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

@@ -8216,6 +8216,12 @@ declare class BMMenu {
 	 */
 	private _node?: DOMNode | null | undefined;
 
+	/**
+	 * The DOM node containing the menu items.
+	 *     
+	 */
+	private _itemsContainerNode?: DOMNode | null | undefined;
+
 	/**
 	 * The container DOM node currently used by this menu
 	 *     
@@ -12834,7 +12840,7 @@ declare interface BMCollectionViewDataSet<T = any> {
 	 * @return 					An array of index paths specifying the positions of the items after they have been moved.
 	 * 											The index paths in this array are not required to match either of the lists supplied by
 	 * 											collection view.
-	 *   
+	 *  
 	 */
 	moveItemsFromIndexPaths?(indexPaths: BMIndexPath<T>[], {toIndexPath}: {toIndexPath: BMIndexPath<T>}): BMIndexPath<T>[];
 
@@ -12847,7 +12853,7 @@ declare interface BMCollectionViewDataSet<T = any> {
 	 * and remove just some of the items, by changing their internal data structures appropriately.
 	 * The order of the items in the array is guaranteed to be such that the target index paths are in ascending order.
 	 * @param indexPaths 		An array of index paths identifying which items have to be removed.
-	 *   
+	 *  
 	 */
 	removeItemsAtIndexPaths?(indexPaths: BMIndexPath<T>[]): void;
 
@@ -12860,10 +12866,23 @@ declare interface BMCollectionViewDataSet<T = any> {
 	 * and add just some of the items, by changing their internal data structures appropriately.
 	 * @param items 					An array of objects to add to the collection view.
 	 * @param toIndexPath 		The starting index path to which the items should be inserted.
-	 *    
+	 *  
 	 */
 	insertItems?(items: any[], {toIndexPath}: {toIndexPath: BMIndexPath<T>}): void;
 
+
+	/**
+	 * This method may be implemented by data set objects that support transferring items to another collection view.
+	 * Data set objects implementing this method are expected to create a copy of the specified item and return it.
+	 * The item is guaranteed to be an object that was returned at some point by the data set when it provided an index path.
+	 * If this method is not implemented, collection view will create a copy of the item by stringifying it and parsing it back
+	 * into an object.
+	 * @param item 						The item whose copy should be created for the transfer.
+	 * @return 							A copy of the specified item.
+	 *  
+	 */
+	copyOfItem?(item: any): any;
+
 }
 
 
@@ -13043,6 +13062,20 @@ declare interface BMCollectionViewDataSource<T = any> {
 	 */
 	collectionViewInsertItems?(collectionView: BMCollectionView, items: any[], {toIndexPath}: {toIndexPath: BMIndexPath<T>}): void;
 
+
+	/**
+	 * This method may be implemented by data source objects that support transferring items to another collection view.
+	 * Data source objects implementing this method are expected to create a copy of the specified item and return it.
+	 * The item is guaranteed to be an object that was returned at some point by the data set when it provided an index path.
+	 * If this method is not implemented, collection view will create a copy of the item by stringifying it and parsing it back
+	 * into an object.
+	 * @param collectionView      The collection view from which items are being transferred.
+	 * @param item 						The item whose copy should be created for the transfer.
+	 * @return 							A copy of the specified item.
+	 *  
+	 */
+	collectionViewCopyOfItem?(collectionView: BMCollectionView, item: any): any;
+
 }
 
 
@@ -13831,7 +13864,7 @@ declare class BMWindow extends BMView {
 	 * The DOM node in which the window contents should be added.
 	 *  
 	 */
-	readonly content: DOMNode;
+	private _content: DOMNode;
 
 	/**
 	 * A string that is used for when this window is minimized.
@@ -13991,6 +14024,12 @@ declare class BMWindow extends BMView {
 	toggleAnimated(animated?: boolean | null | undefined, {completionHandler}?: {completionHandler?: (() => void) | null | undefined}): void;
 
 
+	/**
+	 * When set to `YES`, the anchor node remains hidden while the window is visible.
+	 *  
+	 */
+	private _keepsNodeHidden: boolean;
+
 	/**
 	 * This method is invoked during `bringToFrontAnimated()` to run the animations that will make this window visible.
 	 * Subclasses can override this method to perform custom animations.