From ff8dff1a97b3c5e794b9be1ba8761990850d617c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Wed, 27 Dec 2023 17:56:24 +0100
Subject: [PATCH 1/2] fix(NcCheckboxRadioSwitch): fix shift+click on firefox
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 .../NcCheckboxRadioSwitch/NcCheckboxContent.vue      | 12 ++----------
 .../NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue  |  4 +++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue b/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
index 8f3d0aa57c..32e6301ac4 100644
--- a/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
+++ b/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
@@ -21,8 +21,7 @@
 -->
 
 <template>
-	<component :is="wrapperElement"
-		:for="!isButtonType ? id : null"
+	<span :id="!isButtonType ? `${id}-label` : null"
 		class="checkbox-content"
 		:class="{
 			['checkbox-content-' + type]: true,
@@ -52,7 +51,7 @@
 			<!-- @slot The checkbox/radio label -->
 			<slot />
 		</span>
-	</component>
+	</span>
 </template>
 
 <script>
@@ -166,13 +165,6 @@ export default {
 			return this.type === TYPE_BUTTON
 		},
 
-		wrapperElement() {
-			if (this.isButtonType) {
-				return 'span'
-			}
-			return 'label'
-		},
-
 		/**
 		 * Returns the proper Material icon depending on the select case
 		 *
diff --git a/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue b/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue
index f4bddf21c5..e06838a189 100644
--- a/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue
+++ b/src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue
@@ -277,6 +277,7 @@ export default {
 		v-on="isButtonType ? listeners : null">
 		<input v-if="!isButtonType"
 			:id="id"
+			:aria-labelledby="!isButtonType && !ariaLabel ? `${id}-label` : null"
 			:aria-label="ariaLabel || undefined"
 			class="checkbox-radio-switch__input"
 			:disabled="disabled"
@@ -293,7 +294,8 @@ export default {
 			:button-variant="buttonVariant"
 			:is-checked="isChecked"
 			:loading="loading"
-			:size="size">
+			:size="size"
+			@click.native="onToggle">
 			<template #icon>
 				<!-- @slot The checkbox/radio icon, you can use it for adding an icon to the button variant -->
 				<slot name="icon" />

From b1bfee13d96f836181601720c7f053f67d7c23b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Tue, 2 Jan 2024 09:52:32 +0100
Subject: [PATCH 2/2] chore(NcCheckboxRadioSwitch): add bug comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue b/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
index 32e6301ac4..fa039985ef 100644
--- a/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
+++ b/src/components/NcCheckboxRadioSwitch/NcCheckboxContent.vue
@@ -21,6 +21,10 @@
 -->
 
 <template>
+	<!--
+		label can't be used here because of shift+click firefox bug
+		https://bugzilla.mozilla.org/show_bug.cgi?id=559506
+	-->
 	<span :id="!isButtonType ? `${id}-label` : null"
 		class="checkbox-content"
 		:class="{