bind to fullInput instead of fullData

Author: nicolaskruchten

src/components/containers/TraceMarkerSection.js

@@ -15,7 +15,7 @@ class TraceMarkerSection extends Component {
 
   setLocals(context) {
     const _ = this.props.localize;
-    const traceType = context.fullContainer._fullInput.type;
+    const traceType = context.fullContainer.type;
     if (['bar', 'histogram'].includes(traceType)) {
       this.name = _('Bars');
     } else {

src/components/containers/derived.js

@@ -11,18 +11,10 @@ const TraceTypeSection = (props, context) => {
   const {fullContainer, fullData} = context;
 
   const ifConnectedToTrace =
-    fullContainer &&
-    ((fullContainer._fullInput &&
-      props.traceTypes.includes(fullContainer._fullInput.type)) ||
-      props.traceTypes.includes(fullContainer.type));
+    fullContainer && props.traceTypes.includes(fullContainer.type);
 
   const ifConnectedToLayout =
-    fullData &&
-    fullData.some(
-      t =>
-        props.traceTypes.includes(t._fullInput.type) ||
-        fullData.some(t => props.traceTypes.includes(t.type))
-    );
+    fullData && fullData.some(t => props.traceTypes.includes(t.type));
 
   if (ifConnectedToTrace || ifConnectedToLayout) {
     return <Section {...props} />;

src/components/fields/TraceSelector.js

@@ -68,8 +68,7 @@ class TraceSelector extends Component {
       container &&
       container.uid &&
       !container.mode &&
-      fullContainer._fullInput &&
-      fullContainer._fullInput.type === 'scatter'
+      fullContainer.type === 'scatter'
     ) {
       updateContainer({
         type: 'scatter',

src/lib/connectTraceToPlot.js

@@ -2,7 +2,6 @@ import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import nestedProperty from 'plotly.js/src/lib/nested_property';
 import {
-  findFullTraceIndex,
   getDisplayName,
   plotlyTraceToCustomTrace,
   renderTraceIcon,
@@ -29,29 +28,23 @@ export default function connectTraceToPlot(WrappedComponent) {
       const {data, fullData, plotly} = context;
 
       const trace = traceIndexes.length > 0 ? data[traceIndexes[0]] : {};
-      const fullTraceIndex =
-        traceIndexes.length > 0
-          ? findFullTraceIndex(fullData, traceIndexes[0])
-          : findFullTraceIndex(fullData, 0);
-      const fullTrace = fullData[fullTraceIndex] || {};
-
-      let getValObject;
-      if (plotly && fullTrace._fullInput) {
-        /*
-         * Since fullTrace._fullInput contains the _module.attributes key:
-         * https://github.com/plotly/plotly.js/blob/70f3f70ec5b306cf74630355676f5e318f685824/src/plot_api/plot_schema.js#L241
-         * this will work for all chart types. This needed to be adjusted as financial charts
-         * do not contain their 'true' attributes, but rather attributes of the trace types that are used to compose them
-        */
-        getValObject = attr =>
-          plotly.PlotSchema.getTraceValObject(
-            fullTrace._fullInput,
-            nestedProperty({}, attr).parts
-          );
+
+      let fullTrace = {};
+      for (let i = 0; i < fullData.length; i++) {
+        if (trace.uid === fullData[i]._fullInput.uid) {
+          fullTrace = fullData[i]._fullInput;
+          break;
+        }
       }
 
       this.childContext = {
-        getValObject,
+        getValObject: attr =>
+          plotly
+            ? plotly.PlotSchema.getTraceValObject(
+                fullTrace,
+                nestedProperty({}, attr).parts
+              )
+            : null,
         updateContainer: this.updateTrace,
         deleteContainer: this.deleteTrace,
         container: trace,

src/lib/findFullTraceIndex.js

@@ -13,7 +13,6 @@ import connectToContainer, {
 import {computeTraceOptionsFromSchema} from './computeTraceOptionsFromSchema';
 import connectTraceToPlot from './connectTraceToPlot';
 import dereference from './dereference';
-import findFullTraceIndex from './findFullTraceIndex';
 import getAllAxes, {
   axisIdToAxisName,
   traceTypeToAxisType,
@@ -88,7 +87,6 @@ export {
   computeTraceOptionsFromSchema,
   traceTypeToPlotlyInitFigure,
   dereference,
-  findFullTraceIndex,
   getAllAxes,
   getAxisTitle,
   getDisplayName,

src/lib/index.js

@@ -14,21 +14,7 @@ export default function unpackPlotProps(props, context) {
     attrMeta = context.getValObject(props.attr) || {};
   }
 
-  /*
-   * This needed to be adjusted as financial charts
-   * do not contain their 'true' attributes, but rather attributes of the trace
-   * types that are used to compose them. Financial chart attributes are found in
-   * fullContainer._fullInput
-   */
-  let fullContainer = context.fullContainer;
-  if (
-    fullContainer &&
-    fullContainer._fullInput &&
-    (fullContainer._fullInput.type === 'ohlc' ||
-      fullContainer._fullInput.type === 'candlestick')
-  ) {
-    fullContainer = fullContainer._fullInput;
-  }
+  const fullContainer = context.fullContainer;
 
   const fullProperty = nestedProperty(fullContainer, props.attr);
   let fullValue = fullProperty.get();