Merge branch 'master' into sunburstRotation

package.json

@@ -117,7 +117,7 @@
     "strongly-connected-components": "^1.0.1",
     "superscript-text": "^1.0.0",
     "svg-path-sdf": "^1.1.3",
-    "tinycolor2": "^1.4.1",
+    "tinycolor2": "^1.4.2",
     "to-px": "1.0.1",
     "topojson-client": "^3.1.0",
     "webgl-context": "^2.2.0",

src/traces/sunburst/attributes.js

@@ -204,6 +204,7 @@ module.exports = {
         ].join(' ')
     }),
     rotation: pieAttrs.rotation,
+    sort: pieAttrs.sort,
 
     domain: domainAttrs({name: 'sunburst', trace: true, editType: 'calc'})
 };

src/traces/sunburst/calc.js

@@ -192,7 +192,9 @@ exports.calc = function(gd, trace) {
     if(failed) return;
 
     // TODO add way to sort by height also?
-    hierarchy.sort(function(a, b) { return b.value - a.value; });
+    if(trace.sort) {
+        hierarchy.sort(function(a, b) { return b.value - a.value; });
+    }
 
     var pullColor;
     var scaleColor;

src/traces/sunburst/defaults.js

@@ -73,7 +73,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
 
     coerce('insidetextorientation');
 
+    coerce('sort');
+
     coerce('rotation');
+
 
     handleDomainDefaults(traceOut, layout, coerce);
 

src/traces/treemap/attributes.js

@@ -268,6 +268,7 @@ module.exports = {
             'Sets the positions of the `text` elements.'
         ].join(' ')
     },
+    sort: pieAttrs.sort,
 
     domain: domainAttrs({name: 'treemap', trace: true, editType: 'calc'}),
 };

src/traces/treemap/defaults.js

@@ -114,6 +114,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         coerce('pathbar.edgeshape');
     }
 
+    coerce('sort');
+
     handleDomainDefaults(traceOut, layout, coerce);
 
     // do not support transforms for now