Merge remote-tracking branch 'origin/master' into improve-box-violin-hoverlabels

archmoj · archmoj · commit 3e25576149bf · 2022-06-14T12:51:45.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -293,7 +293,9 @@ jobs:
           command: .circleci/env_image.sh
       - run:
           name: Install poppler-utils to have pdftops for exporting eps
-          command: sudo apt-get install poppler-utils
+          command: |
+              sudo apt-get update --allow-releaseinfo-change
+              sudo apt-get install poppler-utils
       - run:
           name: Create svg, jpg, jpeg, webp, pdf and eps files
           command: python3 test/image/make_exports.py
diff --git a/README.md b/README.md
@@ -87,13 +87,14 @@ While non-minified source files may contain characters outside UTF-8, it is reco
 
 > Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.
 
-To support MathJax, you could load either version two or version three of MathJax files, for example:
+### MathJax
+You could load either version two or version three of MathJax files, for example:
 ```html
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_SVG.js"></script>
 ```
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/mathjax@3.2.0/es5/tex-svg.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/mathjax@3.2.2/es5/tex-svg.js"></script>
 ```
 
 > When using MathJax version 3, it is also possible to use `chtml` output on the other parts of the page in addition to `svg` output for the plotly graph.
diff --git a/draftlogs/6216_add.md b/draftlogs/6216_add.md
@@ -0,0 +1 @@
+ - Add `unselected.line.color` and `unselected.line.opacity` options to `parcoords` trace [[#6216](https://github.com/plotly/plotly.js/pull/6216)]
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -133,7 +133,7 @@
     "deep-equal": "^2.0.5",
     "derequire": "^2.1.1",
     "ecstatic": "^4.1.4",
-    "eslint": "^8.15.0",
+    "eslint": "^8.17.0",
     "extra-iterable": "^2.5.22",
     "falafel": "^2.2.5",
     "fs-extra": "^10.1.0",
@@ -156,7 +156,7 @@
     "lodash": "^4.17.21",
     "madge": "^5.0.1",
     "mathjax-v2": "npm:mathjax@2.7.5",
-    "mathjax-v3": "npm:mathjax@^3.2.1",
+    "mathjax-v3": "npm:mathjax@^3.2.2",
     "minify-stream": "^2.1.0",
     "npm-link-check": "^4.0.0",
     "open": "^8.4.0",
@@ -166,7 +166,7 @@
     "read-last-lines": "^1.8.0",
     "run-series": "^1.1.9",
     "sane-topojson": "^4.0.0",
-    "sass": "^1.52.1",
+    "sass": "^1.52.3",
     "through2": "^4.0.2",
     "true-case-path": "^2.2.1",
     "watchify": "^4.0.0"
diff --git a/src/components/shapes/attributes.js b/src/components/shapes/attributes.js
@@ -103,7 +103,7 @@ module.exports = templatedArray('shape', {
 
     yref: extendFlat({}, annAttrs.yref, {
         description: [
-            'Sets the annotation\'s y coordinate axis.',
+            'Sets the shape\'s y coordinate axis.',
             axisPlaceableObjs.axisRefDescription('y', 'bottom', 'top')
         ].join(' ')
     }),
diff --git a/src/traces/parcoords/attributes.js b/src/traces/parcoords/attributes.js
@@ -133,5 +133,33 @@ module.exports = {
             autoColorDflt: false,
             editTypeOverride: 'calc'
         })
-    )
+    ),
+
+    unselected: {
+        line: {
+            color: {
+                valType: 'color',
+                dflt: '#777',
+                editType: 'plot',
+                description: [
+                    'Sets the base color of unselected lines.',
+                    'in connection with `unselected.line.opacity`.'
+                ].join(' ')
+            },
+            opacity: {
+                valType: 'number',
+                min: 0,
+                max: 1,
+                dflt: 'auto',
+                editType: 'plot',
+                description: [
+                    'Sets the opacity of unselected lines.',
+                    'The default *auto* decreases the opacity smoothly as the number of lines increases.',
+                    'Use *1* to achieve exact `unselected.line.color`.'
+                ].join(' ')
+            },
+            editType: 'plot'
+        },
+        editType: 'plot'
+    }
 };
diff --git a/src/traces/parcoords/constants.js b/src/traces/parcoords/constants.js
@@ -11,7 +11,6 @@ module.exports = {
     layers: ['contextLineLayer', 'focusLineLayer', 'pickLineLayer'],
     axisTitleOffset: 28,
     axisExtentOffset: 10,
-    deselectedLineColor: '#777',
     bar: {
         width: 4, // Visible width of the filter bar
         captureWidth: 10, // Mouse-sensitive width for interaction (Fitts law)
diff --git a/src/traces/parcoords/defaults.js b/src/traces/parcoords/defaults.js
@@ -107,4 +107,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     coerce('labelangle');
     coerce('labelside');
+
+    coerce('unselected.line.color');
+    coerce('unselected.line.opacity');
 };
diff --git a/src/traces/parcoords/lines.js b/src/traces/parcoords/lines.js
@@ -183,6 +183,7 @@ function makeItem(
     var layoutWidth = model.layoutWidth * plotGlPixelRatio;
 
     var deselectedLinesColor = model.deselectedLines.color;
+    var deselectedLinesOpacity = model.deselectedLines.opacity;
 
     var itemModel = Lib.extendFlat({
         key: crossfilterDimensionIndex,
@@ -206,8 +207,8 @@ function makeItem(
             deselectedLinesColor[0] / 255,
             deselectedLinesColor[1] / 255,
             deselectedLinesColor[2] / 255,
-            deselectedLinesColor[3] < 1 ?
-                deselectedLinesColor[3] :
+            deselectedLinesOpacity !== 'auto' ?
+                deselectedLinesColor[3] * deselectedLinesOpacity :
                 Math.max(1 / 255, Math.pow(1 / model.lines.color.length, 1 / 3))
         ],
 
diff --git a/src/traces/parcoords/parcoords.js b/src/traces/parcoords/parcoords.js
@@ -149,7 +149,10 @@ function model(layout, d, i) {
     var trace = cd0.trace;
     var lineColor = helpers.convertTypedArray(cd0.lineColor);
     var line = trace.line;
-    var deselectedLines = {color: rgba(c.deselectedLineColor)};
+    var deselectedLines = {
+        color: rgba(trace.unselected.line.color),
+        opacity: trace.unselected.line.opacity
+    };
     var cOpts = Colorscale.extractOpts(line);
     var cscale = cOpts.reversescale ? Colorscale.flipScale(cd0.cscale) : cd0.cscale;
     var domain = trace.domain;
diff --git a/test/image/baselines/gl2d_parcoords_256_colors.png b/test/image/baselines/gl2d_parcoords_256_colors.png
diff --git a/test/image/baselines/gl2d_parcoords_constraints.png b/test/image/baselines/gl2d_parcoords_constraints.png
diff --git a/test/image/baselines/gl2d_parcoords_dark_background.png b/test/image/baselines/gl2d_parcoords_dark_background.png
diff --git a/test/image/mocks/gl2d_parcoords_256_colors.json b/test/image/mocks/gl2d_parcoords_256_colors.json
@@ -2,6 +2,11 @@
     "data": [
         {
             "type": "parcoords",
+            "unselected": {
+                "line": {
+                    "color": "blue"
+                }
+            },
             "line": {
                 "colorscale": [
                     [
diff --git a/test/image/mocks/gl2d_parcoords_constraints.json b/test/image/mocks/gl2d_parcoords_constraints.json
@@ -1,5 +1,6 @@
 {
   "layout": {
+    "paper_bgcolor": "lightgray",
     "width": 1000,
     "height": 400
   },
@@ -24,6 +25,13 @@
       ]
     },
 
+    "unselected": {
+      "line": {
+        "opacity": 1,
+        "color": "white"
+      }
+    },
+
     "dimensions": [
       {
         "label": "±1.1",
diff --git a/test/image/mocks/gl2d_parcoords_dark_background.json b/test/image/mocks/gl2d_parcoords_dark_background.json
@@ -20,6 +20,12 @@
       "color": [-41, -1317, -164, -1856, -79, -931, -191, -2983, -341, -3846, -278, -3019, -523, -2357, -985, -3447, -211, -2842, -458, -4388, -784, -2563, -935, -2253, -313, -3667, -1479, -1030, -632, -623, -1945, -1324, -1221, -878, -947, -1615, -697, -575, -482, -905, -869, -433, -484, -349, -667, -248, -1135, -888, -1019, -223, -2067, -729, -579, -659, -334, -340, -554, -455, -377, -375, -453, -834, -934, -334, -369, -290, -354, -497, -490, -329, -729, -1794, -151, -1162, -3935, -1013, -509, -825, -997, -320, -680, -422, -785, -542, -563, -489, -1283, -680, -78, -450, -514, -449, -548, -661, -641, -503, -570, -257, -394, -450]
     },
 
+    "unselected": {
+      "line": {
+        "opacity": 0.5
+      }
+    },
+
     "dimensions": [
       {
         "constraintrange": [100000, 150000],
diff --git a/test/jasmine/tests/parcoords_test.js b/test/jasmine/tests/parcoords_test.js
diff --git a/test/plot-schema.json b/test/plot-schema.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ - Add `unselected.line.color` and `unselected.line.opacity` options to `parcoords` trace [[#6216](https://github.com/plotly/plotly.js/pull/6216)]