Rubicon/tutu
1
0
Fork 0
Code Issues 19 Pull requests Projects Activity Actions

Merge branch 'master' into feat-toot-composer

Browse source
This commit is contained in:
Rubicon 2024-09-28 07:30:02 +00:00
commit 06de56b4af
4 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.css
View file

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

1
src/masto/timelines.ts
View file

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

2
src/material/BottomSheet.module.css
View file

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

62
src/timelines/Home.tsx
View file

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