@@ -14,11 +14,11 @@ export default class DragSort extends Service.extend(EventedMixin) {
1414
1515 @tracked sourceArgs : unknown | null = null ;
1616 @tracked sourceIndex : number | null = null ;
17- @tracked sourceList = null ;
17+ @tracked sourceList : Array < unknown > | null = null ;
1818
1919 @tracked targetArgs : unknown | null = null ;
2020 @tracked targetIndex : number | null = null ;
21- @tracked targetList = null ;
21+ @tracked targetList : Array < unknown > | null = null ;
2222
2323 @tracked lastDragEnteredList : unknown | null = null ;
2424 @tracked isHorizontal ?: boolean ;
@@ -143,7 +143,6 @@ export default class DragSort extends Service.extend(EventedMixin) {
143143 }
144144
145145 // Remember entering a new list
146- // @ts -expect-error TODO: fix this type error
147146 setProperties ( this , {
148147 targetList : items ,
149148 lastDragEnteredList : items ,
@@ -171,12 +170,9 @@ export default class DragSort extends Service.extend(EventedMixin) {
171170 // Dragging down
172171 ! isDraggingUp &&
173172 // Target index is not after the last item
174- targetIndex < ( targetList as any ) ?. get ( ' length' ) &&
173+ targetIndex < ( targetList ?. length ?? 0 ) &&
175174 // The only element in target list is not the one dragged
176- ! (
177- ( targetList as any ) ?. get ( 'length' ) === 1 &&
178- ( targetList as any ) ?. get ( 'firstObject' ) === draggedItem
179- )
175+ ! ( targetList ?. length === 1 && targetList [ 0 ] === draggedItem )
180176 )
181177 targetIndex ++ ;
182178
0 commit comments