@postermywall/fabricjs-2 7.1.0-pmw-64 → 7.1.0-pmw-65

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [next]
 
+- Upgrade 7.4.0 [#4](https://github.com/fabricjs/fabric.js/pull/4)
+
 ## [7.4.0]
 
 - feat(): Support viewport rotation in getZoom, dimensions, and control coords [#10977](https://github.com/fabricjs/fabric.js/pull/10977)

package/dist/index.js

@@ -429,7 +429,7 @@
 	const cache = new Cache();
 	//#endregion
 	//#region src/constants.ts
-	const VERSION = "7.1.0-pmw-61";
+	const VERSION = "7.1.0-pmw-65";
 	function noop() {}
 	const halfPI = Math.PI / 2;
 	const quarterPI = Math.PI / 4;
@@ -12779,7 +12779,8 @@
 				grouped = true;
 				shouldRender = true;
 			} else if (this._shouldClearSelection(e, target)) this.discardActiveObject(e);
-			if (this.selection && !config.disableGroupSelector && (!target || (!target.selectable || target.activeOn === "up") && !target.isEditing && target !== this._activeObject)) {
+			const isPressOnMovementLockedBody = !!target && target.lockMovementX && target.lockMovementY && !target.isEditing && !target.findControl(this.getViewportPoint(e), isTouchEvent(e));
+			if (this.selection && !config.disableGroupSelector && (!target || isPressOnMovementLockedBody || (!target.selectable || target.activeOn === "up") && !target.isEditing && target !== this._activeObject)) {
 				const p = this.getScenePoint(e);
 				this._groupSelector = {
 					x: p.x,
@@ -12795,7 +12796,7 @@
 					if (this._activeObject && this._activeObject !== target) target = this._activeObject;
 				}
 				const handle = target.findControl(this.getViewportPoint(e), isTouchEvent(e));
-				if (target === this._activeObject && (handle || !grouped || config.enableGroupSelection)) {
+				if (target === this._activeObject && !this._groupSelector && (handle || !grouped || config.enableGroupSelection)) {
 					this._setupCurrentTransform(e, target, alreadySelected);
 					const control = handle ? handle.control : void 0, pointer = this.getScenePoint(e), mouseDownHandler = control && control.getMouseDownHandler(e, target, control);
 					mouseDownHandler && mouseDownHandler.call(control, e, this._currentTransform, pointer.x, pointer.y);
@@ -13091,9 +13092,11 @@
 		toCanvasElement(multiplier = 1, options) {
 			const { upper } = this.elements;
 			upper.ctx = void 0;
-			const htmlElement = super.toCanvasElement(multiplier, options);
-			upper.ctx = upper.el.getContext("2d");
-			return htmlElement;
+			try {
+				return super.toCanvasElement(multiplier, options);
+			} finally {
+				upper.ctx = upper.el.getContext("2d");
+			}
 		}
 		/**
 		* @override clear {@link textEditingManager}