clean up components

crates/ui/src/scroll/scrollable.rs

@@ -3,7 +3,7 @@ use std::panic::Location;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     App, Div, Element, ElementId, InteractiveElement, IntoElement, ParentElement, RenderOnce,
-    ScrollHandle, Stateful, StatefulInteractiveElement, StyleRefinement, Styled, Window, div, px,
+    ScrollHandle, StatefulInteractiveElement, StyleRefinement, Styled, Window, div, px,
 };
 use gpui_base::{Scrollbar, ScrollbarAxis, ScrollbarHandle};
 use theme::ActiveTheme as _;
@@ -12,26 +12,6 @@ use crate::StyledExt as _;
 
 /// A trait for elements that can be made scrollable with scrollbars.
 pub trait ScrollableElement: InteractiveElement + Styled + ParentElement + Element {
-    /// Adds a scrollbar to the element.
-    #[track_caller]
-    fn scrollbar<H: ScrollbarHandle + Clone>(
-        self,
-        scroll_handle: &H,
-        axis: impl Into<ScrollbarAxis>,
-    ) -> Self {
-        self.child(ScrollbarLayer {
-            id: "scrollbar_layer".into(),
-            axis: axis.into(),
-            scroll_handle: scroll_handle.clone(),
-        })
-    }
-
-    /// Adds a vertical scrollbar to the element.
-    #[track_caller]
-    fn vertical_scrollbar<H: ScrollbarHandle + Clone>(self, scroll_handle: &H) -> Self {
-        self.scrollbar(scroll_handle, ScrollbarAxis::Vertical)
-    }
-
     /// Almost equivalent to [`StatefulInteractiveElement::overflow_y_scroll`], but adds Vertical scrollbar.
     #[track_caller]
     fn overflow_y_scrollbar(self) -> Scrollable<Self> {
@@ -39,8 +19,7 @@ pub trait ScrollableElement: InteractiveElement + Styled + ParentElement + Eleme
     }
 }
 
-/// The scrollbar the application's theme describes: a 10px rail holding a 6px
-/// rounded thumb that grows to 8px under the pointer.
+/// The scrollbar the application's theme describes: a 10px rail holding a 6px rounded thumb that grows to 8px under the pointer.
 fn scrollbar<H: ScrollbarHandle + Clone>(
     scroll_handle: &H,
     axis: ScrollbarAxis,
@@ -87,24 +66,6 @@ fn scrollbar<H: ScrollbarHandle + Clone>(
     })
 }
 
-/// A scrollbar child that resolves the theme while rendering, which the
-/// [`ScrollableElement`] helpers cannot do at the call site.
-#[derive(IntoElement)]
-struct ScrollbarLayer<H: ScrollbarHandle + Clone> {
-    id: ElementId,
-    axis: ScrollbarAxis,
-    scroll_handle: H,
-}
-
-impl<H> RenderOnce for ScrollbarLayer<H>
-where
-    H: ScrollbarHandle + Clone + 'static,
-{
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        scrollbar(&self.scroll_handle, self.axis, cx).id(self.id)
-    }
-}
-
 /// A scrollable element wrapper that adds scrollbars to an interactive element.
 #[derive(IntoElement)]
 pub struct Scrollable<E: InteractiveElement + Styled + ParentElement + Element> {
@@ -128,15 +89,6 @@ where
     }
 }
 
-impl<E> Styled for Scrollable<E>
-where
-    E: InteractiveElement + Styled + ParentElement + Element,
-{
-    fn style(&mut self) -> &mut StyleRefinement {
-        self.element.style()
-    }
-}
-
 impl<E> ParentElement for Scrollable<E>
 where
     E: InteractiveElement + Styled + ParentElement + Element,
@@ -146,18 +98,6 @@ where
     }
 }
 
-impl InteractiveElement for Scrollable<Div> {
-    fn interactivity(&mut self) -> &mut gpui::Interactivity {
-        self.element.interactivity()
-    }
-}
-
-impl InteractiveElement for Scrollable<Stateful<Div>> {
-    fn interactivity(&mut self) -> &mut gpui::Interactivity {
-        self.element.interactivity()
-    }
-}
-
 impl<E> RenderOnce for Scrollable<E>
 where
     E: InteractiveElement + Styled + ParentElement + Element + 'static,
@@ -167,8 +107,6 @@ where
             .use_keyed_state(self.id.clone(), cx, |_, _| ScrollHandle::default())
             .read(cx)
             .clone();
-
-        // Inherit the size from the element style.
         let style = StyleRefinement {
             size: self.element.style().size.clone(),
             ..Default::default()
@@ -190,22 +128,10 @@ where
                         ScrollbarAxis::Horizontal => this.flex_row().overflow_x_scroll(),
                         ScrollbarAxis::Both => this.overflow_scroll(),
                     })
-                    .child(
-                        self.element
-                            // Refine element size to `flex_1`.
-                            .size_auto()
-                            .flex_1(),
-                    ),
+                    .child(self.element.size_auto().flex_1()),
             )
             .child(scrollbar(&scroll_handle, self.axis, cx).id("scrollbar"))
     }
 }
 
 impl ScrollableElement for Div {}
-
-impl<E> ScrollableElement for Stateful<E>
-where
-    E: ParentElement + Styled + Element,
-    Self: InteractiveElement,
-{
-}