Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

tmp add expand

johnnyfishc6cc432b92cd
diff --git a/src/pages/editor-page/canvas/table-node-field.tsx b/src/pages/editor-page/canvas/table-node-field.tsx
index dffa1165..9c12c61c 100644
--- a/src/pages/editor-page/canvas/table-node-field.tsx
+++ b/src/pages/editor-page/canvas/table-node-field.tsx
@@ -22,97 +22,95 @@ export interface TableNodeFieldProps {
highlighted: boolean;
}
-export const TableNodeField: React.FC<TableNodeFieldProps> = ({
- field,
- focused,
- tableNodeId,
- highlighted,
-}) => {
- const { removeField, relationships } = useChartDB();
- const updateNodeInternals = useUpdateNodeInternals();
- const connection = useConnection();
- const isTarget =
- connection.inProgress && connection.fromNode.id !== tableNodeId;
- const numberOfEdgesToField = relationships.filter(
- (relationship) =>
- relationship.targetTableId === tableNodeId &&
- relationship.targetFieldId === field.id
- ).length;
+export const TableNodeField: React.FC<TableNodeFieldProps> = React.memo(
+ ({ field, focused, tableNodeId, highlighted }) => {
+ const { removeField, relationships } = useChartDB();
+ const updateNodeInternals = useUpdateNodeInternals();
+ const connection = useConnection();
+ const isTarget =
+ connection.inProgress && connection.fromNode.id !== tableNodeId;
+ const numberOfEdgesToField = relationships.filter(
+ (relationship) =>
+ relationship.targetTableId === tableNodeId &&
+ relationship.targetFieldId === field.id
+ ).length;
- useEffect(() => {
- updateNodeInternals(tableNodeId);
- }, [tableNodeId, updateNodeInternals, numberOfEdgesToField]);
+ useEffect(() => {
+ updateNodeInternals(tableNodeId);
+ }, [tableNodeId, updateNodeInternals, numberOfEdgesToField]);
- return (
- <div
- className={`group relative flex h-8 items-center justify-between gap-1 border-t px-3 text-sm last:rounded-b-[6px] hover:bg-slate-100 dark:hover:bg-slate-800 ${highlighted ? 'bg-pink-100 dark:bg-pink-900' : ''} transition-colors`}
- >
- {!connection.inProgress && (
- <>
- <Handle
- id={`${RIGHT_HANDLE_ID_PREFIX}${field.id}`}
- className={`!h-4 !w-4 !border-2 !bg-pink-600 ${!focused ? '!invisible' : ''}`}
- position={Position.Right}
- type="source"
- />
- <Handle
- id={`${LEFT_HANDLE_ID_PREFIX}${field.id}`}
- className={`!h-4 !w-4 !border-2 !bg-pink-600 ${!focused ? '!invisible' : ''}`}
- position={Position.Left}
- type="source"
- />
- </>
- )}
- {(!connection.inProgress || isTarget) && (
- <>
- {Array.from(
- { length: numberOfEdgesToField },
- (_, index) => index
- ).map((index) => (
+ return (
+ <div
+ className={`group relative flex h-8 items-center justify-between gap-1 border-t px-3 text-sm last:rounded-b-[6px] hover:bg-slate-100 dark:hover:bg-slate-800 ${highlighted ? 'bg-pink-100 dark:bg-pink-900' : ''} transition-colors`}
+ >
+ {!connection.inProgress && (
+ <>
<Handle
- id={`${TARGET_ID_PREFIX}${index}_${field.id}`}
- key={`${TARGET_ID_PREFIX}${index}_${field.id}`}
- className={`!invisible`}
+ id={`${RIGHT_HANDLE_ID_PREFIX}${field.id}`}
+ className={`!h-4 !w-4 !border-2 !bg-pink-600 ${!focused ? '!invisible' : ''}`}
+ position={Position.Right}
+ type="source"
+ />
+ <Handle
+ id={`${LEFT_HANDLE_ID_PREFIX}${field.id}`}
+ className={`!h-4 !w-4 !border-2 !bg-pink-600 ${!focused ? '!invisible' : ''}`}
+ position={Position.Left}
+ type="source"
+ />
+ </>
+ )}
+ {(!connection.inProgress || isTarget) && (
+ <>
+ {Array.from(
+ { length: numberOfEdgesToField },
+ (_, index) => index
+ ).map((index) => (
+ <Handle
+ id={`${TARGET_ID_PREFIX}${index}_${field.id}`}
+ key={`${TARGET_ID_PREFIX}${index}_${field.id}`}
+ className={`!invisible`}
+ position={Position.Left}
+ type="target"
+ />
+ ))}
+ <Handle
+ id={`${TARGET_ID_PREFIX}${numberOfEdgesToField}_${field.id}`}
+ className={
+ isTarget
+ ? '!absolute !left-0 !top-0 !h-full !w-full !transform-none !rounded-none !border-none !opacity-0'
+ : `!invisible`
+ }
position={Position.Left}
type="target"
/>
- ))}
- <Handle
- id={`${TARGET_ID_PREFIX}${numberOfEdgesToField}_${field.id}`}
- className={
- isTarget
- ? '!absolute !left-0 !top-0 !h-full !w-full !transform-none !rounded-none !border-none !opacity-0'
- : `!invisible`
- }
- position={Position.Left}
- type="target"
- />
- </>
- )}
- <div className="block truncate text-left">{field.name}</div>
- <div className="flex max-w-[35%] justify-end gap-2 truncate hover:shrink-0">
- {field.primaryKey ? (
- <div className="text-muted-foreground group-hover:hidden">
- <KeyRound size={14} />
- </div>
- ) : null}
+ </>
+ )}
+ <div className="block truncate text-left">{field.name}</div>
+ <div className="flex max-w-[35%] justify-end gap-2 truncate hover:shrink-0">
+ {field.primaryKey ? (
+ <div className="text-muted-foreground group-hover:hidden">
+ <KeyRound size={14} />
+ </div>
+ ) : null}
- <div className="content-center truncate text-right text-xs text-muted-foreground group-hover:hidden">
- {field.type.name}
- </div>
- <div className="hidden flex-row group-hover:flex">
- <Button
- variant="ghost"
- className="size-6 p-0 hover:bg-primary-foreground"
- onClick={(e) => {
- e.stopPropagation();
- removeField(tableNodeId, field.id);
- }}
- >
- <Trash2 className="size-3.5 text-red-700" />
- </Button>
+ <div className="content-center truncate text-right text-xs text-muted-foreground group-hover:hidden">
+ {field.type.name}
+ </div>
+ <div className="hidden flex-row group-hover:flex">
+ <Button
+ variant="ghost"
+ className="size-6 p-0 hover:bg-primary-foreground"
+ onClick={(e) => {
+ e.stopPropagation();
+ removeField(tableNodeId, field.id);
+ }}
+ >
+ <Trash2 className="size-3.5 text-red-700" />
+ </Button>
+ </div>
</div>
</div>
- </div>
- );
-};
+ );
+ }
+);
+TableNodeField.displayName = 'TableNodeField';
diff --git a/src/pages/editor-page/canvas/table-node.tsx b/src/pages/editor-page/canvas/table-node.tsx
index a808dc8e..c50347d6 100644
--- a/src/pages/editor-page/canvas/table-node.tsx
+++ b/src/pages/editor-page/canvas/table-node.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useState, useMemo } from 'react';
import { NodeProps, Node, NodeResizer, useStore } from '@xyflow/react';
import { Button } from '@/components/button/button';
import {
@@ -34,6 +34,7 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
const { updateTable } = useChartDB();
const edges = useStore((store) => store.edges) as TableEdgeType[];
const { openTableFromSidebar, selectSidebarSection } = useLayout();
+ const [expanded, setExpanded] = useState(false);
const selectedEdges = edges.filter(
(edge) => (edge.source === id || edge.target === id) && edge.selected
@@ -61,6 +62,27 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
});
}, [table.id, updateTable]);
+ const toggleExpand = () => {
+ setExpanded(!expanded);
+ };
+
+ const visibleFields = useMemo(() => {
+ if (expanded) {
+ return table.fields;
+ }
+
+ const pkFields = table.fields.filter((field) => field.primaryKey);
+ const nonPkFields = table.fields.filter((field) => !field.primaryKey);
+
+ const visiblePkFields = pkFields.slice(0, 10);
+ const remainingSlots = 10 - visiblePkFields.length;
+ const visibleNonPkFields = nonPkFields.slice(0, remainingSlots);
+
+ return [...visiblePkFields, ...visibleNonPkFields].sort(
+ (a, b) => table.fields.indexOf(a) - table.fields.indexOf(b)
+ );
+ }, [expanded, table.fields]);
+
return (
<div
className={`flex w-full flex-col border-2 bg-slate-50 dark:bg-slate-950 ${selected ? 'border-pink-600' : 'border-slate-500 dark:border-slate-700'} rounded-lg shadow-sm`}
@@ -114,7 +136,7 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
</Button>
</div>
</div>
- {table.fields.map((field) => (
+ {visibleFields.map((field) => (
<TableNodeField
key={field.id}
focused={focused}
@@ -128,6 +150,14 @@ export const TableNode: React.FC<NodeProps<TableNodeType>> = ({
)}
/>
))}
+ {table.fields.length > 10 && (
+ <div
+ className="flex cursor-pointer items-center justify-center py-2 hover:bg-slate-100 dark:hover:bg-slate-800"
+ onClick={toggleExpand}
+ >
+ {expanded ? 'Show Less' : 'Show More'}
+ </div>
+ )}
</div>
);
};