Merge branch 'main' of https://github.com/G0rocks/plotly.rs

Author: G0rocks

plotly/src/layout/mod.rs

@@ -1488,7 +1488,6 @@ impl Geo {
     }
 }
 
-
 #[derive(Serialize, Debug, Clone)]
 /// If "cube", this scene's axes are drawn as a cube, regardless of the axes'
 /// ranges. If "data", this scene's axes are drawn in proportion with the axes'

plotly/src/lib.rs

@@ -40,7 +40,7 @@ pub use traces::{
 // Bring the different trace types into the top-level scope
 pub use traces::{
     Bar, BoxPlot, Candlestick, Contour, DensityMapbox, HeatMap, Histogram, Image, Mesh3D, Ohlc,
-    Pie, Sankey, Scatter, Scatter3D, ScatterMapbox, ScatterGeo, ScatterPolar, Surface, Table,
+    Pie, Sankey, Scatter, Scatter3D, ScatterGeo, ScatterMapbox, ScatterPolar, Surface, Table,
 };
 
 pub trait Restyle: serde::Serialize {}

plotly/src/traces/heat_map.rs

@@ -7,6 +7,7 @@ use crate::{
     common::{
         Calendar, ColorBar, ColorScale, Dim, HoverInfo, Label, LegendGroupTitle, PlotType, Visible,
     },
+    private::NumOrStringCollection,
     Trace,
 };
 
@@ -71,6 +72,11 @@ where
     color_scale: Option<ColorScale>,
     #[serde(rename = "connectgaps")]
     connect_gaps: Option<bool>,
+    /// Assigns extra data each datum. This may be useful when listening to
+    /// hover, click and selection events. Note that, "scatter" traces also
+    /// appends customdata items in the markers DOM elements
+    #[serde(rename = "customdata")]
+    custom_data: Option<NumOrStringCollection>,
     #[serde(rename = "hoverinfo")]
     hover_info: Option<HoverInfo>,
     #[serde(rename = "hoverlabel")]

plotly/src/traces/mod.rs

@@ -14,6 +14,7 @@ pub mod pie;
 pub mod sankey;
 pub mod scatter;
 pub mod scatter3d;
+pub mod scatter_geo;
 pub mod scatter_mapbox;
 pub mod scatter_geo;
 mod scatter_polar;
@@ -33,6 +34,7 @@ pub use pie::Pie;
 pub use sankey::Sankey;
 pub use scatter::Scatter;
 pub use scatter3d::Scatter3D;
+pub use scatter_geo::ScatterGeo;
 pub use scatter_mapbox::ScatterMapbox;
 pub use scatter_geo::ScatterGeo;
 pub use scatter_polar::ScatterPolar;

plotly/src/traces/scatter_geo.rs

@@ -342,7 +342,7 @@ mod tests {
             .hover_label(Label::new())
             .ui_revision(6);
         let expected = json!({
-            "type": "scattergegeo",
+            "type": "scattergeo",
             "lat": [45.5017],
             "lon": [-73.5673],
             "name": "name",
@@ -379,4 +379,4 @@ mod tests {
 
         assert_eq!(to_value(scatter_geo).unwrap(), expected);
     }
-}
+}