Merge remote-tracking branch 'origin/master' into cam/7334/switch-geodata-providers

Author: camdecoster

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
     - run: npm run pretest
     - run: npm ci
     - run: npm run cibuild
-    - name: Run headless test
+    - name: Run noCI tests
       uses: coactions/setup-xvfb@v1
       with:
         run: ./tasks/noci_test.sh jasmine

draftlogs/7390_fix.md

@@ -0,0 +1 @@
+- Fix performance warning in scattergl traces, [[#7390](https://github.com/plotly/plotly.js/pull/7390)], with thanks to @MzyzzG for the contribution!

package-lock.json

@@ -60,12 +60,12 @@ var exports = module.exports = function plot(gd, subplot, cdata) {
     linkTraces(gd, subplot, cdata);
 
     if(scene.dirty) {
-        if(
+        if (
             (scene.line2d || scene.error2d) &&
             !(scene.scatter2d || scene.fill2d || scene.glText)
         ) {
             // Fixes shared WebGL context drawing lines only case
-            regl.clear({});
+            regl.clear({ color: true, depth: true });
         }
 
         // make sure scenes are created

src/traces/scattergl/plot.js

@@ -145,6 +145,10 @@ var hasSpecReporter = reporters.indexOf('spec') !== -1;
 if(!hasSpecReporter && argv.showSkipped) reporters.push('spec');
 if(argv.verbose) reporters.push('verbose');
 
+if(process.argv.indexOf('--tags=noCI,noCIdep') !== -1) {
+    reporters = ['dots'];
+}
+
 function func(config) {
     // level of logging
     // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG

test/jasmine/karma.conf.js

@@ -2641,8 +2641,6 @@ describe('Test select box and lasso per trace:', function() {
         it('@noCI should work for waterfall traces, hasCssTransform: ' + hasCssTransform, function(done) {
             var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
             var assertSelectedPoints = makeAssertSelectedPoints();
-            var assertRanges = makeAssertRanges();
-            var assertLassoPoints = makeAssertLassoPoints();
 
             var fig = Lib.extendDeep({}, require('../../image/mocks/waterfall_profit-loss_2018_positive-negative'));
             fig.layout.dragmode = 'lasso';
@@ -2657,14 +2655,11 @@ describe('Test select box and lasso per trace:', function() {
                     function() {
                         assertPoints([
                             [0, 281, 'Purchases'],
-                            [0, 269, 'Material expenses'],                        ]);
+                            [0, 269, 'Material expenses'],
+                        ]);
                         assertSelectedPoints({
                             0: [5, 6]
                         });
-                        assertLassoPoints([
-                            [289.8550, 57.9710 ,521.7391, 405.7971],
-                            [4.3387, 6.7580, 6.7580, 5.5483]
-                        ]);
                     },
                     null, [3, 2, 1], 'waterfall lasso'
                 );
@@ -2683,10 +2678,6 @@ describe('Test select box and lasso per trace:', function() {
                         assertSelectedPoints({
                             0: [5, 6]
                         });
-                        assertRanges([
-                            [173.9130, 289.8550],
-                            [4.3387, 6.7580]
-                        ]);
                     },
                     null, BOXEVENTS, 'waterfall select'
                 );
@@ -2699,7 +2690,6 @@ describe('Test select box and lasso per trace:', function() {
         it('@noCI should work for funnel traces, hasCssTransform: ' + hasCssTransform, function(done) {
             var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
             var assertSelectedPoints = makeAssertSelectedPoints();
-            var assertLassoPoints = makeAssertLassoPoints();
 
             var fig = Lib.extendDeep({}, require('../../image/mocks/funnel_horizontal_group_basic'));
             fig.layout.dragmode = 'lasso';
@@ -2720,10 +2710,6 @@ describe('Test select box and lasso per trace:', function() {
                             0: [2],
                             1: [1]
                         });
-                        assertLassoPoints([
-                            [-140.1492, -1697.3631, 1417.0646, 638.4577],
-                            [1.1129, 1.9193 , 1.9193, 1.5161]
-                        ]);
                     },
                     null, [3, 2, 1], 'funnel lasso'
                 );