#3129 - Full template preview following mouse cursor #3252
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
|
The current issue is that after selecting the template - if the user presses undo - the template preview will be left on the canvas instead of hiding the preview and undoing the last action. I have started re-doing the approach in branch: |
KonstantinEpam23
force-pushed
the
3129-full-template-preview-following-mouse-cursor
branch
from
62d6aca to
34cd4d3
Compare
AKZhuk
changed the title
AKZhuk
force-pushed
the
3129-full-template-preview-following-mouse-cursor
branch
from
9b2669c to
6348557
Compare
…ll-template-preview-following-mouse-cursor
nanoblit
reviewed
Sep 20, 2023
| import { getAngleFromEvent, getBondFlipSign } from './template'; | ||
|
|
||
| const PREVIEW_DELAY = 300; | ||
| type CiType = { map: string; id: number; dist: number }; |
There was a problem hiding this comment.
What's "ci"? Maybe we can use the full name?
Zhirnoff
approved these changes
Sep 20, 2023
|
16 tests fail. Please add screenshots of local run |
rrodionov91
requested changes
Sep 21, 2023
…ll-template-preview-following-mouse-cursor
…ll-template-preview-following-mouse-cursor
|
Pre-tested. Bug is fixed. And fixed comments added by @rrodionov91 |
rrodionov91
approved these changes
Sep 26, 2023
Comment on lines
+120
to
+134
| const bondId = 2; | ||
| const shift = 100; | ||
| await selectRingButton(RingButton.Benzene, page); | ||
| const bondPosition = await getBondByIndex( | ||
| page, | ||
| { type: BondType.SINGLE }, | ||
| bondId, | ||
| ); | ||
| const pointAwayFromBond = { | ||
| x: bondPosition.x + shift, | ||
| y: bondPosition.y + shift, | ||
| }; | ||
| await takeEditorScreenshot(page); | ||
| await page.mouse.move(pointAwayFromBond.x, pointAwayFromBond.y); | ||
| await takeEditorScreenshot(page); |
There was a problem hiding this comment.
I believe that this test covers the case from the previous one and we can keep just only this test.
| class TemplatePreview { | ||
| private readonly editor: Editor; | ||
| private readonly template; | ||
| private readonly mode: 'fg' | null; |
There was a problem hiding this comment.
I believe we can have more clear values for "mode".
| movePreview(event: PointerEvent) { | ||
| this.position = this.editor.render.page2obj(event); | ||
|
|
||
| const ci = this.getPreviewTarget(); |
There was a problem hiding this comment.
I would propose to rename ci to previewTarget
Comment on lines
107
to
111
| const shouldHidePreview = | ||
| isMouseAwayFromAtomsAndBonds || isPreviewTargetChanged; | ||
|
|
||
| const shouldShowPreview = | ||
| ci && !this.connectedPreviewAction && !this.connectedPreviewTimeout; |
There was a problem hiding this comment.
I would propose to rename it to shouldHideConnectedPreview and shouldShowConnectedPreview
Comment on lines
125
to
135
| if (!this.floatingPreview) { | ||
| this.showFloatingPreview(this.position); | ||
| this.previousPosition = this.position; | ||
| this.editor.render.update(false, null, { resizeCanvas: false }); | ||
| } else { | ||
| const dist = this.position.sub(this.previousPosition); | ||
| this.previousPosition = this.position; | ||
| fromMultipleMove(this.restruct, this.floatingPreview, dist); | ||
| this.editor.render.update(false, null, { resizeCanvas: false }); | ||
| this.hoverFusedItems(ci, event); | ||
| } |
There was a problem hiding this comment.
I would propose to move it to separate function f.e. moveFloatingPreview()
Nitvex
deleted the
3129-full-template-preview-following-mouse-cursor
branch
SashaGraves
pushed a commit
that referenced
this pull request
Sep 28, 2023
* #3129 - Full template preview following mouse cursor: draft 4 * #3129 - Full template preview following mouse cursor * #3129 - Full template preview following mouse cursor - Fix e2e * #3129 – fixed showing preview for preview-bonds * #3129 – fixed position for preview * #3129 – fixed showing preview for functional groups * #3129 – fixed failing tests * #3129 – fixed failing tests * #3129 – refactor after review --------- Co-authored-by: Aliaksei <[email protected]> Co-authored-by: Nikita_Vozisov <[email protected]>
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.
How the feature works? / How did you fix the issue?
Screen.Recording.2023-09-11.at.15.23.31.mov
Check list
#1234 – issue name