- {#if customLabel || label}
-
- {/if}
-
-
-
-
diff --git a/src/lib/mono/popover/Menu.svelte b/src/lib/mono/popover/Menu.svelte
index 8368abab..66423306 100644
--- a/src/lib/mono/popover/Menu.svelte
+++ b/src/lib/mono/popover/Menu.svelte
@@ -8,27 +8,26 @@
type Strategy,
} from '@floating-ui/core'
import Popover from '../popover/Popover.svelte'
+ import type { Snippet } from 'svelte'
+ import type { Attachment } from 'svelte/attachments'
interface Props {
openOnHover?: boolean
open?: boolean
- manual?: boolean
placement?: Placement
middleware?: Middleware[]
strategy?: Strategy
class?: string
- target?: import('svelte').Snippet
+ target?: Snippet<[Attachment]>
children?: import('svelte').Snippet<[boolean]>
}
let {
openOnHover = false,
open = $bindable(false),
- manual = false,
placement = 'bottom-start',
middleware = [offset(6), shift({ padding: 6 }), flip()],
strategy = 'absolute',
- class: clazz = '',
target,
children,
...rest
@@ -40,12 +39,10 @@
{placement}
{middleware}
{strategy}
- {manual}
+ {target}
{...rest}
bind:open
popoverClass="rounded-xl w-full backdrop-blur-md max-w-72"
- class={clazz}
- {target}
>
{#snippet popover()}
@@ -48,6 +50,7 @@
{alignment}
{href}
{disabled}
+ data-autoclose={nest ? 'false' : 'true'}
shadow="none"
>
{#snippet prefix()}
@@ -67,5 +70,8 @@
{@render children?.()}
{#snippet suffix()}
{@render passedSuffix?.()}
+ {#if nest}
+
+ {/if}
{/snippet}
diff --git a/src/lib/mono/popover/Popover.svelte b/src/lib/mono/popover/Popover.svelte
index 4be72cb0..1b758d2f 100644
--- a/src/lib/mono/popover/Popover.svelte
+++ b/src/lib/mono/popover/Popover.svelte
@@ -9,6 +9,7 @@
} from '@floating-ui/core'
import { createFloatingActions } from 'svelte-floating-ui'
import { focusTrap } from 'svelte-focus-trap'
+ import type { Attachment } from 'svelte/attachments'
import { expoOut } from 'svelte/easing'
import { scale } from 'svelte/transition'
import { Material } from '../index'
@@ -21,10 +22,8 @@
placement?: Placement
middleware?: Middleware[]
strategy?: Strategy
- manual?: boolean
popoverClass?: string
- class?: string
- target?: import('svelte').Snippet
+ target?: import('svelte').Snippet<[Attachment]>
popover?: import('svelte').Snippet<[boolean]>
children?: import('svelte').Snippet<[boolean]>
}
@@ -36,17 +35,12 @@
placement = 'bottom-start',
middleware = [offset(6), shift(), flip()],
strategy = 'fixed',
- manual = false,
popoverClass = '',
- class: clazz = '',
target,
popover,
children,
}: Props = $props()
- let canUseContents = $state(true)
-
- let el = $state
()
let popoverEl = $state()
let origins: Record = {
@@ -75,66 +69,54 @@
},
})
- const customFloatingContent = (node: HTMLDivElement) => {
- floatingContent(node)
- }
+ const menuAttach: Attachment = element => {
+ const e = element as HTMLButtonElement
- const customFloatingRef = (node: HTMLDivElement) => {
- const n = node.children.item(0)
+ const mouseLeave = () => (openOnHover ? (open = false) : false)
+ const focus = () => (openOnHover ? (open = true) : false)
+ const focusout = () => (openOnHover ? (open = false) : false)
+ const click = () => {
+ open = !open
- // @ts-expect-error svelte hell
- if (n) floatingRef(n)
- else {
- canUseContents = false
- floatingRef(node)
+ if (autoClose) {
+ const clickHandler = (event: Event) => {
+ if (!e) return
+
+ const target = event.target as Element | null
+
+ if (!e?.contains(event.target as Element | null)) {
+ if (target?.closest("[data-autoclose='false']") == null) {
+ open = false
+ document.removeEventListener('click', clickHandler)
+ }
+ }
+ }
+ document.addEventListener('click', clickHandler)
+ }
+ }
+ const keydown = (event: KeyboardEvent) => {
+ if (event.key === 'Escape') open = false
+ }
+
+ e.addEventListener('mouseleave', mouseLeave)
+ e.addEventListener('focus', focus)
+ e.addEventListener('focusout', focusout)
+ e.addEventListener('click', click)
+ e.addEventListener('keydown', keydown)
+
+ floatingRef(e)
+
+ return () => {
+ e.removeEventListener('mouseleave', mouseLeave)
+ e.removeEventListener('focus', focus)
+ e.removeEventListener('focusout', focusout)
+ e.removeEventListener('click', click)
+ e.removeEventListener('keydown', keydown)
}
}
- {
- if (openOnHover) return
-
- // @ts-expect-error svelte hell
- if (!el?.contains(e.target) && open) {
- if (!autoClose) {
- // @ts-expect-error svelte hell
- if (popoverEl && !popoverEl.contains(e.target)) {
- open = false
- }
- } else {
- open = false
- }
- }
- }}
- onkeydown={async e => {
- if (open && e.key == 'Escape') {
- open = false
- // @ts-expect-error svelte hell
- el?.firstChild.focus()
- }
- }}
-/>
-
-{#if target}
- (openOnHover ? (open = true) : false)}
- onmouseleave={() => (openOnHover ? (open = false) : false)}
- onfocus={() => (openOnHover ? (open = true) : false)}
- onfocusout={() => (openOnHover ? (open = false) : false)}
- onclick={() => (!openOnHover && !manual ? (open = !open) : false)}
- onkeydown={e => {
- if (e.key == 'Escape') open = false
- }}
- tabindex="0"
- role="button"
- class="{canUseContents ? 'contents text-left' : 'w-max h-max'} {clazz}"
- bind:this={el}
- use:customFloatingRef
- >
- {@render target?.()}
-
-{/if}
+{@render target?.(menuAttach)}
{#if open}
@@ -146,7 +128,7 @@
easing: expoOut,
}}
class="z-150 {popoverClass}"
- use:customFloatingContent
+ use:floatingContent
use:focusTrap
bind:this={popoverEl}
>
diff --git a/src/lib/mono/search/Search.svelte b/src/lib/mono/search/Search.svelte
index de00289e..b731f6f0 100644
--- a/src/lib/mono/search/Search.svelte
+++ b/src/lib/mono/search/Search.svelte
@@ -65,9 +65,10 @@
- {#snippet target()}
+ {#snippet target(attachment)}
{#if input}{@render input()}{:else}
{
searching = true
diff --git a/src/lib/settings.svelte.ts b/src/lib/settings.svelte.ts
index d322e5eb..7764b80a 100644
--- a/src/lib/settings.svelte.ts
+++ b/src/lib/settings.svelte.ts
@@ -3,9 +3,6 @@ import { env } from '$env/dynamic/public'
import { locale } from './i18n/translations'
import { browser } from '$app/environment'
-console.log('Using the following default settings from the environment:')
-console.log(env)
-
export type View = 'cozy' | 'compact'
export const SSR_ENABLED = env.PUBLIC_SSR_ENABLED?.toLowerCase() == 'true'
@@ -230,7 +227,7 @@ function isObject(item: object) {
* @param target
* @param ...sources
*/
-// eslint-disable-next-line
+
function mergeDeep(target: any, ...sources: any[]) {
if (!sources.length) return target
const source = sources.shift()
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 91791067..ccb18c02 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -1,9 +1,8 @@
import { browser } from '$app/environment'
-import { env } from '$env/dynamic/public'
import { settings } from '$lib/settings.svelte'
import { aliases, loadTranslations } from '$lib/i18n/translations.js'
-export const ssr = (env.PUBLIC_SSR_ENABLED?.toLowerCase() ?? 'false') == 'true'
+export const ssr = false
export const load = async () => {
if (browser) {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 442beb9c..55107f14 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -6,6 +6,7 @@
import PostFeed from '$lib/components/lemmy/post/feed/PostFeed.svelte'
import VirtualFeed from '$lib/components/lemmy/post/feed/VirtualFeed.svelte'
import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte'
+ import Skeleton from '$lib/components/ui/generic/Skeleton.svelte'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import Pageination from '$lib/components/ui/Pageination.svelte'
import { t } from '$lib/i18n/translations.js'
@@ -13,16 +14,19 @@
import { postFeeds } from '$lib/lemmy/postfeed.svelte.js'
import { settings } from '$lib/settings.svelte.js'
import Button from 'mono-svelte/button/Button.svelte'
+ import { onMount } from 'svelte'
import { ArrowRight, ChartBar, Icon } from 'svelte-hero-icons'
let { data = $bindable() } = $props()
- let type = $state(data.feed.value.type_)
- let sort = $state(data.feed.value.sort)
-
- $effect(() => {
- if (type) settings.defaultSort.feed = type
- if (sort) settings.defaultSort.sort = sort
+ onMount(async () => {
+ await data.feed.value
+ $effect(() => {
+ if (data.filters.value.type_)
+ settings.defaultSort.feed = data.filters.value.type_
+ if (data.filters.value.sort)
+ settings.defaultSort.sort = data.filters.value.sort
+ })
})
const FeedComponent = $derived(
@@ -42,10 +46,19 @@
{#snippet extended()}
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
index c326a0d2..ca8244d4 100644
--- a/src/routes/+page.ts
+++ b/src/routes/+page.ts
@@ -1,6 +1,6 @@
import { t } from '$lib/i18n/translations.js'
import { postFeed } from '$lib/lemmy/postfeed.svelte.js'
-import { ReactiveState } from '$lib/promise.svelte.js'
+import { ReactiveState, awaitIfServer } from '$lib/promise.svelte.js'
import { settings } from '$lib/settings.svelte'
import type { ListingType, SortType } from 'lemmy-js-client'
import { ChevronDoubleUp } from 'svelte-hero-icons'
@@ -13,21 +13,25 @@ export async function load({ url, fetch }) {
const listingType: ListingType =
(url.searchParams.get('type') as ListingType) || settings.defaultSort.feed
+ const feed = postFeed({
+ id: 'main',
+ request: {
+ page_cursor: cursor,
+ sort: sort,
+ type_: listingType,
+ limit: 20,
+ show_hidden: settings.posts.showHidden,
+ },
+ url: url,
+ fetch: fetch,
+ })
+
return {
- feed: new ReactiveState(
- await postFeed({
- id: 'main',
- request: {
- page_cursor: cursor,
- sort: sort,
- type_: listingType,
- limit: 20,
- show_hidden: settings.posts.showHidden,
- },
- url: url,
- fetch: fetch,
- }),
- ),
+ feed: new ReactiveState((await awaitIfServer(feed)).data),
+ filters: new ReactiveState({
+ sort: sort,
+ type_: listingType,
+ }),
contextual: {
actions: [
{
diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte
index 2bdebf1d..fa79dbf5 100644
--- a/src/routes/accounts/+page.svelte
+++ b/src/routes/accounts/+page.svelte
@@ -171,8 +171,9 @@