Skip to content

Commit d37c0db

Browse files
Merge pull request #7730 from aloisklink/fix/fix-edgeLabelRightLeft-changes
fix: revert endEdgeLabelLeft/endEdgeLabelRight change
2 parents 5ab5a28 + 18f8b4c commit d37c0db

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

  • packages/mermaid/src

packages/mermaid/src/dagre-wrapper/edges.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ export const insertEdgeLabel = async (elem, edge) => {
119119
}
120120
if (edge.endLabelLeft) {
121121
const endEdgeLabelLeft = elem.insert('g').attr('class', 'edgeTerminals');
122+
// TODO: Remove? `inner` is not used
122123
const inner = endEdgeLabelLeft.insert('g').attr('class', 'inner');
123-
const endLabelElement = await createLabel(inner, edge.endLabelLeft, edge.labelStyle);
124+
const endLabelElement = await createLabel(endEdgeLabelLeft, edge.endLabelLeft, edge.labelStyle);
124125
fo = endLabelElement;
125126
let slBox = endLabelElement.getBBox();
126127
if (useHtmlLabels) {
@@ -140,8 +141,13 @@ export const insertEdgeLabel = async (elem, edge) => {
140141
}
141142
if (edge.endLabelRight) {
142143
const endEdgeLabelRight = elem.insert('g').attr('class', 'edgeTerminals');
144+
// TODO: Remove? `inner` is not used
143145
const inner = endEdgeLabelRight.insert('g').attr('class', 'inner');
144-
const endLabelElement = await createLabel(inner, edge.endLabelRight, edge.labelStyle);
146+
const endLabelElement = await createLabel(
147+
endEdgeLabelRight,
148+
edge.endLabelRight,
149+
edge.labelStyle
150+
);
145151
fo = endLabelElement;
146152
let slBox = endLabelElement.getBBox();
147153
if (useHtmlLabels) {

packages/mermaid/src/rendering-util/rendering-elements/edges.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,10 @@ export const insertEdgeLabel = async (elem, edge) => {
176176
}
177177
if (edge.endLabelLeft) {
178178
const endEdgeLabelLeft = elem.insert('g').attr('class', 'edgeTerminals');
179+
// TODO: Remove? `inner` is not used
179180
const inner = endEdgeLabelLeft.insert('g').attr('class', 'inner');
180181
const endLabelElement = await createLabel(
181-
inner,
182+
endEdgeLabelLeft,
182183
edge.endLabelLeft,
183184
getLabelStyles(edge.labelStyle) || '',
184185
false,
@@ -203,9 +204,10 @@ export const insertEdgeLabel = async (elem, edge) => {
203204
}
204205
if (edge.endLabelRight) {
205206
const endEdgeLabelRight = elem.insert('g').attr('class', 'edgeTerminals');
207+
// TODO: Remove? `inner` is not used
206208
const inner = endEdgeLabelRight.insert('g').attr('class', 'inner');
207209
const endLabelElement = await createLabel(
208-
inner,
210+
endEdgeLabelRight,
209211
edge.endLabelRight,
210212
getLabelStyles(edge.labelStyle) || '',
211213
false,

0 commit comments

Comments
 (0)