fix bug with topBottom aligment

susielu · Mar 14, 2017 · 09f6362 · 09f6362
1 parent 36286ff
commit 09f6362
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/d3-annotation.js b/d3-annotation.js
@@ -4310,10 +4310,9 @@ exports.default = function (_ref) {
 
   var x = -bbox.x;
   var y = -bbox.y;
-
   if (orientationTopBottom.indexOf(orientation) !== -1) {
     align = topBottomDynamic(align, offset.x);
-    if (offset.y < 0 && orientation === "topBotom" || orientation === "top") {
+    if (offset.y < 0 && orientation === "topBottom" || orientation === "top") {
       y -= bbox.height + padding;
     } else {
       y += padding;
@@ -4909,6 +4908,7 @@ var Type = exports.Type = function () {
       if (lineType === "vertical") orientation = "leftRight";else if (lineType === "horizontal") orientation = "topBottom";
 
       var noteParams = { padding: padding, bbox: context.bbox, offset: this.annotation.offset, orientation: orientation, align: align };
+      console.log('draw note content', orientation, lineType, align);
 
       var _noteAlignment = (0, _alignment2.default)(noteParams),
           x = _noteAlignment.x,

diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/docs/bundle.map b/docs/bundle.map
diff --git a/src/Note/alignment.js b/src/Note/alignment.js
@@ -22,10 +22,9 @@ const orientationLeftRight = ["leftRight", "left", "right"]
 export default ({ padding=0, bbox={x:0, y:0, width:0, height:0}, align, orientation, offset={x:0, y:0} }) => {
   let x = -bbox.x 
   let y = -bbox.y
-
   if ( orientationTopBottom.indexOf(orientation) !== -1 ) {
     align = topBottomDynamic(align, offset.x)
-    if (offset.y < 0 && orientation === "topBotom" || orientation === "top") { 
+    if (offset.y < 0 && orientation === "topBottom" || orientation === "top") { 
       y -= bbox.height + padding
     } else {
       y += padding

diff --git a/src/Types-d3.js b/src/Types-d3.js
@@ -201,7 +201,7 @@ export class Type {
 
     const noteParams = { padding, bbox: context.bbox, offset: 
     this.annotation.offset, orientation, align }
-
+    console.log('draw note content', orientation, lineType, align)
     const { x, y } = noteAlignment(noteParams)
     this.offsetCornerX = x + this.annotation.dx
     this.offsetCornerY = y + this.annotation.dy

diff --git a/test/note.js b/test/note.js
@@ -21,10 +21,10 @@ describe('Note-alignment', function () {
     expect(a.x).to.equal(0)
     expect(a.y).to.equal(-50)
 
-    a = alignment(assign(set, { orientation: "topBottom"}))
+    a = alignment(assign(set, { orientation: "topBottom", offset: {x: 0, y: -100}}))
 
     expect(a.x).to.equal(0)
-    expect(a.y).to.equal(0)
+    expect(a.y).to.equal(-50)
   })
 
   it ('stays if orientation is left', function () {