Review comments

Author: VeraZab

src/components/fields/TraceSelector.js

@@ -1,7 +1,7 @@
 import {UnconnectedDropdown} from './Dropdown';
 import PropTypes from 'prop-types';
 import React, {Component} from 'react';
-import {connectToContainer, customToPlotly, plotlyToCustom} from '../../lib';
+import {connectToContainer, customTraceToPlotlyTrace, plotlyTraceToCustomTrace} from '../../lib';
 
 function computeTraceOptionsFromSchema(schema) {
   const capitalize = s => s.charAt(0).toUpperCase() + s.substring(1);
@@ -61,15 +61,15 @@ class TraceSelector extends Component {
       this.traceOptions = [{label: 'Scatter', value: 'scatter'}];
     }
 
-    this.fullValue = plotlyToCustom(props.fullContainer);
+    this.fullValue = plotlyTraceToCustomTrace(props.fullContainer);
   }
 
   componentWillReceiveProps(nextProps, nextContext) {
     this.setLocals(nextProps, nextContext);
   }
 
   updatePlot(value) {
-    const update = customToPlotly(value);
+    const update = customTraceToPlotlyTrace(value);
 
     if (this.props.updateContainer) {
       this.props.updateContainer(update);

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

@@ -45,6 +45,24 @@ describe('TraceSelector', () => {
     expect(innerDropdown.prop('value')).toEqual('line');
   });
 
+  it('interprets scatter + mode=lines+markers as type=line', () => {
+    const editorProps = {
+      ...fixtures.scatter({data: [{mode: 'lines+markers'}]}),
+      onUpdate: jest.fn(),
+    };
+    const wrapper = mount(
+      <TestEditor {...editorProps} plotly={plotly}>
+        <TraceSection traceIndex={0}>
+          <TraceSelector attr="type" />
+        </TraceSection>
+      </TestEditor>
+    ).find(TraceSelector);
+
+    const innerDropdown = wrapper.find(Dropdown);
+
+    expect(innerDropdown.prop('value')).toEqual('line');
+  });
+
   it('updates type=scatter mode=lines when type=line', () => {
     const onUpdateTraces = jest.fn();
     const editorProps = {

src/lib/customTraceType.js

@@ -1,4 +1,4 @@
-export function plotlyToCustom(trace) {
+export function plotlyTraceToCustomTrace(trace) {
   if (
     trace.type === 'scatter' &&
     ['tozeroy', 'tozerox', 'tonexty', 'tonextx', 'toself', 'tonext'].includes(
@@ -15,7 +15,7 @@ export function plotlyToCustom(trace) {
   return trace.type;
 }
 
-export function customToPlotly(customTraceType) {
+export function customTraceToPlotlyTrace(customTraceType) {
   if (customTraceType === 'line') {
     return {type: 'scatter', mode: 'lines', fill: 'none'};
   }

src/lib/index.js

@@ -10,7 +10,7 @@ import localize, {localizeString} from './localize';
 import tinyColor from 'tinycolor2';
 import unpackPlotProps from './unpackPlotProps';
 import walkObject, {isPlainObject} from './walkObject';
-import {customToPlotly, plotlyToCustom} from './customTraceType';
+import {customTraceToPlotlyTrace, plotlyTraceToCustomTrace} from './customTraceType';
 
 function clamp(value, min, max) {
   return Math.max(min, Math.min(max, value));
@@ -34,7 +34,7 @@ export {
   connectLayoutToPlot,
   connectToContainer,
   connectTraceToPlot,
-  customToPlotly,
+  customTraceToPlotlyTrace,
   dereference,
   findFullTraceIndex,
   getDisplayName,
@@ -43,7 +43,7 @@ export {
   isPlainObject,
   localize,
   localizeString,
-  plotlyToCustom,
+  plotlyTraceToCustomTrace,
   unpackPlotProps,
   walkObject,
 };