Merge pull request #837 from plotly/plotlyjs-1.44.0

adjustments for plotly.js 1.44.0
plotly · Feb 3, 2019 · eed7f30 · eed7f30
2 parents 4a7c475 + 391046f
commit eed7f30
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-chart-editor",
   "description": "plotly.js chart editor react component UI",
-  "version": "0.34.4",
+  "version": "0.35.0",
   "author": "Plotly, Inc.",
   "bugs": {
     "url": "https://github.com/plotly/react-chart-editor/issues"
@@ -15,7 +15,7 @@
     "fast-isnumeric": "^1.1.1",
     "immutability-helper": "^2.7.1",
     "plotly-icons": "1.2.3",
-    "plotly.js": "1.43.2",
+    "plotly.js": "1.44.1",
     "prop-types": "^15.5.10",
     "raf": "^3.4.0",
     "react-color": "^2.13.8",

diff --git a/scripts/translationKeys/combined-translation-keys.txt b/scripts/translationKeys/combined-translation-keys.txt
diff --git a/scripts/translationKeys/translation-keys.txt b/scripts/translationKeys/translation-keys.txt
@@ -24,7 +24,7 @@ $
 2D Contour Histogram                                                                                                                                                         // /lib/computeTraceOptionsFromSchema.js:33
 2D Histogram                                                                                                                                                                 // /lib/computeTraceOptionsFromSchema.js:29
 3D                                                                                                                                                                           // /lib/traceTypes.js:29
-3D Line                                                                                                                                                                      // /lib/computeTraceOptionsFromSchema.js:148
+3D Line                                                                                                                                                                      // /lib/computeTraceOptionsFromSchema.js:152
 3D Mesh                                                                                                                                                                      // /lib/computeTraceOptionsFromSchema.js:61
 3D Scatter                                                                                                                                                                   // /lib/computeTraceOptionsFromSchema.js:53
 3D Surface                                                                                                                                                                   // /lib/traceTypes.js:102
@@ -343,6 +343,7 @@ Intensity
 Interactions                                                                                                                                                                 // /default_panels/StyleLayoutPanel.js:106
 Interpolate                                                                                                                                                                  // /default_panels/StyleTracesPanel.js:383
 Interpolate Gaps                                                                                                                                                             // /default_panels/StyleTracesPanel.js:517
+Isosurface                                                                                                                                                                   // /lib/computeTraceOptionsFromSchema.js:137
 J (Optional)                                                                                                                                                                 // /default_panels/GraphCreatePanel.js:93
 January                                                                                                                                                                      // /components/widgets/DateTimePicker.js:70
 Jitter                                                                                                                                                                       // /default_panels/StyleTracesPanel.js:305
@@ -547,7 +548,7 @@ Roughness
 SVG                                                                                                                                                                          // /components/fields/TraceSelector.js:101
 Sankey                                                                                                                                                                       // /lib/computeTraceOptionsFromSchema.js:97
 Satellite                                                                                                                                                                    // /default_panels/GraphSubplotsPanel.js:81
-Satellite Map                                                                                                                                                                // /lib/computeTraceOptionsFromSchema.js:155
+Satellite Map                                                                                                                                                                // /lib/computeTraceOptionsFromSchema.js:159
 Satellite with Streets                                                                                                                                                       // /default_panels/GraphSubplotsPanel.js:82
 Scale                                                                                                                                                                        // /default_panels/GraphSubplotsPanel.js:213
 Scale Group                                                                                                                                                                  // /default_panels/StyleTracesPanel.js:561
@@ -656,7 +657,7 @@ Tick Spacing
 Tick spacing                                                                                                                                                                 // /default_panels/StyleColorbarsPanel.js:213
 Ticks                                                                                                                                                                        // /default_panels/StyleColorbarsPanel.js:221
 Timescale Buttons                                                                                                                                                            // /default_panels/StyleAxesPanel.js:342
-Timeseries                                                                                                                                                                   // /lib/computeTraceOptionsFromSchema.js:144
+Timeseries                                                                                                                                                                   // /lib/computeTraceOptionsFromSchema.js:148
 Tip                                                                                                                                                                          // /default_panels/StyleTracesPanel.js:71
 Title                                                                                                                                                                        // /default_panels/StyleColorbarsPanel.js:37
 Titles                                                                                                                                                                       // /default_panels/StyleAxesPanel.js:32

diff --git a/src/default_panels/StyleLayoutPanel.js b/src/default_panels/StyleLayoutPanel.js
@@ -17,6 +17,7 @@ import {
   Radio,
 } from '../components';
 import {HoverColor} from '../components/fields/derived';
+import DataSelector from '../components/fields/DataSelector';
 
 const StyleLayoutPanel = (props, {localize: _}) => (
   <LayoutPanel>
@@ -165,6 +166,9 @@ const StyleLayoutPanel = (props, {localize: _}) => (
         </HovermodeDropdown>
       </PlotlySection>
     </PlotlyFold>
+    <PlotlyFold name={_('Meta')}>
+      <DataSelector label={_('Custom Data')} attr="meta" />
+    </PlotlyFold>
   </LayoutPanel>
 );
 

diff --git a/src/lib/computeTraceOptionsFromSchema.js b/src/lib/computeTraceOptionsFromSchema.js
@@ -132,6 +132,10 @@ function computeTraceOptionsFromSchema(schema, _, context) {
       value: 'barpolar',
       label: _('Polar Bar'),
     },
+    {
+      value: 'isosurface',
+      label: _('Isosurface'),
+    },
   ].filter(obj => traceTypes.indexOf(obj.value) !== -1);
 
   const traceIndex = traceType => traceOptions.findIndex(opt => opt.value === traceType);

diff --git a/src/lib/index.js b/src/lib/index.js
@@ -155,7 +155,7 @@ function maybeAdjustSrc(src, srcAttributePath, traceType, config) {
     return src[0];
   }
 
-  return config && config.fromSrc ? config.fromSrc(src, traceType) : src;
+  return config && config.fromSrc ? config.fromSrc(src, traceType, srcAttributePath) : src;
 }
 
 function adjustColorscale(colorscale, numberOfNeededColors, colorscaleType, config) {

diff --git a/src/lib/traceTypes.js b/src/lib/traceTypes.js
@@ -240,4 +240,9 @@ export const traceTypes = _ => [
     label: _('Carpet'),
     category: chartCategory(_).HIDDEN,
   },
+  {
+    value: 'isosurface',
+    label: _('Isosurface'),
+    category: chartCategory(_).HIDDEN,
+  },
 ];