Merge branch 'master' into feat-toot-composer

This commit is contained in:
Rubicon 2024-09-28 07:30:02 +00:00
commit e17964ff56
4 changed files with 34 additions and 33 deletions

View file

@ -4,7 +4,7 @@
--safe-area-inset-bottom: env(safe-area-inset-bottom);
--safe-area-inset-right: env(safe-area-inset-right);
background-color: var(--tutu-color-surface, transparent);
overscroll-behavior-block: contain;
overscroll-behavior-block: none;
}
.custom-emoji {

View file

@ -38,7 +38,6 @@ export function useTimeline(
async ([tl], info) => {
let tlChanged = false;
if (otl !== tl) {
console.debug("timeline reset");
npager = opager = undefined;
otl = tl;
tlChanged = true;

View file

@ -11,7 +11,7 @@
width: 100%;
max-width: 560px;
border-radius: 2px;
overscroll-behavior: contain;
overscroll-behavior: none;
max-height: 100vh;
max-height: 100dvh;

View file

@ -430,40 +430,42 @@ const Home: ParentComponent = (props) => {
}
>
<TimeSourceProvider value={now}>
<div class="panel-list" ref={panelList!}>
<div class="tab-panel">
<div>
<TimelinePanel
client={client()}
name="home"
prefetch={prefetching()}
openFullScreenToot={openFullScreenToot}
/>
<Show when={!!client()}>
<div class="panel-list" ref={panelList!}>
<div class="tab-panel">
<div>
<TimelinePanel
client={client()}
name="home"
prefetch={prefetching()}
openFullScreenToot={openFullScreenToot}
/>
</div>
</div>
</div>
<div class="tab-panel">
<div>
<TimelinePanel
client={client()}
name="trends"
prefetch={prefetching()}
openFullScreenToot={openFullScreenToot}
fullRefetch={120}
/>
<div class="tab-panel">
<div>
<TimelinePanel
client={client()}
name="trends"
prefetch={prefetching()}
openFullScreenToot={openFullScreenToot}
fullRefetch={120}
/>
</div>
</div>
</div>
<div class="tab-panel">
<div>
<TimelinePanel
client={client()}
name="public"
prefetch={prefetching()}
openFullScreenToot={openFullScreenToot}
/>
<div class="tab-panel">
<div>
<TimelinePanel
client={client()}
name="public"
prefetch={prefetching()}
openFullScreenToot={openFullScreenToot}
/>
</div>
</div>
<div></div>
</div>
<div></div>
</div>
</Show>
</TimeSourceProvider>
<Suspense>
<HeroSourceProvider value={[heroSrc, setHeroSrc]}>