From c636777200b3915ac0b3fee02a50da19d7f10d01 Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 4 Jul 2022 14:03:36 +0100
Subject: [PATCH] Accessibility for InputSwitch

---
 src/components/inputswitch/InputSwitch.vue | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/inputswitch/InputSwitch.vue b/src/components/inputswitch/InputSwitch.vue
index 11f7852b9..63c7e1e19 100755
--- a/src/components/inputswitch/InputSwitch.vue
+++ b/src/components/inputswitch/InputSwitch.vue
@@ -1,8 +1,8 @@
 <template>
-    <div :class="containerClass" @click="onClick($event)" :style="style">
+    <div :class="containerClass" @click="onClick($event)">
         <div class="p-hidden-accessible">
-            <input ref="input" type="checkbox" :checked="checked" v-bind="$attrs" role="switch" :aria-checked="checked"
-                @focus="onFocus($event)" @blur="onBlur($event)">
+            <input :id="inputId" ref="input" role="switch" :checked="checked" :disabled="disabled" :aria-checked="checked"
+                @focus="onFocus($event)" @blur="onBlur($event)" v-bind="inputProps">
         </div>
         <span class="p-inputswitch-slider"></span>
     </div>
@@ -11,15 +11,12 @@
 <script>
 export default {
     name: 'InputSwitch',
-    inheritAttrs: false,
-    emits: ['click', 'update:modelValue', 'change', 'input'],
+    emits: ['click', 'update:modelValue', 'change', 'input', 'focus', 'blur'],
     props: {
         modelValue: {
             type: null,
             default: false
         },
-        class: null,
-        style: null,
         trueValue: {
             type: null,
             default: true
@@ -27,7 +24,13 @@ export default {
         falseValue: {
             type: null,
             default: false
-        }
+        },
+        disabled: {
+            type: Boolean,
+            default: false
+        },
+        inputId: null,
+        inputProps: null
     },
     data() {
         return {
@@ -36,7 +39,7 @@ export default {
     },
     methods: {
         onClick(event) {
-            if (!this.$attrs.disabled) {
+            if (!this.disabled) {
                 const newValue = this.checked ? this.falseValue : this.trueValue;
                 this.$emit('click', event);
                 this.$emit('update:modelValue', newValue);
@@ -46,20 +49,22 @@ export default {
             }
             event.preventDefault();
         },
-        onFocus() {
+        onFocus(event) {
             this.focused = true;
+            this.$emit('focus', event);
         },
-        onBlur() {
+        onBlur(event) {
             this.focused = false;
+            this.$emit('blur', event);
         }
     },
     computed: {
         containerClass() {
             return [
-                'p-inputswitch p-component', this.class,
+                'p-inputswitch p-component',
                 {
                     'p-inputswitch-checked': this.checked,
-					'p-disabled': this.$attrs.disabled,
+					'p-disabled': this.disabled,
                     'p-focus': this.focused
                 }
             ];