From c5e90a748c175e43b9a1cf3c0d51755650685ef0 Mon Sep 17 00:00:00 2001
From: Andrew Telnov <andrew.telnov@gmail.com>
Date: Tue, 20 Apr 2021 13:11:35 +0300
Subject: [PATCH] Fix: Vue (radiogroup and checkbox questions): enableIf in
 choices property doesn't work correctly #2807

---
 src/vue/checkboxitem.vue   | 23 +++++++++++++++++------
 src/vue/radiogroupitem.vue |  9 +++++++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/vue/checkboxitem.vue b/src/vue/checkboxitem.vue
index 5d767ac1c1..7d918ce001 100644
--- a/src/vue/checkboxitem.vue
+++ b/src/vue/checkboxitem.vue
@@ -12,7 +12,9 @@
         v-bind:aria-required="question.isRequired"
         :aria-label="item.locText.renderedHtml"
         :aria-invalid="question.errors.length > 0"
-        :aria-describedby="question.errors.length > 0 ? question.id + '_errors' : null"
+        :aria-describedby="
+          question.errors.length > 0 ? question.id + '_errors' : null
+        "
         :class="question.cssClasses.itemControl"
       />
       <input
@@ -26,7 +28,9 @@
         v-bind:aria-required="question.isRequired"
         :aria-label="item.locText.renderedHtml"
         :aria-invalid="question.errors.length > 0"
-        :aria-describedby="question.errors.length > 0 ? question.id + '_errors' : null"
+        :aria-describedby="
+          question.errors.length > 0 ? question.id + '_errors' : null
+        "
         :class="question.cssClasses.itemControl"
       />
       <span :class="question.cssClasses.materialDecorator">
@@ -44,7 +48,9 @@
       </span>
     </label>
     <survey-other-choice
-      v-show="question.hasOther && question.renderedValue && question.isOtherSelected"
+      v-show="
+        question.hasOther && question.renderedValue && question.isOtherSelected
+      "
       v-if="item.value == question.otherItem.value"
       :question="question"
     />
@@ -52,15 +58,20 @@
 </template>
 
 <script lang="ts">
+import { ItemValue, Base } from "survey-core";
 import Vue from "vue";
 import { Component, Prop } from "vue-property-decorator";
+import { BaseVue } from "./base";
 
 @Component
-export class CheckboxItem extends Vue {
+export class CheckboxItem extends BaseVue {
   @Prop() question: any;
-  @Prop() item: any;
+  @Prop() item: ItemValue;
   @Prop() index: any;
   @Prop() hideLabel: boolean;
+  protected getModel(): Base {
+    return this.item;
+  }
   get isAllSelected() {
     return this.question.isAllSelected;
   }
@@ -73,4 +84,4 @@ export class CheckboxItem extends Vue {
 }
 Vue.component("survey-checkbox-item", CheckboxItem);
 export default CheckboxItem;
-</script>
\ No newline at end of file
+</script>
diff --git a/src/vue/radiogroupitem.vue b/src/vue/radiogroupitem.vue
index 4bb437eae4..ce7926f0d9 100644
--- a/src/vue/radiogroupitem.vue
+++ b/src/vue/radiogroupitem.vue
@@ -41,15 +41,20 @@
 </template>
 
 <script lang="ts">
+import { ItemValue, Base } from "survey-core";
 import Vue from "vue";
 import { Component, Prop } from "vue-property-decorator";
+import { BaseVue } from "./base";
 
 @Component
-export class RadiogroupItem extends Vue {
+export class RadiogroupItem extends BaseVue {
   @Prop() question: any;
-  @Prop() item: any;
+  @Prop() item: ItemValue;
   @Prop() index: any;
   @Prop() hideLabel: boolean;
+  protected getModel(): Base {
+    return this.item;
+  }
   getLabelClass(item: any) {
     return this.question.getLabelClass(item);
   }