#6538 Survey Settings button is invisible when Property grid is shown (…

…#6541) * #6538 Survey Settings button is invisible when Property grid is shown Fixes #6538 * #6538 - fixed unit-test
surveyjs · Feb 7, 2025 · 10fb64c · 10fb64c
1 parent 5999f4a
commit 10fb64c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/functionalTests/designer/surface.ts b/functionalTests/designer/surface.ts
@@ -598,4 +598,14 @@ test("Page adorner header click - select", async (t) => {
 
   await t.click(".svc-page__content-actions", { offsetX: 50, offsetY: 5 });
   await t.expect(Selector(".svc-page__content").hasClass("svc-page__content--selected")).ok();
+});
+
+test("Check survey settings button", async (t) => {
+  const settingsButton = Selector('button[title="Survey settings"]');
+  await ClientFunction(() => window["creator"].showOneCategoryInPropertyGrid = true)();
+  await t.resizeWindow(1000, 800);
+  await t.resizeWindow(1600, 800);
+  await t.expect(settingsButton.hasClass("svc-toolbar__item--active")).notOk();
+  await t.click('.svc-menu-action__button[title="General"]');
+  await t.expect(settingsButton.hasClass("svc-toolbar__item--active")).ok();
 });
diff --git a/packages/survey-creator-core/src/components/tabs/designer-plugin.ts b/packages/survey-creator-core/src/components/tabs/designer-plugin.ts
@@ -38,15 +38,22 @@ export class TabDesignerPlugin implements ICreatorPlugin {
     return this.creator.isElementSelected(<any>this.creator.survey);
   }
   private get isSettingsActive(): boolean {
-    return this.creator.showSidebar && this.isSurveySelected;
+    const activePage = this.creator.sidebar.activePage;
+    return notShortCircuitAnd(this.creator.showSidebar,
+      this.isSurveySelected,
+      activePage !== this.propertyGridPlaceholderPage.id);
   }
   private get activePageIsPropertyGrid(): boolean {
     return this.creator.sidebar.activePage === this.propertyGridTab.id;
   }
+  private createSelectedUpdater() {
+    return <any>new ComputedUpdater<boolean>(() => {
+      return this.isSettingsActive;
+    });
+  }
   private createVisibleUpdater() {
     return <any>new ComputedUpdater<boolean>(() => {
-      const activePage = this.creator.sidebar.activePage;
-      return notShortCircuitAnd(this.creator.activeTab === "designer", activePage !== this.propertyGridPlaceholderPage.id);
+      return this.creator.activeTab === "designer";
     });
   }
   private updateTabControl() {
@@ -404,7 +411,7 @@ export class TabDesignerPlugin implements ICreatorPlugin {
           });
         }
       },
-      active: this.isSettingsActive,
+      active: this.createSelectedUpdater(),
       visible: this.createVisibleUpdater(),
       locTitleName: "ed.surveySettings",
       locTooltipName: "ed.surveySettingsTooltip",

diff --git a/packages/survey-creator-core/tests/creator-base-1.tests.ts b/packages/survey-creator-core/tests/creator-base-1.tests.ts
@@ -984,7 +984,7 @@ test("Create new page, recreate designer survey via JSON", (): any => {
 test("Check survey settings button ", (): any => {
   const creator = new CreatorTester();
   const item = creator.getActionBarItem("svd-settings");
-  expect(item.active).toBeTruthy();
+  expect(item.active).toBeFalsy();
   creator.selectElement(creator.survey.pages[0]);
   expect(item.active).toBeFalsy();
   creator.selectElement(creator.survey);