Check for numeric - text name collisions within frames of a single addFrames call too

Author: monfera

src/plot_api/plot_api.js

@@ -2631,16 +2631,21 @@ Plotly.addFrames = function(gd, frameList, indices) {
     var bigIndex = _frames.length + frameList.length * 2;
 
     var insertions = [];
+    var _frameHashLocal = {};
     for(i = frameList.length - 1; i >= 0; i--) {
         if(!Lib.isPlainObject(frameList[i])) continue;
 
-        var name = (_frameHash[frameList[i].name] || {}).name;
+        // The entire logic for checking for this type of name collision can be removed once we migrate to ES6 and
+        // use a Map instead of an Object instance, as Map keys aren't converted to strings.
+        var lookupName = frameList[i].name;
+        var name = (_frameHash[lookupName] || _frameHashLocal[lookupName] || {}).name;
         var newName = frameList[i].name;
+        var collisionPresent = _frameHash[name] || _frameHashLocal[name];
 
-        if(name && newName && typeof newName === 'number' && _frameHash[name] && numericNameWarningCount < numericNameWarningCountLimit) {
+        if(name && newName && typeof newName === 'number' && collisionPresent && numericNameWarningCount < numericNameWarningCountLimit) {
             numericNameWarningCount++;
 
-            Lib.warn('addFrames: overwriting frame "' + _frameHash[name].name +
+            Lib.warn('addFrames: overwriting frame "' + (_frameHash[name] || _frameHashLocal[name]).name +
                 '" with a frame whose name of type "number" also equates to "' +
                 name + '". This is valid but may potentially lead to unexpected ' +
                 'behavior since all plotly.js frame names are stored internally ' +
@@ -2653,6 +2658,8 @@ Plotly.addFrames = function(gd, frameList, indices) {
             }
         }
 
+        _frameHashLocal[lookupName] = {name: lookupName};
+
         insertions.push({
             frame: Plots.supplyFrameDefaults(frameList[i]),
             index: (indices && indices[i] !== undefined && indices[i] !== null) ? indices[i] : bigIndex + i

test/jasmine/tests/animate_test.js

@@ -684,13 +684,26 @@ describe('Animate API details', function() {
 
     it('emits warning if strings are not used and this creates ambiguity', function(done) {
         spyOn(Lib, 'warn');
-        Plotly.addFrames(gd, [{name: '8', data: [{x: [8, 7, 6]}]}])
-            .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
-            .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
-            .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
-            .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
+
+        // Test with both multiframe additions and repeated `addFrames` calls - both should count toward the warn limit
+        Plotly.addFrames(gd, [
+            {name: 8, data: [{x: [8, 7, 6]}]},
+            {name: 8888, data: [{x: [8, 7, 6]}]},
+            {name: 8, data: [{x: [8, 7, 6]}]},
+            {name: '8', data: [{x: [8, 7, 6]}]}
+        ])
+            .then(function() {
+                // so far, two warnings
+                expect(Lib.warn.calls.count()).toEqual(2);
+                return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);
+            })
             .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
             .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
+            .then(function() {
+                // so far, 5 + 1 warnings
+                expect(Lib.warn.calls.count()).toEqual(5 + 1);
+                return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);
+            })
             .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
             .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})
             .then(function() {return Plotly.addFrames(gd, [{name: 8, data: [{x: [3, 2, 1]}]}]);})