fix: unstick sort options in pages with search

This commit is contained in:
James Xylight committed 2025-02-04 16:28:44 -08:00
1 parent 80269cf275
commit e39d878643
2 files changed
+59 -63

No files matched your search

+19 -21
View File
@@ -43,8 +43,6 @@
let searchElement = $state<HTMLInputElement>() let searchElement = $state<HTMLInputElement>()
let form = $state<HTMLFormElement>() let form = $state<HTMLFormElement>()
let instance = ''
let showTop = $derived( let showTop = $derived(
(data.query ?? '' != '') && data.communities.length > 0 && data.page == 1, (data.query ?? '' != '') && data.communities.length > 0 && data.page == 1,
) )
@@ -64,11 +62,11 @@
<span>{$t('routes.communities.title')}</span> <span>{$t('routes.communities.title')}</span>
</Header> </Header>
<div <form method="get" action="/communities" class="contents" bind:this={form}>
class="mt-4 mb-0 sticky z-30" <div
style="top: max(1.5rem, {$contentPadding.top}px);" class="mt-4 mb-0 sticky z-30"
> style="top: max(1.5rem, {$contentPadding.top}px);"
<form method="get" action="/communities" bind:this={form}> >
<Tabs routes={[]} class="p-2 dark:bg-zinc-925/70 shadow-md shadow-black/5"> <Tabs routes={[]} class="p-2 dark:bg-zinc-925/70 shadow-md shadow-black/5">
<div class="flex gap-2 flex-row items-center w-full text-base h-10"> <div class="flex gap-2 flex-row items-center w-full text-base h-10">
<TextInput <TextInput
@@ -95,20 +93,20 @@
</Button> </Button>
</div> </div>
</Tabs> </Tabs>
<div class="flex flex-row flex-wrap gap-4 mt-4 items-center"> </div>
<Location <div class="flex flex-row flex-wrap gap-4 mt-4 items-center">
name="type" <Location
selected={data.type} name="type"
onchange={() => form?.requestSubmit()} selected={data.type}
/> onchange={() => form?.requestSubmit()}
<Sort />
name="sort" <Sort
selected={data.sort} name="sort"
onchange={() => form?.requestSubmit()} selected={data.sort}
/> onchange={() => form?.requestSubmit()}
</div> />
</form> </div>
</div> </form>
<ul <ul
class="flex flex-col divide-y divide-slate-100 dark:divide-zinc-800 my-6 h-full" class="flex flex-col divide-y divide-slate-100 dark:divide-zinc-800 my-6 h-full"
> >
+40 -42
View File
@@ -68,11 +68,11 @@
<Header pageHeader> <Header pageHeader>
{$t('routes.search.title')} {$t('routes.search.title')}
</Header> </Header>
<div <form method="get" action="/search" class="contents" bind:this={form}>
class="mt-4 mb-0 sticky z-30" <div
style="top: max(1.5rem, {$contentPadding.top}px);" class="mt-4 mb-0 sticky z-30"
> style="top: max(1.5rem, {$contentPadding.top}px);"
<form method="get" action="/search" class="" bind:this={form}> >
<Tabs routes={[]} class="p-2 dark:bg-zinc-925/70"> <Tabs routes={[]} class="p-2 dark:bg-zinc-925/70">
<div class="flex gap-2 flex-row items-center w-full text-base h-10"> <div class="flex gap-2 flex-row items-center w-full text-base h-10">
<TextInput <TextInput
@@ -98,40 +98,40 @@
</Button> </Button>
</div> </div>
</Tabs> </Tabs>
<div class="flex flex-row flex-wrap items-center gap-4 mt-4"> </div>
<Select <div class="flex flex-row flex-wrap items-center gap-4 mt-4">
name="type" <Select
bind:value={data.type} name="type"
onchange={() => form?.requestSubmit()} bind:value={data.type}
> onchange={() => form?.requestSubmit()}
{#snippet customLabel()} >
<span class="flex items-center gap-1"> {#snippet customLabel()}
<Icon src={AdjustmentsHorizontal} mini size="15" /> <span class="flex items-center gap-1">
{$t('filter.type')} <Icon src={AdjustmentsHorizontal} mini size="15" />
</span> {$t('filter.type')}
{/snippet} </span>
<Option value="All">{$t('content.all')}</Option> {/snippet}
<Option value="Posts">{$t('content.posts')}</Option> <Option value="All">{$t('content.all')}</Option>
<Option value="Comments">{$t('content.comments')}</Option> <Option value="Posts">{$t('content.posts')}</Option>
<Option value="Communities">{$t('content.communities')}</Option> <Option value="Comments">{$t('content.comments')}</Option>
<Option value="Users">{$t('content.users')}</Option> <Option value="Communities">{$t('content.communities')}</Option>
</Select> <Option value="Users">{$t('content.users')}</Option>
<Sort </Select>
name="sort" <Sort
bind:selected={data.sort} name="sort"
onchange={() => form?.requestSubmit()} bind:selected={data.sort}
/> onchange={() => form?.requestSubmit()}
<Button />
size="square-lg" <Button
color="tertiary" size="square-lg"
class="self-end justify-self-center" color="tertiary"
onclick={() => (moreOptions = !moreOptions)} class="self-end justify-self-center"
> onclick={() => (moreOptions = !moreOptions)}
<Icon src={ChevronDown} size="20" mini /> >
</Button> <Icon src={ChevronDown} size="20" mini />
</div> </Button>
</form> </div>
</div> </form>
{#if moreOptions} {#if moreOptions}
<div transition:slide={{ axis: 'y', easing: expoOut }} class="max-w-sm"> <div transition:slide={{ axis: 'y', easing: expoOut }} class="max-w-sm">
<ObjectAutocomplete <ObjectAutocomplete
@@ -189,9 +189,7 @@
{/if} {/if}
{/await} {/await}
<div <div
class="flex flex-col mt-4 divide-slate-200 dark:divide-zinc-800" class="flex flex-col mt-4 divide-slate-200 dark:divide-zinc-800 divide-y"
class:!divide-y={settings.view != 'card'}
class:gap-4={settings.view == 'card'}
> >
{#each data.results as result} {#each data.results as result}
{#if isPostView(result)} {#if isPostView(result)}