Merge pull request #313 from plotly/histogram

Histogram & Histogram 2d adjustments

Author: VeraZab

src/components/containers/TraceMarkerSection.js

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

src/components/fields/derived.js

@@ -59,6 +59,38 @@ export const TraceOrientation = connectToContainer(UnconnectedRadio, {
         ysrc: context.container.xsrc,
       });
     }
+
+    if (
+      context.container.type === 'histogram' &&
+      plotProps.fullValue === 'v' &&
+      context.container.y &&
+      context.container.y.length !== 0
+    ) {
+      context.updateContainer({
+        y: null,
+        ysrc: null,
+        ybins: null,
+        x: context.container.y,
+        xsrc: context.container.ysrc,
+        xbins: context.container.ybins,
+      });
+    }
+
+    if (
+      context.container.type === 'histogram' &&
+      plotProps.fullValue === 'h' &&
+      context.container.x &&
+      context.container.x.length !== 0
+    ) {
+      context.updateContainer({
+        x: null,
+        xsrc: null,
+        xbins: null,
+        y: context.container.x,
+        ysrc: context.container.xsrc,
+        ybins: context.container.xbins,
+      });
+    }
   },
 });
 

src/default_panels/GraphCreatePanel.js

@@ -26,9 +26,30 @@ const GraphCreatePanel = ({localize: _}) => {
         <DataSelector label={_('Locations')} attr="locations" />
         <DataSelector label={_('Latitude')} attr="lat" />
         <DataSelector label={_('Longitude')} attr="lon" />
-        <DataSelector label={_('X')} attr="x" />
-        <DataSelector label={_('Y')} attr="y" />
-        <DataSelector label={{choropleth: _('Values'), '*': _('Z')}} attr="z" />
+        <DataSelector
+          label={{
+            histogram2d: _('X Values'),
+            histogram: _('X Values'),
+            '*': _('X'),
+          }}
+          attr="x"
+        />
+        <DataSelector
+          label={{
+            histogram2d: _('Y Values'),
+            histogram: _('Y Values'),
+            '*': _('Y'),
+          }}
+          attr="y"
+        />
+        <DataSelector
+          label={{
+            choropleth: _('Values'),
+            histogram2d: _('Z Values'),
+            '*': _('Z'),
+          }}
+          attr="z"
+        />
         <DataSelector label={_('I (Optional)')} attr="i" />
         <DataSelector label={_('J (Optional)')} attr="j" />
         <DataSelector label={_('K (Optional)')} attr="k" />