diff --git a/package.json b/package.json index 32a9d10..9cce6a9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "tutu", - "version": "1.0.3", + "version": "1.0.4", "description": "", "private": true, "type": "module", diff --git a/src/App.css b/src/App.css index b912c3a..e2c7ce3 100644 --- a/src/App.css +++ b/src/App.css @@ -8,5 +8,5 @@ } .custom-emoji { - width: 1.25em; + width: 1em; } diff --git a/src/material/BottomSheet.module.css b/src/material/BottomSheet.module.css index 237d0bd..5693423 100644 --- a/src/material/BottomSheet.module.css +++ b/src/material/BottomSheet.module.css @@ -31,7 +31,8 @@ bottom: 0; height: 100vh; height: 100dvh; - max-height: 100%; + max-height: 100vh; + max-height: 100dvh; } } diff --git a/src/material/BottomSheet.tsx b/src/material/BottomSheet.tsx index b5b93cc..73d5b4a 100644 --- a/src/material/BottomSheet.tsx +++ b/src/material/BottomSheet.tsx @@ -1,11 +1,15 @@ import { + children, createEffect, createRenderEffect, + createSignal, onCleanup, onMount, startTransition, useTransition, + type ChildrenReturn, type ParentComponent, + type ResolvedChildren, } from "solid-js"; import styles from "./BottomSheet.module.css"; import { useHeroSignal } from "../platform/anim"; @@ -40,17 +44,21 @@ const BottomSheet: ParentComponent = (props) => { let element: HTMLDialogElement; let animation: Animation | undefined; const hero = useHeroSignal(HERO); + const [cache, setCache] = createSignal(); + const ochildren = children(() => props.children); - const [pending] = useTransition() + const [pending] = useTransition(); createEffect(() => { if (props.open) { if (!element.open && !pending()) { animatedOpen(); + setCache(ochildren()); } } else { if (element.open) { animatedClose(); + setCache(undefined); } } }); @@ -115,7 +123,7 @@ const BottomSheet: ParentComponent = (props) => { return ( - {props.children} + {ochildren() ?? cache()} ); }; diff --git a/src/material/theme.css b/src/material/theme.css index 76bfab4..deacbe7 100644 --- a/src/material/theme.css +++ b/src/material/theme.css @@ -18,6 +18,12 @@ --body-size: 0.9375rem; } } + + input, + textarea { + /* iOS will zoom in if the font-size is smaller than 16px (or 1rem? i dont know) */ + font-size: 1rem; + } } [lang^="zh"], @@ -99,6 +105,7 @@ --tutu-anim-curve-sharp: cubic-bezier(0.4, 0, 0.6, 1); @media (max-width: 300px) { + /* XS screen, like wearables */ & { --tutu-transition-shadow: box-shadow 157.5ms var(--tutu-anim-curve-std); @@ -106,6 +113,7 @@ } @media (max-width: 600px) { + /* Mobile */ & { --tutu-transition-shadow: box-shadow 225ms var(--tutu-anim-curve-std); @@ -113,6 +121,7 @@ } @media (max-width: 1200px) { + /* Tablet */ & { --tutu-transition-shadow: box-shadow 292.5ms var(--tutu-anim-curve-std); @@ -139,4 +148,4 @@ body { font-size: var(--body-size, 1rem); -} +} \ No newline at end of file diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index a45a4fc..56cca5e 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -50,7 +50,7 @@ const Settings: ParentComponent = () => { topbar={ - + Settings diff --git a/src/timelines/CompactToot.tsx b/src/timelines/CompactToot.tsx index 0d58b3d..7042ad4 100644 --- a/src/timelines/CompactToot.tsx +++ b/src/timelines/CompactToot.tsx @@ -39,7 +39,7 @@ const CompactToot: Component = (props) => { @{toot().account.username}@{new URL(toot().account.url).hostname}
{ const rect = srcElement?.getBoundingClientRect(); setHeroSrc((x) => Object.assign({}, x, { [BOTTOM_SHEET_HERO]: rect })); const acct = `${inf.username}@${p.account.site}`; + setTootBottomSheetCache(acct, toot); navigate(`/${encodeURIComponent(acct)}/${toot.id}`); }; diff --git a/src/timelines/RegularToot.tsx b/src/timelines/RegularToot.tsx index 28bc4d8..6484b9f 100644 --- a/src/timelines/RegularToot.tsx +++ b/src/timelines/RegularToot.tsx @@ -177,7 +177,7 @@ function TootAuthorGroup(props: { status: mastodon.v1.Status; now: Date }) { }} /> @{toot().account.username}@{new URL(toot().account.url).hostname} diff --git a/src/timelines/TootBottomSheet.tsx b/src/timelines/TootBottomSheet.tsx index e7abbf8..a4d72c6 100644 --- a/src/timelines/TootBottomSheet.tsx +++ b/src/timelines/TootBottomSheet.tsx @@ -1,30 +1,57 @@ import { useNavigate, useParams } from "@solidjs/router"; -import { createResource, Show, type Component } from "solid-js"; +import { + createEffect, + createRenderEffect, + createResource, + Show, + type Component, +} from "solid-js"; import Scaffold from "../material/Scaffold"; import TootThread from "./TootThread"; -import { AppBar, IconButton, Toolbar } from "@suid/material"; +import { AppBar, Avatar, IconButton, Toolbar } from "@suid/material"; import { Title } from "../material/typography"; -import { Close as CloseIcon } from "@suid/icons-material"; +import { Close as CloseIcon, Send } from "@suid/icons-material"; import { isiOS } from "../platform/host"; import { createUnauthorizedClient, useSessions } from "../masto/clients"; import { resolveCustomEmoji } from "../masto/toot"; import RegularToot from "./RegularToot"; +import type { mastodon } from "masto"; +import cards from "../material/cards.module.css"; +import { css } from "solid-styled"; + +let cachedEntry: [string, mastodon.v1.Status] | undefined; + +export function setCache(acct: string, status: mastodon.v1.Status) { + cachedEntry = [acct, status]; +} + +function getCache(acct: string, id: string) { + if (acct === cachedEntry?.[0] && id === cachedEntry?.[1].id) { + return cachedEntry[1]; + } +} const TootBottomSheet: Component = (props) => { const params = useParams<{ acct: string; id: string }>(); const navigate = useNavigate(); const allSession = useSessions(); + const acctText = () => decodeURIComponent(params.acct); const session = () => { - const [inputUsername, inputSite] = decodeURIComponent(params.acct).split( - "@", - 2, - ); + const [inputUsername, inputSite] = acctText().split("@", 2); const authedSession = allSession().find( (x) => x.account.site === inputSite && x.account.inf?.username === inputUsername, ); - return authedSession ?? { client: createUnauthorizedClient(inputSite) }; + return ( + authedSession ?? { + client: createUnauthorizedClient(inputSite), + account: undefined, + } + ); + }; + const profile = () => { + return session().account; }; const [remoteToot] = createResource( @@ -34,7 +61,7 @@ const TootBottomSheet: Component = (props) => { }, ); - const toot = remoteToot; + const toot = () => remoteToot() ?? getCache(acctText(), params.id); const tootTitle = () => { const t = toot(); @@ -45,6 +72,17 @@ const TootBottomSheet: Component = (props) => { return "A toot"; }; + css` + .bottom-dock { + position: sticky; + bottom: 0; + } + + .name :global(img) { + max-height: 1em; + } + `; + return ( { - {tootTitle} + + createRenderEffect(() => (e.innerHTML = tootTitle())) + } + > } > -
+
- + + +
+ +
+ +
+ + + + + +