From bec3cc437dc991cc36af96e06e088f150638655b Mon Sep 17 00:00:00 2001
From: Ashish Jain <ashishjain0512@gmail.com>
Date: Thu, 13 Aug 2020 20:08:09 +0200
Subject: [PATCH] Fix for interface rendering and positioning

---
 cypress/platform/class.html |  2 ++
 src/dagre-wrapper/nodes.js  | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cypress/platform/class.html b/cypress/platform/class.html
index e10d4392c..237b41310 100644
--- a/cypress/platform/class.html
+++ b/cypress/platform/class.html
@@ -54,6 +54,8 @@
         Customer "1" --> "*" Ticket
     Student "1" --> "1..*" Course
     Galaxy --> "many" Star : Contains
+    &lt;&lt;interface&gt;&gt; Customer
+    &lt;&lt;Service&gt;&gt; Galaxy
       </div>
       <script src="./mermaid.js"></script>
     <script>
diff --git a/src/dagre-wrapper/nodes.js b/src/dagre-wrapper/nodes.js
index a434ed4ab..3d3d5e6e0 100644
--- a/src/dagre-wrapper/nodes.js
+++ b/src/dagre-wrapper/nodes.js
@@ -568,9 +568,12 @@ const class_box = (parent, node) => {
   const hasInterface = node.classData.annotations && node.classData.annotations[0];
 
   // 1. Create the labels
+  const interfaceLabelText = node.classData.annotations[0]
+    ? '<<' + node.classData.annotations[0] + '>>'
+    : '';
   const interfaceLabel = labelContainer
     .node()
-    .appendChild(createLabel(node.classData.annotations[0], node.labelStyle, true, true));
+    .appendChild(createLabel(interfaceLabelText, node.labelStyle, true, true));
   const interfaceBBox = interfaceLabel.getBBox();
   if (node.classData.annotations[0]) {
     maxHeight += interfaceBBox.height + rowPadding;
@@ -614,13 +617,10 @@ const class_box = (parent, node) => {
 
   // position the interface label
   if (hasInterface) {
+    let diffX = (maxWidth - interfaceBBox.width) / 2;
     select(interfaceLabel).attr(
       'transform',
-      'translate( ' +
-        -(maxWidth + node.padding - interfaceBBox.width / 2) / 2 +
-        ', ' +
-        (-1 * maxHeight) / 2 +
-        ')'
+      'translate( ' + ((-1 * maxWidth) / 2 + diffX) + ', ' + (-1 * maxHeight) / 2 + ')'
     );
     verticalPos = interfaceBBox.height + rowPadding;
   }