@react-aria/dnd 3.11.5 → 3.11.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DragManager.main.js +19 -16
- package/dist/DragManager.main.js.map +1 -1
- package/dist/DragManager.mjs +20 -17
- package/dist/DragManager.module.js +20 -17
- package/dist/DragManager.module.js.map +1 -1
- package/dist/DropTargetKeyboardNavigation.main.js +13 -3
- package/dist/DropTargetKeyboardNavigation.main.js.map +1 -1
- package/dist/DropTargetKeyboardNavigation.mjs +13 -3
- package/dist/DropTargetKeyboardNavigation.module.js +13 -3
- package/dist/DropTargetKeyboardNavigation.module.js.map +1 -1
- package/dist/useDrag.main.js +6 -6
- package/dist/useDrag.main.js.map +1 -1
- package/dist/useDrag.mjs +7 -7
- package/dist/useDrag.module.js +7 -7
- package/dist/useDrag.module.js.map +1 -1
- package/dist/useDrop.main.js +2 -2
- package/dist/useDrop.main.js.map +1 -1
- package/dist/useDrop.mjs +3 -3
- package/dist/useDrop.module.js +3 -3
- package/dist/useDrop.module.js.map +1 -1
- package/package.json +10 -10
- package/src/DragManager.ts +19 -16
- package/src/DropTargetKeyboardNavigation.ts +14 -3
- package/src/useDrag.ts +8 -8
- package/src/useDrop.ts +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"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","sources":["packages/@react-aria/dnd/src/useDrop.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '@react-types/button';\nimport {DOMAttributes, DropActivateEvent, DropEnterEvent, DropEvent, DropExitEvent, DropMoveEvent, DropOperation, FocusableElement, DragTypes as IDragTypes, RefObject} from '@react-types/shared';\nimport {DragEvent, useRef, useState} from 'react';\nimport * as DragManager from './DragManager';\nimport {DragTypes, globalAllowedDropOperations, globalDndState, readFromDataTransfer, setGlobalDnDState, setGlobalDropEffect} from './utils';\nimport {DROP_EFFECT_TO_DROP_OPERATION, DROP_OPERATION, DROP_OPERATION_ALLOWED, DROP_OPERATION_TO_DROP_EFFECT} from './constants';\nimport {isIPad, isMac, nodeContains, useEffectEvent, useLayoutEffect} from '@react-aria/utils';\nimport {useVirtualDrop} from './useVirtualDrop';\n\nexport interface DropOptions {\n /** A ref for the droppable element. */\n ref: RefObject<FocusableElement | null>,\n /**\n * A function returning the drop operation to be performed when items matching the given types are dropped\n * on the drop target.\n */\n getDropOperation?: (types: IDragTypes, allowedOperations: DropOperation[]) => DropOperation,\n /** A function that returns the drop operation for a specific point within the target. */\n getDropOperationForPoint?: (types: IDragTypes, allowedOperations: DropOperation[], x: number, y: number) => DropOperation,\n /** Handler that is called when a valid drag enters the drop target. */\n onDropEnter?: (e: DropEnterEvent) => void,\n /** Handler that is called when a valid drag is moved within the drop target. */\n onDropMove?: (e: DropMoveEvent) => void,\n /**\n * Handler that is called after a valid drag is held over the drop target for a period of time.\n * This typically opens the item so that the user can drop within it.\n */\n onDropActivate?: (e: DropActivateEvent) => void,\n /** Handler that is called when a valid drag exits the drop target. */\n onDropExit?: (e: DropExitEvent) => void,\n /** Handler that is called when a valid drag is dropped on the drop target. */\n onDrop?: (e: DropEvent) => void,\n /**\n * Whether the item has an explicit focusable drop affordance to initiate accessible drag and drop mode.\n * If true, the dropProps will omit these event handlers, and they will be applied to dropButtonProps instead.\n */\n hasDropButton?: boolean,\n /**\n * Whether the drop target is disabled. If true, the drop target will not accept any drops.\n */\n isDisabled?: boolean\n}\n\nexport interface DropResult {\n /** Props for the droppable element. */\n dropProps: DOMAttributes,\n /** Whether the drop target is currently focused or hovered. */\n isDropTarget: boolean,\n /** Props for the explicit drop button affordance, if any. */\n dropButtonProps?: AriaButtonProps\n}\n\nconst DROP_ACTIVATE_TIMEOUT = 800;\n\n/**\n * Handles drop interactions for an element, with support for traditional mouse and touch\n * based drag and drop, in addition to full parity for keyboard and screen reader users.\n */\nexport function useDrop(options: DropOptions): DropResult {\n let {hasDropButton, isDisabled} = options;\n let [isDropTarget, setDropTarget] = useState(false);\n let state = useRef<{\n x: number,\n y: number,\n dragOverElements: Set<Element>,\n dropEffect: DataTransfer['dropEffect'],\n allowedOperations: DROP_OPERATION,\n dropActivateTimer: ReturnType<typeof setTimeout> | undefined\n }>({\n x: 0,\n y: 0,\n dragOverElements: new Set<Element>(),\n dropEffect: 'none',\n allowedOperations: DROP_OPERATION.all,\n dropActivateTimer: undefined\n }).current;\n\n let fireDropEnter = (e: DragEvent) => {\n setDropTarget(true);\n\n if (typeof options.onDropEnter === 'function') {\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n options.onDropEnter({\n type: 'dropenter',\n x: e.clientX - rect.x,\n y: e.clientY - rect.y\n });\n }\n };\n\n let fireDropExit = (e: DragEvent) => {\n setDropTarget(false);\n\n if (typeof options.onDropExit === 'function') {\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n options.onDropExit({\n type: 'dropexit',\n x: e.clientX - rect.x,\n y: e.clientY - rect.y\n });\n }\n };\n\n let onDragOver = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n\n let allowedOperations = getAllowedOperations(e);\n if (e.clientX === state.x && e.clientY === state.y && allowedOperations === state.allowedOperations) {\n e.dataTransfer.dropEffect = state.dropEffect;\n return;\n }\n\n state.x = e.clientX;\n state.y = e.clientY;\n\n let prevDropEffect = state.dropEffect;\n\n // Update drop effect if allowed drop operations changed (e.g. user pressed modifier key).\n if (allowedOperations !== state.allowedOperations) {\n let allowedOps = allowedOperationsToArray(allowedOperations);\n let dropOperation = allowedOps[0];\n if (typeof options.getDropOperation === 'function') {\n let types = new DragTypes(e.dataTransfer);\n dropOperation = getDropOperation(allowedOperations, options.getDropOperation(types, allowedOps));\n }\n state.dropEffect = DROP_OPERATION_TO_DROP_EFFECT[dropOperation] || 'none';\n }\n\n if (typeof options.getDropOperationForPoint === 'function') {\n let types = new DragTypes(e.dataTransfer);\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n let dropOperation = getDropOperation(\n allowedOperations,\n options.getDropOperationForPoint(types, allowedOperationsToArray(allowedOperations), state.x - rect.x, state.y - rect.y)\n );\n state.dropEffect = DROP_OPERATION_TO_DROP_EFFECT[dropOperation] || 'none';\n }\n\n state.allowedOperations = allowedOperations;\n e.dataTransfer.dropEffect = state.dropEffect;\n\n // If the drop operation changes, update state and fire events appropriately.\n if (state.dropEffect === 'none' && prevDropEffect !== 'none') {\n fireDropExit(e);\n } else if (state.dropEffect !== 'none' && prevDropEffect === 'none') {\n fireDropEnter(e);\n }\n\n if (typeof options.onDropMove === 'function' && state.dropEffect !== 'none') {\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n options.onDropMove({\n type: 'dropmove',\n x: state.x - rect.x,\n y: state.y - rect.y\n });\n }\n\n clearTimeout(state.dropActivateTimer);\n\n if (options.onDropActivate && typeof options.onDropActivate === 'function' && state.dropEffect !== 'none') {\n let onDropActivateOptions = options.onDropActivate;\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n state.dropActivateTimer = setTimeout(() => {\n onDropActivateOptions({\n type: 'dropactivate',\n x: state.x - rect.x,\n y: state.y - rect.y\n });\n }, DROP_ACTIVATE_TIMEOUT);\n }\n };\n\n let onDragEnter = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n state.dragOverElements.add(e.target as Element);\n if (state.dragOverElements.size > 1) {\n return;\n }\n\n let allowedOperationsBits = getAllowedOperations(e);\n let allowedOperations = allowedOperationsToArray(allowedOperationsBits);\n let dropOperation = allowedOperations[0];\n\n if (typeof options.getDropOperation === 'function') {\n let types = new DragTypes(e.dataTransfer);\n dropOperation = getDropOperation(allowedOperationsBits, options.getDropOperation(types, allowedOperations));\n }\n\n if (typeof options.getDropOperationForPoint === 'function') {\n let types = new DragTypes(e.dataTransfer);\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n dropOperation = getDropOperation(\n allowedOperationsBits,\n options.getDropOperationForPoint(types, allowedOperations, e.clientX - rect.x, e.clientY - rect.y)\n );\n }\n\n state.x = e.clientX;\n state.y = e.clientY;\n state.allowedOperations = allowedOperationsBits;\n state.dropEffect = DROP_OPERATION_TO_DROP_EFFECT[dropOperation] || 'none';\n e.dataTransfer.dropEffect = state.dropEffect;\n\n if (dropOperation !== 'cancel') {\n fireDropEnter(e);\n }\n };\n\n let onDragLeave = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n\n // We would use e.relatedTarget to detect if the drag is still inside the drop target,\n // but it is always null in WebKit. https://bugs.webkit.org/show_bug.cgi?id=66547\n // Instead, we track all of the targets of dragenter events in a set, and remove them\n // in dragleave. When the set becomes empty, we've left the drop target completely.\n // We must also remove any elements that are no longer in the DOM, because dragleave\n // events will never be fired for these. This can happen, for example, with drop\n // indicators between items, which disappear when the drop target changes.\n\n state.dragOverElements.delete(e.target as Element);\n for (let element of state.dragOverElements) {\n if (!nodeContains(e.currentTarget, element)) {\n state.dragOverElements.delete(element);\n }\n }\n\n if (state.dragOverElements.size > 0) {\n return;\n }\n\n if (state.dropEffect !== 'none') {\n fireDropExit(e);\n }\n\n clearTimeout(state.dropActivateTimer);\n };\n\n let onDrop = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n // Track drop effect in global state for Chrome Android. https://bugs.chromium.org/p/chromium/issues/detail?id=1353951\n // Android onDragEnd always returns \"none\" as its drop effect.\n setGlobalDropEffect(state.dropEffect);\n\n if (typeof options.onDrop === 'function') {\n let dropOperation = DROP_EFFECT_TO_DROP_OPERATION[state.dropEffect];\n let items = readFromDataTransfer(e.dataTransfer);\n\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n let event: DropEvent = {\n type: 'drop',\n x: e.clientX - rect.x,\n y: e.clientY - rect.y,\n items,\n dropOperation\n };\n\n options.onDrop(event);\n }\n\n let dndStateSnapshot = {...globalDndState};\n state.dragOverElements.clear();\n fireDropExit(e);\n clearTimeout(state.dropActivateTimer);\n // If there wasn't a collection being tracked as a dragged collection, then we are in a case where a non RSP drag is dropped on a\n // RSP collection and thus we don't need to preserve the global drop effect\n if (dndStateSnapshot.draggingCollectionRef == null) {\n setGlobalDropEffect(undefined);\n } else {\n // Otherwise we need to preserve the global dnd state for onDragEnd's isInternal check.\n // At the moment fireDropExit may clear dropCollectionRef (i.e. useDroppableCollection's provided onDropExit, required to clear dropCollectionRef when exiting a valid drop target)\n setGlobalDnDState(dndStateSnapshot);\n }\n };\n\n let onDropEnter = useEffectEvent((e: DropEnterEvent) => {\n if (typeof options.onDropEnter === 'function') {\n options.onDropEnter(e);\n }\n });\n\n let onDropExit = useEffectEvent((e: DropExitEvent) => {\n if (typeof options.onDropExit === 'function') {\n options.onDropExit(e);\n }\n });\n\n let onDropActivate = useEffectEvent((e: DropActivateEvent) => {\n if (typeof options.onDropActivate === 'function') {\n options.onDropActivate(e);\n }\n });\n\n let onKeyboardDrop = useEffectEvent((e: DropEvent) => {\n if (typeof options.onDrop === 'function') {\n options.onDrop(e);\n }\n });\n\n let getDropOperationKeyboard = useEffectEvent((types: IDragTypes, allowedOperations: DropOperation[]) => {\n if (options.getDropOperation) {\n return options.getDropOperation(types, allowedOperations);\n }\n\n return allowedOperations[0];\n });\n\n let {ref} = options;\n useLayoutEffect(() => {\n if (isDisabled || !ref.current) {\n return;\n }\n return DragManager.registerDropTarget({\n element: ref.current,\n getDropOperation: getDropOperationKeyboard,\n onDropEnter(e) {\n setDropTarget(true);\n onDropEnter(e);\n },\n onDropExit(e) {\n setDropTarget(false);\n onDropExit(e);\n },\n onDrop: onKeyboardDrop,\n onDropActivate\n });\n }, [isDisabled, ref]);\n\n let {dropProps} = useVirtualDrop();\n if (isDisabled) {\n return {\n dropProps: {},\n dropButtonProps: {isDisabled: true},\n isDropTarget: false\n };\n }\n return {\n dropProps: {\n ...(!hasDropButton && dropProps),\n onDragEnter,\n onDragOver,\n onDragLeave,\n onDrop\n },\n dropButtonProps: {...(hasDropButton && dropProps)},\n isDropTarget\n };\n}\n\nfunction getAllowedOperations(e: DragEvent) {\n let allowedOperations = DROP_OPERATION_ALLOWED[e.dataTransfer.effectAllowed];\n\n // WebKit always sets effectAllowed to \"copyMove\" on macOS, and \"all\" on iOS, regardless of what was\n // set during the dragstart event: https://bugs.webkit.org/show_bug.cgi?id=178058\n //\n // Android Chrome also sets effectAllowed to \"copyMove\" in all cases: https://bugs.chromium.org/p/chromium/issues/detail?id=1359182\n //\n // If the drag started within the page, we can use a global variable to get the real allowed operations.\n // This needs to be intersected with the actual effectAllowed, which may have been filtered based on modifier keys.\n // Unfortunately, this means that link operations do not work at all in Safari.\n if (globalAllowedDropOperations) {\n allowedOperations &= globalAllowedDropOperations;\n }\n\n // Chrome and Safari on macOS will automatically filter effectAllowed when pressing modifier keys,\n // allowing the user to switch between move, link, and copy operations. Firefox on macOS and all\n // Windows browsers do not do this, so do it ourselves instead. The exact keys are platform dependent.\n // https://ux.stackexchange.com/questions/83748/what-are-the-most-common-modifier-keys-for-dragging-objects-with-a-mouse\n //\n // Note that none of these modifiers are ever set in WebKit due to a bug: https://bugs.webkit.org/show_bug.cgi?id=77465\n // However, Safari does update effectAllowed correctly, so we can just rely on that.\n let allowedModifiers = DROP_OPERATION.none;\n if (isMac()) {\n if (e.altKey) {\n allowedModifiers |= DROP_OPERATION.copy;\n }\n\n // Chrome and Safari both use the Control key for link, even though Finder uses Command + Option.\n // iPadOS doesn't support link operations and will not fire the drop event at all if dropEffect is set to link.\n // https://bugs.webkit.org/show_bug.cgi?id=244701\n if (e.ctrlKey && !isIPad()) {\n allowedModifiers |= DROP_OPERATION.link;\n }\n\n if (e.metaKey) {\n allowedModifiers |= DROP_OPERATION.move;\n }\n } else {\n if (e.altKey) {\n allowedModifiers |= DROP_OPERATION.link;\n }\n\n if (e.shiftKey) {\n allowedModifiers |= DROP_OPERATION.move;\n }\n\n if (e.ctrlKey) {\n allowedModifiers |= DROP_OPERATION.copy;\n }\n }\n\n if (allowedModifiers) {\n return allowedOperations & allowedModifiers;\n }\n\n return allowedOperations;\n}\n\nfunction allowedOperationsToArray(allowedOperationsBits: DROP_OPERATION) {\n let allowedOperations: Array<DropOperation> = [];\n if (allowedOperationsBits & DROP_OPERATION.move) {\n allowedOperations.push('move');\n }\n\n if (allowedOperationsBits & DROP_OPERATION.copy) {\n allowedOperations.push('copy');\n }\n\n if (allowedOperationsBits & DROP_OPERATION.link) {\n allowedOperations.push('link');\n }\n\n return allowedOperations;\n}\n\nfunction getDropOperation(allowedOperations: DROP_OPERATION, operation: DropOperation) {\n let op = DROP_OPERATION[operation];\n return allowedOperations & op ? operation : 'cancel';\n}\n"],"names":[],"version":3,"file":"useDrop.module.js.map"}
|
|
1
|
+
{"mappings":";;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;AAsDD,MAAM,8CAAwB;AAMvB,SAAS,0CAAQ,OAAoB;IAC1C,IAAI,iBAAC,aAAa,cAAE,UAAU,EAAC,GAAG;IAClC,IAAI,CAAC,cAAc,cAAc,GAAG,CAAA,GAAA,eAAO,EAAE;IAC7C,IAAI,QAAQ,CAAA,GAAA,aAAK,EAOd;QACD,GAAG;QACH,GAAG;QACH,kBAAkB,IAAI;QACtB,YAAY;QACZ,mBAAmB,CAAA,GAAA,yCAAa,EAAE,GAAG;QACrC,mBAAmB;IACrB,GAAG,OAAO;IAEV,IAAI,gBAAgB,CAAC;QACnB,cAAc;QAEd,IAAI,OAAO,QAAQ,WAAW,KAAK,YAAY;YAC7C,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,QAAQ,WAAW,CAAC;gBAClB,MAAM;gBACN,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC;gBACrB,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC;YACvB;QACF;IACF;IAEA,IAAI,eAAe,CAAC;QAClB,cAAc;QAEd,IAAI,OAAO,QAAQ,UAAU,KAAK,YAAY;YAC5C,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,QAAQ,UAAU,CAAC;gBACjB,MAAM;gBACN,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC;gBACrB,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC;YACvB;QACF;IACF;IAEA,IAAI,aAAa,CAAC;QAChB,EAAE,cAAc;QAChB,EAAE,eAAe;QAEjB,IAAI,oBAAoB,2CAAqB;QAC7C,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC,IAAI,sBAAsB,MAAM,iBAAiB,EAAE;YACnG,EAAE,YAAY,CAAC,UAAU,GAAG,MAAM,UAAU;YAC5C;QACF;QAEA,MAAM,CAAC,GAAG,EAAE,OAAO;QACnB,MAAM,CAAC,GAAG,EAAE,OAAO;QAEnB,IAAI,iBAAiB,MAAM,UAAU;QAErC,0FAA0F;QAC1F,IAAI,sBAAsB,MAAM,iBAAiB,EAAE;YACjD,IAAI,aAAa,+CAAyB;YAC1C,IAAI,gBAAgB,UAAU,CAAC,EAAE;YACjC,IAAI,OAAO,QAAQ,gBAAgB,KAAK,YAAY;gBAClD,IAAI,QAAQ,IAAI,CAAA,GAAA,yCAAQ,EAAE,EAAE,YAAY;gBACxC,gBAAgB,uCAAiB,mBAAmB,QAAQ,gBAAgB,CAAC,OAAO;YACtF;YACA,MAAM,UAAU,GAAG,CAAA,GAAA,yCAA4B,CAAC,CAAC,cAAc,IAAI;QACrE;QAEA,IAAI,OAAO,QAAQ,wBAAwB,KAAK,YAAY;YAC1D,IAAI,QAAQ,IAAI,CAAA,GAAA,yCAAQ,EAAE,EAAE,YAAY;YACxC,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,IAAI,gBAAgB,uCAClB,mBACA,QAAQ,wBAAwB,CAAC,OAAO,+CAAyB,oBAAoB,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;YAEzH,MAAM,UAAU,GAAG,CAAA,GAAA,yCAA4B,CAAC,CAAC,cAAc,IAAI;QACrE;QAEA,MAAM,iBAAiB,GAAG;QAC1B,EAAE,YAAY,CAAC,UAAU,GAAG,MAAM,UAAU;QAE5C,6EAA6E;QAC7E,IAAI,MAAM,UAAU,KAAK,UAAU,mBAAmB,QACpD,aAAa;aACR,IAAI,MAAM,UAAU,KAAK,UAAU,mBAAmB,QAC3D,cAAc;QAGhB,IAAI,OAAO,QAAQ,UAAU,KAAK,cAAc,MAAM,UAAU,KAAK,QAAQ;YAC3E,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,QAAQ,UAAU,CAAC;gBACjB,MAAM;gBACN,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;gBACnB,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;YACrB;QACF;QAEA,aAAa,MAAM,iBAAiB;QAEpC,IAAI,QAAQ,cAAc,IAAI,OAAO,QAAQ,cAAc,KAAK,cAAc,MAAM,UAAU,KAAK,QAAQ;YACzG,IAAI,wBAAwB,QAAQ,cAAc;YAClD,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,MAAM,iBAAiB,GAAG,WAAW;gBACnC,sBAAsB;oBACpB,MAAM;oBACN,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;oBACnB,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;gBACrB;YACF,GAAG;QACL;IACF;IAEA,IAAI,cAAc,CAAC;QACjB,EAAE,cAAc;QAChB,EAAE,eAAe;QACjB,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA,GAAA,qBAAa,EAAE;QAC1C,IAAI,MAAM,gBAAgB,CAAC,IAAI,GAAG,GAChC;QAGF,IAAI,wBAAwB,2CAAqB;QACjD,IAAI,oBAAoB,+CAAyB;QACjD,IAAI,gBAAgB,iBAAiB,CAAC,EAAE;QAExC,IAAI,OAAO,QAAQ,gBAAgB,KAAK,YAAY;YAClD,IAAI,QAAQ,IAAI,CAAA,GAAA,yCAAQ,EAAE,EAAE,YAAY;YACxC,gBAAgB,uCAAiB,uBAAuB,QAAQ,gBAAgB,CAAC,OAAO;QAC1F;QAEA,IAAI,OAAO,QAAQ,wBAAwB,KAAK,YAAY;YAC1D,IAAI,QAAQ,IAAI,CAAA,GAAA,yCAAQ,EAAE,EAAE,YAAY;YACxC,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,gBAAgB,uCACd,uBACA,QAAQ,wBAAwB,CAAC,OAAO,mBAAmB,EAAE,OAAO,GAAG,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,KAAK,CAAC;QAErG;QAEA,MAAM,CAAC,GAAG,EAAE,OAAO;QACnB,MAAM,CAAC,GAAG,EAAE,OAAO;QACnB,MAAM,iBAAiB,GAAG;QAC1B,MAAM,UAAU,GAAG,CAAA,GAAA,yCAA4B,CAAC,CAAC,cAAc,IAAI;QACnE,EAAE,YAAY,CAAC,UAAU,GAAG,MAAM,UAAU;QAE5C,IAAI,kBAAkB,UACpB,cAAc;IAElB;IAEA,IAAI,cAAc,CAAC;QACjB,EAAE,cAAc;QAChB,EAAE,eAAe;QAEjB,sFAAsF;QACtF,iFAAiF;QACjF,qFAAqF;QACrF,mFAAmF;QACnF,oFAAoF;QACpF,gFAAgF;QAChF,0EAA0E;QAE1E,MAAM,gBAAgB,CAAC,MAAM,CAAC,CAAA,GAAA,qBAAa,EAAE;QAC7C,KAAK,IAAI,WAAW,MAAM,gBAAgB,CACxC,IAAI,CAAC,CAAA,GAAA,mBAAW,EAAE,EAAE,aAAa,EAAE,UACjC,MAAM,gBAAgB,CAAC,MAAM,CAAC;QAIlC,IAAI,MAAM,gBAAgB,CAAC,IAAI,GAAG,GAChC;QAGF,IAAI,MAAM,UAAU,KAAK,QACvB,aAAa;QAGf,aAAa,MAAM,iBAAiB;IACtC;IAEA,IAAI,SAAS,CAAC;QACZ,EAAE,cAAc;QAChB,EAAE,eAAe;QACjB,sHAAsH;QACtH,8DAA8D;QAC9D,CAAA,GAAA,yCAAkB,EAAE,MAAM,UAAU;QAEpC,IAAI,OAAO,QAAQ,MAAM,KAAK,YAAY;YACxC,IAAI,gBAAgB,CAAA,GAAA,yCAA4B,CAAC,CAAC,MAAM,UAAU,CAAC;YACnE,IAAI,QAAQ,CAAA,GAAA,yCAAmB,EAAE,EAAE,YAAY;YAE/C,IAAI,OAAO,AAAC,EAAE,aAAa,CAAiB,qBAAqB;YACjE,IAAI,QAAmB;gBACrB,MAAM;gBACN,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC;gBACrB,GAAG,EAAE,OAAO,GAAG,KAAK,CAAC;uBACrB;+BACA;YACF;YAEA,QAAQ,MAAM,CAAC;QACjB;QAEA,IAAI,mBAAmB;YAAC,GAAG,CAAA,GAAA,yCAAa,CAAC;QAAA;QACzC,MAAM,gBAAgB,CAAC,KAAK;QAC5B,aAAa;QACb,aAAa,MAAM,iBAAiB;QACpC,iIAAiI;QACjI,2EAA2E;QAC3E,IAAI,iBAAiB,qBAAqB,IAAI,MAC5C,CAAA,GAAA,yCAAkB,EAAE;aAEpB,uFAAuF;QACvF,mLAAmL;QACnL,CAAA,GAAA,yCAAgB,EAAE;IAEtB;IAEA,IAAI,cAAc,CAAA,GAAA,qBAAa,EAAE,CAAC;QAChC,IAAI,OAAO,QAAQ,WAAW,KAAK,YACjC,QAAQ,WAAW,CAAC;IAExB;IAEA,IAAI,aAAa,CAAA,GAAA,qBAAa,EAAE,CAAC;QAC/B,IAAI,OAAO,QAAQ,UAAU,KAAK,YAChC,QAAQ,UAAU,CAAC;IAEvB;IAEA,IAAI,iBAAiB,CAAA,GAAA,qBAAa,EAAE,CAAC;QACnC,IAAI,OAAO,QAAQ,cAAc,KAAK,YACpC,QAAQ,cAAc,CAAC;IAE3B;IAEA,IAAI,iBAAiB,CAAA,GAAA,qBAAa,EAAE,CAAC;QACnC,IAAI,OAAO,QAAQ,MAAM,KAAK,YAC5B,QAAQ,MAAM,CAAC;IAEnB;IAEA,IAAI,2BAA2B,CAAA,GAAA,qBAAa,EAAE,CAAC,OAAmB;QAChE,IAAI,QAAQ,gBAAgB,EAC1B,OAAO,QAAQ,gBAAgB,CAAC,OAAO;QAGzC,OAAO,iBAAiB,CAAC,EAAE;IAC7B;IAEA,IAAI,OAAC,GAAG,EAAC,GAAG;IACZ,CAAA,GAAA,sBAAc,EAAE;QACd,IAAI,cAAc,CAAC,IAAI,OAAO,EAC5B;QAEF,OAAO,0CAA+B;YACpC,SAAS,IAAI,OAAO;YACpB,kBAAkB;YAClB,aAAY,CAAC;gBACX,cAAc;gBACd,YAAY;YACd;YACA,YAAW,CAAC;gBACV,cAAc;gBACd,WAAW;YACb;YACA,QAAQ;4BACR;QACF;IACF,GAAG;QAAC;QAAY;KAAI;IAEpB,IAAI,aAAC,SAAS,EAAC,GAAG,CAAA,GAAA,yCAAa;IAC/B,IAAI,YACF,OAAO;QACL,WAAW,CAAC;QACZ,iBAAiB;YAAC,YAAY;QAAI;QAClC,cAAc;IAChB;IAEF,OAAO;QACL,WAAW;YACT,GAAI,CAAC,iBAAiB,SAAS;yBAC/B;wBACA;yBACA;oBACA;QACF;QACA,iBAAiB;YAAC,GAAI,iBAAiB,SAAS;QAAC;sBACjD;IACF;AACF;AAEA,SAAS,2CAAqB,CAAY;IACxC,IAAI,oBAAoB,CAAA,GAAA,yCAAqB,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC;IAE5E,oGAAoG;IACpG,iFAAiF;IACjF,EAAE;IACF,mIAAmI;IACnI,EAAE;IACF,wGAAwG;IACxG,mHAAmH;IACnH,+EAA+E;IAC/E,IAAI,GAAA,2CACF,qBAAqB,CAAA,GAAA,yCAA0B;IAGjD,kGAAkG;IAClG,gGAAgG;IAChG,sGAAsG;IACtG,wHAAwH;IACxH,EAAE;IACF,uHAAuH;IACvH,oFAAoF;IACpF,IAAI,mBAAmB,CAAA,GAAA,yCAAa,EAAE,IAAI;IAC1C,IAAI,CAAA,GAAA,YAAI,KAAK;QACX,IAAI,EAAE,MAAM,EACV,oBAAoB,CAAA,GAAA,yCAAa,EAAE,IAAI;QAGzC,iGAAiG;QACjG,+GAA+G;QAC/G,iDAAiD;QACjD,IAAI,EAAE,OAAO,IAAI,CAAC,CAAA,GAAA,aAAK,KACrB,oBAAoB,CAAA,GAAA,yCAAa,EAAE,IAAI;QAGzC,IAAI,EAAE,OAAO,EACX,oBAAoB,CAAA,GAAA,yCAAa,EAAE,IAAI;IAE3C,OAAO;QACL,IAAI,EAAE,MAAM,EACV,oBAAoB,CAAA,GAAA,yCAAa,EAAE,IAAI;QAGzC,IAAI,EAAE,QAAQ,EACZ,oBAAoB,CAAA,GAAA,yCAAa,EAAE,IAAI;QAGzC,IAAI,EAAE,OAAO,EACX,oBAAoB,CAAA,GAAA,yCAAa,EAAE,IAAI;IAE3C;IAEA,IAAI,kBACF,OAAO,oBAAoB;IAG7B,OAAO;AACT;AAEA,SAAS,+CAAyB,qBAAqC;IACrE,IAAI,oBAA0C,EAAE;IAChD,IAAI,wBAAwB,CAAA,GAAA,yCAAa,EAAE,IAAI,EAC7C,kBAAkB,IAAI,CAAC;IAGzB,IAAI,wBAAwB,CAAA,GAAA,yCAAa,EAAE,IAAI,EAC7C,kBAAkB,IAAI,CAAC;IAGzB,IAAI,wBAAwB,CAAA,GAAA,yCAAa,EAAE,IAAI,EAC7C,kBAAkB,IAAI,CAAC;IAGzB,OAAO;AACT;AAEA,SAAS,uCAAiB,iBAAiC,EAAE,SAAwB;IACnF,IAAI,KAAK,CAAA,GAAA,yCAAa,CAAC,CAAC,UAAU;IAClC,OAAO,oBAAoB,KAAK,YAAY;AAC9C","sources":["packages/@react-aria/dnd/src/useDrop.ts"],"sourcesContent":["/*\n * Copyright 2020 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {AriaButtonProps} from '@react-types/button';\nimport {DOMAttributes, DropActivateEvent, DropEnterEvent, DropEvent, DropExitEvent, DropMoveEvent, DropOperation, FocusableElement, DragTypes as IDragTypes, RefObject} from '@react-types/shared';\nimport {DragEvent, useRef, useState} from 'react';\nimport * as DragManager from './DragManager';\nimport {DragTypes, globalAllowedDropOperations, globalDndState, readFromDataTransfer, setGlobalDnDState, setGlobalDropEffect} from './utils';\nimport {DROP_EFFECT_TO_DROP_OPERATION, DROP_OPERATION, DROP_OPERATION_ALLOWED, DROP_OPERATION_TO_DROP_EFFECT} from './constants';\nimport {getEventTarget, isIPad, isMac, nodeContains, useEffectEvent, useLayoutEffect} from '@react-aria/utils';\nimport {useVirtualDrop} from './useVirtualDrop';\n\nexport interface DropOptions {\n /** A ref for the droppable element. */\n ref: RefObject<FocusableElement | null>,\n /**\n * A function returning the drop operation to be performed when items matching the given types are dropped\n * on the drop target.\n */\n getDropOperation?: (types: IDragTypes, allowedOperations: DropOperation[]) => DropOperation,\n /** A function that returns the drop operation for a specific point within the target. */\n getDropOperationForPoint?: (types: IDragTypes, allowedOperations: DropOperation[], x: number, y: number) => DropOperation,\n /** Handler that is called when a valid drag enters the drop target. */\n onDropEnter?: (e: DropEnterEvent) => void,\n /** Handler that is called when a valid drag is moved within the drop target. */\n onDropMove?: (e: DropMoveEvent) => void,\n /**\n * Handler that is called after a valid drag is held over the drop target for a period of time.\n * This typically opens the item so that the user can drop within it.\n */\n onDropActivate?: (e: DropActivateEvent) => void,\n /** Handler that is called when a valid drag exits the drop target. */\n onDropExit?: (e: DropExitEvent) => void,\n /** Handler that is called when a valid drag is dropped on the drop target. */\n onDrop?: (e: DropEvent) => void,\n /**\n * Whether the item has an explicit focusable drop affordance to initiate accessible drag and drop mode.\n * If true, the dropProps will omit these event handlers, and they will be applied to dropButtonProps instead.\n */\n hasDropButton?: boolean,\n /**\n * Whether the drop target is disabled. If true, the drop target will not accept any drops.\n */\n isDisabled?: boolean\n}\n\nexport interface DropResult {\n /** Props for the droppable element. */\n dropProps: DOMAttributes,\n /** Whether the drop target is currently focused or hovered. */\n isDropTarget: boolean,\n /** Props for the explicit drop button affordance, if any. */\n dropButtonProps?: AriaButtonProps\n}\n\nconst DROP_ACTIVATE_TIMEOUT = 800;\n\n/**\n * Handles drop interactions for an element, with support for traditional mouse and touch\n * based drag and drop, in addition to full parity for keyboard and screen reader users.\n */\nexport function useDrop(options: DropOptions): DropResult {\n let {hasDropButton, isDisabled} = options;\n let [isDropTarget, setDropTarget] = useState(false);\n let state = useRef<{\n x: number,\n y: number,\n dragOverElements: Set<Element>,\n dropEffect: DataTransfer['dropEffect'],\n allowedOperations: DROP_OPERATION,\n dropActivateTimer: ReturnType<typeof setTimeout> | undefined\n }>({\n x: 0,\n y: 0,\n dragOverElements: new Set<Element>(),\n dropEffect: 'none',\n allowedOperations: DROP_OPERATION.all,\n dropActivateTimer: undefined\n }).current;\n\n let fireDropEnter = (e: DragEvent) => {\n setDropTarget(true);\n\n if (typeof options.onDropEnter === 'function') {\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n options.onDropEnter({\n type: 'dropenter',\n x: e.clientX - rect.x,\n y: e.clientY - rect.y\n });\n }\n };\n\n let fireDropExit = (e: DragEvent) => {\n setDropTarget(false);\n\n if (typeof options.onDropExit === 'function') {\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n options.onDropExit({\n type: 'dropexit',\n x: e.clientX - rect.x,\n y: e.clientY - rect.y\n });\n }\n };\n\n let onDragOver = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n\n let allowedOperations = getAllowedOperations(e);\n if (e.clientX === state.x && e.clientY === state.y && allowedOperations === state.allowedOperations) {\n e.dataTransfer.dropEffect = state.dropEffect;\n return;\n }\n\n state.x = e.clientX;\n state.y = e.clientY;\n\n let prevDropEffect = state.dropEffect;\n\n // Update drop effect if allowed drop operations changed (e.g. user pressed modifier key).\n if (allowedOperations !== state.allowedOperations) {\n let allowedOps = allowedOperationsToArray(allowedOperations);\n let dropOperation = allowedOps[0];\n if (typeof options.getDropOperation === 'function') {\n let types = new DragTypes(e.dataTransfer);\n dropOperation = getDropOperation(allowedOperations, options.getDropOperation(types, allowedOps));\n }\n state.dropEffect = DROP_OPERATION_TO_DROP_EFFECT[dropOperation] || 'none';\n }\n\n if (typeof options.getDropOperationForPoint === 'function') {\n let types = new DragTypes(e.dataTransfer);\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n let dropOperation = getDropOperation(\n allowedOperations,\n options.getDropOperationForPoint(types, allowedOperationsToArray(allowedOperations), state.x - rect.x, state.y - rect.y)\n );\n state.dropEffect = DROP_OPERATION_TO_DROP_EFFECT[dropOperation] || 'none';\n }\n\n state.allowedOperations = allowedOperations;\n e.dataTransfer.dropEffect = state.dropEffect;\n\n // If the drop operation changes, update state and fire events appropriately.\n if (state.dropEffect === 'none' && prevDropEffect !== 'none') {\n fireDropExit(e);\n } else if (state.dropEffect !== 'none' && prevDropEffect === 'none') {\n fireDropEnter(e);\n }\n\n if (typeof options.onDropMove === 'function' && state.dropEffect !== 'none') {\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n options.onDropMove({\n type: 'dropmove',\n x: state.x - rect.x,\n y: state.y - rect.y\n });\n }\n\n clearTimeout(state.dropActivateTimer);\n\n if (options.onDropActivate && typeof options.onDropActivate === 'function' && state.dropEffect !== 'none') {\n let onDropActivateOptions = options.onDropActivate;\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n state.dropActivateTimer = setTimeout(() => {\n onDropActivateOptions({\n type: 'dropactivate',\n x: state.x - rect.x,\n y: state.y - rect.y\n });\n }, DROP_ACTIVATE_TIMEOUT);\n }\n };\n\n let onDragEnter = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n state.dragOverElements.add(getEventTarget(e));\n if (state.dragOverElements.size > 1) {\n return;\n }\n\n let allowedOperationsBits = getAllowedOperations(e);\n let allowedOperations = allowedOperationsToArray(allowedOperationsBits);\n let dropOperation = allowedOperations[0];\n\n if (typeof options.getDropOperation === 'function') {\n let types = new DragTypes(e.dataTransfer);\n dropOperation = getDropOperation(allowedOperationsBits, options.getDropOperation(types, allowedOperations));\n }\n\n if (typeof options.getDropOperationForPoint === 'function') {\n let types = new DragTypes(e.dataTransfer);\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n dropOperation = getDropOperation(\n allowedOperationsBits,\n options.getDropOperationForPoint(types, allowedOperations, e.clientX - rect.x, e.clientY - rect.y)\n );\n }\n\n state.x = e.clientX;\n state.y = e.clientY;\n state.allowedOperations = allowedOperationsBits;\n state.dropEffect = DROP_OPERATION_TO_DROP_EFFECT[dropOperation] || 'none';\n e.dataTransfer.dropEffect = state.dropEffect;\n\n if (dropOperation !== 'cancel') {\n fireDropEnter(e);\n }\n };\n\n let onDragLeave = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n\n // We would use e.relatedTarget to detect if the drag is still inside the drop target,\n // but it is always null in WebKit. https://bugs.webkit.org/show_bug.cgi?id=66547\n // Instead, we track all of the targets of dragenter events in a set, and remove them\n // in dragleave. When the set becomes empty, we've left the drop target completely.\n // We must also remove any elements that are no longer in the DOM, because dragleave\n // events will never be fired for these. This can happen, for example, with drop\n // indicators between items, which disappear when the drop target changes.\n\n state.dragOverElements.delete(getEventTarget(e));\n for (let element of state.dragOverElements) {\n if (!nodeContains(e.currentTarget, element)) {\n state.dragOverElements.delete(element);\n }\n }\n\n if (state.dragOverElements.size > 0) {\n return;\n }\n\n if (state.dropEffect !== 'none') {\n fireDropExit(e);\n }\n\n clearTimeout(state.dropActivateTimer);\n };\n\n let onDrop = (e: DragEvent) => {\n e.preventDefault();\n e.stopPropagation();\n // Track drop effect in global state for Chrome Android. https://bugs.chromium.org/p/chromium/issues/detail?id=1353951\n // Android onDragEnd always returns \"none\" as its drop effect.\n setGlobalDropEffect(state.dropEffect);\n\n if (typeof options.onDrop === 'function') {\n let dropOperation = DROP_EFFECT_TO_DROP_OPERATION[state.dropEffect];\n let items = readFromDataTransfer(e.dataTransfer);\n\n let rect = (e.currentTarget as HTMLElement).getBoundingClientRect();\n let event: DropEvent = {\n type: 'drop',\n x: e.clientX - rect.x,\n y: e.clientY - rect.y,\n items,\n dropOperation\n };\n\n options.onDrop(event);\n }\n\n let dndStateSnapshot = {...globalDndState};\n state.dragOverElements.clear();\n fireDropExit(e);\n clearTimeout(state.dropActivateTimer);\n // If there wasn't a collection being tracked as a dragged collection, then we are in a case where a non RSP drag is dropped on a\n // RSP collection and thus we don't need to preserve the global drop effect\n if (dndStateSnapshot.draggingCollectionRef == null) {\n setGlobalDropEffect(undefined);\n } else {\n // Otherwise we need to preserve the global dnd state for onDragEnd's isInternal check.\n // At the moment fireDropExit may clear dropCollectionRef (i.e. useDroppableCollection's provided onDropExit, required to clear dropCollectionRef when exiting a valid drop target)\n setGlobalDnDState(dndStateSnapshot);\n }\n };\n\n let onDropEnter = useEffectEvent((e: DropEnterEvent) => {\n if (typeof options.onDropEnter === 'function') {\n options.onDropEnter(e);\n }\n });\n\n let onDropExit = useEffectEvent((e: DropExitEvent) => {\n if (typeof options.onDropExit === 'function') {\n options.onDropExit(e);\n }\n });\n\n let onDropActivate = useEffectEvent((e: DropActivateEvent) => {\n if (typeof options.onDropActivate === 'function') {\n options.onDropActivate(e);\n }\n });\n\n let onKeyboardDrop = useEffectEvent((e: DropEvent) => {\n if (typeof options.onDrop === 'function') {\n options.onDrop(e);\n }\n });\n\n let getDropOperationKeyboard = useEffectEvent((types: IDragTypes, allowedOperations: DropOperation[]) => {\n if (options.getDropOperation) {\n return options.getDropOperation(types, allowedOperations);\n }\n\n return allowedOperations[0];\n });\n\n let {ref} = options;\n useLayoutEffect(() => {\n if (isDisabled || !ref.current) {\n return;\n }\n return DragManager.registerDropTarget({\n element: ref.current,\n getDropOperation: getDropOperationKeyboard,\n onDropEnter(e) {\n setDropTarget(true);\n onDropEnter(e);\n },\n onDropExit(e) {\n setDropTarget(false);\n onDropExit(e);\n },\n onDrop: onKeyboardDrop,\n onDropActivate\n });\n }, [isDisabled, ref]);\n\n let {dropProps} = useVirtualDrop();\n if (isDisabled) {\n return {\n dropProps: {},\n dropButtonProps: {isDisabled: true},\n isDropTarget: false\n };\n }\n return {\n dropProps: {\n ...(!hasDropButton && dropProps),\n onDragEnter,\n onDragOver,\n onDragLeave,\n onDrop\n },\n dropButtonProps: {...(hasDropButton && dropProps)},\n isDropTarget\n };\n}\n\nfunction getAllowedOperations(e: DragEvent) {\n let allowedOperations = DROP_OPERATION_ALLOWED[e.dataTransfer.effectAllowed];\n\n // WebKit always sets effectAllowed to \"copyMove\" on macOS, and \"all\" on iOS, regardless of what was\n // set during the dragstart event: https://bugs.webkit.org/show_bug.cgi?id=178058\n //\n // Android Chrome also sets effectAllowed to \"copyMove\" in all cases: https://bugs.chromium.org/p/chromium/issues/detail?id=1359182\n //\n // If the drag started within the page, we can use a global variable to get the real allowed operations.\n // This needs to be intersected with the actual effectAllowed, which may have been filtered based on modifier keys.\n // Unfortunately, this means that link operations do not work at all in Safari.\n if (globalAllowedDropOperations) {\n allowedOperations &= globalAllowedDropOperations;\n }\n\n // Chrome and Safari on macOS will automatically filter effectAllowed when pressing modifier keys,\n // allowing the user to switch between move, link, and copy operations. Firefox on macOS and all\n // Windows browsers do not do this, so do it ourselves instead. The exact keys are platform dependent.\n // https://ux.stackexchange.com/questions/83748/what-are-the-most-common-modifier-keys-for-dragging-objects-with-a-mouse\n //\n // Note that none of these modifiers are ever set in WebKit due to a bug: https://bugs.webkit.org/show_bug.cgi?id=77465\n // However, Safari does update effectAllowed correctly, so we can just rely on that.\n let allowedModifiers = DROP_OPERATION.none;\n if (isMac()) {\n if (e.altKey) {\n allowedModifiers |= DROP_OPERATION.copy;\n }\n\n // Chrome and Safari both use the Control key for link, even though Finder uses Command + Option.\n // iPadOS doesn't support link operations and will not fire the drop event at all if dropEffect is set to link.\n // https://bugs.webkit.org/show_bug.cgi?id=244701\n if (e.ctrlKey && !isIPad()) {\n allowedModifiers |= DROP_OPERATION.link;\n }\n\n if (e.metaKey) {\n allowedModifiers |= DROP_OPERATION.move;\n }\n } else {\n if (e.altKey) {\n allowedModifiers |= DROP_OPERATION.link;\n }\n\n if (e.shiftKey) {\n allowedModifiers |= DROP_OPERATION.move;\n }\n\n if (e.ctrlKey) {\n allowedModifiers |= DROP_OPERATION.copy;\n }\n }\n\n if (allowedModifiers) {\n return allowedOperations & allowedModifiers;\n }\n\n return allowedOperations;\n}\n\nfunction allowedOperationsToArray(allowedOperationsBits: DROP_OPERATION) {\n let allowedOperations: Array<DropOperation> = [];\n if (allowedOperationsBits & DROP_OPERATION.move) {\n allowedOperations.push('move');\n }\n\n if (allowedOperationsBits & DROP_OPERATION.copy) {\n allowedOperations.push('copy');\n }\n\n if (allowedOperationsBits & DROP_OPERATION.link) {\n allowedOperations.push('link');\n }\n\n return allowedOperations;\n}\n\nfunction getDropOperation(allowedOperations: DROP_OPERATION, operation: DropOperation) {\n let op = DROP_OPERATION[operation];\n return allowedOperations & op ? operation : 'cancel';\n}\n"],"names":[],"version":3,"file":"useDrop.module.js.map"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-aria/dnd",
|
|
3
|
-
"version": "3.11.
|
|
3
|
+
"version": "3.11.6",
|
|
4
4
|
"description": "Spectrum UI components in React",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "dist/main.js",
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@internationalized/string": "^3.2.7",
|
|
30
|
-
"@react-aria/i18n": "^3.12.
|
|
31
|
-
"@react-aria/interactions": "^3.27.
|
|
30
|
+
"@react-aria/i18n": "^3.12.16",
|
|
31
|
+
"@react-aria/interactions": "^3.27.1",
|
|
32
32
|
"@react-aria/live-announcer": "^3.4.4",
|
|
33
|
-
"@react-aria/overlays": "^3.31.
|
|
34
|
-
"@react-aria/utils": "^3.33.
|
|
35
|
-
"@react-stately/collections": "^3.12.
|
|
36
|
-
"@react-stately/dnd": "^3.7.
|
|
37
|
-
"@react-types/button": "^3.15.
|
|
38
|
-
"@react-types/shared": "^3.33.
|
|
33
|
+
"@react-aria/overlays": "^3.31.2",
|
|
34
|
+
"@react-aria/utils": "^3.33.1",
|
|
35
|
+
"@react-stately/collections": "^3.12.10",
|
|
36
|
+
"@react-stately/dnd": "^3.7.4",
|
|
37
|
+
"@react-types/button": "^3.15.1",
|
|
38
|
+
"@react-types/shared": "^3.33.1",
|
|
39
39
|
"@swc/helpers": "^0.5.0"
|
|
40
40
|
},
|
|
41
41
|
"peerDependencies": {
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"publishConfig": {
|
|
46
46
|
"access": "public"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "8df187370053aa35f553cb388ad670f65e1ab371"
|
|
49
49
|
}
|
package/src/DragManager.ts
CHANGED
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
import {announce} from '@react-aria/live-announcer';
|
|
14
14
|
import {ariaHideOutside} from '@react-aria/overlays';
|
|
15
15
|
import {DragEndEvent, DragItem, DropActivateEvent, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropOperation, DropTarget as DroppableCollectionTarget, FocusableElement} from '@react-types/shared';
|
|
16
|
+
import {getActiveElement, getEventTarget, isVirtualClick, isVirtualPointerEvent, nodeContains} from '@react-aria/utils';
|
|
16
17
|
import {getDragModality, getTypes} from './utils';
|
|
17
|
-
import {isVirtualClick, isVirtualPointerEvent, nodeContains} from '@react-aria/utils';
|
|
18
18
|
import type {LocalizedStringFormatter} from '@internationalized/string';
|
|
19
19
|
import {RefObject, useEffect, useState} from 'react';
|
|
20
20
|
|
|
@@ -243,7 +243,7 @@ class DragSession {
|
|
|
243
243
|
this.cancelEvent(e);
|
|
244
244
|
|
|
245
245
|
if (e.key === 'Enter') {
|
|
246
|
-
if (e.altKey || nodeContains(this.getCurrentActivateButton(), e
|
|
246
|
+
if (e.altKey || nodeContains(this.getCurrentActivateButton(), getEventTarget(e) as Node)) {
|
|
247
247
|
this.activate(this.currentDropTarget, this.currentDropItem);
|
|
248
248
|
} else {
|
|
249
249
|
this.drop();
|
|
@@ -257,25 +257,26 @@ class DragSession {
|
|
|
257
257
|
|
|
258
258
|
onFocus(e: FocusEvent): void {
|
|
259
259
|
let activateButton = this.getCurrentActivateButton();
|
|
260
|
-
|
|
260
|
+
let eventTarget = getEventTarget(e);
|
|
261
|
+
if (eventTarget === activateButton) {
|
|
261
262
|
// TODO: canceling this breaks the focus ring. Revisit when we support tabbing.
|
|
262
263
|
this.cancelEvent(e);
|
|
263
264
|
return;
|
|
264
265
|
}
|
|
265
266
|
|
|
266
267
|
// Prevent focus events, except to the original drag target.
|
|
267
|
-
if (
|
|
268
|
+
if (eventTarget !== this.dragTarget.element) {
|
|
268
269
|
this.cancelEvent(e);
|
|
269
270
|
}
|
|
270
271
|
|
|
271
272
|
// Ignore focus events on the window/document (JSDOM). Will be handled in onBlur, below.
|
|
272
|
-
if (!(
|
|
273
|
+
if (!(eventTarget instanceof HTMLElement) || eventTarget === this.dragTarget.element) {
|
|
273
274
|
return;
|
|
274
275
|
}
|
|
275
276
|
|
|
276
277
|
let dropTarget =
|
|
277
|
-
this.validDropTargets.find(target => target.element ===
|
|
278
|
-
this.validDropTargets.find(target => nodeContains(target.element,
|
|
278
|
+
this.validDropTargets.find(target => target.element === eventTarget) ||
|
|
279
|
+
this.validDropTargets.find(target => nodeContains(target.element, eventTarget));
|
|
279
280
|
|
|
280
281
|
if (!dropTarget) {
|
|
281
282
|
// if (e.target === activateButton) {
|
|
@@ -289,7 +290,7 @@ class DragSession {
|
|
|
289
290
|
return;
|
|
290
291
|
}
|
|
291
292
|
|
|
292
|
-
let item = dropItems.get(
|
|
293
|
+
let item = dropItems.get(eventTarget);
|
|
293
294
|
if (dropTarget) {
|
|
294
295
|
this.setCurrentDropTarget(dropTarget, item);
|
|
295
296
|
}
|
|
@@ -302,7 +303,7 @@ class DragSession {
|
|
|
302
303
|
return;
|
|
303
304
|
}
|
|
304
305
|
|
|
305
|
-
if (e
|
|
306
|
+
if (getEventTarget(e) !== this.dragTarget.element) {
|
|
306
307
|
this.cancelEvent(e);
|
|
307
308
|
}
|
|
308
309
|
|
|
@@ -321,15 +322,16 @@ class DragSession {
|
|
|
321
322
|
this.cancelEvent(e);
|
|
322
323
|
if (isVirtualClick(e) || this.isVirtualClick) {
|
|
323
324
|
let dropElements = dropItems.values();
|
|
324
|
-
let
|
|
325
|
-
let
|
|
325
|
+
let eventTarget = getEventTarget(e) as HTMLElement;
|
|
326
|
+
let item = [...dropElements].find(item => item.element === eventTarget || nodeContains(item.activateButtonRef?.current, eventTarget));
|
|
327
|
+
let dropTarget = this.validDropTargets.find(target => nodeContains(target.element, eventTarget));
|
|
326
328
|
let activateButton = item?.activateButtonRef?.current ?? dropTarget?.activateButtonRef?.current;
|
|
327
|
-
if (nodeContains(activateButton,
|
|
329
|
+
if (nodeContains(activateButton, eventTarget) && dropTarget) {
|
|
328
330
|
this.activate(dropTarget, item);
|
|
329
331
|
return;
|
|
330
332
|
}
|
|
331
333
|
|
|
332
|
-
if (e
|
|
334
|
+
if (getEventTarget(e) === this.dragTarget.element) {
|
|
333
335
|
this.cancel();
|
|
334
336
|
return;
|
|
335
337
|
}
|
|
@@ -350,7 +352,8 @@ class DragSession {
|
|
|
350
352
|
|
|
351
353
|
cancelEvent(e: Event): void {
|
|
352
354
|
// Allow focusin and focusout on the drag target so focus ring works properly.
|
|
353
|
-
|
|
355
|
+
let eventTarget = getEventTarget(e);
|
|
356
|
+
if ((e.type === 'focusin' || e.type === 'focusout') && (eventTarget === this.dragTarget?.element || eventTarget === this.getCurrentActivateButton())) {
|
|
354
357
|
return;
|
|
355
358
|
}
|
|
356
359
|
|
|
@@ -570,7 +573,7 @@ class DragSession {
|
|
|
570
573
|
// Re-trigger focus event on active element, since it will not have received it during dragging (see cancelEvent).
|
|
571
574
|
// This corrects state such as whether focus ring should appear.
|
|
572
575
|
// useDroppableCollection handles this itself, so this is only for standalone drop zones.
|
|
573
|
-
|
|
576
|
+
getActiveElement()?.dispatchEvent(new FocusEvent('focusin', {bubbles: true}));
|
|
574
577
|
}
|
|
575
578
|
|
|
576
579
|
this.setCurrentDropTarget(null);
|
|
@@ -584,7 +587,7 @@ class DragSession {
|
|
|
584
587
|
}
|
|
585
588
|
|
|
586
589
|
// Re-trigger focus event on active element, since it will not have received it during dragging (see cancelEvent).
|
|
587
|
-
|
|
590
|
+
getActiveElement()?.dispatchEvent(new FocusEvent('focusin', {bubbles: true}));
|
|
588
591
|
|
|
589
592
|
announce(this.stringFormatter.format('dropCanceled'));
|
|
590
593
|
}
|
|
@@ -58,7 +58,7 @@ function nextDropTarget(
|
|
|
58
58
|
} else {
|
|
59
59
|
nextKey = keyboardDelegate.getKeyBelow?.(target.key);
|
|
60
60
|
}
|
|
61
|
-
let nextCollectionKey = collection.getKeyAfter(
|
|
61
|
+
let nextCollectionKey = getNextItem(collection, target.key, key => collection.getKeyAfter(key));
|
|
62
62
|
|
|
63
63
|
// If the keyboard delegate did not move to the next key in the collection,
|
|
64
64
|
// jump to that key with the same drop position. Otherwise, try the other
|
|
@@ -186,7 +186,7 @@ function previousDropTarget(
|
|
|
186
186
|
} else {
|
|
187
187
|
prevKey = keyboardDelegate.getKeyAbove?.(target.key);
|
|
188
188
|
}
|
|
189
|
-
let prevCollectionKey = collection.getKeyBefore(
|
|
189
|
+
let prevCollectionKey = getNextItem(collection, target.key, key => collection.getKeyBefore(key));
|
|
190
190
|
|
|
191
191
|
// If the keyboard delegate did not move to the next key in the collection,
|
|
192
192
|
// jump to that key with the same drop position. Otherwise, try the other
|
|
@@ -258,7 +258,7 @@ function getLastChild(collection: Collection<Node<unknown>>, key: Key): DropTarg
|
|
|
258
258
|
// getChildNodes still returns child tree items even when the item is collapsed.
|
|
259
259
|
// Checking if the next item has a greater level is a silly way to determine if the item is expanded.
|
|
260
260
|
let targetNode = collection.getItem(key);
|
|
261
|
-
let nextKey = collection.getKeyAfter(key);
|
|
261
|
+
let nextKey = getNextItem(collection, key, key => collection.getKeyAfter(key));
|
|
262
262
|
let nextNode = nextKey != null ? collection.getItem(nextKey) : null;
|
|
263
263
|
if (targetNode && nextNode && nextNode.level > targetNode.level) {
|
|
264
264
|
let children = getChildNodes(targetNode, collection);
|
|
@@ -280,3 +280,14 @@ function getLastChild(collection: Collection<Node<unknown>>, key: Key): DropTarg
|
|
|
280
280
|
|
|
281
281
|
return null;
|
|
282
282
|
}
|
|
283
|
+
|
|
284
|
+
// Find the next or previous item in a collection, skipping over other types of nodes (e.g. content).
|
|
285
|
+
function getNextItem(collection: Collection<Node<unknown>>, key: Key, getNextKey: (key: Key) => Key | null): Key | null {
|
|
286
|
+
let nextCollectionKey = getNextKey(key);
|
|
287
|
+
let nextCollectionNode = nextCollectionKey != null ? collection.getItem(nextCollectionKey) : null;
|
|
288
|
+
while (nextCollectionNode && nextCollectionNode.type !== 'item') {
|
|
289
|
+
nextCollectionKey = getNextKey(nextCollectionNode.key);
|
|
290
|
+
nextCollectionNode = nextCollectionKey != null ? collection.getItem(nextCollectionKey) : null;
|
|
291
|
+
}
|
|
292
|
+
return nextCollectionKey;
|
|
293
|
+
}
|
package/src/useDrag.ts
CHANGED
|
@@ -15,10 +15,10 @@ import {DragEndEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEve
|
|
|
15
15
|
import {DragEvent, HTMLAttributes, version as ReactVersion, useEffect, useRef, useState} from 'react';
|
|
16
16
|
import * as DragManager from './DragManager';
|
|
17
17
|
import {DROP_EFFECT_TO_DROP_OPERATION, DROP_OPERATION, EFFECT_ALLOWED} from './constants';
|
|
18
|
+
import {getEventTarget, isVirtualClick, isVirtualPointerEvent, useDescription, useGlobalListeners} from '@react-aria/utils';
|
|
18
19
|
import {globalDropEffect, setGlobalAllowedDropOperations, setGlobalDropEffect, useDragModality, writeToDataTransfer} from './utils';
|
|
19
20
|
// @ts-ignore
|
|
20
21
|
import intlMessages from '../intl/*.json';
|
|
21
|
-
import {isVirtualClick, isVirtualPointerEvent, useDescription, useGlobalListeners} from '@react-aria/utils';
|
|
22
22
|
import {useLocalizedStringFormatter} from '@react-aria/i18n';
|
|
23
23
|
|
|
24
24
|
export interface DragOptions {
|
|
@@ -102,7 +102,7 @@ export function useDrag(options: DragOptions): DragResult {
|
|
|
102
102
|
// If this drag was initiated by a mobile screen reader (e.g. VoiceOver or TalkBack), enter virtual dragging mode.
|
|
103
103
|
if (modalityOnPointerDown.current === 'virtual') {
|
|
104
104
|
e.preventDefault();
|
|
105
|
-
startDragging(e
|
|
105
|
+
startDragging(getEventTarget(e) as HTMLElement);
|
|
106
106
|
modalityOnPointerDown.current = null;
|
|
107
107
|
return;
|
|
108
108
|
}
|
|
@@ -188,9 +188,9 @@ export function useDrag(options: DragOptions): DragResult {
|
|
|
188
188
|
|
|
189
189
|
// Wait a frame before we set dragging to true so that the browser has time to
|
|
190
190
|
// render the preview image before we update the element that has been dragged.
|
|
191
|
-
let target = e
|
|
191
|
+
let target = getEventTarget(e);
|
|
192
192
|
requestAnimationFrame(() => {
|
|
193
|
-
setDragging(target
|
|
193
|
+
setDragging(target);
|
|
194
194
|
});
|
|
195
195
|
};
|
|
196
196
|
|
|
@@ -340,16 +340,16 @@ export function useDrag(options: DragOptions): DragResult {
|
|
|
340
340
|
}
|
|
341
341
|
},
|
|
342
342
|
onKeyDownCapture(e) {
|
|
343
|
-
if (e
|
|
343
|
+
if (getEventTarget(e) === e.currentTarget && e.key === 'Enter') {
|
|
344
344
|
e.preventDefault();
|
|
345
345
|
e.stopPropagation();
|
|
346
346
|
}
|
|
347
347
|
},
|
|
348
348
|
onKeyUpCapture(e) {
|
|
349
|
-
if (e
|
|
349
|
+
if (getEventTarget(e) === e.currentTarget && e.key === 'Enter') {
|
|
350
350
|
e.preventDefault();
|
|
351
351
|
e.stopPropagation();
|
|
352
|
-
startDragging(e
|
|
352
|
+
startDragging(getEventTarget(e));
|
|
353
353
|
}
|
|
354
354
|
},
|
|
355
355
|
onClick(e) {
|
|
@@ -357,7 +357,7 @@ export function useDrag(options: DragOptions): DragResult {
|
|
|
357
357
|
if (isVirtualClick(e.nativeEvent) || modalityOnPointerDown.current === 'virtual') {
|
|
358
358
|
e.preventDefault();
|
|
359
359
|
e.stopPropagation();
|
|
360
|
-
startDragging(e
|
|
360
|
+
startDragging(getEventTarget(e));
|
|
361
361
|
}
|
|
362
362
|
}
|
|
363
363
|
};
|
package/src/useDrop.ts
CHANGED
|
@@ -16,7 +16,7 @@ import {DragEvent, useRef, useState} from 'react';
|
|
|
16
16
|
import * as DragManager from './DragManager';
|
|
17
17
|
import {DragTypes, globalAllowedDropOperations, globalDndState, readFromDataTransfer, setGlobalDnDState, setGlobalDropEffect} from './utils';
|
|
18
18
|
import {DROP_EFFECT_TO_DROP_OPERATION, DROP_OPERATION, DROP_OPERATION_ALLOWED, DROP_OPERATION_TO_DROP_EFFECT} from './constants';
|
|
19
|
-
import {isIPad, isMac, nodeContains, useEffectEvent, useLayoutEffect} from '@react-aria/utils';
|
|
19
|
+
import {getEventTarget, isIPad, isMac, nodeContains, useEffectEvent, useLayoutEffect} from '@react-aria/utils';
|
|
20
20
|
import {useVirtualDrop} from './useVirtualDrop';
|
|
21
21
|
|
|
22
22
|
export interface DropOptions {
|
|
@@ -186,7 +186,7 @@ export function useDrop(options: DropOptions): DropResult {
|
|
|
186
186
|
let onDragEnter = (e: DragEvent) => {
|
|
187
187
|
e.preventDefault();
|
|
188
188
|
e.stopPropagation();
|
|
189
|
-
state.dragOverElements.add(e
|
|
189
|
+
state.dragOverElements.add(getEventTarget(e));
|
|
190
190
|
if (state.dragOverElements.size > 1) {
|
|
191
191
|
return;
|
|
192
192
|
}
|
|
@@ -232,7 +232,7 @@ export function useDrop(options: DropOptions): DropResult {
|
|
|
232
232
|
// events will never be fired for these. This can happen, for example, with drop
|
|
233
233
|
// indicators between items, which disappear when the drop target changes.
|
|
234
234
|
|
|
235
|
-
state.dragOverElements.delete(e
|
|
235
|
+
state.dragOverElements.delete(getEventTarget(e));
|
|
236
236
|
for (let element of state.dragOverElements) {
|
|
237
237
|
if (!nodeContains(e.currentTarget, element)) {
|
|
238
238
|
state.dragOverElements.delete(element);
|