diff --git a/src/lib/components/lemmy/moderation/ModerationMenu.svelte b/src/lib/components/lemmy/moderation/ModerationMenu.svelte index ee02024e..ea56015a 100644 --- a/src/lib/components/lemmy/moderation/ModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/ModerationMenu.svelte @@ -2,9 +2,11 @@ import { profile } from '$lib/auth.svelte.js' import { t } from '$lib/i18n/translations' import { getClient } from '$lib/lemmy.svelte' + import { errorMessage } from '$lib/lemmy/error' import { isCommentView, isPostView } from '$lib/lemmy/item.js' import type { CommentView, PostView } from 'lemmy-js-client' - import { Button, Menu, MenuButton, MenuDivider, toast } from 'mono-svelte' + import { Menu, MenuButton, MenuDivider, toast } from 'mono-svelte' + import type { Snippet } from 'svelte' import { ArrowsUpDown, Fire, @@ -17,23 +19,19 @@ Trash, } from 'svelte-hero-icons' import { amMod, ban, isAdmin, remove, viewVotes } from './moderation' - import ShieldIcon from './ShieldIcon.svelte' - import { errorMessage } from '$lib/lemmy/error' interface Props { item: PostView | CommentView + target: Snippet<[boolean]> } - let { item = $bindable(), ...rest }: Props = $props() + let { item = $bindable(), target: passedTarget }: Props = $props() - let locking = $state(false) - let pinning = $state(false) - - let acting = $derived(locking || pinning) + let acting = $state(false) async function lock(lock: boolean) { if (!profile.current?.jwt || !isPostView(item)) return - locking = true + acting = true try { await getClient().lockPost({ @@ -49,13 +47,13 @@ }) } - locking = false + acting = false } async function pin(pinned: boolean, toInstance: boolean = false) { if (!profile.current?.jwt || !isPostView(item)) return - pinning = true + acting = true try { await getClient().featurePost({ @@ -72,21 +70,13 @@ }) } - pinning = false + acting = false } {#snippet target()} - + {@render passedTarget(acting)} {/snippet} {#if (profile.current?.user && amMod(profile.current.user, item.community)) || (profile.current?.user && isAdmin(profile.current.user))} @@ -99,8 +89,7 @@ lock(!item.post.locked)} - loading={locking} - disabled={locking} + loading={acting} > {#snippet prefix()} @@ -112,8 +101,7 @@ color="success-subtle" onclick={() => pin(isPostView(item) ? !item.post.featured_community : false)} - loading={pinning} - disabled={pinning} + loading={acting} >
{/if} {#if profile.current?.user && (amMod(profile.current.user, post.community) || isAdmin(profile.current.user))} - + {#await import('$lib/components/lemmy/moderation/ModerationMenu.svelte') then { default: ModerationMenu }} + + {#snippet target(acting)} + + {/snippet} + + {/await} {/if} {#if profile.current?.jwt} diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte index a8bfca1a..d5b9a6e3 100644 --- a/src/lib/mono/button/Button.svelte +++ b/src/lib/mono/button/Button.svelte @@ -123,14 +123,14 @@ role={href ? 'link' : 'button'} {href} {...rest} - tabindex={disabled ? -1 : undefined} + tabindex={disabled || loading ? -1 : undefined} class={[ loading ? buttonColor.secondary : buttonColor[color], buttonSize[size], buttonRounding[rounding], buttonShadow[shadow], 'text-sm transition-all font-medium cursor-pointer duration-75 disabled:opacity-50 disabled:pointer-events-none disabled:shadow-none', - disabled && 'pointer-events-none opacity-50 shadow-none', + disabled || (loading && 'pointer-events-none opacity-50 shadow-none'), alignment == 'center' ? 'origin-center' : alignment == 'left' diff --git a/src/lib/mono/code/Snippet.svelte b/src/lib/mono/code/Snippet.svelte deleted file mode 100644 index a678b61f..00000000 --- a/src/lib/mono/code/Snippet.svelte +++ /dev/null @@ -1,59 +0,0 @@ - - -
-
-		{value}
-	
- {#if copy} - - {/if} -
diff --git a/src/lib/mono/forms/Radio.svelte b/src/lib/mono/forms/Radio.svelte deleted file mode 100644 index c3248295..00000000 --- a/src/lib/mono/forms/Radio.svelte +++ /dev/null @@ -1,58 +0,0 @@ - - -
- - -
diff --git a/src/lib/mono/forms/RadioGroup.svelte b/src/lib/mono/forms/RadioGroup.svelte deleted file mode 100644 index 6444b0f0..00000000 --- a/src/lib/mono/forms/RadioGroup.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - -
-
- {@render children?.({ group })} -
-
diff --git a/src/lib/mono/index.ts b/src/lib/mono/index.ts index a2987180..5bd35ec5 100644 --- a/src/lib/mono/index.ts +++ b/src/lib/mono/index.ts @@ -3,7 +3,6 @@ export { default as Button } from './button/Button.svelte' export { buttonColor, buttonSize, buttonShadow } from './button/Button.svelte' export { default as Codeblock } from './code/Codeblock.svelte' -export { default as Snippet } from './code/Snippet.svelte' export { default as Spinner } from './loader/Spinner.svelte' export { default as Material } from './materials/Material.svelte' @@ -18,9 +17,6 @@ export { default as ImageInput } from './forms/ImageInput.svelte' export { default as Checkbox } from './forms/Checkbox.svelte' export { default as Switch } from './forms/Switch.svelte' -export { default as Radio } from './forms/Radio.svelte' -export { default as RadioGroup } from './forms/RadioGroup.svelte' - export { default as Popover } from './popover/Popover.svelte' export { default as Menu } from './popover/Menu.svelte' export { default as MenuDivider } from './popover/MenuDivider.svelte'