Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

fixed other views alongside card view

daniel31x13bc04ea0fe8e2
diff --git a/components/LinkViews/Links.tsx b/components/LinkViews/Links.tsx
index 11720dca..511c1d2c 100644
--- a/components/LinkViews/Links.tsx
+++ b/components/LinkViews/Links.tsx
@@ -61,7 +61,7 @@ export function CardView({
);
}
-export function ListView({
+export function MasonryView({
links,
editMode,
isLoading,
@@ -76,11 +76,27 @@ export function ListView({
hasNextPage?: boolean;
placeHolderRef?: any;
}) {
+ const fullConfig = resolveConfig(tailwindConfig as any);
+
+ const breakpointColumnsObj = useMemo(() => {
+ return {
+ default: 5,
+ 1900: 4,
+ 1500: 3,
+ 880: 2,
+ 550: 1,
+ };
+ }, []);
+
return (
- <div className="flex gap-1 flex-col">
+ <Masonry
+ breakpointCols={breakpointColumnsObj}
+ columnClassName="flex flex-col gap-5 !w-full"
+ className="grid min-[1901px]:grid-cols-5 min-[1501px]:grid-cols-4 min-[881px]:grid-cols-3 min-[551px]:grid-cols-2 grid-cols-1 gap-5 pb-5"
+ >
{links?.map((e, i) => {
return (
- <LinkList
+ <LinkMasonry
key={i}
link={e}
count={i}
@@ -89,11 +105,28 @@ export function ListView({
/>
);
})}
- </div>
+
+ {(hasNextPage || isLoading) &&
+ placeholders?.map((e, i) => {
+ return (
+ <div
+ className="flex flex-col gap-4"
+ ref={e === 1 ? placeHolderRef : undefined}
+ key={i}
+ >
+ <div className="skeleton h-40 w-full"></div>
+ <div className="skeleton h-3 w-2/3"></div>
+ <div className="skeleton h-3 w-full"></div>
+ <div className="skeleton h-3 w-full"></div>
+ <div className="skeleton h-3 w-1/3"></div>
+ </div>
+ );
+ })}
+ </Masonry>
);
}
-export function MasonryView({
+export function ListView({
links,
editMode,
isLoading,
@@ -108,27 +141,11 @@ export function MasonryView({
hasNextPage?: boolean;
placeHolderRef?: any;
}) {
- const fullConfig = resolveConfig(tailwindConfig as any);
-
- const breakpointColumnsObj = useMemo(() => {
- return {
- default: 5,
- 1900: 4,
- 1500: 3,
- 880: 2,
- 550: 1,
- };
- }, []);
-
return (
- <Masonry
- breakpointCols={breakpointColumnsObj}
- columnClassName="flex flex-col gap-5 !w-full"
- className="grid min-[1901px]:grid-cols-5 min-[1501px]:grid-cols-4 min-[881px]:grid-cols-3 min-[551px]:grid-cols-2 grid-cols-1 gap-5 pb-5"
- >
+ <div className="flex gap-1 flex-col">
{links?.map((e, i) => {
return (
- <LinkMasonry
+ <LinkList
key={i}
link={e}
count={i}
@@ -137,7 +154,25 @@ export function MasonryView({
/>
);
})}
- </Masonry>
+
+ {(hasNextPage || isLoading) &&
+ placeholders?.map((e, i) => {
+ return (
+ <div
+ ref={e === 1 ? placeHolderRef : undefined}
+ key={i}
+ className="flex gap-4 p-4"
+ >
+ <div className="skeleton h-16 w-16"></div>
+ <div className="flex flex-col gap-4 w-full">
+ <div className="skeleton h-3 w-2/3"></div>
+ <div className="skeleton h-3 w-full"></div>
+ <div className="skeleton h-3 w-1/3"></div>
+ </div>
+ </div>
+ );
+ })}
+ </div>
);
}
@@ -168,6 +203,9 @@ export default function Links({
links={links}
editMode={editMode}
isLoading={useData?.isLoading}
+ placeholders={placeholderCountToArray(placeholderCount)}
+ hasNextPage={useData?.hasNextPage}
+ placeHolderRef={ref}
/>
);
} else if (layout === ViewMode.Masonry) {
@@ -176,6 +214,9 @@ export default function Links({
links={links}
editMode={editMode}
isLoading={useData?.isLoading}
+ placeholders={placeholderCountToArray(placeholderCount)}
+ hasNextPage={useData?.hasNextPage}
+ placeHolderRef={ref}
/>
);
} else {