merge master

Author: emilykl

draftlogs/7214_remove.md

@@ -0,0 +1 @@
+Drop support for deprecated `bardir` attribute (use `orientation` instead) [[#7214](https://github.com/plotly/plotly.js/pull/7214)]

draftlogs/7215_remove.md

@@ -0,0 +1 @@
+Drop support for deprecated `annotation.ref` attribute (use `annotation.xref` and `annotation.yref` instead) [[#7215](https://github.com/plotly/plotly.js/pull/7215)]

src/components/annotations/attributes.js

@@ -487,14 +487,4 @@ module.exports = templatedArray('annotation', {
         ].join(' ')
     },
     editType: 'calc',
-
-    _deprecated: {
-        ref: {
-            valType: 'string',
-            editType: 'calc',
-            description: [
-                'Obsolete. Set `xref` and `yref` separately instead.'
-            ].join(' ')
-        }
-    }
 });

src/plot_api/helpers.js

@@ -144,17 +144,6 @@ exports.cleanLayout = function(layout) {
 
         if(!Lib.isPlainObject(ann)) continue;
 
-        if(ann.ref) {
-            if(ann.ref === 'paper') {
-                ann.xref = 'paper';
-                ann.yref = 'paper';
-            } else if(ann.ref === 'data') {
-                ann.xref = 'x';
-                ann.yref = 'y';
-            }
-            delete ann.ref;
-        }
-
         cleanAxRef(ann, 'xref');
         cleanAxRef(ann, 'yref');
     }
@@ -283,17 +272,6 @@ exports.cleanData = function(data) {
             delete trace.xbins;
         }
 
-        // convert bardir to orientation, and put the data into
-        // the axes it's eventually going to be used with
-        if('bardir' in trace) {
-            if(trace.bardir === 'h' && (traceIs(trace, 'bar') ||
-                trace.type.substr(0, 9) === 'histogram')) {
-                trace.orientation = 'h';
-                exports.swapXYData(trace);
-            }
-            delete trace.bardir;
-        }
-
         // now we have only one 1D histogram type, and whether
         // it uses x or y data depends on trace.orientation
         if(trace.type === 'histogramy') exports.swapXYData(trace);

src/traces/bar/attributes.js

@@ -227,13 +227,4 @@ module.exports = {
         editType: 'style'
     },
     zorder: scatterAttrs.zorder,
-
-    _deprecated: {
-        bardir: {
-            valType: 'enumerated',
-            editType: 'calc',
-            values: ['v', 'h'],
-            description: 'Renamed to `orientation`.'
-        }
-    }
 };

src/traces/histogram/attributes.js

@@ -246,9 +246,5 @@ module.exports = {
     selected: barAttrs.selected,
     unselected: barAttrs.unselected,
 
-    _deprecated: {
-        bardir: barAttrs._deprecated.bardir
-    },
-
     zorder: barAttrs.zorder
 };

test/image/mocks/11.json

@@ -214,7 +214,8 @@
     "xatype": "category",
     "yatype": "linear",
     "tag": "",
-    "ref": "paper"
+    "xref": "paper",
+    "yref": "paper"
    }
   ],
   "margin": {

test/image/mocks/14.json

@@ -167,7 +167,8 @@
     "xatype": "log",
     "yatype": "log",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    },
    {
     "x": 0.15585471975544452,
@@ -198,7 +199,8 @@
     "xatype": "log",
     "yatype": "log",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    },
    {
     "x": 1.8420351138192386,
@@ -229,7 +231,8 @@
     "xatype": "log",
     "yatype": "log",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    },
    {
     "x": -0.5537301200821234,
@@ -260,7 +263,8 @@
     "xatype": "log",
     "yatype": "log",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    },
    {
     "x": -2.701204903100102,
@@ -291,7 +295,8 @@
     "xatype": "log",
     "yatype": "log",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    },
    {
     "x": -1.6961577824283882,
@@ -322,7 +327,8 @@
     "xatype": "log",
     "yatype": "log",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    }
   ],
   "margin": {

test/image/mocks/17.json

@@ -612,7 +612,8 @@
     "xatype": "linear",
     "yatype": "linear",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    }
   ],
   "margin": {

test/image/mocks/27.json

@@ -329,7 +329,8 @@
     "xatype": "linear",
     "yatype": "linear",
     "tag": "",
-    "ref": "plot"
+    "xref": "plot",
+    "yref": "plot"
    }
   ],
   "margin": {

test/image/mocks/29.json

@@ -2256,7 +2256,8 @@
     "xanchor": "auto",
     "yanchor": "auto",
     "tag": "",
-    "ref": "paper"
+    "xref": "paper",
+    "yref": "paper"
    }
   ],
   "margin": {

test/jasmine/tests/plot_api_test.js

@@ -2540,7 +2540,6 @@ describe('Test plot api', function() {
 
             var layout = {
                 annotations: [
-                    { ref: 'paper' },
                     null,
                     { xref: 'x02', yref: 'y1' }
                 ],
@@ -2553,9 +2552,8 @@ describe('Test plot api', function() {
 
             Plotly.newPlot(gd, data, layout);
 
-            expect(gd.layout.annotations[0]).toEqual({ xref: 'paper', yref: 'paper' });
-            expect(gd.layout.annotations[1]).toEqual(null);
-            expect(gd.layout.annotations[2]).toEqual({ xref: 'x2', yref: 'y' });
+            expect(gd.layout.annotations[0]).toEqual(null);
+            expect(gd.layout.annotations[1]).toEqual({ xref: 'x2', yref: 'y' });
 
             expect(gd.layout.shapes[0].xref).toBeUndefined();
             expect(gd.layout.shapes[0].yref).toBeUndefined();

test/plot-schema.json

@@ -730,13 +730,6 @@
    "annotations": {
     "items": {
      "annotation": {
-      "_deprecated": {
-       "ref": {
-        "description": "Obsolete. Set `xref` and `yref` separately instead.",
-        "editType": "calc",
-        "valType": "string"
-       }
-      },
       "align": {
        "description": "Sets the horizontal alignment of the `text` within the box. Has an effect only if `text` spans two or more lines (i.e. `text` contains one or more <br> HTML tags) or if an explicit width is set to override the text width.",
        "dflt": "center",
@@ -17291,17 +17284,6 @@
   "bar": {
    "animatable": true,
    "attributes": {
-    "_deprecated": {
-     "bardir": {
-      "description": "Renamed to `orientation`.",
-      "editType": "calc",
-      "valType": "enumerated",
-      "values": [
-       "v",
-       "h"
-      ]
-     }
-    },
     "alignmentgroup": {
      "description": "Set several traces linked to the same position axis or matching axes to the same alignmentgroup. This controls whether bars compute their positional range dependently or independently.",
      "dflt": "",
@@ -43686,17 +43668,6 @@
   "histogram": {
    "animatable": false,
    "attributes": {
-    "_deprecated": {
-     "bardir": {
-      "description": "Renamed to `orientation`.",
-      "editType": "calc",
-      "valType": "enumerated",
-      "values": [
-       "v",
-       "h"
-      ]
-     }
-    },
     "alignmentgroup": {
      "description": "Set several traces linked to the same position axis or matching axes to the same alignmentgroup. This controls whether bars compute their positional range dependently or independently.",
      "dflt": "",