feat(Canvas): provide correctly named canvas pointer methods. BREAKING: rm _normalizePointer, restorePointerVpt
#9175
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,6 @@ import { | |
| import type { TCanvasSizeOptions } from './StaticCanvas'; | ||
| import { StaticCanvas } from './StaticCanvas'; | ||
| import { isCollection } from '../util/typeAssertions'; | ||
| import { isTransparent } from '../util/misc/isTransparent'; | ||
| import type { | ||
| TMat2D, | ||
|
|
@@ -589,11 +588,11 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents> | |
| const pointer = target.group | ||
| ? // transform pointer to target's containing coordinate plane | ||
| sendPointToPlane( | ||
| this.getScenePoint(e), | ||
| undefined, | ||
| target.group.calcTransformMatrix() | ||
| ) | ||
| : this.getScenePoint(e); | ||
| const corner = target.getActiveControl() || '', | ||
| control = !!corner && target.controls[corner], | ||
| actionHandler = | ||
|
|
@@ -708,7 +707,7 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents> | |
| return undefined; | ||
| } | ||
|
|
||
| const pointer = this.getViewportPoint(e), | ||
| activeObject = this._activeObject, | ||
| aObjects = this.getActiveObjects(); | ||
|
|
||
|
|
@@ -765,7 +764,10 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents> | |
| obj && | ||
| obj.visible && | ||
| obj.evented && | ||
| obj.containsPoint( | ||
| sendPointToPlane(pointer, undefined, this.viewportTransform), | ||
| true | ||
|
Comment on lines
+767
to
+769
There was a problem hiding this comment. keep this in mind for conflict resolution with #9395 |
||
| ) | ||
| ) { | ||
| if ( | ||
| (this.perPixelTargetFind || obj.perPixelTargetFind) && | ||
|
|
@@ -815,7 +817,7 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents> | |
| * Function used to search inside objects an object that contains pointer in bounding box or that contains pointerOnCanvas when painted | ||
| * @see {@link _searchPossibleTargets} | ||
| * @param {FabricObject[]} [objects] objects array to look into | ||
| * @param {Point} [pointer] coordinates from viewport to check. | ||
| * @return {FabricObject} **top most object on screen** that contains pointer | ||
| */ | ||
| searchPossibleTargets( | ||
|
|
@@ -835,42 +837,56 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents> | |
| } | ||
|
|
||
| /** | ||
| * @returns point existing in the same plane as the {@link HTMLCanvasElement}, | ||
| * `(0, 0)` being the top left corner of the {@link HTMLCanvasElement}. | ||
| * This means that changes to the {@link viewportTransform} do not change the values of the point | ||
| * and it remains unchanged from the viewer's perspective. | ||
| * | ||
| * @example | ||
| * const scenePoint = sendPointToPlane( | ||
| * this.getViewportPoint(e), | ||
| * undefined, | ||
| * canvas.viewportTransform | ||
| * ); | ||
| * | ||
| */ | ||
| getViewportPoint(e: TPointerEvent) { | ||
| if (this._pointer) { | ||
| return this._pointer; | ||
| } | ||
| return this.getPointer(e, true); | ||
| } | ||
|
|
||
| /** | ||
| * @returns point existing in the scene (the same plane as the plane {@link FabricObject#getCenterPoint} exists in). | ||
| * This means that changes to the {@link viewportTransform} do not change the values of the point, | ||
| * however, from the viewer's perspective, the point is changed. | ||
| * | ||
| * @example | ||
| * const viewportPoint = sendPointToPlane( | ||
| * this.getScenePoint(e), | ||
| * canvas.viewportTransform | ||
| * ); | ||
| * | ||
| */ | ||
| getScenePoint(e: TPointerEvent) { | ||
| if (this._absolutePointer) { | ||
| return this._absolutePointer; | ||
ShaMan123 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| return this.getPointer(e); | ||
| } | ||
|
|
||
| /** | ||
| * Returns pointer relative to canvas. | ||
| * | ||
| * @deprecated This method is deprecated since v6 to protect you from misuse. | ||
| * Use {@link getViewportPoint} or {@link getScenePoint} instead. | ||
| * | ||
| * @param {Event} e | ||
| * @param {Boolean} [fromViewport] whether to return the point from the viewport or in the scene | ||
| * @return {Point} | ||
| */ | ||
| getPointer(e: TPointerEvent, fromViewport = false): Point { | ||
| const upperCanvasEl = this.upperCanvasEl, | ||
| bounds = upperCanvasEl.getBoundingClientRect(); | ||
| let pointer = getPointer(e), | ||
|
|
@@ -889,8 +905,8 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents> | |
| this.calcOffset(); | ||
| pointer.x = pointer.x - this._offset.left; | ||
| pointer.y = pointer.y - this._offset.top; | ||
| if (!fromViewport) { | ||
| pointer = sendPointToPlane(pointer, undefined, this.viewportTransform); | ||
| } | ||
|
|
||
| const retinaScaling = this.getRetinaScaling(); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems redundant since we cache
getScenePoint