Skip to content

Commit 264d621

Browse files
Fix lint
1 parent fdbf895 commit 264d621

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

addon/components/drag-sort-item.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ interface DragSortItemSignature {
1919
determineForeignPositionAction: unknown;
2020
draggingEnabled: boolean;
2121
dragEndAction?: unknown;
22-
dragStartAction?: (args: { event: DragEvent; element: HTMLElement; draggedItem: unknown }) => void;
22+
dragStartAction?: (args: {
23+
event: DragEvent;
24+
element: HTMLElement;
25+
draggedItem: unknown;
26+
}) => void;
2327
group: string;
2428
handle?: string;
2529
index: number;

addon/components/drag-sort-list.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ interface DragSortListSignature {
99
additionalArgs: unknown;
1010
childClass?: string;
1111
childTagName?: string;
12-
determineForeignPositionAction?: (args: { draggedItem: unknown; items: Array<unknown> }) => number;
12+
determineForeignPositionAction?: (args: {
13+
draggedItem: unknown;
14+
items: Array<unknown>;
15+
}) => number;
1316
draggingEnabled: boolean;
1417
dragEndAction?: unknown;
1518
dragStartAction?: unknown;

addon/services/drag-sort.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Comments
 (0)