Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Refactor folder grid

Hakan Shehua8a7c78e93ef
diff --git a/desktop/src/renderer/components/folders/grids/grid-file.tsx b/desktop/src/renderer/components/folders/grids/grid-file.tsx
index 526f70a4..0c12f078 100644
--- a/desktop/src/renderer/components/folders/grids/grid-file.tsx
+++ b/desktop/src/renderer/components/folders/grids/grid-file.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import { FileNode } from '@/types/files';
import { FileThumbnail } from '@/renderer/components/files/file-thumbnail';
import { FileContextMenu } from '@/renderer/components/files/file-context-menu';
+import { GridItem } from './grid-item';
interface GridFileProps {
file: FileNode;
@@ -10,7 +11,7 @@ interface GridFileProps {
export const GridFile = ({ file }: GridFileProps) => {
return (
<FileContextMenu id={file.id}>
- <React.Fragment>
+ <GridItem id={file.id}>
<div className="flex w-full justify-center">
<FileThumbnail
id={file.id}
@@ -27,7 +28,7 @@ export const GridFile = ({ file }: GridFileProps) => {
>
{file.name}
</p>
- </React.Fragment>
+ </GridItem>
</FileContextMenu>
);
};
diff --git a/desktop/src/renderer/components/folders/grids/grid-item.tsx b/desktop/src/renderer/components/folders/grids/grid-item.tsx
index 62063f57..6bbf6e43 100644
--- a/desktop/src/renderer/components/folders/grids/grid-item.tsx
+++ b/desktop/src/renderer/components/folders/grids/grid-item.tsx
@@ -1,14 +1,13 @@
import React from 'react';
-import { FileNode } from '@/types/files';
import { cn } from '@/lib/utils';
import { useFolder } from '@/renderer/contexts/folder';
-import { GridFile } from '@/renderer/components/folders/grids/grid-file';
interface GridItemProps {
- file: FileNode;
+ id: string;
+ children: React.ReactNode;
}
-export const GridItem = ({ file }: GridItemProps) => {
+export const GridItem = ({ id, children }: GridItemProps) => {
const folder = useFolder();
const ref = React.useRef<HTMLDivElement>(null);
@@ -21,10 +20,10 @@ export const GridItem = ({ file }: GridItemProps) => {
'flex cursor-pointer select-none flex-col items-center gap-2 p-2',
selected ? 'bg-blue-100' : 'hover:bg-blue-50',
)}
- onClick={(event) => folder.onClick(event, file.id)}
- onDoubleClick={(event) => folder.onDoubleClick(event, file.id)}
+ onClick={(event) => folder.onClick(event, id)}
+ onDoubleClick={(event) => folder.onDoubleClick(event, id)}
>
- <GridFile file={file} />
+ {children}
</div>
);
};
diff --git a/desktop/src/renderer/components/folders/grids/grid-layout.tsx b/desktop/src/renderer/components/folders/grids/grid-layout.tsx
index 8b1bd673..08d50405 100644
--- a/desktop/src/renderer/components/folders/grids/grid-layout.tsx
+++ b/desktop/src/renderer/components/folders/grids/grid-layout.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { GridItem } from '@/renderer/components/folders/grids/grid-item';
import { useFolder } from '@/renderer/contexts/folder';
+import { GridFile } from '@/renderer/components/folders/grids/grid-file';
export const GridLayout = () => {
const folder = useFolder();
@@ -8,7 +8,7 @@ export const GridLayout = () => {
return (
<div className="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-8 2xl:grid-cols-10">
{folder.files.map((file) => (
- <GridItem key={file.id} file={file} />
+ <GridFile key={file.id} file={file} />
))}
</div>
);