Merge branch 'features/rename-on-create-custom-message-panel' of http…

…s://github.com/surveyjs/survey-creator into features/rename-on-create-custom-message-panel
surveyjs · Jan 16, 2024 · d963750 · d963750
2 parents c58cae3 + 179c9c3
commit d963750
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/survey-creator-core/src/components/question.ts b/packages/survey-creator-core/src/components/question.ts
@@ -198,6 +198,7 @@ export class QuestionAdornerViewModel extends SurveyElementAdornerBase {
   private createCustomMessagePanel(): QuestionBannerParams {
     if (!this.isMessagePanelVisible) return null;
     const res: any = {
+      question: this.element,
       actionText: "",
       messageText: "",
       onClick: () => { }

diff --git a/packages/survey-creator-core/tests/creator-base.tests.ts b/packages/survey-creator-core/tests/creator-base.tests.ts
@@ -3549,11 +3549,13 @@ test("Custom messagePanel", (): any => {
     }
   });
   const creator = new CreatorTester();
+  let questionName;
   creator.onCreateCustomMessagePanel.add((sender, options) => {
     options.messageText = "Banner text#";
     options.actionText = "Action text#";
+    questionName = options.question.name;
     options.onClick = () => {
-      creator.selectElement(creator.survey.getQuestionByName("q2"), "prop1");
+      creator.selectElement(options.question, "prop1");
     };
   });
   creator.JSON = {
@@ -3569,11 +3571,12 @@ test("Custom messagePanel", (): any => {
   q1.prop1 = 1;
   expect(q1AdornerModel.isBannerShowing).toBeTruthy();
   const bannerParams = q1AdornerModel.createBannerParams();
+  expect(questionName).toBe("q1");
   expect(bannerParams.text).toBe("Banner text#");
   expect(bannerParams.actionText).toBe("Action text#");
   expect(creator.selectedElementName).toBe("survey");
   bannerParams.onClick();
-  expect(creator.selectedElementName).toBe("q2");
+  expect(creator.selectedElementName).toBe("q1");
   q1.prop1 = 0;
   expect(q1AdornerModel.isBannerShowing).toBeFalsy();
   Serializer.removeProperty("selectbase", "prop1");