Skip to content

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

Feat/subject areas (#1184)

1ilitf47a5b2500c4
diff --git a/src/components/EditorCanvas/Area.jsx b/src/components/EditorCanvas/Area.jsx
index a91576e8..0ab9e903 100644
--- a/src/components/EditorCanvas/Area.jsx
+++ b/src/components/EditorCanvas/Area.jsx
@@ -10,6 +10,8 @@ import ColorPicker from "../EditorSidePanel/ColorPicker";
import {
IconEdit,
IconDeleteStroked,
+ IconEyeClosed,
+ IconEyeOpened,
IconLock,
IconUnlock,
} from "@douyinfe/semi-icons";
@@ -21,23 +23,29 @@ import {
useSelect,
useAreas,
useSaveState,
+ useAreaMembership,
} from "../../hooks";
import { useTranslation } from "react-i18next";
import { useHover } from "usehooks-ts";
+const collapsedHeight = 40;
+
export default memo(function Area({
data,
+ tableCount,
onPointerDown,
setResize,
setInitDimensions,
}) {
const { t } = useTranslation();
const ref = useRef(null);
+
const isHovered = useHover(ref);
const { layout } = useLayout();
const { settings } = useSettings();
const { setSaveState } = useSaveState();
const { updateArea } = useAreas();
+ const { toggleAreaHidden } = useAreaMembership();
const {
selectedElement,
setSelectedElement,
@@ -151,6 +159,47 @@ export default memo(function Area({
);
}, [selectedElement, data, bulkSelectedElements]);
+ const borderClass = isHovered
+ ? "border-dashed border-blue-500"
+ : isSelected
+ ? "border-blue-500"
+ : "border-slate-400";
+
+ if (data.hidden) {
+ return (
+ <g ref={ref}>
+ <foreignObject
+ x={data.x}
+ y={data.y}
+ width={Math.max(Math.min(data.width, 280), 180)}
+ height={collapsedHeight}
+ onPointerDown={() => onPointerDown(data, ObjectType.AREA)}
+ >
+ <div
+ className={`w-full h-full px-2 rounded cursor-move border-2 flex items-center gap-2 ${borderClass}`}
+ style={{ backgroundColor: `${data.color}66` }}
+ onDoubleClick={edit}
+ >
+ <div className="text-color select-none overflow-hidden text-ellipsis whitespace-nowrap font-semibold">
+ {data.name}
+ </div>
+ <div className="text-color select-none whitespace-nowrap text-xs opacity-70 flex-1">
+ {t("area_table_count", { count: tableCount })}
+ </div>
+ <Button
+ size="small"
+ type="tertiary"
+ theme="borderless"
+ icon={<IconEyeClosed size="small" />}
+ onClick={() => toggleAreaHidden(data)}
+ disabled={layout.readOnly}
+ />
+ </div>
+ </foreignObject>
+ </g>
+ );
+ }
+
return (
<g ref={ref}>
<foreignObject
@@ -162,13 +211,7 @@ export default memo(function Area({
onPointerDown={() => onPointerDown(data, ObjectType.AREA)}
>
<div
- className={`w-full h-full p-2 rounded cursor-move border-2 ${
- isHovered
- ? "border-dashed border-blue-500"
- : isSelected
- ? "border-blue-500 opacity-100"
- : "border-slate-400 opacity-100"
- }`}
+ className={`w-full h-full p-2 rounded cursor-move border-2 ${borderClass}`}
style={{ backgroundColor: `${data.color}66` }}
onDoubleClick={edit}
>
@@ -195,6 +238,13 @@ export default memo(function Area({
onClick={lockUnlockArea}
disabled={layout.readOnly}
/>
+ <Button
+ size="small"
+ type="tertiary"
+ icon={<IconEyeOpened size="small" />}
+ onClick={() => toggleAreaHidden(data)}
+ disabled={layout.readOnly}
+ />
<Popover
visible={areaIsOpen() && !layout.sidebar}
onClickOutSide={onClickOutSide}
diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsx
index 72a00acf..19b7b49b 100644
--- a/src/components/EditorCanvas/Canvas.jsx
+++ b/src/components/EditorCanvas/Canvas.jsx
@@ -30,24 +30,32 @@ import {
useSaveState,
useCollab,
useViews,
+ useAreaMembership,
} from "../../hooks";
import { useTranslation } from "react-i18next";
import { useEventListener } from "usehooks-ts";
import {
areFieldsCompatible,
getRelatedFieldKeysByTable,
- getTableHeight,
- getTableWidth,
} from "../../utils/utils";
import {
getViewHeight,
getViewWidth,
resolveViewColumns,
} from "../../utils/views";
-import { getRectFromEndpoints, isInsideRect } from "../../utils/rect";
+import {
+ findContainingArea,
+ getRectFromEndpoints,
+ isInsideRect,
+} from "../../utils/rect";
import { State, noteWidth } from "../../data/constants";
import { nanoid } from "nanoid";
+const noHiddenAreas = {
+ areaHiddenTableIds: new Set(),
+ tableCountByArea: new Map(),
+};
+
const notDragging = {
id: -1,
type: ObjectType.NONE,
@@ -145,6 +153,7 @@ export default function Canvas() {
metaKey: false,
});
const elementPointerDownRef = useRef(null);
+ const carriedTablesRef = useRef([]);
const handleElementPointerDown = useCallback((element, type) => {
elementPointerDownRef.current = { element, type };
}, []);
@@ -180,6 +189,27 @@ export default function Canvas() {
return ids;
}, [bulkSelectedElements, selectedElement.element, selectedElement.id]);
+ const { getTableRect, resolveAreaId, persistInferredAreaIds } =
+ useAreaMembership();
+
+ const { areaHiddenTableIds, tableCountByArea } = useMemo(() => {
+ const hiddenAreaIds = new Set(
+ areas.filter((a) => a.hidden).map((a) => a.id),
+ );
+ if (hiddenAreaIds.size === 0) return noHiddenAreas;
+ const areaHiddenTableIds = new Set();
+ const tableCountByArea = new Map();
+ tables.forEach((table) => {
+ if (!hiddenAreaIds.has(table.areaId)) return;
+ areaHiddenTableIds.add(table.id);
+ tableCountByArea.set(
+ table.areaId,
+ (tableCountByArea.get(table.areaId) ?? 0) + 1,
+ );
+ });
+ return { areaHiddenTableIds, tableCountByArea };
+ }, [areas, tables]);
+
const isSameElement = (el1, el2) => {
return el1.id === el2.id && el1.type === el2.type;
};
@@ -199,7 +229,7 @@ export default function Canvas() {
};
tables.forEach((table) => {
- if (table.locked) return;
+ if (table.locked || areaHiddenTableIds.has(table.id)) return;
const element = {
id: table.id,
@@ -207,17 +237,7 @@ export default function Canvas() {
currentCoords: { x: table.x, y: table.y },
initialCoords: { x: table.x, y: table.y },
};
- const tableRect = {
- x: table.x,
- y: table.y,
- width: getTableWidth(table),
- height: getTableHeight(
- table,
- settings.showComments,
- relatedFieldKeysByTable.get(table.id),
- ),
- };
- if (shouldAddElement(tableRect, element)) {
+ if (shouldAddElement(getTableRect(table), element)) {
elements.push(element);
}
});
@@ -247,7 +267,7 @@ export default function Canvas() {
});
areas.forEach((area) => {
- if (area.locked) return;
+ if (area.locked || area.hidden) return;
const element = {
id: area.id,
@@ -354,9 +374,32 @@ export default function Canvas() {
return;
}
+ const dragSet = isSelected ? bulkSelectedElements : [elementInBulk];
if (!isSelected) {
- setBulkSelectedElements([elementInBulk]);
+ setBulkSelectedElements(dragSet);
}
+ const draggedAreaIds = new Set(
+ dragSet.filter((el) => el.type === ObjectType.AREA).map((el) => el.id),
+ );
+ const draggedTableIds = new Set(
+ dragSet.filter((el) => el.type === ObjectType.TABLE).map((el) => el.id),
+ );
+ carriedTablesRef.current =
+ draggedAreaIds.size === 0
+ ? []
+ : tables
+ .filter(
+ (table) =>
+ !table.locked &&
+ !draggedTableIds.has(table.id) &&
+ draggedAreaIds.has(resolveAreaId(table, areas)),
+ )
+ .map((table) => ({
+ id: table.id,
+ initialCoords: { x: table.x, y: table.y },
+ currentCoords: { x: table.x, y: table.y },
+ }));
+ if (draggedAreaIds.size > 0) persistInferredAreaIds(areas);
setDragging({
id: element.id,
type,
@@ -418,7 +461,7 @@ export default function Canvas() {
y: pointer.spaces.diagram.y - dragging.grabOffset.y,
});
- const { currentCoords } = bulkSelectedElements.find((el) =>
+ const { currentCoords, initialCoords } = bulkSelectedElements.find((el) =>
isSameElement(el, dragging),
);
@@ -450,6 +493,14 @@ export default function Canvas() {
});
});
+ carriedTablesRef.current.forEach((carried) => {
+ carried.currentCoords = {
+ x: carried.initialCoords.x + mainElementFinalX - initialCoords.x,
+ y: carried.initialCoords.y + mainElementFinalY - initialCoords.y,
+ };
+ tableUpdates.set(carried.id, carried.currentCoords);
+ });
+
if (tableUpdates.size > 0) updateTables(tableUpdates);
setBulkSelectedElements(newBulkSelectedElements);
return;
@@ -578,11 +629,12 @@ export default function Canvas() {
};
const didResize = (id) => {
+ const area = areas.find((a) => a.id === id);
return !(
- areas[id].x === areaInitDimensions.x &&
- areas[id].y === areaInitDimensions.y &&
- areas[id].width === areaInitDimensions.width &&
- areas[id].height === areaInitDimensions.height
+ area.x === areaInitDimensions.x &&
+ area.y === areaInitDimensions.y &&
+ area.width === areaInitDimensions.width &&
+ area.height === areaInitDimensions.height
);
};
@@ -601,18 +653,65 @@ export default function Canvas() {
if (!e.isPrimary) return;
if (didDrag()) {
+ const movedAreas = bulkSelectedElements.filter(
+ (el) => el.type === ObjectType.AREA,
+ );
+ const movedAreaIds = new Set(movedAreas.map((el) => el.id));
+ const areasAt = (coordsKey) =>
+ areas.map((area) => {
+ const moved = movedAreas.find((el) => el.id === area.id);
+ return moved ? { ...area, ...moved[coordsKey] } : area;
+ });
+ const areasBefore = areasAt("initialCoords");
+ const areasAfter = areasAt("currentCoords");
+
+ const areaChanges = new Map();
+ bulkSelectedElements.forEach((el) => {
+ if (el.type !== ObjectType.TABLE) return;
+ const table = tablesById.get(el.id);
+ const before = resolveAreaId(table, areasBefore, el.initialCoords);
+ if (movedAreaIds.has(before)) return;
+ const after =
+ findContainingArea(getTableRect(table, el.currentCoords), areasAfter)
+ ?.id ?? null;
+ if (after !== before) areaChanges.set(el.id, { before, after });
+ });
+ if (areaChanges.size > 0) {
+ updateTables(
+ new Map(
+ [...areaChanges].map(([id, { after }]) => [id, { areaId: after }]),
+ ),
+ );
+ }
+
setUndoStack((prev) => [
...prev,
{
action: Action.MOVE,
bulk: true,
message: t("bulk_update"),
- elements: bulkSelectedElements.map((el) => ({
- id: el.id,
- type: el.type,
- undo: el.initialCoords,
- redo: el.currentCoords,
- })),
+ elements: [
+ ...bulkSelectedElements.map((el) => {
+ const change =
+ el.type === ObjectType.TABLE && areaChanges.get(el.id);
+ return {
+ id: el.id,
+ type: el.type,
+ undo: change
+ ? { ...el.initialCoords, areaId: change.before }
+ : el.initialCoords,
+ redo: change
+ ? { ...el.currentCoords, areaId: change.after }
+ : el.currentCoords,
+ };
+ }),
+ ...carriedTablesRef.current.map((carried) => ({
+ id: carried.id,
+ type: ObjectType.TABLE,
+ undo: carried.initialCoords,
+ redo: carried.currentCoords,
+ })),
+ ],
},
]);
setRedoStack([]);
@@ -636,6 +735,7 @@ export default function Canvas() {
}
}
setDragging(notDragging);
+ carriedTablesRef.current = [];
if (panning.isPanning && didPan()) {
setSaveState(State.SAVING);
@@ -648,24 +748,56 @@ export default function Canvas() {
setLinking(false);
if (areaResize.id !== -1 && didResize(areaResize.id)) {
+ const resizedArea = areas.find((a) => a.id === areaResize.id);
+ const areasBefore = areas.map((a) =>
+ a.id === resizedArea.id ? { ...a, ...areaInitDimensions } : a,
+ );
+ const areaChanges = new Map();
+ tables.forEach((table) => {
+ const before = resolveAreaId(table, areasBefore);
+ if (before !== resizedArea.id && before !== null) return;
+ const rect = getTableRect(table);
+ const stillInside =
+ before === resizedArea.id &&
+ findContainingArea(rect, [resizedArea]) !== null;
+ const after = stillInside
+ ? resizedArea.id
+ : findContainingArea(rect, areas)?.id ?? null;
+ if (after !== before) areaChanges.set(table.id, { before, after });
+ });
+ persistInferredAreaIds(areasBefore);
+ if (areaChanges.size > 0) {
+ updateTables(
+ new Map(
+ [...areaChanges].map(([id, { after }]) => [id, { areaId: after }]),
+ ),
+ );
+ }
+ const { x, y, width, height } = resizedArea;
setUndoStack((prev) => [
...prev,
{
action: Action.EDIT,
+ bulk: true,
element: ObjectType.AREA,
- aid: areaResize.id,
- undo: {
- ...areas[areaResize.id],
- x: areaInitDimensions.x,
- y: areaInitDimensions.y,
- width: areaInitDimensions.width,
- height: areaInitDimensions.height,
- },
- redo: areas[areaResize.id],
message: t("edit_area", {
- areaName: areas[areaResize.id].name,
+ areaName: resizedArea.name,
extra: "[resize]",
}),
+ elements: [
+ {
+ id: resizedArea.id,
+ type: ObjectType.AREA,
+ undo: areaInitDimensions,
+ redo: { x, y, width, height },
+ },
+ ...[...areaChanges].map(([id, { before, after }]) => ({
+ id,
+ type: ObjectType.TABLE,
+ undo: { areaId: before },
+ redo: { areaId: after },
+ })),
+ ],
},
]);
setRedoStack([]);
@@ -858,36 +990,42 @@ export default function Canvas() {
<Area
key={a.id}
data={a}
+ tableCount={tableCountByArea.get(a.id) ?? 0}
setResize={setAreaResize}
setInitDimensions={setAreaInitDimensions}
onPointerDown={handleElementPointerDown}
/>
))}
- {relationships.map((e) => (
- <Relationship
- key={e.id}
- data={e}
- startTable={tablesById.get(e.startTableId)}
- endTable={tablesById.get(e.endTableId)}
- startRelatedFieldKeys={relatedFieldKeysByTable.get(
- e.startTableId,
- )}
- endRelatedFieldKeys={relatedFieldKeysByTable.get(e.endTableId)}
- />
- ))}
- {tables.map((table) => (
- <Table
- key={table.id}
- tableData={table}
- isSelected={selectedTableIds.has(table.id)}
- database={database}
- relatedFieldKeys={relatedFieldKeysByTable.get(table.id)}
- setHoveredTable={setHoveredTable}
- handleGripField={handleGripField}
- setLinkingLine={setLinkingLine}
- onPointerDown={handleElementPointerDown}
- />
- ))}
+ {relationships.map((e) =>
+ areaHiddenTableIds.has(e.startTableId) ||
+ areaHiddenTableIds.has(e.endTableId) ? null : (
+ <Relationship
+ key={e.id}
+ data={e}
+ startTable={tablesById.get(e.startTableId)}
+ endTable={tablesById.get(e.endTableId)}
+ startRelatedFieldKeys={relatedFieldKeysByTable.get(
+ e.startTableId,
+ )}
+ endRelatedFieldKeys={relatedFieldKeysByTable.get(e.endTableId)}
+ />
+ ),
+ )}
+ {tables.map((table) =>
+ areaHiddenTableIds.has(table.id) ? null : (
+ <Table
+ key={table.id}
+ tableData={table}
+ isSelected={selectedTableIds.has(table.id)}
+ database={database}
+ relatedFieldKeys={relatedFieldKeysByTable.get(table.id)}
+ setHoveredTable={setHoveredTable}
+ handleGripField={handleGripField}
+ setLinkingLine={setLinkingLine}
+ onPointerDown={handleElementPointerDown}
+ />
+ ),
+ )}
{views.map((view) => (
<View
key={view.id}
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx
index fb67a8cb..ece2ddac 100644
--- a/src/components/EditorHeader/ControlPanel.jsx
+++ b/src/components/EditorHeader/ControlPanel.jsx
@@ -262,7 +262,7 @@ export default function ControlPanel({
if (a.element === ObjectType.TABLE) {
deleteTable(a.data.table.id, false);
} else if (a.element === ObjectType.AREA) {
- deleteArea(areas[areas.length - 1].id, false);
+ deleteArea(a.data.id, false);
} else if (a.element === ObjectType.NOTE) {
deleteNote(notes[notes.length - 1].id, false);
} else if (a.element === ObjectType.RELATIONSHIP) {
@@ -281,10 +281,8 @@ export default function ControlPanel({
setRedoStack((prev) => [...prev, { ...a, x, y }]);
updateTable(a.id, { x: a.x, y: a.y });
} else if (a.element === ObjectType.AREA) {
- setRedoStack((prev) => [
- ...prev,
- { ...a, x: areas[a.id].x, y: areas[a.id].y },
- ]);
+ const { x, y } = areas.find((area) => area.id === a.id);
+ setRedoStack((prev) => [...prev, { ...a, x, y }]);
updateArea(a.id, { x: a.x, y: a.y });
} else if (a.element === ObjectType.NOTE) {
setRedoStack((prev) => [
@@ -302,7 +300,7 @@ export default function ControlPanel({
} else if (a.element === ObjectType.NOTE) {
addNote(a.data, false);
} else if (a.element === ObjectType.AREA) {
- addArea(a.data, false);
+ addArea(a.data, false, a.index);
} else if (a.element === ObjectType.TYPE) {
addType(a.data, false);
} else if (a.element === ObjectType.ENUM) {
@@ -480,7 +478,7 @@ export default function ControlPanel({
if (a.element === ObjectType.TABLE) {
addTable(a.data, false);
} else if (a.element === ObjectType.AREA) {
- addArea(null, false);
+ addArea(a.data, false);
} else if (a.element === ObjectType.NOTE) {
addNote(null, false);
} else if (a.element === ObjectType.RELATIONSHIP) {
@@ -499,10 +497,8 @@ export default function ControlPanel({
setUndoStack((prev) => [...prev, { ...a, x, y }]);
updateTable(a.id, { x: a.x, y: a.y });
} else if (a.element === ObjectType.AREA) {
- setUndoStack((prev) => [
- ...prev,
- { ...a, x: areas[a.id].x, y: areas[a.id].y },
- ]);
+ const { x, y } = areas.find((area) => area.id === a.id);
+ setUndoStack((prev) => [...prev, { ...a, x, y }]);
updateArea(a.id, { x: a.x, y: a.y });
} else if (a.element === ObjectType.NOTE) {
setUndoStack((prev) => [
@@ -962,14 +958,16 @@ export default function ControlPanel({
id: notes.length,
});
break;
- case ObjectType.AREA:
+ case ObjectType.AREA: {
+ const copiedArea = areas.find((a) => a.id === selectedElement.id);
addArea({
- ...areas[selectedElement.id],
- x: areas[selectedElement.id].x + 20,
- y: areas[selectedElement.id].y + 20,
- id: areas.length,
+ ...copiedArea,
+ x: copiedArea.x + 20,
+ y: copiedArea.y + 20,
+ id: nanoid(),
});
break;
+ }
case ObjectType.VIEW: {
const copiedView = views.find((v) => v.id === selectedElement.id);
addView({
@@ -1009,7 +1007,9 @@ export default function ControlPanel({
break;
case ObjectType.AREA:
navigator.clipboard
- .writeText(JSON.stringify({ ...areas[selectedElement.id] }))
+ .writeText(
+ JSON.stringify(areas.find((a) => a.id === selectedElement.id)),
+ )
.catch(() => Toast.error(t("oops_smth_went_wrong")));
break;
case ObjectType.VIEW:
@@ -1065,7 +1065,7 @@ export default function ControlPanel({
...obj,
x: obj.x + 20,
y: obj.y + 20,
- id: areas.length,
+ id: nanoid(),
});
} else if (v.validate(obj, noteSchema).valid) {
addNote({
diff --git a/src/components/EditorHeader/SideSheet/Migration.jsx b/src/components/EditorHeader/SideSheet/Migration.jsx
index 7f7d7ae1..db3d3953 100644
--- a/src/components/EditorHeader/SideSheet/Migration.jsx
+++ b/src/components/EditorHeader/SideSheet/Migration.jsx
@@ -52,6 +52,7 @@ export default function Migration({
"width",
"height",
"locked",
+ "areaId",
"color",
"title",
"transform",
diff --git a/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx b/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx
index de677e71..de9b015e 100644
--- a/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx
+++ b/src/components/EditorSidePanel/AreasTab/AreaDetails.jsx
@@ -1,15 +1,25 @@
import { useState, useRef } from "react";
import { Button, Input } from "@douyinfe/semi-ui";
import ColorPicker from "../ColorPicker";
-import { IconDeleteStroked } from "@douyinfe/semi-icons";
-import { useAreas, useLayout, useUndoRedo } from "../../../hooks";
+import {
+ IconDeleteStroked,
+ IconEyeClosed,
+ IconEyeOpened,
+} from "@douyinfe/semi-icons";
+import {
+ useAreaMembership,
+ useAreas,
+ useLayout,
+ useUndoRedo,
+} from "../../../hooks";
import { Action, ObjectType } from "../../../data/constants";
import { useTranslation } from "react-i18next";
-export default function AreaInfo({ data, i }) {
+export default function AreaInfo({ data }) {
const { t } = useTranslation();
const { layout } = useLayout();
const { deleteArea, updateArea } = useAreas();
+ const { toggleAreaHidden } = useAreaMembership();
const { setUndoStack, setRedoStack } = useUndoRedo();
const [editField, setEditField] = useState({});
const initialColorRef = useRef(data.color);
@@ -35,7 +45,7 @@ export default function AreaInfo({ data, i }) {
{
action: Action.EDIT,
element: ObjectType.AREA,
- aid: i,
+ aid: data.id,
undo: { color: undoColor },
redo: { color: color },
message: t("edit_area", {
@@ -64,7 +74,7 @@ export default function AreaInfo({ data, i }) {
{
action: Action.EDIT,
element: ObjectType.AREA,
- aid: i,
+ aid: data.id,
undo: editField,
redo: { name: e.target.value },
message: t("edit_area", {
@@ -80,14 +90,21 @@ export default function AreaInfo({ data, i }) {
usePopover={true}
value={data.color}
readOnly={layout.readOnly}
- onChange={(color) => updateArea(i, { color })}
+ onChange={(color) => updateArea(data.id, { color })}
onColorPick={(color) => handleColorPick(color)}
/>
+ <Button
+ theme="borderless"
+ type="tertiary"
+ disabled={layout.readOnly}
+ icon={data.hidden ? <IconEyeClosed /> : <IconEyeOpened />}
+ onClick={() => toggleAreaHidden(data)}
+ />
<Button
type="danger"
disabled={layout.readOnly}
icon={<IconDeleteStroked />}
- onClick={() => deleteArea(i, true)}
+ onClick={() => deleteArea(data.id, true)}
/>
</div>
);
diff --git a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
index 756ea853..89fcb553 100644
--- a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
+++ b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
@@ -33,8 +33,8 @@ export default function AreasTab() {
/>
) : (
<div className="p-2">
- {areas.map((a, i) => (
- <AreaInfo data={a} key={"area_" + i} i={i} />
+ {areas.map((a) => (
+ <AreaInfo data={a} key={a.id} />
))}
</div>
)}
diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsx
index a485a601..a2cbf3d7 100644
--- a/src/components/Workspace.jsx
+++ b/src/components/Workspace.jsx
@@ -261,22 +261,25 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
const moveToCloud = useCallback(async () => {
if (typeof extensions.cloudSave !== "function" || !loadedDiagramId) return;
setSaveState(State.SAVING);
+ const cloudId = uuidv4();
try {
- await extensions.cloudSave(buildCloudPayload(loadedDiagramId), {
- isNew: true,
- });
+ await extensions.cloudSave(buildCloudPayload(cloudId), { isNew: true });
await db.diagrams.where("diagramId").equals(loadedDiagramId).delete();
- setDiagramSource("cloud");
- if (typeof cloudLoad === "function") {
- await cloudLoad(loadedDiagramId);
- }
setSaveState(State.SAVED);
setLastSaved(new Date().toLocaleString());
+ navigate(`/editor/diagrams/${cloudId}`, { replace: true });
} catch (err) {
console.warn("move to cloud failed:", err);
setSaveState(State.ERROR);
}
- }, [extensions, loadedDiagramId, buildCloudPayload, setSaveState, cloudLoad]);
+ }, [
+ extensions,
+ loadedDiagramId,
+ buildCloudPayload,
+ setSaveState,
+ setLastSaved,
+ navigate,
+ ]);
const dismissMoveToCloud = () => {
if (!loadedDiagramId) return;
diff --git a/src/context/AreasContext.jsx b/src/context/AreasContext.jsx
index f6e45792..794e6fd8 100644
--- a/src/context/AreasContext.jsx
+++ b/src/context/AreasContext.jsx
@@ -1,5 +1,6 @@
import { Toast } from "@douyinfe/semi-ui";
import { createContext, useState } from "react";
+import { nanoid } from "nanoid";
import { useTranslation } from "react-i18next";
import { Action, ObjectType, defaultBlue } from "../data/constants";
import { useSelect, useTransform, useUndoRedo, useCollab } from "../hooks";
@@ -16,20 +17,21 @@ export default function AreasContextProvider({ children }) {
const { emitDelta, isApplyingRemoteRef } = useCollab();
const shouldEmit = () => !isApplyingRemoteRef?.current;
- const addArea = (data, addToHistory = true) => {
+ const addArea = (data, addToHistory = true, index = areas.length) => {
let created = data;
if (data) {
setAreas((prev) => {
const temp = prev.slice();
- temp.splice(data.id, 0, data);
- return temp.map((t, i) => ({ ...t, id: i }));
+ temp.splice(index, 0, data);
+ return temp;
});
} else {
const width = 200;
const height = 200;
+ const id = nanoid();
created = {
- id: areas.length,
- name: `area_${areas.length}`,
+ id,
+ name: `area_${id}`,
...cascadePosition(
{ x: transform.pan.x - width / 2, y: transform.pan.y - height / 2 },
areas,
@@ -39,7 +41,7 @@ export default function AreasContextProvider({ children }) {
color: defaultBlue,
locked: false,
};
- setAreas((prev) => [...prev, { ...created, id: prev.length }]);
+ setAreas((prev) => [...prev, created]);
}
if (addToHistory) {
setUndoStack((prev) => [
@@ -47,6 +49,7 @@ export default function AreasContextProvider({ children }) {
{
action: Action.ADD,
element: ObjectType.AREA,
+ data: created,
message: t("add_area"),
},
]);
@@ -64,22 +67,25 @@ export default function AreasContextProvider({ children }) {
const deleteArea = (id, addToHistory = true) => {
if (addToHistory) {
+ const index = areas.findIndex((a) => a.id === id);
Toast.success(t("area_deleted"));
setUndoStack((prev) => [
...prev,
{
action: Action.DELETE,
element: ObjectType.AREA,
- data: areas[id],
- message: t("delete_area", { areaName: areas[id].name }),
+ data: areas[index],
+ index,
+ message: t("delete_area", { areaName: areas[index].name }),
},
]);
setRedoStack([]);
}
- setAreas((prev) =>
- prev.filter((e) => e.id !== id).map((e, i) => ({ ...e, id: i })),
- );
- if (id === selectedElement.id) {
+ setAreas((prev) => prev.filter((e) => e.id !== id));
+ if (
+ selectedElement.element === ObjectType.AREA &&
+ id === selectedElement.id
+ ) {
setSelectedElement((prev) => ({
...prev,
element: ObjectType.NONE,
diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsx
index 919c20cc..50c77938 100644
--- a/src/context/DiagramContext.jsx
+++ b/src/context/DiagramContext.jsx
@@ -351,6 +351,8 @@ export default function DiagramContextProvider({ children }) {
const latestActionsRef = useRef(null);
latestActionsRef.current = {
+ getTables: () => tables,
+ getRelationships: () => relationships,
addTable,
updateTable,
updateTables,
diff --git a/src/data/schemas.js b/src/data/schemas.js
index 0a4473be..0bffbd94 100644
--- a/src/data/schemas.js
+++ b/src/data/schemas.js
@@ -3,6 +3,7 @@ export const tableSchema = {
properties: {
id: { type: ["integer", "string"] },
name: { type: "string" },
+ areaId: { type: ["integer", "string", "null"] },
x: { type: "number" },
y: { type: "number" },
width: { type: "number" },
@@ -82,13 +83,14 @@ export const tableSchema = {
export const areaSchema = {
type: "object",
properties: {
- id: { type: "integer" },
+ id: { type: ["integer", "string"] },
name: { type: "string" },
x: { type: "number" },
y: { type: "number" },
width: { type: "number" },
height: { type: "number" },
locked: { type: "boolean" },
+ hidden: { type: "boolean" },
color: { type: "string", pattern: "^#[0-9a-fA-F]{6}$" },
},
required: ["id", "name", "x", "y", "width", "height", "color"],
diff --git a/src/hooks/index.js b/src/hooks/index.js
index 6c93cea4..a8e8d32b 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -15,3 +15,4 @@ export { default as useViews } from "./useViews";
export { default as useThemedPage } from "./useThemedPage";
export { default as useNavigateWithParams } from "./useNavigateWithParams";
export { default as useCollab } from "./useCollab";
+export { default as useAreaMembership } from "./useAreaMembership";
diff --git a/src/hooks/useAreaMembership.js b/src/hooks/useAreaMembership.js
new file mode 100644
index 00000000..61d3fe35
--- /dev/null
+++ b/src/hooks/useAreaMembership.js
@@ -0,0 +1,85 @@
+import { useContext, useRef } from "react";
+import { useTranslation } from "react-i18next";
+import { Action, ObjectType } from "../data/constants";
+import { DiagramActionsContext } from "../context/DiagramContext";
+import { UndoRedoActionsContext } from "../context/UndoRedoContext";
+import {
+ getRelatedFieldKeysByTable,
+ getTableHeight,
+ getTableWidth,
+} from "../utils/utils";
+import { findContainingArea } from "../utils/rect";
+import useAreas from "./useAreas";
+import useSettings from "./useSettings";
+
+export default function useAreaMembership() {
+ const { t } = useTranslation();
+ const { getTables, getRelationships, updateTables } = useContext(
+ DiagramActionsContext,
+ );
+ const { areas, updateArea } = useAreas();
+ const { settings } = useSettings();
+ const { setUndoStack, setRedoStack } = useContext(UndoRedoActionsContext);
+ const relatedFieldKeysRef = useRef({ relationships: null, keys: null });
+
+ const getRelatedFieldKeys = (tableId) => {
+ const relationships = getRelationships();
+ if (relatedFieldKeysRef.current.relationships !== relationships) {
+ relatedFieldKeysRef.current = {
+ relationships,
+ keys: getRelatedFieldKeysByTable(relationships),
+ };
+ }
+ return relatedFieldKeysRef.current.keys.get(tableId);
+ };
+
+ const getTableRect = (table, { x, y } = table) => ({
+ x,
+ y,
+ width: getTableWidth(table),
+ height: getTableHeight(
+ table,
+ settings.showComments,
+ getRelatedFieldKeys(table.id),
+ ),
+ });
+
+ const resolveAreaId = (table, areaList = areas, coords = table) =>
+ table.areaId !== undefined
+ ? table.areaId
+ : findContainingArea(getTableRect(table, coords), areaList)?.id ?? null;
+
+ const persistInferredAreaIds = (areaList = areas) => {
+ const inferred = new Map();
+ getTables().forEach((table) => {
+ if (table.areaId === undefined) {
+ inferred.set(table.id, { areaId: resolveAreaId(table, areaList) });
+ }
+ });
+ if (inferred.size > 0) updateTables(inferred);
+ };
+
+ const toggleAreaHidden = (area) => {
+ if (!area.hidden) persistInferredAreaIds();
+ setUndoStack((prev) => [
+ ...prev,
+ {
+ action: Action.EDIT,
+ element: ObjectType.AREA,
+ aid: area.id,
+ undo: { hidden: area.hidden },
+ redo: { hidden: !area.hidden },
+ message: t("edit_area", { areaName: area.name, extra: "[hidden]" }),
+ },
+ ]);
+ setRedoStack([]);
+ updateArea(area.id, { hidden: !area.hidden });
+ };
+
+ return {
+ getTableRect,
+ resolveAreaId,
+ persistInferredAreaIds,
+ toggleAreaHidden,
+ };
+}
diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.js
index caf6a75c..a7b3698f 100644
--- a/src/i18n/locales/en.js
+++ b/src/i18n/locales/en.js
@@ -158,6 +158,8 @@ const en = {
"This feature is meant for object-relational DBMSs like PostgreSQL.\nIf used for MySQL or MariaDB a JSON type will be generated with the corresponding json validation check.\nIf used for SQLite it will be translated to a BLOB.\nIf used for MSSQL a type alias to the first column will be generated.",
table_deleted: "Table deleted",
area_deleted: "Area deleted",
+ area_table_count_one: "{{count}} table",
+ area_table_count_other: "{{count}} tables",
note_deleted: "Note deleted",
relationship_deleted: "Relationship deleted",
type_deleted: "Type deleted",
diff --git a/src/utils/rect.js b/src/utils/rect.js
index 277877b2..4b85d95c 100644
--- a/src/utils/rect.js
+++ b/src/utils/rect.js
@@ -27,3 +27,24 @@ export function cascadePosition(position, occupied, step = 30) {
}
return { x, y };
}
+
+export function findContainingArea(rect, areas) {
+ const cx = rect.x + rect.width / 2;
+ const cy = rect.y + rect.height / 2;
+ let best = null;
+ areas.forEach((area) => {
+ if (area.hidden) return;
+ const contains =
+ cx >= area.x &&
+ cx <= area.x + area.width &&
+ cy >= area.y &&
+ cy <= area.y + area.height;
+ if (
+ contains &&
+ (!best || area.width * area.height < best.width * best.height)
+ ) {
+ best = area;
+ }
+ });
+ return best;
+}