A click on a toolbox item inserts a new question at the end of the page

fix #5674 (#5695)
surveyjs · Jul 16, 2024 · 2bfe290 · 2bfe290
1 parent d26815c
commit 2bfe290
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/survey-creator-core/src/creator-base.ts b/packages/survey-creator-core/src/creator-base.ts
@@ -2293,7 +2293,7 @@ export class SurveyCreatorModel extends Base
       }
       parent = selectedElement.parent;
       if (index < 0) {
-        if (this.addNewQuestionLast) {
+        if (this.addNewQuestionLast && modifiedType === "ADDED_FROM_PAGEBUTTON") {
           index = parent.elements.length;
         } else {
           index = parent.elements.indexOf(selectedElement);

diff --git a/packages/survey-creator-core/tests/creator-base.tests.ts b/packages/survey-creator-core/tests/creator-base.tests.ts
@@ -3900,12 +3900,12 @@ test("creator.addNewQuestionLast property", (): any => {
   creator.clickToolboxItem({ type: "text" });
   expect(creator.selectedElementName).toEqual("question2");
   creator.selectQuestionByName("question1");
-  creator.clickToolboxItem({ type: "text" });
+  creator.addNewQuestionInPage((str) => {}, undefined, "text");
   expect(creator.selectedElementName).toEqual("question3");
   expect(creator.survey.pages[0].elements[2].name).toEqual("question3");
   creator.selectQuestionByName("question1");
   creator.addNewQuestionLast = false;
-  creator.clickToolboxItem({ type: "text" });
+  creator.addNewQuestionInPage((str) => {}, undefined, "text");
   expect(creator.selectedElementName).toEqual("question4");
   expect(creator.survey.pages[0].elements[1].name).toEqual("question4");
   expect(creator.survey.pages[0].elements[3].name).toEqual("question3");