revert commit 7296fb7

archmoj · archmoj · commit 586a3868e24b · 2020-12-05T21:09:06.000-05:00
diff --git a/src/lib/relink_private.js b/src/lib/relink_private.js
@@ -25,6 +25,7 @@ module.exports = function relinkPrivateKeys(toContainer, fromContainer) {
         var toVal = toContainer[k];
 
         if(toVal === fromVal) continue;
+        if(toContainer.matches && k === '_categoriesMap') continue;
 
         if(k.charAt(0) === '_' || typeof fromVal === 'function') {
             // if it already exists at this point, it's something
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -2735,16 +2735,6 @@ function react(gd, data, layout, config) {
 
         applyUIRevisions(gd.data, gd.layout, oldFullData, oldFullLayout);
 
-        var allNames = Object.getOwnPropertyNames(oldFullLayout);
-        for(var q = 0; q < allNames.length; q++) {
-            var name = allNames[q];
-            var start = name.substring(0, 5);
-            if(start === 'xaxis' || start === 'yaxis') {
-                var emptyCategories = oldFullLayout[name]._emptyCategories;
-                if(emptyCategories) emptyCategories();
-            }
-        }
-
         // "true" skips updating calcdata and remapping arrays from calcTransforms,
         // which supplyDefaults usually does at the end, but we may need to NOT do
         // if the diff (which we haven't determined yet) says we'll recalc
diff --git a/test/jasmine/tests/axes_test.js b/test/jasmine/tests/axes_test.js
@@ -6715,7 +6715,7 @@ describe('more react tests', function() {
 
     afterEach(destroyGraphDiv);
 
-    it('should sort catgories on matching axes using react and relink using relayout', function(done) {
+    it('should sort catgories on matching axes using react', function(done) {
         var fig = {
             data: [{
                 yaxis: 'y',
@@ -6831,16 +6831,6 @@ describe('more react tests', function() {
             expect(gd._fullLayout.xaxis._categoriesMap).toEqual({Z: 0, 0: 1, A: 2});
             expect(gd._fullLayout.xaxis2._categoriesMap).toEqual({Z: 0, 0: 1, A: 2});
         })
-        .then(function() {
-            // should get the same order with relayout
-            return Plotly.relayout(gd, 'width', 600);
-        })
-        .then(function() {
-            expect(gd._fullLayout.xaxis._categories).toEqual(['Z', '0', 'A']);
-            expect(gd._fullLayout.xaxis2._categories).toEqual(['Z', '0', 'A']);
-            expect(gd._fullLayout.xaxis._categoriesMap).toEqual({Z: 0, 0: 1, A: 2});
-            expect(gd._fullLayout.xaxis2._categoriesMap).toEqual({Z: 0, 0: 1, A: 2});
-        })
         .catch(failTest)
         .then(done);
     });
