src/platform/StackedRouter.tsx

@@ -15,8 +15,6 @@ import {
   useContext,
   onCleanup,
   type Accessor,
-  useTransition,
-  getOwner,
 } from "solid-js";
 import { createStore, unwrap } from "solid-js/store";
 import "./StackedRouter.css";
@@ -81,8 +79,8 @@ export type NewFrameOptions<T> = (T extends undefined
 export type FramePusher<T, K extends keyof T = keyof T> = T[K] extends
   | undefined
   | any
-  ? (path: K, state?: Readonly<NewFrameOptions<T[K]>>) => Promise<Readonly<StackFrame>>
+  ? (path: K, state?: Readonly<NewFrameOptions<T[K]>>) => Readonly<StackFrame>
-  : (path: K, state: Readonly<NewFrameOptions<T[K]>>) => Promise<Readonly<StackFrame>>;
+  : (path: K, state: Readonly<NewFrameOptions<T[K]>>) => Readonly<StackFrame>;
 
 export type Navigator<PushGuide = Record<string, any>> = {
   frames: readonly StackFrame[];
@@ -467,8 +465,6 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
   const [stack, mutStack] = createStore([] as StackFrame[], { name: "stack" });
   const windowSize = useWindowSize();
 
-  const [, startTransition] = useTransition();
-
   if (import.meta.hot) {
     const saveStack = () => {
       import.meta.hot!.data[$StackedRouterSavedStack] = unwrap(stack);
@@ -492,8 +488,8 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
     });
   }
 
-  const pushFrame = async (path: string, opts?: Readonly<NewFrameOptions<any>>) =>
+  const pushFrame = (path: string, opts?: Readonly<NewFrameOptions<any>>) =>
-    await untrack(async () => {
+    untrack(() => {
       const frame = {
         path,
         state: opts?.state,
@@ -503,17 +499,14 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
       };
 
       const replace = opts?.replace;
-      const length = stack.length;
+      if (replace === "all" || stack.length === 0) {
-      await startTransition(() => {
+        mutStack([frame]);
-        if (replace === "all" || length === 0) {
+      } else if (replace) {
-          mutStack([frame]);
+        const idx = stack.length - 1;
-        } else if (replace) {
+        mutStack(idx, frame);
-          const idx = length - 1;
+      } else {
-          mutStack(idx, frame);
+        mutStack(stack.length, frame);
-        } else {
+      }
-          mutStack(length, frame);
-        }
-      });
 
       const savedStack = serializableStack(stack);
 
@@ -522,7 +515,6 @@ const StackedRouter: Component<StackedRouterProps> = (oprops) => {
       } else {
         window.history.pushState(savedStack, "", path);
       }
-
       return frame;
     });
 

src/timelines/Home.tsx

@@ -1,23 +1,27 @@
 import {
   createSignal,
   Show,
+  onMount,
   type ParentComponent,
+  createRenderEffect,
   createEffect,
-  useTransition,
 } from "solid-js";
 import { useDocumentTitle } from "../utils";
 import Scaffold from "~material/Scaffold";
 import {
+  AppBar,
   ListItemSecondaryAction,
   ListItemText,
   MenuItem,
   Switch,
+  Toolbar,
 } from "@suid/material";
 import { css } from "solid-styled";
 import { TimeSourceProvider, createTimeSource } from "~platform/timesrc";
 import ProfileMenuButton from "./ProfileMenuButton";
 import Tabs from "~material/Tabs";
 import Tab from "~material/Tab";
+import { makeEventListener } from "@solid-primitives/event-listener";
 import { $settings } from "../settings/stores";
 import { useStore } from "@nanostores/solid";
 import TrendTimelinePanel from "./TrendTimelinePanel";
@@ -28,20 +32,10 @@ import {
   default as ItemSelectionProvider,
 } from "./toots/ItemSelectionProvider";
 import AppTopBar from "~material/AppTopBar";
-import { createTranslator } from "~platform/i18n";
-import { useWindowSize } from "@solid-primitives/resize-observer";
-
-type StringRes = Record<
-  "tabs.home" | "tabs.trending" | "tabs.public" | "set.prefetch-toots",
-  string
->;
 
 const Home: ParentComponent = (props) => {
   let panelList: HTMLDivElement;
   useDocumentTitle("Timelines");
-  const [t] = createTranslator(
-    (code) => import(`./i18n/${code}.json`) as Promise<{ default: StringRes }>,
-  );
   const now = createTimeSource();
   const [, selectionState] = createSingluarItemSelection(
     undefined as string | undefined,
@@ -104,19 +98,10 @@ const Home: ParentComponent = (props) => {
     }
   };
 
-  const windowSize = useWindowSize();
-  createEffect((last) => {
-    if (last !== windowSize.width) {
-      requestRecalculateTabIndicator();
-    }
-  });
-
-  const [inTransition] = useTransition();
-
   createEffect(() => {
-    if (!inTransition()) {
+    makeEventListener(window, "resize", requestRecalculateTabIndicator);
-      requestAnimationFrame(recalculateTabIndicator);
+
-    }
+    requestAnimationFrame(recalculateTabIndicator);
   });
 
   const isTabFocus = (idx: number) => {
@@ -184,13 +169,13 @@ const Home: ParentComponent = (props) => {
           <AppTopBar>
             <Tabs>
               <Tab focus={isTabFocus(0)} onClick={[onTabClick, 0]}>
-                {t("tabs.home")}
+                Home
               </Tab>
               <Tab focus={isTabFocus(1)} onClick={[onTabClick, 1]}>
-                {t("tabs.trending")}
+                Trending
               </Tab>
               <Tab focus={isTabFocus(2)} onClick={[onTabClick, 2]}>
-                {t("tabs.public")}
+                Public
               </Tab>
             </Tabs>
             <ProfileMenuButton profile={profiles()[0]}>
@@ -202,7 +187,7 @@ const Home: ParentComponent = (props) => {
                   )
                 }
               >
-                <ListItemText>{t("set.prefetch-toots")}</ListItemText>
+                <ListItemText>Prefetch Toots</ListItemText>
                 <ListItemSecondaryAction>
                   <Switch checked={prefetching()}></Switch>
                 </ListItemSecondaryAction>

src/timelines/ProfileMenuButton.tsx

@@ -16,12 +16,6 @@ import {
 } from "@suid/icons-material";
 import A from "~platform/A";
 import Menu, { createManagedMenuState } from "~material/Menu";
-import { createTranslator } from "~platform/i18n";
-
-type StringRes = Record<
-  "nav.bookmarks" | "nav.likes" | "nav.lists" | "nav.settings",
-  string
->;
 
 const ProfileMenuButton: ParentComponent<{
   profile?: {
@@ -38,10 +32,6 @@ const ProfileMenuButton: ParentComponent<{
 }> = (props) => {
   const menuId = createUniqueId();
   const buttonId = createUniqueId();
-  const [t] = createTranslator(
-    async (code) =>
-      (await import(`./i18n/${code}.json`)) as { default: StringRes },
-  );
 
   const [open, state] = createManagedMenuState();
 
@@ -94,19 +84,19 @@ const ProfileMenuButton: ParentComponent<{
           <ListItemIcon>
             <BookmarkIcon />
           </ListItemIcon>
-          <ListItemText>{t("nav.bookmarks")}</ListItemText>
+          <ListItemText>Bookmarks</ListItemText>
         </MenuItem>
         <MenuItem disabled>
           <ListItemIcon>
             <LikeIcon />
           </ListItemIcon>
-          <ListItemText>{t("nav.likes")}</ListItemText>
+          <ListItemText>Likes</ListItemText>
         </MenuItem>
         <MenuItem disabled>
           <ListItemIcon>
             <ListIcon />
           </ListItemIcon>
-          <ListItemText>{t("nav.lists")}</ListItemText>
+          <ListItemText>Lists</ListItemText>
         </MenuItem>
         <Divider />
         <Show when={props.children}>
@@ -117,7 +107,7 @@ const ProfileMenuButton: ParentComponent<{
           <ListItemIcon>
             <SettingsIcon />
           </ListItemIcon>
-          <ListItemText>{t("nav.settings")}</ListItemText>
+          <ListItemText>Settings</ListItemText>
         </MenuItem>
       </Menu>
     </>

src/timelines/i18n/en.json

@@ -1,15 +1,3 @@
 {
-  "Choose Language": "Choose Language",
+  "Choose Language": "Choose Language"
-
-  "tabs.home": "Home",
-  "tabs.trending": "Trending",
-  "tabs.public": "Public",
-
-  "set.prefetch-toots": "Prefetch Toots",
-
-  "nav.bookmarks": "Bookmarks",
-  "nav.likes": "Likes",
-  "nav.lists": "Lists",
-  "nav.settings": "Settings"
-
 }

src/timelines/i18n/zh-Hans.json

@@ -1,14 +1,3 @@
 {
-  "Choose Language": "选择语言",
+  "Choose Language": "选择语言"
-
-  "tabs.home": "主页",
-  "tabs.trending": "当下热门",
-  "tabs.public": "公开",
-
-  "set.prefetch-toots": "提前下载嘟文",
-
-  "nav.bookmarks": "所有书签",
-  "nav.likes": "喜欢的嘟文",
-  "nav.lists": "所有列表",
-  "nav.settings": "设置"
 }