Skip to content

Modern Docker Management, Designed for Everyone

fix: add missing props to button

Kyle Mendell044396c641cc
diff --git a/frontend/src/lib/components/ui/button/button.svelte b/frontend/src/lib/components/ui/button/button.svelte
index 4daf4535c..cee02c35f 100644
--- a/frontend/src/lib/components/ui/button/button.svelte
+++ b/frontend/src/lib/components/ui/button/button.svelte
@@ -1,80 +1,128 @@
+<!--
+ Installed from @ieedan/shadcn-svelte-extras
+-->
+
<script lang="ts" module>
- import { cn, type WithElementRef } from "$lib/utils.js";
- import type { HTMLAnchorAttributes, HTMLButtonAttributes } from "svelte/elements";
- import { type VariantProps, tv } from "tailwind-variants";
+ import type { WithChildren, WithoutChildren } from 'bits-ui';
+ import type { HTMLAnchorAttributes, HTMLButtonAttributes } from 'svelte/elements';
+ import { type VariantProps, tv } from 'tailwind-variants';
export const buttonVariants = tv({
- base: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+ base: "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive focus-visible:border-ring focus-visible:ring-ring/50 relative inline-flex shrink-0 items-center justify-center gap-2 overflow-hidden rounded-md text-sm font-medium whitespace-nowrap outline-hidden transition-all select-none focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
variants: {
variant: {
- default: "bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
+ default: 'bg-primary text-primary-foreground hover:bg-primary/90 shadow-2xs',
destructive:
- "bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60 text-white",
+ 'bg-destructive hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:bg-destructive/60 dark:focus-visible:ring-destructive/40 text-white shadow-2xs',
outline:
- "bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 border",
- secondary: "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
- ghost: "hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
- link: "text-primary underline-offset-4 hover:underline",
+ 'bg-background hover:bg-accent hover:text-accent-foreground dark:border-input dark:bg-input/30 dark:hover:bg-input/50 border shadow-2xs',
+ secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-2xs',
+ ghost: 'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
+ link: 'text-primary underline-offset-4 hover:underline'
},
size: {
- default: "h-9 px-4 py-2 has-[>svg]:px-3",
- sm: "h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5",
- lg: "h-10 rounded-md px-6 has-[>svg]:px-4",
- icon: "size-9",
- },
+ default: 'h-9 px-4 py-2 has-[>svg]:px-3',
+ sm: 'h-8 gap-1.5 rounded-md px-3 has-[>svg]:px-2.5',
+ lg: 'h-10 rounded-md px-6 has-[>svg]:px-4',
+ icon: 'size-9'
+ }
},
defaultVariants: {
- variant: "default",
- size: "default",
- },
+ variant: 'default',
+ size: 'default'
+ }
});
- export type ButtonVariant = VariantProps<typeof buttonVariants>["variant"];
- export type ButtonSize = VariantProps<typeof buttonVariants>["size"];
+ export type ButtonVariant = VariantProps<typeof buttonVariants>['variant'];
+ export type ButtonSize = VariantProps<typeof buttonVariants>['size'];
+
+ export type ButtonPropsWithoutHTML = WithChildren<{
+ ref?: HTMLElement | null;
+ variant?: ButtonVariant;
+ size?: ButtonSize;
+ loading?: boolean;
+ onClickPromise?: (
+ e: MouseEvent & {
+ currentTarget: EventTarget & HTMLButtonElement;
+ }
+ ) => Promise<void>;
+ }>;
- export type ButtonProps = WithElementRef<HTMLButtonAttributes> &
- WithElementRef<HTMLAnchorAttributes> & {
- variant?: ButtonVariant;
- size?: ButtonSize;
+ export type AnchorElementProps = ButtonPropsWithoutHTML &
+ WithoutChildren<Omit<HTMLAnchorAttributes, 'href' | 'type'>> & {
+ href: HTMLAnchorAttributes['href'];
+ type?: never;
+ disabled?: HTMLButtonAttributes['disabled'];
};
+
+ export type ButtonElementProps = ButtonPropsWithoutHTML &
+ WithoutChildren<Omit<HTMLButtonAttributes, 'type' | 'href'>> & {
+ type?: HTMLButtonAttributes['type'];
+ href?: never;
+ disabled?: HTMLButtonAttributes['disabled'];
+ };
+
+ export type ButtonProps = AnchorElementProps | ButtonElementProps;
</script>
<script lang="ts">
+ import { cn } from '$lib/utils/utils.js';
+ import LoaderCircleIcon from '@lucide/svelte/icons/loader-circle';
+
let {
- class: className,
- variant = "default",
- size = "default",
ref = $bindable(null),
+ variant = 'default',
+ size = 'default',
href = undefined,
- type = "button",
- disabled,
+ type = 'button',
+ loading = false,
+ disabled = false,
+ tabindex = 0,
+ onclick,
+ onClickPromise,
+ class: className,
children,
- ...restProps
+ ...rest
}: ButtonProps = $props();
</script>
-{#if href}
- <a
- bind:this={ref}
- data-slot="button"
- class={cn(buttonVariants({ variant, size }), className)}
- href={disabled ? undefined : href}
- aria-disabled={disabled}
- role={disabled ? "link" : undefined}
- tabindex={disabled ? -1 : undefined}
- {...restProps}
- >
- {@render children?.()}
- </a>
-{:else}
- <button
- bind:this={ref}
- data-slot="button"
- class={cn(buttonVariants({ variant, size }), className)}
- {type}
- {disabled}
- {...restProps}
- >
- {@render children?.()}
- </button>
-{/if}
+<!-- This approach to disabled links is inspired by bits-ui see: https://github.com/huntabyte/bits-ui/pull/1055 -->
+<svelte:element
+ this={href ? 'a' : 'button'}
+ {...rest}
+ data-slot="button"
+ type={href ? undefined : type}
+ href={href && !disabled ? href : undefined}
+ disabled={href ? undefined : disabled || loading}
+ aria-disabled={href ? disabled : undefined}
+ role={href && disabled ? 'link' : undefined}
+ tabindex={href && disabled ? -1 : tabindex}
+ class={cn(buttonVariants({ variant, size }), className)}
+ bind:this={ref}
+ onclick={async (
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ e: any
+ ) => {
+ onclick?.(e);
+
+ if (type === undefined) return;
+
+ if (onClickPromise) {
+ loading = true;
+
+ await onClickPromise(e);
+
+ loading = false;
+ }
+ }}
+>
+ {#if type !== undefined && loading}
+ <div class="absolute flex size-full place-items-center justify-center bg-inherit">
+ <div class="flex animate-spin place-items-center justify-center">
+ <LoaderCircleIcon class="size-4" />
+ </div>
+ </div>
+ <span class="sr-only">Loading</span>
+ {/if}
+ {@render children?.()}
+</svelte:element>
diff --git a/frontend/src/lib/components/ui/button/index.ts b/frontend/src/lib/components/ui/button/index.ts
index fb585d768..34c3e590c 100644
--- a/frontend/src/lib/components/ui/button/index.ts
+++ b/frontend/src/lib/components/ui/button/index.ts
@@ -1,9 +1,16 @@
+/*
+ Installed from @ieedan/shadcn-svelte-extras
+*/
+
import Root, {
type ButtonProps,
type ButtonSize,
type ButtonVariant,
- buttonVariants,
-} from "./button.svelte";
+ type AnchorElementProps,
+ type ButtonElementProps,
+ type ButtonPropsWithoutHTML,
+ buttonVariants
+} from './button.svelte';
export {
Root,
@@ -14,4 +21,7 @@ export {
type ButtonProps,
type ButtonSize,
type ButtonVariant,
+ type AnchorElementProps,
+ type ButtonElementProps,
+ type ButtonPropsWithoutHTML
};