Name changes & add isRequired

Author: VeraZab

src/EditorControls.js

@@ -28,7 +28,7 @@ class EditorControls extends Component {
     return {
       advancedTraceTypeSelector: this.props.advancedTraceTypeSelector,
       config: gd._context,
-      customSrcHandling: this.props.customSrcHandling,
+      srcConverters: this.props.srcConverters,
       data: gd.data,
       dataSources: this.props.dataSources,
       dataSourceOptions: this.props.dataSourceOptions,
@@ -281,9 +281,9 @@ EditorControls.propTypes = {
   beforeUpdateTraces: PropTypes.func,
   children: PropTypes.node,
   className: PropTypes.string,
-  customSrcHandling: PropTypes.shape({
-    toSrc: PropTypes.func,
-    fromSrc: PropTypes.func,
+  srcConverters: PropTypes.shape({
+    toSrc: PropTypes.func.isRequired,
+    fromSrc: PropTypes.func.isRequired,
   }),
   dataSourceOptionRenderer: PropTypes.func,
   dataSourceOptions: PropTypes.array,
@@ -311,9 +311,9 @@ EditorControls.defaultProps = {
 EditorControls.childContextTypes = {
   advancedTraceTypeSelector: PropTypes.bool,
   config: PropTypes.object,
-  customSrcHandling: PropTypes.shape({
-    toSrc: PropTypes.func,
-    fromSrc: PropTypes.func,
+  srcConverters: PropTypes.shape({
+    toSrc: PropTypes.func.isRequired,
+    fromSrc: PropTypes.func.isRequired,
   }),
   data: PropTypes.array,
   dataSourceOptionRenderer: PropTypes.func,

src/PlotlyEditor.js

@@ -25,7 +25,7 @@ class PlotlyEditor extends Component {
             traceTypesConfig={this.props.traceTypesConfig}
             dictionaries={this.props.dictionaries}
             showFieldTooltips={this.props.showFieldTooltips}
-            customSrcHandling={this.props.customSrcHandling}
+            srcConverters={this.props.srcConverters}
           >
             {this.props.children}
           </EditorControls>
@@ -71,9 +71,9 @@ PlotlyEditor.propTypes = {
   divId: PropTypes.string,
   hideControls: PropTypes.bool,
   showFieldTooltips: PropTypes.bool,
-  customSrcHandling: PropTypes.shape({
-    toSrc: PropTypes.func,
-    fromSrc: PropTypes.func,
+  srcConverters: PropTypes.shape({
+    toSrc: PropTypes.func.isRequired,
+    fromSrc: PropTypes.func.isRequired,
   }),
 };
 

src/components/fields/DataSelector.js

@@ -27,11 +27,8 @@ export class UnconnectedDataSelector extends Component {
 
     this.srcAttr = props.attr + 'src';
     this.srcProperty = nestedProperty(props.container, this.srcAttr).get();
-    this.fullValue = this.context.customSrcHandling
-      ? this.context.customSrcHandling.toSrc(
-          this.srcProperty,
-          props.container.type
-        )
+    this.fullValue = this.context.srcConverters
+      ? this.context.srcConverters.toSrc(this.srcProperty, props.container.type)
       : this.srcProperty;
 
     this.is2D = false;
@@ -77,8 +74,8 @@ export class UnconnectedDataSelector extends Component {
       this.srcAttr,
       this.props.container.type,
       {
-        fromSrc: this.context.customSrcHandling
-          ? this.context.customSrcHandling.fromSrc
+        fromSrc: this.context.srcConverters
+          ? this.context.srcConverters.fromSrc
           : null,
       }
     );
@@ -127,9 +124,9 @@ UnconnectedDataSelector.contextTypes = {
   dataSourceOptions: PropTypes.array,
   dataSourceValueRenderer: PropTypes.func,
   dataSourceOptionRenderer: PropTypes.func,
-  customSrcHandling: PropTypes.shape({
-    toSrc: PropTypes.func,
-    fromSrc: PropTypes.func,
+  srcConverters: PropTypes.shape({
+    toSrc: PropTypes.func.isRequired,
+    fromSrc: PropTypes.func.isRequired,
   }),
 };