plotly.js 2.13.3 → 2.14.0

package/lib/locales/nl.js

@@ -3,7 +3,41 @@
 module.exports = {
     moduleType: 'locale',
     name: 'nl',
-    dictionary: {},
+    dictionary: {
+        'Autoscale': 'Automatische schaal',
+        'Click to enter Colorscale title': 'Klik om kleurenschaal titel in te vullen',
+        'Click to enter Component A title': 'Klik om Component A titel in te vullen',
+        'Click to enter Component B title': 'Klik om Component B titel in te vullen',
+        'Click to enter Component C title': 'Klik om Component C titel in te vullen',
+        'Click to enter Plot title': 'Klik om Plot titel in te vullen',
+        'Click to enter X axis title': 'Klik om x-as titel in te vullen',
+        'Click to enter Y axis title': 'Klik om y-as titel in te vullen',
+        'Click to enter radial axis title': 'Klik om radiaal-as titel in te vullen',
+        'Double-click to zoom back out': 'Zoom uit door te dubbel klikken',
+        'Download plot as a png': 'Dowload de plot als een png-bestand',
+        'Download plot': 'Download de plot',
+        'Draw circle': 'Teken cirkel',
+        'Draw closed freeform': 'Teken gesloten vorm',
+        'Draw line': 'Teken lijn',
+        'Draw open freeform': 'Teken open vorm',
+        'Draw rectangle': 'Teken rechthoek',
+        'Edit in Chart Studio': 'In Chart Studio wijzigen',
+        'Erase active shape': 'Wis huidige vorm',
+        'IE only supports svg. Changing format to svg.': 'IE ondersteunt alleen svg bestanden. Formaat gewijzigd naar svg.',
+        'Lasso Select': 'Lasso selectie',
+        'Produced with Plotly.js': 'Gemaakt met Plotly.js',
+        'Zoom': 'Inzoomen',
+        'max:': 'maximum:',
+        'mean ± σ:': 'gemiddelde ± σ:',
+        'mean:': 'gemiddelde:',
+        'min:': 'minimum:',
+        'new text': 'nieuwe tekst',
+        'open:': 'openen:',
+        'high:': 'hoog:',
+        'low:': 'laag:',
+        'source:': 'bron:',
+        'target:': 'doel:',
+    },
     format: {
         days: [
             'zondag', 'maandag', 'dinsdag', 'woensdag',
@@ -18,6 +52,12 @@ module.exports = {
             'jan', 'feb', 'maa', 'apr', 'mei', 'jun',
             'jul', 'aug', 'sep', 'okt', 'nov', 'dec'
         ],
-        date: '%d-%m-%Y'
+        date: '%d-%m-%Y',
+        decimal: ',',
+        thousands: '.',
+        year: '%Y',
+        month: '%b %Y',
+        dayMonth: '%-d %b',
+        dayMonthYear: '%-d %b %Y'
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plotly.js",
-  "version": "2.13.3",
+  "version": "2.14.0",
   "description": "The open source javascript graphing library that powers plotly",
   "license": "MIT",
   "main": "./lib/index.js",

package/src/components/selections/draw.js

@@ -46,6 +46,10 @@ function draw(gd) {
     }
 }
 
+function couldHaveActiveSelection(gd) {
+    return gd._context.editSelection;
+}
+
 function drawOne(gd, index) {
     // remove the existing selection if there is one.
     // because indices can change, we need to look in all selection layers
@@ -82,7 +86,7 @@ function drawOne(gd, index) {
             lineDash = 'solid';
         }
 
-        var isActiveSelection =
+        var isActiveSelection = couldHaveActiveSelection(gd) &&
             gd._fullLayout._activeSelectionIndex === index;
 
         if(isActiveSelection) {
@@ -149,6 +153,8 @@ function setClipPath(selectionPath, gd, selectionOptions) {
 
 
 function activateSelection(gd, path) {
+    if(!couldHaveActiveSelection(gd)) return;
+
     var element = path.node();
     var id = +element.getAttribute('data-index');
     if(id >= 0) {
@@ -165,6 +171,8 @@ function activateSelection(gd, path) {
 }
 
 function activateLastSelection(gd) {
+    if(!couldHaveActiveSelection(gd)) return;
+
     var id = gd._fullLayout.selections.length - 1;
     gd._fullLayout._activeSelectionIndex = id;
     gd._fullLayout._deactivateSelection = deactivateSelection;
@@ -172,6 +180,8 @@ function activateLastSelection(gd) {
 }
 
 function deactivateSelection(gd) {
+    if(!couldHaveActiveSelection(gd)) return;
+
     var id = gd._fullLayout._activeSelectionIndex;
     if(id >= 0) {
         clearOutlineControllers(gd);

package/src/plot_api/plot_config.js

@@ -114,6 +114,12 @@ var configAttributes = {
         }
     },
 
+    editSelection: {
+        valType: 'boolean',
+        dflt: true,
+        description: 'Enables moving selections.'
+    },
+
     autosizable: {
         valType: 'boolean',
         dflt: false,

package/src/traces/sankey/attributes.js

@@ -168,6 +168,14 @@ var attrs = module.exports = overrideAll({
     },
 
     link: {
+        arrowlen: {
+            valType: 'number',
+            min: 0,
+            dflt: 0,
+            description: [
+                'Sets the length (in px) of the links arrow, if 0 no arrow will be drawn.'
+            ].join(' ')
+        },
         label: {
             valType: 'data_array',
             dflt: [],

package/src/traces/sankey/defaults.js

@@ -52,6 +52,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         return Lib.coerce(linkIn, linkOut, attributes.link, attr, dflt);
     }
     coerceLink('label');
+    coerceLink('arrowlen');
     coerceLink('source');
     coerceLink('target');
     coerceLink('value');

package/src/traces/sankey/render.js

@@ -271,6 +271,7 @@ function sankeyModel(layout, d, traceIndex) {
         nodeLineWidth: trace.node.line.width,
         linkLineColor: trace.link.line.color,
         linkLineWidth: trace.link.line.width,
+        linkArrowLength: trace.link.arrowlen,
         valueFormat: trace.valueformat,
         valueSuffix: trace.valuesuffix,
         textFont: trace.textfont,
@@ -309,6 +310,7 @@ function linkModel(d, l, i) {
         linkPath: linkPath,
         linkLineColor: d.linkLineColor,
         linkLineWidth: d.linkLineWidth,
+        linkArrowLength: d.linkArrowLength,
         valueFormat: d.valueFormat,
         valueSuffix: d.valueSuffix,
         sankey: d.sankey,
@@ -318,7 +320,7 @@ function linkModel(d, l, i) {
     };
 }
 
-function createCircularClosedPathString(link) {
+function createCircularClosedPathString(link, arrowLen) {
     // Using coordinates computed by d3-sankey-circular
     var pathString = '';
     var offset = link.width / 2;
@@ -328,17 +330,17 @@ function createCircularClosedPathString(link) {
         pathString =
           // start at the left of the target node
           'M ' +
-          coords.targetX + ' ' + (coords.targetY + offset) + ' ' +
+          (coords.targetX - arrowLen) + ' ' + (coords.targetY + offset) + ' ' +
           'L' +
-          coords.rightInnerExtent + ' ' + (coords.targetY + offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.targetY + offset) +
           'A' +
           (coords.rightLargeArcRadius + offset) + ' ' + (coords.rightSmallArcRadius + offset) + ' 0 0 1 ' +
-          (coords.rightFullExtent - offset) + ' ' + (coords.targetY - coords.rightSmallArcRadius) +
+          (coords.rightFullExtent - offset - arrowLen) + ' ' + (coords.targetY - coords.rightSmallArcRadius) +
           'L' +
-          (coords.rightFullExtent - offset) + ' ' + coords.verticalRightInnerExtent +
+          (coords.rightFullExtent - offset - arrowLen) + ' ' + coords.verticalRightInnerExtent +
           'A' +
           (coords.rightLargeArcRadius + offset) + ' ' + (coords.rightLargeArcRadius + offset) + ' 0 0 1 ' +
-          coords.rightInnerExtent + ' ' + (coords.verticalFullExtent - offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.verticalFullExtent - offset) +
           'L' +
           coords.leftInnerExtent + ' ' + (coords.verticalFullExtent - offset) +
           'A' +
@@ -366,34 +368,35 @@ function createCircularClosedPathString(link) {
           (coords.leftLargeArcRadius - offset) + ' ' + (coords.leftLargeArcRadius - offset) + ' 0 0 0 ' +
           coords.leftInnerExtent + ' ' + (coords.verticalFullExtent + offset) +
           'L' +
-          coords.rightInnerExtent + ' ' + (coords.verticalFullExtent + offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.verticalFullExtent + offset) +
           'A' +
           (coords.rightLargeArcRadius - offset) + ' ' + (coords.rightLargeArcRadius - offset) + ' 0 0 0 ' +
-          (coords.rightFullExtent + offset) + ' ' + coords.verticalRightInnerExtent +
+          (coords.rightFullExtent + offset - arrowLen) + ' ' + coords.verticalRightInnerExtent +
           'L' +
-          (coords.rightFullExtent + offset) + ' ' + (coords.targetY - coords.rightSmallArcRadius) +
+          (coords.rightFullExtent + offset - arrowLen) + ' ' + (coords.targetY - coords.rightSmallArcRadius) +
           'A' +
           (coords.rightLargeArcRadius - offset) + ' ' + (coords.rightSmallArcRadius - offset) + ' 0 0 0 ' +
-          coords.rightInnerExtent + ' ' + (coords.targetY - offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.targetY - offset) +
           'L' +
-          coords.targetX + ' ' + (coords.targetY - offset) +
+          (coords.targetX - arrowLen) + ' ' + (coords.targetY - offset) +
+          (arrowLen > 0 ? 'L' + coords.targetX + ' ' + (coords.targetY) : '') +
           'Z';
     } else {
         // Bottom path
         pathString =
           // start at the left of the target node
           'M ' +
-          coords.targetX + ' ' + (coords.targetY - offset) + ' ' +
+          (coords.targetX - arrowLen) + ' ' + (coords.targetY - offset) + ' ' +
           'L' +
-          coords.rightInnerExtent + ' ' + (coords.targetY - offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.targetY - offset) +
           'A' +
           (coords.rightLargeArcRadius + offset) + ' ' + (coords.rightSmallArcRadius + offset) + ' 0 0 0 ' +
-          (coords.rightFullExtent - offset) + ' ' + (coords.targetY + coords.rightSmallArcRadius) +
+          (coords.rightFullExtent - offset - arrowLen) + ' ' + (coords.targetY + coords.rightSmallArcRadius) +
           'L' +
-          (coords.rightFullExtent - offset) + ' ' + coords.verticalRightInnerExtent +
+          (coords.rightFullExtent - offset - arrowLen) + ' ' + coords.verticalRightInnerExtent +
           'A' +
           (coords.rightLargeArcRadius + offset) + ' ' + (coords.rightLargeArcRadius + offset) + ' 0 0 0 ' +
-          coords.rightInnerExtent + ' ' + (coords.verticalFullExtent + offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.verticalFullExtent + offset) +
           'L' +
           coords.leftInnerExtent + ' ' + (coords.verticalFullExtent + offset) +
           'A' +
@@ -421,17 +424,18 @@ function createCircularClosedPathString(link) {
           (coords.leftLargeArcRadius - offset) + ' ' + (coords.leftLargeArcRadius - offset) + ' 0 0 1 ' +
           coords.leftInnerExtent + ' ' + (coords.verticalFullExtent - offset) +
           'L' +
-          coords.rightInnerExtent + ' ' + (coords.verticalFullExtent - offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.verticalFullExtent - offset) +
           'A' +
           (coords.rightLargeArcRadius - offset) + ' ' + (coords.rightLargeArcRadius - offset) + ' 0 0 1 ' +
-          (coords.rightFullExtent + offset) + ' ' + coords.verticalRightInnerExtent +
+          (coords.rightFullExtent + offset - arrowLen) + ' ' + coords.verticalRightInnerExtent +
           'L' +
-          (coords.rightFullExtent + offset) + ' ' + (coords.targetY + coords.rightSmallArcRadius) +
+          (coords.rightFullExtent + offset - arrowLen) + ' ' + (coords.targetY + coords.rightSmallArcRadius) +
           'A' +
           (coords.rightLargeArcRadius - offset) + ' ' + (coords.rightSmallArcRadius - offset) + ' 0 0 1 ' +
-          coords.rightInnerExtent + ' ' + (coords.targetY + offset) +
+          (coords.rightInnerExtent - arrowLen) + ' ' + (coords.targetY + offset) +
           'L' +
-          coords.targetX + ' ' + (coords.targetY + offset) +
+          (coords.targetX - arrowLen) + ' ' + (coords.targetY + offset) +
+          (arrowLen > 0 ? 'L' + coords.targetX + ' ' + (coords.targetY) : '') +
           'Z';
     }
     return pathString;
@@ -440,11 +444,16 @@ function createCircularClosedPathString(link) {
 function linkPath() {
     var curvature = 0.5;
     function path(d) {
+        var arrowLen = d.linkArrowLength;
         if(d.link.circular) {
-            return createCircularClosedPathString(d.link);
+            return createCircularClosedPathString(d.link, arrowLen);
         } else {
+            var maxArrowLength = Math.abs((d.link.target.x0 - d.link.source.x1) / 2);
+            if(arrowLen > maxArrowLength) {
+                arrowLen = maxArrowLength;
+            }
             var x0 = d.link.source.x1;
-            var x1 = d.link.target.x0;
+            var x1 = d.link.target.x0 - arrowLen;
             var xi = interpolateNumber(x0, x1);
             var x2 = xi(curvature);
             var x3 = xi(1 - curvature);
@@ -452,15 +461,17 @@ function linkPath() {
             var y0b = d.link.y0 + d.link.width / 2;
             var y1a = d.link.y1 - d.link.width / 2;
             var y1b = d.link.y1 + d.link.width / 2;
-            return 'M' + x0 + ',' + y0a +
-                 'C' + x2 + ',' + y0a +
-                 ' ' + x3 + ',' + y1a +
-                 ' ' + x1 + ',' + y1a +
-                 'L' + x1 + ',' + y1b +
-                 'C' + x3 + ',' + y1b +
-                 ' ' + x2 + ',' + y0b +
-                 ' ' + x0 + ',' + y0b +
-                 'Z';
+            var start = 'M' + x0 + ',' + y0a;
+            var upperCurve = 'C' + x2 + ',' + y0a +
+                ' ' + x3 + ',' + y1a +
+                ' ' + x1 + ',' + y1a;
+            var lowerCurve = 'C' + x3 + ',' + y1b +
+                ' ' + x2 + ',' + y0b +
+                ' ' + x0 + ',' + y0b;
+
+            var rightEnd = arrowLen > 0 ? 'L' + (x1 + arrowLen) + ',' + (y1a + d.link.width / 2) : '';
+            rightEnd += 'L' + x1 + ',' + y1b;
+            return start + upperCurve + rightEnd + lowerCurve + 'Z';
         }
     }
     return path;

package/src/version.js

@@ -1,4 +1,4 @@
 'use strict';
 
 // package version injected by `npm run preprocess`
-exports.version = '2.13.3';
+exports.version = '2.14.0';