From 49642c216ddbe12b0b86f4470632c2f50f8023eb Mon Sep 17 00:00:00 2001
From: Dmitry Kurmanov <kurmanov.work@gmail.com>
Date: Thu, 27 Jun 2024 12:54:33 +0400
Subject: [PATCH] PR: Questions with checkboxes - Roles provided for the
 checkboxes are not valid (#8467)

* work for the https://github.com/surveyjs/survey-library/issues/8460

* work for the https://github.com/surveyjs/survey-library/issues/8460
---
 .../src/questions/checkbox-item.component.html       |  2 +-
 packages/survey-vue3-ui/src/CheckboxItem.vue         |  2 +-
 src/knockout/templates/question-checkbox.html        |  3 ++-
 src/question.ts                                      |  2 +-
 src/question_checkbox.ts                             |  5 ++++-
 src/question_expression.ts                           |  2 +-
 src/react/reactquestion_checkbox.tsx                 |  2 +-
 src/vue/checkboxitem.vue                             |  4 ++--
 tests/markup/helper.ts                               |  2 ++
 .../snapshots/checkbox-columns-head-foot.snap.html   | 12 ++++++------
 .../snapshots/checkbox-columns-mobile.snap.html      |  8 ++++----
 .../checkbox-columns-no-head-foot.snap.html          | 12 ++++++------
 tests/markup/snapshots/checkbox-columns.snap.html    |  6 +++---
 tests/markup/snapshots/checkbox-comment-V2.snap.html |  6 +++---
 tests/markup/snapshots/checkbox-disabled.snap.html   |  8 ++++----
 tests/markup/snapshots/checkbox-modern.snap.html     |  6 +++---
 tests/markup/snapshots/checkbox-other-V2.snap.html   |  8 ++++----
 .../snapshots/checkbox-other-maxlength.snap.html     |  6 +++---
 tests/markup/snapshots/checkbox-other.snap.html      | 12 ++++++------
 .../snapshots/checkbox-readonly-selected.snap.html   |  8 ++++----
 tests/markup/snapshots/checkbox-readonly.snap.html   |  8 ++++----
 .../snapshots/checkbox-row-head-foot.snap.html       | 12 ++++++------
 .../snapshots/checkbox-row-no-head-foot.snap.html    | 12 ++++++------
 tests/markup/snapshots/checkbox-v2.snap.html         |  6 +++---
 tests/markup/snapshots/checkbox.snap.html            |  8 ++++----
 ...dynamic-show-in-multiple-columns-mobile.snap.html |  6 +++---
 .../matrixdynamic-show-in-multiple-columns.snap.html |  4 ++--
 27 files changed, 89 insertions(+), 83 deletions(-)

diff --git a/packages/survey-angular-ui/src/questions/checkbox-item.component.html b/packages/survey-angular-ui/src/questions/checkbox-item.component.html
index 7e273844fb..bc00ac8d51 100644
--- a/packages/survey-angular-ui/src/questions/checkbox-item.component.html
+++ b/packages/survey-angular-ui/src/questions/checkbox-item.component.html
@@ -1,3 +1,3 @@
-<input type="checkbox" role="option" [name]="question.name+model.id" [id]="question.getItemId(model)" [class]="question.cssClasses.itemControl"
+<input type="checkbox" [name]="question.name+model.id" [id]="question.getItemId(model)" [class]="question.cssClasses.itemControl" [required]="question.hasRequiredError()"
   [disabled]="!question.getItemEnabled(model)" [readonly]="question.isReadOnlyAttr" [checked]="question.isItemSelected(model)" [value]="model.value" (change)="onChange($event)"/>
 <ng-content></ng-content>
\ No newline at end of file
diff --git a/packages/survey-vue3-ui/src/CheckboxItem.vue b/packages/survey-vue3-ui/src/CheckboxItem.vue
index 4af2fe6f73..3cce02095a 100644
--- a/packages/survey-vue3-ui/src/CheckboxItem.vue
+++ b/packages/survey-vue3-ui/src/CheckboxItem.vue
@@ -3,7 +3,6 @@
     <label :class="question.getLabelClass(item)">
       <input
         type="checkbox"
-        role="option"
         :name="question.name + item.id"
         :checked="question.isItemSelected(item)"
         @input="
@@ -16,6 +15,7 @@
         :disabled="!question.getItemEnabled(item)"
         :readonly="question.isReadOnlyAttr"
         :class="question.cssClasses.itemControl"
+        :required="question.hasRequiredError()"
       /><span
         v-if="question.cssClasses.materialDecorator"
         :class="question.cssClasses.materialDecorator"
diff --git a/src/knockout/templates/question-checkbox.html b/src/knockout/templates/question-checkbox.html
index 04dc57b3a0..3e2709ad88 100644
--- a/src/knockout/templates/question-checkbox.html
+++ b/src/knockout/templates/question-checkbox.html
@@ -46,10 +46,11 @@
       <!-- /ko -->
     </fieldset>
 </script>
+
 <script type="text/html" id="survey-checkbox-item">
   <div role="presentation" data-bind="css: question.getItemClass($data)">
       <label data-bind="css: question.getLabelClass($data)">
-          <input type="checkbox" role="option" data-bind="attr: {name: question.name + id, id: question.getItemId($data), readonly: question.isReadOnlyAttr}, value: $data.value, checked: question.isItemSelected($data), event: { change: (i, e) => { question.clickItemHandler($data, e.target.checked); } }, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"/>
+          <input type="checkbox" data-bind="attr: {name: question.name + id, id: question.getItemId($data), readonly: question.isReadOnlyAttr, required: question.hasRequiredError()}, value: $data.value, checked: question.isItemSelected($data), event: { change: (i, e) => { question.clickItemHandler($data, e.target.checked); } }, enable: question.getItemEnabled($data), css: question.cssClasses.itemControl"/>
           <!-- ko if: question.cssClasses.materialDecorator -->
           <span data-bind="css: question.cssClasses.materialDecorator">
             <!-- ko if: question.itemSvgIcon -->
diff --git a/src/question.ts b/src/question.ts
index f223fde1c4..4d04d59aa0 100644
--- a/src/question.ts
+++ b/src/question.ts
@@ -2196,7 +2196,7 @@ export class Question extends SurveyElement<Question>
       }
     }
   }
