🔪 editor revision (#381)

Author: nicolaskruchten

dev/App.js

@@ -33,7 +33,6 @@ class App extends Component {
     // _fullLayout etc in handlePlotUpdate()
     this.state = {
       graphDiv: {},
-      editorRevision: 0,
       plotRevision: 0,
       currentMockIndex: -1,
       mocks: [],
@@ -51,7 +50,7 @@ class App extends Component {
   }
 
   handlePlotUpdate(graphDiv) {
-    this.setState(({editorRevision: x}) => ({editorRevision: x + 1, graphDiv}));
+    this.setState({graphDiv});
   }
 
   handleEditorUpdate() {
@@ -82,7 +81,6 @@ class App extends Component {
           <PlotlyEditor
             graphDiv={this.state.graphDiv}
             onUpdate={this.handleEditorUpdate.bind(this)}
-            revision={this.state.editorRevision}
             dataSources={dataSources}
             dataSourceOptions={dataSourceOptions}
             plotly={plotly}

src/PlotlyEditor.js

@@ -19,18 +19,6 @@ class PlotlyEditor extends Component {
     }
   }
 
-  shouldComponentUpdate(nextProps) {
-    if (
-      nextProps.revision === void 0 ||
-      nextProps.revision !== this.props.revision ||
-      nextProps.dataSources !== this.props.dataSources ||
-      nextProps.dataSourceOptions !== this.props.dataSourceOptions
-    ) {
-      return true;
-    }
-    return false;
-  }
-
   getChildContext() {
     const gd = this.props.graphDiv || {};
     return {
@@ -253,7 +241,6 @@ PlotlyEditor.propTypes = {
   locale: PropTypes.string,
   onUpdate: PropTypes.func,
   plotly: PropTypes.object,
-  revision: PropTypes.any,
   traceTypesConfig: PropTypes.object,
 };
 

src/__tests__/PlotlyEditor-test.js

@@ -42,6 +42,7 @@ class Section extends Component {
         // for now, only allowing for cartesian chart types
         if (
           data.length > 1 &&
+          data[fullContainer.index] &&
           traceTypeToAxisType(data[fullContainer.index].type) === 'cartesian'
         ) {
           this.sectionVisible = true;

src/components/containers/Section.js

@@ -127,7 +127,7 @@ TraceSelector.propTypes = {
   getValObject: PropTypes.func,
   container: PropTypes.object.isRequired,
   fullContainer: PropTypes.object.isRequired,
-  fullValue: PropTypes.any.isRequired,
+  fullValue: PropTypes.any,
   localize: PropTypes.func,
   updateContainer: PropTypes.func,
 };