StackedRouter: new router simulates app behaviour #45
1 changed files with 3 additions and 13 deletions
|
@ -1,10 +1,7 @@
|
|||
import {
|
||||
children,
|
||||
createSignal,
|
||||
For,
|
||||
Show,
|
||||
type JSX,
|
||||
type ParentComponent,
|
||||
type Component,
|
||||
} from "solid-js";
|
||||
import Scaffold from "../material/Scaffold.js";
|
||||
import {
|
||||
|
@ -44,7 +41,6 @@ import {
|
|||
useDateFnLocale,
|
||||
} from "../platform/i18n.jsx";
|
||||
import { type Template } from "@solid-primitives/i18n";
|
||||
import BottomSheet from "../material/BottomSheet.jsx";
|
||||
import { useServiceWorker } from "../platform/host.js";
|
||||
import { useSessions } from "../masto/clients.js";
|
||||
import { useNavigator } from "../platform/StackedRouter.jsx";
|
||||
|
@ -163,7 +159,7 @@ type Strings = {
|
|||
["lang.auto"]: Template<{ detected: string }>;
|
||||
} & Record<string, string | undefined>;
|
||||
|
||||
const Settings: ParentComponent = (props) => {
|
||||
const Settings: Component = () => {
|
||||
const [t] = createTranslator(
|
||||
(code) =>
|
||||
import(`./i18n/${code}.json`) as Promise<{
|
||||
|
@ -173,7 +169,7 @@ const Settings: ParentComponent = (props) => {
|
|||
);
|
||||
const {pop} = useNavigator();
|
||||
const settings$ = useStore($settings);
|
||||
const { needRefresh, offlineReady } = useServiceWorker();
|
||||
const { needRefresh } = useServiceWorker();
|
||||
const dateFnLocale = useDateFnLocale();
|
||||
|
||||
const profiles = useSessions();
|
||||
|
@ -182,8 +178,6 @@ const Settings: ParentComponent = (props) => {
|
|||
signOut((a) => a.site === acct.site && a.accessToken === acct.accessToken);
|
||||
};
|
||||
|
||||
const subpage = children(() => props.children);
|
||||
|
||||
css`
|
||||
ul {
|
||||
padding: 0;
|
||||
|
@ -209,10 +203,6 @@ const Settings: ParentComponent = (props) => {
|
|||
</AppBar>
|
||||
}
|
||||
>
|
||||
<BottomSheet open={!!subpage()} onClose={() => pop(1)}>
|
||||
{subpage()}
|
||||
</BottomSheet>
|
||||
|
||||
<List class="setting-list" use:solid-styled>
|
||||
<li>
|
||||
<ul>
|
||||
|
|
Loading…
Reference in a new issue