fix: popover

This commit is contained in:
Torsten Dittmann committed 2024-03-01 02:31:24 +01:00
1 parent 90b1d8dad0
commit 7c4505fb19
8 files changed
+59 -42

No files matched your search

+5 -3
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { onMount } from 'svelte';
import { SvelteComponent, onMount } from 'svelte';
import { FormItem, Helper, Label } from '.';
import { Drop } from '$lib/components';
@@ -14,6 +14,8 @@
export let autofocus = false;
export let autocomplete = false;
export let maxlength: number = null;
export let popover: typeof SvelteComponent<unknown> = null;
export let popoverProps: Record<string, unknown> = {};
// https://www.geeksforgeeks.org/how-to-validate-a-domain-name-using-regular-expression/
const pattern = String.raw`(?!-)[A-Za-z0-9\-]+([\-\.]{1}[a-z0-9]+)*\.[A-Za-z]{2,18}`;
@@ -50,7 +52,7 @@
<FormItem>
<Label {required} hide={!showLabel} for={id}>
{label}{#if $$slots?.popover}
{label}{#if popover}
<Drop isPopover bind:show display="inline-block">
<!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
&nbsp;<button
@@ -67,7 +69,7 @@
<div
class="dropped card u-max-width-250"
style="--p-card-padding: .75rem; box-shadow:var(--shadow-large);">
<slot name="popover" />
<svelte:component this={popover} {...popoverProps} />
</div>
</svelte:fragment>
</Drop>
+5 -3
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { onMount } from 'svelte';
import { SvelteComponent, onMount } from 'svelte';
import { FormItem, Helper, Label } from '.';
import NullCheckbox from './nullCheckbox.svelte';
import { Drop } from '$lib/components';
@@ -17,6 +17,8 @@
export let autofocus = false;
export let autocomplete = false;
export let tooltip: string = null;
export let popover: typeof SvelteComponent<unknown> = null;
export let popoverProps: Record<string, unknown> = {};
let element: HTMLInputElement;
let error: string;
@@ -59,7 +61,7 @@
<FormItem>
<Label {required} {optionalText} {tooltip} hide={!showLabel} for={id}>
{label}{#if $$slots?.popover}
{label}{#if popover}
<Drop isPopover bind:show display="inline-block">
<!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
&nbsp;<button
@@ -76,7 +78,7 @@
<div
class="dropped card u-max-width-250"
style="--p-card-padding: .75rem; box-shadow:var(--shadow-large);">
<slot name="popover" />
<svelte:component this={popover} {...popoverProps} />
</div>
</svelte:fragment>
</Drop>
+5 -3
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { Drop, Trim } from '$lib/components';
import { humanFileSize } from '$lib/helpers/sizeConvertion';
import { onMount } from 'svelte';
import { SvelteComponent, onMount } from 'svelte';
import { Helper, Label } from '.';
export let label: string = null;
@@ -13,6 +13,8 @@
export let optionalText: string = null;
export let tooltip: string = null;
export let error: string = null;
export let popover: typeof SvelteComponent<unknown> = null;
export let popoverProps: Record<string, unknown> = {};
let input: HTMLInputElement;
let hovering = false;
@@ -95,7 +97,7 @@
<div>
{#if label}
<Label {required} {optionalText} {tooltip} hide={!label}>
{label}{#if $$slots?.popover}
{label}{#if popover}
<Drop isPopover bind:show display="inline-block">
<!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
&nbsp;<button
@@ -112,7 +114,7 @@
<div
class="dropped card u-max-width-250"
style="--p-card-padding: .75rem; box-shadow:var(--shadow-large);">
<slot name="popover" />
<svelte:component this={popover} {...popoverProps} />
</div>
</svelte:fragment>
</Drop>
+5 -3
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { onMount } from 'svelte';
import { SvelteComponent, onMount } from 'svelte';
import { FormItem, Helper, Label } from '.';
import { Drop } from '$lib/components';
@@ -16,6 +16,8 @@
export let showPasswordButton = false;
export let minlength = 8;
export let maxlength: number = null;
export let popover: typeof SvelteComponent<unknown> = null;
export let popoverProps: Record<string, unknown> = {};
let element: HTMLInputElement;
let error: string;
@@ -50,7 +52,7 @@
<FormItem>
<Label {required} hide={!showLabel} for={id}>
{label}{#if $$slots?.popover}
{label}{#if popover}
<Drop isPopover bind:show={showPopover} display="inline-block">
<!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
&nbsp;<button
@@ -67,7 +69,7 @@
<div
class="dropped card u-max-width-250"
style="--p-card-padding: .75rem; box-shadow:var(--shadow-large);">
<slot name="popover" />
<svelte:component this={popover} {...popoverProps} />
</div>
</svelte:fragment>
</Drop>
+5 -3
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { onMount } from 'svelte';
import { SvelteComponent, onMount } from 'svelte';
import { FormItem, Helper, Label } from '.';
import { Drop } from '$lib/components';
@@ -14,6 +14,8 @@
export let autofocus = false;
export let autocomplete = false;
export let maxlength: number = null;
export let popover: typeof SvelteComponent<unknown> = null;
export let popoverProps: Record<string, unknown> = {};
const pattern = String.raw`^\+?[1-9]\d{1,14}$`;
@@ -49,7 +51,7 @@
<FormItem>
<Label {required} hide={!showLabel} for={id}>
{label}{#if $$slots?.popover}
{label}{#if popover}
<Drop isPopover bind:show display="inline-block">
<!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
&nbsp;<button
@@ -66,7 +68,7 @@
<div
class="dropped card u-max-width-250"
style="--p-card-padding: .75rem; box-shadow:var(--shadow-large);">
<slot name="popover" />
<svelte:component this={popover} {...popoverProps} />
</div>
</svelte:fragment>
</Drop>
+5 -3
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { onMount } from 'svelte';
import { SvelteComponent, onMount } from 'svelte';
import { FormItem, FormItemPart, Helper, Label } from '.';
import NullCheckbox from './nullCheckbox.svelte';
import TextCounter from './textCounter.svelte';
@@ -23,6 +23,8 @@
export let maxlength: number = null;
export let tooltip: string = null;
export let isMultiple = false;
export let popover: typeof SvelteComponent<unknown> = null;
export let popoverProps: Record<string, unknown> = {};
let element: HTMLInputElement;
let error: string;
@@ -76,7 +78,7 @@
<svelte:component this={wrapper} {fullWidth}>
{#if label}
<Label {required} {hideRequired} {tooltip} {optionalText} hide={!showLabel} for={id}>
{label}{#if $$slots?.popover}
{label}{#if popover}
<Drop isPopover bind:show display="inline-block">
<!-- TODO: make unclicked icon greyed out and hover and clicked filled -->
&nbsp;<button
@@ -94,7 +96,7 @@
class="dropped card u-max-width-250"
style:--p-card-padding=".75rem"
style:box-shadow="var(--shadow-large)">
<slot name="popover" />
<svelte:component this={popover} {...popoverProps} />
</div>
</svelte:fragment>
</Drop>
@@ -2,7 +2,7 @@
import { ImagePreview } from '$lib/components';
export let lines = [];
export let popoverImage: { src: { dark: string; light: string }; alt: string } | null = null;
export let image: { src: { dark: string; light: string }; alt: string } | null = null;
</script>
<div class="u-flex-vertical u-gap-16">
@@ -10,11 +10,11 @@
<p>{@html line}</p>
{/each}
{#if popoverImage}
{#if image}
<ImagePreview
darkSrc={popoverImage.src.dark}
lightSrc={popoverImage.src.light}
alt={popoverImage.alt} />
darkSrc={image.src.dark}
lightSrc={image.src.light}
alt={image.alt} />
{/if}
</div>
@@ -40,21 +40,31 @@
| FCMProviderParams
| APNSProviderParams
>;
function getPopoverProps(input: ProviderInput) {
if (!input.popover) {
return {};
}
return {
lines: input.popover,
image: input.popoverImage
};
}
</script>
<FormList>
{#each inputs as input}
{@const popoverImage = input.popoverImage}
{@const popover = input.popover ? PopoverContent : null}
{@const popoverProps = getPopoverProps(input)}
{#if input.type === 'text'}
<InputText
id={input.name}
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
{popover}
{popoverProps}
bind:value={params[input.name]}>
<svelte:fragment slot="popover">
<PopoverContent lines={input.popover} {popoverImage} />
</svelte:fragment>
</InputText>
{:else if input.type === 'password'}
<InputPassword
@@ -62,11 +72,10 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
{popover}
{popoverProps}
showPasswordButton
bind:value={params[input.name]}>
<svelte:fragment slot="popover">
<PopoverContent lines={input.popover} {popoverImage} />
</svelte:fragment>
</InputPassword>
{:else if input.type === 'email'}
<InputEmail
@@ -74,10 +83,9 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
{popover}
popoverProps={getPopoverProps(input)}
bind:value={params[input.name]}>
<svelte:fragment slot="popover">
<PopoverContent lines={input.popover} {popoverImage} />
</svelte:fragment>
</InputEmail>
{:else if input.type === 'domain'}
<InputDomain
@@ -85,10 +93,9 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
{popover}
{popoverProps}
bind:value={params[input.name]}>
<svelte:fragment slot="popover">
<PopoverContent lines={input.popover} {popoverImage} />
</svelte:fragment>
</InputDomain>
{:else if input.type === 'phone'}
<InputPhone
@@ -96,20 +103,18 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
{popover}
{popoverProps}
bind:value={params[input.name]}>
<svelte:fragment slot="popover">
<PopoverContent lines={input.popover} {popoverImage} />
</svelte:fragment>
</InputPhone>
{:else if input.type === 'file'}
<InputFile
label={input.label}
allowedFileExtensions={input.allowedFileExtensions}
required={!input.optional}
{popover}
{popoverProps}
bind:files={files[input.name]}>
<svelte:fragment slot="popover">
<PopoverContent lines={input.popover} {popoverImage} />
</svelte:fragment>
</InputFile>
{:else if input.type === 'switch'}
<InputSwitch label={input.label} id={input.name} bind:value={params[input.name]}>