Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes error after dropping invalid element over editor area #125943

Merged
merged 1 commit into from
Jun 22, 2021
Merged

Fixes error after dropping invalid element over editor area #125943

merged 1 commit into from
Jun 22, 2021

Conversation

jeanp413
Copy link
Contributor

This PR fixes #124946

@jeanp413 jeanp413 mentioned this pull request Jun 10, 2021
Closed
@sbatten
Copy link
Member

sbatten commented Jun 11, 2021

added reviewers based on those involved in the issue discussion

@isidorn
Copy link
Contributor

isidorn commented Jun 22, 2021

Looks good to me!
@sbatten should we merge this in?

@sbatten sbatten merged commit 5716b11 into microsoft:main Jun 22, 2021
@sbatten sbatten added this to the June 2021 milestone Jun 22, 2021
@jeanp413 jeanp413 deleted the fix-124946 branch June 22, 2021 17:27
Tyriar added a commit that referenced this pull request Jun 24, 2021
@Tyriar
Fix terminal dnd to editor
9403dff 
Drag and drop broken from terminal to editor in #125943 because it no longer
accepted the TERMINAL data transfer type and list views changed to drag text instead of
resources.

Fixes #127077
@Tyriar
Copy link
Member

Tyriar commented Jun 24, 2021

FYI this broke terminal DND, I'm mostly changing it back in 9403dff

@jeanp413
Copy link
Contributor Author

@Tyriar sorry about that, I did this PR before DataTransfers.TERMINALS was added.
But is it really needed to change the list datatype back to DataTransfers.RESOURCES? The point of this PR is to use DataTransfers.RESOURCES just for file resources.
I think that checking for DataTransfers.TERMINALS in editorDropTarge.ts and setting the datatype to DataTransfers.TERMINALS inside the terminal tab list while starting a drag and drop action should fix the terminal DND.

@isidorn
Copy link
Contributor

isidorn commented Jun 24, 2021

@jeanp413 that sounds good to me.
If @Tyriar agrees, maybe you could open a new PR which also tackles the terminal?

@Tyriar
Copy link
Member

Tyriar commented Jun 24, 2021

Will change 👍

@Tyriar Tyriar mentioned this pull request Jun 24, 2021
Closed
@Tyriar
Copy link
Member

Tyriar commented Jun 24, 2021

That's tracked in #127077

@isidorn
Copy link
Contributor

isidorn commented Jun 25, 2021

@Tyriar Great. Did you also unrevert your revert?

@Tyriar
Copy link
Member

Tyriar commented Jun 25, 2021

@isidorn it's like it was in the PR now, just Terminals data transfers are also accepted.

@isidorn
Copy link
Contributor

isidorn commented Jun 25, 2021

Awesome, thanks 👏

@jeanp413 jeanp413 mentioned this pull request Jul 11, 2021
Merged
@github-actions github-actions bot locked and limited conversation to collaborators Aug 6, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@joaomoreno joaomoreno joaomoreno approved these changes

@bpasero bpasero bpasero approved these changes

@isidorn isidorn isidorn approved these changes

Assignees

@sbatten sbatten

Labels
None yet
Projects
None yet
Milestone
June 2021
Development

Successfully merging this pull request may close these issues.

Error after dropping invalid element over editor area
6 participants
@jeanp413 @sbatten @isidorn @Tyriar @joaomoreno @bpasero