From 1377384c20f9c5a2db0373d499e2e31cdb15ebe4 Mon Sep 17 00:00:00 2001
From: riccardoperra <riccardo.perra@icloud.com>
Date: Sun, 7 Jan 2024 18:43:14 +0100
Subject: [PATCH] fix: combobox

---
 .../src/components/Combobox/Combobox.css.ts   |  17 ++-
 .../kit/src/components/Combobox/Combobox.tsx  | 127 +++++++++++++-----
 .../src/stories/Combobox.stories.tsx          |   2 -
 3 files changed, 107 insertions(+), 39 deletions(-)

diff --git a/packages/kit/src/components/Combobox/Combobox.css.ts b/packages/kit/src/components/Combobox/Combobox.css.ts
index 47afa80..e755aee 100644
--- a/packages/kit/src/components/Combobox/Combobox.css.ts
+++ b/packages/kit/src/components/Combobox/Combobox.css.ts
@@ -183,9 +183,18 @@ export const comboboxInput = style({
 	appearance: "none",
 	background: "transparent",
 	outline: "none",
+	border: 0,
 	display: "inline-flex",
 	minWidth: 0,
-	flex: 1,
+	width: "100%",
+});
+
+export const comboboxTrigger = style({
+	border: 0,
+	background: "transparent",
+	outline: "none",
+	padding: 0,
+	color: themeVars.foreground,
 });
 
 export const itemIndicator = style({
@@ -194,3 +203,9 @@ export const itemIndicator = style({
 	width: selectThemeVars.indicatorSize,
 	flexShrink: 0,
 });
+
+export const comboboxInputWorkaround = style({
+	width: 0,
+	height: 0,
+	opacity: 0,
+});
diff --git a/packages/kit/src/components/Combobox/Combobox.tsx b/packages/kit/src/components/Combobox/Combobox.tsx
index 51713ec..8891a3a 100644
--- a/packages/kit/src/components/Combobox/Combobox.tsx
+++ b/packages/kit/src/components/Combobox/Combobox.tsx
@@ -1,17 +1,17 @@
-import { Combobox as KCombobox } from "@kobalte/core";
+import { Combobox as KCombobox, createControllableBooleanSignal } from "@kobalte/core";
 import { Accessor, JSX, JSXElement, Show, createSignal, splitProps } from "solid-js";
 import { CheckIcon } from "../../icons/CheckIcon";
 import { SelectorIcon } from "../../icons/SelectorIcon";
 import { mergeClasses } from "../../utils/css";
-import { BaseFieldProps, createBaseFieldProps } from "../Field/createBaseFieldProps";
+import { highlight } from "../../utils/highlight/highlight";
 import {
-	createFieldErrorMessageProps,
 	FieldWithErrorMessageSupport,
+	createFieldErrorMessageProps,
 } from "../Field/FieldError/createFieldErrorMessageProps";
 import { createFieldLabelProps } from "../Field/FieldLabel/createFieldLabelProps";
 import { createFieldMessageProps } from "../Field/FieldMessage/createFieldMessageProps";
+import { BaseFieldProps, createBaseFieldProps } from "../Field/createBaseFieldProps";
 import * as styles from "./Combobox.css";
-import { highlight } from "../../utils/highlight/highlight";
 
 void highlight;
 
@@ -29,10 +29,6 @@ export type ComboboxProps<Option, OptGroup = never> = KCombobox.ComboboxRootProp
 		valueComponent?: (state: Accessor<Option>) => JSXElement;
 	};
 
-function ComboboxContent(props: KCombobox.ComboboxContentProps) {
-	return <KCombobox.Content class={styles.content} {...props} />;
-}
-
 export function ComboboxItem<T>(
 	props: KCombobox.ComboboxItemProps & {
 		itemLabel?: (item: T) => JSXElement;
@@ -54,44 +50,96 @@ export function ComboboxItem<T>(
 export function Combobox<Option, OptGroup = never>(
 	props: ComboboxProps<Option, OptGroup>,
 ) {
-	const [local, internal, others] = splitProps(
-		props,
-		[
-			"aria-label",
-			"children",
-			"size",
-			"theme",
-			"errorMessage",
-			"description",
-			"label",
-			"itemLabel",
-			"valueComponent",
-		],
-		["options", "value"],
-	);
+	const [local, others] = splitProps(props, [
+		"aria-label",
+		"size",
+		"theme",
+		"errorMessage",
+		"description",
+		"label",
+		"itemLabel",
+		"value",
+		"onChange",
+		"open",
+		"onOpenChange",
+		"onInputChange",
+	]);
 	const baseFieldProps = createBaseFieldProps(props);
 	const labelProps = createFieldLabelProps<"label">({});
 	const descriptionProps = createFieldMessageProps({});
 	const errorProps = createFieldErrorMessageProps(props);
 
+	const [open, setOpen] = createControllableBooleanSignal({
+		value: () => local.open,
+		defaultValue: () => local.open,
+		onChange(value) {
+			local.onOpenChange?.(value);
+		},
+	});
+
 	const [textValue, setTextValue] = createSignal("");
+	let control!: HTMLInputElement;
+
+	const onInputFocus = (event: FocusEvent) => {
+		if (isChangingValue) {
+			setOpen(false);
+		} else {
+			setOpen(true);
+		}
+	};
+
+	let controlWorkaround!: HTMLInputElement;
+
+	type TriggerMode = KCombobox.ComboboxRootOptions<any, any>["triggerMode"];
+
+	const handleOpenChange = (open: boolean, mode: TriggerMode) => {
+		setOpen(open);
+		if (!open && mode === "focus") {
+			// If open is false and mode is focus, then portal will be closed. Currently
+			// there is a behavior where input is automatically focused triggering the modal opening.
+			// As a workaround, i'm focusing another input in order to don't retrigger the portal content opening.
+			setTimeout(() => {
+				controlWorkaround.focus();
+				setOpen(false);
+			});
+		}
+	};
+
+	const handleOnChange = (value: Option & Option[]) => {
+		local.onChange?.(value as Option & Option[]);
+		// On handle change we set `isChangingValue` to true in order to force close the modal.
+		// Read `onInputFocus`;
+		isChangingValue = true;
+		setTimeout(() => (isChangingValue = false), 0);
+	};
+
+	let isChangingValue = false;
 
 	return (
 		<KCombobox.Root
 			data-cui="combobox"
-			{...(others as Record<string, unknown>)}
-			options={internal.options}
-			value={internal.value}
 			class={styles.field}
 			itemComponent={itemProps => (
 				<ComboboxItem
 					item={itemProps.item}
-					textValue={textValue()}
 					itemLabel={local.itemLabel}
+					textValue={textValue()}
 				/>
 			)}
+			open={open()}
+			onInputChange={text => {
+				setTextValue(text);
+				local.onInputChange?.(text);
+			}}
+			onChange={handleOnChange}
+			onOpenChange={(isOpen, mode) => {
+				handleOpenChange(isOpen, mode);
+				local.onOpenChange?.(isOpen, mode);
+			}}
+			{...(others as Record<string, unknown>)}
+			triggerMode={"input"}
 		>
-			<Show when={local.label} keyed={false}>
+			<Show when={local.label}>
 				<KCombobox.Label {...labelProps}>{local.label}</KCombobox.Label>
 			</Show>
 
@@ -101,9 +149,16 @@ export function Combobox<Option, OptGroup = never>(
 				aria-label={local["aria-label"]}
 			>
 				<KCombobox.Input
-					onInput={el => setTextValue(el.currentTarget.value)}
+					onFocus={onInputFocus}
+					ref={control}
 					class={styles.comboboxInput}
 				/>
+				<input
+					aria-hidden="true"
+					ref={controlWorkaround}
+					class={styles.comboboxInputWorkaround}
+				/>
+
 				<KCombobox.Trigger>
 					<KCombobox.Icon>
 						<SelectorIcon />
@@ -111,21 +166,21 @@ export function Combobox<Option, OptGroup = never>(
 				</KCombobox.Trigger>
 			</KCombobox.Control>
 
-			<Show when={local.description} keyed={false}>
+			<KCombobox.Portal>
+				<KCombobox.Content class={styles.content}>
+					<KCombobox.Listbox />
+				</KCombobox.Content>
+			</KCombobox.Portal>
+			<Show when={local.description}>
 				<KCombobox.Description {...descriptionProps}>
 					{local.description}
 				</KCombobox.Description>
 			</Show>
-			<Show when={local.errorMessage} keyed={false}>
+			<Show when={local.errorMessage}>
 				<KCombobox.ErrorMessage {...errorProps}>
 					{local.errorMessage}
 				</KCombobox.ErrorMessage>
 			</Show>
-			<KCombobox.Portal>
-				<ComboboxContent>
-					<KCombobox.Listbox />
-				</ComboboxContent>
-			</KCombobox.Portal>
 		</KCombobox.Root>
 	);
 }
diff --git a/packages/storybook/src/stories/Combobox.stories.tsx b/packages/storybook/src/stories/Combobox.stories.tsx
index cb2f523..818162e 100644
--- a/packages/storybook/src/stories/Combobox.stories.tsx
+++ b/packages/storybook/src/stories/Combobox.stories.tsx
@@ -58,8 +58,6 @@ export default meta;
 export const ComboboxStory: Story = {
 	name: "Combobox",
 	args: {
-		triggerMode: "focus",
-		// TODO is this correct?
 		"aria-label": "Fruit",
 		placeholder: "Insert a value...",
 		label: "Input label",