From 8e1f005d0e8bcd2cdab24864bcb54513f1f6f735 Mon Sep 17 00:00:00 2001
From: Oleg Isonen <oleg008@gmail.com>
Date: Sat, 23 Jul 2022 14:45:05 +0200
Subject: [PATCH] fixing bugs

---
 .../features/style-panel/render-property.tsx  | 15 ++++---
 .../design-system/components/combobox.tsx     | 44 ++++++++++++-------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/apps/designer/app/designer/features/style-panel/render-property.tsx b/apps/designer/app/designer/features/style-panel/render-property.tsx
index 091d57e121..bc4d57e630 100644
--- a/apps/designer/app/designer/features/style-panel/render-property.tsx
+++ b/apps/designer/app/designer/features/style-panel/render-property.tsx
@@ -192,14 +192,17 @@ const ComboboxControl = ({
             label: String(currentValue.value),
           }}
           itemToString={(item) => (item ? item.name : "")}
-          onItemHighlight={(value) => {
-            if (value === undefined) {
+          onItemSelect={(item) => {
+            setValue(item.name);
+          }}
+          onItemHighlight={(item) => {
+            if (item === undefined) {
               setValue(String(currentValue.value), { isEphemeral: true });
               return;
             }
-            setValue(value.name, { isEphemeral: true });
+            setValue(item.name, { isEphemeral: true });
           }}
-          disclosure={({ inputProps, toggleProps }) => (
+          disclosure={({ inputProps, toggleProps, highlightedItem }) => (
             <ComboboxTextField
               toggleProps={toggleProps}
               inputProps={{
@@ -208,9 +211,11 @@ const ComboboxControl = ({
                 state: currentValue.type === "invalid" ? "invalid" : undefined,
                 onKeyDown(event) {
                   inputProps.onKeyDown?.(event);
+                  // While highlightedItem is there, combobox is handling it.
+                  if (highlightedItem) return;
                   switch (event.key) {
                     case "Enter": {
-                      setValue(event.currentTarget.value);
+                      setValue(String(inputProps.value));
                       break;
                     }
                   }
diff --git a/apps/designer/app/shared/design-system/components/combobox.tsx b/apps/designer/app/shared/design-system/components/combobox.tsx
index 724b2b86fa..b2b7f121f1 100644
--- a/apps/designer/app/shared/design-system/components/combobox.tsx
+++ b/apps/designer/app/shared/design-system/components/combobox.tsx
@@ -1,8 +1,10 @@
 import {
   useState,
   forwardRef,
+  useEffect,
   type ElementRef,
   type ComponentProps,
+  type ForwardRefRenderFunction,
 } from "react";
 import { CheckIcon, ChevronDownIcon } from "~/shared/icons";
 import { Popper, PopperContent, PopperAnchor } from "@radix-ui/react-popper";
@@ -34,15 +36,16 @@ const ListboxItem = styled("li", itemCss, {
   margin: 0,
 });
 
-type ComboboxTextFieldProps = {
+type ComboboxTextFieldProps<Item> = {
   inputProps: ComponentProps<typeof TextField>;
   toggleProps: ComponentProps<typeof IconButton>;
+  highlightedItem?: Item;
 };
 
-export const ComboboxTextField = forwardRef<
-  ElementRef<typeof Flex>,
-  ComboboxTextFieldProps
->(({ inputProps, toggleProps }, ref) => {
+const ComboboxTextFieldBase: ForwardRefRenderFunction<
+  HTMLDivElement,
+  ComboboxTextFieldProps<BaseItem>
+> = ({ inputProps, toggleProps }, ref) => {
   return (
     <Box ref={ref} css={{ position: "relative" }}>
       <TextField css={{ paddingRight: "$4" }} {...inputProps} />
@@ -58,7 +61,9 @@ export const ComboboxTextField = forwardRef<
       </IconButton>
     </Box>
   );
-});
+};
+
+export const ComboboxTextField = forwardRef(ComboboxTextFieldBase);
 
 ComboboxTextField.displayName = "ComboboxTextField";
 
@@ -69,7 +74,9 @@ type ComboboxProps<Item> = {
   onItemSelect?: (value: Item) => void;
   onItemHighlight?: (value?: Item) => void;
   itemToString?: (item: Item | null) => string;
-  disclosure?: (props: ComponentProps<typeof ComboboxTextField>) => JSX.Element;
+  disclosure?: <Item>(
+    props: ComponentProps<typeof ComboboxTextField>
+  ) => JSX.Element;
   // @todo should we spread those props flat?
   contentProps?: ComponentProps<typeof PopperContent>;
 };
@@ -83,11 +90,9 @@ export const Combobox = <Item extends BaseItem>({
     item !== null && "label" in item ? item.label : item ?? "",
   onItemSelect,
   onItemHighlight,
-  disclosure = ({ inputProps, toggleProps }) => (
-    <ComboboxTextField inputProps={inputProps} toggleProps={toggleProps} />
-  ),
+  disclosure = (props) => <ComboboxTextField {...props} />,
 }: ComboboxProps<Item>) => {
-  const [filteredItems, setFilteredItems] = useState(items);
+  const [foundItems, setFoundItems] = useState(items);
   const {
     isOpen,
     getToggleButtonProps,
@@ -105,11 +110,11 @@ export const Combobox = <Item extends BaseItem>({
           typeof items[0] === "object" && "label" in items[0]
             ? { keys: ["label"] }
             : undefined;
-        const filteredItems = matchSorter(items, inputValue, options);
-        setFilteredItems(filteredItems);
+        const foundItems = matchSorter(items, inputValue, options);
+        setFoundItems(foundItems);
       }
     },
-    items: filteredItems,
+    items: foundItems,
     selectedItem: value,
     itemToString,
     onSelectedItemChange({ selectedItem }) {
@@ -124,21 +129,28 @@ export const Combobox = <Item extends BaseItem>({
     },
   });
 
+  useEffect(() => {
+    if (isOpen === false) {
+      setFoundItems(items);
+    }
+  }, [isOpen]);
+
   const inputProps: Record<string, unknown> = getInputProps({ name });
   const toggleProps: Record<string, unknown> = getToggleButtonProps();
   const comboboxProps: Record<string, unknown> = getComboboxProps();
   const menuProps: Record<string, unknown> = getMenuProps();
+  const highlightedItem = foundItems[highlightedIndex];
 
   return (
     <Popper>
       <Box {...comboboxProps}>
         <PopperAnchor asChild>
-          {disclosure({ inputProps, toggleProps })}
+          {disclosure<Item>({ inputProps, toggleProps, highlightedItem })}
         </PopperAnchor>
         <PopperContent {...contentProps} style={{ zIndex: 1 }}>
           <Listbox {...menuProps}>
             {isOpen &&
-              filteredItems.map((item, index) => {
+              foundItems.map((item, index) => {
                 const itemProps: Record<string, unknown> = getItemProps({
                   item,
                   index,