diff --git a/src/platform/StackedRouter.tsx b/src/platform/StackedRouter.tsx index 445be66..07b3526 100644 --- a/src/platform/StackedRouter.tsx +++ b/src/platform/StackedRouter.tsx @@ -306,10 +306,7 @@ const StackedRouter: Component = (oprops) => { } const [fig0] = event.touches; const { x, width } = event.currentTarget.getBoundingClientRect(); - if ( - fig0.clientX - fig0.radiusX < x - 22 || - fig0.clientX + fig0.radiusX > x + 22 - ) { + if (fig0.clientX < x - 22 || fig0.clientX > x + 22) { return; } origX = x; @@ -416,10 +413,10 @@ const StackedRouter: Component = (oprops) => { class="StackedPage" onCancel={[popFrame, 1]} onClick={[onDialogClick, popFrame]} - onTouchStart={onDialogTouchStart} - onTouchMove={onDialogTouchMove} - onTouchEnd={onDialogTouchEnd} - onTouchCancel={onDialogTouchCancel} + on:touchstart={onDialogTouchStart} + on:touchmove={onDialogTouchMove} + on:touchend={onDialogTouchEnd} + on:touchcancel={onDialogTouchCancel} id={frame().rootId} > diff --git a/src/timelines/MediaAttachmentGrid.css b/src/timelines/MediaAttachmentGrid.css index 8811f49..55bb30d 100644 --- a/src/timelines/MediaAttachmentGrid.css +++ b/src/timelines/MediaAttachmentGrid.css @@ -12,7 +12,7 @@ min-width: 40px; object-fit: contain; max-width: 100%; - background-color: var(--tutu-color-surface-d); + background-color: var(--media-color-accent, var(--tutu-color-surface-d)); border-radius: 2px; border: 1px solid var(--tutu-color-surface-d); transition: outline-width 60ms var(--tutu-anim-curve-std), border-color 60ms var(--tutu-anim-curve-std); diff --git a/src/timelines/toot-components/PreviewCard.css b/src/timelines/toot-components/PreviewCard.css index a62c17c..7730679 100644 --- a/src/timelines/toot-components/PreviewCard.css +++ b/src/timelines/toot-components/PreviewCard.css @@ -19,6 +19,10 @@ background-color: var(--tutu-color-surface); max-width: 100%; height: auto; + + &.loaded { + background-color: #eeeeee; + } } &:hover, diff --git a/src/timelines/toot-components/PreviewCard.tsx b/src/timelines/toot-components/PreviewCard.tsx index ed20eb8..88a2cec 100644 --- a/src/timelines/toot-components/PreviewCard.tsx +++ b/src/timelines/toot-components/PreviewCard.tsx @@ -5,6 +5,14 @@ import { Title, Body1 } from "../../material/typography"; import { averageColorHex } from "../../platform/blurhash"; import "./PreviewCard.css"; +function onResetImg(event: Event & { currentTarget: HTMLImageElement }) { + event.currentTarget.classList.remove("loaded"); +} + +function onImgLoaded(event: Event & { currentTarget: HTMLImageElement }) { + event.currentTarget.classList.add("loaded"); +} + export function PreviewCard(props: { src: mastodon.v1.PreviewCard; alwaysCompact?: boolean; @@ -81,6 +89,8 @@ export function PreviewCard(props: { >