Merge pull request #722 from thejackshelton/multi-select

thejackshelton · web-flow · commit 3659c0232dc5 · 2024-04-25T16:13:49.000-05:00
Initial multi-select capabilities
diff --git a/apps/website/src/routes/docs/headless/select/examples/bind-open.tsx b/apps/website/src/routes/docs/headless/select/examples/bind-open.tsx
@@ -17,7 +17,7 @@ export default component$(() => {
   return (
     <>
       <button onClick$={() => (isOpen.value = true)}>Toggle open state</button>
-      <Select bind:open={isOpen} class="select" aria-label="hero">
+      <Select bind:open={isOpen} class="select">
         <SelectTrigger class="select-trigger">
           <SelectValue placeholder="Select an option" />
         </SelectTrigger>
diff --git a/apps/website/src/routes/docs/headless/select/examples/controlled-value.tsx b/apps/website/src/routes/docs/headless/select/examples/controlled-value.tsx
@@ -15,13 +15,7 @@ export default component$(() => {
 
   return (
     <>
-      <Select
-        onChange$={$((value: string) => {
-          selected.value = value;
-        })}
-        bind:value={selected}
-        class="select"
-      >
+      <Select bind:value={selected} class="select">
         <SelectTrigger class="select-trigger">
           <SelectValue placeholder="Select an option" />
         </SelectTrigger>
diff --git a/apps/website/src/routes/docs/headless/select/examples/form.tsx b/apps/website/src/routes/docs/headless/select/examples/form.tsx
@@ -15,7 +15,7 @@ export default component$(() => {
 
   return (
     <form preventdefault:submit>
-      <Select required class="select" aria-label="hero">
+      <Select required class="select">
         <SelectTrigger class="select-trigger">
           <SelectValue placeholder="Select an option" />
         </SelectTrigger>
diff --git a/apps/website/src/routes/docs/headless/select/examples/group.tsx b/apps/website/src/routes/docs/headless/select/examples/group.tsx
@@ -3,7 +3,7 @@ import {
   Select,
   SelectPopover,
   SelectGroup,
-  SelectLabel,
+  SelectGroupLabel,
   SelectListbox,
   SelectOption,
   SelectTrigger,
@@ -24,13 +24,13 @@ export default component$(() => {
       <SelectPopover class="select-popover">
         <SelectListbox class="select-listbox">
           <SelectGroup>
-            <SelectLabel class="select-label">People</SelectLabel>
+            <SelectGroupLabel class="select-label">People</SelectGroupLabel>
             {users.map((user) => (
               <SelectOption key={user}>{user}</SelectOption>
             ))}
           </SelectGroup>
           <SelectGroup>
-            <SelectLabel class="select-label">Animals</SelectLabel>
+            <SelectGroupLabel class="select-group-label">Animals</SelectGroupLabel>
             {animals.map((animal) => (
               <SelectOption class="select-option" key={animal}>
                 {animal}
diff --git a/apps/website/src/routes/docs/headless/select/examples/hero.tsx b/apps/website/src/routes/docs/headless/select/examples/hero.tsx
@@ -1,6 +1,7 @@
 import { component$, useStyles$ } from '@builder.io/qwik';
 import {
   Select,
+  SelectLabel,
   SelectListbox,
   SelectOption,
   SelectPopover,
@@ -14,7 +15,8 @@ export default component$(() => {
   const users = ['Tim', 'Ryan', 'Jim', 'Jessie', 'Abby'];
 
   return (
-    <Select class="select" aria-label="hero">
+    <Select class="select">
+      <SelectLabel>Logged in users</SelectLabel>
       <SelectTrigger class="select-trigger">
         <SelectValue placeholder="Select an option" />
       </SelectTrigger>
diff --git a/apps/website/src/routes/docs/headless/select/examples/multiple.tsx b/apps/website/src/routes/docs/headless/select/examples/multiple.tsx
@@ -0,0 +1,31 @@
+import { component$, useSignal, useStyles$ } from '@builder.io/qwik';
+import {
+  Select,
+  SelectListbox,
+  SelectOption,
+  SelectPopover,
+  SelectTrigger,
+  SelectValue,
+} from '@qwik-ui/headless';
+import styles from '../snippets/select.css?inline';
+
+export default component$(() => {
+  useStyles$(styles);
+  const users = ['Tim', 'Ryan', 'Jim', 'Jessie', 'Abby'];
+  const selected = useSignal<string[]>([]);
+
+  return (
+    <Select multiple bind:value={selected} class="select">
+      <SelectTrigger class="select-trigger">
+        <SelectValue>{selected.value}</SelectValue>
+      </SelectTrigger>
+      <SelectPopover class="select-popover">
+        <SelectListbox class="select-listbox">
+          {users.map((user) => (
+            <SelectOption key={user}>{user}</SelectOption>
+          ))}
+        </SelectListbox>
+      </SelectPopover>
+    </Select>
+  );
+});
diff --git a/apps/website/src/routes/docs/headless/select/examples/scrollable.tsx b/apps/website/src/routes/docs/headless/select/examples/scrollable.tsx
@@ -3,7 +3,7 @@ import {
   Select,
   SelectPopover,
   SelectGroup,
-  SelectLabel,
+  SelectGroupLabel,
   SelectListbox,
   SelectOption,
   SelectTrigger,
@@ -24,15 +24,15 @@ export default component$(() => {
       <SelectPopover class="select-popover">
         <SelectListbox class="select-listbox select-max-height">
           <SelectGroup>
-            <SelectLabel class="select-label">People</SelectLabel>
+            <SelectGroupLabel class="select-label">People</SelectGroupLabel>
             {users.map((user) => (
               <SelectOption class="select-option" key={user}>
                 {user}
               </SelectOption>
             ))}
           </SelectGroup>
           <SelectGroup>
-            <SelectLabel class="select-label">Animals</SelectLabel>
+            <SelectGroupLabel class="select-label">Animals</SelectGroupLabel>
             {animals.map((animal) => (
               <SelectOption key={animal}>{animal}</SelectOption>
             ))}
diff --git a/apps/website/src/routes/docs/headless/select/index.mdx b/apps/website/src/routes/docs/headless/select/index.mdx
@@ -207,6 +207,12 @@ A common use case is the addition of options dynamically. For example, an infini
 
 Clicking the `Add Users` button adds a couple new users mapped to the list. Taking this further, we could grab more data from the server and add it to the list, or even hitting a database to get more users.
 
+### Multiple selections
+
+<Showcase name="multiple" />
+
+The `multiple` prop allows the user to select multiple options.
+
 ## Menu behavior
 
 ### Typeahead
diff --git a/apps/website/src/routes/docs/headless/select/snippets/building-blocks.tsx b/apps/website/src/routes/docs/headless/select/snippets/building-blocks.tsx
@@ -4,7 +4,7 @@ import {
   SelectPopover,
   SelectTrigger,
   SelectGroup,
-  SelectLabel,
+  SelectGroupLabel,
   SelectValue,
   SelectListbox,
   SelectOption,
@@ -22,7 +22,7 @@ export default component$(() => (
 
         {/* optional */}
         <SelectGroup>
-          <SelectLabel>group label</SelectLabel>
+          <SelectGroupLabel>group label</SelectGroupLabel>
           <SelectOption>group option</SelectOption>
         </SelectGroup>
       </SelectListbox>
diff --git a/apps/website/src/routes/docs/headless/select/snippets/select.css b/apps/website/src/routes/docs/headless/select/snippets/select.css
@@ -28,7 +28,7 @@
   color: hsl(var(--foreground));
 }
 
-.select-label {
+.select-group-label {
   font-size: 0.875rem;
   line-height: 1.25rem;
   color: hsla(var(--foreground) / 0.8);
diff --git a/packages/kit-headless/src/components/select/hidden-select.tsx b/packages/kit-headless/src/components/select/hidden-select.tsx
@@ -55,7 +55,7 @@ export const HiddenSelect = component$(
               {options?.map((opt: Opt) => (
                 <option
                   value={opt.value}
-                  selected={context.selectedIndexSig.value === opt.index}
+                  selected={context.selectedIndexesSig.value.includes(opt.index)}
                   key={opt.value}
                 >
                   {opt.displayValue}
diff --git a/packages/kit-headless/src/components/select/index.ts b/packages/kit-headless/src/components/select/index.ts
@@ -1,10 +1,11 @@
 export * from './select';
+export * from './select-label';
 export * from './select-inline';
 export * from './select-listbox';
 export * from './select-option';
 export * from './select-popover';
 export * from './select-trigger';
 export * from './select-value';
 export * from './select-group';
-export * from './select-label';
+export * from './select-group-label';
 export * from './hidden-select';
diff --git a/packages/kit-headless/src/components/select/select-context.ts b/packages/kit-headless/src/components/select/select-context.ts
@@ -13,21 +13,23 @@ export type SelectContext = {
   popoverRef: Signal<HTMLElement | undefined>;
   listboxRef: Signal<HTMLUListElement | undefined>;
   groupRef: Signal<HTMLDivElement | undefined>;
+  labelRef: Signal<HTMLDivElement | undefined>;
 
   // core state
   localId: string;
   optionsSig: Signal<Opt[]>;
   highlightedIndexSig: Signal<number | null>;
   isListboxOpenSig: Signal<boolean>;
-  selectedIndexSig: Signal<number | null>;
+  selectedIndexesSig: Signal<Array<number | null>>;
 
   // user configurable
   scrollOptions?: ScrollIntoViewOptions;
   loop: boolean;
+  multiple: boolean | undefined;
 };
 
 export const groupContextId = createContextId<GroupContext>('Select-Group');
 
 export type GroupContext = {
-  labelId: string;
+  groupLabelId: string;
 };
diff --git a/packages/kit-headless/src/components/select/select-group-label.tsx b/packages/kit-headless/src/components/select/select-group-label.tsx
@@ -0,0 +1,14 @@
+import { PropsOf, Slot, component$, useContext } from '@builder.io/qwik';
+import { groupContextId } from './select-context';
+
+type SelectLabelProps = PropsOf<'li'>;
+
+export const SelectGroupLabel = component$<SelectLabelProps>((props) => {
+  const groupContext = useContext(groupContextId);
+
+  return (
+    <li id={groupContext.groupLabelId} {...props}>
+      <Slot />
+    </li>
+  );
+});
diff --git a/packages/kit-headless/src/components/select/select-group.tsx b/packages/kit-headless/src/components/select/select-group.tsx
@@ -4,7 +4,6 @@ import {
   component$,
   useContext,
   useContextProvider,
-  useId,
 } from '@builder.io/qwik';
 
 import SelectContextId, { groupContextId } from './select-context';
@@ -13,16 +12,16 @@ type SelectGroupProps = PropsOf<'div'>;
 
 export const SelectGroup = component$<SelectGroupProps>((props) => {
   const context = useContext(SelectContextId);
-  const labelId = useId();
+  const groupLabelId = `${context.localId}-group-label`;
 
   const groupContext = {
-    labelId,
+    groupLabelId,
   };
 
   useContextProvider(groupContextId, groupContext);
 
   return (
-    <div aria-labelledby={labelId} role="group" {...props} ref={context.groupRef}>
+    <div aria-labelledby={groupLabelId} role="group" {...props} ref={context.groupRef}>
       <Slot />
     </div>
   );
diff --git a/packages/kit-headless/src/components/select/select-inline.tsx b/packages/kit-headless/src/components/select/select-inline.tsx
@@ -1,6 +1,7 @@
 import { type JSXNode, Component } from '@builder.io/qwik';
 import { SelectImpl, type SelectProps } from './select';
 import { SelectOption } from './select-option';
+import { SelectLabel } from './select-label';
 
 export type Opt = {
   isDisabled: boolean;
@@ -18,6 +19,7 @@ export const Select: Component<SelectProps> = (props: SelectProps) => {
   const opts: Opt[] = [];
   let currentIndex = 0;
   let valuePropIndex = null;
+  let label = false;
 
   const childrenToProcess = (
     Array.isArray(myChildren) ? [...myChildren] : [myChildren]
@@ -70,6 +72,11 @@ export const Select: Component<SelectProps> = (props: SelectProps) => {
         break;
       }
 
+      case SelectLabel: {
+        label = true;
+        break;
+      }
+
       default: {
         if (child) {
           const anyChildren = Array.isArray(child.children)
@@ -95,7 +102,7 @@ export const Select: Component<SelectProps> = (props: SelectProps) => {
   }
 
   return (
-    <SelectImpl {...rest} _valuePropIndex={valuePropIndex} _options={opts}>
+    <SelectImpl {...rest} _label={label} _valuePropIndex={valuePropIndex} _options={opts}>
       {props.children}
     </SelectImpl>
   );
diff --git a/packages/kit-headless/src/components/select/select-label.tsx b/packages/kit-headless/src/components/select/select-label.tsx
@@ -1,14 +1,13 @@
 import { PropsOf, Slot, component$, useContext } from '@builder.io/qwik';
-import { groupContextId } from './select-context';
+import SelectContextId from './select-context';
 
-type SelectLabelProps = PropsOf<'li'>;
-
-export const SelectLabel = component$<SelectLabelProps>((props) => {
-  const groupContext = useContext(groupContextId);
+export const SelectLabel = component$((props: PropsOf<'div'>) => {
+  const context = useContext(SelectContextId);
+  const labelId = `${context.localId}-label`;
 
   return (
-    <li id={groupContext.labelId} {...props}>
+    <div ref={context.labelRef} id={labelId} {...props}>
       <Slot />
-    </li>
+    </div>
   );
 });
diff --git a/packages/kit-headless/src/components/select/select-option.tsx b/packages/kit-headless/src/components/select/select-option.tsx
@@ -10,6 +10,7 @@ import {
 } from '@builder.io/qwik';
 import { isServer, isBrowser } from '@builder.io/qwik/build';
 import SelectContextId from './select-context';
+import { useSelect } from './use-select';
 
 export type SelectOptionProps = PropsOf<'li'> & {
   /** Internal index we get from the inline component. Please see select-inline.tsx */
@@ -30,8 +31,11 @@ export const SelectOption = component$<SelectOptionProps>((props) => {
   const localIndexSig = useSignal<number | null>(null);
   const optionId = `${context.localId}-${_index}`;
 
+  const { addUniqueIndex } = useSelect();
+
   const isSelectedSig = useComputed$(() => {
-    return !disabled && context.selectedIndexSig.value === _index;
+    const index = _index ?? null;
+    return !disabled && context.selectedIndexesSig.value.includes(index);
   });
 
   const isHighlightedSig = useComputed$(() => {
@@ -78,8 +82,12 @@ export const SelectOption = component$<SelectOptionProps>((props) => {
   const handleClick$ = $(() => {
     if (disabled) return;
 
-    context.selectedIndexSig.value = localIndexSig.value;
-    context.isListboxOpenSig.value = false;
+    if (context.multiple) {
+      addUniqueIndex(context.selectedIndexesSig, localIndexSig.value);
+    } else {
+      context.selectedIndexesSig.value = [localIndexSig.value];
+      context.isListboxOpenSig.value = false;
+    }
   });
 
   const handlePointerOver$ = $(() => {
diff --git a/packages/kit-headless/src/components/select/select-trigger.tsx b/packages/kit-headless/src/components/select/select-trigger.tsx
diff --git a/packages/kit-headless/src/components/select/select-value.tsx b/packages/kit-headless/src/components/select/select-value.tsx
diff --git a/packages/kit-headless/src/components/select/select.driver.ts b/packages/kit-headless/src/components/select/select.driver.ts
diff --git a/packages/kit-headless/src/components/select/select.test.ts b/packages/kit-headless/src/components/select/select.test.ts
diff --git a/packages/kit-headless/src/components/select/select.tsx b/packages/kit-headless/src/components/select/select.tsx
diff --git a/packages/kit-headless/src/components/select/use-select.tsx b/packages/kit-headless/src/components/select/use-select.tsx

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`color: hsl(var(--foreground));`
`29`	`29`	`}`
`30`	`30`
`31`		`-.select-label {`
	`31`	`+.select-group-label {`
`32`	`32`	`font-size: 0.875rem;`
`33`	`33`	`line-height: 1.25rem;`
`34`	`34`	`color: hsla(var(--foreground) / 0.8);`