fix: resolve conflict of zoom-canvas and drag-canvas #6780
Merged
Conversation
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
WalkthroughThis pull request resolves the conflict between zoom-canvas and drag-canvas interactions by introducing a mechanism to prevent drag-canvas offset behavior when zoom-canvas interaction is active. The changes ensure that the drag operation is halted during a pinch gesture. Changes
|
![petercat-assistant[bot]](https://avatars.githubusercontent.com/in/875736?s=60&v=4){kind=small}
Aarebecca
reviewed
Feb 18, 2025
|
支持一个 PinchHanle 实例绑定多种类型（start/move/end）的多个事件函数，同时支持单个回调函数的解绑，当所有回调函数为空时，会自动销毁实例 |
Aarebecca
reviewed
Feb 19, 2025
packages/g6/src/utils/shortcut.ts
Outdated
| @@ -127,7 +127,7 @@ export class Shortcut { | |||
| this.emitter.off(CommonEvent.KEY_UP, this.onKeyUp); | |||
| this.emitter.off(CommonEvent.WHEEL, this.onWheel); | |||
| this.emitter.off(CommonEvent.DRAG, this.onDrag); | |||
| this.pinchHandler?.destroy(); | |||
| this.pinchHandler?.unregister('move', this.handlePinch.bind(this)); | |||
There was a problem hiding this comment.
bind 会返回一个新的函数，这样写会注销不会成功
There was a problem hiding this comment.
改成了下面的形式，保证绑定和解绑的是同一个函数
this.boundHandlePinch = this.handlePinch.bind(this);
this.pinchHandler = new PinchHandler(this.emitter, 'pinchmove', this.boundHandlePinch);
Aarebecca
approved these changes
Feb 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolved the conflict that occurred when configuring the interaction behaviors of zoom canvas and drag canvas simultaneously. The solution is to prevent the offset behavior of drag - canvas when the zoom - canvas interaction is in progress.