From 6283794727315935613338b8427fef5dc2579a71 Mon Sep 17 00:00:00 2001
From: Chase Weaver <chase.weaver34@gmail.com>
Date: Sat, 7 May 2022 13:07:14 -0400
Subject: [PATCH 1/4] feat: added 'multiple' as an option to Listbox

---
 src/lib/components/listbox/Listbox.svelte     | 33 ++++++++++++++++++-
 .../components/listbox/ListboxOption.svelte   | 31 +++++++++++++++--
 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/listbox/Listbox.svelte b/src/lib/components/listbox/Listbox.svelte
index c0f323d9..98a3e757 100644
--- a/src/lib/components/listbox/Listbox.svelte
+++ b/src/lib/components/listbox/Listbox.svelte
@@ -3,6 +3,10 @@
     Open,
     Closed,
   }
+  export enum ValueMode {
+    Single,
+    Multi,
+  }
   export type ListboxOptionDataRef = {
     textValue: string;
     disabled: boolean;
@@ -14,6 +18,7 @@
     listboxState: ListboxStates;
     value: unknown;
     orientation: "vertical" | "horizontal";
+    mode: ValueMode;
 
     labelRef: Writable<HTMLLabelElement | null>;
     buttonRef: Writable<HTMLButtonElement | null>;
@@ -61,6 +66,8 @@
     horizontal?: boolean;
     /** The selected value */
     value?: StateDefinition["value"];
+    /** Wether the `Listbox` should allow mutliple selections */
+    multiple?: boolean;
   };
 </script>
 
@@ -89,6 +96,7 @@
   export let use: HTMLActionArray = [];
   export let disabled = false;
   export let horizontal = false;
+  export let multiple = false;
   export let value: StateDefinition["value"];
 
   /***** Events *****/
@@ -112,6 +120,9 @@
   let options: StateDefinition["options"] = [];
   let searchQuery: StateDefinition["searchQuery"] = "";
   let activeOptionIndex: StateDefinition["activeOptionIndex"] = null;
+  let mode: StateDefinition["mode"] = multiple
+    ? ValueMode.Multi
+    : ValueMode.Single;
 
   let api = writable<StateDefinition>({
     listboxState,
@@ -124,6 +135,7 @@
     activeOptionIndex,
     disabled,
     orientation,
+    mode,
     closeListbox() {
       if (disabled) return;
       if (listboxState === ListboxStates.Closed) return;
@@ -231,7 +243,25 @@
     },
     select(value: unknown) {
       if (disabled) return;
-      dispatch("change", value);
+      dispatch(
+        "change",
+        match(mode, {
+          [ValueMode.Single]: () => value,
+          [ValueMode.Multi]: () => {
+            let copy = ($api.value as unknown[]).slice();
+            let raw = value;
+
+            let idx = copy.indexOf(raw);
+            if (idx === -1) {
+              copy.push(raw);
+            } else {
+              copy.splice(idx, 1);
+            }
+
+            return copy;
+          },
+        })
+      );
     },
   });
   setContext(LISTBOX_CONTEXT_NAME, api);
@@ -256,6 +286,7 @@
       activeOptionIndex,
       disabled,
       orientation,
+      mode,
     };
   });
 
diff --git a/src/lib/components/listbox/ListboxOption.svelte b/src/lib/components/listbox/ListboxOption.svelte
index 8b80033b..115737ed 100644
--- a/src/lib/components/listbox/ListboxOption.svelte
+++ b/src/lib/components/listbox/ListboxOption.svelte
@@ -12,7 +12,11 @@
 
 <script lang="ts">
   import { onDestroy, onMount, tick } from "svelte";
-  import { ListboxStates, useListboxContext } from "./Listbox.svelte";
+  import {
+    ListboxStates,
+    useListboxContext,
+    ValueMode,
+  } from "./Listbox.svelte";
   import { useId } from "$lib/hooks/use-id";
   import { Focus } from "$lib/utils/calculate-active-index";
   import Render from "$lib/utils/Render.svelte";
