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

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

@@ -11,6 +11,7 @@ import {BMViewport} from './BMViewport'
 import {BMLayoutAttribute, BMLayoutConstraintRelation, BMLayoutConstraint, BMLayoutConstraintPriorityRequired, BMLayoutConstraintKind} from './BMLayoutConstraint_v2.5'
 import * as kiwi from 'kiwi.js'
 import { BMKeyboardShortcutModifier } from '../BMWindow/BMKeyboardShortcut'
+import { BMDragSession } from './BMDragSession'
 
 
 // When set to YES, this will cause view to use transforms instead of left/right for positioning
@@ -2276,7 +2277,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 +2309,9 @@ BMView.prototype = BMExtend(BMView.prototype, {
             }
         }
 
-		if (!Object.keys(this._keyboardShortcuts).length) this._disableKeyboardShortcuts();
+		if (!Object.keys(this._keyboardShortcuts).length) {
+            this._disableKeyboardShortcuts();
+        }
 	},
 
 	/**
@@ -2314,9 +2319,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 +2339,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;
 	},
 
 	/**
@@ -2370,6 +2381,26 @@ BMView.prototype = BMExtend(BMView.prototype, {
 
     // #endregion
 
+    // #region Gestures
+
+    /**
+     * Initiates a drag session with the specified drag delegate from a touch or mouse event.
+     * @param event <MouseEvent or TouchEvent>      The event that triggered the drag gesture.
+     * {
+     *  @param delegate <BMDragDelegate>            The drag session delegate supplying items and
+     *                                              handling events for the session.
+     *  @param touchIdentifier <Number, nullable>   If the event is a touch event and this is specified,
+     *                                              it represents the identifier of the touch point that
+     *                                              will be tracked throughout the drag session. If not
+     *                                              specified, the first changed touch will be used.
+     * }
+     */
+    performDragWithEvent(event, {delegate, touchIdentifier}) {
+        BMDragSession._beginDragWithEvent(event, {dragDelegate: delegate, view: this, touchIdentifier});
+    },
+
+    // #endregion
+
     // #region Constraints and Cassowary Variables
 
 

package/build/BMWindow/BMPopover/BMPopover.js

