Dry up derived file

Author: VeraZab

src/components/fields/derived.js

@@ -212,19 +212,10 @@ export const AnnotationArrowRef = connectToContainer(UnconnectedDropdown, {
 
     if (currentAxisRef === 'paper') {
       // If currentAxesRef is paper provide all axes options to user.
-      if (props.attr === 'axref') {
-        plotProps.options = [
-          {label: 'in pixels', value: 'pixel'},
-          ...computeAxesRefOptions(getAllAxes(context.fullLayout), 'x'),
-        ];
-      }
-
-      if (props.attr === 'ayref') {
-        plotProps.options = [
-          {label: 'in pixels', value: 'pixel'},
-          ...computeAxesRefOptions(getAllAxes(context.fullLayout), 'y'),
-        ];
-      }
+      plotProps.options = [
+        {label: 'in pixels', value: 'pixel'},
+        ...computeAxesRefOptions(getAllAxes(context.fullLayout), props.attr),
+      ];
     } else {
       // If currentAxesRef is an actual axes then offer that value as the only
       // axes option.
@@ -254,19 +245,10 @@ export const AnnotationRef = connectToContainer(UnconnectedDropdown, {
       );
     }
 
-    if (props.attr === 'xref') {
-      plotProps.options = [
-        {label: 'Canvas', value: 'paper'},
-        ...computeAxesRefOptions(getAllAxes(context.fullLayout), 'x'),
-      ];
-    }
-
-    if (props.attr === 'yref') {
-      plotProps.options = [
-        {label: 'Canvas', value: 'paper'},
-        ...computeAxesRefOptions(getAllAxes(context.fullLayout), 'y'),
-      ];
-    }
+    plotProps.options = [
+      {label: 'Canvas', value: 'paper'},
+      ...computeAxesRefOptions(getAllAxes(context.fullLayout), props.attr),
+    ];
 
     if (currentOffsetRef !== 'pixel') {
       plotProps.updatePlot = v => {
@@ -294,28 +276,23 @@ export const AnnotationRef = connectToContainer(UnconnectedDropdown, {
 
 export const PositioningRef = connectToContainer(UnconnectedDropdown, {
   modifyPlotProps: (props, context, plotProps) => {
-    if (props.attr === 'xref') {
-      plotProps.options = [
-        {label: 'Canvas', value: 'paper'},
-        ...computeAxesRefOptions(getAllAxes(context.fullLayout), 'x'),
-      ];
-    }
+    plotProps.options = [
+      {label: 'Canvas', value: 'paper'},
+      ...computeAxesRefOptions(getAllAxes(context.fullLayout), props.attr),
+    ];
 
-    if (props.attr === 'yref') {
-      plotProps.options = [
-        {label: 'Canvas', value: 'paper'},
-        ...computeAxesRefOptions(getAllAxes(context.fullLayout), 'y'),
-      ];
-    }
     plotProps.clearable = false;
   },
 });
 
-function computeAxesRefOptions(axes, refAxis) {
+function computeAxesRefOptions(axes, propsAttr) {
   const options = [];
   for (let i = 0; i < axes.length; i++) {
     const ax = axes[i];
-    if (ax._id.charAt(0) === refAxis) {
+    if (
+      ax._id.charAt(0) === propsAttr.charAt(0) ||
+      ax._id.charAt(0) === propsAttr.charAt(1)
+    ) {
       // checking user data for title avoids default "Click to enter axis title"
       const label = striptags(ax._input.title || ax._id);
       options.push({label, value: ax._id});

src/shame.js

@@ -4,8 +4,6 @@
 import {getFromId} from 'plotly.js/src/plots/cartesian/axis_ids';
 import nestedProperty from 'plotly.js/src/lib/nested_property';
 
-
-
 // Temporary fix for:
 // https://github.com/plotly/react-plotly.js-editor/issues/103
 // We should be able to remove this once the plotly.react method has