Fix generics for manager passed to Entity

clauderic · Sep 12, 2024 · e70b29a · e70b29a
1 parent bfc8ab2
commit e70b29a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.changeset/fix-generics.md b/.changeset/fix-generics.md
@@ -0,0 +1,6 @@
+---
+'@dnd-kit/abstract': patch
+'@dnd-kit/dom': patch
+---
+
+Make sure the generic for `DragDropManager` is passed through to `Entity` so that the `manager` reference on classes extending `Entity` is strongly typed.
diff --git a/packages/abstract/src/core/entities/draggable/draggable.ts b/packages/abstract/src/core/entities/draggable/draggable.ts
@@ -17,7 +17,7 @@ export type DraggableStatus = 'idle' | 'dragging' | 'dropping';
 export class Draggable<
   T extends Data = Data,
   U extends DragDropManager<any, any> = DragDropManager<any, any>,
-> extends Entity<T> {
+> extends Entity<T, U> {
   constructor(
     {modifiers, type, sensors, ...input}: Input<T>,
     manager: U | undefined

diff --git a/packages/abstract/src/core/entities/droppable/droppable.ts b/packages/abstract/src/core/entities/droppable/droppable.ts
@@ -20,7 +20,7 @@ export interface Input<T extends Data = Data> extends EntityInput<T> {
 export class Droppable<
   T extends Data = Data,
   U extends DragDropManager<any, any> = DragDropManager<any, any>,
-> extends Entity<T> {
+> extends Entity<T, U> {
   constructor(
     {accept, collisionDetector, collisionPriority, type, ...input}: Input<T>,
     manager: U | undefined

diff --git a/packages/dom/src/core/entities/draggable/draggable.ts b/packages/dom/src/core/entities/draggable/draggable.ts
@@ -19,7 +19,10 @@ export interface Input<T extends Data = Data> extends DraggableInput<T> {
   modifiers?: Modifiers<DragDropManager>;
 }
 
-export class Draggable<T extends Data = Data> extends AbstractDraggable<T> {
+export class Draggable<T extends Data = Data> extends AbstractDraggable<
+  T,
+  DragDropManager
+> {
   constructor(
     {
       element,

diff --git a/packages/dom/src/core/entities/droppable/droppable.ts b/packages/dom/src/core/entities/droppable/droppable.ts
@@ -24,7 +24,10 @@ export interface Input<T extends Data = Data>
   element?: Element;
 }
 
-export class Droppable<T extends Data = Data> extends AbstractDroppable<T> {
+export class Droppable<T extends Data = Data> extends AbstractDroppable<
+  T,
+  DragDropManager
+> {
   constructor(
     {element, effects = () => [], ...input}: Input<T>,
     manager: DragDropManager | undefined