-
Notifications
You must be signed in to change notification settings - Fork 3.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed bug: Incorrect point deletion with keyboard shortcut #4420
Merged
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e42c26d
fixed incorrect deletion
klakhov 91d882e
Merge branch 'develop' into kl/fix-point-delete-bug
klakhov ac24315
update changelog
klakhov 68cb638
added test
klakhov 0149732
Merge branch 'develop' into kl/fix-point-delete-bug
klakhov 34e2b70
applied comments
klakhov ef2ccf6
Merge branch 'develop' into kl/fix-point-delete-bug
klakhov 8091e24
added small check
klakhov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -793,6 +793,15 @@ export class CanvasViewImpl implements CanvasView, Listener { | |
|
||
if (['polygon', 'polyline', 'points'].includes(state.shapeType)) { | ||
if (e.altKey) { | ||
if (state.shapeType === 'points') { | ||
const selectedClientID = parseInt( | ||
((e.target as HTMLElement).parentElement as HTMLElement).getAttribute('clientID'), 10, | ||
); | ||
|
||
if (state.clientID !== selectedClientID) { | ||
return; | ||
} | ||
} | ||
const { points } = state; | ||
this.onEditDone(state, points.slice(0, pointID * 2).concat(points.slice(pointID * 2 + 2))); | ||
} else if (e.shiftKey) { | ||
|
@@ -860,6 +869,8 @@ export class CanvasViewImpl implements CanvasView, Listener { | |
|
||
if (value) { | ||
const getGeometry = (): Geometry => this.geometry; | ||
const getController = (): CanvasController => this.controller; | ||
const getActiveElement = (): ActiveElement => this.activeElement; | ||
(shape as any).selectize(value, { | ||
deepSelect: true, | ||
pointSize: (2 * consts.BASE_POINT_SIZE) / this.geometry.scale, | ||
|
@@ -875,7 +886,22 @@ export class CanvasViewImpl implements CanvasView, Listener { | |
'stroke-width': consts.POINTS_STROKE_WIDTH / getGeometry().scale, | ||
}); | ||
|
||
circle.on('mouseenter', (): void => { | ||
circle.on('mouseenter', (e: MouseEvent): void => { | ||
const activeElement = getActiveElement(); | ||
if (activeElement !== null && e.altKey) { | ||
const [state] = getController().objects.filter( | ||
(_state: any): boolean => _state.clientID === activeElement.clientID, | ||
); | ||
if (state.shapeType === 'points') { | ||
const selectedClientID = parseInt( | ||
((e.target as HTMLElement).parentElement as HTMLElement).getAttribute('clientID'), 10, | ||
); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not to use + operator here to cast to integer? It looks simpler |
||
if (state.clientID !== selectedClientID) { | ||
return; | ||
} | ||
} | ||
} | ||
|
||
circle.attr({ | ||
'stroke-width': consts.POINTS_SELECTED_STROKE_WIDTH / getGeometry().scale, | ||
}); | ||
|
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.
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.
Maybe this condition should work for all the shapes, not only for points, do not you think so?