Merge pull request #167 from VisActor/fix/continuous-clamp

fix: fix clamp of comtinuous scale

packages/vscale/__tests__/clamp.test.ts

@@ -0,0 +1,15 @@
+import { LinearScale } from '../src/linear-scale';
+
+test('linear(x) will not ignores extra range values if the domain is smaller than the range', function () {
+  const scale = new LinearScale();
+
+  scale.clamp(true).domain([-10, 10]).range([100, 200]);
+  expect(scale.scale(0)).toBe(150);
+  expect(scale.scale(-50)).toBe(100);
+  expect(scale.scale(50)).toBe(200);
+
+  scale.domain([-100, 100]);
+  expect(scale.scale(0)).toBe(150);
+  expect(scale.scale(-50)).toBe(125);
+  expect(scale.scale(50)).toBe(175);
+});

packages/vscale/src/continuous-scale.ts

@@ -33,6 +33,7 @@ export class ContinuousScale extends BaseScale implements IContinuousScale {
   protected _domainValidator?: (val: number) => boolean;
 
   _clamp?: (x: number) => number;
+  _autoClamp?: boolean;
 
   constructor(transformer: TransformType = identity, untransformer: TransformType = identity) {
     super();
@@ -154,7 +155,7 @@ export class ContinuousScale extends BaseScale implements IContinuousScale {
       n = rangeLength;
     }
 
-    if (this._clamp === undefined) {
+    if (this._autoClamp) {
       this._clamp = clamper(domain[0], domain[n - 1]);
     }
     this._piecewise = n > 2 ? polymap : bimap;
@@ -172,8 +173,10 @@ export class ContinuousScale extends BaseScale implements IContinuousScale {
       return this._clamp !== identity;
     }
     if (f) {
+      this._autoClamp = false;
       this._clamp = f;
     } else {
+      this._autoClamp = !!_;
       this._clamp = _ ? undefined : identity;
     }