Skip to content

Modern Docker Management, Designed for Everyone

refactor: update global variable input design

Kyle Mendell87f60d696b98
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index ff437117f..7a7f3b8e4 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -1256,5 +1256,6 @@
"customize_registry_credentials": "Registry Credentials",
"customize_registry_mirrors": "Registry Mirrors",
"customize_secret_variables": "Secret Variables",
- "customize_variable_templates": "Variable Templates"
+ "customize_variable_templates": "Variable Templates",
+ "duplicate": "Duplicate"
}
diff --git a/frontend/src/lib/components/ui/input-group/index.ts b/frontend/src/lib/components/ui/input-group/index.ts
new file mode 100644
index 000000000..fe1f55d8a
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/index.ts
@@ -0,0 +1,22 @@
+import Root from "./input-group.svelte";
+import Addon from "./input-group-addon.svelte";
+import Button from "./input-group-button.svelte";
+import Input from "./input-group-input.svelte";
+import Text from "./input-group-text.svelte";
+import Textarea from "./input-group-textarea.svelte";
+
+export {
+ Root,
+ Addon,
+ Button,
+ Input,
+ Text,
+ Textarea,
+ //
+ Root as InputGroup,
+ Addon as InputGroupAddon,
+ Button as InputGroupButton,
+ Input as InputGroupInput,
+ Text as InputGroupText,
+ Textarea as InputGroupTextarea,
+};
diff --git a/frontend/src/lib/components/ui/input-group/input-group-addon.svelte b/frontend/src/lib/components/ui/input-group/input-group-addon.svelte
new file mode 100644
index 000000000..3e70d3ad9
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/input-group-addon.svelte
@@ -0,0 +1,53 @@
+<script lang="ts" module>
+ import { tv, type VariantProps } from "tailwind-variants";
+ const inputGroupAddonVariants = tv({
+ base: "text-muted-foreground flex h-auto cursor-text select-none items-center justify-center gap-2 py-1.5 text-sm font-medium group-data-[disabled=true]/input-group:opacity-50 [&>kbd]:rounded-[calc(var(--radius)-5px)] [&>svg:not([class*='size-'])]:size-4",
+ variants: {
+ align: {
+ "inline-start":
+ "order-first pl-3 has-[>button]:ml-[-0.45rem] has-[>kbd]:ml-[-0.35rem]",
+ "inline-end":
+ "order-last pr-3 has-[>button]:mr-[-0.45rem] has-[>kbd]:mr-[-0.35rem]",
+ "block-start":
+ "[.border-b]:pb-3 order-first w-full justify-start px-3 pt-3 group-has-[>input]/input-group:pt-2.5",
+ "block-end":
+ "[.border-t]:pt-3 order-last w-full justify-start px-3 pb-3 group-has-[>input]/input-group:pb-2.5",
+ },
+ },
+ defaultVariants: {
+ align: "inline-start",
+ },
+ });
+
+ export type InputGroupAddonAlign = VariantProps<typeof inputGroupAddonVariants>["align"];
+</script>
+
+<script lang="ts">
+ import { cn } from "$lib/utils.js";
+ import type { HTMLAttributes } from "svelte/elements";
+
+ let {
+ class: className,
+ children,
+ align = "inline-start",
+ ...restProps
+ }: HTMLAttributes<HTMLDivElement> & {
+ align?: InputGroupAddonAlign;
+ } = $props();
+</script>
+
+<div
+ role="group"
+ data-slot="input-group-addon"
+ data-align={align}
+ class={cn(inputGroupAddonVariants({ align }), className)}
+ onclick={(e) => {
+ if ((e.target as HTMLElement).closest("button")) {
+ return;
+ }
+ e.currentTarget.parentElement?.querySelector("input")?.focus();
+ }}
+ {...restProps}
+>
+ {@render children?.()}
+</div>
diff --git a/frontend/src/lib/components/ui/input-group/input-group-button.svelte b/frontend/src/lib/components/ui/input-group/input-group-button.svelte
new file mode 100644
index 000000000..361c8d424
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/input-group-button.svelte
@@ -0,0 +1,47 @@
+<script lang="ts" module>
+ import { tv, type VariantProps } from "tailwind-variants";
+
+ const inputGroupButtonVariants = tv({
+ base: "flex items-center gap-2 text-sm shadow-none",
+ variants: {
+ size: {
+ xs: "h-6 gap-1 rounded-[calc(var(--radius)-5px)] px-2 has-[>svg]:px-2 [&>svg:not([class*='size-'])]:size-3.5",
+ sm: "h-8 gap-1.5 rounded-md px-2.5 has-[>svg]:px-2.5",
+ "icon-xs": "size-6 rounded-[calc(var(--radius)-5px)] p-0 has-[>svg]:p-0",
+ "icon-sm": "size-8 p-0 has-[>svg]:p-0",
+ },
+ },
+ defaultVariants: {
+ size: "xs",
+ },
+ });
+
+ export type InputGroupButtonSize = VariantProps<typeof inputGroupButtonVariants>["size"];
+</script>
+
+<script lang="ts">
+ import { cn } from "$lib/utils.js";
+ import type { ComponentProps } from "svelte";
+ import { Button } from "$lib/components/ui/button/index.js";
+
+ let {
+ class: className,
+ children,
+ type = "button",
+ variant = "ghost",
+ size = "xs",
+ ...restProps
+ }: Omit<ComponentProps<typeof Button>, "href" | "size"> & {
+ size?: InputGroupButtonSize;
+ } = $props();
+</script>
+
+<Button
+ {type}
+ data-size={size}
+ {variant}
+ class={cn(inputGroupButtonVariants({ size }), className)}
+ {...restProps}
+>
+ {@render children?.()}
+</Button>
diff --git a/frontend/src/lib/components/ui/input-group/input-group-input.svelte b/frontend/src/lib/components/ui/input-group/input-group-input.svelte
new file mode 100644
index 000000000..827042021
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/input-group-input.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+ import { cn } from "$lib/utils.js";
+ import type { ComponentProps } from "svelte";
+ import { Input } from "$lib/components/ui/input/index.js";
+
+ let {
+ value = $bindable(),
+ class: className,
+ ...props
+ }: ComponentProps<typeof Input> = $props();
+</script>
+
+<Input
+ data-slot="input-group-control"
+ class={cn(
+ "flex-1 rounded-none border-0 bg-transparent shadow-none focus-visible:ring-0 dark:bg-transparent",
+ className
+ )}
+ bind:value
+ {...props}
+/>
diff --git a/frontend/src/lib/components/ui/input-group/input-group-text.svelte b/frontend/src/lib/components/ui/input-group/input-group-text.svelte
new file mode 100644
index 000000000..c61dcb9dc
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/input-group-text.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+ import { cn } from "$lib/utils.js";
+ import type { HTMLAttributes } from "svelte/elements";
+
+ let { class: className, children, ...restProps }: HTMLAttributes<HTMLSpanElement> = $props();
+</script>
+
+<span
+ class={cn(
+ "text-muted-foreground flex items-center gap-2 text-sm [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none",
+ className
+ )}
+ {...restProps}
+>
+ {@render children?.()}
+</span>
diff --git a/frontend/src/lib/components/ui/input-group/input-group-textarea.svelte b/frontend/src/lib/components/ui/input-group/input-group-textarea.svelte
new file mode 100644
index 000000000..7a8c4d7e3
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/input-group-textarea.svelte
@@ -0,0 +1,21 @@
+<script lang="ts">
+ import { cn } from "$lib/utils.js";
+ import { Textarea } from "$lib/components/ui/textarea/index.js";
+ import type { ComponentProps } from "svelte";
+
+ let {
+ value = $bindable(),
+ class: className,
+ ...props
+ }: ComponentProps<typeof Textarea> = $props();
+</script>
+
+<Textarea
+ data-slot="input-group-control"
+ class={cn(
+ "flex-1 resize-none rounded-none border-0 bg-transparent py-3 shadow-none focus-visible:ring-0 dark:bg-transparent",
+ className
+ )}
+ bind:value
+ {...props}
+/>
diff --git a/frontend/src/lib/components/ui/input-group/input-group.svelte b/frontend/src/lib/components/ui/input-group/input-group.svelte
new file mode 100644
index 000000000..558d3ba20
--- /dev/null
+++ b/frontend/src/lib/components/ui/input-group/input-group.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+ import { cn } from "$lib/utils.js";
+ import type { HTMLAttributes } from "svelte/elements";
+
+ let { class: className, children, ...props }: HTMLAttributes<HTMLDivElement> = $props();
+</script>
+
+<div
+ data-slot="input-group"
+ role="group"
+ class={cn(
+ "group/input-group border-input dark:bg-input/30 shadow-xs relative flex w-full items-center rounded-md border outline-none transition-[color,box-shadow]",
+ "h-9 has-[>textarea]:h-auto",
+
+ // Variants based on alignment.
+ "has-[>[data-align=inline-start]]:[&>input]:pl-2",
+ "has-[>[data-align=inline-end]]:[&>input]:pr-2",
+ "has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>[data-align=block-start]]:[&>input]:pb-3",
+ "has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-end]]:[&>input]:pt-3",
+
+ // Focus state.
+ "has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot=input-group-control]:focus-visible]:ring-[3px]",
+
+ // Error state.
+ "has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[[data-slot][aria-invalid=true]]:border-destructive dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40",
+
+ className
+ )}
+ {...props}
+>
+ {@render children?.()}
+</div>
diff --git a/frontend/src/routes/customize/variables/+page.svelte b/frontend/src/routes/customize/variables/+page.svelte
index 3ab73fb69..52903d24a 100644
--- a/frontend/src/routes/customize/variables/+page.svelte
+++ b/frontend/src/routes/customize/variables/+page.svelte
@@ -2,6 +2,8 @@
import * as Card from '$lib/components/ui/card';
import { Button } from '$lib/components/ui/button';
import { Input } from '$lib/components/ui/input';
+ import * as InputGroup from '$lib/components/ui/input-group/index.js';
+ import * as Tooltip from '$lib/components/ui/tooltip/index.js';
import { toast } from 'svelte-sonner';
import PlusIcon from '@lucide/svelte/icons/plus';
import XIcon from '@lucide/svelte/icons/x';
@@ -222,64 +224,83 @@
<div class="space-y-2">
{#each filteredVars as envVar, index (index)}
{@const actualIndex = envVars.indexOf(envVar)}
- <div
- class="bg-muted/30 hover:bg-muted/50 group flex flex-col gap-2 rounded-lg border p-2.5 transition-colors sm:flex-row sm:items-center"
- >
- <div class="flex flex-1 gap-2">
- <Input
- type="text"
- placeholder={m.variables_key_placeholder()}
- bind:value={envVar.key}
- disabled={isLoading}
- class="h-9 flex-1 font-mono text-sm sm:max-w-[200px]"
- onkeydown={(e) => handleKeyDown(e, actualIndex)}
- oninput={(e) => {
- const target = e.target as HTMLInputElement;
- const cursorPos = target.selectionStart || 0;
- const oldValue = envVar.key;
- const newValue = target.value.toUpperCase().replace(/\s/g, '_');
-
- envVar.key = newValue;
-
- requestAnimationFrame(() => {
- const diff = newValue.length - oldValue.length;
- target.setSelectionRange(cursorPos + diff, cursorPos + diff);
- });
- }}
- />
- <span class="text-muted-foreground flex items-center font-mono text-sm">=</span>
- <Input
- type="text"
- placeholder={m.variables_value_placeholder()}
- bind:value={envVar.value}
- disabled={isLoading}
- class="h-9 flex-[2] font-mono text-sm"
- onkeydown={(e) => handleKeyDown(e, actualIndex)}
- />
- </div>
- <div class="flex items-center gap-1 self-end sm:self-center">
- <Button
- type="button"
- variant="ghost"
- size="icon"
- class="size-8 shrink-0 opacity-70 transition-opacity group-hover:opacity-100"
- onclick={() => duplicateEnvVar(actualIndex)}
- disabled={isLoading}
- title="Duplicate"
- >
- <CopyIcon class="size-4" />
- </Button>
- <Button
- type="button"
- variant="ghost"
- size="icon"
- class="text-destructive hover:text-destructive hover:bg-destructive/10 size-8 shrink-0 opacity-70 transition-opacity group-hover:opacity-100"
- onclick={() => removeEnvVar(actualIndex)}
- disabled={isLoading}
- title="Remove"
- >
- <XIcon class="size-4" />
- </Button>
+ <div class="flex flex-col gap-2 sm:flex-row sm:items-center">
+ <div class="flex flex-1 items-center gap-2">
+ <InputGroup.Root class="flex-1 sm:max-w-[200px]">
+ <InputGroup.Input
+ type="text"
+ placeholder={m.variables_key_placeholder()}
+ bind:value={envVar.key}
+ disabled={isLoading}
+ class="font-mono text-sm"
+ onkeydown={(e) => handleKeyDown(e, actualIndex)}
+ oninput={(e) => {
+ const target = e.target as HTMLInputElement;
+ const cursorPos = target.selectionStart || 0;
+ const oldValue = envVar.key;
+ const newValue = target.value.toUpperCase().replace(/\s/g, '_');
+
+ envVar.key = newValue;
+
+ requestAnimationFrame(() => {
+ const diff = newValue.length - oldValue.length;
+ target.setSelectionRange(cursorPos + diff, cursorPos + diff);
+ });
+ }}
+ />
+ </InputGroup.Root>
+ <span class="text-muted-foreground font-mono text-sm">=</span>
+ <InputGroup.Root class="flex-[2]">
+ <InputGroup.Input
+ type="text"
+ placeholder={m.variables_value_placeholder()}
+ bind:value={envVar.value}
+ disabled={isLoading}
+ class="font-mono text-sm"
+ onkeydown={(e) => handleKeyDown(e, actualIndex)}
+ />
+ <InputGroup.Addon align="inline-end">
+ <Tooltip.Root>
+ <Tooltip.Trigger>
+ {#snippet child({ props })}
+ <InputGroup.Button
+ {...props}
+ variant="ghost"
+ aria-label={m.duplicate()}
+ size="icon-xs"
+ onclick={() => duplicateEnvVar(actualIndex)}
+ disabled={isLoading}
+ >
+ <CopyIcon />
+ </InputGroup.Button>
+ {/snippet}
+ </Tooltip.Trigger>
+ <Tooltip.Content>
+ <p>{m.duplicate()}</p>
+ </Tooltip.Content>
+ </Tooltip.Root>
+ <Tooltip.Root>
+ <Tooltip.Trigger>
+ {#snippet child({ props })}
+ <InputGroup.Button
+ {...props}
+ variant="ghost"
+ aria-label={m.common_remove()}
+ size="icon-xs"
+ onclick={() => removeEnvVar(actualIndex)}
+ disabled={isLoading}
+ class="text-destructive hover:text-destructive"
+ >
+ <XIcon />
+ </InputGroup.Button>
+ {/snippet}
+ </Tooltip.Trigger>
+ <Tooltip.Content>
+ <p>{m.common_remove()}</p>
+ </Tooltip.Content>
+ </Tooltip.Root>
+ </InputGroup.Addon>
+ </InputGroup.Root>
</div>
</div>
{/each}