Skip to content

Commit

Permalink
fix: exports all from multi drag plugin, adjusts multi drag function …
Browse files Browse the repository at this point in the history
…names to avoid conflicts
  • Loading branch information
sashamilenkovic committed Jul 1, 2024
1 parent 274b903 commit 891dfae
Show file tree
Hide file tree
Showing 11 changed files with 127 additions and 36 deletions.
38 changes: 29 additions & 9 deletions dist/index.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ __export(src_exports, {
dragAndDrop: () => dragAndDrop,
dragStateProps: () => dragStateProps,
dragValues: () => dragValues,
dragstart: () => dragstart2,
dragstart: () => dragstart,
dragstartClasses: () => dragstartClasses,
end: () => end,
eventCoordinates: () => eventCoordinates,
Expand All @@ -39,6 +39,7 @@ __export(src_exports, {
handleDragstart: () => handleDragstart,
handleEnd: () => handleEnd,
handleLongTouch: () => handleLongTouch,
handleSelections: () => handleSelections,
handleTouchOverNode: () => handleTouchOverNode3,
handleTouchOverParent: () => handleTouchOverParent3,
handleTouchedNode: () => handleTouchedNode,
Expand All @@ -49,6 +50,13 @@ __export(src_exports, {
isBrowser: () => isBrowser,
isNode: () => isNode,
multiDrag: () => multiDrag,
multiDragState: () => multiDragState,
multiDragstart: () => multiDragstart,
multiHandleDragstart: () => multiHandleDragstart,
multiHandleEnd: () => multiHandleEnd,
multiHandleTouchstart: () => multiHandleTouchstart,
multiReapplyDragClasses: () => multiReapplyDragClasses,
multiTouchstart: () => multiTouchstart,
nodeEventData: () => nodeEventData,
nodes: () => nodes,
parentEventData: () => parentEventData,
Expand All @@ -62,12 +70,14 @@ __export(src_exports, {
removeClass: () => removeClass,
resetState: () => resetState,
selections: () => selections,
selectionsEnd: () => selectionsEnd,
setDragState: () => setDragState,
setParentValues: () => setParentValues,
setTouchState: () => setTouchState,
setupNode: () => setupNode,
setupNodeRemap: () => setupNodeRemap,
sort: () => sort,
stackNodes: () => stackNodes,
state: () => state,
swap: () => swap,
tearDown: () => tearDown,
Expand Down Expand Up @@ -350,12 +360,12 @@ function selectionsEnd(data, state2) {
function multiHandleDragstart(data) {
if (!(data.e instanceof DragEvent))
return;
dragstart({
multiDragstart({
e: data.e,
targetData: data.targetData
});
}
function dragstart(data) {
function multiDragstart(data) {
const dragState = initDrag(data);
multiDragState.isTouch = false;
const multiDragConfig = data.targetData.parent.data.config.multiDragConfig;
Expand Down Expand Up @@ -393,12 +403,12 @@ function dragstart(data) {
function multiHandleTouchstart(data) {
if (!(data.e instanceof TouchEvent))
return;
touchstart({
multiTouchstart({
e: data.e,
targetData: data.targetData
});
}
function touchstart(data) {
function multiTouchstart(data) {
const touchState = initTouch(data);
multiDragState.isTouch = true;
multiDragState.activeNode = data.targetData.node;
Expand Down Expand Up @@ -1414,7 +1424,7 @@ function remapFinished() {
function handleDragstart(data) {
if (!(data.e instanceof DragEvent))
return;
dragstart2({
dragstart({
e: data.e,
targetData: data.targetData
});
Expand Down Expand Up @@ -1464,14 +1474,14 @@ function validateDragHandle(data) {
}
return false;
}
function touchstart2(data) {
function touchstart(data) {
if (!validateDragHandle(data))
return;
const touchState = initTouch(data);
handleTouchedNode(data, touchState);
handleLongTouch(data, touchState);
}
function dragstart2(data) {
function dragstart(data) {
if (!validateDragHandle(data)) {
data.e.preventDefault();
return;
Expand Down Expand Up @@ -1578,7 +1588,7 @@ function end(_eventData, state2) {
function handleTouchstart(eventData) {
if (!(eventData.e instanceof TouchEvent))
return;
touchstart2({
touchstart({
e: eventData.e,
targetData: eventData.targetData
});
Expand Down Expand Up @@ -2020,6 +2030,7 @@ function parentEventData(callback) {
handleDragstart,
handleEnd,
handleLongTouch,
handleSelections,
handleTouchOverNode,
handleTouchOverParent,
handleTouchedNode,
Expand All @@ -2030,6 +2041,13 @@ function parentEventData(callback) {
isBrowser,
isNode,
multiDrag,
multiDragState,
multiDragstart,
multiHandleDragstart,
multiHandleEnd,
multiHandleTouchstart,
multiReapplyDragClasses,
multiTouchstart,
nodeEventData,
nodes,
parentEventData,
Expand All @@ -2043,12 +2061,14 @@ function parentEventData(callback) {
removeClass,
resetState,
selections,
selectionsEnd,
setDragState,
setParentValues,
setTouchState,
setupNode,
setupNodeRemap,
sort,
stackNodes,
state,
swap,
tearDown,
Expand Down
2 changes: 1 addition & 1 deletion dist/index.cjs.map

Large diffs are not rendered by default.

27 changes: 26 additions & 1 deletion dist/index.d.cts
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,39 @@ interface MultiDragConfig<T> {
*/
plugins?: Array<DNDPlugin>;
}
interface MultiDragState<T> {
selectedNodes: Array<NodeRecord<T>>;
activeNode: NodeRecord<T> | undefined;
isTouch: boolean;
}

declare const multiDragState: MultiDragState<any>;
declare function multiDrag<T>(multiDragConfig?: Partial<MultiDragConfig<T>>): (parent: HTMLElement) => {
setup(): void;
tearDownNodeRemap<T>(data: TearDownNodeData<T>): void;
tearDownNode<T_1>(data: TearDownNodeData<T_1>): void;
setupNodeRemap<T_2>(data: SetupNodeData<T_2>): void;
setupNode<T_3>(data: SetupNodeData<T_3>): void;
} | undefined;
declare function multiReapplyDragClasses<T>(node: Node, parentData: ParentData<T>): void;
declare function multiHandleEnd<T>(data: NodeEventData<T>): void;
declare function selectionsEnd<T>(data: NodeEventData<T>, state: DragState<T> | TouchState<T>): void;
declare function multiHandleDragstart<T>(data: NodeEventData<T>): void;
declare function multiDragstart<T>(data: NodeDragEventData<T>): void;
declare function multiHandleTouchstart<T>(data: NodeEventData<T>): void;
declare function multiTouchstart<T>(data: NodeTouchEventData<T>): void;
declare function handleSelections<T>(data: NodeEventData<T>, selectedValues: Array<T>, state: DragState<T> | TouchState<T>, x: number, y: number): {
data: NodeEventData<T>;
state: DragState<T> | TouchState<T>;
x: number;
y: number;
};
declare function stackNodes<T>({ data, state, x, y, }: {
data: NodeEventData<T>;
state: DragState<T> | TouchState<T>;
x: number;
y: number;
}): void;

interface AnimationsConfig {
duration?: number;
Expand Down Expand Up @@ -854,4 +879,4 @@ declare function performTransfer<T>(state: DragState<T> | TouchState<T>, data: N
declare function transfer<T>(data: NodeEventData<T> | ParentEventData<T>, state: DragState<T> | TouchState<T>): void;
declare function parentEventData<T>(callback: any): (e: Event) => NodeEventData<T> | undefined;

export { type DNDPlugin, type DNDPluginData, type DragAndDrop, type DragAndDropData, type DragState, type DragStateProps, type EventHandlers, type Node, type NodeData, type NodeDragEventData, type NodeEvent, type NodeEventData, type NodeFromPoint, type NodeRecord, type NodeTargetData, type NodeTouchEventData, type NodesData, type ParentConfig, type ParentData, type ParentDragEventData, type ParentEventData, type ParentFromPoint, type ParentObservers, type ParentRecord, type ParentTargetData, type ParentsData, type PluginData, type ScrollData, type SetupNode, type SetupNodeData, type TearDownNode, type TearDownNodeData, type TouchOverNodeEvent, type TouchOverParentEvent, type TouchState, type TouchStateProps, addClass, addEvents, animations, copyNodeStyle, dragAndDrop, dragStateProps, dragValues, dragstart, dragstartClasses, end, eventCoordinates, events, getElFromPoint, getScrollParent, handleDragoverNode, handleDragoverParent, handleDragstart, handleEnd, handleLongTouch, handleTouchOverNode, handleTouchOverParent, handleTouchedNode, handleTouchmove, handleTouchstart, initDrag, initTouch, isBrowser, isNode, multiDrag, nodeEventData, nodes, parentEventData, parentValues, parents, performSort, performTransfer, place, remapFinished, remapNodes, removeClass, resetState, selections, setDragState, setParentValues, setTouchState, setupNode, setupNodeRemap, sort, state, swap, tearDown, tearDownNode, tearDownNodeRemap, throttle, transfer, updateConfig, validateSort, validateTransfer };
export { type DNDPlugin, type DNDPluginData, type DragAndDrop, type DragAndDropData, type DragState, type DragStateProps, type EventHandlers, type Node, type NodeData, type NodeDragEventData, type NodeEvent, type NodeEventData, type NodeFromPoint, type NodeRecord, type NodeTargetData, type NodeTouchEventData, type NodesData, type ParentConfig, type ParentData, type ParentDragEventData, type ParentEventData, type ParentFromPoint, type ParentObservers, type ParentRecord, type ParentTargetData, type ParentsData, type PluginData, type ScrollData, type SetupNode, type SetupNodeData, type TearDownNode, type TearDownNodeData, type TouchOverNodeEvent, type TouchOverParentEvent, type TouchState, type TouchStateProps, addClass, addEvents, animations, copyNodeStyle, dragAndDrop, dragStateProps, dragValues, dragstart, dragstartClasses, end, eventCoordinates, events, getElFromPoint, getScrollParent, handleDragoverNode, handleDragoverParent, handleDragstart, handleEnd, handleLongTouch, handleSelections, handleTouchOverNode, handleTouchOverParent, handleTouchedNode, handleTouchmove, handleTouchstart, initDrag, initTouch, isBrowser, isNode, multiDrag, multiDragState, multiDragstart, multiHandleDragstart, multiHandleEnd, multiHandleTouchstart, multiReapplyDragClasses, multiTouchstart, nodeEventData, nodes, parentEventData, parentValues, parents, performSort, performTransfer, place, remapFinished, remapNodes, removeClass, resetState, selections, selectionsEnd, setDragState, setParentValues, setTouchState, setupNode, setupNodeRemap, sort, stackNodes, state, swap, tearDown, tearDownNode, tearDownNodeRemap, throttle, transfer, updateConfig, validateSort, validateTransfer };
27 changes: 26 additions & 1 deletion dist/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,39 @@ interface MultiDragConfig<T> {
*/
plugins?: Array<DNDPlugin>;
}
interface MultiDragState<T> {
selectedNodes: Array<NodeRecord<T>>;
activeNode: NodeRecord<T> | undefined;
isTouch: boolean;
}

declare const multiDragState: MultiDragState<any>;
declare function multiDrag<T>(multiDragConfig?: Partial<MultiDragConfig<T>>): (parent: HTMLElement) => {
setup(): void;
tearDownNodeRemap<T>(data: TearDownNodeData<T>): void;
tearDownNode<T_1>(data: TearDownNodeData<T_1>): void;
setupNodeRemap<T_2>(data: SetupNodeData<T_2>): void;
setupNode<T_3>(data: SetupNodeData<T_3>): void;
} | undefined;
declare function multiReapplyDragClasses<T>(node: Node, parentData: ParentData<T>): void;
declare function multiHandleEnd<T>(data: NodeEventData<T>): void;
declare function selectionsEnd<T>(data: NodeEventData<T>, state: DragState<T> | TouchState<T>): void;
declare function multiHandleDragstart<T>(data: NodeEventData<T>): void;
declare function multiDragstart<T>(data: NodeDragEventData<T>): void;
declare function multiHandleTouchstart<T>(data: NodeEventData<T>): void;
declare function multiTouchstart<T>(data: NodeTouchEventData<T>): void;
declare function handleSelections<T>(data: NodeEventData<T>, selectedValues: Array<T>, state: DragState<T> | TouchState<T>, x: number, y: number): {
data: NodeEventData<T>;
state: DragState<T> | TouchState<T>;
x: number;
y: number;
};
declare function stackNodes<T>({ data, state, x, y, }: {
data: NodeEventData<T>;
state: DragState<T> | TouchState<T>;
x: number;
y: number;
}): void;

interface AnimationsConfig {
duration?: number;
Expand Down Expand Up @@ -854,4 +879,4 @@ declare function performTransfer<T>(state: DragState<T> | TouchState<T>, data: N
declare function transfer<T>(data: NodeEventData<T> | ParentEventData<T>, state: DragState<T> | TouchState<T>): void;
declare function parentEventData<T>(callback: any): (e: Event) => NodeEventData<T> | undefined;

export { type DNDPlugin, type DNDPluginData, type DragAndDrop, type DragAndDropData, type DragState, type DragStateProps, type EventHandlers, type Node, type NodeData, type NodeDragEventData, type NodeEvent, type NodeEventData, type NodeFromPoint, type NodeRecord, type NodeTargetData, type NodeTouchEventData, type NodesData, type ParentConfig, type ParentData, type ParentDragEventData, type ParentEventData, type ParentFromPoint, type ParentObservers, type ParentRecord, type ParentTargetData, type ParentsData, type PluginData, type ScrollData, type SetupNode, type SetupNodeData, type TearDownNode, type TearDownNodeData, type TouchOverNodeEvent, type TouchOverParentEvent, type TouchState, type TouchStateProps, addClass, addEvents, animations, copyNodeStyle, dragAndDrop, dragStateProps, dragValues, dragstart, dragstartClasses, end, eventCoordinates, events, getElFromPoint, getScrollParent, handleDragoverNode, handleDragoverParent, handleDragstart, handleEnd, handleLongTouch, handleTouchOverNode, handleTouchOverParent, handleTouchedNode, handleTouchmove, handleTouchstart, initDrag, initTouch, isBrowser, isNode, multiDrag, nodeEventData, nodes, parentEventData, parentValues, parents, performSort, performTransfer, place, remapFinished, remapNodes, removeClass, resetState, selections, setDragState, setParentValues, setTouchState, setupNode, setupNodeRemap, sort, state, swap, tearDown, tearDownNode, tearDownNodeRemap, throttle, transfer, updateConfig, validateSort, validateTransfer };
export { type DNDPlugin, type DNDPluginData, type DragAndDrop, type DragAndDropData, type DragState, type DragStateProps, type EventHandlers, type Node, type NodeData, type NodeDragEventData, type NodeEvent, type NodeEventData, type NodeFromPoint, type NodeRecord, type NodeTargetData, type NodeTouchEventData, type NodesData, type ParentConfig, type ParentData, type ParentDragEventData, type ParentEventData, type ParentFromPoint, type ParentObservers, type ParentRecord, type ParentTargetData, type ParentsData, type PluginData, type ScrollData, type SetupNode, type SetupNodeData, type TearDownNode, type TearDownNodeData, type TouchOverNodeEvent, type TouchOverParentEvent, type TouchState, type TouchStateProps, addClass, addEvents, animations, copyNodeStyle, dragAndDrop, dragStateProps, dragValues, dragstart, dragstartClasses, end, eventCoordinates, events, getElFromPoint, getScrollParent, handleDragoverNode, handleDragoverParent, handleDragstart, handleEnd, handleLongTouch, handleSelections, handleTouchOverNode, handleTouchOverParent, handleTouchedNode, handleTouchmove, handleTouchstart, initDrag, initTouch, isBrowser, isNode, multiDrag, multiDragState, multiDragstart, multiHandleDragstart, multiHandleEnd, multiHandleTouchstart, multiReapplyDragClasses, multiTouchstart, nodeEventData, nodes, parentEventData, parentValues, parents, performSort, performTransfer, place, remapFinished, remapNodes, removeClass, resetState, selections, selectionsEnd, setDragState, setParentValues, setTouchState, setupNode, setupNodeRemap, sort, stackNodes, state, swap, tearDown, tearDownNode, tearDownNodeRemap, throttle, transfer, updateConfig, validateSort, validateTransfer };
28 changes: 19 additions & 9 deletions dist/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,12 @@ function selectionsEnd(data, state2) {
function multiHandleDragstart(data) {
if (!(data.e instanceof DragEvent))
return;
dragstart({
multiDragstart({
e: data.e,
targetData: data.targetData
});
}
function dragstart(data) {
function multiDragstart(data) {
const dragState = initDrag(data);
multiDragState.isTouch = false;
const multiDragConfig = data.targetData.parent.data.config.multiDragConfig;
Expand Down Expand Up @@ -310,12 +310,12 @@ function dragstart(data) {
function multiHandleTouchstart(data) {
if (!(data.e instanceof TouchEvent))
return;
touchstart({
multiTouchstart({
e: data.e,
targetData: data.targetData
});
}
function touchstart(data) {
function multiTouchstart(data) {
const touchState = initTouch(data);
multiDragState.isTouch = true;
multiDragState.activeNode = data.targetData.node;
Expand Down Expand Up @@ -1331,7 +1331,7 @@ function remapFinished() {
function handleDragstart(data) {
if (!(data.e instanceof DragEvent))
return;
dragstart2({
dragstart({
e: data.e,
targetData: data.targetData
});
Expand Down Expand Up @@ -1381,14 +1381,14 @@ function validateDragHandle(data) {
}
return false;
}
function touchstart2(data) {
function touchstart(data) {
if (!validateDragHandle(data))
return;
const touchState = initTouch(data);
handleTouchedNode(data, touchState);
handleLongTouch(data, touchState);
}
function dragstart2(data) {
function dragstart(data) {
if (!validateDragHandle(data)) {
data.e.preventDefault();
return;
Expand Down Expand Up @@ -1495,7 +1495,7 @@ function end(_eventData, state2) {
function handleTouchstart(eventData) {
if (!(eventData.e instanceof TouchEvent))
return;
touchstart2({
touchstart({
e: eventData.e,
targetData: eventData.targetData
});
Expand Down Expand Up @@ -1924,7 +1924,7 @@ export {
dragAndDrop,
dragStateProps,
dragValues,
dragstart2 as dragstart,
dragstart,
dragstartClasses,
end,
eventCoordinates,
Expand All @@ -1936,6 +1936,7 @@ export {
handleDragstart,
handleEnd,
handleLongTouch,
handleSelections,
handleTouchOverNode3 as handleTouchOverNode,
handleTouchOverParent3 as handleTouchOverParent,
handleTouchedNode,
Expand All @@ -1946,6 +1947,13 @@ export {
isBrowser,
isNode,
multiDrag,
multiDragState,
multiDragstart,
multiHandleDragstart,
multiHandleEnd,
multiHandleTouchstart,
multiReapplyDragClasses,
multiTouchstart,
nodeEventData,
nodes,
parentEventData,
Expand All @@ -1959,12 +1967,14 @@ export {
removeClass,
resetState,
selections,
selectionsEnd,
setDragState,
setParentValues,
setTouchState,
setupNode,
setupNodeRemap,
sort,
stackNodes,
state,
swap,
tearDown,
Expand Down
2 changes: 1 addition & 1 deletion dist/index.mjs.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
} from "./utils";
export { isBrowser };
export * from "./types";
export { multiDrag } from "./plugins/multiDrag";
export * from "./plugins/multiDrag";
export { animations } from "./plugins/animations";
export { selections } from "./plugins/multiDrag/plugins/selections";
export { swap } from "./plugins/swap";
Expand Down
Loading

0 comments on commit 891dfae

Please sign in to comment.