From 02a81c93b78bb6629217c64769e154a31e2e1fd8 Mon Sep 17 00:00:00 2001 From: OlgaLarina Date: Tue, 4 Feb 2025 11:34:04 +0300 Subject: [PATCH 1/3] resolve #6512 Reset theme popup dialog has an rendering --- functionalTests/helper.ts | 1 + functionalTests/theme/theme.ts | 4 +-- .../src/ctr-font-sizes.scss | 1 + .../survey-creator-core/src/ctr-sizes.scss | 1 + .../src/lbr-font-sizes.scss | 1 + .../survey-creator-core/src/lbr-sizes.scss | 1 + .../etalons/theme-tab-reset-popup-dialog.png | Bin 0 -> 18303 bytes .../surface-string-editor-error_mask.png | Bin 0 -> 987 bytes .../etalons/theme-tab-reset-popup-dialog.png | Bin 0 -> 18302 bytes .../tests/designer/side-bar.ts | 6 ++--- .../tests/designer/theme-tab.ts | 25 ++++++++++++++---- 11 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 visualRegressionTests-V2/tests/designer/etalons/theme-tab-reset-popup-dialog.png create mode 100644 visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png create mode 100644 visualRegressionTests/tests/designer/etalons/theme-tab-reset-popup-dialog.png diff --git a/functionalTests/helper.ts b/functionalTests/helper.ts index 83898b68d8..b3ac6333ba 100644 --- a/functionalTests/helper.ts +++ b/functionalTests/helper.ts @@ -67,6 +67,7 @@ export const creatorTabDesignerName = "Designer"; export const creatorTabPreviewName = "Preview"; export const creatorTabLogicName = "Logic"; export const creatorTabTranslationName = "Translation"; +export const creatorTabThemeName = "Themes"; export const generalGroupName = "General"; export const logicGroupName = "Conditions"; export const inputMaskSettingsGroupName = "Input Mask Settings"; diff --git a/functionalTests/theme/theme.ts b/functionalTests/theme/theme.ts index 5f7593f40b..737b9f849d 100644 --- a/functionalTests/theme/theme.ts +++ b/functionalTests/theme/theme.ts @@ -1,4 +1,4 @@ -import { getPropertyGridCategory, getTabbedMenuItemByText, setJSON } from "../helper"; +import { creatorTabThemeName, getPropertyGridCategory, getTabbedMenuItemByText, setJSON } from "../helper"; import { ClientFunction, Selector } from "testcafe"; const title = "Theme Editor"; const url = "http://127.0.0.1:8080/testCafe/testcafe-theme-tab"; @@ -38,7 +38,7 @@ test("Editors, loose focus on enter", async (t) => { }; await setJSON(json); - await t.click(getTabbedMenuItemByText("Themes")); + await t.click(getTabbedMenuItemByText(creatorTabThemeName)); await t.click(getPropertyGridCategory("Appearance")); const colorQuestionInputSelector = Selector("div[data-name=primaryColor] input.spg-color-editor__input"); diff --git a/packages/survey-creator-core/src/ctr-font-sizes.scss b/packages/survey-creator-core/src/ctr-font-sizes.scss index 80ef192265..8d75af1bdd 100644 --- a/packages/survey-creator-core/src/ctr-font-sizes.scss +++ b/packages/survey-creator-core/src/ctr-font-sizes.scss @@ -1,5 +1,6 @@ @use "./ctr-variables.scss" as *; +.svc-creator-popup, .svc-creator { --sjs-font-size-x075: calc(#{$font-unit} * 0.75); --sjs-font-size-x1: calc(#{$font-unit} * 1); diff --git a/packages/survey-creator-core/src/ctr-sizes.scss b/packages/survey-creator-core/src/ctr-sizes.scss index f1152c7d0b..ef8238d963 100644 --- a/packages/survey-creator-core/src/ctr-sizes.scss +++ b/packages/survey-creator-core/src/ctr-sizes.scss @@ -1,5 +1,6 @@ @use "./ctr-variables.scss" as *; +.svc-creator-popup, .svc-creator { --sjs-spacing-x2: calc(#{$spacing-unit} * 2); --sjs-spacing-x3: calc(#{$spacing-unit} * 3); diff --git a/packages/survey-creator-core/src/lbr-font-sizes.scss b/packages/survey-creator-core/src/lbr-font-sizes.scss index 371ab4ff0e..2fdab130d4 100644 --- a/packages/survey-creator-core/src/lbr-font-sizes.scss +++ b/packages/survey-creator-core/src/lbr-font-sizes.scss @@ -1,5 +1,6 @@ @use "./lbr-variables.scss" as *; +.svc-creator-popup, .svc-creator { --lbr-line-height-x8: calc(#{$lbr-line-height-unit} * 8); --lbr-line-height-x7: calc(#{$lbr-line-height-unit} * 7); diff --git a/packages/survey-creator-core/src/lbr-sizes.scss b/packages/survey-creator-core/src/lbr-sizes.scss index af024ce92a..530ae5d4b9 100644 --- a/packages/survey-creator-core/src/lbr-sizes.scss +++ b/packages/survey-creator-core/src/lbr-sizes.scss @@ -1,5 +1,6 @@ @use "./lbr-variables.scss" as *; +.svc-creator-popup, .svc-creator { --lbr-spacing-x16: calc(#{$lbr-spacing-unit} * 16); --lbr-spacing-x15: calc(#{$lbr-spacing-unit} * 15); diff --git a/visualRegressionTests-V2/tests/designer/etalons/theme-tab-reset-popup-dialog.png b/visualRegressionTests-V2/tests/designer/etalons/theme-tab-reset-popup-dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..6f7a1f63cb0aa7d4b3ab3f2bd8df94dcbe3663ed GIT binary patch literal 18303 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 literal 0 HcmV?d00001 diff --git a/visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png b/visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..95b2072019d02b8ee946fbff645902b0ce2d92ae GIT binary patch literal 987 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVui#(A7*Y}U_O>C{VFLjMN6r8LH$QqH z(zaxS^NnN13Tuu%Jy^8B@>s-eMuvtXkN>hVG_)|VGAO7zFfw>>1~4!LF^MoVOc@oT zBqWNhv-i*2e(h;|L$hW4Vs?h_Da>394qgpR3=@PFFfc4((O_U$x!=y|(*`EH+S%fp znGVdoi6W`Vh@pO{31#J_zrFtX+O9v`1qRQvzc4(QmxGzazFt;VVPN<%l@}NwL(PMr e=oFB8%(<&m$lYesr)Xe?WbkzLb6Mw<&;$VJlgjb{ literal 0 HcmV?d00001 diff --git a/visualRegressionTests/tests/designer/etalons/theme-tab-reset-popup-dialog.png b/visualRegressionTests/tests/designer/etalons/theme-tab-reset-popup-dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..5e26d0826ea8afc127ec98a5d69c18027454e605 GIT binary patch literal 18302 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̧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 { await t.click(getAddNewQuestionButton()); await takeElementScreenshot("side-bar-tabbed-property-grid.png", ".svc-side-bar", t, comparer); - await t.click(getTabbedMenuItemByText("Themes")); + await t.click(getTabbedMenuItemByText(creatorTabThemeName)); await takeElementScreenshot("side-bar-tabbed-property-grid-theme-general.png", ".svc-side-bar", t, comparer); await t.click(Selector(".svc-menu-action__button").filterVisible().nth(4)); @@ -155,7 +155,7 @@ test.page(themeTabUrl)("boolean switch", async (t) => { window["creator"].showOneCategoryInPropertyGrid = true; })(); - await t.click(getTabbedMenuItemByText("Themes")); + await t.click(getTabbedMenuItemByText(creatorTabThemeName)); await t.click(Selector(".svc-menu-action__button").filterVisible().nth(4)); await takeElementScreenshot("boolean-switch-default.png", ".spg-boolean-switch", t, comparer); diff --git a/visualRegressionTests/tests/designer/theme-tab.ts b/visualRegressionTests/tests/designer/theme-tab.ts index 8a16eb2037..991bec1645 100644 --- a/visualRegressionTests/tests/designer/theme-tab.ts +++ b/visualRegressionTests/tests/designer/theme-tab.ts @@ -1,5 +1,5 @@ import { ClientFunction, Selector } from "testcafe"; -import { getPropertyGridCategory, getTabbedMenuItemByText, setJSON, takeElementScreenshot, themeSettingsButtonSelector, wrapVisualTest, url } from "../../helper"; +import { getPropertyGridCategory, getTabbedMenuItemByText, setJSON, takeElementScreenshot, themeSettingsButtonSelector, wrapVisualTest, url, creatorTabThemeName } from "../../helper"; const themeTabUrl = url.replace(/\/testcafe$/, "/testcafe-theme-tab"); const title = "Themes tab"; @@ -15,7 +15,7 @@ test("Check boxshadow settings", async (t) => { await setJSON(json); const root = Selector("div[data-name='--sjs-shadow-small']"); await t.resizeWindow(2000, 2000) - .click(getTabbedMenuItemByText("Themes")) + .click(getTabbedMenuItemByText(creatorTabThemeName)) .click(getPropertyGridCategory("Appearance")) .click(advancedModeSwitcher) .scrollIntoView(root); @@ -32,7 +32,7 @@ test("Check sidebar header", async (t) => { const json = {}; const root = Selector(".svc-side-bar__container-header ").filterVisible(); await t.resizeWindow(2000, 2000) - .click(getTabbedMenuItemByText("Themes")); + .click(getTabbedMenuItemByText(creatorTabThemeName)); await takeElementScreenshot("theme-editor-header.png", root, t, comparer); await ClientFunction(() => { window["creator"].allowCollapseSidebar = false; })(); await takeElementScreenshot("theme-editor-header-no-collapse-button.png", root, t, comparer); @@ -49,7 +49,7 @@ test("toolbar view", async (t) => { { elements: [{ type: "text", name: "question2" }] } ] }); - await t.click(getTabbedMenuItemByText("Themes")); + await t.click(getTabbedMenuItemByText(creatorTabThemeName)); await t.resizeWindow(380, 600); await takeElementScreenshot("theme-tab-toolbar_responsive.png", Selector(".svc-footer-bar .svc-toolbar-wrapper"), t, comparer); @@ -69,7 +69,7 @@ test("theme setting property grid", async (t) => { { elements: [{ type: "text", name: "question2" }] } ] }); - await t.click(getTabbedMenuItemByText("Themes")); + await t.click(getTabbedMenuItemByText(creatorTabThemeName)); const westResizer = Selector(".svc-resizer-west"); await t.drag(westResizer, -150, 0); @@ -119,4 +119,19 @@ test("theme setting property grid mobile", async (t) => { await ClientFunction(() => document.body.focus())(); await takeElementScreenshot("theme-editor-property-grid-general-group-mobile.png", expandedGroup, t, comparer); }); +}); + +test("Reset theme popup dialog view", async (t) => { + await wrapVisualTest(t, async (t, comparer) => { + await t.resizeWindow(1280, 900); + await t.click(getTabbedMenuItemByText(creatorTabThemeName)); + + const expandedGroup = Selector(".spg-theme-builder-root .spg-panel.sd-element--expanded"); + await t + .click(getPropertyGridCategory("General")) + .click(expandedGroup.find(".spg-button-group__item-caption").withText("Dark")) + .click(Selector("#svc-reset-theme .svc-toolbar__item")); + + await takeElementScreenshot("theme-tab-reset-popup-dialog.png", Selector(".sv-popup__body-content").filterVisible(), t, comparer); + }); }); \ No newline at end of file From 5520557fa6e0295a980774f388e8ba182151b5cb Mon Sep 17 00:00:00 2001 From: OlgaLarina Date: Tue, 4 Feb 2025 12:57:22 +0300 Subject: [PATCH 2/3] resolve #6512 Reset theme popup dialog has an rendering --- .../surface-string-editor-error_mask.png | Bin 987 -> 1109 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png b/visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png index 95b2072019d02b8ee946fbff645902b0ce2d92ae..2de3acf1d46f261e5eebcc3984cd9e777db2d233 100644 GIT binary patch literal 1109 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVui#(B>~}Jh^%I>F;MizS%beB*eh5XOer}Vz78WSbW}DpM9xm zpSJEk{omO5=d_t8&(E64z%aq)llaV;dzR1iynW_L_ik>61Mb^@HlOjSy9VUWJb6DS zjfvsI#az1`yHDSJ`tDQyo!EDJ`;$P%0F`Q2Jz<_P^N%htoEX;Ud~O6<{`}pi%^>cd zUG8C$$8Bg9mW9FWtXIK~>h}wQ)-vM;+ z2Pv~ZTOihm0Rx7?uKLMbpowMWKlSg#)@|Q?THSc^`<=UMjKHagp+dFzKL-QD6nOlA fqJ@gt@jt_*iiyGTYL}gX#RY?>tDnm{r-UW|lul^< literal 987 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVui#(A7*Y}U_O>C{VFLjMN6r8LH$QqH z(zaxS^NnN13Tuu%Jy^8B@>s-eMuvtXkN>hVG_)|VGAO7zFfw>>1~4!LF^MoVOc@oT zBqWNhv-i*2e(h;|L$hW4Vs?h_Da>394qgpR3=@PFFfc4((O_U$x!=y|(*`EH+S%fp znGVdoi6W`Vh@pO{31#J_zrFtX+O9v`1qRQvzc4(QmxGzazFt;VVPN<%l@}NwL(PMr e=oFB8%(<&m$lYesr)Xe?WbkzLb6Mw<&;$VJlgjb{ From 31e96e4fafc2ed280e97426f7ff2decba86addd5 Mon Sep 17 00:00:00 2001 From: OlgaLarina Date: Tue, 4 Feb 2025 14:10:28 +0300 Subject: [PATCH 3/3] update mask #6512 Reset theme popup dialog has an rendering --- .../surface-string-editor-error_mask.png | Bin 1109 -> 1233 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png b/visualRegressionTests/tests/designer/etalons/surface-string-editor-error_mask.png index 2de3acf1d46f261e5eebcc3984cd9e777db2d233..d9fc84dfe8d106de8bf64db75b8daf6fb2fd6d38 100644 GIT binary patch literal 1233 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVui#(Q7)5gnk zK+W*~|DxmEhtIie^z*(V7i#*~nStTK37`(XTp;7ZD1-7qP(Gk{jQz|c+}L+)Yy8J~Gu&z^Zwe5>txV%n!QxeN{0p9}soGk#b)bEZwU zG{b}3+XtkLjAzbdV937?ic{M|>08fsZ>ux}In4g{nJ1CA85s7c_aD%{W~QH}7JnJ& zuGil=>a%C-XG+)gZ)0S**Y5sfWt!UgTWkys|EpTUmjeBAZ?k*FcZk@7@|z3{2Nv=& zFvwK3n5TmrvBMPX>jT>>pUee2!>(=S$<08c;^sq?m9Gby5!Veg7i8%9+5Z%Q0g*yP zK)euqFnu=IV?S1)gc(Qzu`j)esXP$h1#%JHM+_*D7 zc0f5wp6 z?{a&OXzpd8HM*d{wzvJ%z4h$!ThHciIr}|h_WiXWAM9HKB7rHXdnPBt0e6GH&Ohuy xo@Hh@uzx#BVD^9L2bnTIpNPmJCS|{{cdWnZab=02Ik2c=@O1TaS?83{1OR%ZsRRH3 literal 1109 zcmeAS@N?(olHy`uVBq!ia0y~yU|IlVui#(B>~}Jh^%I>F;MizS%beB*eh5XOer}Vz78WSbW}DpM9xm zpSJEk{omO5=d_t8&(E64z%aq)llaV;dzR1iynW_L_ik>61Mb^@HlOjSy9VUWJb6DS zjfvsI#az1`yHDSJ`tDQyo!EDJ`;$P%0F`Q2Jz<_P^N%htoEX;Ud~O6<{`}pi%^>cd zUG8C$$8Bg9mW9FWtXIK~>h}wQ)-vM;+ z2Pv~ZTOihm0Rx7?uKLMbpowMWKlSg#)@|Q?THSc^`<=UMjKHagp+dFzKL-QD6nOlA fqJ@gt@jt_*iiyGTYL}gX#RY?>tDnm{r-UW|lul^<