Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-23 15:46:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix drag and drop of messages onto a label / folder in the sidebar #1533

Browse source
This commit is contained in:
Ben Gotow 2019-06-30 22:56:25 -05:00
parent 99a40d7b9f
commit af61bac1a5
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/components/drop-zone.tsx
View file

@ -75,7 +75,13 @@ export class DropZone extends React.Component<DropZoneProps> {
<div <div
{...otherProps} {...otherProps}
onDragOver={event => { onDragOver={event => {
if (event.target instanceof HTMLElement && event.target.closest('[data-slate-editor]'))
return;
if (event.dataTransfer.effectAllowed) {
event.dataTransfer.dropEffect = event.dataTransfer.effectAllowed;
} else {
event.dataTransfer.dropEffect = 'copy'; event.dataTransfer.dropEffect = 'copy';
}
event.preventDefault(); event.preventDefault();
}} }}
onDragEnter={this._onDragEnter} onDragEnter={this._onDragEnter}

4
app/src/window-event-handler.ts
View file

@ -248,10 +248,6 @@ export default class WindowEventHandler {
event.stopPropagation(); event.stopPropagation();
}; };
onDragOver = (event: DragEvent) => {
event.dataTransfer.dropEffect = 'none';
};
resolveHref(el: EventTarget) { resolveHref(el: EventTarget) {
if (!el || !(el instanceof HTMLElement)) { if (!el || !(el instanceof HTMLElement)) {
return null; return null;