note to self - dont set defaults in constructors

metricsgraphics · May 19, 2022 · d8a3b2e · d8a3b2e
1 parent 6c3a071
commit d8a3b2e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/lib/src/charts/abstractChart.ts b/lib/src/charts/abstractChart.ts
@@ -137,8 +137,8 @@ export default abstract class AbstractChart {
     target,
     markers,
     baselines,
-    xAccessor = 'date',
-    yAccessor = 'value',
+    xAccessor,
+    yAccessor,
     margin,
     buffer,
     width,
@@ -154,6 +154,10 @@ export default abstract class AbstractChart {
     brush,
     computeDomains
   }: IAbstractChart) {
+    // convert string accessors to functions if necessary
+    this.xAccessor = makeAccessorFunction(xAccessor ?? 'date')
+    this.yAccessor = makeAccessorFunction(yAccessor ?? 'value')
+
     // set parameters
     this.data = data
     this.target = select(target)
@@ -166,9 +170,6 @@ export default abstract class AbstractChart {
     this.showTooltip = showTooltip ?? true
     this.tooltipFunction = tooltipFunction
 
-    // convert string accessors to functions if necessary
-    this.xAccessor = makeAccessorFunction(xAccessor)
-    this.yAccessor = makeAccessorFunction(yAccessor)
     this.margin = margin ?? { top: 10, left: 60, right: 20, bottom: 40 }
     this.buffer = buffer ?? 10
 

diff --git a/lib/src/charts/scatter.ts b/lib/src/charts/scatter.ts
@@ -33,10 +33,10 @@ export default class ScatterChart extends AbstractChart {
   yRug?: Rug
   _activePoint: ActivePoint = { i: -1, j: -1 }
 
-  constructor({ sizeAccessor = () => 3, xRug = false, yRug = false, ...args }: IScatterChart) {
+  constructor({ sizeAccessor, xRug, yRug, ...args }: IScatterChart) {
     super(args)
-    this.showXRug = xRug
-    this.showYRug = yRug
+    this.showXRug = xRug ?? false
+    this.showYRug = yRug ?? false
 
     this.sizeAccessor = sizeAccessor ? makeAccessorFunction(sizeAccessor) : () => 3
 

diff --git a/lib/src/components/delaunay.ts b/lib/src/components/delaunay.ts
@@ -57,7 +57,7 @@ export default class Delaunay {
   onLeave: EmptyInteractionFunction
 
   constructor({
-    points = [],
+    points,
     xAccessor,
     yAccessor,
     xScale,
@@ -69,13 +69,13 @@ export default class Delaunay {
     aggregate,
     defined
   }: IDelaunay) {
+    this.xAccessor = xAccessor
+    this.yAccessor = yAccessor
     this.xScale = xScale
     this.yScale = yScale
     this.onPoint = onPoint ?? (() => null)
     this.onLeave = onLeave ?? (() => null)
     this.onClick = onClick ?? this.onClick
-    this.xAccessor = xAccessor
-    this.yAccessor = yAccessor
     this.aggregate = aggregate ?? this.aggregate
 
     // normalize passed points

diff --git a/lib/src/components/point.ts b/lib/src/components/point.ts
@@ -25,11 +25,11 @@ export default class Point extends AbstractShape {
   }
 
   get cx(): number {
-    return this.xScale.scaleObject(this.xAccessor(this.data))!
+    return this.xScale.scaleObject(this.xAccessor(this.data))
   }
 
   get cy(): number {
-    return this.yScale.scaleObject(this.yAccessor(this.data))!
+    return this.yScale.scaleObject(this.yAccessor(this.data))
   }
 
   /**

diff --git a/lib/src/components/rect.ts b/lib/src/components/rect.ts
@@ -30,19 +30,19 @@ export default class Rect extends AbstractShape {
   }
 
   get x(): number {
-    return this.xScale.scaleObject(this.xAccessor(this.data))!
+    return this.xScale.scaleObject(this.xAccessor(this.data))
   }
 
   get y(): number {
-    return this.yScale.scaleObject(this.yAccessor(this.data))!
+    return this.yScale.scaleObject(this.yAccessor(this.data))
   }
 
   get width(): number {
     return Math.max(0, Math.abs(this.widthAccessor(this.data)))
   }
 
   get height(): number {
-    return Math.max(0, this.yScale.scaleObject(this.heightAccessor(this.data))!)
+    return Math.max(0, this.yScale.scaleObject(this.heightAccessor(this.data)))
   }
 
   /**