Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 58 additions & 58 deletions src/components/EditorCanvas/Relationship.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { useMemo, useRef } from "react";
import {
Cardinality,
darkBgTheme,
ObjectType,
Tab,
} from "../../data/constants";
import { useMemo, useRef, useState, useEffect } from "react";
import { Cardinality, ObjectType, Tab } from "../../data/constants";
import { calcPath } from "../../utils/calcPath";
import { useDiagram, useSettings, useLayout, useSelect } from "../../hooks";
import { useTranslation } from "react-i18next";
Expand Down Expand Up @@ -46,13 +41,13 @@ export default function Relationship({ data }) {
// the translated values are to ensure backwards compatibility
case t(Cardinality.MANY_TO_ONE):
case Cardinality.MANY_TO_ONE:
cardinalityStart = "n";
cardinalityStart = data.manyLabel || "n";
cardinalityEnd = "1";
break;
case t(Cardinality.ONE_TO_MANY):
case Cardinality.ONE_TO_MANY:
cardinalityStart = "1";
cardinalityEnd = "n";
cardinalityEnd = data.manyLabel || "n";
break;
case t(Cardinality.ONE_TO_ONE):
case Cardinality.ONE_TO_ONE:
Expand Down Expand Up @@ -128,63 +123,30 @@ export default function Relationship({ data }) {
cursor="pointer"
/>
{settings.showRelationshipLabels && (
<>
<rect
x={labelX - 2}
y={labelY - labelFontSize}
fill={settings.mode === "dark" ? darkBgTheme : "white"}
width={labelWidth + 4}
height={labelHeight}
/>
<text
x={labelX}
y={labelY}
fill={settings.mode === "dark" ? "lightgrey" : "#333"}
fontSize={labelFontSize}
fontWeight={500}
ref={labelRef}
className="group-hover:fill-sky-700"
>
{data.name}
</text>
</>
<text
x={labelX}
y={labelY}
fill={settings.mode === "dark" ? "lightgrey" : "#333"}
fontSize={labelFontSize}
fontWeight={500}
ref={labelRef}
className="group-hover:fill-sky-700"
>
{data.name}
</text>
)}
{pathRef.current && settings.showCardinality && (
<>
<circle
cx={cardinalityStartX}
cy={cardinalityStartY}
r="12"
fill="grey"
className="group-hover:fill-sky-700"
/>
<text
<CardinalityLabel
x={cardinalityStartX}
y={cardinalityStartY}
fill="white"
strokeWidth="0.5"
textAnchor="middle"
alignmentBaseline="middle"
>
{cardinalityStart}
</text>
<circle
cx={cardinalityEndX}
cy={cardinalityEndY}
r="12"
fill="grey"
className="group-hover:fill-sky-700"
text={cardinalityStart}
/>
<text
<CardinalityLabel
x={cardinalityEndX}
y={cardinalityEndY}
fill="white"
strokeWidth="0.5"
textAnchor="middle"
alignmentBaseline="middle"
>
{cardinalityEnd}
</text>
text={cardinalityEnd}
/>
</>
)}
</g>
Expand Down Expand Up @@ -212,3 +174,41 @@ export default function Relationship({ data }) {
</>
);
}

function CardinalityLabel({ x, y, text, r = 12, padding = 14 }) {
const [textWidth, setTextWidth] = useState(0);
const textRef = useRef(null);

useEffect(() => {
if (textRef.current) {
const bbox = textRef.current.getBBox();
setTextWidth(bbox.width);
}
}, [text]);

return (
<g>
<rect
x={x - textWidth / 2 - padding / 2}
y={y - r}
rx={r}
ry={r}
width={textWidth + padding}
height={r * 2}
fill="grey"
className="group-hover:fill-sky-700"
/>
<text
ref={textRef}
x={x}
y={y}
fill="white"
strokeWidth="0.5"
textAnchor="middle"
alignmentBaseline="middle"
>
{text}
</text>
</g>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,41 @@ export default function RelationshipInfo({ data }) {
className="w-full"
onChange={changeCardinality}
/>

{data.cardinality !== Cardinality.ONE_TO_ONE && (
<>
<div className="text-md font-semibold break-keep mt-2">
{t("many_side_label")}:
</div>
<Input
value={data.manyLabel}
placeholder={t("label")}
onChange={(value) => updateRelationship(data.id, { manyLabel: value })}
onFocus={(e) => setEditField({ manyLabel: e.target.value })}
defaultValue="n"
onBlur={(e) => {
if (e.target.value === editField.manyLabel) return;
setUndoStack((prev) => [
...prev,
{
action: Action.EDIT,
element: ObjectType.RELATIONSHIP,
component: "self",
rid: data.id,
undo: editField,
redo: { manyLabel: e.target.value },
message: t("edit_relationship", {
refName: e.target.value,
extra: "[manyLabel]",
}),
},
]);
setRedoStack([]);
}}
/>
</>
)}

<Row gutter={6} className="my-3">
<Col span={12}>
<div className="font-semibold">{t("on_update")}: </div>
Expand Down
2 changes: 2 additions & 0 deletions src/i18n/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ const en = {
export_saved_data: "Export saved data",
dbml_view: "DBML view",
tab_view: "Tab view",
label: "Label",
many_side_label: "Many(n) side label",
},
};

Expand Down