feat: use new menu component

This commit is contained in:
Xyphyn committed 2023-09-04 12:31:14 -07:00
1 parent 3b87091484
commit 2d1cd8c607
14 files changed
+89 -271

No files matched your search

+19 -18
View File
@@ -8,14 +8,18 @@
} from '$lib/components/lemmy/moderation/moderation.js'
import Avatar from '$lib/components/ui/Avatar.svelte'
import Logo from '$lib/components/ui/Logo.svelte'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
import { LINKED_INSTANCE_URL, instance } from '$lib/instance.js'
import { site } from '$lib/lemmy.js'
import { theme } from '$lib/ui/colors.js'
import { Button, Select, Spinner } from 'mono-svelte'
import {
ArrowLeftOnRectangle,
Button,
Menu,
MenuButton,
MenuDivider,
Select,
Spinner,
} from 'mono-svelte'
import {
Bars3,
Bookmark,
Cog6Tooth,
@@ -135,19 +139,17 @@
<Icon mini src={GlobeAlt} size="16" slot="prefix" />
<span class="hidden md:inline">Explore</span>
</Button>
<Menu alignment="bottom-right">
<Menu origin="bottom-right">
<Button
let:toggleOpen
color="primary"
slot="button"
slot="target"
aria-label="Create"
on:click={toggleOpen}
class="max-md:w-9 max-md:h-8 max-md:!p-0"
>
<Icon src={Plus} width={18} mini slot="prefix" />
<span class="hidden md:inline">Create</span>
</Button>
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">Create</li>
<MenuDivider>Create</MenuDivider>
<MenuButton
link
href="/create/post"
@@ -175,17 +177,16 @@
</Menu>
</div>
<Menu
alignment="bottom-right"
itemsClass="h-8 md:h-8"
containerClass="!max-h-[28rem]"
origin="bottom-right"
itemsClass="h-8 md:h-8 z-10"
targetClass="z-10"
containerClass="!max-h-[28rem] z-10"
>
<button
class="w-8 h-8 rounded-full ring-1 ring-slate-300 bg-slate-100
dark:bg-zinc-800 relative"
aria-label="Profile"
slot="button"
let:toggleOpen
on:click={toggleOpen}
slot="target"
>
{#if $profile?.user}
<div class="w-8 h-8 aspect-square object-cover rounded-full">
@@ -206,9 +207,9 @@
</div>
{/if}
</button>
<li class="text-xs opacity-80 text-left mx-4 my-1 py-1">
<MenuDivider>
{$profile?.user ? $profile.user.local_user_view.person.name : 'Profile'}
</li>
</MenuDivider>
{#if $profile?.user}
<MenuButton link href="/profile">
<Icon src={UserCircle} mini width={16} /> Profile
@@ -238,7 +239,7 @@
</span>
</MenuButton>
<hr class="dark:opacity-10 w-[90%] my-2 mx-auto" />
<li class="text-xs px-4 py-1 my-1 opacity-80">App</li>
<MenuDivider>App</MenuDivider>
<MenuButton link href="/settings">
<Icon src={Cog6Tooth} mini width={16} />
Settings
-79
View File
@@ -1,79 +0,0 @@
<script lang="ts">
import type { Alignment } from '$lib/components/ui/menu/menu.js'
import { backOut, bounceOut, circOut, expoOut, sineOut } from 'svelte/easing'
import { scale } from 'svelte/transition'
export let open = false
let clazz = ''
export { clazz as class }
export let itemsClass = ''
export let absolute = false
export let alignment: Alignment = 'bottom-left'
let element: any
export const toggleOpen = () => (open = !open)
function getOriginClass(origin: Alignment) {
switch (origin) {
case 'top-right':
return 'bottom-[100%] right-0 origin-bottom-right'
case 'bottom-left':
return 'top-[100%] origin-top-left'
case 'top-left':
return 'bottom-[100%] left-0 origin-bottom-left'
case 'bottom-right':
return 'top-[100%] right-0 origin-top-right'
case 'top-center':
return 'bottom-[100%] -left-[450%] origin-bottom'
case 'bottom-center':
return 'top-[100%] -left-[450%] origin-top'
default:
return 'bottom-[100%] origin-top-left'
}
}
</script>
<svelte:body
on:click={(e) => {
if (!element.contains(e.target)) {
open = false
}
}}
/>
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div
class="overflow-visible {absolute
? 'absolute'
: 'relative'} cursor-auto h-max {clazz} {itemsClass}"
bind:this={element}
tabindex="-1"
>
<slot name="button" {toggleOpen} />
{#if open}
<menu
transition:scale|local={{
duration: 200,
start: 0.95,
easing: expoOut,
}}
class="list-none absolute max-h-96 z-30 overflow-auto {getOriginClass(
alignment
)}
rounded-lg py-2 min-w-[16rem] my-2 flex flex-col shadow-sm
bg-white dark:bg-zinc-900 backdrop-blur-2xl border border-slate-200 dark:border-zinc-800
{$$props.containerClass}"
>
{#if open}
<div on:click={toggleOpen} class="flex flex-col gap-0 h-max">
<slot {toggleOpen} />
</div>
{/if}
</menu>
{/if}
</div>
@@ -1,55 +0,0 @@
<script lang="ts">
import { Color } from '$lib/ui/colors'
import { Spinner } from 'mono-svelte'
import { createEventDispatcher } from 'svelte'
type ButtonColor = keyof typeof buttonColors
const buttonColors = {
secondary:
'hover:bg-gray-200/50 hover:dark:bg-zinc-600/20 text-slate-800 fill-slate-800 dark:text-zinc-200 dark:fill-zinc-200',
dangerSecondary: 'hover:bg-red-500 text-red-500 hover:text-white',
success:
'hover:bg-green-600 text-green-600 dark:text-green-500 hover:text-white hover:dark:text-white',
warning:
'hover:bg-yellow-500 dark:text-yellow-300 text-yellow-600 hover:dark:text-black hover:text-black',
}
export let color: ButtonColor = 'secondary'
export let link = false
export let href = ''
export let loading = false
export let disabled = false
const click = createEventDispatcher()
</script>
<li>
{#if link}
<a
{href}
class="flex flex-row gap-2 items-center px-4 py-2 w-full text-sm transition-colors {buttonColors[
color
]} {disabled ? 'opacity-50 pointer-events-none' : ''}"
>
<slot />
</a>
{:else}
<button
on:click={(e) => click('click', e)}
type="button"
class="flex flex-row gap-2 items-center px-4 py-2 w-full text-sm
transition-colors list-none {buttonColors[
color
]} disabled:opacity-50 disabled:pointer-events-none"
{disabled}
>
{#if loading}
<Spinner width={16} />
{:else}
<slot name="icon" />
{/if}
<slot />
</button>
{/if}
</li>
-7
View File
@@ -1,7 +0,0 @@
export type Alignment =
| 'top-right'
| 'top-left'
| 'bottom-right'
| 'bottom-left'
| 'bottom-center'
| 'top-center'