bm-core-ui 2.7.0 → 2.8.3

package/build/BMWindow/BMWindow.js

@@ -6,9 +6,9 @@ import {BMRectMake, BMRectMakeWithNodeFrame} from '../Core/BMRect'
 import {BMAnimateWithBlock, BMAnimationContextGetCurrent, BMAnimationContextEnableWebAnimations, __BMVelocityAnimate, BMHook} from '../Core/BMAnimationContext'
 import {BMView} from '../BMView/BMView_v2.5'
 import {BMLayoutOrientation} from '../BMView/BMLayoutSizeClass'
-import { BMKeyboardShortcutModifier } from './BMKeyboardShortcut'
 import { BMSizeMake } from '../Core/BMSize'
 import { BMLayoutAttribute } from '../BMView/BMLayoutConstraint_v2.5'
+import { BMViewport } from '../BMView/BMViewport'
 
 //@ts-check
 // @type BMWindowOverlay extends BMView
@@ -682,11 +682,6 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 	 * An array containing the tool windows associated with this window.
 	 */
 	_toolWindows: undefined, // <[BMToolWindow]>
-
-	/**
-	 * The keyboard shortcuts that have been registered to this window.
-	 */
-	_keyboardShortcuts: undefined, // <[BMKeyboardShortcut]>
 	
 	/**
 	 * Initializes this window with the given screen area.
@@ -704,7 +699,6 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		let modal = (args && 'modal' in args) ? args.modal : YES;
 
 		this._toolWindows = [];
-		this._keyboardShortcuts = [];
 
 		this._overlay = (new BMWindowOverlay).initWithWindow(this, {modal});
 		this._blocker = this._overlay.node;
@@ -1067,91 +1061,22 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		if (this._fullScreen) this.layout();
 	},
 
-	/**
-	 * Registers a keyboard shortcut that can be activated when this window is the key window.
-	 * @param shortcut <BMKeyboardShortcut>			The keyboard shortcut to register.
-	 */
-	registerKeyboardShortcut(shortcut) {
-		if (!this._keyboardShortcuts.length) this._enableKeyboardShortcuts();
-
-		this._keyboardShortcuts.push(shortcut);
-	},
-
-	/**
-	 * Unregisters a keyboard shortcut. If this keyboard shortcut had not been previously registered, this method does nothing.
-	 * @param shortcut <BMKeyboardShortcut>			The keyboard shortcut to unregister.
-	 */
-	unregisterKeyboardShortcut(shortcut) {
-		for (let i = 0; i < this._keyboardShortcuts.length; i++) {
-			if (this._keyboardShortcuts[i] == shortcut) {
-				this._keyboardShortcuts.splice(i, 1);
-				break;
-			}
-		}
-
-		if (!this._keyboardShortcuts.length) this._disableKeyboardShortcuts();
-	},
-
-	/**
-	 * If keyboard shortcuts have been registered on this window, this method will be invoked to identify
-	 * 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.
-	 */
-	keyPressedWithEvent(event) {
-		// Check if a shortcut key has been pressed.
-		for (const shortcut of this._keyboardShortcuts) {
-			if (event.code != shortcut.keyCode) continue;
-
-			// Build the modifier bitmap for this event
-			let bitmap = 0;
-			for (const modifier in BMKeyboardShortcutModifier) {
-				if (event[BMKeyboardShortcutModifier[modifier].key]) {
-					bitmap = bitmap | BMKeyboardShortcutModifier[modifier].value;
-				}
-			}
-
-			if (bitmap == shortcut._modifierBitmap) {
-				if (shortcut.preventsDefault) event.preventDefault();
-				shortcut.target[shortcut.action](event);
-			}
-		}
-	},
-
-	/**
-	 * Set to `YES` if keyboard shortcuts are enabled.
-	 */
-	_keyboardShortcutsEnabled: NO, // <Boolean>
-
 	/**
 	 * 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.
 	 */
 	_enableKeyboardShortcuts() {
-		this.node.tabIndex = -1;
+		BMView.prototype._enableKeyboardShortcuts.apply(this, arguments);
 
-		if (document.activeElement && !this.node.contains(document.activeElement)) {
-			this.node.focus();
-		}
-		else if (!document.activeElement) {
-			this.node.focus();
+		if (this.isModal || this.isKeyWindow) {
+			if (document.activeElement && !this.node.contains(document.activeElement)) {
+				this.node.focus();
+			}
+			else if (!document.activeElement) {
+				this.node.focus();
+			}
 		}
-
-		this._keypressHandler = (event) => {
-			this.keyPressedWithEvent(event);
-		};
-
-		this.node.addEventListener('keydown', this._keypressHandler);
-		this._keyboardShortcutsEnabled = YES;
-	},
-
-	/**
-	 * Disables keyboard shortcut handling. This detaches the relevant event handlers from this window's `node`.
-	 */
-	_disableKeyboardShortcuts() {
-		this.node.removeEventListener('keydown', this._keypressHandler);
-		this._keyboardShortcutsEnabled = NO;
 	},
 
 	/**
@@ -1199,6 +1124,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 			const animationNode = node.cloneNode(YES);
 			
 			const nodeDisplay = node.style.display;
+			self._nodeDisplay = nodeDisplay;
 			
 			animationNode.style.position = 'fixed';
 			animationNode.style.zIndex = BM_WINDOW_Z_INDEX_MAX + 1;
@@ -1240,6 +1166,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 									}
 									else {
 										node.style.display = nodeDisplay;
+										self._nodeDisplay = undefined;
 									}
 
 									completionHandler();
@@ -1329,6 +1256,10 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 				completionHandler = () => {
 					this.anchorRect = undefined;
 					this.anchorNode = undefined;
+
+					if (this._keyboardShortcutsEnabled) {
+						this.node.focus();
+					}
 				}
 			}
 
@@ -1337,6 +1268,10 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 			this._blocker.style.display = 'block';
 			this._window.style.display = 'block';
 
+			if (this._keyboardShortcutsEnabled) {
+				this.node.focus();
+			}
+
 			this._overlay._windowWillAppear();
 		
 		}
@@ -1352,15 +1287,15 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 
 			this._blocker.style.pointerEvents = '';
 			this._window.style.pointerEvents = '';
+
+			if (this._keyboardShortcutsEnabled) {
+				this.node.focus();
+			}
 			
 			if (self.delegate && self.delegate.windowDidAppear) self.delegate.windowDidAppear(self);
 			
 			if (args && args.completionHandler) args.completionHandler();
 		}
-
-		if (this._keyboardShortcutsEnabled) {
-			this.node.focus();
-		}
 	},
 	
 
@@ -1393,14 +1328,14 @@ 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 ('_nodeDisplay' in self) {
+			if (typeof self._nodeDisplay != 'undefined') {
 				node.style.display = self._nodeDisplay;
 			}
 			
 			const rect = BMRectMakeWithNodeFrame(node);
 			const animationNode = node.cloneNode(YES);
 			
-			const nodeDisplay = ('_nodeDisplay' in self) ? self._nodeDisplay : node.style.display;
+			const nodeDisplay = (typeof self._nodeDisplay != 'undefined') ? self._nodeDisplay : node.style.display;
 			self._nodeDisplay = undefined;
 			
 			animationNode.style.position = 'fixed';

package/build/Core/BMAnimationContext.js

@@ -834,10 +834,6 @@ export function BMAnimationApplyBlocking(blocking) {
     }
 	animation.options.complete = completeCallback;
 	
-	if (window.event && window.event.shiftKey) {
-		animation.options.duration = animation.options.duration * 5;
-		window.event.preventDefault();
-	}
     
     var stride = animation.options.stride;
 	var delay = animation.options.delay || 0;

package/build/Core/BMCoreUI.js

@@ -391,6 +391,10 @@ export function BMUUIDMake() {
  * An enum containing HTML entities for various commonly used symbols.
  */
 export var BMHTMLEntity = Object.freeze({ // <enum>
+	/**
+	 * The HTML entity representing the control key.
+	 */
+	Control: '&#8963;', // <enum>
 	/**
 	 * The HTML entity representing the bowen knot Command symbol.
 	 */
@@ -414,7 +418,11 @@ export var BMHTMLEntity = Object.freeze({ // <enum>
 	/**
 	 * The HTML entity representing the Return symbol.
 	 */
-	Return: '&#9166;' // <enum>
+	Return: '&#9166;', // <enum>
+	/**
+	 * The HTML entity representing the Escape symbol.
+	 */
+	Escape: '&#9099;', // <enum>
 });
 
 // @endtype