From 6fb2fa60e2008451879c4ea5444178355efd88b2 Mon Sep 17 00:00:00 2001
From: Gregor Wassmann <gregor.wassmann@gmail.com>
Date: Thu, 30 Dec 2021 20:57:50 +0100
Subject: [PATCH] Incorprate PR feedback

---
 src/Checkbox/Checkbox.svelte | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Checkbox/Checkbox.svelte b/src/Checkbox/Checkbox.svelte
index adfad805..000d2dff 100644
--- a/src/Checkbox/Checkbox.svelte
+++ b/src/Checkbox/Checkbox.svelte
@@ -57,16 +57,6 @@
   const dispatch = createEventDispatcher();
 
   $: dispatch("check", checked);
-  $: checked = group.indexOf(value) >= 0;
-
-  const updateGroup = () => {
-    if (checked) {
-      group = [...group, value];
-    } else {
-      group.splice(group.indexOf(value), 1);
-      group = group;
-    }
-  };
 </script>
 
 <!-- svelte-ignore a11y-mouse-events-have-key-events -->
@@ -92,7 +82,7 @@
       bind:this="{ref}"
       type="checkbox"
       value="{value}"
-      checked="{checked}"
+      checked="{checked || group.includes(value)}"
       disabled="{disabled}"
       id="{id}"
       indeterminate="{indeterminate}"
@@ -102,8 +92,10 @@
       on:change
       on:change="{() => {
         checked = !checked;
+        group = group.includes(value)
+          ? group.filter((_value) => _value !== value)
+          : [...group, value];
       }}"
-      on:change="{updateGroup}"
       on:blur
     />
     <label for="{id}" title="{title}" class:bx--checkbox-label="{true}">