Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No drag over indication if drag a page over another empty page #6519

Merged
merged 1 commit into from
Feb 4, 2025
Merged

No drag over indication if drag a page over another empty page #6519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/survey-creator-core/src/survey-elements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ export class DragDropSurveyElements extends DragDropCore<any> {
const dropTargetRect = dropTargetNode.getBoundingClientRect();
const calcDirection = !settings.dragDrop.allowDragToTheSameLine || (!!this.draggedElement && this.draggedElement.isPage) ? "top-bottom" : null;
let dragOverLocation = calculateDragOverLocation(event.clientX, event.clientY, dropTargetRect, calcDirection);
if (dropTarget && ((dropTarget.isPanel || dropTarget.isPage) && dropTarget.elements.length === 0 || isPanelDynamic(dropTarget) && dropTarget.template.elements.length == 0)) {
if (!this.draggedElement.isPage && dropTarget && ((dropTarget.isPanel || dropTarget.isPage) && dropTarget.elements.length === 0 || isPanelDynamic(dropTarget) && dropTarget.template.elements.length == 0)) {
if (dropTarget.isPage || this.insideContainer) {
dragOverLocation = DragTypeOverMeEnum.InsideEmptyPanel;
}
Expand Down
52 changes: 51 additions & 1 deletion packages/survey-creator-core/tests/dragdrop-elements.tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ test("surveyelement: onDragStart and onDragEnd events", () => {
ddHelper.draggedElement = question2;
ddHelper.dropTarget = question1;

ddHelper["createDraggedElementShortcut"] = ()=>{};
ddHelper["createDraggedElementShortcut"] = () => { };
ddHelper.dragInit(null, ddHelper.draggedElement, ddHelper.parentElement, document.createElement("div"));
expect(beforeCount).toBe(1);

Expand Down Expand Up @@ -1235,6 +1235,56 @@ test("Test onDragOverLocationCalculating", (): any => {
expect(ddHelper.dragOverLocation).toBe(DragTypeOverMeEnum.Bottom);
expect(ddHelper.insideContainer).toBeTruthy();
});
test("dragOverLocation calculation for empty and non-empty pages", (): any => {
const creator = new CreatorTester();
creator.JSON = {
"pages": [
{
"name": "page1",
},
{
"name": "page2",
"elements": [
{
"type": "text",
"name": "question2"
}
]
},
{
"name": "page3",
"elements": [
{
"type": "text",
"name": "question3"
}
]
}
]
};
const ddHelper: any = creator.dragDropSurveyElements;
const p1 = creator.survey.pages[0];
const p2 = creator.survey.pages[1];
const p3 = creator.survey.pages[2];
ddHelper.draggedElement = p3;
ddHelper["allowDropHere"] = true;
ddHelper["findDropTargetNodeFromPoint"] = () => ({ getBoundingClientRect: () => ({ x: 10, y: 10, width: 200, height: 100 }) });
ddHelper["getDropTargetByNode"] = () => p1;
ddHelper["isDropTargetValid"] = () => true;
ddHelper.dragOver({ clientX: 40, clientY: 50 });
expect(ddHelper.dragOverLocation).toBe(DragTypeOverMeEnum.Top);
expect(ddHelper.insideContainer).toBeTruthy();
ddHelper.dragOver({ clientX: 100, clientY: 90 });
expect(ddHelper.dragOverLocation).toBe(DragTypeOverMeEnum.Bottom);
expect(ddHelper.insideContainer).toBeTruthy();
ddHelper["getDropTargetByNode"] = () => p2;
ddHelper.dragOver({ clientX: 40, clientY: 50 });
expect(ddHelper.dragOverLocation).toBe(DragTypeOverMeEnum.Top);
expect(ddHelper.insideContainer).toBeTruthy();
ddHelper.dragOver({ clientX: 100, clientY: 90 });
expect(ddHelper.dragOverLocation).toBe(DragTypeOverMeEnum.Bottom);
expect(ddHelper.insideContainer).toBeTruthy();
});
test("Support onDragDropAllow&allowDropNextToAnother, #5621", (): any => {
const creator = new CreatorTester();
creator.JSON = {
Expand Down