@@ -1127,12 +1127,16 @@ BMPopover.prototype = BMExtend(Object.create(BMWindow.prototype), {
         }
 
         if (!this._isDetached) {
+            const popoverLayers = [this.contentNode, this._background, this._dropShadowContainer];
+
             // If not detached, apply a displacement to this popover that is half of the regular
             // drag distance, until this popover is fully detached
-            BMHook(this.node, {
-                translateX: `${(toPosition.x - this._initialDragPosition.x) / 3 | 0}px`,
-                translateY: `${(toPosition.y - this._initialDragPosition.y) / 3 | 0}px`,
-            });
+            for (const node of popoverLayers) {
+                BMHook(node, {
+                    translateX: `${(toPosition.x - this._initialDragPosition.x) / 3 | 0}px`,
+                    translateY: `${(toPosition.y - this._initialDragPosition.y) / 3 | 0}px`,
+                });
+            }
 
             const distance = toPosition.distanceToPoint(this._initialDragPosition);
             if (distance > BMPopoverDragThreshold) {
@@ -1158,11 +1162,15 @@ BMPopover.prototype = BMExtend(Object.create(BMWindow.prototype), {
             // If the drag operation didn't cause this popover to detach, animate it back to its
             // regular position
             BMAnimateWithBlock(() => {
-                const controller = BMAnimationContextGetCurrent().controllerForObject(this, {node: this.node});
-                controller.registerBuiltInPropertiesWithDictionary({
-                    translateX: '0px',
-                    translateY: '0px',
-                });
+                const popoverLayers = [this.contentNode, this._background, this._dropShadowContainer];
+
+                for (const node of popoverLayers) {
+                    const controller = BMAnimationContextGetCurrent().controllerForObject(node, {node});
+                    controller.registerBuiltInPropertiesWithDictionary({
+                        translateX: '0px',
+                        translateY: '0px',
+                    });
+                }
             }, {duration: 500, easing: 'easeInOutQuart'});
         }
 
@@ -1194,19 +1202,24 @@ BMPopover.prototype = BMExtend(Object.create(BMWindow.prototype), {
 
         let promise;
 
+        const popoverLayers = [this.contentNode, this._background, this._dropShadowContainer];
+
         // If a temporary transform was applied to this node, clear it
-        if (BMAnimationContextGetCurrent()) {
-            const controller = BMAnimationContextGetCurrent().controllerForObject(this, {node: this.node});
-            controller.registerBuiltInPropertiesWithDictionary({
-                translateX: '0px',
-                translateY: '0px',
-            });
+        for (const node of popoverLayers) {
+            if (BMAnimationContextGetCurrent()) {
+                const controller = BMAnimationContextGetCurrent().controllerForObject(node, {node});
+                controller.registerBuiltInPropertiesWithDictionary({
+                    translateX: '0px',
+                    translateY: '0px',
+                });
 
-            promise = new Promise(r => BMAnimationContextAddCompletionHandler(r));
-        }
-        else {
-            BMHook(this.node, {translateX: '0px', translateY: '0px'});
+                promise = new Promise(r => BMAnimationContextAddCompletionHandler(r));
+            }
+            else {
+                BMHook(node, {translateX: '0px', translateY: '0px'});
+            }
         }
+        
 
         if (animationContextStarted) {
             BMAnimationApplyBlocking(YES);
@@ -1229,7 +1242,9 @@ BMPopover.prototype = BMExtend(Object.create(BMWindow.prototype), {
         for (const layer of popoverLayers) {
             BMHook(layer, {scaleX: .75, scaleY: .75, opacity: 0});
 
-            __BMVelocityAnimate(layer, {scaleX: 1, scaleY: 1, opacity: 1}, {duration: 300, easing: [0,1.59,.49,1], complete: first ? completionHandler : undefined}, YES);
+            __BMVelocityAnimate(layer, {scaleX: 1, scaleY: 1, opacity: 1}, {duration: 300, easing: [0,1.59,.49,1], complete: first ? completionHandler : undefined}, YES)?.then(() => {
+                BMHook(layer, {scaleX: 1, scaleY: 1, opacity: 1});
+            });
             first = NO;
         }
     },

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

@@ -3,7 +3,7 @@
 import {YES, NO, BMExtend, BMCopyProperties} from '../Core/BMCoreUI'
 import {BMPointMake} from '../Core/BMPoint'
 import {BMRectMake, BMRectMakeWithNodeFrame, BMRectMakeWithOrigin} from '../Core/BMRect'
-import {BMAnimateWithBlock, BMAnimationContextGetCurrent, BMAnimationContextEnableWebAnimations, __BMVelocityAnimate, BMHook} from '../Core/BMAnimationContext'
+import {BMAnimateWithBlock, BMAnimationContextGetCurrent, BMAnimationContextEnableWebAnimations, __BMVelocityAnimate, BMHook, BMAnimationContextBeginStatic, BMAnimationApply, BMAnimationBeginWithDuration, BMAnimationContextAddCompletionHandler} from '../Core/BMAnimationContext'
 import {BMView, BMViewColorScheme} from '../BMView/BMView_v2.5'
 import {BMLayoutOrientation} from '../BMView/BMLayoutSizeClass'
 import { BMSizeMake } from '../Core/BMSize'
@@ -746,16 +746,30 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 	set frame(frame) {
 		if (this._fullScreen) return;
 
+		const currentFrame = this._frame ?? frame;
+
 		frame = frame.integralRect;
 
 		this._frame = frame.copy();
 		
-		BMCopyProperties(this._window.style, {
-			left: frame.origin.x + 'px',
-			top: frame.origin.y + 'px',
-			width: frame.size.width + 'px',
-			height: frame.size.height + 'px'
-		});
+		let context = BMAnimationContextGetCurrent();
+		if (context) {
+			const controller = context.controllerForObject(this, {node: this._window});
+			controller.registerBuiltInPropertiesWithDictionary({
+				left: [frame.origin.x + 'px', currentFrame.origin.x + 'px'],
+				top: [frame.origin.y + 'px', currentFrame.origin.y + 'px'],
+				width: [frame.size.width + 'px', currentFrame.size.width + 'px'],
+				height: [frame.size.height + 'px', currentFrame.size.height + 'px']
+			});
+		}
+		else {
+			BMCopyProperties(this._window.style, {
+				left: frame.origin.x + 'px',
+				top: frame.origin.y + 'px',
+				width: frame.size.width + 'px',
+				height: frame.size.height + 'px'
+			});
+		}
 
 		switch (this.frameHorizontalPositionLayoutAttribute) {
 			case BMLayoutAttribute.Left:
@@ -849,6 +863,26 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		return this._toolbar;
 	},
 
+	/**
+	 * Defined for non-modal windows. The drag handle used to resize the window.
+	 */
+	_dragHandle: undefined, // <DOMNode>
+
+	/**
+	 * Controls whether the window resize handle appears.
+	 */
+	_resizable: YES, // <Boolean>
+
+	get resizable() {
+		return this._resizable;
+	},
+	set resizable(resizable) {
+		if (this._dragHandle) {
+			this._dragHandle.style.display = resizable ? 'block' : 'none';
+		}
+		this._resizable = resizable;
+	},
+
 	/**
 	 * The window overlay.
 	 */
@@ -1069,7 +1103,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		this.widthConstraint.isActive = YES;
 		this.heightConstraint.isActive = YES;
 
-		if (!modal && withToolbar) {
+		if (!modal) {
 			// In non-modal mode, allow the toolbar to move the window
 			this.maxLeftConstraint = this.left.greaterThanOrEqualTo(0);
 			this.maxTopConstraint = this.top.greaterThanOrEqualTo(0);
@@ -1086,7 +1120,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 			window.addEventListener('resize', this._boundViewportDidResize = this._viewportDidResize.bind(this));
 
 			// Initialize dragging touch events for the toolbar
-			this._toolbar.addEventListener('mousedown', event => {
+			this._toolbar?.addEventListener('mousedown', event => {
 				// Don't process events originating from children of the toolbar
 				if (event.target != this._toolbar) return;
 
@@ -1130,7 +1164,7 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 	
 			let touchDragPoint;
 	
-			this._toolbar.addEventListener('touchstart', /** @type {TouchEvent} */ event => {
+			this._toolbar?.addEventListener('touchstart', /** @type {TouchEvent} */ event => {
 				// If there is already a drag in progress, don't process this new event
 				if (typeof touchDragPoint !== 'undefined') {
 					return;
@@ -1194,11 +1228,11 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 				event.preventDefault();
 			});
 
-			this._toolbar.addEventListener('dbclick', event => {
+			this._toolbar?.addEventListener('dbclick', event => {
 				this.minimizeAnimated(YES);
 			});
 
-			this._toolbar.addEventListener('wheel', /** @param {WheelEvent} event */ event => {
+			this._toolbar?.addEventListener('wheel', /** @param {WheelEvent} event */ event => {
 				// Scrolling on the toolbar should enter showcase
 				if (event.deltaY > 0) {
 					// Allow the delegate to suppress this behaviour
@@ -1918,9 +1952,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 +1962,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 +1975,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) {
@@ -2195,7 +2225,15 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 				duration: _BMWindowAnimationDurationDefault,
 				easing: _BMWindowAnimationEasingDefault,
 				display: 'block'
-			}, YES);
+			}, YES)?.then(() => {
+				BMHook(this._window, {
+					opacity: 1,
+					translateX: '0px',
+					translateY: '0px', 
+					scaleX: 1,
+					scaleY: 1
+				});
+			});
 
 			const title = animationNode.querySelector('span');
 			__BMVelocityAnimate(title, {translateX: ['30px', '0px']}, {duration: _BMWindowAnimationDurationDefault, easing: _BMWindowAnimationEasingDefault}, YES);
@@ -2242,30 +2280,48 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		
 		var self = this;
 
+		BMAnimationContextBeginStatic();
+
 		this.widthConstraint.constant = window.innerWidth;
 		this.heightConstraint.constant = window.innerHeight;
 		this.leftConstraint.constant = 0;
 		this.topConstraint.constant = 0;
+
+		BMAnimationApply();
 		
 		if (animated) {
-			BMAnimateWithBlock(() => {
-				let controller = BMAnimationContextGetCurrent().controllerForObject(this, {node: this.node});
-				controller.registerBuiltInPropertiesWithDictionary({left: '0px', top: '0px', width: window.innerWidth + 'px', height: window.innerHeight + 'px'});
+			const completionHandler = function () {
+				if (self.delegate && self.delegate.windowDidEnterFullScreen) self.delegate.windowDidEnterFullScreen(self);
+				if (args && args.completionHandler) args.completionHandler();
+				
+				self._window.classList.add('BMFullScreenWindow');
+			};
+
+			// If an animation context is already started, reuse it
+			let contextStarted = NO;
+			if (!BMAnimationContextGetCurrent()) {
+				contextStarted = YES;
+				BMAnimationBeginWithDuration(300, {duration: 300, easing: 'easeInOutQuart',
+					complete: completionHandler
+				});
+			}
+			else {
+				BMAnimationContextAddCompletionHandler(completionHandler);
+			}
 
-				const frame = this.frame.copy();
-				this.layout();
+			let controller = BMAnimationContextGetCurrent().controllerForObject(this, {node: this.node});
 
-				// When the window contains elements whose intrinsic size must be measured, upon finishing the layout, the window will continue to keep its
-				// temporary frame used for measuring, so it has to be reset prior to the animation starting
-				BMCopyProperties(this.node.style, {left: frame.origin.x + 'px', top: frame.origin.y + 'px', width: frame.size.width + 'px', height: frame.size.height + 'px'})
-			}, {duration: 300, easing: 'easeInOutQuart',
-				complete: function () {
-					if (self.delegate && self.delegate.windowDidEnterFullScreen) self.delegate.windowDidEnterFullScreen(self);
-					if (args && args.completionHandler) args.completionHandler();
-					
-					self._window.classList.add('BMFullScreenWindow');
-				}
-			});
+			const frame = this.frame.copy();
+			this.layout();
+			controller.registerBuiltInPropertiesWithDictionary({left: '0px', top: '0px', width: window.innerWidth + 'px', height: window.innerHeight + 'px'});
+
+			// When the window contains elements whose intrinsic size must be measured, upon finishing the layout, the window will continue to keep its
+			// temporary frame used for measuring, so it has to be reset prior to the animation starting
+			BMCopyProperties(this.node.style, {left: frame.origin.x + 'px', top: frame.origin.y + 'px', width: frame.size.width + 'px', height: frame.size.height + 'px'})
+			
+			if (contextStarted) {
+				BMAnimationApply();
+			}
 		}
 		else {
 			self._window.classList.add('BMFullScreenWindow');
@@ -2300,44 +2356,51 @@ BMWindow.prototype = BMExtend(Object.create(BMView.prototype), {
 		
 		var self = this;
 
+		BMAnimationContextBeginStatic();
+
 		this.widthConstraint.constant = this.frame.width;
 		this.heightConstraint.constant = this.frame.height;
 		this.leftConstraint.constant = this.frame.left;
 		this.topConstraint.constant = this.frame.top;
+
+		BMAnimationApply();
 		
 		if (animated) {
 			self._window.classList.remove('BMFullScreenWindow');
 			var frame = self.frame;
 			BMCopyProperties(self._window.style, {left: '0px', top: '0px', width: window.innerWidth + 'px', height: window.innerHeight + 'px'});
-			/*__BMVelocityAnimate(this._window, {left: frame.origin.x + 'px', top: frame.origin.y + 'px', width: frame.size.width + 'px', height: frame.size.height + 'px'}, {
-				duration: 300,
-				easing: 'easeInOutQuart',
-				complete: function () {
-					if (self.delegate && self.delegate.windowDidExitFullScreen) self.delegate.windowDidExitFullScreen(self);
-					if (args && args.completionHandler) args.completionHandler();
-					
-					self.frame = self.frame;
-				}
-			});*/
 
-			BMAnimateWithBlock(() => {
-				let controller = BMAnimationContextGetCurrent().controllerForObject(this, {node: this.node});
-				controller.registerBuiltInProperty('left', {withValue: frame.origin.x + 'px'});
-				controller.registerBuiltInProperty('top', {withValue: frame.origin.y + 'px'});
-				controller.registerBuiltInProperty('width', {withValue: frame.size.width + 'px'});
-				controller.registerBuiltInProperty('height', {withValue: frame.size.height + 'px'});
-				this._fullScreen = NO;
-				this.layout();
-				BMCopyProperties(self._window.style, {left: '0px', top: '0px', width: window.innerWidth + 'px', height: window.innerHeight + 'px'});
-			}, {
-				duration: 300, easing: 'easeInOutQuart',
-				complete: function () {
-					if (self.delegate && self.delegate.windowDidExitFullScreen) self.delegate.windowDidExitFullScreen(self);
-					if (args && args.completionHandler) args.completionHandler();
-					
-					self.frame = self.frame;
-				}
-			});
+			const completionHandler = function () {
+				if (self.delegate && self.delegate.windowDidExitFullScreen) self.delegate.windowDidExitFullScreen(self);
+				if (args && args.completionHandler) args.completionHandler();
+				
+				self.frame = self.frame;
+			};
+
+			// If an animation context is already started, reuse it
+			let contextStarted = NO;
+			if (!BMAnimationContextGetCurrent()) {
+				contextStarted = YES;
+				BMAnimationBeginWithDuration(300, {duration: 300, easing: 'easeInOutQuart',
+					complete: completionHandler
+				});
+			}
+			else {
+				BMAnimationContextAddCompletionHandler(completionHandler);
+			}
+
+			this._fullScreen = NO;
+			this.layout();
+			let controller = BMAnimationContextGetCurrent().controllerForObject(this, {node: this.node});
+			controller.registerBuiltInProperty('left', {withValue: frame.origin.x + 'px'});
+			controller.registerBuiltInProperty('top', {withValue: frame.origin.y + 'px'});
+			controller.registerBuiltInProperty('width', {withValue: frame.size.width + 'px'});
+			controller.registerBuiltInProperty('height', {withValue: frame.size.height + 'px'});
+			BMCopyProperties(self._window.style, {left: '0px', top: '0px', width: window.innerWidth + 'px', height: window.innerHeight + 'px'});
+
+			if (contextStarted) {
+				BMAnimationApply();
+			}
 		}
 		else {
 			self._window.classList.remove('BMFullScreenWindow');