From d98c347902c9c08d69c77ed2f38fef05b79dd963 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 18 Oct 2023 16:13:36 +0200
Subject: [PATCH] Checkpoint

---
 crates/gpui3/src/element.rs      |  6 ++++++
 crates/gpui3/src/elements/div.rs | 21 +++++++--------------
 crates/gpui3/src/focus.rs        |  6 ++----
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/crates/gpui3/src/element.rs b/crates/gpui3/src/element.rs
index 2d81e406913351bbfd968ed9a1516fa11885cec6..9f5d0078f87b5771ab1a08d08fab96818d2ad4c7 100644
--- a/crates/gpui3/src/element.rs
+++ b/crates/gpui3/src/element.rs
@@ -61,6 +61,12 @@ pub trait ElementFocusability: 'static + Send + Sync {
 
 pub struct Focusable(FocusHandle);
 
+impl AsRef<FocusHandle> for Focusable {
+    fn as_ref(&self) -> &FocusHandle {
+        &self.0
+    }
+}
+
 impl ElementFocusability for Focusable {
     fn focus_handle(&self) -> Option<&FocusHandle> {
         Some(&self.0)
diff --git a/crates/gpui3/src/elements/div.rs b/crates/gpui3/src/elements/div.rs
index 5d874eb79e87f7e1085056f0f8a1850357c095b9..2f6fc0059500a1426fec9b038b5afb1f3a81573b 100644
--- a/crates/gpui3/src/elements/div.rs
+++ b/crates/gpui3/src/elements/div.rs
@@ -1,9 +1,9 @@
 use crate::{
     Active, Anonymous, AnyElement, AppContext, BorrowWindow, Bounds, Click, DispatchPhase, Element,
-    ElementFocusability, ElementId, ElementIdentity, EventListeners, FocusHandle, Focusable, Hover,
-    Identified, Interactive, IntoAnyElement, KeyDownEvent, LayoutId, MouseClickEvent,
-    MouseDownEvent, MouseMoveEvent, MouseUpEvent, NonFocusable, Overflow, ParentElement, Pixels,
-    Point, ScrollWheelEvent, SharedString, Style, StyleRefinement, Styled, ViewContext,
+    ElementFocusability, ElementId, ElementIdentity, EventListeners, Focus, FocusHandle, Focusable,
+    Hover, Identified, Interactive, IntoAnyElement, LayoutId, MouseClickEvent, MouseDownEvent,
+    MouseMoveEvent, MouseUpEvent, NonFocusable, Overflow, ParentElement, Pixels, Point,
+    ScrollWheelEvent, SharedString, Style, StyleRefinement, Styled, ViewContext,
 };
 use collections::HashMap;
 use parking_lot::Mutex;
@@ -339,20 +339,13 @@ where
     }
 }
 
-impl<I, V> Div<I, Focusable, V>
+impl<I, V> Focus for Div<I, Focusable, V>
 where
     I: ElementIdentity,
     V: 'static + Send + Sync,
 {
-    pub fn on_key_down<F>(
-        mut self,
-        listener: impl Fn(&mut V, &KeyDownEvent, DispatchPhase, &mut ViewContext<V>)
-            + Send
-            + Sync
-            + 'static,
-    ) -> Self {
-        self.listeners.key_down.push(Box::new(listener));
-        self
+    fn handle(&self) -> &FocusHandle {
+        self.focusability.as_ref()
     }
 }
 
diff --git a/crates/gpui3/src/focus.rs b/crates/gpui3/src/focus.rs
index 50338d36a903ca122ff3da9cf1a5ff5536c28588..c7f405a358b241a4c5ad5cb1ede3ab756830e6ed 100644
--- a/crates/gpui3/src/focus.rs
+++ b/crates/gpui3/src/focus.rs
@@ -1,11 +1,9 @@
 use crate::{
-    DispatchPhase, Element, EventListeners, FocusEvent, FocusHandle, KeyDownEvent, KeyUpEvent,
-    ViewContext,
+    DispatchPhase, FocusEvent, FocusHandle, Interactive, KeyDownEvent, KeyUpEvent, ViewContext,
 };
 
-pub trait Focus: Element {
+pub trait Focus: Interactive {
     fn handle(&self) -> &FocusHandle;
-    fn listeners(&mut self) -> &mut EventListeners<Self::ViewState>;
 
     fn on_focus(
         mut self,