Rubicon/tutu
1
0
Fork 0
Code Issues 13 Pull requests Projects 2 Releases Activity Actions

Compare commits

base: Rubicon:69f7f37a2ce917763a4d4bc10a86bd66fff1958f
Branches Tags
Rubicon:master
Rubicon:rewrite-timeline
Rubicon:v1.0.7
Rubicon:v1.0.6
Rubicon:v1.0.5
Rubicon:v1.0.4
Rubicon:v1.0.3
Rubicon:v1.0.2
Rubicon:v1.0.1
Rubicon:v1.0.0
...
compare: Rubicon:11c31f7f4275fa6c10ade4b6867c61442bc0e9da
Branches Tags
Rubicon:master
Rubicon:rewrite-timeline
Rubicon:v1.0.7
Rubicon:v1.0.6
Rubicon:v1.0.5
Rubicon:v1.0.4
Rubicon:v1.0.3
Rubicon:v1.0.2
Rubicon:v1.0.1
Rubicon:v1.0.0

2 commits
69f7f37a2c ... 11c31f7f42

Author SHA1 Message Date
thislight
11c31f7f42
timelines: minor clean up
All checks were successful
/ depoly (push) Successful in 1m5s
Details
2024-09-27 18:07:10 +08:00
thislight
bf06cfe2e1
Home: fix could not jump to sign in page 2024-09-27 18:06:44 +08:00
2 changed files with 38 additions and 35 deletions
Show stats Expand all files Collapse all files

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;

72
src/timelines/Home.tsx
View file

@ -11,7 +11,7 @@ import {
Suspense, Suspense,
Match, Match,
Switch as JsSwitch, Switch as JsSwitch,
ErrorBoundary ErrorBoundary,
} from "solid-js"; } from "solid-js";
import { useDocumentTitle } from "../utils"; import { useDocumentTitle } from "../utils";
import { type mastodon } from "masto"; import { type mastodon } from "masto";
@ -126,9 +126,11 @@ const TimelinePanel: Component<{
}; };
return ( return (
<ErrorBoundary fallback={(err, reset) => { <ErrorBoundary
return <p>Oops: {String(err)}</p> fallback={(err, reset) => {
}}> return <p>Oops: {String(err)}</p>;
}}
>
<PullDownToRefresh <PullDownToRefresh
linkedElement={scrollLinked()} linkedElement={scrollLinked()}
loading={snapshot.loading} loading={snapshot.loading}
@ -404,40 +406,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]}>