Merge pull request #6736 from surveyjs/bug/6699

Fix property grid resets tab's name when question's name is changing

Author: OlgaLarina

packages/survey-creator-core/src/property-grid/property-grid-view-model.ts

@@ -104,7 +104,9 @@ export class PropertyGridViewModel extends Base {
     let titleName = this.getTitle();
     this.selectedElementName = titleName;
     this.objectSelectionAction.tooltip = titleName;
-    this.objectSelectionAction.title = this.propertyGridModel.showOneCategoryInPropertyGrid ? "" : titleName;
+    if(!this.propertyGridModel.showOneCategoryInPropertyGrid) {
+      this.objectSelectionAction.title = titleName;
+    }
   }
   private getTitle(): string {
     var obj = this.getSelectedObj();

packages/survey-creator-core/tests/property-grid/property-grid-viewmodel.tests.ts

@@ -5,13 +5,15 @@ import {
   PopupModel,
   IAction,
   QuestionMatrixDynamicModel,
-  _setIsTouch
+  _setIsTouch,
+  QuestionTextModel
 } from "survey-core";
 import { PropertyGridViewModel } from "../../src/property-grid/property-grid-view-model";
 export { PropertyGridEditorMatrix } from "../../src/property-grid/matrices";
 import { CreatorTester } from "../creator-tester";
 import { ObjectSelectorModel } from "../../src/property-grid/object-selector";
 import { settings } from "../../src/creator-settings";
+import { TabDesignerPlugin } from "../../src/components/tabs/designer-plugin";
 
 test("Generate and update title correctly", () => {
   const creator = new CreatorTester();
@@ -191,4 +193,26 @@ test("Create the property grid survey on request", () => {
   const model = new PropertyGridViewModel(propertyGrid, creator);
   expect(model.getPropertyValue("survey")).toBeFalsy();
   expect(model.survey).toBeTruthy();
-});
+});
+
+test("Object selector's title should be leaved unchanged when changing question's name - Bug#6699", () => {
+  const creator = new CreatorTester();
+  creator.JSON = {
+    elements: [
+      {
+        type: "text",
+        name: "question1"
+      }
+    ]
+  };
+  const question = creator.survey.getQuestionByName("question1");
+  creator.showOneCategoryInPropertyGrid = true;
+  const propertyGridViewModel = (creator.getPlugin("designer") as TabDesignerPlugin).propertyGridViewModel;
+  const selectorBarItem = propertyGridViewModel.objectSelectionAction;
+  creator.selectElement(question);
+  expect(selectorBarItem.title).toBe("General");
+  expect(selectorBarItem.tooltip).toBe("question1");
+  question.name = "question2";
+  expect(selectorBarItem.title).toBe("General");
+  expect(selectorBarItem.tooltip).toBe("question2");
+});