Add colorScaleKey parameter to abstractscale constructor

Author: keller-mark

package.json

@@ -1,6 +1,6 @@
 {
  "name": "vue-declarative-plots",
- "version": "1.2.30",
+ "version": "1.2.31",
  "private": false,
  "scripts": {
  "serve": "vue-cli-service serve --open ./examples-src/index.js",

src/components/plots/StratifiedSinaPlot.vue

@@ -412,7 +412,7 @@ export default {
 
  // Draw the points
  let histogram = d3_histogram()
- .domain(y.domain())
+ .domain(yScale.domainFiltered)
  .value((d) => d[vm.variable] || 0);
  
  let bins = histogram(boxData);

src/scales/AbstractScale.js

@@ -98,12 +98,18 @@ export default class AbstractScale extends AbstractScaleDispatcher {
  * @param {*} name The name for the scale.
  * @param {*} domain The domain for the scale.
  */
- constructor(id, name, domain) {
+ constructor(id, name, domain, colorScaleKey) {
  super();
  this._id = id;
  this._name = name;
 
- this._colorScale = AbstractScale.defaultColorScale;
+ if(colorScaleKey === undefined) {
+ this._colorScaleOriginal = AbstractScale.defaultColorScale;
+ this._colorScale = AbstractScale.defaultColorScale;
+ } else {
+ this._colorScaleOriginal = AbstractScale.colorScales[colorScaleKey];
+ this._colorScale = AbstractScale.colorScales[colorScaleKey];
+ }
 
  this._domain = [];
  this._domainFiltered = [];
@@ -247,7 +253,7 @@ export default class AbstractScale extends AbstractScaleDispatcher {
  * Resets the color scale.
  */
  resetColorScale() {
- this._colorScale = AbstractScale.defaultColorScale;
+ this._colorScale = this._colorScaleOriginal;
  this.emitUpdate();
  }
 

src/scales/CategoricalScale.js

@@ -18,8 +18,8 @@ export default class CategoricalScale extends AbstractScale {
  * @param {array} humanDomain The humanDomain for the scale, or a promise. Optional.
  * @param {object} colorOverrides The default colorOverrides for the scale. Optional.
  */
- constructor(id, name, domain, humanDomain, colorOverrides) {
- super(id, name, domain);
+ constructor(id, name, domain, humanDomain, colorOverrides, colorScaleKey) {
+ super(id, name, domain, colorScaleKey);
 
  this._humanDomain = undefined;