PX val_map now respects category_orders

Author: nicolaskruchten

Diff for: packages/python/plotly/plotly/express/_core.py

@@ -1838,6 +1838,7 @@ def get_orderings(args, grouper, grouped):
                 if col not in orders:
                     orders[col] = list(uniques)
                 else:
+                    orders[col] = list(orders[col])
                     for val in uniques:
                         if val not in orders[col]:
                             orders[col].append(val)
@@ -1849,7 +1850,6 @@ def get_orderings(args, grouper, grouped):
                 group_names,
                 key=lambda g: orders[col].index(g[i]) if g[i] in orders[col] else -1,
             )
-
     return orders, group_names, group_values
 
 
@@ -1877,17 +1877,19 @@ def make_figure(args, constructor, trace_patch=None, layout_patch=None):
 
     col_labels = []
     row_labels = []
-
     for m in grouped_mappings:
-        if m.grouper:
+        if m.grouper not in sorted_group_values:
+            m.val_map[""] = m.sequence[0]
+        else:
+            sorted_values = orders[m.grouper]
             if m.facet == "col":
                 prefix = get_label(args, args["facet_col"]) + "="
-                col_labels = [prefix + str(s) for s in sorted_group_values[m.grouper]]
+                col_labels = [prefix + str(s) for s in sorted_values]
             if m.facet == "row":
                 prefix = get_label(args, args["facet_row"]) + "="
-                row_labels = [prefix + str(s) for s in sorted_group_values[m.grouper]]
-            for val in sorted_group_values[m.grouper]:
-                if val not in m.val_map:
+                row_labels = [prefix + str(s) for s in sorted_values]
+            for val in sorted_values:
+                if val not in m.val_map:  # always False if it's an IdentityMap
                     m.val_map[val] = m.sequence[len(m.val_map) % len(m.sequence)]
 
     subplot_type = _subplot_type_for_trace_type(constructor().type)
@@ -1943,8 +1945,6 @@ def make_figure(args, constructor, trace_patch=None, layout_patch=None):
 
             for i, m in enumerate(grouped_mappings):
                 val = group_name[i]
-                if val not in m.val_map:
-                    m.val_map[val] = m.sequence[len(m.val_map) % len(m.sequence)]
                 try:
                     m.updater(trace, m.val_map[val])  # covers most cases
                 except ValueError:

Diff for: packages/python/plotly/plotly/tests/test_optional/test_px/test_px.py

@@ -209,8 +209,8 @@ def test_px_defaults():
 
 
 def assert_orderings(days_order, days_check, times_order, times_check):
-    symbol_sequence = ["circle", "diamond", "square", "cross"]
-    color_sequence = ["red", "blue"]
+    symbol_sequence = ["circle", "diamond", "square", "cross", "circle", "diamond"]
+    color_sequence = ["red", "blue", "red", "blue", "red", "blue", "red", "blue"]
     fig = px.scatter(
         px.data.tips(),
         x="total_bill",
@@ -229,7 +229,7 @@ def assert_orderings(days_order, days_check, times_order, times_check):
             assert days_check[col] in trace.hovertemplate
 
     for row in range(len(times_check)):
-        for trace in fig.select_traces(row=2 - row):
+        for trace in fig.select_traces(row=len(times_check) - row):
             assert times_check[row] in trace.hovertemplate
 
     for trace in fig.data:
@@ -241,13 +241,10 @@ def assert_orderings(days_order, days_check, times_order, times_check):
                 assert trace.marker.color == color_sequence[i]
 
 
-def test_noisy_orthogonal_orderings():
-    assert_orderings(
-        ["x", "Sun", "Sat", "y", "Fri", "z"],  # add extra noise, missing Thur
-        ["Sun", "Sat", "Fri", "Thur"],  # Thur is at the back
-        ["a", "Lunch", "b"],  # add extra noise, missing Dinner
-        ["Lunch", "Dinner"],  # Dinner is at the back
-    )
+@pytest.mark.parametrize("days", permutations(["Sun", "Sat", "Fri", "x"]))
+@pytest.mark.parametrize("times", permutations(["Lunch", "x"]))
+def test_orthogonal_and_missing_orderings(days, times):
+    assert_orderings(days, list(days) + ["Thur"], times, list(times) + ["Dinner"])
 
 
 @pytest.mark.parametrize("days", permutations(["Sun", "Sat", "Fri", "Thur"]))