bm-core-ui 2.11.9-beta.2 → 2.12.0-beta.3

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

@@ -4585,9 +4585,10 @@ export class BMView {
 	 * and handle key presses. Subclasses that override this method should invoke the base implementation to allow
 	 * keyboard shortcuts to be handled correctly.
 	 * @param event 			The event that triggered this action.
+	 * @return           `YES` if a keyboard shortcut was handled, `NO` or `undefined` otherwise.
 	 *  
 	 */
-	keyPressedWithEvent(event: KeyboardEvent): void;
+	keyPressedWithEvent(event: KeyboardEvent): boolean | null | undefined;
 
 
 	/**
@@ -14327,6 +14328,12 @@ export class BMToolWindow extends BMWindow {
 	 */
 	opensAutomatically: boolean;
 
+	/**
+	 * The window to which this tool window is associated.
+	 *  
+	 */
+	private _parentWindow: BMWindow;
+
 	/**
 	 * Initializes this tool window with the given frame and associates it with the given window.
 	 * @param frame 		The window's frame.

package/build/BMCollectionView/BMCollectionView.js

@@ -2682,7 +2682,7 @@ BMCollectionView.prototype = BMExtend(BM_COLLECTION_VIEW_USE_BMVIEW_SUBCLASS ? O
 		    
 		    cellEventCanDoubleClick = NO;
 		    if (self.delegate && self.delegate.collectionViewCanDoubleClickCell) {
-			    cellEventCanDoubleClick = self.delegate.collectionViewCanDoubleClickCell(self, cell);
+			    cellEventCanDoubleClick = self.delegate.collectionViewCanDoubleClickCell(self, cell, {withEvent: event});
 		    }
 		    
 		    if (cellEventCanDoubleClick) cellEventDoubleClickTimeout = window.setTimeout(function () {

package/build/BMView/BMLayoutConstraint_v2.5.js

@@ -541,10 +541,12 @@ BMLayoutConstraint.prototype = {
 				if (this._solver) {
 					if (this._constraint) {
 						try {
-							if (this._solver.hasConstraint(this._constraint)) this._solver.removeConstraint(this._constraint);
+							if (this._solver.hasConstraint(this._constraint)) {
+								this._solver.removeConstraint(this._constraint);
+							}
 						}
 						catch (layoutError) {
-							this._cassowaryConstraint = undefined;
+							this._constraint = undefined;
 							this._sourceView.rootView._invalidatedConstraints = YES;
 							this._sourceView.needsLayout = YES;
 						}
@@ -556,7 +558,7 @@ BMLayoutConstraint.prototype = {
 						this._solver.addConstraint(this._cassowaryConstraint);
 					}
 					catch (layoutError) {
-						this._cassowaryConstraint = undefined;
+						this._constraint = undefined;
 						this._sourceView.rootView._invalidatedConstraints = YES;
 						this._sourceView.needsLayout = YES;
 					}
@@ -605,22 +607,12 @@ BMLayoutConstraint.prototype = {
 		return this._constant;
 	},
 	set constant(constant) {
-		if (constant == this._constant) return;
-		this._constant = constant;
-		return this._updateConfiguration();
-
-		// When changing the constant, update the attached solver, if there is one
-		if (this._solver) {
-			if (this._constraint) {
-				this._solver.removeConstraint(this._constraint);
-				this._constraint = undefined;
-			}
-			this._solver.addConstraint(this._cassowaryConstraint);
+		if (constant == this._constant) {
+			return;
 		}
 
-		if (this.isActive) {
-		    this._sourceView.needsLayout = YES;
-		}
+		this._constant = constant;
+		this._updateConfiguration();
 	},
 
 	/**
@@ -694,15 +686,7 @@ BMLayoutConstraint.prototype = {
 	 * Returns this constraint's constant for the currently active size class.
 	 */
 	get activeConstant() { // <Number or String>
-		// TODO:
 		return this._configuration.constant;
-		let sizeClassHash = this._sourceView.sizeClass._hashString;
-
-		if ('constant' in this._variations[sizeClassHash]) {
-			return this._variations[sizeClassHash].constant;
-		}
-
-		return this._constant;
 	},
 
 	/**
@@ -716,12 +700,7 @@ BMLayoutConstraint.prototype = {
 	set priority(priority) {
 		if (this._priority != priority) {
 			this._priority = priority;
-			return this._updateConfiguration();
-			
-			this._sourceView.needsLayout = YES;
-
-			if (this._targetView) this._targetView.needsLayout = YES;
-			this._sourceView.rootView._invalidatedConstraints = YES;
+			this._updateConfiguration();
 		}
 	},
 
@@ -798,13 +777,6 @@ BMLayoutConstraint.prototype = {
 	get activePriority() { // <Number>
 		// TODO:
 		return this._configuration.priority;
-		let sizeClassHash = this._sourceView.sizeClass._hashString;
-
-		if ('priority' in this._variations[sizeClassHash]) {
-			return this._variations[sizeClassHash].priority;
-		}
-
-		return this._priority;
 	},
 
 	/**
@@ -855,19 +827,7 @@ BMLayoutConstraint.prototype = {
 	set isActive(active) {
 		if (active != this._isActive) {
 			this._isActive = active;
-			return this._updateConfiguration();
-			this._sourceView._checkConstraints();
-			this._sourceView.needsLayout = YES;
-			this._sourceView.rootView._invalidatedConstraints = YES;
-
-			if (this._targetView) {
-				if (this._targetView.rootView != this._sourceView.rootView) {
-					throw new Error('[BMCoreUI] Incorrectly attempting to activate a layout constraint that affects two views that do not share a common ancestor.');
-				}
-
-				this._targetView._checkConstraints();
-				this._targetView.needsLayout = YES;
-			}
+			this._updateConfiguration();
 		}
 	},
 
@@ -942,13 +902,6 @@ BMLayoutConstraint.prototype = {
 	 */
 	get affectsLayout() { // <Boolean>
 		return this._configuration.isActive;
-		let sizeClassHash = this._sourceView.sizeClass._hashString;
-
-		if ('isActive' in this._variations[sizeClassHash]) {
-			return this._variations[sizeClassHash].isActive;
-		}
-
-		return this._isActive;
 	},
 
 	/**
@@ -1048,7 +1001,9 @@ BMLayoutConstraint.prototype = {
 	 * generated by this layout constraint.
 	 */
 	get _cassowaryConstraint() {
-		if (this._constraint) return this._constraint;
+		if (this._constraint) {
+			return this._constraint;
+		}
 
 		var expression = this._cassowaryExpression;
 

package/build/BMView/BMView_v2.5.js

@@ -2276,7 +2276,9 @@ BMView.prototype = BMExtend(BMView.prototype, {
 	 * @param shortcut <BMKeyboardShortcut>			The keyboard shortcut to register.
 	 */
 	registerKeyboardShortcut(shortcut) {
-		if (!Object.keys(this._keyboardShortcuts).length) this._enableKeyboardShortcuts();
+		if (!Object.keys(this._keyboardShortcuts).length) {
+            this._enableKeyboardShortcuts();
+        }
 
         if (!this._keyboardShortcuts[shortcut.keyCode]) {
             this._keyboardShortcuts[shortcut.keyCode] = [];
@@ -2306,7 +2308,9 @@ BMView.prototype = BMExtend(BMView.prototype, {
             }
         }
 
-		if (!Object.keys(this._keyboardShortcuts).length) this._disableKeyboardShortcuts();
+		if (!Object.keys(this._keyboardShortcuts).length) {
+            this._disableKeyboardShortcuts();
+        }
 	},
 
 	/**
@@ -2314,9 +2318,12 @@ BMView.prototype = BMExtend(BMView.prototype, {
 	 * and handle key presses. Subclasses that override this method should invoke the base implementation to allow
 	 * keyboard shortcuts to be handled correctly.
 	 * @param event <KeyboardEvent>			The event that triggered this action.
+     * @return <Boolean, nullable>          `YES` if a keyboard shortcut was handled, `NO` or `undefined` otherwise.
 	 */
 	keyPressedWithEvent(event) {
-        if (!this._keyboardShortcuts[event.code]) return;
+        if (!this._keyboardShortcuts[event.code]) return NO;
+
+        let shortcutHandled = NO;
 
 		// Check if a shortcut key has been pressed.
 		for (const shortcut of this._keyboardShortcuts[event.code]) {
@@ -2331,8 +2338,11 @@ BMView.prototype = BMExtend(BMView.prototype, {
 			if (bitmap == shortcut._modifierBitmap) {
 				if (shortcut.preventsDefault) event.preventDefault();
 				shortcut.target[shortcut.action](event, {forKeyboardShortcut: shortcut});
+                shortcutHandled = YES;
 			}
 		}
+
+        return shortcutHandled;
 	},
 
 	/**

package/build/BMWindow/BMToolWindow.js

@@ -1,5 +1,6 @@
 // @ts-check
 
+import { BMView } from '../BMView/BMView_v2.5';
 import {YES, NO, BMExtend} from '../Core/BMCoreUI'
 import {BMWindow} from './BMWindow'
 
@@ -25,6 +26,11 @@ BMToolWindow.prototype = BMExtend(Object.create(BMWindow.prototype), {
 	 */
 	opensAutomatically: YES, // <Boolean>
 
+	/**
+	 * The window to which this tool window is associated.
+	 */
+	_parentWindow: undefined, // <BMWindow>
+
 	/**
 	 * Initializes this tool window with the given frame and associates it with the given window.
 	 * @param frame <BMRect>		The window's frame.
@@ -41,8 +47,14 @@ BMToolWindow.prototype = BMExtend(Object.create(BMWindow.prototype), {
 		this.node.classList.add('BMToolWindow');
 		window._toolWindows.push(this);
 
+		this._parentWindow = window;
+
 		// If the window is the key window, make this tool window visible
-		if (BMWindow._keyWindow == window) this.bringToFrontAnimated(YES);
+		if (BMWindow._keyWindow == window) {
+			this.bringToFrontAnimated(YES);
+		}
+
+		this._enableKeyboardShortcuts();
 
 		return this;
 	},
@@ -53,6 +65,22 @@ BMToolWindow.prototype = BMExtend(Object.create(BMWindow.prototype), {
 
 	resignKeyWindow() {
 		// This operation is a no-op for tool windows
+	},
+
+	keyPressedWithEvent(event, args) {
+		const handled = BMView.prototype.keyPressedWithEvent.apply(this, [event, args]);
+
+		if (!handled) {
+			this._parentWindow?.keyPressedWithEvent(event, args);
+		}
+	},
+
+	release() {
+		const index = this._parentWindow._toolWindows.indexOf(this);
+		if (index != -1) {
+			this._parentWindow._toolWindows.splice(index, -1);
+		}
+		BMWindow.prototype.release.call(this);
 	}
 });
 

package/build/BMWindow/BMWindow.js

@@ -1918,9 +1918,6 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		
 		animated = (animated === undefined ? YES : animated);
 		
-		//__BMVelocityAnimate(this._blocker, 'stop');
-		//__BMVelocityAnimate(this._window, 'stop');
-		
 		var self = this;
 
 		this._blocker.style.pointerEvents = 'none';
@@ -1931,8 +1928,11 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		}
 		this._visible = NO;
 
+		// Dismiss all associated tool windows if they are visible
 		for (let window of this._toolWindows) {
-			window.dismissAnimated(animated);
+			if (window._visible) {
+				window.dismissAnimated(animated);
+			}
 		}
 		
 		if (animated) {
@@ -1941,10 +1941,6 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 				duration: _BMWindowAnimationDurationDefault,
 				easing: _BMWindowAnimationEasingDefault,
 				display: 'none',
-				/*progress: function (elements, complete) {
-					self._blocker.style.webkitBackdropFilter = 'blur(' + ((1 - complete) * 15).toFixed(2) + 'px)';
-					self._blocker.style.backdropFilter = 'blur(' + ((1 - complete) * 15).toFixed(2) + 'px)';
-				},*/
 				complete: function () {
 					self.windowDidClose();
 					if (self.delegate && self.delegate.windowDidClose) {

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

@@ -4585,9 +4585,10 @@ declare class BMView {
 	 * and handle key presses. Subclasses that override this method should invoke the base implementation to allow
 	 * keyboard shortcuts to be handled correctly.
 	 * @param event 			The event that triggered this action.
+	 * @return           `YES` if a keyboard shortcut was handled, `NO` or `undefined` otherwise.
 	 *  
 	 */
-	keyPressedWithEvent(event: KeyboardEvent): void;
+	keyPressedWithEvent(event: KeyboardEvent): boolean | null | undefined;
 
 
 	/**
@@ -14327,6 +14328,12 @@ declare class BMToolWindow extends BMWindow {
 	 */
 	opensAutomatically: boolean;
 
+	/**
+	 * The window to which this tool window is associated.
+	 *  
+	 */
+	private _parentWindow: BMWindow;
+
 	/**
 	 * Initializes this tool window with the given frame and associates it with the given window.
 	 * @param frame 		The window's frame.