apply Drawing.hideOutsideRangePoints to trace groups

- to allow it to pass trace-wide property (e.g. input calendars)

Author: etpinard

src/components/drawing/index.js

@@ -99,14 +99,16 @@ drawing.hideOutsideRangePoint = function(d, sel, xa, ya) {
     );
 };
 
-drawing.hideOutsideRangePoints = function(points, subplot) {
+drawing.hideOutsideRangePoints = function(traceGroups, subplot) {
     if(!subplot._hasClipOnAxisFalse) return;
 
     var xa = subplot.xaxis;
     var ya = subplot.yaxis;
 
-    points.each(function(d) {
-        drawing.hideOutsideRangePoint(d, d3.select(this), xa, ya);
+    traceGroups.each(function(d) {
+        traceGroups.selectAll('.point,.textpoint').each(function(d) {
+            drawing.hideOutsideRangePoint(d, d3.select(this), xa, ya);
+        });
     });
 };
 

src/plots/cartesian/dragbox.js

@@ -751,21 +751,21 @@ module.exports = function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
                 .call(Drawing.setTranslate, clipDx, clipDy)
                 .call(Drawing.setScale, xScaleFactor2, yScaleFactor2);
 
-            var scatterPoints = subplot.plot.selectAll('.scatterlayer .points, .boxlayer .points');
+            var traceGroups = subplot.plot
+                .selectAll('.scatterlayer .trace, .boxlayer .trace');
 
             subplot.plot
                 .call(Drawing.setTranslate, plotDx, plotDy)
                 .call(Drawing.setScale, 1 / xScaleFactor2, 1 / yScaleFactor2);
 
-            // This is specifically directed at scatter traces, applying an inverse
-            // scale to individual points to counteract the scale of the trace
-            // as a whole:
-            scatterPoints.selectAll('.point')
-                .call(Drawing.setPointGroupScale, xScaleFactor2, yScaleFactor2)
-                .call(Drawing.hideOutsideRangePoints, subplot);
-
-            scatterPoints.selectAll('.textpoint')
-                .call(Drawing.setTextPointsScale, xScaleFactor2, yScaleFactor2)
+            // This is specifically directed at marker points in scatter, box and violin traces,
+            // applying an inverse scale to individual points to counteract
+            // the scale of the trace as a whole:
+            traceGroups.selectAll('.point')
+                .call(Drawing.setPointGroupScale, xScaleFactor2, yScaleFactor2);
+            traceGroups.selectAll('.textpoint')
+                .call(Drawing.setTextPointsScale, xScaleFactor2, yScaleFactor2);
+            traceGroups
                 .call(Drawing.hideOutsideRangePoints, subplot);
         }
     }

src/plots/cartesian/transition_axes.js

@@ -161,17 +161,16 @@ module.exports = function transitionAxes(gd, newLayout, transitionOpts, makeOnCo
             .call(Drawing.setTranslate, xa2._offset, ya2._offset)
             .call(Drawing.setScale, 1, 1);
 
-        var scatterPoints = subplot.plot.select('.scatterlayer').selectAll('.points');
+        var traceGroups = subplot.plot.selectAll('.scatterlayer .trace');
 
         // This is specifically directed at scatter traces, applying an inverse
         // scale to individual points to counteract the scale of the trace
         // as a whole:
-        scatterPoints.selectAll('.point')
-            .call(Drawing.setPointGroupScale, 1, 1)
-            .call(Drawing.hideOutsideRangePoints, subplot);
-
-        scatterPoints.selectAll('.textpoint')
-            .call(Drawing.setTextPointsScale, 1, 1)
+        traceGroups.selectAll('.point')
+            .call(Drawing.setPointGroupScale, 1, 1);
+        traceGroups.selectAll('.textpoint')
+            .call(Drawing.setTextPointsScale, 1, 1);
+        traceGroups
             .call(Drawing.hideOutsideRangePoints, subplot);
     }
 

src/plots/ternary/ternary.js

@@ -652,13 +652,8 @@ proto.initInteractions = function() {
         _this.plotContainer.selectAll('.crisp').classed('crisp', false);
 
         if(_this._hasClipOnAxisFalse) {
-            var scatterPoints = _this.plotContainer
-                .select('.scatterlayer').selectAll('.points');
-
-            scatterPoints.selectAll('.point')
-                .call(Drawing.hideOutsideRangePoints, _this);
-
-            scatterPoints.selectAll('.textpoint')
+            _this.plotContainer
+                .select('.scatterlayer').selectAll('.trace')
                 .call(Drawing.hideOutsideRangePoints, _this);
         }
     }