Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

Fix: hydration and key warning

Ashish Viradiya35f14a254086
diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsx
index 6e65374b..ecd3354c 100644
--- a/components/datarooms/dataroom-items-list.tsx
+++ b/components/datarooms/dataroom-items-list.tsx
@@ -1,4 +1,4 @@
-import { memo, useCallback, useMemo, useState } from "react";
+import { Fragment, memo, useCallback, useMemo, useState } from "react";
import { TeamContextType } from "@/context/team-context";
import {
@@ -356,7 +356,7 @@ export function DataroomItemsList({
if (isMobile) {
return (
- <>
+ <Fragment key={itemId}>
{item.itemType === "folder" ? (
<FolderCard
key={itemId}
@@ -374,12 +374,12 @@ export function DataroomItemsList({
dataroomId={dataroomId}
/>
)}
- </>
+ </Fragment>
);
}
return (
- <>
+ <Fragment key={itemId}>
{item.itemType === "folder" ? (
<DroppableFolder
key={itemId}
@@ -427,7 +427,7 @@ export function DataroomItemsList({
/>
</DraggableItem>
)}
- </>
+ </Fragment>
);
};
const resetSelection = () => {
@@ -590,7 +590,9 @@ export function DataroomItemsList({
{isMobile ? (
<div>
<ul role="list" className="space-y-4">
- {mixedItems.map(renderItem)}
+ {mixedItems.map((item) => (
+ <li key={`${item.itemType}-${item.id}`}>{renderItem(item)}</li>
+ ))}
</ul>
<Portal containerId={"documents-header-count"}>
<HeaderContent />
@@ -616,7 +618,11 @@ export function DataroomItemsList({
}}
>
<ul role="list" className="space-y-4">
- {mixedItems.map(renderItem)}
+ {mixedItems.map((item) => (
+ <li key={`${item.itemType}-${item.id}`}>
+ {renderItem(item)}
+ </li>
+ ))}
</ul>
<Portal>
diff --git a/components/view/viewer/dataroom-viewer.tsx b/components/view/viewer/dataroom-viewer.tsx
index 9aa85fbd..681ee6b1 100644
--- a/components/view/viewer/dataroom-viewer.tsx
+++ b/components/view/viewer/dataroom-viewer.tsx
@@ -338,7 +338,11 @@ export default function DataroomViewer({
</div>
</div>
<ul role="list" className="-mx-4 space-y-4 overflow-auto p-4">
- {mixedItems.map(renderItem)}
+ {mixedItems.map((item) => (
+ <li key={`${item.id}}`}>
+ {renderItem(item)}
+ </li>
+ ))}
</ul>
</div>
<ScrollBar orientation="vertical" />
diff --git a/lib/swr/use-domains.ts b/lib/swr/use-domains.ts
index a29cb9ba..9ef00004 100644
--- a/lib/swr/use-domains.ts
+++ b/lib/swr/use-domains.ts
@@ -8,7 +8,7 @@ export function useDomains() {
const teamInfo = useTeam();
const { data: domains, error } = useSWR<Domain[]>(
- `/api/teams/${teamInfo?.currentTeam?.id}/domains`,
+ teamInfo?.currentTeam?.id ? `/api/teams/${teamInfo.currentTeam.id}/domains` : null,
fetcher,
{
dedupingInterval: 60000,