fix(core): fix the previous commit (snapping)

Tests failed, and the approach wasn't particularly good
khurrammaqbool · Apr 11, 2022 · a0341b0 · a0341b0
1 parent aaebdc2
commit a0341b0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/packages/core/src/genome/scaleIndex.js b/packages/core/src/genome/scaleIndex.js
@@ -34,7 +34,8 @@ export default function scaleIndex() {
      */
     const scale = /** @type {any} */ (scaleFunction);
 
-    scale.invert = (y) => ((y - range[0]) / rangeSpan) * domainSpan + domain[0];
+    scale.invert = (y) =>
+        ((y - range[0]) / rangeSpan) * domainSpan + domain[0] - align;
 
     // @ts-expect-error
     scale.domain = function (_) {

diff --git a/packages/core/src/genome/scaleIndex.test.js b/packages/core/src/genome/scaleIndex.test.js
@@ -4,21 +4,37 @@ import scaleIndex from "./scaleIndex";
 test("Scale with defaults works as expected", () => {
     const scale = scaleIndex();
 
-    expect(scale(-1)).toEqual(-1);
-    expect(scale(0)).toEqual(0);
-    expect(scale(1)).toEqual(1);
-    expect(scale(2)).toEqual(2);
+    // Align is 0.5 by default
+    expect(scale(-1)).toEqual(-0.5);
+    expect(scale(0)).toEqual(0.5);
+    expect(scale(1)).toEqual(1.5);
+    expect(scale(2)).toEqual(2.5);
 });
 
 test("Scale scales correctly with custom domain and range", () => {
-    const scale = scaleIndex().domain([0, 10]).range([100, 200]);
+    const scale = scaleIndex().domain([0, 10]).range([100, 200]).align(0.0);
 
     expect(scale(0)).toEqual(100);
     expect(scale(10)).toEqual(200);
 });
 
 test("Invert works as expected", () => {
-    const scale = scaleIndex().domain([0, 10]).range([100, 200]);
+    const scale = scaleIndex().domain([0, 10]).range([100, 200]).align(0.0);
+
+    expect(scale.invert(scale(0))).toEqual(0);
+    expect(scale.invert(scale(5))).toEqual(5);
+    expect(scale.invert(scale(10))).toEqual(10);
+});
+
+test("Scale scales correctly with custom domain, range, and align", () => {
+    const scale = scaleIndex().domain([0, 10]).range([100, 200]).align(0.5);
+
+    expect(scale(0)).toEqual(105);
+    expect(scale(10)).toEqual(205);
+});
+
+test("Invert works as expected with align", () => {
+    const scale = scaleIndex().domain([0, 10]).range([100, 200]).align(0.5);
 
     expect(scale.invert(scale(0))).toEqual(0);
     expect(scale.invert(scale(5))).toEqual(5);

diff --git a/packages/core/src/view/scaleResolution.js b/packages/core/src/view/scaleResolution.js
@@ -395,12 +395,16 @@ export default class ScaleResolution {
         let newDomain = [...oldDomain];
 
         // @ts-expect-error
-        const anchor = scale.invert(scaleAnchor);
+        let anchor = scale.invert(scaleAnchor);
 
         if (this.getScaleProps().reverse) {
             pan = -pan;
         }
 
+        if ("align" in scale) {
+            anchor += scale.align();
+        }
+
         // TODO: symlog
         switch (scale.type) {
             case "linear":