fix(layouts.PortLabel): center the position of oriented outside/insid…

…e labels, remove redundant code from manual layout (#2036)
clientIO · Feb 14, 2023 · 93a1c20 · 93a1c20
1 parent f9dd510
commit 93a1c20
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/layout/ports/portLabel.mjs b/src/layout/ports/portLabel.mjs
@@ -32,29 +32,31 @@ function outsideLayout(portPosition, elBBox, autoOrient, opt) {
         ty = 0;
         textAnchor = 'start';
     } else if (angle < x[0]) {
-        y = '0';
         tx = 0;
         ty = -offset;
         if (autoOrient) {
             orientAngle = -90;
             textAnchor = 'start';
+            y = '.3em';
         } else {
             textAnchor = 'middle';
+            y = '0';
         }
     } else if (angle < x[3]) {
         y = '.3em';
         tx = -offset;
         ty = 0;
         textAnchor = 'end';
     } else {
-        y = '.6em';
         tx = 0;
         ty = offset;
         if (autoOrient) {
             orientAngle = 90;
             textAnchor = 'start';
+            y = '.3em';
         } else {
             textAnchor = 'middle';
+            y = '.6em';
         }
     }
 
@@ -101,29 +103,31 @@ function insideLayout(portPosition, elBBox, autoOrient, opt) {
         ty = 0;
         textAnchor = 'end';
     } else if (angle < bBoxAngles[0]) {
-        y = '.6em';
         tx = 0;
         ty = offset;
         if (autoOrient) {
             orientAngle = 90;
             textAnchor = 'start';
+            y = '.3em';
         } else {
             textAnchor = 'middle';
+            y = '.6em';
         }
     } else if (angle < bBoxAngles[3]) {
         y = '.3em';
         tx = offset;
         ty = 0;
         textAnchor = 'start';
     } else {
-        y = '0em';
         tx = 0;
         ty = -offset;
         if (autoOrient) {
             orientAngle = -90;
             textAnchor = 'start';
+            y = '.3em';
         } else {
             textAnchor = 'middle';
+            y = '0';
         }
     }
 
@@ -182,8 +186,8 @@ function radialLayout(portCenterOffset, autoOrient, opt) {
     });
 }
 
-export const manual = function(portPosition, elBBox, opt) {
-    return labelAttributes(opt, elBBox);
+export const manual = function(_portPosition, _elBBox, opt) {
+    return labelAttributes(opt);
 };
 
 export const left = function(portPosition, elBBox, opt) {