src/UnexpectedError.tsx

@@ -49,13 +49,11 @@ const UnexpectedError: Component<{ error?: any }> = (props) => {
       <h1>Oh, it is our fault.</h1>
       <p>There is an unexpected error in our app, and it's not your fault.</p>
       <p>
-        You can restart the app to see if this guy is gone. If you meet this guy
+        You can reload to see if this guy is gone. If you meet this guy
         repeatly, please report to us.
       </p>
       <div>
-        <Button onClick={() => (window.location.replace("/"))}>
-          Restart App
-        </Button>
+        <Button onClick={() => window.location.reload()}>Reload</Button>
       </div>
       <details>
         <summary>

src/platform/StackedRouter.css

@@ -3,8 +3,6 @@
   display: contents;
   max-width: 100vw;
   max-width: 100dvw;
-
-  contain: layout;
 }
 
 dialog.StackedPage {

src/platform/StackedRouter.tsx

@@ -2,6 +2,7 @@ import { StaticRouter, type RouterProps } from "@solidjs/router";
 import {
   Component,
   createContext,
+  createEffect,
   createRenderEffect,
   createUniqueId,
   Index,
@@ -33,33 +34,8 @@ export type NewFrameOptions<T> = (T extends undefined
       state?: T;
     }
   : { state: T }) & {
-  /**
-   * The new frame should replace the current frame.
-   */
   replace?: boolean;
-  /**
-   * The animatedOpen phase of the life cycle.
-   *
-   * You can use this hook to animate the opening
-   * of the frame. In this phase, the frame content is created
-   * and is mounted to the document.
-   *
-   * You must return an {@link Animation}. This function must be
-   * without side effects. This phase is ended after the {@link Animation}
-   * finished.
-   */
   animateOpen?: StackFrame["animateOpen"];
-  /**
-   * The animatedClose phase of the life cycle.
-   *
-   * You can use this hook to animate the closing of the frame.
-   * In this phase, the frame content is still mounted in the
-   * document and will be unmounted after this phase.
-   *
-   * You must return an {@link Animation}. This function must be
-   * without side effects. This phase is ended after the
-   * {@link Animation} finished.
-   */
   animateClose?: StackFrame["animateClose"];
 };
 
@@ -77,10 +53,6 @@ export type Navigator<PushGuide = Record<string, any>> = {
 
 const NavigatorContext = /* @__PURE__ */ createContext<Navigator>();
 
-export function useMaybeNavigator() {
-  return useContext(NavigatorContext);
-}
-
 /**
  * Get the navigator of the {@link StackedRouter}.
  *
@@ -91,7 +63,7 @@ export function useMaybeNavigator() {
  * navigator to the type you need.
  */
 export function useNavigator() {
-  const navigator = useMaybeNavigator();
+  const navigator = useContext(NavigatorContext);
 
   if (!navigator) {
     throw new TypeError("not in available scope of StackedRouter");
@@ -108,12 +80,8 @@ export type CurrentFrame = {
 const CurrentFrameContext =
   /* @__PURE__ */ createContext<Accessor<Readonly<CurrentFrame>>>();
 
-export function useMaybeCurrentFrame() {
-  return useContext(CurrentFrameContext);
-}
-
 export function useCurrentFrame() {
-  const frame = useMaybeCurrentFrame();
+  const frame = useContext(CurrentFrameContext);
 
   if (!frame) {
     throw new TypeError("not in available scope of StackedRouter");
@@ -122,28 +90,6 @@ export function useCurrentFrame() {
   return frame;
 }
 
-/**
- * Return an accessor of is current frame is suspended.
- *
- * A suspended frame is the one not on the top. "Suspended"
- * is the description of a certain situtation, not in the life cycle
- * of a frame.
- */
-export function useMaybeIsFrameSuspended() {
-  const { frames } = useMaybeNavigator() || {};
-
-  if (typeof frames === "undefined") {
-    return () => false;
-  }
-
-  const thisFrame = useCurrentFrame();
-
-  return () => {
-    const idx = thisFrame().index;
-    return frames.length - 1 > idx;
-  };
-}
-
 function onDialogClick(
   onClose: () => void,
   event: MouseEvent & { currentTarget: HTMLDialogElement },
@@ -243,10 +189,10 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
         )! as HTMLDialogElement;
         const createAnimation = lastFrame.animateClose ?? animateClose;
         requestAnimationFrame(() => {
-          element.classList.add("animating");
+          element.classList.add("animating")
           const animation = createAnimation(element);
           animation.addEventListener("finish", () => {
-            element.classList.remove("animating");
+            element.classList.remove("animating")
             onlyPopFrame(depth);
           });
         });

src/timelines/Home.tsx

@@ -3,9 +3,11 @@ import {
   Show,
   onMount,
   type ParentComponent,
-  createRenderEffect,
+  children,
+  Suspense,
 } from "solid-js";
 import { useDocumentTitle } from "../utils";
+import { type mastodon } from "masto";
 import Scaffold from "../material/Scaffold";
 import {
   AppBar,
@@ -21,11 +23,17 @@ import ProfileMenuButton from "./ProfileMenuButton";
 import Tabs from "../material/Tabs";
 import Tab from "../material/Tab";
 import { makeEventListener } from "@solid-primitives/event-listener";
+import BottomSheet, {
+  HERO as BOTTOM_SHEET_HERO,
+} from "../material/BottomSheet";
 import { $settings } from "../settings/stores";
 import { useStore } from "@nanostores/solid";
+import { HeroSourceProvider, type HeroSource } from "../platform/anim";
+import { setCache as setTootBottomSheetCache } from "./TootBottomSheet";
 import TrendTimelinePanel from "./TrendTimelinePanel";
 import TimelinePanel from "./TimelinePanel";
 import { useSessions } from "../masto/clients";
+import { useNavigator } from "../platform/StackedRouter";
 
 const Home: ParentComponent = (props) => {
   let panelList: HTMLDivElement;
@@ -35,17 +43,29 @@ const Home: ParentComponent = (props) => {
   const settings$ = useStore($settings);
 
   const profiles = useSessions();
+  const profile = () => {
+    const all = profiles();
+    if (all.length > 0) {
+      return all[0].account.inf;
+    }
+  };
   const client = () => {
     const all = profiles();
     return all?.[0]?.client;
   };
+  const {pop, push} = useNavigator();
 
+  const [heroSrc, setHeroSrc] = createSignal<HeroSource>({});
+  const [panelOffset, setPanelOffset] = createSignal(0);
   const prefetching = () => !settings$().prefetchTootsDisabled;
+  const [currentFocusOn, setCurrentFocusOn] = createSignal<HTMLElement[]>([]);
   const [focusRange, setFocusRange] = createSignal([0, 0] as readonly [
     number,
     number,
   ]);
 
+  const child = children(() => props.children);
+
   let scrollEventLockReleased = true;
 
   const recalculateTabIndicator = () => {
@@ -82,17 +102,17 @@ const Home: ParentComponent = (props) => {
     }
   };
 
-  const requestRecalculateTabIndicator = () => {
+  onMount(() => {
+    makeEventListener(panelList, "scroll", () => {
+      if (scrollEventLockReleased) {
+        requestAnimationFrame(recalculateTabIndicator);
+      }
+    });
+    makeEventListener(window, "resize", () => {
       if (scrollEventLockReleased) {
         requestAnimationFrame(recalculateTabIndicator);
       }
-  };
-
-  createRenderEffect(() => {
-    makeEventListener(window, "resize", requestRecalculateTabIndicator);
     });
-
-  onMount(() => {
     requestAnimationFrame(recalculateTabIndicator);
   });
 
@@ -115,6 +135,30 @@ const Home: ParentComponent = (props) => {
     }
   };
 
+  const openFullScreenToot = (
+    toot: mastodon.v1.Status,
+    srcElement?: HTMLElement,
+    reply?: boolean,
+  ) => {
+    const p = profiles()[0];
+    const inf = p.account.inf ?? profile();
+    if (!inf) {
+      console.warn("no account info?");
+      return;
+    }
+    setHeroSrc((x) =>
+      Object.assign({}, x, { [BOTTOM_SHEET_HERO]: srcElement }),
+    );
+    const acct = `${inf.username}@${p.account.site}`;
+    setTootBottomSheetCache(acct, toot);
+    push(`/${encodeURIComponent(acct)}/toot/${toot.id}`, {
+      state: reply
+        ? {
+            tootReply: true,
+          }
+        : undefined,
+    });
+  };
 
   css`
     .tab-panel {
@@ -165,7 +209,7 @@ const Home: ParentComponent = (props) => {
               class="responsive"
               sx={{ paddingTop: "var(--safe-area-inset-top, 0px)" }}
             >
-              <Tabs>
+              <Tabs onFocusChanged={setCurrentFocusOn} offset={panelOffset()}>
                 <Tab focus={isTabFocus(0)} onClick={[onTabClick, 0]}>
                   Home
                 </Tab>
@@ -195,25 +239,26 @@ const Home: ParentComponent = (props) => {
           </AppBar>
         }
       >
+        <HeroSourceProvider value={[heroSrc, setHeroSrc]}>
           <TimeSourceProvider value={now}>
             <Show when={!!client()}>
-            <div
-              class="panel-list"
-              ref={panelList!}
-              onScroll={requestRecalculateTabIndicator}
-            >
+              <div class="panel-list" ref={panelList!}>
                 <div class="tab-panel">
                   <div>
                     <TimelinePanel
                       client={client()}
                       name="home"
                       prefetch={prefetching()}
+                      openFullScreenToot={openFullScreenToot}
                     />
                   </div>
                 </div>
                 <div class="tab-panel">
                   <div>
-                  <TrendTimelinePanel client={client()} />
+                    <TrendTimelinePanel
+                      client={client()}
+                      openFullScreenToot={openFullScreenToot}
+                    />
                   </div>
                 </div>
                 <div class="tab-panel">
@@ -222,6 +267,7 @@ const Home: ParentComponent = (props) => {
                       client={client()}
                       name="public"
                       prefetch={prefetching()}
+                      openFullScreenToot={openFullScreenToot}
                     />
                   </div>
                 </div>
@@ -229,6 +275,12 @@ const Home: ParentComponent = (props) => {
               </div>
             </Show>
           </TimeSourceProvider>
+          <Suspense>
+            <BottomSheet open={!!child()} onClose={() => pop(1)}>
+              {child()}
+            </BottomSheet>
+          </Suspense>
+        </HeroSourceProvider>
       </Scaffold>
     </>
   );

src/timelines/PullDownToRefresh.tsx

@@ -10,7 +10,6 @@ import { Refresh as RefreshIcon } from "@suid/icons-material";
 import { CircularProgress } from "@suid/material";
 import { makeEventListener } from "@solid-primitives/event-listener";
 import { createVisibilityObserver } from "@solid-primitives/intersection-observer";
-import { useMaybeIsFrameSuspended } from "../platform/StackedRouter";
 
 const PullDownToRefresh: Component<{
   loading?: boolean;
@@ -34,7 +33,6 @@ const PullDownToRefresh: Component<{
   });
 
   const rootVisible = obvx(() => rootElement);
-  const isFrameSuspended = useMaybeIsFrameSuspended()
 
   createEffect(() => {
     if (!rootVisible()) setPullDown(0);
@@ -111,9 +109,6 @@ const PullDownToRefresh: Component<{
     if (!rootVisible()) {
       return;
     }
-    if (isFrameSuspended()) {
-      return;
-    }
     const element = props.linkedElement;
     if (!element) return;
     makeEventListener(element, "wheel", handleLinkedWheel);
@@ -164,9 +159,6 @@ const PullDownToRefresh: Component<{
     if (!rootVisible()) {
       return;
     }
-    if (isFrameSuspended()) {
-      return;
-    }
     const element = props.linkedElement;
     if (!element) return;
     makeEventListener(element, "touchmove", handleTouch);

src/timelines/TimelinePanel.tsx

@@ -20,6 +20,12 @@ const TimelinePanel: Component<{
   client: mastodon.rest.Client;
   name: "home" | "public";
   prefetch?: boolean;
+
+  openFullScreenToot: (
+    toot: mastodon.v1.Status,
+    srcElement?: HTMLElement,
+    reply?: boolean,
+  ) => void;
 }> = (props) => {
   const [scrollLinked, setScrollLinked] = createSignal<HTMLElement>();
 

src/timelines/TrendTimelinePanel.tsx

@@ -13,6 +13,12 @@ import TootList from "./TootList.jsx";
 
 const TrendTimelinePanel: Component<{
   client: mastodon.rest.Client;
+
+  openFullScreenToot: (
+    toot: mastodon.v1.Status,
+    srcElement?: HTMLElement,
+    reply?: boolean,
+  ) => void;
 }> = (props) => {
   const [scrollLinked, setScrollLinked] = createSignal<HTMLElement>();
   const [tl, snapshot, { refetch: refetchTimeline }] = createTimelineSnapshot(