Skip to content

Commit

Permalink
work for #6640 Unwanted indent below input (description = below input…
Browse files Browse the repository at this point in the history 
…). (#6662)

Co-authored-by: OlgaLarina <olga.larina.dev@gmail.com>
  • Loading branch information
@OlgaLarina
OlgaLarina and OlgaLarina committed Aug 4, 2023
1 parent 456af80 commit a0cca11
Show file tree
Hide file tree
Showing 15 changed files with 58 additions and 46 deletions.
4 changes: 2 additions & 2 deletions src/question.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,10 +586,10 @@ export class Question extends SurveyElement<Question>
this.updateQuestionCss();
}
get hasDescriptionUnderTitle(): boolean {
return this.getDescriptionLocation() == "underTitle";
return this.getDescriptionLocation() == "underTitle" && this.hasDescription;
}
get hasDescriptionUnderInput(): boolean {
return this.getDescriptionLocation() == "underInput";
return this.getDescriptionLocation() == "underInput" && this.hasDescription;
}
private getDescriptionLocation() {
if (this.descriptionLocation !== "default") return this.descriptionLocation;
Expand Down
8 changes: 0 additions & 8 deletions tests/markup/snapshots/page-swnl-title-v2.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ <h5 class="sd-element__title sd-question__title sd-title" id="testid0_ariaTitle"
<span>&nbsp;</span>
<span class="sv-string-viewer">Question title</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-invalid="false" aria-labelledby="testid0_ariaTitle" aria-required="false" class="sd-input sd-text" id="testid0i" placeholder="" type="text">
Expand All @@ -24,10 +20,6 @@ <h5 class="sd-element__title sd-question__title sd-title" id="testid1_ariaTitle"
<span>&nbsp;</span>
<span class="sv-string-viewer">Question title</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-invalid="false" aria-labelledby="testid1_ariaTitle" aria-required="false" class="sd-input sd-text" id="testid1i" placeholder="" type="text">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/page-title-v2.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ <h5 class="sd-element__title sd-question__title sd-title" id="testid0_ariaTitle"
<span>&nbsp;</span>
<span class="sv-string-viewer">Question title</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-invalid="false" aria-labelledby="testid0_ariaTitle" aria-required="false" class="sd-input sd-text" id="testid0i" placeholder="" type="text">
Expand Down
8 changes: 0 additions & 8 deletions tests/markup/snapshots/panel-page-swnl-title-v2.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ <h5 class="sd-element__title sd-question__title sd-title" id="testid0_ariaTitle"
<span>&nbsp;</span>
<span class="sv-string-viewer">Question title</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-invalid="false" aria-labelledby="testid0_ariaTitle" aria-required="false" class="sd-input sd-text" id="testid0i" placeholder="" type="text">
Expand All @@ -26,10 +22,6 @@ <h5 class="sd-element__title sd-question__title sd-title" id="testid0_ariaTitle"
<h5 class="sd-element__title sd-question__title sd-title" id="testid1_ariaTitle">
<span class="sv-string-viewer">Question title</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-invalid="false" aria-labelledby="testid1_ariaTitle" aria-required="false" class="sd-input sd-text" id="testid1i" placeholder="" type="text">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/paneldynamic-progress-tab-center.snap.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
<div class="sd-tabs-toolbar sd-tabs-toolbar--center sv-action-bar sv-action-bar--default-size-mode">
<div class="sv-action">
<div class="sv-action__content">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/paneldynamic-progress-tab-left.snap.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
<div class="sd-tabs-toolbar sd-tabs-toolbar--left sv-action-bar sv-action-bar--default-size-mode">
<div class="sv-action">
<div class="sv-action__content">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/paneldynamic-progress-tab-right.snap.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
<div class="sd-tabs-toolbar sd-tabs-toolbar--right sv-action-bar sv-action-bar--default-size-mode">
<div class="sv-action">
<div class="sv-action__content">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/question-errors-v2-bottom.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ <h5 class="sd-element__title sd-question__title sd-question__title--error sd-que
<span>&nbsp;</span>
<span aria-hidden="true" class="sd-question__required-text">*</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-describedby="testid0_errors" aria-invalid="true" aria-labelledby="testid0_ariaTitle" aria-required="true" class="sd-input sd-input--error sd-text" id="testid0i" placeholder="" type="text">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/question-errors-v2-top.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ <h5 class="sd-element__title sd-question__title sd-question__title--error sd-que
<span>&nbsp;</span>
<span aria-hidden="true" class="sd-question__required-text">*</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-describedby="testid0_errors" aria-invalid="true" aria-labelledby="testid0_ariaTitle" aria-required="true" class="sd-input sd-input--error sd-text" id="testid0i" placeholder="" type="text">
Expand Down
4 changes: 0 additions & 4 deletions tests/markup/snapshots/question-with-indent.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ <h5 class="sd-element__title sd-question__title sd-title" id="testid0_ariaTitle"
<span>&nbsp;</span>
<span class="sv-string-viewer">name</span>
</h5>
<div class="sd-description sd-question__description" style="display:none;">
<span class="sv-string-viewer">
</span>
</div>
</div>
<div class="sd-question__content sd-text__content" role="presentation">
<input aria-invalid="false" aria-labelledby="testid0_ariaTitle" aria-required="false" class="sd-input sd-text" id="testid0i" placeholder="" type="text">
Expand Down
1 change: 1 addition & 0 deletions tests/surveytests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16379,6 +16379,7 @@ QUnit.test("check descriptionLocation change css classes", function (assert) {
"elements": [
{
"type": "text",
"description": "question-description",
"descriptionLocation": "hidden",
"name": "question1",
}
Expand Down
Binary file added visualRegressionTests/tests/defaultV2/etalons/question-description-empty.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...essionTests/tests/defaultV2/etalons/question-descriptionLocation-underInput.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...essionTests/tests/defaultV2/etalons/question-descriptionLocation-underTitle.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions visualRegressionTests/tests/defaultV2/question.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,4 +636,59 @@ frameworks.forEach(framework => {
await takeElementScreenshot("question-baseunit.png", questionRoot, t, comparer);
});
});

test("Question descriptionLocation property", async (t) => {
await wrapVisualTest(t, async (t, comparer) => {
await t.resizeWindow(1920, 1080);
await initSurvey(framework, {
"focusFirstQuestionAutomatic": false,
showQuestionNumbers: "off",
"pages": [
{
"name": "page1",
"elements": [
{
name: "q1",
type: "text",
title: "description underTitle",
description: "question-description",
},
{
name: "q2",
type: "text",
title: "description underTitle",
description: "question-description",
descriptionLocation: "underTitle",
},
{
name: "q3",
type: "text",
title: "description empty",
descriptionLocation: "underTitle",
},
{
name: "q4",
type: "text",
title: "description underInput",
description: "question-description",
descriptionLocation: "underInput",
},
{
name: "q5",
type: "text",
title: "description empty",
descriptionLocation: "underInput",
}
]
}
]
});
const questionRows = Selector(".sd-row");
await takeElementScreenshot("question-descriptionLocation-underTitle.png", questionRows.nth(0), t, comparer);
await takeElementScreenshot("question-descriptionLocation-underTitle.png", questionRows.nth(1), t, comparer);
await takeElementScreenshot("question-description-empty.png", questionRows.nth(2), t, comparer);
await takeElementScreenshot("question-description-empty.png", questionRows.nth(4), t, comparer);
await takeElementScreenshot("question-descriptionLocation-underInput.png", questionRows.nth(3), t, comparer);
});
});
});

0 comments on commit a0cca11

Please sign in to comment.