Merge remote-tracking branch 'origin/master' into new-formats-in-period-ticklabelmode

Author: archmoj

src/components/modebar/buttons.js

@@ -390,6 +390,9 @@ modeBarButtons.resetCameraLastSave3d = {
 function handleCamera3d(gd, ev) {
     var button = ev.currentTarget;
     var attr = button.getAttribute('data-attr');
+    var resetLastSave = attr === 'resetLastSave';
+    var resetDefault = attr === 'resetDefault';
+
     var fullLayout = gd._fullLayout;
     var sceneIds = fullLayout._subplots.gl3d || [];
     var aobj = {};
@@ -402,12 +405,12 @@ function handleCamera3d(gd, ev) {
         var scene = fullLayout[sceneId]._scene;
         var didUpdate;
 
-        if(attr === 'resetLastSave') {
+        if(resetLastSave) {
             aobj[camera + '.up'] = scene.viewInitial.up;
             aobj[camera + '.eye'] = scene.viewInitial.eye;
             aobj[camera + '.center'] = scene.viewInitial.center;
             didUpdate = true;
-        } else if(attr === 'resetDefault') {
+        } else if(resetDefault) {
             aobj[camera + '.up'] = null;
             aobj[camera + '.eye'] = null;
             aobj[camera + '.center'] = null;

src/plot_api/plot_api.js

@@ -1739,13 +1739,14 @@ function _restyle(gd, aobj, traces) {
         // swap hovermode if set to "compare x/y data"
         if(ai === 'orientationaxes') {
             var hovermode = nestedProperty(gd.layout, 'hovermode');
-            if(hovermode.get() === 'x') {
+            var h = hovermode.get();
+            if(h === 'x') {
                 hovermode.set('y');
-            } else if(hovermode.get() === 'y') {
+            } else if(h === 'y') {
                 hovermode.set('x');
-            } else if(hovermode.get() === 'x unified') {
+            } else if(h === 'x unified') {
                 hovermode.set('y unified');
-            } else if(hovermode.get() === 'y unified') {
+            } else if(h === 'y unified') {
                 hovermode.set('x unified');
             }
         }
@@ -2769,6 +2770,8 @@ function react(gd, data, layout, config) {
         // when at least one animatable attribute has changed,
         // N.B. config changed aren't animatable
         if(newFullLayout.transition && !configChanged && (restyleFlags.anim || relayoutFlags.anim)) {
+            if(relayoutFlags.ticks) seq.push(subroutines.doTicksRelayout);
+
             Plots.doCalcdata(gd);
             subroutines.doAutoRangeAndConstraints(gd);
 

src/plots/cartesian/axes.js

@@ -743,7 +743,8 @@ axes.calcTicks = function calcTicks(ax, opts) {
 
     var removedPreTick0Label = false;
     var ticksOut = new Array(tickVals.length);
-    for(var i = 0; i < tickVals.length; i++) {
+    var i;
+    for(i = 0; i < tickVals.length; i++) {
         var _minor = tickVals[i].minor;
         var _value = tickVals[i].value;
 
@@ -771,28 +772,32 @@ axes.calcTicks = function calcTicks(ax, opts) {
             var B = tickVals[b].value;
 
             var delta = definedDelta || Math.abs(B - A);
-            var half = axrev ? -0.5 : 0.5;
             if(delta >= ONEDAY * 365) { // Years could have days less than ONEAVGYEAR period
-                v += half * ONEAVGYEAR;
+                v += ONEAVGYEAR / 2;
             } else if(delta >= ONEDAY * 28) { // Months could have days less than ONEAVGMONTH period
-                v += half * ONEAVGMONTH;
+                v += ONEAVGMONTH / 2;
             } else if(delta >= ONEDAY) {
-                v += half * ONEDAY;
+                v += ONEDAY / 2;
             }
 
             ticksOut[i].periodX = v;
 
             if(v > maxRange || v < minRange) { // hide label if outside the range
                 ticksOut[i].text = '';
-                if(i === 0) removedPreTick0Label = true;
+                removedPreTick0Label = true;
             }
         }
     }
 
-    if(removedPreTick0Label && ticksOut.length > 1) {
-        // redo tick0 text
-        ax._prevDateHead = '';
-        ticksOut[1].text = axes.tickText(ax, tickVals[1].value).text;
+    if(removedPreTick0Label) {
+        for(i = 1; i < ticksOut.length; i++) {
+            if(ticksOut[i].periodX <= maxRange && ticksOut[i].periodX >= minRange) {
+                // redo first visible tick
+                ax._prevDateHead = '';
+                ticksOut[i].text = axes.tickText(ax, tickVals[i].value).text;
+                break;
+            }
+        }
     }
 
     ax._inCalcTicks = false;

src/traces/table/plot.js

@@ -57,13 +57,14 @@ module.exports = function plot(gd, wrappedTraceHolders) {
         .classed(c.cn.tableControlView, true)
         .style('box-sizing', 'content-box');
     if(dynamic) {
+        var wheelEvent = 'onwheel' in document ? 'wheel' : 'mousewheel';
         cvEnter
             .on('mousemove', function(d) {
                 tableControlView
                     .filter(function(dd) {return d === dd;})
                     .call(renderScrollbarKit, gd);
             })
-            .on('mousewheel', function(d) {
+            .on(wheelEvent, function(d) {
                 if(d.scrollbarState.wheeling) return;
                 d.scrollbarState.wheeling = true;
                 var newY = d.scrollY + d3.event.deltaY;

test/image/baselines/date_axes_period2.png

@@ -36,10 +36,8 @@ module.exports = function(type, x, y, opts) {
     var el = (opts && opts.element) || document.elementFromPoint(x, y);
     var ev;
 
-    if(type === 'scroll' || type === 'mousewheel') {
-        // somehow table needs this to be mouswheel but others need wheel.
-        // yet they all work the same in the browser?
-        type = (type === 'scroll') ? 'wheel' : 'mousewheel';
+    if(type === 'scroll' || type === 'wheel') {
+        type = 'wheel';
         ev = new window.WheelEvent(type, Lib.extendFlat({}, fullOpts, opts));
     } else {
         ev = new window.MouseEvent(type, fullOpts);

test/jasmine/assets/mouse_event.js

@@ -415,7 +415,7 @@ describe('table', function() {
             gdWheelEventCount = 0;
             Plotly.plot(gd, mockCopy.data, mockCopy.layout)
             .then(function() {
-                gd.addEventListener('mousewheel', function(evt) {
+                gd.addEventListener('wheel', function(evt) {
                     gdWheelEventCount++;
                     // make sure we don't *really* scroll the page.
                     // that would be annoying!
@@ -440,7 +440,7 @@ describe('table', function() {
 
         function scroll(pos, dy) {
             mouseEvent('mousemove', pos.x, pos.y);
-            mouseEvent('mousewheel', pos.x, pos.y, {deltaX: 0, deltaY: dy});
+            mouseEvent('wheel', pos.x, pos.y, {deltaX: 0, deltaY: dy});
         }
 
         it('bubbles scroll events iff they did not scroll a table', function() {

test/jasmine/tests/table_test.js

@@ -621,6 +621,63 @@ describe('Titles can be updated', function() {
     }
 });
 
+describe('Titles and labels', function() {
+    'use strict';
+
+    var gd;
+    beforeEach(function() { gd = createGraphDiv(); });
+    afterEach(destroyGraphDiv);
+
+    it('should react with transition', function(done) {
+        Plotly.newPlot(gd, {
+            data: [
+                {
+                    type: 'bar',
+                    x: ['a', 'b'],
+                    y: [1, 2],
+                }
+            ],
+            layout: {
+                title: {
+                    text: 'OLD'
+                },
+                xaxis: {
+                    title: {
+                        text: 'x-old'
+                    }
+                }
+            }
+        }).then(function() {
+            Plotly.react(gd, {
+                data: [
+                    {
+                        type: 'bar',
+                        x: ['b', 'a'],
+                        y: [3, 2],
+                    }
+                ],
+                layout: {
+                    title: {
+                        text: 'NEW'
+                    },
+                    xaxis: {
+                        title: {
+                            text: 'x-new'
+                        }
+                    },
+                    transition: { duration: 500 }
+                }
+            });
+        }).then(function() {
+            expectTitle('NEW');
+            expect(xTitleSel().text()).toBe('x-new');
+            expect(d3.select('.xtick').text()).toBe('b');
+        })
+        .catch(fail)
+        .then(done);
+    });
+});
+
 describe('Titles support setting custom font properties', function() {
     'use strict';