centralize functions in parcoords helpers

Author: archmoj

src/traces/parcoords/helpers.js

@@ -0,0 +1,23 @@
+/**
+* Copyright 2012-2019, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var isTypedArray = require('../../lib').isTypedArray;
+
+exports.convertTypedArray = function(a) {
+    return isTypedArray(a) ? Array.prototype.slice.call(a) : a;
+};
+
+exports.isOrdinal = function(dimension) {
+    return !!dimension.tickvals;
+};
+
+exports.isVisible = function(dimension) {
+    return dimension.visible || !('visible' in dimension);
+};

src/traces/parcoords/parcoords.js

@@ -22,16 +22,11 @@ var keyFun = gup.keyFun;
 var repeat = gup.repeat;
 var unwrap = gup.unwrap;
 
+var helpers = require('./helpers');
 var c = require('./constants');
 var brush = require('./axisbrush');
 var lineLayerMaker = require('./lines');
 
-function convertTypedArray(a) {
-    return Lib.isTypedArray(a) ? Array.prototype.slice.call(a) : a;
-}
-
-function visible(dimension) { return !('visible' in dimension) || dimension.visible; }
-
 function dimensionExtent(dimension) {
     var lo = dimension.range ? dimension.range[0] : Lib.aggNums(Math.min, null, dimension.values, dimension._length);
     var hi = dimension.range ? dimension.range[1] : Lib.aggNums(Math.max, null, dimension.values, dimension._length);
@@ -88,7 +83,9 @@ function domainScale(height, padding, dimension, tickvals, ticktext) {
         .range([height - padding, padding]);
 }
 
-function unitToPaddedPx(height, padding) { return d3.scale.linear().range([padding, height - padding]); }
+function unitToPaddedPx(height, padding) {
+    return d3.scale.linear().range([padding, height - padding]);
+}
 
 function domainToPaddedUnitScale(dimension, padFraction) {
     return d3.scale.linear()
@@ -140,7 +137,7 @@ function someFiltersActive(view) {
 function model(layout, d, i) {
     var cd0 = unwrap(d);
     var trace = cd0.trace;
-    var lineColor = convertTypedArray(cd0.lineColor);
+    var lineColor = helpers.convertTypedArray(cd0.lineColor);
     var line = trace.line;
     var cOpts = Colorscale.extractOpts(line);
     var cscale = cOpts.reversescale ? Colorscale.flipScale(cd0.cscale) : cd0.cscale;
@@ -172,7 +169,7 @@ function model(layout, d, i) {
 
     return {
         key: i,
-        colCount: dimensions.filter(visible).length,
+        colCount: dimensions.filter(helpers.isVisible).length,
         dimensions: dimensions,
         tickDistance: c.tickDistance,
         unitToColor: unitToColorScale(cscale),
@@ -216,7 +213,7 @@ function viewModel(state, callbacks, model) {
 
     var uniqueKeys = {};
 
-    viewModel.dimensions = dimensions.filter(visible).map(function(dimension, i) {
+    viewModel.dimensions = dimensions.filter(helpers.isVisible).map(function(dimension, i) {
         var domainToPaddedUnit = domainToPaddedUnitScale(dimension, unitPad);
         var foundKey = uniqueKeys[dimension.label];
         uniqueKeys[dimension.label] = (foundKey || 0) + 1;
@@ -276,16 +273,16 @@ function viewModel(state, callbacks, model) {
             }
         } else tickvals = undefined;
 
-        truncatedValues = convertTypedArray(truncatedValues);
-        truncatedValues = convertTypedArray(truncatedValues);
+        truncatedValues = helpers.convertTypedArray(truncatedValues);
+        truncatedValues = helpers.convertTypedArray(truncatedValues);
 
         return {
             key: key,
             label: dimension.label,
             tickFormat: dimension.tickformat,
             tickvals: tickvals,
             ticktext: ticktext,
-            ordinal: !!tickvals,
+            ordinal: helpers.isOrdinal(dimension),
             multiselect: dimension.multiselect,
             xIndex: i,
             crossfilterDimensionIndex: i,

src/traces/parcoords/plot.js

@@ -10,10 +10,7 @@
 
 var parcoords = require('./parcoords');
 var prepareRegl = require('../../lib/prepare_regl');
-
-function visible(dimension) {
-    return dimension.visible || !('visible' in dimension);
-}
+var isVisible = require('./helpers').isVisible;
 
 function newIndex(visibleIndices, orig, dim) {
     var origIndex = orig.indexOf(dim);
@@ -107,12 +104,12 @@ module.exports = function plot(gd, cdModule) {
         // without having to incur heavy UI blocking due to an actual `Plotly.restyle` call
 
         // drag&drop sorting of the visible dimensions
-        var orig = sorter(visibleIndices, initialDims[i].filter(visible));
+        var orig = sorter(visibleIndices, initialDims[i].filter(isVisible));
         currentDims[i].sort(orig);
 
         // invisible dimensions are not interpreted in the context of drag&drop sorting as an invisible dimension
         // cannot be dragged; they're interspersed into their original positions by this subsequent merging step
-        initialDims[i].filter(function(d) {return !visible(d);})
+        initialDims[i].filter(function(d) {return !isVisible(d);})
              .sort(function(d) {
                  // subsequent splicing to be done left to right, otherwise indices may be incorrect
                  return initialDims[i].indexOf(d);