Refactor ScrollView into scrollable fluent method. (#68)

crates/story/src/scrollable_story.rs

@@ -7,9 +7,9 @@ use gpui::{
 };
 use ui::button::Button;
 use ui::divider::Divider;
-use ui::scroll::{Scrollable, Scrollbar, ScrollbarAxis, ScrollbarState};
+use ui::scroll::{Scrollbar, ScrollbarAxis, ScrollbarState};
 use ui::theme::ActiveTheme;
-use ui::{h_flex, v_flex, Clickable};
+use ui::{h_flex, v_flex, Clickable, StyledExt as _};
 
 pub struct ScrollableStory {
     scroll_handle: ScrollHandle,
@@ -182,15 +182,18 @@ impl Render for ScrollableStory {
                     .h(px(200.))
                     .child(
                         v_flex()
-                            .m_3()
+                            .id("test-1")
+                            .focusable()
+                            .scrollable(cx.view().clone(), ScrollbarAxis::Vertical)
+                            .p_3()
                             .w(test_width)
                             .gap_1()
+                            .child("Hello world")
                             .children(
                                 items
                                     .iter()
                                     .map(|s| div().bg(cx.theme().card).child(s.clone())),
-                            )
-                            .scrollable("scroll-view1", cx.view().clone()),
+                            ),
                     )
             })
     }

crates/ui/src/scroll/mod.rs

@@ -1,37 +1,7 @@
-mod scroll_view;
 mod scrollable;
+mod scrollable_mask;
 mod scrollbar;
 
-use gpui::{AnyElement, AnyView, Div, Element, ElementId, Focusable, InteractiveElement, Stateful};
-pub use scroll_view::*;
 pub use scrollable::*;
+pub use scrollable_mask::*;
 pub use scrollbar::*;
-
-pub trait Scrollable: Element {
-    /// Wraps the element in a ScrollView.
-    ///
-    /// Current this is only have a vertical scrollbar.
-    fn scrollable(self, id: impl Into<ElementId>, view: impl Into<AnyView>) -> ScrollView {
-        ScrollView::new(
-            ElementId::Name(format!("{}:{}", id.into(), "ScrollView").into()),
-            view,
-            ScrollbarAxis::Vertical,
-        )
-        .content(move |_| self)
-    }
-}
-
-impl Scrollable for AnyElement {}
-impl Scrollable for Div {}
-impl<E> Scrollable for Focusable<E>
-where
-    E: Element,
-    Self: InteractiveElement,
-{
-}
-impl<E> Scrollable for Stateful<E>
-where
-    E: Element,
-    Self: InteractiveElement,
-{
-}