Review comments

Author: VeraZab

src/components/containers/derived.js

@@ -9,25 +9,22 @@ const LayoutPanel = connectLayoutToPlot(Panel);
 
 const TraceTypeSection = (props, context) => {
   const {fullContainer, fullData} = context;
-  // when TraceTypeSection is used in a connectedToTrace context
-  if (
+
+  const ifConnectedToTrace =
     fullContainer &&
     ((fullContainer._fullInput &&
       props.traceTypes.includes(fullContainer._fullInput.type)) ||
-      props.traceTypes.includes(fullContainer.type))
-  ) {
-    return <Section {...props} />;
-  }
+      props.traceTypes.includes(fullContainer.type));
 
-  // when TraceTypeSection is used in a connectedToLayout context
-  if (
+  const ifConnectedToLayout =
     fullData &&
     fullData.some(
       t =>
         props.traceTypes.includes(t._fullInput.type) ||
         fullData.some(t => props.traceTypes.includes(t.type))
-    )
-  ) {
+    );
+
+  if (ifConnectedToTrace || ifConnectedToLayout) {
     return <Section {...props} />;
   }
 

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

@@ -27,8 +27,8 @@ 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 Axis 1', value: 'y'});
-    expect(options[2]).toEqual({label: 'Y Axis: yaxis2 title', value: 'y2'});
+    expect(options[1]).toEqual({label: 'Y 1', value: 'y'});
+    expect(options[2]).toEqual({label: 'Y: yaxis2 title', value: 'y2'});
   });
 
   it('sends update for a[x|y]ref attr on [x|y]ref change', () => {
@@ -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 Axis 1', value: 'y'});
-    expect(options[2]).toEqual({label: 'Y Axis: yaxis2 title', value: 'y2'});
+    expect(options[1]).toEqual({label: 'Y 1', value: 'y'});
+    expect(options[2]).toEqual({label: 'Y: yaxis2 title', value: 'y2'});
   });
 });

src/components/fields/derived.js

@@ -41,7 +41,6 @@ export const AxisAnchorDropdown = connectToContainer(UnconnectedDropdown, {
     }
     options.push({label: _('Free'), value: 'free'});
     plotProps.options = options;
-    plotProps.clearable = false;
   },
 });
 
@@ -131,7 +130,7 @@ export const AxisSide = connectToContainer(UnconnectedRadio, {
       return;
     }
 
-    plotProps.options = [{label: _('Mixed Values'), value: 'mixed values'}];
+    plotProps.isVisible = false;
   },
 });
 
@@ -265,12 +264,6 @@ UnconnectedNumericFraction.defaultProps = {
   showSlider: true,
 };
 
-class UnconnectedNumericSlider extends UnconnectedNumeric {}
-UnconnectedNumericSlider.propTypes = UnconnectedNumeric.propTypes;
-UnconnectedNumericSlider.defaultProps = {
-  showSlider: true,
-};
-
 const numericFractionModifyPlotProps = (props, context, plotProps) => {
   const {attrMeta, fullValue, updatePlot} = plotProps;
   const min = attrMeta.min || 0;
@@ -313,8 +306,8 @@ export const LayoutNumericFraction = connectLayoutToPlot(
   })
 );
 
-export const LayoutNumericSlider = connectLayoutToPlot(
-  connectToContainer(UnconnectedNumericSlider, {
+export const LayoutNumeric = connectLayoutToPlot(
+  connectToContainer(UnconnectedNumeric, {
     supplyPlotProps: supplyLayoutPlotProps,
   })
 );

src/components/fields/index.js

@@ -37,7 +37,7 @@ import {
   PositioningNumeric,
   NumericFractionInverse,
   LayoutNumericFraction,
-  LayoutNumericSlider,
+  LayoutNumeric,
   LayoutNumericFractionInverse,
   RangesliderVisible,
   RangeselectorVisible,
@@ -72,7 +72,7 @@ export {
   HoverInfo,
   Info,
   LayoutNumericFraction,
-  LayoutNumericSlider,
+  LayoutNumeric,
   LayoutNumericFractionInverse,
   NumericFraction,
   NumericFractionDomain,

src/components/index.js

@@ -25,7 +25,7 @@ import {
   HoverInfo,
   Info,
   LayoutNumericFraction,
-  LayoutNumericSlider,
+  LayoutNumeric,
   LayoutNumericFractionInverse,
   NumericFraction,
   NumericFractionDomain,
@@ -114,7 +114,7 @@ export {
   PositioningNumeric,
   NumericFractionInverse,
   LayoutNumericFraction,
-  LayoutNumericSlider,
+  LayoutNumeric,
   LayoutNumericFractionInverse,
   LayoutPanel,
   LineDashSelector,

src/default_panels/GraphCreatePanel.js

@@ -14,7 +14,7 @@ import {
   TextEditor,
   Numeric,
   TraceTypeSection,
-  LayoutNumericSlider,
+  LayoutNumeric,
 } from '../components';
 import {localize} from '../lib';
 
@@ -84,14 +84,14 @@ const GraphCreatePanel = ({localize: _}) => {
           attr="thetaunit"
           clearable={false}
         />
-        <LayoutNumericSlider
+        <LayoutNumeric
           attr="polar.sector[0]"
           label={_('Theta Start')}
           min={0}
           max={360}
           showSlider
         />
-        <LayoutNumericSlider
+        <LayoutNumeric
           attr="polar.sector[1]"
           label={_('Theta End')}
           min={0}

src/default_panels/StyleAxesPanel.js

@@ -25,6 +25,7 @@ import {
 } from '../components';
 
 import {localize} from '../lib';
+import {TRACE_TO_AXIS} from '../lib/constants';
 
 class StyleAxesPanel extends Component {
   constructor(props, context) {
@@ -86,7 +87,7 @@ class StyleAxesPanel extends Component {
 
           <TraceTypeSection
             name={_('Anchor')}
-            traceTypes={['scatter', 'scattergl']}
+            traceTypes={TRACE_TO_AXIS.cartesian}
           >
             <AxisAnchorDropdown
               label={_('Anchor To')}

src/lib/getAllAxes.js

@@ -79,6 +79,6 @@ export function getAxisTitle(axis) {
   const subplotNb = getSubplotNumber(axis);
 
   return axis._input && axis._input.title
-    ? striptags(`${axisType} Axis: ${axis._input.title}`)
-    : striptags(`${axisType} Axis ${subplotNb === 0 ? 1 : subplotNb}`);
+    ? striptags(`${axisType}: ${axis._input.title}`)
+    : striptags(`${axisType} ${subplotNb === 0 ? 1 : subplotNb}`);
 }