chore: improve custom scroll areas

This commit is contained in:
3252a8
2026-05-30 21:41:32 +03:00
parent 3541f2f78b
commit fbc3e193bf
11 changed files with 270 additions and 193 deletions
+3
View File
@@ -26,6 +26,7 @@
import { onMount, setContext } from "svelte"; import { onMount, setContext } from "svelte";
import { fade } from "svelte/transition"; import { fade } from "svelte/transition";
import { Select } from "$components/ui/primitives.js"; import { Select } from "$components/ui/primitives.js";
import { ScrollArea } from "$components/ui/index.js";
import { AdminBadge, AdminButton } from "$components/patterns/admin/index.js"; import { AdminBadge, AdminButton } from "$components/patterns/admin/index.js";
import BrandMark from "$lib/webapp/BrandMark.svelte"; import BrandMark from "$lib/webapp/BrandMark.svelte";
@@ -760,6 +761,7 @@
</header> </header>
<main class="admin-main"> <main class="admin-main">
<ScrollArea class="admin-main-scroll" maxHeight="none">
{#key active} {#key active}
<div class="admin-section-stage" in:fade={sectionFade} out:fade={sectionFade}> <div class="admin-section-stage" in:fade={sectionFade} out:fade={sectionFade}>
{#if active === "stats"} {#if active === "stats"}
@@ -842,6 +844,7 @@
{/if} {/if}
</div> </div>
{/key} {/key}
</ScrollArea>
</main> </main>
</section> </section>
</div> </div>
@@ -1,5 +1,5 @@
<script> <script>
import { ColorInput, FileInput, Input, Textarea } from "$components/ui/index.js"; import { ColorInput, FileInput, Input, ScrollArea, Textarea } from "$components/ui/index.js";
import { import {
Check, Check,
ChevronRight, ChevronRight,
@@ -824,6 +824,7 @@
/> />
</label> </label>
</div> </div>
<ScrollArea class="admin-icon-picker-scroll" maxHeight="min(52vh, 460px)">
<div class="admin-icon-picker-grid"> <div class="admin-icon-picker-grid">
{#each filteredIconOptions as iconName} {#each filteredIconOptions as iconName}
{@const Icon = iconComponent(iconName)} {@const Icon = iconComponent(iconName)}
@@ -840,5 +841,6 @@
</button> </button>
{/each} {/each}
</div> </div>
</ScrollArea>
</div> </div>
</Dialog> </Dialog>
@@ -4,6 +4,7 @@
import { fmtTrafficBytes } from "../../lib/admin/format.js"; import { fmtTrafficBytes } from "../../lib/admin/format.js";
import Badge from "$components/ui/badge.svelte"; import Badge from "$components/ui/badge.svelte";
import { ScrollArea } from "$components/ui/index.js";
import * as Card from "$components/ui/card/index.js"; import * as Card from "$components/ui/card/index.js";
import { import {
AdminDashboardGrid, AdminDashboardGrid,
@@ -606,6 +607,7 @@
style="width:78%;height:9px;margin-top:6px" style="width:78%;height:9px;margin-top:6px"
></span> ></span>
</div> </div>
<ScrollArea class="admin-panel-dash-nodes-scroll" maxHeight="240px">
<div class="admin-panel-dash-nodes-grid"> <div class="admin-panel-dash-nodes-grid">
{#each Array(4) as _, m (m)} {#each Array(4) as _, m (m)}
<div class="admin-panel-dash-node"> <div class="admin-panel-dash-node">
@@ -621,6 +623,7 @@
</div> </div>
{/each} {/each}
</div> </div>
</ScrollArea>
</div> </div>
</div> </div>
</Card.Content> </Card.Content>
@@ -1018,6 +1021,7 @@
{at("stats_panel_inner_nodes_hint", {}, "")} {at("stats_panel_inner_nodes_hint", {}, "")}
</p> </p>
</div> </div>
<ScrollArea class="admin-panel-dash-nodes-scroll" maxHeight="240px">
<div class="admin-panel-dash-nodes-grid"> <div class="admin-panel-dash-nodes-grid">
{#each panelNodeTraffic.seven.slice(0, PANEL_NODE_TILE_LIMIT) as node} {#each panelNodeTraffic.seven.slice(0, PANEL_NODE_TILE_LIMIT) as node}
<div class="admin-panel-dash-node"> <div class="admin-panel-dash-node">
@@ -1031,6 +1035,7 @@
</div> </div>
{/each} {/each}
</div> </div>
</ScrollArea>
{#if panelNodeTraffic.seven.length > PANEL_NODE_TILE_LIMIT} {#if panelNodeTraffic.seven.length > PANEL_NODE_TILE_LIMIT}
<p class="admin-panel-dash-nodes-more"> <p class="admin-panel-dash-nodes-more">
{at( {at(
@@ -269,7 +269,8 @@
{:else if !tickets.length} {:else if !tickets.length}
<div class="admin-empty-state">{at("support_empty", {}, "Тикетов пока нет")}</div> <div class="admin-empty-state">{at("support_empty", {}, "Тикетов пока нет")}</div>
{:else} {:else}
<div class="support-inbox-list"> <ScrollArea class="support-inbox-list" maxHeight="none">
<div class="support-inbox-list-inner">
{#each tickets as ticket} {#each tickets as ticket}
<SupportInboxRow <SupportInboxRow
{ticket} {ticket}
@@ -279,6 +280,7 @@
/> />
{/each} {/each}
</div> </div>
</ScrollArea>
{/if} {/if}
</section> </section>
</div> </div>
@@ -1,6 +1,6 @@
<script> <script>
import { Label, Separator, Tabs } from "$components/ui/primitives.js"; import { Label, Separator, Tabs } from "$components/ui/primitives.js";
import { Checkbox, Input, Textarea } from "$components/ui/index.js"; import { Checkbox, Input, ScrollArea, Textarea } from "$components/ui/index.js";
import Dialog from "$components/ui/dialog.svelte"; import Dialog from "$components/ui/dialog.svelte";
import { import {
AdminBadge, AdminBadge,
@@ -552,7 +552,7 @@
</div> </div>
</div> </div>
<div class="admin-user-logs-wrap"> <ScrollArea class="admin-user-logs-wrap" maxHeight="min(52vh, 460px)">
{#if userLogsLoading} {#if userLogsLoading}
<AdminTableSkeleton <AdminTableSkeleton
headers={[ headers={[
@@ -604,7 +604,7 @@
</tbody> </tbody>
</AdminTable> </AdminTable>
{/if} {/if}
</div> </ScrollArea>
{#if userLogsLoaded && userLogsTotal > userLogsPageSize} {#if userLogsLoaded && userLogsTotal > userLogsPageSize}
<AdminPagination <AdminPagination
@@ -976,7 +976,9 @@
onclose={() => usersStore.updateState({ userMessageConfirmOpen: false })} onclose={() => usersStore.updateState({ userMessageConfirmOpen: false })}
class="admin-dialog" class="admin-dialog"
> >
<div class="admin-confirm-message-preview">{userMessageDraft}</div> <ScrollArea class="admin-confirm-message-preview" maxHeight="min(280px, 45vh)">
{userMessageDraft}
</ScrollArea>
<div class="admin-dialog-actions"> <div class="admin-dialog-actions">
<AdminButton onclick={() => usersStore.updateState({ userMessageConfirmOpen: false })} <AdminButton onclick={() => usersStore.updateState({ userMessageConfirmOpen: false })}
>{at("btn_cancel", {}, "Отмена")}</AdminButton >{at("btn_cancel", {}, "Отмена")}</AdminButton
@@ -1230,7 +1232,7 @@
gap: 8px; gap: 8px;
font-size: 13px; font-size: 13px;
} }
.admin-user-logs-wrap { :global(.admin-user-logs-wrap) {
min-height: 120px; min-height: 120px;
} }
.admin-user-log-event { .admin-user-log-event {
@@ -30,12 +30,14 @@
</Select.Trigger> </Select.Trigger>
<Select.Portal> <Select.Portal>
<Select.Content class="admin-select-content" {sideOffset}> <Select.Content class="admin-select-content" {sideOffset}>
<Select.Viewport class="admin-select-viewport">
{#each items as item (item.value)} {#each items as item (item.value)}
<Select.Item value={item.value} label={item.label} class="admin-select-item"> <Select.Item value={item.value} label={item.label} class="admin-select-item">
<span>{item.label}</span> <span>{item.label}</span>
<Check size={14} class="admin-select-item-check" /> <Check size={14} class="admin-select-item-check" />
</Select.Item> </Select.Item>
{/each} {/each}
</Select.Viewport>
</Select.Content> </Select.Content>
</Select.Portal> </Select.Portal>
</Select.Root> </Select.Root>
@@ -5,6 +5,7 @@
import { onMount } from "svelte"; import { onMount } from "svelte";
import { fade, fly } from "svelte/transition"; import { fade, fly } from "svelte/transition";
import Button from "./button.svelte"; import Button from "./button.svelte";
import ScrollArea from "./scroll-area.svelte";
export let open = false; export let open = false;
export let title = ""; export let title = "";
@@ -65,7 +66,9 @@
<X size={18} /> <X size={18} />
</Button> </Button>
</div> </div>
<ScrollArea class="dialog-body-scroll" maxHeight="none">
<slot /> <slot />
</ScrollArea>
</section> </section>
</div> </div>
{/if} {/if}
+69 -26
View File
@@ -348,7 +348,7 @@
min-height: 0; min-height: 0;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
overscroll-behavior: contain; overscroll-behavior: contain;
overflow-y: auto; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
padding: 24px 28px 36px; padding: 24px 28px 36px;
display: flex; display: flex;
@@ -359,7 +359,14 @@
/* Flex children must NOT shrink otherwise they collapse to fit the /* Flex children must NOT shrink otherwise they collapse to fit the
container and the main never overflows, breaking scroll. */ container and the main never overflows, breaking scroll. */
.admin-main > * { .admin-main-scroll {
flex: 1 1 auto;
min-height: 0;
max-height: none;
}
.admin-main > *,
.admin-main-scroll > .scroll-area__viewport > * {
flex-shrink: 0; flex-shrink: 0;
} }
@@ -1048,16 +1055,18 @@
color: var(--admin-muted); color: var(--admin-muted);
} }
.admin-panel-dash-nodes-scroll {
max-height: 240px;
border-radius: 12px;
border: 1px solid var(--admin-border);
background: color-mix(in srgb, var(--admin-bg) 65%, var(--admin-surface-2));
}
.admin-panel-dash-nodes-grid { .admin-panel-dash-nodes-grid {
display: grid; display: grid;
gap: 8px; gap: 8px;
grid-template-columns: repeat(auto-fit, minmax(160px, 1fr)); grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
max-height: 240px;
overflow-y: auto;
padding: 10px; padding: 10px;
border-radius: 12px;
border: 1px solid var(--admin-border);
background: color-mix(in srgb, var(--admin-bg) 65%, var(--admin-surface-2));
} }
.admin-panel-dash-node { .admin-panel-dash-node {
@@ -2221,12 +2230,14 @@
padding-left: 36px; padding-left: 36px;
} }
.admin-icon-picker-scroll {
border-radius: 10px;
}
.admin-icon-picker-grid { .admin-icon-picker-grid {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr)); grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
gap: 10px; gap: 10px;
max-height: min(52vh, 460px);
overflow-y: auto;
padding: 2px 4px 4px 0; padding: 2px 4px 4px 0;
} }
@@ -2726,7 +2737,7 @@
/* Keep admin dialogs readable on desktop: base .dialog-card uses min(100%, 520px); /* Keep admin dialogs readable on desktop: base .dialog-card uses min(100%, 520px);
this rule must not stretch the card to full viewport width. */ this rule must not stretch the card to full viewport width. */
width: min(100%, 520px); width: min(100%, 520px);
overflow-y: auto; overflow: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
overscroll-behavior: contain; overscroll-behavior: contain;
} }
@@ -3842,7 +3853,7 @@
z-index: 90; z-index: 90;
min-width: var(--bits-select-anchor-width); min-width: var(--bits-select-anchor-width);
max-height: var(--bits-select-content-available-height, 320px); max-height: var(--bits-select-content-available-height, 320px);
overflow-y: auto; overflow: hidden;
border: 1px solid var(--admin-border); border: 1px solid var(--admin-border);
border-radius: 10px; border-radius: 10px;
background: background:
@@ -3855,6 +3866,31 @@
gap: 1px; gap: 1px;
} }
.admin-select-viewport {
display: flex;
flex-direction: column;
gap: 1px;
max-height: inherit;
overflow-y: auto;
scrollbar-width: thin;
scrollbar-color: color-mix(in srgb, var(--admin-muted) 34%, var(--admin-border)) transparent;
}
.admin-select-viewport::-webkit-scrollbar {
width: 8px;
}
.admin-select-viewport::-webkit-scrollbar-track {
background: transparent;
}
.admin-select-viewport::-webkit-scrollbar-thumb {
border: 2px solid transparent;
border-radius: 999px;
background: color-mix(in srgb, var(--admin-muted) 34%, var(--admin-border));
background-clip: padding-box;
}
.admin-select-item { .admin-select-item {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -4050,7 +4086,7 @@
.admin-confirm-message-preview { .admin-confirm-message-preview {
max-height: min(280px, 45vh); max-height: min(280px, 45vh);
overflow: auto; overflow: hidden;
padding: 12px 14px; padding: 12px 14px;
border: 1px solid var(--admin-border); border: 1px solid var(--admin-border);
border-radius: 10px; border-radius: 10px;
@@ -4399,11 +4435,14 @@
} }
.support-inbox-list { .support-inbox-list {
gap: 8px;
min-height: 0; min-height: 0;
overflow-y: auto; overflow: hidden;
}
.support-inbox-list-inner {
display: grid;
gap: 8px;
padding-right: 2px; padding-right: 2px;
scrollbar-width: thin;
} }
.support-inbox-row { .support-inbox-row {
@@ -5033,11 +5072,13 @@
} }
.support-inbox-list { .support-inbox-list {
align-content: start;
min-height: 0; min-height: 0;
overflow-y: auto; overflow: hidden;
}
.support-inbox-list-inner {
align-content: start;
padding-right: 2px; padding-right: 2px;
scrollbar-width: thin;
} }
.support-inbox-row { .support-inbox-row {
@@ -5263,7 +5304,7 @@
height: 100%; height: 100%;
min-height: 0; min-height: 0;
max-height: none !important; max-height: none !important;
overflow: auto; overflow: hidden;
} }
} }
@@ -5436,15 +5477,17 @@
} }
.support-admin-list-panel .support-inbox-list { .support-admin-list-panel .support-inbox-list {
min-height: 0;
height: 100%;
overflow: hidden;
padding: 0;
}
.support-admin-list-panel .support-inbox-list-inner {
display: grid; display: grid;
align-content: start; align-content: start;
gap: 8px; gap: 8px;
min-height: 0;
height: 100%;
overflow: auto;
padding: 0;
padding-right: 4px; padding-right: 4px;
scrollbar-width: thin;
} }
.support-admin-list-panel > .admin-empty-state { .support-admin-list-panel > .admin-empty-state {
@@ -5561,7 +5604,7 @@
min-height: 0; min-height: 0;
height: 100%; height: 100%;
max-height: none !important; max-height: none !important;
overflow: auto; overflow: hidden;
border: 1px solid var(--admin-border); border: 1px solid var(--admin-border);
border-radius: 12px; border-radius: 12px;
background: color-mix(in srgb, var(--admin-bg) 68%, transparent); background: color-mix(in srgb, var(--admin-bg) 68%, transparent);
@@ -5913,7 +5956,7 @@
.support-ticket-dialog .support-admin-message-scroll { .support-ticket-dialog .support-admin-message-scroll {
height: 100%; height: 100%;
min-height: 320px; min-height: 320px;
overflow: auto; overflow: hidden;
} }
} }
+9 -8
View File
@@ -326,7 +326,7 @@
} }
.scroll-area { .scroll-area {
overflow: auto; overflow: hidden;
min-height: 0; min-height: 0;
} }
@@ -854,7 +854,7 @@
.ticket-list, .ticket-list,
.ticket-message-list, .ticket-message-list,
.support-admin-messages, .support-admin-messages,
.support-inbox-list { .support-inbox-list-inner {
display: grid; display: grid;
gap: 10px; gap: 10px;
} }
@@ -1457,14 +1457,15 @@
align-content: stretch; align-content: stretch;
} }
.support-ticket-list-scroll {
min-height: 0;
height: 100%;
}
.support-list-card .ticket-list, .support-list-card .ticket-list,
.support-user-list-skeleton { .support-user-list-skeleton {
align-content: start; align-content: start;
min-height: 0;
height: 100%;
overflow: auto;
padding-right: 4px; padding-right: 4px;
scrollbar-width: thin;
} }
.support-list-card .support-empty-state { .support-list-card .support-empty-state {
@@ -1538,7 +1539,7 @@
.support-ticket-screen .support-message-scroll { .support-ticket-screen .support-message-scroll {
min-height: 0; min-height: 0;
height: 100%; height: 100%;
overflow: auto; overflow: hidden;
padding: 20px; padding: 20px;
scrollbar-width: thin; scrollbar-width: thin;
} }
@@ -1717,7 +1718,7 @@
.support-ticket-screen .support-message-scroll { .support-ticket-screen .support-message-scroll {
min-height: 0; min-height: 0;
height: 100%; height: 100%;
overflow: auto; overflow: hidden;
padding: 10px; padding: 10px;
} }
+12 -2
View File
@@ -30,10 +30,11 @@
position: relative; position: relative;
z-index: 1; z-index: 1;
display: grid; display: grid;
grid-template-rows: auto minmax(0, 1fr);
gap: 16px; gap: 16px;
width: min(100%, 520px); width: min(100%, 520px);
max-height: min(86dvh, 760px); max-height: min(86dvh, 760px);
overflow: auto; overflow: hidden;
overscroll-behavior: contain; overscroll-behavior: contain;
padding: 18px; padding: 18px;
border: 1px solid var(--border); border: 1px solid var(--border);
@@ -43,6 +44,15 @@
box-shadow: var(--shadow-strong); box-shadow: var(--shadow-strong);
} }
.dialog-body-scroll {
min-height: 0;
max-height: none;
}
.dialog-body-scroll > .scroll-area__viewport {
display: grid;
}
.dialog-head { .dialog-head {
display: grid; display: grid;
grid-template-columns: minmax(0, 1fr) auto; grid-template-columns: minmax(0, 1fr) auto;
@@ -94,7 +104,7 @@
.payment-dialog-card { .payment-dialog-card {
max-height: 100%; max-height: 100%;
overflow-y: auto; overflow: hidden;
} }
.payment-dialog-body { .payment-dialog-body {
@@ -4,7 +4,7 @@
import { Check, ChevronsUpDown, LifeBuoy, MessageSquarePlus } from "$components/ui/icons.js"; import { Check, ChevronsUpDown, LifeBuoy, MessageSquarePlus } from "$components/ui/icons.js";
import Button from "$components/ui/button.svelte"; import Button from "$components/ui/button.svelte";
import Card from "$components/ui/card.svelte"; import Card from "$components/ui/card.svelte";
import { Input, Skeleton, Textarea } from "$components/ui/index.js"; import { Input, ScrollArea, Skeleton, Textarea } from "$components/ui/index.js";
import { TicketCard } from "$components/patterns/webapp/index.js"; import { TicketCard } from "$components/patterns/webapp/index.js";
import { Select, Tabs } from "$components/ui/primitives.js"; import { Select, Tabs } from "$components/ui/primitives.js";
import { import {
@@ -296,6 +296,7 @@
</Tabs.Root> </Tabs.Root>
{#if loading} {#if loading}
<ScrollArea class="support-ticket-list-scroll" maxHeight="none">
<div class="support-user-list-skeleton" aria-label={t("wa_loading")}> <div class="support-user-list-skeleton" aria-label={t("wa_loading")}>
{#each Array(5) as _, index (index)} {#each Array(5) as _, index (index)}
<article class="support-user-ticket-skeleton"> <article class="support-user-ticket-skeleton">
@@ -310,6 +311,7 @@
</article> </article>
{/each} {/each}
</div> </div>
</ScrollArea>
{:else if !tickets.length} {:else if !tickets.length}
<div class="support-empty-state" in:fade={{ duration: 180 }}> <div class="support-empty-state" in:fade={{ duration: 180 }}>
<MessageSquarePlus size={34} /> <MessageSquarePlus size={34} />
@@ -317,11 +319,13 @@
<small>{t("wa_support_empty_hint")}</small> <small>{t("wa_support_empty_hint")}</small>
</div> </div>
{:else} {:else}
<ScrollArea class="support-ticket-list-scroll" maxHeight="none">
<div class="ticket-list"> <div class="ticket-list">
{#each tickets as ticket} {#each tickets as ticket}
<TicketCard {ticket} {t} onOpen={(item) => supportStore.openTicket(item.ticket_id)} /> <TicketCard {ticket} {t} onOpen={(item) => supportStore.openTicket(item.ticket_id)} />
{/each} {/each}
</div> </div>
</ScrollArea>
{/if} {/if}
</Card> </Card>
</main> </main>