zudoku 0.0.0-e101786 → 0.0.0-e20b2e4

package/src/lib/plugins/openapi/playground/Headers.tsx

@@ -1,67 +1,196 @@
 import { XIcon } from "lucide-react";
-import { Control, useFieldArray, UseFormRegister } from "react-hook-form";
+import { useCallback, useEffect, useRef } from "react";
+import {
+  Control,
+  Controller,
+  useFieldArray,
+  useFormContext,
+} from "react-hook-form";
+import { Card } from "zudoku/ui/Card.js";
+import { Checkbox } from "zudoku/ui/Checkbox.js";
+import { Autocomplete } from "../../../components/Autocomplete.js";
 import { Button } from "../../../ui/Button.js";
 import { Input } from "../../../ui/Input.js";
-import { type PlaygroundForm } from "./Playground.js";
+import ParamsGrid, { ParamsGridItem } from "./ParamsGrid.js";
+import { Header, type PlaygroundForm } from "./Playground.js";
+
+const headerOptions = Object.freeze([
+  "Accept",
+  "Accept-Encoding",
+  "Accept-Language",
+  "Authorization",
+  "Cache-Control",
+  "Connection",
+  "Content-Disposition",
+  "Content-Encoding",
+  "Content-Language",
+  "Content-Length",
+  "Content-Range",
+  "Content-Security-Policy",
+  "Content-Type",
+  "Cookie",
+  "Date",
+  "ETag",
+  "Expires",
+  "Host",
+  "If-Modified-Since",
+  "Location",
+  "Origin",
+  "Pragma",
+  "Referer",
+  "Set-Cookie",
+  "User-Agent",
+  "X-Requested-With",
+]);
 
 export const Headers = ({
   control,
-  register,
+  headers: schemaHeaders,
 }: {
-  register: UseFormRegister<PlaygroundForm>;
   control: Control<PlaygroundForm>;
+  headers: Header[];
 }) => {
-  const { fields, append, remove } = useFieldArray<PlaygroundForm>({
+  const { fields, append, remove } = useFieldArray<PlaygroundForm, "headers">({
     control,
     name: "headers",
   });
+  const { setValue, watch } = useFormContext<PlaygroundForm>();
+  const valueRefs = useRef<Array<HTMLInputElement | null>>([]);
+  const nameRefs = useRef<Array<HTMLInputElement | null>>([]);
+  const watchedHeaders = watch("headers");
+
+  const addNewHeader = useCallback(() => {
+    append({ name: "", value: "", active: false });
+  }, [append]);
+
+  useEffect(() => {
+    if (watchedHeaders.length === 0) {
+      addNewHeader();
+    }
+  }, [watchedHeaders, addNewHeader]);
+
+  const handleHeaderEnter = (index: number) => {
+    valueRefs.current[index]?.focus();
+  };
+
+  const handleValueEnter = (index: number) => {
+    addNewHeader();
+    requestAnimationFrame(() => nameRefs.current[index + 1]?.focus());
+  };
+
+  const missingHeaders = schemaHeaders
+    .filter((h) => !watchedHeaders.some((f) => f.name === h.name))
+    .map(({ name }) => name);
 
   return (
     <div className="flex flex-col gap-2">
-      <table className="w-full [&_td]:border [&_td]:p-1.5 [&_td]:px-2">
-        <tbody>
-          {fields.map((header, i) => (
-            <tr
-              key={header.id}
-              className="group has-[:focus]:bg-muted/50 hover:bg-muted/50"
-            >
-              <td className="flex gap-2 items-center">
-                <Input
-                  {...register(`headers.${i}.name`)}
-                  placeholder="Name"
-                  className="border-0 shadow-none text-xs font-mono"
-                  autoComplete="off"
-                />
-              </td>
-              <td>
+      <Card className="overflow-hidden">
+        <ParamsGrid>
+          {fields.map((field, i) => {
+            const currentHeader = schemaHeaders.find(
+              (h) => h.name === watch(`headers.${i}.name`),
+            );
+            return (
+              <ParamsGridItem key={field.id}>
+                <div className="flex items-center gap-2 ">
+                  <Controller
+                    control={control}
+                    name={`headers.${i}.active`}
+                    render={({ field }) => (
+                      <Checkbox
+                        variant="outline"
+                        id={`headers.${i}.active`}
+                        checked={field.value}
+                        onCheckedChange={(checked) => {
+                          field.onChange(checked);
+                        }}
+                      />
+                    )}
+                  />
+                  <Controller
+                    control={control}
+                    name={`headers.${i}.name`}
+                    render={({ field }) => (
+                      <Autocomplete
+                        {...field}
+                        placeholder="Name"
+                        className="border-0 shadow-none bg-transparent text-xs font-mono"
+                        options={[...missingHeaders, ...headerOptions]}
+                        onEnterPress={() => handleHeaderEnter(i)}
+                        onChange={(e) => {
+                          field.onChange(e);
+                          setValue(`headers.${i}.active`, true);
+                        }}
+                        ref={(el) => {
+                          nameRefs.current[i] = el;
+                        }}
+                      />
+                    )}
+                  />
+                </div>
                 <div className="flex items-center gap-2">
-                  <Input
-                    placeholder={"Value"}
-                    className="border-0 shadow-none text-xs font-mono"
-                    {...register(`headers.${i}.value`)}
-                    autoComplete="off"
+                  <Controller
+                    control={control}
+                    name={`headers.${i}.value`}
+                    render={({ field }) => {
+                      const hasEnum =
+                        currentHeader?.enum && currentHeader.enum.length > 0;
+
+                      if (!hasEnum) {
+                        return (
+                          <Input
+                            placeholder="Value"
+                            className="w-full border-0 shadow-none text-xs font-mono focus-visible:ring-0"
+                            {...field}
+                            ref={(el) => {
+                              valueRefs.current[i] = el;
+                            }}
+                            onKeyDown={(e) => {
+                              if (
+                                e.key === "Enter" &&
+                                e.currentTarget.value.trim()
+                              ) {
+                                handleValueEnter(i);
+                              }
+                            }}
+                            autoComplete="off"
+                          />
+                        );
+                      }
+
+                      return (
+                        <Autocomplete
+                          shouldFilter={false}
+                          value={field.value}
+                          options={currentHeader.enum ?? []}
+                          onChange={(e) => {
+                            field.onChange(e);
+                            setValue(`headers.${i}.active`, true);
+                          }}
+                          className="font-mono text-xs border-0"
+                        />
+                      );
+                    }}
                   />
                   <Button
                     size="icon"
                     variant="ghost"
-                    className="text-muted-foreground opacity-0 group-hover:opacity-100"
-                    onClick={() => {
-                      remove(i);
-                    }}
+                    className="text-muted-foreground opacity-0 group-hover:opacity-100 rounded-full w-8 h-7"
+                    onClick={() => remove(i)}
                     type="button"
                   >
                     <XIcon size={16} />
                   </Button>
                 </div>
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+              </ParamsGridItem>
+            );
+          })}
+        </ParamsGrid>
+      </Card>
       <div className="text-end">
         <Button
           className=""
-          onClick={() => append({ name: "", value: "" })}
+          onClick={addNewHeader}
           type="button"
           variant="secondary"
         >

package/src/lib/plugins/openapi/playground/ParamsGrid.tsx

@@ -0,0 +1,13 @@
+import createVariantComponent from "../../../util/createVariantComponent.js";
+
+const ParamsGrid = createVariantComponent(
+  "div",
+  "grid grid-cols-[2fr_3fr] gap-2 items-center",
+);
+
+export const ParamsGridItem = createVariantComponent(
+  "div",
+  "group hover:bg-accent px-3 grid col-span-full grid-cols-subgrid",
+);
+
+export default ParamsGrid;

package/src/lib/plugins/openapi/playground/PathParams.tsx

@@ -1,96 +1,56 @@
-import { EraserIcon } from "lucide-react";
 import { Control, Controller, useFieldArray } from "react-hook-form";
 import { Card } from "zudoku/ui/Card.js";
-import { Button } from "../../../ui/Button.js";
 import { Input } from "../../../ui/Input.js";
-import { cn } from "../../../util/cn.js";
-import { ColorizedParam, useParamColor } from "../ColorizedParam.js";
+import { ColorizedParam } from "../ColorizedParam.js";
+import ParamsGrid, { ParamsGridItem } from "./ParamsGrid.js";
 import type { PlaygroundForm } from "./Playground.js";
 
-const PathParamLabel = ({ name }: { name: string }) => {
-  const color = useParamColor(name);
-
-  return (
-    <div className="flex items-center">
-      <div
-        className="w-2 h-2 rounded-full"
-        style={{ backgroundColor: `hsl(${color})` }}
-      />
-
-      <ColorizedParam
-        slug={name}
-        name={name}
-        className="font-mono text-xs m-2 px-1"
-      />
-    </div>
-  );
-};
-
 export const PathParams = ({
   control,
 }: {
   control: Control<PlaygroundForm>;
 }) => {
-  const { fields } = useFieldArray<PlaygroundForm>({
+  const { fields } = useFieldArray<PlaygroundForm, "pathParams">({
     control,
     name: "pathParams",
   });
 
   return (
     <Card className="rounded-lg">
-      <table className="w-full">
-        <tbody>
-          {fields.map((part, i) => (
-            <tr key={part.id} className="hover:bg-accent/40">
-              <td className="w-5/12">
-                <Controller
-                  control={control}
-                  name={`pathParams.${i}.value`}
-                  render={() => <PathParamLabel name={part.name} />}
-                />
-              </td>
-              <td className="w-7/12">
-                <div className="flex justify-between items-center">
-                  <Controller
-                    control={control}
-                    name={`pathParams.${i}.value`}
-                    render={({ field }) => (
-                      <Input
-                        {...field}
-                        required
-                        placeholder="Enter value"
-                        className="w-full border-0 shadow-none text-xs font-mono hover:bg-accent"
-                      />
-                    )}
-                  />
-                  <Controller
-                    control={control}
-                    name={`pathParams.${i}.value`}
-                    render={({ field }) => (
-                      <Button
-                        size="icon"
-                        type="button"
-                        variant="ghost"
-                        aria-label="Clear value"
-                        className={cn(
-                          "ms-2 mr-1",
-                          field.value.length === 0
-                            ? "opacity-0 pointer-events-none"
-                            : "opacity-100",
-                        )}
-                        title="Clear value"
-                        onClick={() => field.onChange("")}
-                      >
-                        <EraserIcon size={16} />
-                      </Button>
-                    )}
+      <ParamsGrid>
+        {fields.map((field, i) => (
+          <ParamsGridItem key={field.id}>
+            <Controller
+              control={control}
+              name={`pathParams.${i}.name`}
+              render={() => (
+                <div className="flex items-center">
+                  <ColorizedParam
+                    slug={field.name}
+                    name={field.name}
+                    className="font-mono text-xs px-2"
                   />
                 </div>
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
+              )}
+            />
+
+            <div className="flex justify-between items-center">
+              <Controller
+                control={control}
+                name={`pathParams.${i}.value`}
+                render={({ field }) => (
+                  <Input
+                    {...field}
+                    required
+                    placeholder="Enter value"
+                    className="w-full border-0 shadow-none text-xs font-mono focus-visible:ring-0"
+                  />
+                )}
+              />
+            </div>
+          </ParamsGridItem>
+        ))}
+      </ParamsGrid>
     </Card>
   );
 };