snapshot

Author: willmcgugan

src/textual/screen.py

@@ -340,19 +340,18 @@ def active_bindings(self) -> dict[str, ActiveBinding]:
                     # Note that None has a different meaning, which is why there is an `is False`
                     # rather than a truthy check.
                     continue
+                enabled = bool(action_state)
                 if existing_key_and_binding := bindings_map.get(key):
                     # This key has already been bound
-                    _, existing_binding, _ = existing_key_and_binding
                     # Replace priority bindings
-                    if binding.priority and not existing_binding.priority:
-                        bindings_map[key] = ActiveBinding(
-                            namespace, binding, bool(action_state)
-                        )
+                    if (
+                        binding.priority
+                        and not existing_key_and_binding.binding.priority
+                    ):
+                        bindings_map[key] = ActiveBinding(namespace, binding, enabled)
                 else:
                     # New binding
-                    bindings_map[key] = ActiveBinding(
-                        namespace, binding, bool(action_state)
-                    )
+                    bindings_map[key] = ActiveBinding(namespace, binding, enabled)
 
         return bindings_map
 

tests/snapshot_tests/__snapshots__/test_snapshots/test_bind_override.svg

@@ -0,0 +1,41 @@
+from textual.app import App, ComposeResult
+from textual.widget import Widget
+from textual.widgets import Footer, Switch
+from textual.binding import Binding
+
+
+class MyWidget(Widget, can_focus=True):
+    BINDINGS = [
+        Binding("space", "app.bell", "Bell (Widget)"),
+        Binding("a", "app.notify('a widget')", "widget"),
+        Binding("b", "app.notify('b widget')", "widget"),
+    ]
+
+    DEFAULT_CSS = """
+    MyWidget {
+        border: solid green;
+        height: 5;
+    }
+    """
+
+
+class BindApp(App):
+    BINDINGS = [
+        Binding("space", "app.bell", "Bell (App)"),
+        Binding("c", "app.notify('c app')", "app"),
+        Binding("a", "app.notify('a app')", "app"),
+        Binding("b", "app.notify('b app')", "app"),
+    ]
+
+    def compose(self) -> ComposeResult:
+        yield MyWidget()
+        yield Switch()
+        yield Footer()
+
+    def action_notify(self, msg: str):
+        self.notify(msg)
+
+
+if __name__ == "__main__":
+    app = BindApp()
+    app.run()

tests/snapshot_tests/snapshot_apps/bind_override.py

@@ -1405,3 +1405,8 @@ def test_remove_tab_no_animation(snap_compare):
 def test_auto_height_scrollbar(snap_compare):
     """Regression test for https://github.com/Textualize/textual/issues/4778"""
     assert snap_compare(SNAPSHOT_APPS_DIR / "data_table_auto_height.py")
+
+
+def test_bind_override(snap_compare):
+    """Regression test for https://github.com/Textualize/textual/issues/4755"""
+    assert snap_compare(SNAPSHOT_APPS_DIR / "bind_override.py")

tests/snapshot_tests/test_snapshots.py

@@ -45,7 +45,7 @@ def test_bindings_get_key_spaced_list(more_bindings):
 def test_bindings_merge_simple(bindings):
     left = BindingsMap([BINDING1])
     right = BindingsMap([BINDING2])
-    assert BindingsMap.merge([left, right]).key_to_bindings == bindings.keys
+    assert BindingsMap.merge([left, right]).key_to_bindings == bindings.key_to_bindings
 
 
 def test_bindings_merge_overlap():