filter: auto-type filter target arrays

- use auto-typed axis data-to-calc method to filter by target array

Author: etpinard

src/transforms/filter.js

@@ -9,6 +9,7 @@
 'use strict';
 
 var Lib = require('../lib');
+var Plots = require('../plots/plots');
 var axisIds = require('../plots/cartesian/axis_ids');
 
 var INEQUALITY_OPS = ['=', '<', '>=', '>', '<='];
@@ -31,6 +32,7 @@ exports.attributes = {
         valType: 'string',
         strict: true,
         noBlank: true,
+        arrayOk: true,
         dflt: 'x',
         description: [
             'Sets the filter target by which the filter is applied.',
@@ -165,12 +167,29 @@ function getFilterArray(trace, target) {
 
         return Array.isArray(array) ? array : [];
     }
+    else if(Array.isArray(target)) return target.slice();
 
     return false;
 }
 
 function getDataToCoordFunc(gd, trace, target) {
-    var ax = axisIds.getFromTrace(gd, trace, target);
+    var ax;
+
+    // In the case of an array target, make a mock data array
+    // and call supplyDefaults to the data type and
+    // setup the data-to-calc method.
+    if(Array.isArray(target)) {
+        var mockGd = {
+            data: [{ x: target }],
+            layout: {}
+        };
+
+        Plots.supplyDefaults(mockGd);
+        ax = mockGd._fullLayout.xaxis;
+    }
+    else {
+        ax = axisIds.getFromTrace(gd, trace, target);
+    }
 
     // if 'target' has corresponding axis
     // -> use setConvert method
@@ -180,7 +199,7 @@ function getDataToCoordFunc(gd, trace, target) {
     // -> cast to String
     if(target === 'ids') return function(v) { return String(v); };
 
-    // otherwise
+    // otherwise (e.g. numeric-array of 'marker.color' or 'marker.size')
     // -> cast to Number
     return function(v) { return +v; };
 }

test/jasmine/tests/transform_filter_test.js

@@ -614,6 +614,74 @@ describe('filter transforms calc:', function() {
         expect(out[0].y).toEqual([2, 2, 3]);
         expect(out[0].ids).toEqual(['n1', 'p1', 'p2']);
     });
+
+    describe('filters should handle array *target* values', function() {
+        var _base = Lib.extendDeep({}, base);
+
+        function _assert(out, x, y, markerColor) {
+            expect(out[0].x).toEqual(x, '- x coords');
+            expect(out[0].y).toEqual(y, '- y coords');
+            expect(out[0].marker.color).toEqual(markerColor, '- marker.color arrayOk');
+            expect(out[0].marker.size).toEqual(20, '- marker.size style');
+        }
+
+        it('with numeric items', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    target: [1, 1, 0, 0, 1, 0, 1],
+                    operation: '{}',
+                    value: 0
+                }]
+            })]);
+
+            _assert(out, [-2, 0, 2], [3, 1, 3], [0.3, 0.1, 0.3]);
+            expect(out[0].transforms[0].target).toEqual([0, 0, 0]);
+        });
+
+        it('with categorical items', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    target: ['a', 'a', 'b', 'b', 'a', 'b', 'a'],
+                    operation: '{}',
+                    value: 'b'
+                }]
+            })]);
+
+            _assert(out, [-2, 0, 2], [3, 1, 3], [0.3, 0.1, 0.3]);
+            expect(out[0].transforms[0].target).toEqual(['b', 'b', 'b']);
+        });
+
+        it('with dates items', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    target: ['2015-07-20', '2016-08-01', '2016-09-01', '2016-10-21', '2016-12-02'],
+                    operation: '<',
+                    value: '2016-01-01'
+                }]
+            })]);
+
+            _assert(out, [-2], [1], [0.1]);
+            expect(out[0].transforms[0].target).toEqual(['2015-07-20']);
+        });
+
+        it('with multiple transforms (dates) ', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    target: ['2015-07-20', '2016-08-01', '2016-09-01', '2016-10-21', '2016-12-02'],
+                    operation: '>',
+                    value: '2016-01-01'
+                }, {
+                    type: 'filter',
+                    target: ['2015-07-20', '2016-08-01', '2016-09-01', '2016-10-21', '2016-12-02'],
+                    operation: '<',
+                    value: '2016-09-01'
+                }]
+            })]);
+
+            _assert(out, [-1], [2], [0.2]);
+            expect(out[0].transforms[0].target).toEqual(['2016-08-01']);
+        });
+    });
 });
 
 describe('filter transforms interactions', function() {