-
Notifications
You must be signed in to change notification settings - Fork 14.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6 from williaster/chris--dnd-robustness
[dnd] refactor drop position logic
- Loading branch information
Showing
3 changed files
with
128 additions
and
123 deletions.
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
98 changes: 21 additions & 77 deletions
98
superset/assets/javascripts/dashboard/v2/components/dnd/handleHover.js
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
88 changes: 88 additions & 0 deletions
88
superset/assets/javascripts/dashboard/v2/util/getDropPosition.js
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 |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| import isValidChild from './isValidChild'; | ||
|
|
||
| export const DROP_TOP = 'DROP_TOP'; | ||
| export const DROP_RIGHT = 'DROP_RIGHT'; | ||
| export const DROP_BOTTOM = 'DROP_BOTTOM'; | ||
| export const DROP_LEFT = 'DROP_LEFT'; | ||
|
|
||
| const SIBLING_DROP_THRESHOLD = 10; | ||
|
|
||
| export default function getDropPosition(monitor, Component) { | ||
| const { | ||
| parentComponent, | ||
| component, | ||
| orientation, | ||
| isDraggingOverShallow, | ||
| } = Component.props; | ||
|
|
||
| const draggingItem = monitor.getItem(); | ||
|
|
||
| // if dropped self on self, do nothing | ||
| if (!draggingItem || draggingItem.draggableId === component.id || !isDraggingOverShallow) { | ||
| return null; | ||
| } | ||
|
|
||
| const validChild = isValidChild({ | ||
| parentType: component.type, | ||
| childType: draggingItem.type, | ||
| }); | ||
|
|
||
| const validSibling = isValidChild({ | ||
| parentType: parentComponent && parentComponent.type, | ||
| childType: draggingItem.type, | ||
| }); | ||
|
|
||
| if (!validChild && !validSibling) { | ||
| return null; | ||
| } | ||
|
|
||
| const hasChildren = component.children.length > 0; | ||
| const childDropOrientation = orientation === 'row' ? 'vertical' : 'horizontal'; | ||
| const siblingDropOrientation = orientation === 'row' ? 'horizontal' : 'vertical'; | ||
|
|
||
| if (validChild && !validSibling) { // easiest case, insert as child | ||
| if (childDropOrientation === 'vertical') { | ||
| return hasChildren ? DROP_RIGHT : DROP_LEFT; | ||
| } | ||
| return hasChildren ? DROP_BOTTOM : DROP_TOP; | ||
| } | ||
|
|
||
| const refBoundingRect = Component.ref.getBoundingClientRect(); | ||
| const clientOffset = monitor.getClientOffset(); | ||
|
|
||
| // Drop based on mouse position relative to component center | ||
| if (validSibling && !validChild) { | ||
| if (siblingDropOrientation === 'vertical') { | ||
| const refMiddleX = | ||
| refBoundingRect.left + ((refBoundingRect.right - refBoundingRect.left) / 2); | ||
| return clientOffset.x < refMiddleX ? DROP_LEFT : DROP_RIGHT; | ||
| } | ||
| const refMiddleY = refBoundingRect.top + ((refBoundingRect.bottom - refBoundingRect.top) / 2); | ||
| return clientOffset.y < refMiddleY ? DROP_TOP : DROP_BOTTOM; | ||
| } | ||
|
|
||
| // either is valid, so choose location based on boundary deltas | ||
| if (validSibling && validChild) { | ||
| const deltaTop = Math.abs(clientOffset.y - refBoundingRect.top); | ||
| const deltaBottom = Math.abs(clientOffset.y - refBoundingRect.bottom); | ||
| const deltaLeft = Math.abs(clientOffset.x - refBoundingRect.left); | ||
| const deltaRight = Math.abs(clientOffset.x - refBoundingRect.right); | ||
|
|
||
| // if near enough to a sibling boundary, drop there | ||
| if (siblingDropOrientation === 'vertical') { | ||
| if (deltaLeft < SIBLING_DROP_THRESHOLD) return DROP_LEFT; | ||
| if (deltaRight < SIBLING_DROP_THRESHOLD) return DROP_RIGHT; | ||
| } else { | ||
| if (deltaTop < SIBLING_DROP_THRESHOLD) return DROP_TOP; | ||
| if (deltaBottom < SIBLING_DROP_THRESHOLD) return DROP_BOTTOM; | ||
| } | ||
|
|
||
| // drop as child | ||
| if (childDropOrientation === 'vertical') { | ||
| return hasChildren ? DROP_RIGHT : DROP_LEFT; | ||
| } | ||
| return hasChildren ? DROP_BOTTOM : DROP_TOP; | ||
| } | ||
|
|
||
| return null; | ||
| } |