diff --git a/functionalTests/helper.ts b/functionalTests/helper.ts index db6e760a32..1967ea9f45 100644 --- a/functionalTests/helper.ts +++ b/functionalTests/helper.ts @@ -180,6 +180,22 @@ export async function setShowSidebar(newVal: boolean) { window["creator"].showSidebar = newVal; })(newVal); } +export async function setShowAddQuestionButton(newVal: boolean) { + await ClientFunction((newVal) => { + window["creator"].showAddQuestionButton = newVal; + })(newVal); +} +export async function setAllowEditSurveyTitle(newVal: boolean) { + await ClientFunction((newVal) => { + window["creator"].allowEditSurveyTitle = newVal; + })(newVal); +} +export async function setExpandCollapseButtonVisibility(newVal: string) { + await ClientFunction((newVal) => { + window["creator"].expandCollapseButtonVisibility = newVal; + })(newVal); +} + export const explicitErrorHandler = ClientFunction(() => { window.addEventListener("error", e => { if (e.message === "ResizeObserver loop completed with undelivered notifications." || diff --git a/packages/survey-creator-core/src/components/header/logo-image.scss b/packages/survey-creator-core/src/components/header/logo-image.scss index db99cf23e3..ef12a303dd 100644 --- a/packages/survey-creator-core/src/components/header/logo-image.scss +++ b/packages/survey-creator-core/src/components/header/logo-image.scss @@ -36,7 +36,7 @@ .svc-logo-image-placeholder { @include ctrLargeFont; color: $foreground-light; - opacity: 0.25; + opacity: var(--ctr-survey-header-logo-placeholder-icon-opacity, 0.25); white-space: nowrap; word-break: keep-all; padding: 0; @@ -46,7 +46,7 @@ justify-content: center; align-items: center; margin-right: calcSize(-2); - border-radius: calcSize(4); + border-radius: var(--ctr-survey-header-logo-placeholder-corner-radius, calcSize(4)); transition: background-color $creator-transition-duration, opacity $creator-transition-duration; &:hover { @@ -59,8 +59,8 @@ } svg { - width: calcSize(6); - height: calcSize(6); + width: var(--ctr-survey-header-logo-placeholder-icon-width, calcSize(6)); + height: var(--ctr-survey-header-logo-placeholder-icon-height, calcSize(6)); } } diff --git a/packages/survey-creator-core/src/components/item-value.scss b/packages/survey-creator-core/src/components/item-value.scss index 5a3b0d84ae..e2dfde5be4 100644 --- a/packages/survey-creator-core/src/components/item-value.scss +++ b/packages/survey-creator-core/src/components/item-value.scss @@ -271,7 +271,7 @@ .svc-item-value__ghost { display: none; - background: $background-dim; + background: var(--ctr-survey-radio-button-group-item-background-color-drop-spot, $background-dim); border-radius: var(--ctr-survey-radio-button-group-item-corner-radius-floating, calcSize(12.5)); width: calcSize(25); height: 40px; diff --git a/packages/survey-creator-core/src/components/side-bar/tab-control-model.ts b/packages/survey-creator-core/src/components/side-bar/tab-control-model.ts index 94ce6a47f6..a6f939a296 100644 --- a/packages/survey-creator-core/src/components/side-bar/tab-control-model.ts +++ b/packages/survey-creator-core/src/components/side-bar/tab-control-model.ts @@ -10,7 +10,7 @@ export class TabControlModel extends Base { private updateExpandCollapseAction() { this.expandCollapseAction.iconName = this.sidePanel.visible ? "icon-collapse-panel" : "icon-expand-panel"; this.expandCollapseAction.css = this.sidePanel.visible ? "svd-grid-hide" : "svd-grid-expand"; - this.expandCollapseAction.locTitleName = this.sidePanel.visible ? "ed.hidePanel" : "ed.showPanel"; + this.expandCollapseAction.locTooltipName = this.sidePanel.visible ? "ed.hidePanel" : "ed.showPanel"; } private createToggleAction() { diff --git a/packages/survey-creator-core/src/custom-questions/boolean-switch.scss b/packages/survey-creator-core/src/custom-questions/boolean-switch.scss index 7b71c184a8..d753687b22 100644 --- a/packages/survey-creator-core/src/custom-questions/boolean-switch.scss +++ b/packages/survey-creator-core/src/custom-questions/boolean-switch.scss @@ -42,6 +42,7 @@ .spg-boolean-switch__button--checked { background: var(--ctr-toggle-button-background-color-checked, #19b394); + box-shadow: none; .spg-boolean-switch__thumb--left { background: none; diff --git a/packages/survey-creator-core/src/property-grid-theme/property-grid.scss b/packages/survey-creator-core/src/property-grid-theme/property-grid.scss index 5236c0cd7b..a550f53354 100644 --- a/packages/survey-creator-core/src/property-grid-theme/property-grid.scss +++ b/packages/survey-creator-core/src/property-grid-theme/property-grid.scss @@ -79,6 +79,7 @@ .sd-body, .sl-body { min-width: calcSize(78); + padding: 0; } } diff --git a/packages/survey-creator-core/src/themes/default.ts b/packages/survey-creator-core/src/themes/default.ts index 34953a5eeb..e958e81c30 100644 --- a/packages/survey-creator-core/src/themes/default.ts +++ b/packages/survey-creator-core/src/themes/default.ts @@ -86,6 +86,7 @@ const Theme = { "--lbr-shadow-small-blur": "2px", "--lbr-shadow-small-spread": "0px", "--ctr-button-group-item-text-opacity-disabled": 0.25, + "--ctr-survey-header-logo-placeholder-icon-opacity": 0.5, "--ctr-toolbox-item-shadow-hovered-1-color": "#00000000", "--ctr-toolbox-item-shadow-pressed-color": "#00000000", "--ctr-toolbox-item-shadow-hovered-2-color": "#00000000", @@ -602,6 +603,8 @@ const Theme = { "--lbr-action-button-icon-color-negative": "var(--sjs-semantic-red-background-500)", "--ctr-property-grid-background-color": "var(--sjs-layer-1-background-500)", "--ctr-survey-header-logo-placeholder-icon-color": "var(--sjs-layer-3-foreground-50)", + "--ctr-survey-header-logo-placeholder-icon-width": "var(--sjs-size-x6)", + "--ctr-survey-header-logo-placeholder-icon-height": "var(--sjs-size-x6)", "--lbr-notification-padding-left": "var(--sjs-spacing-x2)", "--lbr-notification-padding-right": "var(--sjs-spacing-x2)", "--lbr-notification-button-corner-radius": "var(--sjs-corner-radius-x1)", @@ -670,6 +673,7 @@ const Theme = { "--ctr-survey-radio-button-group-item-shadow-floating-2-spread": "var(--ctr-shadow-medium-spread)", "--ctr-survey-radio-button-group-item-shadow-floating-2-color": "var(--ctr-shadow-medium-color)", "--ctr-survey-ranking-item-corner-radius-floating": "var(--sjs-corner-radius-x1)", + "--ctr-survey-header-logo-placeholder-corner-radius": "var(--sjs-corner-radius-round)", "--ctr-survey-header-logo-placeholder-background-color-hovered": "var(--sjs-primary-background-10)", "--ctr-survey-header-logo-placeholder-icon-color-hovered": "var(--sjs-primary-background-500)", "--ctr-survey-header-text-title-color-placeholder": "var(--sjs-layer-3-foreground-50)", diff --git a/visualRegressionTests-V2/tests/designer/etalons/creator-mobile-paddings.png b/visualRegressionTests-V2/tests/designer/etalons/creator-mobile-paddings.png index 1acfb6e65b..890951f645 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/creator-mobile-paddings.png and b/visualRegressionTests-V2/tests/designer/etalons/creator-mobile-paddings.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/creator-smartphone.png b/visualRegressionTests-V2/tests/designer/etalons/creator-smartphone.png index 57b9490c19..3cc0fe58da 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/creator-smartphone.png and b/visualRegressionTests-V2/tests/designer/etalons/creator-smartphone.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/design-surface-toolbar.png b/visualRegressionTests-V2/tests/designer/etalons/design-surface-toolbar.png index cd4e039f07..96e767927b 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/design-surface-toolbar.png and b/visualRegressionTests-V2/tests/designer/etalons/design-surface-toolbar.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/designer-survey-layout-mobile.png b/visualRegressionTests-V2/tests/designer/etalons/designer-survey-layout-mobile.png index bb963e4342..1392ff3dd9 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/designer-survey-layout-mobile.png and b/visualRegressionTests-V2/tests/designer/etalons/designer-survey-layout-mobile.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-left.png b/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-left.png index 913e54cc85..eb1fc52b12 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-left.png and b/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-left.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-right.png b/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-right.png index 2c819b82c4..1ce86bf111 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-right.png and b/visualRegressionTests-V2/tests/designer/etalons/designer-tab-page-navigator-toolbox-right.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/drag-drop-in-collapsed-page.png b/visualRegressionTests-V2/tests/designer/etalons/drag-drop-in-collapsed-page.png index 9c7080614c..ba5786a5a2 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/drag-drop-in-collapsed-page.png and b/visualRegressionTests-V2/tests/designer/etalons/drag-drop-in-collapsed-page.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed-selected.png b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed-selected.png index b52fff6fbc..8a04dfb2a2 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed-selected.png and b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed-selected.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed.png b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed.png index a2df58ca5f..208e7c4dcd 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed.png and b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-collapsed.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-expanded.png b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-expanded.png index 4e302f5691..4cb2ebe710 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-adorner-expanded.png and b/visualRegressionTests-V2/tests/designer/etalons/page-adorner-expanded.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-content-click.png b/visualRegressionTests-V2/tests/designer/etalons/page-content-click.png index 72a81e93b1..be9ac0972a 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-content-click.png and b/visualRegressionTests-V2/tests/designer/etalons/page-content-click.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-content-hover.png b/visualRegressionTests-V2/tests/designer/etalons/page-content-hover.png index 00b196c040..54272d4ceb 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-content-hover.png and b/visualRegressionTests-V2/tests/designer/etalons/page-content-hover.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-content.png b/visualRegressionTests-V2/tests/designer/etalons/page-content.png index 3edf4e27e4..7378de0a8c 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-content.png and b/visualRegressionTests-V2/tests/designer/etalons/page-content.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-navigator-by-page-not-overlaped.png b/visualRegressionTests-V2/tests/designer/etalons/page-navigator-by-page-not-overlaped.png index 1c8901a56d..f9137bc8a0 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-navigator-by-page-not-overlaped.png and b/visualRegressionTests-V2/tests/designer/etalons/page-navigator-by-page-not-overlaped.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-navigator-not-overlaped.png b/visualRegressionTests-V2/tests/designer/etalons/page-navigator-not-overlaped.png index d270c102f8..48482d6c78 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-navigator-not-overlaped.png and b/visualRegressionTests-V2/tests/designer/etalons/page-navigator-not-overlaped.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-navigator-with-popup.png b/visualRegressionTests-V2/tests/designer/etalons/page-navigator-with-popup.png index df7c267a40..4f011444b6 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-navigator-with-popup.png and b/visualRegressionTests-V2/tests/designer/etalons/page-navigator-with-popup.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-selected-responsive.png b/visualRegressionTests-V2/tests/designer/etalons/page-selected-responsive.png index 414acd533c..539ea457e8 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-selected-responsive.png and b/visualRegressionTests-V2/tests/designer/etalons/page-selected-responsive.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/page-title-click.png b/visualRegressionTests-V2/tests/designer/etalons/page-title-click.png index 01439adb37..89d2c8eec3 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/page-title-click.png and b/visualRegressionTests-V2/tests/designer/etalons/page-title-click.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/pg-choices-fast-entry-popup.png b/visualRegressionTests-V2/tests/designer/etalons/pg-choices-fast-entry-popup.png index ecc0ef8da2..e46ad30457 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/pg-choices-fast-entry-popup.png and b/visualRegressionTests-V2/tests/designer/etalons/pg-choices-fast-entry-popup.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/pg-default-value-popup.png b/visualRegressionTests-V2/tests/designer/etalons/pg-default-value-popup.png index d2362693e3..c051a60ee4 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/pg-default-value-popup.png and b/visualRegressionTests-V2/tests/designer/etalons/pg-default-value-popup.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/scrollbar-creator-content.png b/visualRegressionTests-V2/tests/designer/etalons/scrollbar-creator-content.png index 8b5f02b84d..5386d6f5a6 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/scrollbar-creator-content.png and b/visualRegressionTests-V2/tests/designer/etalons/scrollbar-creator-content.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/surface-placeholder-with-header.png b/visualRegressionTests-V2/tests/designer/etalons/surface-placeholder-with-header.png index dc30a05983..04355ed645 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/surface-placeholder-with-header.png and b/visualRegressionTests-V2/tests/designer/etalons/surface-placeholder-with-header.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/surface-string-editor-error.png b/visualRegressionTests-V2/tests/designer/etalons/surface-string-editor-error.png index fbb999b8d2..382ddd365a 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/surface-string-editor-error.png and b/visualRegressionTests-V2/tests/designer/etalons/surface-string-editor-error.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-adaptive-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-adaptive-compact.png index e73ad19578..c3d99db819 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-adaptive-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-adaptive-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-compact-hover-item.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-compact-hover-item.png index 62b161f00e..efaf8bdac9 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-compact-hover-item.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-compact-hover-item.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-popup.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-popup.png index 47d29105ab..13be21bd1f 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-popup.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-left-popup.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-adaptive-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-adaptive-compact.png index 2cccb64004..7e44257c34 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-adaptive-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-adaptive-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-compact-hover-item.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-compact-hover-item.png index 8e8b28f09d..693908fd75 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-compact-hover-item.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-compact-hover-item.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-popup.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-popup.png index ed621ad96b..18883c2157 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-popup.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-popup.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-adaptive-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-adaptive-compact.png index b3f5ab5f21..6fc2b464fb 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-adaptive-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-adaptive-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-compact-hover-item.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-compact-hover-item.png index dceb750518..169673291e 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-compact-hover-item.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-compact-hover-item.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-popup.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-popup.png index 0ecb6e044e..4749f0a918 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-popup.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-popup.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact-hover-item.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact-hover-item.png index 7be3697fff..f3353917f5 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact-hover-item.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact-hover-item.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact.png index 7a06dddf6d..35d771dda5 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-rtl-scroll-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact-hover-item.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact-hover-item.png index e0a9fdd2d8..50cc8e3d9f 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact-hover-item.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact-hover-item.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact.png index 00fe87d607..089a3bfcdc 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-hover-item.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-hover-item.png index 4af76009a1..6842308e89 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-hover-item.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-right-scroll-hover-item.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-compact.png index 98dc4a2e1c..30383642ca 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-entered.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-entered.png index c30a36569f..fd443e0b83 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-entered.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-entered.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-placeholder.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-placeholder.png index b86eaa798a..5d8a7fb78f 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-placeholder.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact-placeholder.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact.png b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact.png index 00098bbe1e..6de6aa371b 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact.png and b/visualRegressionTests-V2/tests/designer/etalons/toolbox-search-rtl-compact.png differ diff --git a/visualRegressionTests-V2/tests/designer/etalons/translation-tab-show-all-strings_mask.png b/visualRegressionTests-V2/tests/designer/etalons/translation-tab-show-all-strings_mask.png index 58c7e031d1..9500fc59e5 100644 Binary files a/visualRegressionTests-V2/tests/designer/etalons/translation-tab-show-all-strings_mask.png and b/visualRegressionTests-V2/tests/designer/etalons/translation-tab-show-all-strings_mask.png differ diff --git a/visualRegressionTests-V2/tests/designer/surface.ts b/visualRegressionTests-V2/tests/designer/surface.ts index 7537f7c6cc..490c317e99 100644 --- a/visualRegressionTests-V2/tests/designer/surface.ts +++ b/visualRegressionTests-V2/tests/designer/surface.ts @@ -1,5 +1,5 @@ import { ClientFunction, Selector } from "testcafe"; -import { url, setJSON, takeElementScreenshot, addQuestionByAddQuestionButton, wrapVisualTest, getTabbedMenuItemByText, creatorTabPreviewName, creatorTabDesignerName, resetHoverToCreator, getPropertyGridCategory, generalGroupName, getListItemByText, surveySettingsButtonSelector, changeToolboxScrolling, changeToolboxSearchEnabled, getToolboxItemByAriaLabel } from "../../helper"; +import { url, setJSON, takeElementScreenshot, addQuestionByAddQuestionButton, wrapVisualTest, getTabbedMenuItemByText, creatorTabPreviewName, creatorTabDesignerName, resetHoverToCreator, getPropertyGridCategory, generalGroupName, getListItemByText, surveySettingsButtonSelector, changeToolboxScrolling, changeToolboxSearchEnabled, getToolboxItemByAriaLabel, setShowAddQuestionButton, setAllowEditSurveyTitle, setExpandCollapseButtonVisibility } from "../../helper"; const title = "Designer surface"; @@ -2144,9 +2144,7 @@ test("Question adorner - collapsed", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-question__content"); const qCollapseButton = Selector(".svc-question__content #collapse"); @@ -2198,9 +2196,7 @@ test("Question adorner - no title collapsed", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-question__content"); const qCollapseButton = Selector(".svc-question__content #collapse"); @@ -2221,7 +2217,7 @@ test("Question adorner - no title collapsed", async (t) => { test("Page adorner - collapsed", async (t) => { await wrapVisualTest(t, async (t, comparer) => { - await t.resizeWindow(1652, 500); + await t.resizeWindow(1000, 500); const json = { elements: [ { @@ -2230,9 +2226,9 @@ test("Page adorner - collapsed", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setAllowEditSurveyTitle(false); + await setShowAddQuestionButton(false); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-page__content"); const qCollapseButton = Selector(".svc-page__content #collapse"); @@ -2241,7 +2237,7 @@ test("Page adorner - collapsed", async (t) => { await takeElementScreenshot("page-adorner-expanded.png", ".svc-tab-designer_content", t, comparer); await t.click(qContent.nth(0), { offsetX: 10, offsetY: 10 }); await t.click(qCollapseButton.filterVisible()); - await t.hover(".svc-toolbox", { speed: 0.1 }); + await resetHoverToCreator(t); await takeElementScreenshot("page-adorner-collapsed-selected.png", ".svc-tab-designer_content", t, comparer); await t.click(".svc-tab-designer_content", { offsetX: 1, offsetY: 1 }); await takeElementScreenshot("page-adorner-collapsed.png", ".svc-tab-designer_content", t, comparer); @@ -2263,9 +2259,7 @@ test("Question adorner - collapsed mobile", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-question__content"); const qCollapseButton = Selector(".svc-question__content #collapse"); @@ -2335,9 +2329,7 @@ test("Collapse all and expand all toolbar", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); await t.hover("#collapseAll"); await takeElementScreenshot("design-surface-toolbar.png", Selector(".svc-tab-designer"), t, comparer); diff --git a/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed-selected.png b/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed-selected.png index 08574132bd..4885932217 100644 Binary files a/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed-selected.png and b/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed-selected.png differ diff --git a/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed.png b/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed.png index 8a7ae67aad..67639752d2 100644 Binary files a/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed.png and b/visualRegressionTests/tests/designer/etalons/page-adorner-collapsed.png differ diff --git a/visualRegressionTests/tests/designer/etalons/page-adorner-expanded.png b/visualRegressionTests/tests/designer/etalons/page-adorner-expanded.png index d27b80c187..8d155b17f7 100644 Binary files a/visualRegressionTests/tests/designer/etalons/page-adorner-expanded.png and b/visualRegressionTests/tests/designer/etalons/page-adorner-expanded.png differ diff --git a/visualRegressionTests/tests/designer/etalons/pg-choices-fast-entry-popup.png b/visualRegressionTests/tests/designer/etalons/pg-choices-fast-entry-popup.png index 0353c6c2d3..2d4dcb9656 100644 Binary files a/visualRegressionTests/tests/designer/etalons/pg-choices-fast-entry-popup.png and b/visualRegressionTests/tests/designer/etalons/pg-choices-fast-entry-popup.png differ diff --git a/visualRegressionTests/tests/designer/etalons/pg-default-value-popup.png b/visualRegressionTests/tests/designer/etalons/pg-default-value-popup.png index 2cdc4f9ce0..e49e0d521d 100644 Binary files a/visualRegressionTests/tests/designer/etalons/pg-default-value-popup.png and b/visualRegressionTests/tests/designer/etalons/pg-default-value-popup.png differ diff --git a/visualRegressionTests/tests/designer/surface.ts b/visualRegressionTests/tests/designer/surface.ts index 7ca790cc37..13a1224aa8 100644 --- a/visualRegressionTests/tests/designer/surface.ts +++ b/visualRegressionTests/tests/designer/surface.ts @@ -1,5 +1,5 @@ import { ClientFunction, Selector } from "testcafe"; -import { url, setJSON, takeElementScreenshot, addQuestionByAddQuestionButton, wrapVisualTest, getTabbedMenuItemByText, creatorTabPreviewName, creatorTabDesignerName, resetHoverToCreator, getPropertyGridCategory, generalGroupName, getListItemByText, surveySettingsButtonSelector, changeToolboxScrolling, changeToolboxSearchEnabled, getToolboxItemByAriaLabel } from "../../helper"; +import { url, setJSON, takeElementScreenshot, addQuestionByAddQuestionButton, wrapVisualTest, getTabbedMenuItemByText, creatorTabPreviewName, creatorTabDesignerName, resetHoverToCreator, getPropertyGridCategory, generalGroupName, getListItemByText, surveySettingsButtonSelector, changeToolboxScrolling, changeToolboxSearchEnabled, getToolboxItemByAriaLabel, setAllowEditSurveyTitle, setShowAddQuestionButton, setExpandCollapseButtonVisibility } from "../../helper"; const title = "Designer surface"; @@ -2144,9 +2144,7 @@ test("Question adorner - collapsed", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-question__content"); const qCollapseButton = Selector(".svc-question__content #collapse"); @@ -2198,9 +2196,7 @@ test("Question adorner - no title collapsed", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-question__content"); const qCollapseButton = Selector(".svc-question__content #collapse"); @@ -2221,7 +2217,7 @@ test("Question adorner - no title collapsed", async (t) => { test("Page adorner - collapsed", async (t) => { await wrapVisualTest(t, async (t, comparer) => { - await t.resizeWindow(1652, 500); + await t.resizeWindow(1000, 500); const json = { elements: [ { @@ -2230,9 +2226,9 @@ test("Page adorner - collapsed", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setAllowEditSurveyTitle(false); + await setShowAddQuestionButton(false); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-page__content"); const qCollapseButton = Selector(".svc-page__content #collapse"); @@ -2241,7 +2237,7 @@ test("Page adorner - collapsed", async (t) => { await takeElementScreenshot("page-adorner-expanded.png", ".svc-tab-designer_content", t, comparer); await t.click(qContent.nth(0), { offsetX: 10, offsetY: 10 }); await t.click(qCollapseButton.filterVisible()); - await t.hover(".svc-toolbox", { speed: 0.1 }); + await resetHoverToCreator(t); await takeElementScreenshot("page-adorner-collapsed-selected.png", ".svc-tab-designer_content", t, comparer); await t.click(".svc-tab-designer_content", { offsetX: 1, offsetY: 1 }); await takeElementScreenshot("page-adorner-collapsed.png", ".svc-tab-designer_content", t, comparer); @@ -2263,9 +2259,7 @@ test("Question adorner - collapsed mobile", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); const qContent = Selector(".svc-question__content"); const qCollapseButton = Selector(".svc-question__content #collapse"); @@ -2335,9 +2329,7 @@ test("Collapse all and expand all toolbar", async (t) => { } ] }; - await ClientFunction(() => { - window["creator"].expandCollapseButtonVisibility = "onhover"; - })(); + await setExpandCollapseButtonVisibility("onhover"); await setJSON(json); await t.hover("#collapseAll"); await takeElementScreenshot("design-surface-toolbar.png", Selector(".svc-tab-designer"), t, comparer);