@@ -21,6 +25,7 @@
   import { get_current_component } from "svelte/internal";
   import type { HTMLActionArray } from "$lib/hooks/use-actions";
   import type { TPassThroughProps } from "$lib/types";
+  import { match } from "$lib/utils/match";
 
   /***** Props *****/
   type TAsProp = $$Generic<SupportedAs>;
@@ -39,13 +44,26 @@
   let id = `headlessui-listbox-option-${useId()}`;
 
   let buttonRef = $api.buttonRef;
+  let isFirstSelected = false;
 
   $: active =
     $api.activeOptionIndex !== null
       ? $api.options[$api.activeOptionIndex].id === id
       : false;
 
-  $: selected = $api.value === value;
+  $: selected = match($api.mode, {
+    [ValueMode.Single]: () => $api.value === value,
+    [ValueMode.Multi]: () => ($api.value as unknown[]).includes(value),
+  });
+
+  $: isFirstSelected = match($api.mode, {
+    [ValueMode.Single]: () => selected,
+    [ValueMode.Multi]: () =>
+      $api.options.find((option: unknown) =>
+        ($api.value as unknown[]).includes(option)
+      )?.id === id,
+  });
+
   $: dataRef = {
     disabled,
     value,
@@ -75,7 +93,14 @@
     await tick();
     if (newState !== oldState || newSelected !== oldSelected) {
       if (newState === ListboxStates.Open && newSelected) {
-        $api.goToOption(Focus.Specific, id);
+        match($api.mode, {
+          [ValueMode.Multi]: () => {
+            if (isFirstSelected) $api.goToOption(Focus.Specific, id);
+          },
+          [ValueMode.Single]: () => {
+            $api.goToOption(Focus.Specific, id);
+          },
+        });
       }
     }
     if (newState !== oldState || newActive !== oldActive) {

From 172a9db6509ccbae40cfd6d85ff56ea1c70f4f09 Mon Sep 17 00:00:00 2001
From: Chase Weaver <chase.weaver34@gmail.com>
Date: Sat, 7 May 2022 13:40:00 -0400
Subject: [PATCH 2/4] docs: added example of the 'multiple' option to listbox

---
 src/lib/components/listbox/Listbox.svelte |  2 +-
 src/routes/docs/listbox.svx               | 38 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/listbox/Listbox.svelte b/src/lib/components/listbox/Listbox.svelte
index 98a3e757..25c95a9c 100644
--- a/src/lib/components/listbox/Listbox.svelte
+++ b/src/lib/components/listbox/Listbox.svelte
@@ -66,7 +66,7 @@
     horizontal?: boolean;
     /** The selected value */
     value?: StateDefinition["value"];
-    /** Wether the `Listbox` should allow mutliple selections */
+    /** Whether the `Listbox` should allow mutliple selections */
     multiple?: boolean;
   };
 </script>
diff --git a/src/routes/docs/listbox.svx b/src/routes/docs/listbox.svx
index 8167bcc5..3609d4d9 100644
--- a/src/routes/docs/listbox.svx
+++ b/src/routes/docs/listbox.svx
@@ -99,6 +99,44 @@ You can use these states to conditionally apply whatever active/focus styles you
 </Listbox>
 ```
 
+## Multiple Values
+
+To allow selecting multiple values in your listbox, use the `multiple` prop and pass an array to `value` instead of a single option.
+
+```svelte
+<script>
+  import {
+    Listbox,
+    ListboxButton,
+    ListboxLabel,
+    ListboxOptions,
+    ListboxOption,
+  } from "@rgossiaux/svelte-headlessui";
+
+  const people = [
+    { id: 1, name: "Durward Reynolds" },
+    { id: 2, name: "Kenton Towne" },
+    { id: 3, name: "Therese Wunsch" },
+    { id: 4, name: "Benedict Kessler" },
+    { id: 5, name: "Katelyn Rohan" },
+  ];
+
+  let selectedPeople = [people[0], people[1]];
+</script>
+
+<Listbox value={selectedPeople} on:change={(e) => (selectedPeople = e.detail)} multiple>
+  <ListboxLabel>Assignee:</ListboxLabel>
+  <ListboxButton>{selectedPeople.map((person) => person.name).join(', ')}</ListboxButton>
+  <ListboxOptions>
+    {#each people as person (person.id)}
+      <ListboxOption value={person}>
+        {person.name}
+      </ListboxOption>
+    {/each}
+  </ListboxOptions>
+</Listbox>
+```
+
 ## Using a custom label
 
 By default, the `Listbox` will use the `<ListboxButton>` contents as the label for screenreaders. If you'd like more control over what is announced to assistive technologies, use the `ListboxLabel` component:

From ab965668546d9696519b71c0ebe7dcf456433118 Mon Sep 17 00:00:00 2001
From: Chase Weaver <chase.weaver34@gmail.com>
Date: Sun, 6 Nov 2022 09:50:31 -0500
Subject: [PATCH 3/4] fix: prevent dropdown from closing on value change

---
 src/lib/components/listbox/ListboxOption.svelte  | 2 +-
 src/lib/components/listbox/ListboxOptions.svelte | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/listbox/ListboxOption.svelte b/src/lib/components/listbox/ListboxOption.svelte
index 115737ed..561578a7 100644
--- a/src/lib/components/listbox/ListboxOption.svelte
+++ b/src/lib/components/listbox/ListboxOption.svelte
@@ -118,7 +118,7 @@
     let event = e as any as MouseEvent;
     if (disabled) return event.preventDefault();
     $api.select(value);
-    $api.closeListbox();
+    if ($api.mode === ValueMode.Single) $api.closeListbox();
     await tick();
     $buttonRef?.focus({ preventScroll: true });
   }
diff --git a/src/lib/components/listbox/ListboxOptions.svelte b/src/lib/components/listbox/ListboxOptions.svelte
index ee733e35..c87a1108 100644
--- a/src/lib/components/listbox/ListboxOptions.svelte
+++ b/src/lib/components/listbox/ListboxOptions.svelte
@@ -12,7 +12,7 @@
 
 <script lang="ts">
   import { tick } from "svelte";
-  import { ListboxStates, useListboxContext } from "./Listbox.svelte";
+  import { ListboxStates, ValueMode, useListboxContext } from './Listbox.svelte';
   import { useId } from "$lib/hooks/use-id";
   import { match } from "$lib/utils/match";
   import { Keys } from "$lib/utils/keyboard";
@@ -64,7 +64,7 @@
           let { dataRef } = $api.options[$api.activeOptionIndex];
           $api.select(dataRef.value);
         }
-        $api.closeListbox();
+        if ($api.mode === ValueMode.Single) $api.closeListbox();
         await tick();
         $buttonRef?.focus({ preventScroll: true });
         break;

From 10ad27d348e6b9b9c6b09994d536a51ca911de8c Mon Sep 17 00:00:00 2001
From: Chase Weaver <chase.weaver34@gmail.com>
Date: Sun, 6 Nov 2022 10:06:10 -0500
Subject: [PATCH 4/4] fix: prevent focus loss when using a keyboard to select
 items

---
 src/lib/components/listbox/ListboxOptions.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/listbox/ListboxOptions.svelte b/src/lib/components/listbox/ListboxOptions.svelte
index c87a1108..611e0db9 100644
--- a/src/lib/components/listbox/ListboxOptions.svelte
+++ b/src/lib/components/listbox/ListboxOptions.svelte
@@ -66,7 +66,7 @@
         }
         if ($api.mode === ValueMode.Single) $api.closeListbox();
         await tick();
-        $buttonRef?.focus({ preventScroll: true });
+        if ($api.mode === ValueMode.Single) $buttonRef?.focus({ preventScroll: true });
         break;
 
       case match($api.orientation, {