added funnelarea

Author: emmanuelle

packages/python/plotly/plotly/express/_chart_types.py

@@ -1141,6 +1141,8 @@ def pie(
     """
     if color_discrete_sequence is not None:
         layout_patch = {"piecolorway": color_discrete_sequence}
+    else:
+        layout_patch = {}
     return make_figure(
         args=locals(),
         constructor=go.Pie,
@@ -1191,6 +1193,8 @@ def sunburst(
     """
     if color_discrete_sequence is not None:
         layout_patch = {"sunburstcolorway": color_discrete_sequence}
+    else:
+        layout_patch = {}
     return make_figure(
         args=locals(),
         constructor=go.Sunburst,
@@ -1230,6 +1234,8 @@ def treemap(
     """
     if color_discrete_sequence is not None:
         layout_patch = {"treemapcolorway": color_discrete_sequence}
+    else:
+        layout_patch = {}
     return make_figure(
         args=locals(),
         constructor=go.Treemap,
@@ -1283,8 +1289,11 @@ def funnel(
 
 def funnel_area(
     data_frame=None,
-    values=None,
     names=None,
+    values=None,
+    color=None,
+    color_discrete_sequence=None,
+    color_discrete_map={},
     textinfo=None,
     hover_name=None,
     hover_data=None,
@@ -1294,12 +1303,20 @@ def funnel_area(
     template=None,
     width=None,
     height=None,
+    opacity=None,
 ):
     """
     In a funnel area plot, each row of `data_frame` is represented as a trapezoidal sector of a funnel.
     """
+    if color_discrete_sequence is not None:
+        layout_patch = {"funnelareacolorway": color_discrete_sequence}
+    else:
+        layout_patch = {}
     return make_figure(
-        args=locals(), constructor=go.Funnelarea, trace_patch=dict(showlegend=True)
+        args=locals(),
+        constructor=go.Funnelarea,
+        trace_patch=dict(showlegend=True),
+        layout_patch=layout_patch,
     )
 
 

packages/python/plotly/plotly/express/_core.py

@@ -308,25 +308,16 @@ def make_trace_kwargs(args, trace_spec, g, mapping_labels, sizeref):
                     colorable = "marker"
                     if colorable not in result:
                         result[colorable] = dict()
-                    print("ok")
+                    # Other if/else block
                     if args.get("color_is_continuous"):
-                        print(
-                            "continuous scale", args["color_continuous_scale"],
-                        )
                         result[colorable]["colors"] = g[v]
-                        result[colorable]["colorscale"] = args["color_continuous_scale"]
-                        # result[colorable]["coloraxis"] = "coloraxis1"
+                        result[colorable]["coloraxis"] = "coloraxis1"
                         mapping_labels[v_label] = "%{color}"
                     else:
-                        print(
-                            "discrete",
-                            args["color_discrete_sequence"],
-                            args.get("color_is_continuous"),
-                        )
                         result[colorable]["colors"] = make_color_mapping(
                             g[v], args["color_discrete_sequence"]
                         )
-                elif trace_spec.constructor == go.Pie:
+                elif trace_spec.constructor in [go.Pie, go.Funnelarea]:
                     colorable = "marker"
                     if colorable not in result:
                         result[colorable] = dict()
@@ -779,7 +770,6 @@ def apply_default_cascade(args):
     # if the template doesn't have one, we set some final fallback defaults
     if "color_continuous_scale" in args:
         if args["color_continuous_scale"] is not None:
-            print("True in cascade")
             args["color_is_continuous"] = True
         if (
             args["color_continuous_scale"] is None
@@ -793,7 +783,6 @@ def apply_default_cascade(args):
 
     if "color_discrete_sequence" in args:
         if args["color_discrete_sequence"] is not None:
-            print("False in cascade")
             args["color_is_continuous"] = False
         if args["color_discrete_sequence"] is None and args["template"].layout.colorway:
             args["color_discrete_sequence"] = args["template"].layout.colorway
@@ -1076,24 +1065,27 @@ def infer_config(args, constructor, trace_patch):
                 ):
                     attrs.append("color")
                     if not "color_is_continuous" in args:
-                        print("True in infer 2")
                         args["color_is_continuous"] = True
                 elif constructor in [go.Sunburst, go.Treemap]:
                     attrs.append("color")
                 else:
-                    if constructor not in [go.Pie]:
+                    if constructor not in [go.Pie, go.Funnelarea]:
                         grouped_attrs.append("marker.color")
         elif "line_group" in args or constructor == go.Histogram2dContour:
             grouped_attrs.append("line.color")
-        elif constructor not in [go.Pie, go.Sunburst, go.Treemap]:
+        elif constructor not in [go.Pie, go.Funnelarea]:
             grouped_attrs.append("marker.color")
         else:
             attrs.append("color")
 
         show_colorbar = bool(
             "color" in attrs
             and args["color"]
-            and constructor not in [go.Pie, go.Sunburst, go.Treemap]
+            and constructor not in [go.Pie, go.Funnelarea]
+            and (
+                constructor not in [go.Treemap, go.Sunburst]
+                or args.get("color_is_continuous")
+            )
         )
     else:
         show_colorbar = False

packages/python/plotly/plotly/tests/test_core/test_px/test_px_functions.py

@@ -95,3 +95,24 @@ def test_sunburst_treemap_colorscales():
             color_discrete_sequence=color_seq,
         )
         assert list(fig.layout[colorway]) == color_seq
+
+
+def test_pie_funnelarea_colorscale():
+    labels = ["A", "B", "C", "D"]
+    values = [3, 2, 1, 4]
+    for func, colorway in zip(
+        [px.sunburst, px.treemap], ["sunburstcolorway", "treemapcolorway"]
+    ):
+        # Discrete colorscale, no color arg passed
+        color_seq = px.colors.sequential.Reds
+        fig = func(names=labels, values=values, color_discrete_sequence=color_seq,)
+        assert list(fig.layout[colorway]) == color_seq
+        # Discrete colorscale, color arg passed
+        color_seq = px.colors.sequential.Reds
+        fig = func(
+            names=labels,
+            values=values,
+            color=labels,
+            color_discrete_sequence=color_seq,
+        )
+        assert np.all([col in color_seq for col in fig.data[0].marker.colors])