Skip to content

Commit

Permalink
Fixed #5367 - A drop indicator appears at an incorrect position when …
Browse files Browse the repository at this point in the history
…the Add Question button is hidden (#5374)

Co-authored-by: tsv2013 <tsv2013@noreply.github.com>
  • Loading branch information
tsv2013 and tsv2013 committed Apr 2, 2024
1 parent 2fd96e7 commit d6c52d1
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
6 changes: 5 additions & 1 deletion packages/survey-creator-core/src/components/page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ svc-page {
height: 2px;
}

.svc-page--drag-over-empty-no-add-button:after {
bottom: auto;
}

.svc-page__placeholder_frame {
min-width: auto;
max-width: 100%;
Expand All @@ -125,4 +129,4 @@ svc-page {
padding: calcSize(6) calcSize(8);
height: auto;
}
}
}
3 changes: 3 additions & 0 deletions packages/survey-creator-core/src/components/page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ export class PageAdorner extends SurveyElementAdornerBase<PageModel> {
result = "svc-question__content--drag-over-inside";
} else if (!!this.dragTypeOverMe && this.page.elements.length === 0 && this.creator.survey.pages.length > 0) {
result = "svc-page--drag-over-empty";
if (!settings.designer.showAddQuestionButton) {
result += " svc-page--drag-over-empty-no-add-button";
}
}
if (this.isGhost) {
return result + " svc-page__content--new";
Expand Down
24 changes: 24 additions & 0 deletions packages/survey-creator-core/tests/page-adorner.tests.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { PageAdorner } from "../src/components/page";
import { settings } from "../src/creator-settings";
import { CreatorTester } from "./creator-tester";

test("Check page adorner css on drag over", (): any => {
const creator = new CreatorTester();
creator.JSON = {
pages: [
{ name: "page1" },
]
};
const pageAdorner = new PageAdorner(
creator,
creator.survey.pages[0]
);
expect(pageAdorner.css).toBe("");
pageAdorner.dragTypeOverMe = true as any;
expect(pageAdorner.css).toBe("svc-question__content--drag-over-inside");
pageAdorner.showPlaceholder = false;
expect(pageAdorner.css).toBe("svc-page--drag-over-empty");
settings.designer.showAddQuestionButton = false;
expect(pageAdorner.css).toBe("svc-page--drag-over-empty svc-page--drag-over-empty-no-add-button");
settings.designer.showAddQuestionButton = true;
});

0 comments on commit d6c52d1

Please sign in to comment.