@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - [[#412](https://github.com/plotly/plotly.rs/pull/412)] Add `Violin` trace type with box, mean line, KDE span, and split/grouped support
 - [[#414](https://github.com/plotly/plotly.rs/issues/414)] Add `DensityMap` (MapLibre `map` subplot) trace type — density heatmaps with full color-scale and hover support
 - [[#417](https://github.com/plotly/plotly.rs/issues/417)] Add `ScatterMap` (MapLibre `map` subplot) trace type — the modern counterpart to `ScatterMapbox`
+- Add `Funnel` trace type (bar-like, cartesian) with a `Connector` option, plus the layout-level `funnelmode`/`funnelgap`/`funnelgroupgap` attributes and a `FunnelMode` enum
 - [[#418](https://github.com/plotly/plotly.rs/issues/418)] Add native point clustering to `ScatterMap` via a `Cluster` option
 
 ### Changed
 
@@ -222,6 +222,7 @@ pub enum PlotType {
     Choropleth,
     ChoroplethMap,
     Contour,
+    Funnel,
     HeatMap,
     Histogram,
     Histogram2dContour,
 
@@ -44,7 +44,8 @@ pub use self::legend::{GroupClick, ItemClick, ItemSizing, Legend, TraceOrder};
 pub use self::map::{LayoutMap, MapBounds, MapStyle};
 pub use self::mapbox::{Center, Mapbox, MapboxStyle};
 pub use self::modes::{
-    AspectMode, BarMode, BarNorm, BoxMode, ClickMode, UniformTextMode, ViolinMode, WaterfallMode,
+    AspectMode, BarMode, BarNorm, BoxMode, ClickMode, FunnelMode, UniformTextMode, ViolinMode,
+    WaterfallMode,
 };
 pub use self::polar::{
     AngularAxis, AngularAxisType, AutoRange, AutoRangeOptions, AutoTypeNumbers, AxisLayer,
@@ -379,6 +380,12 @@ pub struct LayoutFields {
     waterfall_gap: Option<f64>,
     #[serde(rename = "waterfallgroupgap")]
     waterfall_group_gap: Option<f64>,
+    #[serde(rename = "funnelmode")]
+    funnel_mode: Option<FunnelMode>,
+    #[serde(rename = "funnelgap")]
+    funnel_gap: Option<f64>,
+    #[serde(rename = "funnelgroupgap")]
+    funnel_group_gap: Option<f64>,
     #[serde(rename = "piecolorway")]
     pie_colorway: Option<Vec<Box<dyn Color>>>,
     #[serde(rename = "extendpiecolors")]
 
@@ -71,6 +71,14 @@ pub enum WaterfallMode {
     Overlay,
 }
 
+#[derive(Serialize, Debug, Clone)]
+#[serde(rename_all = "lowercase")]
+pub enum FunnelMode {
+    Stack,
+    Group,
+    Overlay,
+}
+
 #[derive(Debug, Clone)]
 pub enum UniformTextMode {
     False,
@@ -146,6 +154,13 @@ mod tests {
         assert_eq!(to_value(WaterfallMode::Overlay).unwrap(), json!("overlay"));
     }
 
+    #[test]
+    fn serialize_funnel_mode() {
+        assert_eq!(to_value(FunnelMode::Stack).unwrap(), json!("stack"));
+        assert_eq!(to_value(FunnelMode::Group).unwrap(), json!("group"));
+        assert_eq!(to_value(FunnelMode::Overlay).unwrap(), json!("overlay"));
+    }
+
     #[test]
     fn serialize_aspect_mode() {
         let aspect_mode = AspectMode::default();
 
@@ -60,13 +60,14 @@ pub use layout::Layout;
 pub use plot::{Plot, Trace, Traces};
 // Also provide easy access to modules which contain additional trace-specific types
 pub use traces::{
-    box_plot, choropleth, choropleth_map, contour, density_map, heat_map, histogram, image, mesh3d,
-    sankey, scatter, scatter3d, scatter_map, scatter_mapbox, sunburst, surface, treemap, violin,
+    box_plot, choropleth, choropleth_map, contour, density_map, funnel, heat_map, histogram, image,
+    mesh3d, sankey, scatter, scatter3d, scatter_map, scatter_mapbox, sunburst, surface, treemap,
+    violin,
 };
 // Bring the different trace types into the top-level scope
 pub use traces::{
     Bar, BoxPlot, Candlestick, Choropleth, ChoroplethMap, Contour, DensityMap, DensityMapbox,
-    HeatMap, Histogram, Image, Mesh3D, Ohlc, Pie, Sankey, Scatter, Scatter3D, ScatterGeo,
+    Funnel, HeatMap, Histogram, Image, Mesh3D, Ohlc, Pie, Sankey, Scatter, Scatter3D, ScatterGeo,
     ScatterMap, ScatterMapbox, ScatterPolar, Sunburst, Surface, Table, Treemap, Violin,
 };
 
 
@@ -0,0 +1,303 @@
+//! Funnel trace
+
+use plotly_derive::FieldSetter;
+use serde::Serialize;
+
+use crate::{
+    color::Color,
+    common::{
+        ConstrainText, Dim, Font, HoverInfo, Label, LegendGroupTitle, Line, Marker, Orientation,
+        PlotType, TextAnchor, TextPosition, Visible, XAxisId, YAxisId,
+    },
+    Trace,
+};
+
+/// Visually connects consecutive funnel stages.
+#[serde_with::skip_serializing_none]
+#[derive(Serialize, Clone, Debug, FieldSetter)]
+pub struct Connector {
+    visible: Option<bool>,
+    line: Option<Line>,
+    #[serde(rename = "fillcolor")]
+    fill_color: Option<Box<dyn Color>>,
+}
+
+impl Connector {
+    pub fn new() -> Self {
+        Default::default()
+    }
+}
+
+/// Construct a funnel trace.
+///
+/// # Examples
+///
+/// ```
+/// use plotly::Funnel;
+///
+/// let x = vec![100, 60, 40];
+/// let y = vec!["Visits", "Signups", "Purchases"];
+///
+/// let trace = Funnel::new(x, y)
+///     .orientation(plotly::common::Orientation::Horizontal)
+///     .text_info("value+percent previous");
+///
+/// let expected = serde_json::json!({
+///     "type": "funnel",
+///     "x": [100, 60, 40],
+///     "y": ["Visits", "Signups", "Purchases"],
+///     "orientation": "h",
+///     "textinfo": "value+percent previous"
+/// });
+///
+/// assert_eq!(serde_json::to_value(trace).unwrap(), expected);
+/// ```
+#[serde_with::skip_serializing_none]
+#[derive(Serialize, Debug, Clone, FieldSetter)]
+#[field_setter(box_self, kind = "trace")]
+pub struct Funnel<X, Y>
+where
+    X: Serialize + Clone,
+    Y: Serialize + Clone,
+{
+    #[field_setter(default = "PlotType::Funnel")]
+    r#type: PlotType,
+    x: Option<Vec<X>>,
+    y: Option<Vec<Y>>,
+    name: Option<String>,
+    visible: Option<Visible>,
+    #[serde(rename = "showlegend")]
+    show_legend: Option<bool>,
+    #[serde(rename = "legendgroup")]
+    legend_group: Option<String>,
+    #[serde(rename = "legendgrouptitle")]
+    legend_group_title: Option<LegendGroupTitle>,
+    opacity: Option<f64>,
+    ids: Option<Vec<String>>,
+    /// Sets the bar width (in position axis units). Unlike `Bar`, the funnel
+    /// trace does not accept a per-point array here.
+    width: Option<f64>,
+    /// Shifts the position where the bar is drawn (in position axis units).
+    /// Unlike `Bar`, the funnel trace does not accept a per-point array here.
+    offset: Option<f64>,
+    orientation: Option<Orientation>,
+    text: Option<Dim<String>>,
+    #[serde(rename = "textposition")]
+    text_position: Option<Dim<TextPosition>>,
+    /// Determines which trace information appears on the graph. Plotly.js
+    /// expects a `+`-joined flaglist built from any of `label`, `text`,
+    /// `percent initial`, `percent previous`, `percent total` and `value`, or
+    /// the single value `none`.
+    #[serde(rename = "textinfo")]
+    text_info: Option<String>,
+    #[serde(rename = "texttemplate")]
+    text_template: Option<Dim<String>>,
+    #[serde(rename = "texttemplatefallback")]
+    text_template_fallback: Option<Dim<String>>,
+    #[serde(rename = "textangle")]
+    text_angle: Option<f64>,
+    #[serde(rename = "textfont")]
+    text_font: Option<Font>,
+    #[serde(rename = "insidetextfont")]
+    inside_text_font: Option<Font>,
+    #[serde(rename = "outsidetextfont")]
+    outside_text_font: Option<Font>,
+    #[serde(rename = "insidetextanchor")]
+    inside_text_anchor: Option<TextAnchor>,
+    #[serde(rename = "constraintext")]
+    constrain_text: Option<ConstrainText>,
+    #[serde(rename = "cliponaxis")]
+    clip_on_axis: Option<bool>,
+    #[serde(rename = "hovertext")]
+    hover_text: Option<Dim<String>>,
+    #[serde(rename = "hoverinfo")]
+    hover_info: Option<HoverInfo>,
+    #[serde(rename = "hovertemplate")]
+    hover_template: Option<Dim<String>>,
+    #[serde(rename = "hovertemplatefallback")]
+    hover_template_fallback: Option<Dim<String>>,
+    #[serde(rename = "hoverlabel")]
+    hover_label: Option<Label>,
+    marker: Option<Marker>,
+    connector: Option<Connector>,
+    #[serde(rename = "xaxis")]
+    x_axis: Option<XAxisId>,
+    #[serde(rename = "yaxis")]
+    y_axis: Option<YAxisId>,
+    #[serde(rename = "alignmentgroup")]
+    alignment_group: Option<String>,
+    #[serde(rename = "offsetgroup")]
+    offset_group: Option<String>,
+}
+
+impl<X, Y> Funnel<X, Y>
+where
+    X: Serialize + Clone,
+    Y: Serialize + Clone,
+{
+    pub fn new(x: Vec<X>, y: Vec<Y>) -> Box<Self> {
+        Box::new(Funnel {
+            x: Some(x),
+            y: Some(y),
+            ..Default::default()
+        })
+    }
+}
+
+impl<X, Y> Trace for Funnel<X, Y>
+where
+    X: Serialize + Clone,
+    Y: Serialize + Clone,
+{
+    fn to_json(&self) -> String {
+        serde_json::to_string(self).unwrap()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{json, to_value};
+
+    use super::*;
+    use crate::common::DashType;
+
+    #[test]
+    fn default_funnel() {
+        let trace: Funnel<i32, i32> = Funnel::default();
+        let expected = json!({"type": "funnel"}).to_string();
+
+        assert_eq!(trace.to_json(), expected);
+    }
+
+    #[test]
+    fn serialize_connector() {
+        let connector = Connector::new()
+            .visible(true)
+            .line(Line::new().width(2.0).dash(DashType::Dot))
+            .fill_color("#aabbcc");
+
+        let expected = json!({
+            "visible": true,
+            "line": {"width": 2.0, "dash": "dot"},
+            "fillcolor": "#aabbcc",
+        });
+
+        assert_eq!(to_value(connector).unwrap(), expected);
+    }
+
+    #[test]
+    fn serialize_funnel() {
+        let funnel = Funnel::new(vec![1, 2], vec![3, 4])
+            .alignment_group("alignment_group")
+            .clip_on_axis(true)
+            .connector(Connector::new().visible(true))
+            .constrain_text(ConstrainText::Both)
+            .hover_info(HoverInfo::All)
+            .hover_label(Label::new())
+            .hover_template("tmpl")
+            .hover_template_array(vec!["tmpl1", "tmpl2"])
+            .hover_text("hover_text")
+            .hover_text_array(vec!["hover_text"])
+            .ids(vec!["1"])
+            .inside_text_anchor(TextAnchor::End)
+            .inside_text_font(Font::new())
+            .legend_group("legend-group")
+            .legend_group_title("legend-group-title")
+            .marker(Marker::new())
+            .name("Funnel")
+            .offset(5.0)
+            .offset_group("offset_group")
+            .opacity(0.5)
+            .orientation(Orientation::Horizontal)
+            .outside_text_font(Font::new())
+            .show_legend(false)
+            .text("text")
+            .text_angle(0.05)
+            .text_array(vec!["text"])
+            .text_font(Font::new())
+            .text_info("value+percent previous")
+            .text_position(TextPosition::Inside)
+            .text_position_array(vec![TextPosition::Inside])
+            .text_template("text_template")
+            .text_template_array(vec!["text_template"])
+            .visible(Visible::LegendOnly)
+            .width(999.0)
+            .x_axis("x3")
+            .y_axis("y3");
+
+        let expected = json!({
+            "type": "funnel",
+            "x": [1, 2],
+            "y": [3, 4],
+            "name": "Funnel",
+            "visible": "legendonly",
+            "showlegend": false,
+            "legendgroup": "legend-group",
+            "legendgrouptitle": {"text": "legend-group-title"},
+            "opacity": 0.5,
+            "ids": ["1"],
+            "width": 999.0,
+            "offset": 5.0,
+            "orientation": "h",
+            "text": ["text"],
+            "textposition": ["inside"],
+            "textinfo": "value+percent previous",
+            "texttemplate": ["text_template"],
+            "textangle": 0.05,
+            "textfont": {},
+            "insidetextfont": {},
+            "outsidetextfont": {},
+            "insidetextanchor": "end",
+            "constraintext": "both",
+            "cliponaxis": true,
+            "hovertext": ["hover_text"],
+            "hoverinfo": "all",
+            "hovertemplate": ["tmpl1", "tmpl2"],
+            "hoverlabel": {},
+            "marker": {},
+            "connector": {"visible": true},
+            "xaxis": "x3",
+            "yaxis": "y3",
+            "alignmentgroup": "alignment_group",
+            "offsetgroup": "offset_group",
+        });
+
+        assert_eq!(to_value(funnel).unwrap(), expected);
+    }
+
+    #[test]
+    fn serialize_horizontal_funnel_in_subplot() {
+        let funnel = Funnel::new(
+            vec![1234567890.0, 800000000.0, 500000000.0],
+            vec!["Spent", "Committed", "Planned"],
+        )
+        .orientation(Orientation::Horizontal)
+        .name("Pipeline funnel: totalplannedcommit -> commit_total -> spent_total")
+        .text_info("value+percent previous")
+        .text_position(TextPosition::Inside)
+        .hover_text_array(vec!["a", "b", "c"])
+        .hover_template("%{hovertext}<extra></extra>")
+        .marker(Marker::new().color_array(vec!["#111111", "#222222", "#333333"]))
+        .connector(Connector::new().visible(true))
+        .x_axis("x3")
+        .y_axis("y3");
+
+        let expected = json!({
+            "type": "funnel",
+            "x": [1234567890.0, 800000000.0, 500000000.0],
+            "y": ["Spent", "Committed", "Planned"],
+            "orientation": "h",
+            "name": "Pipeline funnel: totalplannedcommit -> commit_total -> spent_total",
+            "textinfo": "value+percent previous",
+            "textposition": "inside",
+            "hovertext": ["a", "b", "c"],
+            "hovertemplate": "%{hovertext}<extra></extra>",
+            "marker": {"color": ["#111111", "#222222", "#333333"]},
+            "connector": {"visible": true},
+            "xaxis": "x3",
+            "yaxis": "y3",
+        });
+
+        assert_eq!(to_value(funnel).unwrap(), expected);
+    }
+}