Skip to content
Merged
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions packages/components/src/drop-zone/provider.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,41 @@ import { isEqual, find, some, filter, noop, throttle, includes } from 'lodash';
/**
* WordPress dependencies
*/
import { Component, findDOMNode } from '@wordpress/element';
import { Component, createContext, findDOMNode } from '@wordpress/element';
import isShallowEqual from '@wordpress/is-shallow-equal';

const Context = createContext( {
addDropZone: () => {},
removeDropZone: () => {},
isDraggingOverDocument: false,
isDraggingOverElement: false,
position: null,
type: null,
} );

class DropZoneProvider extends Component {
constructor() {
super( ...arguments );

// Event listeners
this.onDragOver = this.onDragOver.bind( this );
this.onDrop = this.onDrop.bind( this );
// Context methods so this component can receive data from consumers
this.addDropZone = this.addDropZone.bind( this );
this.removeDropZone = this.removeDropZone.bind( this );
// Utility methods
this.resetDragState = this.resetDragState.bind( this );
this.toggleDraggingOverDocument = throttle( this.toggleDraggingOverDocument.bind( this ), 200 );
this.dragOverListener = this.dragOverListener.bind( this );
this.isWithinZoneBounds = this.isWithinZoneBounds.bind( this );
this.onDrop = this.onDrop.bind( this );

this.dropzones = [];
this.state = {
addDropZone: this.addDropZone,
removeDropZone: this.removeDropZone,
Comment thread
youknowriad marked this conversation as resolved.
Resolved
isDraggingOverDocument: false,
hoveredDropZone: -1,
position: null,
};
this.dropzones = [];
}

dragOverListener( event ) {
this.toggleDraggingOverDocument( event, this.getDragEventType( event ) );
event.preventDefault();
}

getChildContext() {
Expand All @@ -46,7 +57,7 @@ class DropZoneProvider extends Component {
}

componentDidMount() {
window.addEventListener( 'dragover', this.dragOverListener );
window.addEventListener( 'dragover', this.onDragOver );
window.addEventListener( 'drop', this.onDrop );
window.addEventListener( 'mouseup', this.resetDragState );

Expand All @@ -56,11 +67,19 @@ class DropZoneProvider extends Component {
}

componentWillUnmount() {
window.removeEventListener( 'dragover', this.dragOverListener );
window.removeEventListener( 'dragover', this.onDragOver );
window.removeEventListener( 'drop', this.onDrop );
window.removeEventListener( 'mouseup', this.resetDragState );
}

addDropZone( dropZone ) {
this.dropzones.push( dropZone );
}

removeDropZone( dropZone ) {
this.dropzones = filter( this.dropzones, ( dz ) => dz !== dropZone );
}

resetDragState() {
// Avoid throttled drag over handler calls
this.toggleDraggingOverDocument.cancel();
Expand Down Expand Up @@ -204,6 +223,11 @@ class DropZoneProvider extends Component {
return isWithinElement( dropzone );
}

onDragOver( event ) {
this.toggleDraggingOverDocument( event, this.getDragEventType( event ) );
event.preventDefault();
}

onDrop( event ) {
// This seemingly useless line has been shown to resolve a Safari issue
// where files dragged directly from the dock are not recognized
Expand Down