YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: update image displays (#2093)

Browse Source
This commit is contained in:
boojack
2023-08-06 10:42:30 +08:00
committed by GitHub
parent 726300394b
commit 843850675f
4 changed files with 142 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/components/Memo.tsx
View File

@ -66,6 +66,7 @@ const Memo: React.FC<Props> = (props: Props) => {
);
}, [memo.relationList]);
// Update display time string.
useEffect(() => {
let intervalFlag: any = -1;
if (Date.now() - memo.displayTs < 1000 * 60 * 60 * 24) {
@ -102,6 +103,11 @@ const Memo: React.FC<Props> = (props: Props) => {
}
}, [lazyRendering]);
if (!shouldRender) {
// Render a placeholder to occupy the space.
return <div className={`memo-wrapper min-h-[128px] ${"memos-" + memo.id}`} ref={memoContainerRef}></div>;
}
const handleTogglePinMemoBtnClick = async () => {
try {
if (memo.pinned) {
@ -246,15 +252,6 @@ const Memo: React.FC<Props> = (props: Props) => {
}
};
if (!shouldRender) {
return (
<div
className={`memo-wrapper min-h-[128px] ${"memos-" + memo.id} ${memo.pinned && !readonly ? "pinned" : ""}`}
ref={memoContainerRef}
></div>
);
}
return (
<>
<div className={`memo-wrapper ${"memos-" + memo.id} ${memo.pinned && !readonly ? "pinned" : ""}`} ref={memoContainerRef}>

39
web/src/components/MemoResourceListView.tsx
View File

@ -1,4 +1,4 @@
import { ImageList, ImageListItem, useMediaQuery } from "@mui/material";
import classNames from "classnames";
import { absolutifyLink } from "@/helpers/utils";
import { getResourceType, getResourceUrl } from "@/utils/resource";
import MemoResource from "./MemoResource";
@ -23,7 +23,6 @@ const MemoResourceListView: React.FC<Props> = (props: Props) => {
...getDefaultProps(),
...props,
};
const matches = useMediaQuery("(min-width:640px)");
const imageResourceList = resourceList.filter((resource) => getResourceType(resource).startsWith("image"));
const videoResourceList = resourceList.filter((resource) => resource.type.startsWith("video"));
const otherResourceList = resourceList.filter(
@ -41,20 +40,38 @@ const MemoResourceListView: React.FC<Props> = (props: Props) => {
return (
<>
{imageResourceList.length > 0 && (
<div className="w-full mt-2">
<ImageList variant="masonry" cols={matches ? 3 : 2} gap={8}>
{imageResourceList.length > 0 &&
(imageResourceList.length === 1 ? (
<div className="mt-2 max-w-[90%] max-h-64 flex justify-center items-center shadow rounded overflow-hidden hide-scrollbar hover:shadow-md">
<img
className="cursor-pointer min-h-full w-auto min-w-full object-cover"
src={getResourceUrl(imageResourceList[0])}
onClick={() => handleImageClick(getResourceUrl(imageResourceList[0]))}
decoding="async"
loading="lazy"
/>
</div>
) : (
<div className={classNames("w-full mt-2 grid gap-2 grid-cols-2 sm:grid-cols-3")}>
{imageResourceList.map((resource) => {
const url = getResourceUrl(resource);
return (
<ImageListItem onClick={() => handleImageClick(url)} key={resource.id}>
<img className="shadow rounded" src={url} loading="lazy" />
</ImageListItem>
<SquareDiv
key={resource.id}
className="flex justify-center items-center shadow rounded overflow-hidden hide-scrollbar hover:shadow-md"
>
<img
className="cursor-pointer min-h-full w-auto min-w-full object-cover"
src={resource.externalLink ? url : url + "?thumbnail=1"}
onClick={() => handleImageClick(url)}
decoding="async"
loading="lazy"
/>
</SquareDiv>
);
})}
</ImageList>
</div>
)}
</div>
))}
<div className={`resource-wrapper ${className || ""}`}>
{videoResourceList.length > 0 && (