Skip to content

Commit cd8be54

Browse files
committed
chore: address review comments
1 parent 9596a78 commit cd8be54

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

packages/base/src/util/dragAndDrop/DragAndDropMixin.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type UI5Element from "../../UI5Element.js";
2-
import type MovePlacement from "../../types/MovePlacement.js";
2+
import MovePlacement from "../../types/MovePlacement.js";
33
import Orientation from "../../types/Orientation.js";
44
import type { DragAndDropSettings } from "./DragRegistry.js";
55
import DragRegistry from "./DragRegistry.js";
@@ -10,8 +10,8 @@ import { findClosestPosition } from "./findClosestPosition.js";
1010
type DragAndDropCallbacks = {
1111
getItemsForDragDrop: () => Array<HTMLElement>;
1212
getOrientation: () => Orientation;
13-
getDropIndicator: () => { targetReference: HTMLElement | null; placement: any } | null;
14-
setDropIndicator: (targetReference: HTMLElement | null, placement?: any) => void;
13+
getDropIndicator: () => { targetReference: HTMLElement | null; placement: MovePlacement } | null;
14+
setDropIndicator: (targetReference: HTMLElement | null, placement?: MovePlacement) => void;
1515
shouldContainsDraggedElement?: (draggedElement: HTMLElement, targetElement: HTMLElement) => boolean;
1616
getDragAndDropSettings?: () => DragAndDropSettings;
1717
getTargetFromPosition?: (element: HTMLElement) => HTMLElement;
@@ -75,13 +75,13 @@ function createDragAndDropMixin<T extends UI5Element>(callbacks: DragAndDropCall
7575

7676
// Filter out "On" placement if dropping on the dragged element itself
7777
if (closestPosition.element === draggedElement) {
78-
closestPosition.placements = closestPosition.placements.filter(placement => placement !== "On" as MovePlacement);
78+
closestPosition.placements = closestPosition.placements.filter(placement => placement !== MovePlacement.On);
7979
}
8080

8181
const settings = callbacks.getDragAndDropSettings?.() || {};
8282
const { targetReference, placement } = handleDragOver(e, this, closestPosition, closestPosition.element, settings);
8383

84-
callbacks.setDropIndicator(targetReference, placement);
84+
callbacks.setDropIndicator(targetReference, placement as MovePlacement);
8585
},
8686

8787
_ondrop(this: T, e: DragEvent) {

packages/main/src/List.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
import Orientation from "@ui5/webcomponents-base/dist/types/Orientation.js";
2626
import DragRegistry from "@ui5/webcomponents-base/dist/util/dragAndDrop/DragRegistry.js";
2727
import type { MoveEventDetail } from "@ui5/webcomponents-base/dist/util/dragAndDrop/DragRegistry.js";
28+
import type MovePlacement from "@ui5/webcomponents-base/dist/types/MovePlacement.js";
2829
import createDragAndDropMixin from "@ui5/webcomponents-base/dist/util/dragAndDrop/DragAndDropMixin.js";
2930
import { findClosestPositionsByKey } from "@ui5/webcomponents-base/dist/util/dragAndDrop/findClosestPosition.js";
3031
import NavigationMode from "@ui5/webcomponents-base/dist/types/NavigationMode.js";
@@ -557,7 +558,7 @@ class List extends UI5Element {
557558
getOrientation: () => Orientation.Vertical,
558559
getDropIndicator: () => (this.dropIndicatorDOM ? {
559560
targetReference: this.dropIndicatorDOM.targetReference,
560-
placement: this.dropIndicatorDOM.placement,
561+
placement: this.dropIndicatorDOM.placement as MovePlacement,
561562
} : null),
562563
setDropIndicator: (targetReference: HTMLElement | null, placement?: any) => {
563564
if (this.dropIndicatorDOM) {

packages/main/src/Tree.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ class Tree extends UI5Element {
333333
getOrientation: () => Orientation.Vertical,
334334
getDropIndicator: () => (this.dropIndicatorDOM ? {
335335
targetReference: this.dropIndicatorDOM.targetReference,
336-
placement: this.dropIndicatorDOM.placement,
336+
placement: this.dropIndicatorDOM.placement as MovePlacement,
337337
} : null),
338338
setDropIndicator: (targetReference: HTMLElement | null, placement?: any) => {
339339
if (this.dropIndicatorDOM) {

0 commit comments

Comments
 (0)