Skip to content

Commit

Permalink
Merge branch 'master' into bug/7359-pages-onserlizevalue
Browse files Browse the repository at this point in the history
  • Loading branch information
@OlgaLarina
OlgaLarina committed Nov 17, 2023
2 parents de62318 + 14613b6 commit 33347f4
Show file tree
Hide file tree
Showing 15 changed files with 162 additions and 40 deletions.
2 changes: 2 additions & 0 deletions src/defaultV2-theme/blocks/sd-element.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@
padding-bottom: var(--sd-base-padding);
background: $question-background;
box-shadow: $shadow-small;
display: flex;
flex-direction: column;
}

//compact styles
Expand Down
6 changes: 5 additions & 1 deletion src/defaultV2-theme/blocks/sd-question.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}

.sd-element--with-frame>.sd-question__erbox--below-question {
margin-top: var(--sd-base-padding);
margin-top: auto;
border-radius: 0 0 calcCornerRadius(1) calcCornerRadius(1);
}

Expand Down Expand Up @@ -80,6 +80,9 @@

&.sd-question--error-bottom {
padding-bottom: 0;
&>.sd-question__content {
margin-bottom: var(--sd-base-padding)
}
}

&>.sd-question__erbox--outside-question {
Expand All @@ -105,6 +108,7 @@
.sd-question--left {
display: flex;
flex-wrap: wrap;
flex-direction: row;
}

.sd-question__content--left {
Expand Down
4 changes: 2 additions & 2 deletions src/localization/english.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ export var englishStrings = {
textMinMaxLength:
"Please enter at least {0} and no more than {1} characters.",
minRowCountError: "Please fill in at least {0} row(s).",
minSelectError: "Please select at least {0} variant(s).",
maxSelectError: "Please select no more than {0} variant(s).",
minSelectError: "Please select at least {0} option(s).",
maxSelectError: "Please select no more than {0} option(s).",
numericMinMax: "The '{0}' should be at least {1} and at most {2}",
numericMin: "The '{0}' should be at least {1}",
numericMax: "The '{0}' should be at most {1}",
Expand Down
4 changes: 3 additions & 1 deletion src/martixBase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,9 @@ export class QuestionMatrixBaseModel<TRow, TColumn> extends Question {

//a11y
public getCellAriaLabel(rowTitle:string, columnTitle:string):string {
return `row ${rowTitle}, column ${columnTitle}`;
const row = (this.getLocalizationString("matrix_row") || "row").toLocaleLowerCase();
const column = (this.getLocalizationString("matrix_column") || "column").toLocaleLowerCase();
return `${row} ${rowTitle}, ${column} ${columnTitle}`;
}

public get isNewA11yStructure(): boolean {
Expand Down
5 changes: 4 additions & 1 deletion src/question_matrixdropdownbase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export class MatrixDropdownCell {
private updateCellQuestionTitleDueToAccessebility(row: MatrixDropdownRowModelBase): void {
this.questionValue.locTitle.onGetTextCallback = (str: string): string => {
if(!row || !row.getSurvey()) return this.questionValue.title;
const rowTitle = row.locText && row.locText.renderedHtml;
const rowTitle = row.getAccessbilityText();
if(!rowTitle) return this.questionValue.title;
return this.column.colOwner.getCellAriaLabel(rowTitle, this.questionValue.title);
};
Expand Down Expand Up @@ -286,6 +286,9 @@ implements ISurveyData, ISurveyImpl, ILocalizableOwner {
public get locText(): LocalizableString {
return null;
}
public getAccessbilityText(): string {
return this.locText && this.locText.renderedHtml;
}
public get hasPanel(): boolean {
if (!this.data) return false;
return this.data.hasDetailPanel(this);
Expand Down
4 changes: 3 additions & 1 deletion src/question_matrixdynamic.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ export class MatrixDynamicRowModel extends MatrixDropdownRowModelBase implements
public get rowName() {
return this.id;
}

public getAccessbilityText(): string {
return (this.index + 1).toString();
}
public get shortcutText(): string {
const matrix = <QuestionMatrixDynamicModel>this.data;
const index = matrix.visibleRows.indexOf(this) + 1;
Expand Down
4 changes: 3 additions & 1 deletion src/question_signaturepad.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ export class QuestionSignaturePadModel extends Question {
*
* Default value: `false`
*
* > The signature area is scaled only for display. The resulting image will have dimensions specified by the [`signatureHeight`](#signatureHeight) and [`signatureWidth`](#signatureWidth) properties.
* When you enable this property, the signature area's width (the [`signatureWidth`](#signatureWidth) property) is increased or descreased to occupy all available width within the question. The area's height (the [`signatureHeight`](#signatureHeight) property) changes proportionally to the width, keeping the ratio of `signatureWidth` to `signatureHeight` constant. Specify the `signatureWidth` and `signatureHeight` properties if you want to control the ratio.
*
* > The signature area is scaled only for display. The image saved in survey results will have dimensions specified by the `signatureHeight` and `signatureWidth` properties.
*/
@property() signatureAutoScaleEnabled: boolean;
/**
Expand Down
24 changes: 12 additions & 12 deletions tests/markup/snapshots/matrixdynamic-default.snap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<div>
<div>
<div class="sv_select_wrapper">
<div aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 1" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell0i" role="combobox">
<div aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="row 1, column Column 1" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell0i" role="combobox">
<div class="sv_q_dropdown__value">
<input aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-label="Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell0i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
<input aria-controls="testid0row1cell0i_list" aria-expanded="false" aria-label="row 1, column Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell0i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
</div>
<div class="sv_q_dropdown_clean-button" style="display:none;" tabindex="-1">
<svg class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
Expand Down Expand Up @@ -61,9 +61,9 @@
<div>
<div>
<div class="sv_select_wrapper">
<div aria-controls="testid0row1cell1i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 2" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell1i" role="combobox">
<div aria-controls="testid0row1cell1i_list" aria-expanded="false" aria-invalid="false" aria-label="row 1, column Column 2" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell1i" role="combobox">
<div class="sv_q_dropdown__value">
<input aria-controls="testid0row1cell1i_list" aria-expanded="false" aria-label="Column 2" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell1i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
<input aria-controls="testid0row1cell1i_list" aria-expanded="false" aria-label="row 1, column Column 2" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell1i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
</div>
<div class="sv_q_dropdown_clean-button" style="display:none;" tabindex="-1">
<svg class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
Expand Down Expand Up @@ -100,9 +100,9 @@
<div>
<div>
<div class="sv_select_wrapper">
<div aria-controls="testid0row1cell2i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 3" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell2i" role="combobox">
<div aria-controls="testid0row1cell2i_list" aria-expanded="false" aria-invalid="false" aria-label="row 1, column Column 3" aria-required="false" class="sv_q_dropdown_control" id="testid0row1cell2i" role="combobox">
<div class="sv_q_dropdown__value">
<input aria-controls="testid0row1cell2i_list" aria-expanded="false" aria-label="Column 3" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell2i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
<input aria-controls="testid0row1cell2i_list" aria-expanded="false" aria-label="row 1, column Column 3" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row1cell2i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
</div>
<div class="sv_q_dropdown_clean-button" style="display:none;" tabindex="-1">
<svg class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
Expand Down Expand Up @@ -154,9 +154,9 @@
<div>
<div>
<div class="sv_select_wrapper">
<div aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 1" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell0i" role="combobox">
<div aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-invalid="false" aria-label="row 2, column Column 1" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell0i" role="combobox">
<div class="sv_q_dropdown__value">
<input aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-label="Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell0i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
<input aria-controls="testid0row3cell0i_list" aria-expanded="false" aria-label="row 2, column Column 1" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell0i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
</div>
<div class="sv_q_dropdown_clean-button" style="display:none;" tabindex="-1">
<svg class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
Expand Down Expand Up @@ -193,9 +193,9 @@
<div>
<div>
<div class="sv_select_wrapper">
<div aria-controls="testid0row3cell1i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 2" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell1i" role="combobox">
<div aria-controls="testid0row3cell1i_list" aria-expanded="false" aria-invalid="false" aria-label="row 2, column Column 2" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell1i" role="combobox">
<div class="sv_q_dropdown__value">
<input aria-controls="testid0row3cell1i_list" aria-expanded="false" aria-label="Column 2" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell1i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
<input aria-controls="testid0row3cell1i_list" aria-expanded="false" aria-label="row 2, column Column 2" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell1i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
</div>
<div class="sv_q_dropdown_clean-button" style="display:none;" tabindex="-1">
<svg class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
Expand Down Expand Up @@ -232,9 +232,9 @@
<div>
<div>
<div class="sv_select_wrapper">
<div aria-controls="testid0row3cell2i_list" aria-expanded="false" aria-invalid="false" aria-label="Column 3" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell2i" role="combobox">
<div aria-controls="testid0row3cell2i_list" aria-expanded="false" aria-invalid="false" aria-label="row 2, column Column 3" aria-required="false" class="sv_q_dropdown_control" id="testid0row3cell2i" role="combobox">
<div class="sv_q_dropdown__value">
<input aria-controls="testid0row3cell2i_list" aria-expanded="false" aria-label="Column 3" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell2i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
<input aria-controls="testid0row3cell2i_list" aria-expanded="false" aria-label="row 2, column Column 3" autocomplete="off" class="sv_q_dropdown__filter-string-input" id="testid0row3cell2i_0" inputmode="text" placeholder="Select..." readonly="" role="combobox" type="text">
</div>
<div class="sv_q_dropdown_clean-button" style="display:none;" tabindex="-1">
<svg class="sv_q_dropdown_clean-button-svg sv-svg-icon" role="img">
Expand Down

0 comments on commit 33347f4

Please sign in to comment.