Rebasing and test fix

Author: VeraZab

src/components/fields/__tests__/AnnotationRef-test.js

@@ -27,7 +27,7 @@ describe('<AnnotationRef>', () => {
     const options = drop.first().prop('options');
     expect(options.length).toBe(3);
     expect(options[0]).toEqual({label: 'Canvas', value: 'paper'});
-    expect(options[1]).toEqual({label: 'y', value: 'y'});
+    expect(options[1]).toEqual({label: 'Y', value: 'y'});
     expect(options[2]).toEqual({label: 'yaxis2 title', value: 'y2'});
   });
 
@@ -114,7 +114,7 @@ describe('<AnnotationArrowRef>', () => {
     const options = drop.first().prop('options');
     expect(options.length).toBe(3);
     expect(options[0]).toEqual({label: 'in pixels', value: 'pixel'});
-    expect(options[1]).toEqual({label: 'y', value: 'y'});
+    expect(options[1]).toEqual({label: 'Y', value: 'y'});
     expect(options[2]).toEqual({label: 'yaxis2 title', value: 'y2'});
   });
 });

src/components/fields/derived.js

@@ -369,21 +369,15 @@ export const PositioningNumeric = connectToContainer(UnconnectedNumeric, {
   },
 });
 
-function computeAxesRefOptions(axes, refAxis) {
+function computeAxesRefOptions(axes, propsAttr) {
   const options = [];
   for (let i = 0; i < axes.length; i++) {
     const ax = axes[i];
-<<<<<<< HEAD
-    if (ax._id.charAt(0) === refAxis) {
-      // checking user data for title avoids default "Click to enter axis title"
-      const label = striptags(ax._input.title || ax._id);
-=======
     if (
       ax._id.charAt(0) === propsAttr.charAt(0) ||
       ax._id.charAt(0) === propsAttr.charAt(1)
     ) {
       const label = getAxisTitle(ax);
->>>>>>> Standardize axis titles
       options.push({label, value: ax._id});
     }
   }