From 224458dc9ca08e5ccc89f6dffe014ff012931366 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 11 Nov 2022 14:51:48 +0100 Subject: [PATCH] feat: refactor hover list --- src/lib/components/drop.svelte | 114 +++++++++++++++++ src/lib/components/dropList.svelte | 109 ++--------------- src/lib/components/hoverList.svelte | 141 ---------------------- src/lib/components/index.ts | 2 +- src/lib/components/permissions/row.svelte | 135 ++++++++++++++++----- 5 files changed, 224 insertions(+), 277 deletions(-) create mode 100644 src/lib/components/drop.svelte delete mode 100644 src/lib/components/hoverList.svelte diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte new file mode 100644 index 000000000..84486418a --- /dev/null +++ b/src/lib/components/drop.svelte @@ -0,0 +1,114 @@ + + + + + + +
+ +
+ +
+
+ {#if show} + + {/if} +
+ + diff --git a/src/lib/components/dropList.svelte b/src/lib/components/dropList.svelte index 54af40d47..f78139199 100644 --- a/src/lib/components/dropList.svelte +++ b/src/lib/components/dropList.svelte @@ -1,77 +1,17 @@ - - -
+ -
- -
-
- {#if show} +
- {/if} -
- - + + diff --git a/src/lib/components/hoverList.svelte b/src/lib/components/hoverList.svelte deleted file mode 100644 index c0fb4bab3..000000000 --- a/src/lib/components/hoverList.svelte +++ /dev/null @@ -1,141 +0,0 @@ - - - - -
- -
(childHover = false)} - on:mouseenter={() => (childHover = true)} - bind:this={tooltip} - style="z-index: 10"> - {#if show} -
-
-
    - -
-
- -
- {/if} -
-
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index cf506b842..4c5913d7a 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -14,7 +14,7 @@ export { default as List } from './list.svelte'; export { default as ListItem } from './listItem.svelte'; export { default as Empty } from './empty.svelte'; export { default as EmptySearch } from './emptySearch.svelte'; -export { default as HoverList } from './hoverList.svelte'; +export { default as Drop } from './drop.svelte'; export { default as DropList } from './dropList.svelte'; export { default as DropListItem } from './dropListItem.svelte'; export { default as DropListLink } from './dropListLink.svelte'; diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index 68bbfd447..39392d530 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -1,11 +1,15 @@ -
+
{#if role === 'users'}
Users
@@ -32,36 +36,101 @@ {:else if role === 'any'}
Any
{:else} - -
- {role} -
- - {#await getData(role) then data} -
- -
-

- {data.name - ? data.name - : data?.email - ? data?.email - : data?.phone - ? data?.phone - : '-'} -

- {role} -
-
- {#if data?.email || data?.phone} -

{data?.email}

-

{data?.phone}

- {:else if data?.total} -

Members:{data?.total}

- {/if} - {/await} -
-
+
{ + data = n; + }) + .finally(() => { + tick().then(() => { + instance.setContent(content.innerHTML); + instance.show(); + }); + }); + } + }}> + {role} +
+
+ {#if data} + + {:else} + Not found. + {/if} +
{/if}
+ +