last tweak

Author: nicolaskruchten

src/components/containers/AnnotationAccordion.js

@@ -22,7 +22,7 @@ class AnnotationAccordion extends Component {
           <AnnotationFold
             key={i}
             annotationIndex={i}
-            name={getParsedTemplateString(ann.text, meta)}
+            name={getParsedTemplateString(ann.text, {meta})}
             canDelete={canAdd}
           >
             {children}

src/components/containers/RangeSelectorAccordion.js

@@ -33,7 +33,7 @@ class RangeSelectorAccordion extends Component {
         <RangeSelectorFold
           key={i}
           rangeselectorIndex={i}
-          name={getParsedTemplateString(btn.label, meta)}
+          name={getParsedTemplateString(btn.label, {meta})}
           canDelete={true}
         >
           {children}

src/components/fields/AxesCreator.js

@@ -134,10 +134,9 @@ class UnconnectedAxesCreator extends Component {
 
     function getOptions(axisType) {
       return fullLayout._subplots[axisType].map(axisId => ({
-        label: getParsedTemplateString(
-          getAxisTitle(fullLayout[axisIdToAxisName(axisId)]),
-          fullLayout.meta
-        ),
+        label: getParsedTemplateString(getAxisTitle(fullLayout[axisIdToAxisName(axisId)]), {
+          meta: fullLayout.meta,
+        }),
         value: axisId,
       }));
     }

src/components/fields/AxesSelector.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Dropdown from '../widgets/Dropdown';
 import RadioBlocks from '../widgets/RadioBlocks';
 import React, {Component} from 'react';
+import {getParsedTemplateString} from 'lib';
 
 class AxesSelector extends Component {
   constructor(props, context) {
@@ -30,7 +31,9 @@ class AxesSelector extends Component {
           option.value === 'allaxes'
             ? option
             : {
-                label: option.title,
+                label: getParsedTemplateString(option.title, {
+                  meta: fullLayout.meta,
+                }),
                 value: option.value,
               }
         )

src/lib/connectTraceToPlot.js

@@ -71,7 +71,7 @@ export default function connectTraceToPlot(WrappedComponent) {
 
       if (trace && fullTrace) {
         this.icon = renderTraceIcon(plotlyTraceToCustomTrace(trace));
-        this.name = getParsedTemplateString(fullTrace.name, fullTrace.meta);
+        this.name = getParsedTemplateString(fullTrace.name, {meta: fullTrace.meta});
       }
     }
 

src/lib/index.js

@@ -203,11 +203,11 @@ function getFullTrace(props, context) {
   return fullTrace;
 }
 
-function getParsedTemplateString(originalString, meta) {
+function getParsedTemplateString(originalString, context) {
   let text = originalString;
 
-  if (originalString && meta && (meta.length || Object.keys(meta).length)) {
-    text = templateString(originalString, {meta});
+  if (originalString && context) {
+    text = templateString(originalString, context);
   }
 
   return text === '' && originalString ? originalString : text;