misc: Change the way buttons are handled
This commit is contained in:
1 parent
d8ac0d807a
commit
e243848e17
30 files changed
+215
-152
No files matched your search
@@ -1,43 +1,91 @@
|
||||
<script lang="ts">
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
import Loading from '$lib/components/ui/loader/Loading.svelte'
|
||||
import Spinner from '$lib/components/ui/loader/Spinner.svelte'
|
||||
|
||||
export let color: Color = Color.secondary
|
||||
type ButtonColor = keyof typeof buttonColor
|
||||
type ButtonSize = keyof typeof buttonSize
|
||||
type ButtonRoundness = keyof typeof buttonRoundness
|
||||
|
||||
const buttonColor = {
|
||||
primary: `border bg-black border-black text-white dark:bg-white
|
||||
dark:border-white dark:text-black hover:text-inherit hover:bg-transparent
|
||||
active:bg-black/10 active:dark:bg-white/10`,
|
||||
|
||||
secondary: 'bg-transparent hover:bg-slate-100 hover:dark:bg-zinc-800',
|
||||
|
||||
danger:
|
||||
'border border-red-500 bg-red-500 hover:text-red-500 hover:bg-transparent text-white',
|
||||
|
||||
ghost: `border border-slate-200 dark:border-zinc-800 hover:bg-slate-100 hover:dark:bg-zinc-800
|
||||
hover:border-slate-200 hover:dark:border-zinc-700`,
|
||||
|
||||
elevated: `bg-slate-100 dark:bg-zinc-800 border border-slate-200
|
||||
dark:border-zinc-700 hover:bg-slate-200 hover:dark:bg-zinc-700 hover:border-slate-300
|
||||
hover:dark:border-zinc-600`,
|
||||
|
||||
none: '',
|
||||
}
|
||||
|
||||
const buttonSize = {
|
||||
sm: 'px-3 py-1',
|
||||
md: 'px-3 py-1.5',
|
||||
lg: 'px-4 py-2',
|
||||
}
|
||||
|
||||
const buttonRoundness = {
|
||||
pill: 'rounded-full',
|
||||
md: 'rounded-md',
|
||||
none: '',
|
||||
}
|
||||
|
||||
export let loading = false
|
||||
export let large = false
|
||||
export let disabled = false
|
||||
export let submit = false
|
||||
export let label: string = ''
|
||||
export let spinner = false
|
||||
|
||||
export let color: ButtonColor = 'secondary'
|
||||
export let size: ButtonSize = 'md'
|
||||
export let rounded: ButtonRoundness = 'md'
|
||||
|
||||
const dispatch = createEventDispatcher()
|
||||
export let href: string | undefined = undefined
|
||||
|
||||
let buttonClass = `
|
||||
${buttonColor[color]}
|
||||
${buttonSize[size]}
|
||||
${buttonRoundness[rounded]}
|
||||
${
|
||||
loading ? (color == 'primary' ? '!bg-transparent !text-inherit' : '') : ''
|
||||
}
|
||||
text-sm transition-all disabled:opacity-70 disabled:pointer-events-none
|
||||
${$$props.class}
|
||||
`
|
||||
</script>
|
||||
|
||||
<button
|
||||
{disabled}
|
||||
on:click={(e) => dispatch('click', e)}
|
||||
class="{large
|
||||
? 'w-full px-4 py-2'
|
||||
: 'px-3 py-1.5'} rounded-md {color} text-sm transition-all disabled:opacity-50 disabled:pointer-events-none"
|
||||
type={submit ? 'submit' : 'button'}
|
||||
aria-label={label}
|
||||
>
|
||||
<div
|
||||
class="flex flex-row items-center justify-center gap-2"
|
||||
class:hidden={loading}
|
||||
{#if href}
|
||||
<a {href} {...$$restProps} class={buttonClass}>
|
||||
<div class="flex flex-row items-center justify-center gap-1.5">
|
||||
{#if loading}
|
||||
<Spinner />
|
||||
{:else}
|
||||
<slot name="icon" />
|
||||
{/if}
|
||||
<slot />
|
||||
</div>
|
||||
</a>
|
||||
{:else}
|
||||
<button
|
||||
disabled={loading}
|
||||
{...$$restProps}
|
||||
on:click={(e) => dispatch('click', e)}
|
||||
class={buttonClass}
|
||||
type={submit ? 'submit' : 'button'}
|
||||
>
|
||||
<slot name="icon" />
|
||||
<slot />
|
||||
</div>
|
||||
<div class="mx-auto" class:hidden={!loading}>
|
||||
{#if spinner}
|
||||
<Spinner />
|
||||
{:else}
|
||||
<div class="py-2">
|
||||
<Loading />
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</button>
|
||||
<div class="flex flex-row items-center justify-center gap-1.5">
|
||||
{#if loading}
|
||||
<Spinner width={20} />
|
||||
{:else}
|
||||
<slot name="icon" />
|
||||
{/if}
|
||||
<slot />
|
||||
</div>
|
||||
</button>
|
||||
{/if}
|
||||
@@ -15,9 +15,12 @@
|
||||
</script>
|
||||
|
||||
<label
|
||||
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg border border-black border-dashed cursor-pointer min-h-36 transition-colors dark:border-white {dragover
|
||||
class="flex flex-col items-center px-8 py-4 mx-auto w-full rounded-lg
|
||||
border border-slate-300 dark:border-zinc-700 bg-white dark:bg-black
|
||||
cursor-pointer min-h-36 transition-colors {dragover
|
||||
? 'border-sky-500 text-sky-500'
|
||||
: ''}"
|
||||
: ''}
|
||||
"
|
||||
on:drop|preventDefault={(event) => (files = event.dataTransfer?.files)}
|
||||
on:dragover|preventDefault={(event) => {
|
||||
if (event.dataTransfer) {
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
<script lang="ts">
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
export let href: string
|
||||
|
||||
export let color: Color = Color.secondary
|
||||
export let href = ''
|
||||
export let label: string = ''
|
||||
export let highlight: boolean
|
||||
</script>
|
||||
|
||||
<a
|
||||
{href}
|
||||
class="px-3 py-1 rounded-md {color} flex flex-row items-center
|
||||
justify-center text-sm transition-all gap-1"
|
||||
aria-label={label}
|
||||
class="flex flex-row gap-2 {highlight ? 'text-sky-500' : ''} hover:underline"
|
||||
{...$$restProps}
|
||||
>
|
||||
<slot name="icon" />
|
||||
<slot />
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
{placeholder}
|
||||
{maxlength}
|
||||
{rows}
|
||||
class="w-full px-3 text-sm py-2.5 bg-transparent border border-black/20
|
||||
dark:border-white/20 dark:focus:border-white focus:outline-none
|
||||
focus:border-black transition-colors rounded-md {clazz}"
|
||||
class="w-full px-3 text-sm py-2.5 bg-white dark:bg-black
|
||||
border border-slate-300 dark:border-zinc-700 dark:focus:border-white
|
||||
focus:outline-none focus:border-black transition-colors rounded-md {clazz}"
|
||||
/>
|
||||
</label>
|
||||
@@ -3,26 +3,26 @@
|
||||
|
||||
export let label: string = ''
|
||||
export let type: 'text' | 'password' | 'email' | null | undefined = 'text'
|
||||
export let placeholder: string = ''
|
||||
export let value: string = ''
|
||||
export let maxlength: number = -1
|
||||
export let required = false
|
||||
export let id = ''
|
||||
export let pattern: string | undefined = undefined
|
||||
export let minlength: number = 0
|
||||
|
||||
function typeAction(node: Node) {
|
||||
// @ts-ignore
|
||||
node.type = type
|
||||
}
|
||||
|
||||
let clazz = ''
|
||||
export { clazz as class }
|
||||
|
||||
const dispatcher = createEventDispatcher()
|
||||
|
||||
let className = `
|
||||
${value.length != 0 ? 'invalid:border-red-400' : ''}
|
||||
w-full px-3 text-sm py-2.5 bg-white dark:bg-zinc-950
|
||||
border border-slate-300 dark:border-zinc-700 dark:focus:border-white
|
||||
focus:outline-none focus:border-black transition-colors rounded-md
|
||||
${$$props.class}
|
||||
`
|
||||
</script>
|
||||
|
||||
<label class="flex flex-col items-center {clazz}">
|
||||
<label class="flex flex-col items-center {$$props.class}">
|
||||
{#if label != ''}
|
||||
<span
|
||||
class="font-bold text-sm text-left mb-1 cursor-pointer w-max self-start"
|
||||
@@ -38,16 +38,8 @@
|
||||
bind:value
|
||||
on:keydown={(e) => dispatcher('keydown', e)}
|
||||
on:input={(e) => dispatcher('input', e)}
|
||||
{placeholder}
|
||||
{maxlength}
|
||||
{minlength}
|
||||
{pattern}
|
||||
{id}
|
||||
class="{value.length != 0
|
||||
? 'invalid:border-red-400'
|
||||
: ''} w-full px-3 text-sm py-2.5 bg-transparent
|
||||
border border-black/20 dark:border-white/20 dark:focus:border-white
|
||||
focus:outline-none focus:border-black transition-colors rounded-md {clazz}"
|
||||
{...$$restProps}
|
||||
class={className}
|
||||
{required}
|
||||
/>
|
||||
</label>
|
||||
Reference in new issue
Block a user