Skip to content

Free, simple, and intuitive online database diagram editor and SQL generator.

Optimize canvas performance (#1172)

1ilit7683bdf90a8d
diff --git a/src/components/EditorCanvas/Area.jsx b/src/components/EditorCanvas/Area.jsx
index da0381b0..a91576e8 100644
--- a/src/components/EditorCanvas/Area.jsx
+++ b/src/components/EditorCanvas/Area.jsx
@@ -1,4 +1,4 @@
-import { useMemo, useRef, useState } from "react";
+import { memo, useMemo, useRef, useState } from "react";
import {
Button,
ButtonGroup,
@@ -25,7 +25,7 @@ import {
import { useTranslation } from "react-i18next";
import { useHover } from "usehooks-ts";
-export default function Area({
+export default memo(function Area({
data,
onPointerDown,
setResize,
@@ -159,7 +159,7 @@ export default function Area({
y={data.y}
width={data.width > 0 ? data.width : 0}
height={data.height > 0 ? data.height : 0}
- onPointerDown={onPointerDown}
+ onPointerDown={() => onPointerDown(data, ObjectType.AREA)}
>
<div
className={`w-full h-full p-2 rounded cursor-move border-2 ${
@@ -262,7 +262,7 @@ export default function Area({
)}
</g>
);
-}
+});
function EditPopoverContent({ data }) {
const [editField, setEditField] = useState({});
diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsx
index b489dc9e..ab11b2e9 100644
--- a/src/components/EditorCanvas/Canvas.jsx
+++ b/src/components/EditorCanvas/Canvas.jsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Slot } from "../../context/ExtensionsContext";
import {
Action,
@@ -47,6 +47,12 @@ import { getRectFromEndpoints, isInsideRect } from "../../utils/rect";
import { State, noteWidth } from "../../data/constants";
import { nanoid } from "nanoid";
+const notDragging = {
+ id: -1,
+ type: ObjectType.NONE,
+ grabOffset: { x: 0, y: 0 },
+};
+
export default function Canvas() {
const { t } = useTranslation();
@@ -73,11 +79,6 @@ export default function Canvas() {
bulkSelectedElements,
setBulkSelectedElements,
} = useSelect();
- const notDragging = {
- id: -1,
- type: ObjectType.NONE,
- grabOffset: { x: 0, y: 0 },
- };
const [dragging, setDragging] = useState(notDragging);
const [linking, setLinking] = useState(false);
const [linkingLine, setLinkingLine] = useState({
@@ -142,9 +143,27 @@ export default function Canvas() {
ctrlKey: false,
metaKey: false,
});
- // this is used to store the element that is clicked on
- // at the moment, and shouldn't be a part of the state
- let elementPointerDown = null;
+ const elementPointerDownRef = useRef(null);
+ const handleElementPointerDown = useCallback((element, type) => {
+ elementPointerDownRef.current = { element, type };
+ }, []);
+
+ const tablesById = useMemo(
+ () => new Map(tables.map((table) => [table.id, table])),
+ [tables],
+ );
+
+ const selectedTableIds = useMemo(() => {
+ const ids = new Set(
+ bulkSelectedElements
+ .filter((el) => el.type === ObjectType.TABLE)
+ .map((el) => el.id),
+ );
+ if (selectedElement.element === ObjectType.TABLE) {
+ ids.add(selectedElement.id);
+ }
+ return ids;
+ }, [bulkSelectedElements, selectedElement.element, selectedElement.id]);
const isSameElement = (el1, el2) => {
return el1.id === el2.id && el1.type === el2.type;
@@ -479,6 +498,9 @@ export default function Canvas() {
* @param {PointerEvent} e
*/
const handlePointerDown = (e) => {
+ const elementPointerDown = elementPointerDownRef.current;
+ elementPointerDownRef.current = null;
+
if (!e.isPrimary) return;
// don't pan if the sidesheet for editing a table is open
@@ -636,11 +658,11 @@ export default function Canvas() {
});
};
- const handleGripField = () => {
+ const handleGripField = useCallback(() => {
setPanning((old) => ({ ...old, isPanning: false }));
setDragging(notDragging);
setLinking(true);
- };
+ }, []);
const getCardinality = (startField, endField) => {
const startIsUnique = startField.unique || startField.primary;
@@ -817,42 +839,37 @@ export default function Canvas() {
data={a}
setResize={setAreaResize}
setInitDimensions={setAreaInitDimensions}
- onPointerDown={() => {
- elementPointerDown = {
- element: a,
- type: ObjectType.AREA,
- };
- }}
+ onPointerDown={handleElementPointerDown}
/>
))}
{relationships.map((e) => (
- <Relationship key={e.id} data={e} />
+ <Relationship
+ key={e.id}
+ data={e}
+ startTable={tablesById.get(e.startTableId)}
+ endTable={tablesById.get(e.endTableId)}
+ relationships={relationships}
+ />
))}
{tables.map((table) => (
<Table
key={table.id}
tableData={table}
+ isSelected={selectedTableIds.has(table.id)}
+ zoom={transform.zoom}
+ database={database}
+ relationships={relationships}
setHoveredTable={setHoveredTable}
handleGripField={handleGripField}
setLinkingLine={setLinkingLine}
- onPointerDown={() => {
- elementPointerDown = {
- element: table,
- type: ObjectType.TABLE,
- };
- }}
+ onPointerDown={handleElementPointerDown}
/>
))}
{views.map((view) => (
<View
key={view.id}
viewData={view}
- onPointerDown={() => {
- elementPointerDown = {
- element: view,
- type: ObjectType.VIEW,
- };
- }}
+ onPointerDown={handleElementPointerDown}
/>
))}
{linking && (
@@ -868,12 +885,7 @@ export default function Canvas() {
<Note
key={n.id}
data={n}
- onPointerDown={() => {
- elementPointerDown = {
- element: n,
- type: ObjectType.NOTE,
- };
- }}
+ onPointerDown={handleElementPointerDown}
/>
))}
{bulkSelectRect.show && (
diff --git a/src/components/EditorCanvas/Note.jsx b/src/components/EditorCanvas/Note.jsx
index 2ae9a04a..d5f71753 100644
--- a/src/components/EditorCanvas/Note.jsx
+++ b/src/components/EditorCanvas/Note.jsx
@@ -1,4 +1,4 @@
-import { useMemo, useState, useRef, useEffect } from "react";
+import { memo, useMemo, useState, useRef, useEffect } from "react";
import { Action, ObjectType, Tab, State } from "../../data/constants";
import {
Input,
@@ -26,7 +26,7 @@ import {
import { useTranslation } from "react-i18next";
import { noteWidth, noteRadius, noteFold } from "../../data/constants";
-export default function Note({ data, onPointerDown }) {
+export default memo(function Note({ data, onPointerDown }) {
const [editField, setEditField] = useState({});
const [hovered, setHovered] = useState(false);
const [resizing, setResizing] = useState(false);
@@ -395,7 +395,7 @@ export default function Note({ data, onPointerDown }) {
y={data.y}
width={width}
height={data.height}
- onPointerDown={onPointerDown}
+ onPointerDown={() => onPointerDown(data, ObjectType.NOTE)}
>
<div className="text-gray-900 select-none w-full h-full cursor-move px-3 py-2">
<div className="flex justify-between gap-1 w-full">
@@ -538,4 +538,4 @@ export default function Note({ data, onPointerDown }) {
</foreignObject>
</g>
);
-}
+});
diff --git a/src/components/EditorCanvas/Relationship.jsx b/src/components/EditorCanvas/Relationship.jsx
index 0ba53028..448a6896 100644
--- a/src/components/EditorCanvas/Relationship.jsx
+++ b/src/components/EditorCanvas/Relationship.jsx
@@ -1,7 +1,15 @@
-import { useMemo, useRef, useState, useEffect } from "react";
+import {
+ memo,
+ useCallback,
+ useEffect,
+ useLayoutEffect,
+ useMemo,
+ useRef,
+ useState,
+} from "react";
import { Cardinality, ObjectType, Tab } from "../../data/constants";
import { calcPath, calcCompositePath } from "../../utils/calcPath";
-import { useDiagram, useSettings, useLayout, useSelect } from "../../hooks";
+import { useSettings, useLayout, useSelect } from "../../hooks";
import { useTranslation } from "react-i18next";
import { SideSheet } from "@douyinfe/semi-ui";
import RelationshipInfo from "../EditorSidePanel/RelationshipsTab/RelationshipInfo";
@@ -13,18 +21,78 @@ import {
} from "../../utils/utils";
const labelFontSize = 16;
+const cardinalityOffset = 28;
-export default function Relationship({ data }) {
- const { settings } = useSettings();
- const { tables, relationships } = useDiagram();
+export default memo(function Relationship({
+ data,
+ startTable,
+ endTable,
+ relationships,
+}) {
const { layout } = useLayout();
const { selectedElement, setSelectedElement } = useSelect();
const { t } = useTranslation();
- const pathValues = useMemo(() => {
- const startTable = tables.find((t) => t.id === data.startTableId);
- const endTable = tables.find((t) => t.id === data.endTableId);
+ const edit = useCallback(() => {
+ setSelectedElement((prev) => ({
+ ...prev,
+ ...(layout.sidebar && { currentTab: Tab.RELATIONSHIPS }),
+ element: ObjectType.RELATIONSHIP,
+ id: data.id,
+ open: true,
+ }));
+ if (layout.sidebar) {
+ document
+ .getElementById(`scroll_ref_${data.id}`)
+ ?.scrollIntoView({ behavior: "smooth" });
+ }
+ }, [data.id, layout.sidebar, setSelectedElement]);
+
+ return (
+ <>
+ <RelationshipPath
+ data={data}
+ startTable={startTable}
+ endTable={endTable}
+ relationships={relationships}
+ onEdit={edit}
+ />
+ <SideSheet
+ title={t("edit")}
+ size="small"
+ visible={
+ selectedElement.element === ObjectType.RELATIONSHIP &&
+ selectedElement.id === data.id &&
+ selectedElement.open &&
+ !layout.sidebar
+ }
+ onCancel={() => {
+ setSelectedElement((prev) => ({
+ ...prev,
+ open: false,
+ }));
+ }}
+ style={{ paddingBottom: "16px" }}
+ >
+ <div className="sidesheet-theme">
+ <RelationshipInfo data={data} />
+ </div>
+ </SideSheet>
+ </>
+ );
+});
+const RelationshipPath = memo(function RelationshipPath({
+ data,
+ startTable,
+ endTable,
+ relationships,
+ onEdit,
+}) {
+ const { settings } = useSettings();
+ const { t } = useTranslation();
+
+ const pathValues = useMemo(() => {
if (!startTable || !endTable || startTable.hidden || endTable.hidden)
return null;
@@ -65,7 +133,7 @@ export default function Relationship({ data }) {
fields: endFields,
},
};
- }, [tables, relationships, data]);
+ }, [startTable, endTable, relationships, data]);
const isComposite = (pathValues?.startFieldIndices?.length ?? 0) > 1;
@@ -83,9 +151,49 @@ export default function Relationship({ data }) {
);
}, [pathValues, isComposite, settings.showComments]);
+ const d = useMemo(() => {
+ if (!pathValues) return null;
+ if (composite) return composite.path;
+ return calcPath(pathValues, 1, settings.showComments);
+ }, [pathValues, composite, settings.showComments]);
+
const pathRef = useRef();
const labelRef = useRef();
const [hovered, setHovered] = useState(false);
+ const [anchors, setAnchors] = useState(null);
+
+ useLayoutEffect(() => {
+ if (!d || !pathRef.current) {
+ setAnchors(null);
+ return;
+ }
+
+ const labelBox = labelRef.current?.getBBox();
+ const labelWidth = labelBox?.width ?? 0;
+ const labelHeight = labelBox?.height ?? 0;
+
+ let labelPoint, startPoint, endPoint;
+ if (composite) {
+ labelPoint = composite.labelPoint;
+ startPoint = composite.startCardinality;
+ endPoint = composite.endCardinality;
+ } else {
+ const path = pathRef.current;
+ const pathLength = path.getTotalLength();
+ labelPoint = path.getPointAtLength(pathLength / 2);
+ startPoint = path.getPointAtLength(cardinalityOffset);
+ endPoint = path.getPointAtLength(pathLength - cardinalityOffset);
+ }
+
+ setAnchors({
+ label: {
+ x: labelPoint.x - labelWidth / 2,
+ y: labelPoint.y + labelHeight / 2,
+ },
+ start: { x: startPoint.x, y: startPoint.y },
+ end: { x: endPoint.x, y: endPoint.y },
+ });
+ }, [d, composite, data.name, settings.showRelationshipLabels]);
let cardinalityStart = "1";
let cardinalityEnd = "1";
@@ -111,153 +219,63 @@ export default function Relationship({ data }) {
break;
}
- let cardinalityStartX = 0;
- let cardinalityEndX = 0;
- let cardinalityStartY = 0;
- let cardinalityEndY = 0;
- let labelX = 0;
- let labelY = 0;
-
- let labelWidth = labelRef.current?.getBBox().width ?? 0;
- let labelHeight = labelRef.current?.getBBox().height ?? 0;
-
- const cardinalityOffset = 28;
-
- if (composite) {
- labelX = composite.labelPoint.x - (labelWidth ?? 0) / 2;
- labelY = composite.labelPoint.y + (labelHeight ?? 0) / 2;
- cardinalityStartX = composite.startCardinality.x;
- cardinalityStartY = composite.startCardinality.y;
- cardinalityEndX = composite.endCardinality.x;
- cardinalityEndY = composite.endCardinality.y;
- } else if (pathRef.current) {
- const pathLength = pathRef.current.getTotalLength();
-
- const labelPoint = pathRef.current.getPointAtLength(pathLength / 2);
- labelX = labelPoint.x - (labelWidth ?? 0) / 2;
- labelY = labelPoint.y + (labelHeight ?? 0) / 2;
-
- const point1 = pathRef.current.getPointAtLength(cardinalityOffset);
- cardinalityStartX = point1.x;
- cardinalityStartY = point1.y;
- const point2 = pathRef.current.getPointAtLength(
- pathLength - cardinalityOffset,
- );
- cardinalityEndX = point2.x;
- cardinalityEndY = point2.y;
- }
-
- const edit = () => {
- if (!layout.sidebar) {
- setSelectedElement((prev) => ({
- ...prev,
- element: ObjectType.RELATIONSHIP,
- id: data.id,
- open: true,
- }));
- } else {
- setSelectedElement((prev) => ({
- ...prev,
- currentTab: Tab.RELATIONSHIPS,
- element: ObjectType.RELATIONSHIP,
- id: data.id,
- open: true,
- }));
- if (selectedElement.currentTab !== Tab.RELATIONSHIPS) return;
- document
- .getElementById(`scroll_ref_${data.id}`)
- .scrollIntoView({ behavior: "smooth" });
- }
- };
-
- if (!pathValues) return null;
+ if (!d) return null;
return (
- <>
- <g
- className="select-none group"
- onDoubleClick={edit}
- onPointerEnter={() => setHovered(true)}
- onPointerLeave={() => setHovered(false)}
- >
- {/* invisible wider path for better hover ux */}
- <path
- d={
- composite
- ? composite.path
- : calcPath(pathValues, 1, settings.showComments)
- }
- fill="none"
- stroke="transparent"
- strokeWidth={12}
- cursor="pointer"
- />
- <path
- ref={pathRef}
- d={
- composite
- ? composite.path
- : calcPath(pathValues, 1, settings.showComments)
- }
- className="relationship-path"
- style={{ stroke: hovered ? undefined : data.color }}
- fill="none"
- cursor="pointer"
- />
- {settings.showRelationshipLabels && (
- <text
- x={labelX}
- y={labelY}
- fill={data.color ?? (settings.mode === "dark" ? "lightgrey" : "#333")}
- fontSize={labelFontSize}
- fontWeight={500}
- ref={labelRef}
- className="group-hover:fill-sky-600"
- >
- {data.name}
- </text>
- )}
- {(composite || pathRef.current) && settings.showCardinality && (
- <>
- <CardinalityLabel
- x={cardinalityStartX}
- y={cardinalityStartY}
- text={cardinalityStart}
- color={data.color}
- />
- <CardinalityLabel
- x={cardinalityEndX}
- y={cardinalityEndY}
- text={cardinalityEnd}
- color={data.color}
- />
- </>
- )}
- </g>
- <SideSheet
- title={t("edit")}
- size="small"
- visible={
- selectedElement.element === ObjectType.RELATIONSHIP &&
- selectedElement.id === data.id &&
- selectedElement.open &&
- !layout.sidebar
- }
- onCancel={() => {
- setSelectedElement((prev) => ({
- ...prev,
- open: false,
- }));
- }}
- style={{ paddingBottom: "16px" }}
- >
- <div className="sidesheet-theme">
- <RelationshipInfo data={data} />
- </div>
- </SideSheet>
- </>
+ <g
+ className="select-none group"
+ onDoubleClick={onEdit}
+ onPointerEnter={() => setHovered(true)}
+ onPointerLeave={() => setHovered(false)}
+ >
+ {/* invisible wider path for better hover ux */}
+ <path
+ d={d}
+ fill="none"
+ stroke="transparent"
+ strokeWidth={12}
+ cursor="pointer"
+ />
+ <path
+ ref={pathRef}
+ d={d}
+ className="relationship-path"
+ style={{ stroke: hovered ? undefined : data.color }}
+ fill="none"
+ cursor="pointer"
+ />
+ {settings.showRelationshipLabels && (
+ <text
+ x={anchors?.label.x ?? 0}
+ y={anchors?.label.y ?? 0}
+ fill={data.color ?? (settings.mode === "dark" ? "lightgrey" : "#333")}
+ fontSize={labelFontSize}
+ fontWeight={500}
+ ref={labelRef}
+ className="group-hover:fill-sky-600"
+ >
+ {data.name}
+ </text>
+ )}
+ {anchors && settings.showCardinality && (
+ <>
+ <CardinalityLabel
+ x={anchors.start.x}
+ y={anchors.start.y}
+ text={cardinalityStart}
+ color={data.color}
+ />
+ <CardinalityLabel
+ x={anchors.end.x}
+ y={anchors.end.y}
+ text={cardinalityEnd}
+ color={data.color}
+ />
+ </>
+ )}
+ </g>
);
-}
+});
function CardinalityLabel({ x, y, text, color, r = 12, padding = 14 }) {
const [textWidth, setTextWidth] = useState(0);
diff --git a/src/components/EditorCanvas/Table.jsx b/src/components/EditorCanvas/Table.jsx
index 7f34a7bc..c556f9b1 100644
--- a/src/components/EditorCanvas/Table.jsx
+++ b/src/components/EditorCanvas/Table.jsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import { memo, useContext, useMemo, useState } from "react";
import {
Action,
Tab,
@@ -33,8 +33,9 @@ import {
useDiagram,
useSelect,
useUndoRedo,
- useTransform,
} from "../../hooks";
+import { DiagramActionsContext } from "../../context/DiagramContext";
+import { SelectActionsContext } from "../../context/SelectContext";
import TableInfo from "../EditorSidePanel/TablesTab/TableInfo";
import { useTranslation } from "react-i18next";
import { resolveType } from "../../utils/customTypes";
@@ -51,8 +52,12 @@ import {
} from "../../utils/utils";
import ResizeHandles from "./ResizeHandles";
-export default function Table({
+export default memo(function Table({
tableData,
+ isSelected,
+ zoom,
+ database,
+ relationships,
onPointerDown,
setHoveredTable,
handleGripField,
@@ -62,25 +67,14 @@ export default function Table({
const [hovered, setHovered] = useState(false);
const [resizeEngaged, setResizeEngaged] = useState(false);
const { layout } = useLayout();
- const {
- database,
- tables,
- relationships,
- addTable,
- deleteTable,
- deleteField,
- updateTable,
- } = useDiagram();
+ const { addTable, deleteTable, deleteField, updateTable } = useContext(
+ DiagramActionsContext,
+ );
const { setUndoStack, setRedoStack } = useUndoRedo();
const { settings } = useSettings();
- const { transform } = useTransform();
const { t } = useTranslation();
- const {
- selectedElement,
- setSelectedElement,
- bulkSelectedElements,
- setBulkSelectedElements,
- } = useSelect();
+ const { setSelectedElement, setBulkSelectedElements } =
+ useContext(SelectActionsContext);
const borderColor = useMemo(
() => (settings.mode === "light" ? "border-zinc-300" : "border-zinc-600"),
@@ -105,16 +99,6 @@ export default function Table({
[tableData, relationships],
);
- const isSelected = useMemo(() => {
- return (
- (selectedElement.id == tableData.id &&
- selectedElement.element === ObjectType.TABLE) ||
- bulkSelectedElements.some(
- (e) => e.type === ObjectType.TABLE && e.id === tableData.id,
- )
- );
- }, [selectedElement, tableData, bulkSelectedElements]);
-
const toggleTableCollapse = (e) => {
e.stopPropagation();
if (layout.readOnly) return;
@@ -144,12 +128,12 @@ export default function Table({
updateTable(tableData.id, { locked: locking });
const lockTable = () => {
- setSelectedElement({
- ...selectedElement,
+ setSelectedElement((prev) => ({
+ ...prev,
element: ObjectType.NONE,
id: -1,
open: false,
- });
+ }));
setBulkSelectedElements((prev) =>
prev.filter(
(el) => el.id !== tableData.id || el.type !== ObjectType.TABLE,
@@ -199,48 +183,20 @@ export default function Table({
};
const openEditor = () => {
- if (!layout.sidebar) {
- setSelectedElement((prev) => ({
- ...prev,
- element: ObjectType.TABLE,
- id: tableData.id,
- open: true,
- }));
- } else {
- setSelectedElement((prev) => ({
- ...prev,
- currentTab: Tab.TABLES,
- element: ObjectType.TABLE,
- id: tableData.id,
- open: true,
- }));
- if (selectedElement.currentTab !== Tab.TABLES) return;
+ setSelectedElement((prev) => ({
+ ...prev,
+ ...(layout.sidebar && { currentTab: Tab.TABLES }),
+ element: ObjectType.TABLE,
+ id: tableData.id,
+ open: true,
+ }));
+ if (layout.sidebar) {
document
.getElementById(`scroll_table_${tableData.id}`)
- .scrollIntoView({ behavior: "smooth" });
+ ?.scrollIntoView({ behavior: "smooth" });
}
};
- const getFieldReference = (fieldData) => {
- let matchedEndFieldId = null;
- const rel = relationships.find((r) => {
- if (r.startTableId !== tableData.id) return false;
- const pair = getRelationshipFields(r).find(
- (p) => p.startFieldId === fieldData.id,
- );
- if (!pair) return false;
- matchedEndFieldId = pair.endFieldId;
- return true;
- });
- if (!rel) return null;
-
- const refTable = tables.find((tbl) => tbl.id === rel.endTableId);
- const refField = refTable?.fields.find((f) => f.id === matchedEndFieldId);
- if (!refTable || !refField) return null;
-
- return { tableName: refTable.name, fieldName: refField.name };
- };
-
const resizeTable = ({ width: nextWidth, x: nextX }) => {
updateTable(
tableData.id,
@@ -292,7 +248,7 @@ export default function Table({
width={width}
height={height}
className="group drop-shadow-lg rounded-md cursor-move"
- onPointerDown={onPointerDown}
+ onPointerDown={() => onPointerDown(tableData, ObjectType.TABLE)}
onPointerEnter={(e) => e.isPrimary && setHovered(true)}
onPointerLeave={(e) => e.isPrimary && setHovered(false)}
>
@@ -340,7 +296,9 @@ export default function Table({
<Button
size="small"
type="tertiary"
- title={tableData.locked ? t("unlock_table") : t("lock_table")}
+ title={
+ tableData.locked ? t("unlock_table") : t("lock_table")
+ }
icon={
tableData.locked ? (
<IconLock size="small" />
@@ -437,76 +395,15 @@ export default function Table({
</div>
{visibleFieldEntries.map(({ field: e }, i) => {
- const resolved = resolveType(database, e.type);
- const reference = getFieldReference(e);
return settings.showFieldSummary ? (
<Popover
key={e.id ?? i}
content={
- <div className="popover-theme">
- <div
- className="flex justify-between items-center pb-2"
- style={{ direction: "ltr" }}
- >
- <p className="me-4 font-bold">{e.name}</p>
- <p
- className={
- "ms-4 font-mono " +
- (resolved.isCustom ? "" : resolved.color)
- }
- style={
- resolved.isCustom ? { color: resolved.color } : {}
- }
- >
- {e.type +
- ((resolved.isSized || resolved.hasPrecision) &&
- e.size &&
- e.size !== ""
- ? "(" + e.size + ")"
- : "")}
- </p>
- </div>
- <hr />
- {e.primary && (
- <Tag color="blue" className="me-2 my-2">
- {t("primary_key")}
- </Tag>
- )}
- {e.unique && (
- <Tag color="amber" className="me-2 my-2">
- {t("unique")}
- </Tag>
- )}
- {e.notNull && (
- <Tag color="purple" className="me-2 my-2">
- {t("not_null")}
- </Tag>
- )}
- {e.increment && (
- <Tag color="green" className="me-2 my-2">
- {t("autoincrement")}
- </Tag>
- )}
- {reference && (
- <Tag color="light-blue" className="me-2 my-2">
- {t("foreign_key")}
- </Tag>
- )}
- {reference && (
- <p>
- <strong>{t("references")}: </strong>
- {reference.tableName}({reference.fieldName})
- </p>
- )}
- <p>
- <strong>{t("default_value")}: </strong>
- {e.default === "" ? t("not_set") : e.default}
- </p>
- <p className="max-w-80">
- <strong>{t("comment")}: </strong>
- {e.comment === "" ? t("not_set") : e.comment}
- </p>
- </div>
+ <FieldSummary
+ field={e}
+ tableId={tableData.id}
+ database={database}
+ />
}
position="right"
showArrow
@@ -530,34 +427,14 @@ export default function Table({
y={tableData.y}
width={width}
height={height}
- zoom={transform.zoom}
+ zoom={zoom}
visible={hovered}
onResize={resizeTable}
onResizeEnd={commitResize}
onEngagedChange={setResizeEngaged}
/>
)}
- <SideSheet
- title={t("edit")}
- size="small"
- visible={
- selectedElement.element === ObjectType.TABLE &&
- selectedElement.id === tableData.id &&
- selectedElement.open &&
- !layout.sidebar
- }
- onCancel={() =>
- setSelectedElement((prev) => ({
- ...prev,
- open: !prev.open,
- }))
- }
- style={{ paddingBottom: "16px" }}
- >
- <div className="sidesheet-theme">
- <TableInfo data={tableData} />
- </div>
- </SideSheet>
+ <TableEditSheet tableData={tableData} />
</>
);
@@ -687,4 +564,119 @@ export default function Table({
</div>
);
}
+});
+
+function FieldSummary({ field: e, tableId, database }) {
+ const { tables, relationships } = useDiagram();
+ const { t } = useTranslation();
+ const resolved = resolveType(database, e.type);
+
+ let matchedEndFieldId = null;
+ const rel = relationships.find((r) => {
+ if (r.startTableId !== tableId) return false;
+ const pair = getRelationshipFields(r).find((p) => p.startFieldId === e.id);
+ if (!pair) return false;
+ matchedEndFieldId = pair.endFieldId;
+ return true;
+ });
+ const refTable = rel && tables.find((tbl) => tbl.id === rel.endTableId);
+ const refField = refTable?.fields.find((f) => f.id === matchedEndFieldId);
+ const reference =
+ refTable && refField
+ ? { tableName: refTable.name, fieldName: refField.name }
+ : null;
+
+ return (
+ <div className="popover-theme">
+ <div
+ className="flex justify-between items-center pb-2"
+ style={{ direction: "ltr" }}
+ >
+ <p className="me-4 font-bold">{e.name}</p>
+ <p
+ className={
+ "ms-4 font-mono " + (resolved.isCustom ? "" : resolved.color)
+ }
+ style={resolved.isCustom ? { color: resolved.color } : {}}
+ >
+ {e.type +
+ ((resolved.isSized || resolved.hasPrecision) &&
+ e.size &&
+ e.size !== ""
+ ? "(" + e.size + ")"
+ : "")}
+ </p>
+ </div>
+ <hr />
+ {e.primary && (
+ <Tag color="blue" className="me-2 my-2">
+ {t("primary_key")}
+ </Tag>
+ )}
+ {e.unique && (
+ <Tag color="amber" className="me-2 my-2">
+ {t("unique")}
+ </Tag>
+ )}
+ {e.notNull && (
+ <Tag color="purple" className="me-2 my-2">
+ {t("not_null")}
+ </Tag>
+ )}
+ {e.increment && (
+ <Tag color="green" className="me-2 my-2">
+ {t("autoincrement")}
+ </Tag>
+ )}
+ {reference && (
+ <Tag color="light-blue" className="me-2 my-2">
+ {t("foreign_key")}
+ </Tag>
+ )}
+ {reference && (
+ <p>
+ <strong>{t("references")}: </strong>
+ {reference.tableName}({reference.fieldName})
+ </p>
+ )}
+ <p>
+ <strong>{t("default_value")}: </strong>
+ {e.default === "" ? t("not_set") : e.default}
+ </p>
+ <p className="max-w-80">
+ <strong>{t("comment")}: </strong>
+ {e.comment === "" ? t("not_set") : e.comment}
+ </p>
+ </div>
+ );
+}
+
+function TableEditSheet({ tableData }) {
+ const { layout } = useLayout();
+ const { selectedElement, setSelectedElement } = useSelect();
+ const { t } = useTranslation();
+
+ return (
+ <SideSheet
+ title={t("edit")}
+ size="small"
+ visible={
+ selectedElement.element === ObjectType.TABLE &&
+ selectedElement.id === tableData.id &&
+ selectedElement.open &&
+ !layout.sidebar
+ }
+ onCancel={() =>
+ setSelectedElement((prev) => ({
+ ...prev,
+ open: !prev.open,
+ }))
+ }
+ style={{ paddingBottom: "16px" }}
+ >
+ <div className="sidesheet-theme">
+ <TableInfo data={tableData} />
+ </div>
+ </SideSheet>
+ );
}
diff --git a/src/components/EditorCanvas/View.jsx b/src/components/EditorCanvas/View.jsx
index 283a5b9c..1f90959b 100644
--- a/src/components/EditorCanvas/View.jsx
+++ b/src/components/EditorCanvas/View.jsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import { memo, useMemo, useState } from "react";
import { Action, Tab, ObjectType } from "../../data/constants";
import {
IconMore,
@@ -35,7 +35,7 @@ import {
} from "../../utils/views";
import ResizeHandles from "./ResizeHandles";
-export default function View({ viewData, onPointerDown }) {
+export default memo(function View({ viewData, onPointerDown }) {
const [hovered, setHovered] = useState(false);
const [resizeEngaged, setResizeEngaged] = useState(false);
const { layout } = useLayout();
@@ -204,7 +204,7 @@ export default function View({ viewData, onPointerDown }) {
width={width}
height={height}
className="group drop-shadow-lg rounded-md cursor-move"
- onPointerDown={onPointerDown}
+ onPointerDown={() => onPointerDown(viewData, ObjectType.VIEW)}
onPointerEnter={(e) => e.isPrimary && setHovered(true)}
onPointerLeave={(e) => e.isPrimary && setHovered(false)}
>
@@ -387,4 +387,4 @@ export default function View({ viewData, onPointerDown }) {
</SideSheet>
</>
);
-}
+});
diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsx
index 6c7305aa..3f9ed088 100644
--- a/src/context/DiagramContext.jsx
+++ b/src/context/DiagramContext.jsx
@@ -1,4 +1,4 @@
-import { createContext, useCallback, useState } from "react";
+import { createContext, useCallback, useMemo, useRef, useState } from "react";
import { Action, DB, ObjectType, defaultBlue } from "../data/constants";
import { useTransform, useUndoRedo, useSelect, useCollab } from "../hooks";
import { Toast } from "@douyinfe/semi-ui";
@@ -8,6 +8,7 @@ import { getRelationshipFields } from "../utils/utils";
import { cascadePosition } from "../utils/rect";
export const DiagramContext = createContext(null);
+export const DiagramActionsContext = createContext(null);
export default function DiagramContextProvider({ children }) {
const { t } = useTranslation();
@@ -330,30 +331,52 @@ export default function DiagramContextProvider({ children }) {
}
};
+ const latestActionsRef = useRef(null);
+ latestActionsRef.current = {
+ addTable,
+ updateTable,
+ updateField,
+ deleteField,
+ deleteTable,
+ addRelationship,
+ deleteRelationship,
+ updateRelationship,
+ };
+
+ const actions = useMemo(
+ () => ({
+ ...Object.fromEntries(
+ Object.keys(latestActionsRef.current).map((name) => [
+ name,
+ (...args) => latestActionsRef.current[name](...args),
+ ]),
+ ),
+ setTables,
+ setRelationships,
+ setDatabase,
+ setSqlHeader,
+ }),
+ [setDatabase, setSqlHeader],
+ );
+
+ const value = useMemo(
+ () => ({
+ ...actions,
+ tables,
+ relationships,
+ database,
+ sqlHeader,
+ tablesCount: tables.length,
+ relationshipsCount: relationships.length,
+ }),
+ [actions, tables, relationships, database, sqlHeader],
+ );
+
return (
- <DiagramContext.Provider
- value={{
- tables,
- setTables,
- addTable,
- updateTable,
- updateField,
- deleteField,
- deleteTable,
- relationships,
- setRelationships,
- addRelationship,
- deleteRelationship,
- updateRelationship,
- database,
- setDatabase,
- sqlHeader,
- setSqlHeader,
- tablesCount: tables.length,
- relationshipsCount: relationships.length,
- }}
- >
- {children}
- </DiagramContext.Provider>
+ <DiagramActionsContext.Provider value={actions}>
+ <DiagramContext.Provider value={value}>
+ {children}
+ </DiagramContext.Provider>
+ </DiagramActionsContext.Provider>
);
}
diff --git a/src/context/SelectContext.jsx b/src/context/SelectContext.jsx
index ce04c5ea..ec2231e9 100644
--- a/src/context/SelectContext.jsx
+++ b/src/context/SelectContext.jsx
@@ -1,7 +1,8 @@
-import { createContext, useState } from "react";
+import { createContext, useMemo, useState } from "react";
import { ObjectType, Tab } from "../data/constants";
export const SelectContext = createContext(null);
+export const SelectActionsContext = createContext(null);
export default function SelectContextProvider({ children }) {
const [selectedElement, setSelectedElement] = useState({
@@ -15,16 +16,19 @@ export default function SelectContextProvider({ children }) {
});
const [bulkSelectedElements, setBulkSelectedElements] = useState([]);
+ const actions = useMemo(
+ () => ({ setSelectedElement, setBulkSelectedElements }),
+ [],
+ );
+
+ const value = useMemo(
+ () => ({ ...actions, selectedElement, bulkSelectedElements }),
+ [actions, selectedElement, bulkSelectedElements],
+ );
+
return (
- <SelectContext.Provider
- value={{
- selectedElement,
- setSelectedElement,
- bulkSelectedElements,
- setBulkSelectedElements,
- }}
- >
- {children}
- </SelectContext.Provider>
+ <SelectActionsContext.Provider value={actions}>
+ <SelectContext.Provider value={value}>{children}</SelectContext.Provider>
+ </SelectActionsContext.Provider>
);
}