diff --git a/.vscode/settings.json b/.vscode/settings.json index f2b25e04..93c3f4de 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,6 @@ "i18n-ally.localesPaths": [ "src/lib/i18n", "src/routes/inbox/messages" - ] + ], + "i18n-ally.keystyle": "nested" } \ No newline at end of file diff --git a/src/lib/components/lemmy/comment/CommentActions.svelte b/src/lib/components/lemmy/comment/CommentActions.svelte index 21d3e7cb..6eaaa318 100644 --- a/src/lib/components/lemmy/comment/CommentActions.svelte +++ b/src/lib/components/lemmy/comment/CommentActions.svelte @@ -66,8 +66,9 @@ {/if} - {#snippet target()} + {#snippet target(attachment)} {/if} - {#snippet target()} - diff --git a/src/lib/components/lemmy/dropdowns/Sort.svelte b/src/lib/components/lemmy/dropdowns/Sort.svelte index 459e31d4..f14830a3 100644 --- a/src/lib/components/lemmy/dropdowns/Sort.svelte +++ b/src/lib/components/lemmy/dropdowns/Sort.svelte @@ -88,53 +88,50 @@ {#if selected?.startsWith('Top')} -
- -
+ {/if} diff --git a/src/lib/components/lemmy/dropdowns/ViewSelect.svelte b/src/lib/components/lemmy/dropdowns/ViewSelect.svelte index 6ced6398..757017dc 100644 --- a/src/lib/components/lemmy/dropdowns/ViewSelect.svelte +++ b/src/lib/components/lemmy/dropdowns/ViewSelect.svelte @@ -3,9 +3,10 @@ import { settings } from '$lib/settings.svelte.js' import { Select } from 'mono-svelte' import Option from 'mono-svelte/forms/select/Option.svelte' + import type { SelectProps } from 'mono-svelte/forms/select/Select.svelte' import { Bars3, Icon, RectangleGroup, ViewColumns } from 'svelte-hero-icons' - interface Props { + interface Props extends SelectProps { showLabel?: boolean } diff --git a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte index a5ca8c61..c2bd3e47 100644 --- a/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte +++ b/src/lib/components/lemmy/moderation/CommentModerationMenu.svelte @@ -24,8 +24,9 @@ - {#snippet target()} + {#snippet target(attachment)} + + {#snippet target(attachment)} + + {/snippet} + share(true)}> + {#snippet prefix()} + {/snippet} - share(true)}> - {#snippet prefix()} - - {/snippet} - {$t('filter.location.global')} - - share(false)}> - {#snippet prefix()} - - {/snippet} - {$t('filter.location.local')} - - - + {$t('filter.location.global')} + + share(false)}> + {#snippet prefix()} + + {/snippet} + {$t('filter.location.local')} + + {/if} {#if profile.current?.jwt} diff --git a/src/lib/components/ui/Expandable.svelte b/src/lib/components/ui/Expandable.svelte index 26fac279..12848e12 100644 --- a/src/lib/components/ui/Expandable.svelte +++ b/src/lib/components/ui/Expandable.svelte @@ -41,7 +41,7 @@ 'transition-transform duration-300 ease-out', ]} > - + {/if}
import { page } from '$app/state' + import { t } from '$lib/i18n/translations' import { Button, Material, toast } from 'mono-svelte' + import { focusTrap } from 'svelte-focus-trap' import { Icon, Share, XMark } from 'svelte-hero-icons' import { expoOut } from 'svelte/easing' import { fade, scale } from 'svelte/transition' - import { focusTrap } from 'svelte-focus-trap' - import { t } from '$lib/i18n/translations' interface Props { /** * The full-resolution image URL */ alt?: string - class?: string - children?: import('svelte').Snippet } - let { alt = '', class: clazz = '', children }: Props = $props() + let { alt = '' }: Props = $props() {#if page.state.openImage || '' != ''} @@ -88,7 +86,3 @@
{/if} - - diff --git a/src/lib/components/ui/layout/pages/Header.svelte b/src/lib/components/ui/layout/pages/Header.svelte index e6235941..462fab0c 100644 --- a/src/lib/components/ui/layout/pages/Header.svelte +++ b/src/lib/components/ui/layout/pages/Header.svelte @@ -32,7 +32,7 @@ pageHeader && `w-[calc(100%+1.5rem)] sm:w-[calc(100%+3rem)] bg-slate-100 dark:bg-zinc-950 -mx-3 sm:-mx-6 sm:px-6 sm:pb-6 px-4 pb-4 -mt-64 pt-64 - border-b border-slate-200 dark:border-zinc-900 margin z-0`, + border-b border-slate-200 dark:border-zinc-900 margin z-0 mb-3 sm:mb-6`, ]} {style} aria-label={$t('aria.element.pageHeader')} diff --git a/src/lib/components/ui/layout/pages/Tabs.svelte b/src/lib/components/ui/layout/pages/Tabs.svelte index 7d9018ec..b223e9f6 100644 --- a/src/lib/components/ui/layout/pages/Tabs.svelte +++ b/src/lib/components/ui/layout/pages/Tabs.svelte @@ -23,22 +23,47 @@ style = 'header', }: Props = $props() - function isSelected(url: URL, href?: SvelteURL) { - if (href?.search != '') return href?.search == url.search - else if (url.search == '') return href?.pathname == url.pathname + let matchType = $derived<('search' | 'pathname')[]>( + routes.map(i => + new URL(`https://example.com${i.href}`)?.search != '' + ? 'search' + : 'pathname', + ), + ) + + // i am on 2 hours of sleep i apologize + function isSelected(url: URL, href: SvelteURL, type: 'search' | 'pathname') { + const currentSearch = new Set(url.searchParams.values()) + const hrefSearch = new Set(href.searchParams.values()) + // checks if there is any + const usePathname = !routes.some( + i => + new Set( + new URL(`https://example.com${i.href}`).searchParams.values(), + ).intersection(currentSearch).size > 0, + ) + + const hasSearchParam = hrefSearch.intersection(currentSearch).size > 0 + + if (hasSearchParam && !usePathname) return hasSearchParam + else if ((url.search == '' || usePathname) && type == 'pathname') + return href.pathname == url.pathname }