Skip to content

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

Add offset to fix overlapping elements (#1154)

1ilite918bf1b457f
diff --git a/src/context/AreasContext.jsx b/src/context/AreasContext.jsx
index d16064e2..f6e45792 100644
--- a/src/context/AreasContext.jsx
+++ b/src/context/AreasContext.jsx
@@ -3,6 +3,7 @@ import { createContext, useState } from "react";
import { useTranslation } from "react-i18next";
import { Action, ObjectType, defaultBlue } from "../data/constants";
import { useSelect, useTransform, useUndoRedo, useCollab } from "../hooks";
+import { cascadePosition } from "../utils/rect";
export const AreasContext = createContext(null);
@@ -29,8 +30,10 @@ export default function AreasContextProvider({ children }) {
created = {
id: areas.length,
name: `area_${areas.length}`,
- x: transform.pan.x - width / 2,
- y: transform.pan.y - height / 2,
+ ...cascadePosition(
+ { x: transform.pan.x - width / 2, y: transform.pan.y - height / 2 },
+ areas,
+ ),
width,
height,
color: defaultBlue,
diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsx
index 9652cd1d..db124352 100644
--- a/src/context/DiagramContext.jsx
+++ b/src/context/DiagramContext.jsx
@@ -5,6 +5,7 @@ import { Toast } from "@douyinfe/semi-ui";
import { useTranslation } from "react-i18next";
import { nanoid } from "nanoid";
import { getRelationshipFields } from "../utils/utils";
+import { cascadePosition } from "../utils/rect";
export const DiagramContext = createContext(null);
@@ -40,8 +41,7 @@ export default function DiagramContextProvider({ children }) {
const newTable = {
id,
name: `table_${id}`,
- x: transform.pan.x,
- y: transform.pan.y,
+ ...cascadePosition(transform.pan, tables),
locked: false,
fields: [
{
diff --git a/src/context/NotesContext.jsx b/src/context/NotesContext.jsx
index 9b584922..a2817b86 100644
--- a/src/context/NotesContext.jsx
+++ b/src/context/NotesContext.jsx
@@ -7,6 +7,7 @@ import {
} from "../data/constants";
import { useUndoRedo, useTransform, useSelect, useCollab } from "../hooks";
import { Toast } from "@douyinfe/semi-ui";
+import { cascadePosition } from "../utils/rect";
import { useTranslation } from "react-i18next";
export const NotesContext = createContext(null);
@@ -32,8 +33,10 @@ export default function NotesContextProvider({ children }) {
const height = 88;
created = {
id: notes.length,
- x: transform.pan.x,
- y: transform.pan.y - height / 2,
+ ...cascadePosition(
+ { x: transform.pan.x, y: transform.pan.y - height / 2 },
+ notes,
+ ),
title: `note_${notes.length}`,
content: "",
locked: false,
diff --git a/src/utils/rect.js b/src/utils/rect.js
index 634a154d..277877b2 100644
--- a/src/utils/rect.js
+++ b/src/utils/rect.js
@@ -16,3 +16,14 @@ export function isInsideRect(rect1, rect2) {
rect1.y + rect1.height < rect2.y + rect2.height
);
}
+
+export function cascadePosition(position, occupied, step = 30) {
+ let { x, y } = position;
+ while (
+ occupied.some((o) => Math.abs(o.x - x) < step && Math.abs(o.y - y) < step)
+ ) {
+ x += step;
+ y += step;
+ }
+ return { x, y };
+}