-  protected hasRequiredError(): boolean {
+  public hasRequiredError(): boolean {
     return this.isRequired && this.isEmpty();
   }
   private validatorRunner: ValidatorRunner;
diff --git a/src/question_checkbox.ts b/src/question_checkbox.ts
index 4abb7e541c..755c74aa55 100644
--- a/src/question_checkbox.ts
+++ b/src/question_checkbox.ts
@@ -659,7 +659,10 @@ export class QuestionCheckboxModel extends QuestionCheckboxBase {
     return true;
   }
   public get a11y_input_ariaRole(): string {
-    return "listbox";
+    return "group";
+  }
+  public get a11y_input_ariaRequired(): "true" | "false" {
+    return null;
   }
   // EO a11y
 }
diff --git a/src/question_expression.ts b/src/question_expression.ts
index 9891f26d97..ee09631124 100644
--- a/src/question_expression.ts
+++ b/src/question_expression.ts
@@ -78,7 +78,7 @@ export class QuestionExpressionModel extends Question {
   protected canCollectErrors(): boolean {
     return true;
   }
-  protected hasRequiredError(): boolean {
+  public hasRequiredError(): boolean {
     return false;
   }
   private createRunner(): ExpressionRunner {
diff --git a/src/react/reactquestion_checkbox.tsx b/src/react/reactquestion_checkbox.tsx
index 07c213784c..8c327d004a 100644
--- a/src/react/reactquestion_checkbox.tsx
+++ b/src/react/reactquestion_checkbox.tsx
@@ -213,7 +213,6 @@ export class SurveyQuestionCheckboxItem extends ReactSurveyElement {
           <input
             className={this.cssClasses.itemControl}
             type="checkbox"
-            role="option"
             name={this.question.name + this.item.id}
             value={this.item.value}
             id={id}
@@ -222,6 +221,7 @@ export class SurveyQuestionCheckboxItem extends ReactSurveyElement {
             readOnly={this.question.isReadOnlyAttr}
             checked={isChecked}
             onChange={this.handleOnChange}
+            required={this.question.hasRequiredError()}
           />
           {
             this.cssClasses.materialDecorator ?
diff --git a/src/vue/checkboxitem.vue b/src/vue/checkboxitem.vue
index f5a8505ee8..2045b764e2 100644
--- a/src/vue/checkboxitem.vue
+++ b/src/vue/checkboxitem.vue
@@ -2,14 +2,14 @@
   <div role="presentation" :class="question.getItemClass(item)">
     <label :class="question.getLabelClass(item)">
       <input
-        type="checkbox" role="option" :name="question.name+item.id"
+        type="checkbox" :name="question.name+item.id"
         :checked="question.isItemSelected(item)"
         @input="
           (e) => {
             question.clickItemHandler(item, e.target.checked);
           }
         "
-        :value="item.value"
+        :value="item.value" :required="question.hasRequiredError()"
         :id="question.getItemId(item)" :disabled="!question.getItemEnabled(item)" :readonly="question.isReadOnlyAttr"
         :class="question.cssClasses.itemControl" /><span
         v-if="question.cssClasses.materialDecorator" :class="question.cssClasses.materialDecorator">
diff --git a/tests/markup/helper.ts b/tests/markup/helper.ts
index 46c206703e..052c0d8db6 100644
--- a/tests/markup/helper.ts
+++ b/tests/markup/helper.ts
@@ -330,6 +330,8 @@ function clearAttributes(el: Element, removeIds = false) {
   }
   if(el.hasAttribute("readonly"))
     el.setAttribute("readonly", "");
+  if(el.hasAttribute("required"))
+    el.setAttribute("required", "");
   if (el.hasAttribute("disabled"))
     el.setAttribute("disabled", "");
   if(el.hasAttribute("ng-reflect-value")) {
diff --git a/tests/markup/snapshots/checkbox-columns-head-foot.snap.html b/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
index dde642751c..cadfff3f9c 100644
--- a/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-head-foot.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_selectall" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" role="option" type="checkbox" value="">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" type="checkbox" value="">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Select All</span>
 			</span>
@@ -12,7 +12,7 @@
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" role="option" type="checkbox" value="item1">
+					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" type="checkbox" value="item1">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item1</span>
 					</span>
@@ -22,7 +22,7 @@
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" role="option" type="checkbox" value="item2">
+					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" type="checkbox" value="item2">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item2</span>
 					</span>
@@ -32,7 +32,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_none" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" role="option" type="checkbox" value="none">
+			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" type="checkbox" value="none">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">None</span>
 			</span>
@@ -40,7 +40,7 @@
 	</div>
 	<div class="sv_q_checkbox" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" role="option" type="checkbox" value="other">
+			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-columns-mobile.snap.html b/tests/markup/snapshots/checkbox-columns-mobile.snap.html
index 4e6b36c38d..eb29494340 100644
--- a/tests/markup/snapshots/checkbox-columns-mobile.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-mobile.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-2" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" role="option" type="checkbox" value="item3">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html b/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
index 9299262bd7..11e291c639 100644
--- a/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-columns-no-head-foot.snap.html
@@ -1,10 +1,10 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox sv_q_checkbox_selectall" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" role="option" type="checkbox" value="">
+					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" type="checkbox" value="">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">Select All</span>
 					</span>
@@ -12,7 +12,7 @@
 			</div>
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" role="option" type="checkbox" value="item2">
+					<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" type="checkbox" value="item2">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item2</span>
 					</span>
@@ -20,7 +20,7 @@
 			</div>
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" role="option" type="checkbox" value="other">
+					<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" type="checkbox" value="other">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">Other (describe)</span>
 					</span>
@@ -30,7 +30,7 @@
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" role="option" type="checkbox" value="item1">
+					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" type="checkbox" value="item1">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item1</span>
 					</span>
@@ -38,7 +38,7 @@
 			</div>
 			<div class="sv_q_checkbox sv_q_checkbox_none" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" role="option" type="checkbox" value="none">
+					<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" type="checkbox" value="none">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">None</span>
 					</span>
diff --git a/tests/markup/snapshots/checkbox-columns.snap.html b/tests/markup/snapshots/checkbox-columns.snap.html
index 48aadc32dd..2bbfdae5f2 100644
--- a/tests/markup/snapshots/checkbox-columns.snap.html
+++ b/tests/markup/snapshots/checkbox-columns.snap.html
@@ -1,10 +1,10 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div>
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+					<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item1</span>
 					</span>
@@ -14,7 +14,7 @@
 		<div class="sv_q_select_column sv-q-column-2" role="presentation">
 			<div class="sv_q_checkbox" role="presentation">
 				<label class="sv_q_checkbox_label">
-					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+					<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 					<span class="sv_q_checkbox_control_label">
 						<span class="sv-string-viewer">item2</span>
 					</span>
diff --git a/tests/markup/snapshots/checkbox-comment-V2.snap.html b/tests/markup/snapshots/checkbox-comment-V2.snap.html
index e9c179cc23..9076cfa569 100644
--- a/tests/markup/snapshots/checkbox-comment-V2.snap.html
+++ b/tests/markup/snapshots/checkbox-comment-V2.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase" role="listbox">
+<fieldset aria-invalid="false" aria-label="name" class="sd-selectbase" role="group">
 	<legend class="sv-hidden">name</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
 		<label class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -19,6 +19,6 @@
 	<div>
 		<span class="sv-string-viewer">Other (describe)</span>
 	</div>
-	<textarea aria-label="name" aria-required="false" class="sd-comment sd-input sd-selectbase__other" id="testid0_comment" placeholder="" style="resize:both;">
+	<textarea aria-label="name" class="sd-comment sd-input sd-selectbase__other" id="testid0_comment" placeholder="" style="resize:both;">
 	</textarea>
 </div>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-disabled.snap.html b/tests/markup/snapshots/checkbox-disabled.snap.html
index 178e38dc76..906b3328da 100644
--- a/tests/markup/snapshots/checkbox-disabled.snap.html
+++ b/tests/markup/snapshots/checkbox-disabled.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-editor" contenteditable="true">item1</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-editor" contenteditable="true">item2</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_2" name="nameitem3" role="option" type="checkbox" value="item3">
+			<input class="sv_q_checkbox_control_item" disabled="" id="testid0i_2" name="nameitem3" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-editor" contenteditable="true">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-modern.snap.html b/tests/markup/snapshots/checkbox-modern.snap.html
index 55818a0fb3..602cbe0079 100644
--- a/tests/markup/snapshots/checkbox-modern.snap.html
+++ b/tests/markup/snapshots/checkbox-modern.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv-selectbase" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv-selectbase" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv-checkbox sv-checkbox--allowhover sv-item sv-q-col-1 sv-selectbase__item" role="presentation">
 		<label class="sv-selectbase__label">
-			<input class="sv-item__control sv-visuallyhidden" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sv-item__control sv-visuallyhidden" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sv-checkbox__decorator sv-item__decorator sv-selectbase__decorator">
 				<svg class="sv-checkbox__svg sv-item__svg">
 					<use xlink:href="#icon-moderncheck" class="">
@@ -16,7 +16,7 @@
 	</div>
 	<div class="sv-checkbox sv-checkbox--allowhover sv-item sv-q-col-1 sv-selectbase__item" role="presentation">
 		<label class="sv-selectbase__label">
-			<input class="sv-item__control sv-visuallyhidden" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sv-item__control sv-visuallyhidden" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 			<span class="sv-checkbox__decorator sv-item__decorator sv-selectbase__decorator">
 				<svg class="sv-checkbox__svg sv-item__svg">
 					<use xlink:href="#icon-moderncheck" class="">
diff --git a/tests/markup/snapshots/checkbox-other-V2.snap.html b/tests/markup/snapshots/checkbox-other-V2.snap.html
index 1710464faa..4a2455b5b9 100644
--- a/tests/markup/snapshots/checkbox-other-V2.snap.html
+++ b/tests/markup/snapshots/checkbox-other-V2.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sd-selectbase" role="listbox">
+<fieldset aria-invalid="false" aria-label="name" class="sd-selectbase" role="group">
 	<legend class="sv-hidden">name</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
 		<label class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -16,7 +16,7 @@
 	</div>
 	<div class="sd-checkbox sd-checkbox--checked sd-item sd-item--checked sd-selectbase__item sv-q-col-1" role="presentation">
 		<label class="sd-selectbase__label">
-			<input checked="" class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="nameother" role="option" type="checkbox" value="other">
+			<input checked="" class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="nameother" type="checkbox" value="other">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -29,7 +29,7 @@
 		</label>
 	</div>
 	<div class="form-group sd-question__comment-area">
-		<textarea aria-label="name" aria-required="false" class="sd-comment sd-input sd-selectbase__other" id="testid0_other" placeholder="" style="resize:both;">
+		<textarea aria-label="name" class="sd-comment sd-input sd-selectbase__other" id="testid0_other" placeholder="" style="resize:both;">
 		</textarea>
 	</div>
 </fieldset>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-other-maxlength.snap.html b/tests/markup/snapshots/checkbox-other-maxlength.snap.html
index 5caf08ff6e..841f4a941e 100644
--- a/tests/markup/snapshots/checkbox-other-maxlength.snap.html
+++ b/tests/markup/snapshots/checkbox-other-maxlength.snap.html
@@ -1,15 +1,15 @@
-<fieldset aria-invalid="false" aria-label="name" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="name" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">name</legend>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_0" name="nameother" role="option" type="checkbox" value="other">
+			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_0" name="nameother" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
 		</label>
 	</div>
 	<div class="form-group">
-		<textarea aria-label="name" aria-required="false" class="sv_q_checkbox_other sv_q_other" id="testid0_other" maxlength="15" placeholder="" style="resize:both;">
+		<textarea aria-label="name" class="sv_q_checkbox_other sv_q_other" id="testid0_other" maxlength="15" placeholder="" style="resize:both;">
 		</textarea>
 	</div>
 </fieldset>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-other.snap.html b/tests/markup/snapshots/checkbox-other.snap.html
index d14f080c7c..7ccc61af2f 100644
--- a/tests/markup/snapshots/checkbox-other.snap.html
+++ b/tests/markup/snapshots/checkbox-other.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" role="option" type="checkbox" value="item3">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
@@ -26,14 +26,14 @@
 	</div>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_3" name="nameother" role="option" type="checkbox" value="other">
+			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_3" name="nameother" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
 		</label>
 	</div>
 	<div class="form-group">
-		<textarea aria-label="Question title" aria-required="false" class="sv_q_checkbox_other sv_q_other" id="testid0_other" placeholder="" style="resize:both;">
+		<textarea aria-label="Question title" class="sv_q_checkbox_other sv_q_other" id="testid0_other" placeholder="" style="resize:both;">
 		</textarea>
 	</div>
 </fieldset>
\ No newline at end of file
diff --git a/tests/markup/snapshots/checkbox-readonly-selected.snap.html b/tests/markup/snapshots/checkbox-readonly-selected.snap.html
index d8c4288c65..0afa8be99d 100644
--- a/tests/markup/snapshots/checkbox-readonly-selected.snap.html
+++ b/tests/markup/snapshots/checkbox-readonly-selected.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="checked sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" readonly="" role="option" type="checkbox" value="item1">
+			<input checked="" class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" readonly="" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" readonly="" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" readonly="" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" readonly="" role="option" type="checkbox" value="item3">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" readonly="" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-readonly.snap.html b/tests/markup/snapshots/checkbox-readonly.snap.html
index dced286721..c9e44661ed 100644
--- a/tests/markup/snapshots/checkbox-readonly.snap.html
+++ b/tests/markup/snapshots/checkbox-readonly.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" readonly="" role="option" type="checkbox" value="item1">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" readonly="" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" readonly="" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" readonly="" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" readonly="" role="option" type="checkbox" value="item3">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" readonly="" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-row-head-foot.snap.html b/tests/markup/snapshots/checkbox-row-head-foot.snap.html
index f81864cf87..1b5546eb5a 100644
--- a/tests/markup/snapshots/checkbox-row-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-row-head-foot.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_selectall" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" role="option" type="checkbox" value="">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" type="checkbox" value="">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Select All</span>
 			</span>
@@ -11,7 +11,7 @@
 	<div>
 		<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
 			<label class="sv_q_checkbox_label">
-				<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" role="option" type="checkbox" value="item1">
+				<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" type="checkbox" value="item1">
 				<span class="sv_q_checkbox_control_label">
 					<span class="sv-string-viewer">item1</span>
 				</span>
@@ -19,7 +19,7 @@
 		</div>
 		<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
 			<label class="sv_q_checkbox_label">
-				<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" role="option" type="checkbox" value="item2">
+				<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" type="checkbox" value="item2">
 				<span class="sv_q_checkbox_control_label">
 					<span class="sv-string-viewer">item2</span>
 				</span>
@@ -28,7 +28,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_none" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" role="option" type="checkbox" value="none">
+			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" type="checkbox" value="none">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">None</span>
 			</span>
@@ -36,7 +36,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" role="option" type="checkbox" value="other">
+			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html b/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
index d4bba5290f..5febe00d29 100644
--- a/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
+++ b/tests/markup/snapshots/checkbox-row-no-head-foot.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_selectall" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" role="option" type="checkbox" value="">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameselectall" type="checkbox" value="">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Select All</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem1" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem2" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
@@ -26,7 +26,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline sv_q_checkbox_none" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" role="option" type="checkbox" value="none">
+			<input class="sv_q_checkbox_control_item" id="testid0i_3" name="namenone" type="checkbox" value="none">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">None</span>
 			</span>
@@ -34,7 +34,7 @@
 	</div>
 	<div class="sv_q_checkbox sv_q_checkbox_inline" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" role="option" type="checkbox" value="other">
+			<input class="sv_q_checkbox_control_item" id="testid0i_4" name="nameother" type="checkbox" value="other">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">Other (describe)</span>
 			</span>
diff --git a/tests/markup/snapshots/checkbox-v2.snap.html b/tests/markup/snapshots/checkbox-v2.snap.html
index 2b62263062..1e464e4e5c 100644
--- a/tests/markup/snapshots/checkbox-v2.snap.html
+++ b/tests/markup/snapshots/checkbox-v2.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sd-selectbase" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sd-selectbase" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
 		<label class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
@@ -16,7 +16,7 @@
 	</div>
 	<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sv-q-col-1" role="presentation">
 		<label class="sd-selectbase__label">
-			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 			<span class="sd-checkbox__decorator sd-item__decorator">
 				<svg class="sd-checkbox__svg sd-item__svg">
 					<use xlink:href="#icon-v2check" class="">
diff --git a/tests/markup/snapshots/checkbox.snap.html b/tests/markup/snapshots/checkbox.snap.html
index af4e1cae5b..ab80cbf232 100644
--- a/tests/markup/snapshots/checkbox.snap.html
+++ b/tests/markup/snapshots/checkbox.snap.html
@@ -1,8 +1,8 @@
-<fieldset aria-invalid="false" aria-label="Question title" aria-required="false" class="sv_qcbc sv_qcbx" role="listbox">
+<fieldset aria-invalid="false" aria-label="Question title" class="sv_qcbc sv_qcbx" role="group">
 	<legend class="sv-hidden">Question title</legend>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" role="option" type="checkbox" value="item1">
+			<input class="sv_q_checkbox_control_item" id="testid0i_0" name="nameitem1" type="checkbox" value="item1">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item1</span>
 			</span>
@@ -10,7 +10,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" role="option" type="checkbox" value="item2">
+			<input class="sv_q_checkbox_control_item" id="testid0i_1" name="nameitem2" type="checkbox" value="item2">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item2</span>
 			</span>
@@ -18,7 +18,7 @@
 	</div>
 	<div class="sv_q_checkbox sv-q-col-1" role="presentation">
 		<label class="sv_q_checkbox_label">
-			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" role="option" type="checkbox" value="item3">
+			<input class="sv_q_checkbox_control_item" id="testid0i_2" name="nameitem3" type="checkbox" value="item3">
 			<span class="sv_q_checkbox_control_label">
 				<span class="sv-string-viewer">item3</span>
 			</span>
diff --git a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
index 8b9676dd25..ef199282db 100644
--- a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
+++ b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns-mobile.snap.html
@@ -49,11 +49,11 @@
 						<span class="sv-string-viewer sv-string-viewer--multiline">col2</span>
 					</span>
 					<div class="sd-table__question-wrapper">
-						<fieldset aria-invalid="false" aria-label="row row1, column col2" aria-required="true" class="sd-selectbase sd-selectbase--row" role="listbox">
+						<fieldset aria-invalid="false" aria-label="row row1, column col2" class="sd-selectbase sd-selectbase--row" role="group">
 							<legend class="sv-hidden">row row1, column col2</legend>
 							<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
 								<label class="sd-selectbase__label">
-									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2Item 1" role="option" type="checkbox" value="Item 1">
+									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2Item 1" required="" type="checkbox" value="Item 1">
 									<span class="sd-checkbox__decorator sd-item__decorator">
 										<svg class="sd-checkbox__svg sd-item__svg">
 											<use xlink:href="#icon-v2check" class="">
@@ -67,7 +67,7 @@
 							</div>
 							<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
 								<label class="sd-selectbase__label">
-									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2Item 2" role="option" type="checkbox" value="Item 2">
+									<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2Item 2" required="" type="checkbox" value="Item 2">
 									<span class="sd-checkbox__decorator sd-item__decorator">
 										<svg class="sd-checkbox__svg sd-item__svg">
 											<use xlink:href="#icon-v2check" class="">
diff --git a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html
index 5e5a55c21c..56429871bb 100644
--- a/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html
+++ b/tests/markup/snapshots/matrixdynamic-show-in-multiple-columns.snap.html
@@ -35,7 +35,7 @@
 					<div class="sd-table__question-wrapper">
 						<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
 							<label class="sd-selectbase__label">
-								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2Item 1" role="option" type="checkbox" value="Item 1">
+								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_0" name="col2Item 1" required="" type="checkbox" value="Item 1">
 								<span class="sd-checkbox__decorator sd-item__decorator">
 									<svg class="sd-checkbox__svg sd-item__svg">
 										<use xlink:href="#icon-v2check" class="">
@@ -50,7 +50,7 @@
 					<div class="sd-table__question-wrapper">
 						<div class="sd-checkbox sd-checkbox--allowhover sd-item sd-item--allowhover sd-selectbase__item sd-selectbase__item--inline" role="presentation">
 							<label class="sd-selectbase__label">
-								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2Item 2" role="option" type="checkbox" value="Item 2">
+								<input class="sd-checkbox__control sd-item__control sd-visuallyhidden" id="testid0row1cell3i_1" name="col2Item 2" required="" type="checkbox" value="Item 2">
 								<span class="sd-checkbox__decorator sd-item__decorator">
 									<svg class="sd-checkbox__svg sd-item__svg">
 										<use xlink:href="#icon-v2check" class="">