restyle/relayout refactor

src/plot_api/edit_types.js

@@ -15,13 +15,16 @@ var isPlainObject = Lib.isPlainObject;
 var traceOpts = {
     valType: 'flaglist',
     extras: ['none'],
-    flags: ['calc', 'calcIfAutorange', 'plot', 'style', 'colorbars'],
+    flags: ['calc', 'calcIfAutorange', 'clearAxisTypes', 'plot', 'style', 'colorbars'],
     description: [
         'trace attributes should include an `editType` string matching this flaglist.',
         '*calc* is the most extensive: a full `Plotly.plot` starting by clearing `gd.calcdata`',
         'to force it to be regenerated',
         '*calcIfAutorange* does a full `Plotly.plot`, but only clears and redoes `gd.calcdata`',
         'if there is at least one autoranged axis.',
+        '*clearAxisTypes* resets the types of the axes this trace is on, because new data could',
+        'cause the automatic axis type detection to change. Log type will not be cleared, as that',
+        'is never automatically chosen so must have been user-specified.',
         '*plot* calls `Plotly.plot` but without first clearing `gd.calcdata`.',
         '*style* only calls `module.style` for all trace modules and redraws the legend.',
         '*colorbars* only redraws colorbars.'

src/plot_api/plot_api.js

@@ -1282,8 +1282,9 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
     var specs = _restyle(gd, aobj, traces),
         flags = specs.flags;
 
-    // clear calcdata if required
+    // clear calcdata and/or axis types if required so they get regenerated
     if(flags.clearCalc) gd.calcdata = undefined;
+    if(flags.clearAxisTypes) clearAxisTypes(gd, traces, {});
 
     // fill in redraw sequence
     var seq = [];
@@ -1340,12 +1341,6 @@ function _restyle(gd, aobj, _traces) {
         axlist,
         flagAxForDelete = {};
 
-    // these ones may alter the axis type
-    // (at least if the first trace is involved)
-    var axtypeAttrs = [
-        'type', 'x', 'y', 'x0', 'y0', 'orientation', 'xaxis', 'yaxis'
-    ];
-
     // make a new empty vals array for undoit
     function a0() { return traces.map(function() { return undefined; }); }
 
@@ -1557,11 +1552,6 @@ function _restyle(gd, aobj, _traces) {
             }
         }
 
-        // check if we need to call axis type
-        if((traces.indexOf(0) !== -1) && (axtypeAttrs.indexOf(ai) !== -1)) {
-            Plotly.Axes.clearTypes(gd, traces);
-        }
-
         // major enough changes deserve autoscale, autobin, and
         // non-reversed axes so people don't get confused
         if(['orientation', 'type'].indexOf(ai) !== -1) {
@@ -2101,8 +2091,9 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, traces) {
     var relayoutSpecs = _relayout(gd, Lib.extendFlat({}, layoutUpdate)),
         relayoutFlags = relayoutSpecs.flags;
 
-    // clear calcdata if required
+    // clear calcdata and/or axis types if required
     if(restyleFlags.clearCalc || relayoutFlags.calc) gd.calcdata = undefined;
+    if(restyleFlags.clearAxisTypes) clearAxisTypes(gd, traces, layoutUpdate);
 
     // fill in redraw sequence
     var seq = [];
@@ -2157,6 +2148,37 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, traces) {
     });
 };
 
+// empty out types for all axes containing these traces
+// so we auto-set them again
+var axLetters = ['x', 'y', 'z'];
+function clearAxisTypes(gd, traces, layoutUpdate) {
+    if(typeof traces === 'number') traces = [traces];
+    else if(!Array.isArray(traces) || !traces.length) {
+        traces = (gd._fullData).map(function(d, i) { return i; });
+    }
+    for(var i = 0; i < traces.length; i++) {
+        var trace = gd._fullData[i];
+        for(var j = 0; j < 3; j++) {
+            var ax = Plotly.Axes.getFromTrace(gd, trace, axLetters[j]);
+
+            // do not clear log type - that's never an auto result so must have been intentional
+            if(ax && ax.type !== 'log') {
+                var axAttr = ax._name;
+                var sceneName = ax._id.substr(1);
+                if(sceneName.substr(0, 5) === 'scene') {
+                    if(layoutUpdate[sceneName] !== undefined) continue;
+                    axAttr = sceneName + '.' + axAttr;
+                }
+                var typeAttr = axAttr + '.type';
+
+                if(layoutUpdate[axAttr] === undefined && layoutUpdate[typeAttr] === undefined) {
+                    Lib.nestedProperty(gd.layout, typeAttr).set(null);
+                }
+            }
+        }
+    }
+}
+
 /**
  * Animate to a frame, sequence of frame, frame group, or frame definition
  *

src/plots/attributes.js

@@ -16,7 +16,7 @@ module.exports = {
         role: 'info',
         values: [],     // listed dynamically
         dflt: 'scatter',
-        editType: 'calc'
+        editType: 'calc+clearAxisTypes'
     },
     visible: {
         valType: 'enumerated',

src/plots/cartesian/attributes.js

@@ -14,7 +14,7 @@ module.exports = {
         valType: 'subplotid',
         role: 'info',
         dflt: 'x',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets a reference between this trace\'s x coordinates and',
             'a 2D cartesian x axis.',
@@ -27,7 +27,7 @@ module.exports = {
         valType: 'subplotid',
         role: 'info',
         dflt: 'y',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets a reference between this trace\'s y coordinates and',
             'a 2D cartesian y axis.',

src/plots/cartesian/axes.js

@@ -175,19 +175,6 @@ axes.getDataToCoordFunc = function(gd, trace, target, targetArray) {
     return getDataConversions(gd, trace, target, targetArray).d2c;
 };
 
-// empty out types for all axes containing these traces
-// so we auto-set them again
-axes.clearTypes = function(gd, traces) {
-    if(!Array.isArray(traces) || !traces.length) {
-        traces = (gd._fullData).map(function(d, i) { return i; });
-    }
-    traces.forEach(function(tracenum) {
-        var trace = gd.data[tracenum];
-        delete (axes.getFromId(gd, trace.xaxis) || {}).type;
-        delete (axes.getFromId(gd, trace.yaxis) || {}).type;
-    });
-};
-
 // get counteraxis letter for this axis (name or id)
 // this can also be used as the id for default counter axis
 axes.counterLetter = function(id) {

src/plots/gl3d/layout/attributes.js

@@ -14,7 +14,7 @@ module.exports = {
         valType: 'subplotid',
         role: 'info',
         dflt: 'scene',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets a reference between this trace\'s 3D coordinate system and',
             'a 3D scene.',

src/traces/bar/attributes.js

@@ -99,7 +99,7 @@ module.exports = {
         valType: 'enumerated',
         role: 'info',
         values: ['v', 'h'],
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the orientation of the bars.',
             'With *v* (*h*), the value of the each bar spans',

src/traces/box/attributes.js

@@ -19,15 +19,15 @@ var scatterMarkerAttrs = scatterAttrs.marker,
 module.exports = {
     y: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the y sample data or coordinates.',
             'See overview for more info.'
         ].join(' ')
     },
     x: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the x sample data or coordinates.',
             'See overview for more info.'
@@ -36,7 +36,7 @@ module.exports = {
     x0: {
         valType: 'any',
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the x coordinate of the box.',
             'See overview for more info.'
@@ -45,7 +45,7 @@ module.exports = {
     y0: {
         valType: 'any',
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the y coordinate of the box.',
             'See overview for more info.'
@@ -54,7 +54,7 @@ module.exports = {
     name: {
         valType: 'string',
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the trace name.',
             'The trace name appear as the legend item and on hover.',
@@ -134,7 +134,7 @@ module.exports = {
         valType: 'enumerated',
         values: ['v', 'h'],
         role: 'style',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the orientation of the box(es).',
             'If *v* (*h*), the distribution is visualized along',

src/traces/carpet/attributes.js

@@ -34,7 +34,7 @@ module.exports = {
     },
     x: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'A two dimensional array of x coordinates at each carpet point.',
             'If ommitted, the plot is a cheater plot and the xaxis is hidden',
@@ -43,7 +43,7 @@ module.exports = {
     },
     y: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: 'A two dimensional array of y coordinates at each carpet point.'
     },
     a: {

src/traces/heatmap/attributes.js

@@ -43,7 +43,7 @@ module.exports = extendFlat({}, {
         valType: 'enumerated',
         values: ['array', 'scaled'],
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'If *array*, the heatmap\'s x coordinates are given by *x*',
             '(the default behavior when `x` is provided).',
@@ -55,7 +55,7 @@ module.exports = extendFlat({}, {
         valType: 'enumerated',
         values: ['array', 'scaled'],
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'If *array*, the heatmap\'s y coordinates are given by *y*',
             '(the default behavior when `y` is provided)',

src/traces/histogram/attributes.js

@@ -14,14 +14,14 @@ var barAttrs = require('../bar/attributes');
 module.exports = {
     x: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the sample data to be binned on the x axis.'
         ].join(' ')
     },
     y: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the sample data to be binned on the y axis.'
         ].join(' ')

src/traces/mesh3d/attributes.js

@@ -19,23 +19,23 @@ var extendFlat = require('../../lib/extend').extendFlat;
 module.exports = extendFlat(colorAttrs('', 'calc', false), {
     x: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the X coordinates of the vertices. The nth element of vectors `x`, `y` and `z`',
             'jointly represent the X, Y and Z coordinates of the nth vertex.'
         ].join(' ')
     },
     y: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the Y coordinates of the vertices. The nth element of vectors `x`, `y` and `z`',
             'jointly represent the X, Y and Z coordinates of the nth vertex.'
         ].join(' ')
     },
     z: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the Z coordinates of the vertices. The nth element of vectors `x`, `y` and `z`',
             'jointly represent the X, Y and Z coordinates of the nth vertex.'

src/traces/ohlc/attributes.js

@@ -55,7 +55,7 @@ module.exports = {
 
     x: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Sets the x coordinates.',
             'If absent, linear coordinate will be generated.'

src/traces/scatter/attributes.js

@@ -21,14 +21,14 @@ var extendFlat = require('../../lib/extend').extendFlat;
 module.exports = {
     x: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: 'Sets the x coordinates.'
     },
     x0: {
         valType: 'any',
         dflt: 0,
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Alternate to `x`.',
             'Builds a linear space of x coordinates.',
@@ -48,14 +48,14 @@ module.exports = {
     },
     y: {
         valType: 'data_array',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: 'Sets the y coordinates.'
     },
     y0: {
         valType: 'any',
         dflt: 0,
         role: 'info',
-        editType: 'calc',
+        editType: 'calc+clearAxisTypes',
         description: [
             'Alternate to `y`.',
             'Builds a linear space of y coordinates.',

src/traces/scatter3d/attributes.js

@@ -54,7 +54,7 @@ function makeProjectionAttr(axLetter) {
     };
 }
 
-module.exports = overrideAll({
+var attrs = module.exports = overrideAll({
     x: scatterAttrs.x,
     y: scatterAttrs.y,
     z: {
@@ -172,3 +172,5 @@ module.exports = overrideAll({
     error_y: errorBarAttrs,
     error_z: errorBarAttrs,
 }, 'calc', 'nested');
+
+attrs.x.editType = attrs.y.editType = attrs.z.editType = 'calc+clearAxisTypes';

src/traces/scattergl/attributes.js

@@ -20,7 +20,7 @@ var scatterLineAttrs = scatterAttrs.line,
     scatterMarkerAttrs = scatterAttrs.marker,
     scatterMarkerLineAttrs = scatterMarkerAttrs.line;
 
-module.exports = overrideAll({
+var attrs = module.exports = overrideAll({
     x: scatterAttrs.x,
     x0: scatterAttrs.x0,
     dx: scatterAttrs.dx,
@@ -86,3 +86,5 @@ module.exports = overrideAll({
     error_y: scatterAttrs.error_y,
     error_x: scatterAttrs.error_x
 }, 'calc', 'nested');
+
+attrs.x.editType = attrs.y.editType = attrs.x0.editType = attrs.y0.editType = 'calc+clearAxisTypes';

src/traces/surface/attributes.js

@@ -97,7 +97,7 @@ function makeContourAttr(axLetter) {
     };
 }
 
-module.exports = overrideAll({
+var attrs = module.exports = overrideAll({
     z: {
         valType: 'data_array',
         description: 'Sets the z coordinates.'
@@ -244,3 +244,5 @@ module.exports = overrideAll({
         })
     }
 }, 'calc', 'nested');
+
+attrs.x.editType = attrs.y.editType = attrs.z.editType = 'calc+clearAxisTypes';