diff --git a/crates/command_palette2/src/command_palette.rs b/crates/command_palette2/src/command_palette.rs index c7a6c9ee83..139d8a16c7 100644 --- a/crates/command_palette2/src/command_palette.rs +++ b/crates/command_palette2/src/command_palette.rs @@ -1,9 +1,9 @@ use collections::{CommandPaletteFilter, HashMap}; use fuzzy::{StringMatch, StringMatchCandidate}; use gpui::{ - actions, div, Action, AppContext, Component, Div, EventEmitter, FocusHandle, Keystroke, - ParentElement, Render, StatelessInteractive, Styled, View, ViewContext, VisualContext, - WeakView, WindowContext, + actions, div, prelude::*, Action, AppContext, Component, EventEmitter, FocusHandle, Keystroke, + Node, ParentComponent, Render, Styled, View, ViewContext, VisualContext, WeakView, + WindowContext, }; use picker::{Picker, PickerDelegate}; use std::{ @@ -77,7 +77,7 @@ impl Modal for CommandPalette { } impl Render for CommandPalette { - type Element = Div; + type Element = Node; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { v_stack().w_96().child(self.picker.clone()) @@ -148,7 +148,7 @@ impl CommandPaletteDelegate { } impl PickerDelegate for CommandPaletteDelegate { - type ListItem = Div>; + type ListItem = Node>; fn placeholder_text(&self) -> Arc { "Execute a command...".into() diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs index 654aa73fee..f4e4146f1a 100644 --- a/crates/editor2/src/editor.rs +++ b/crates/editor2/src/editor.rs @@ -39,12 +39,12 @@ use futures::FutureExt; use fuzzy::{StringMatch, StringMatchCandidate}; use git::diff_hunk_to_display; use gpui::{ - action, actions, div, point, px, relative, rems, size, uniform_list, AnyElement, AppContext, - AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Component, Context, + action, actions, div, point, prelude::*, px, relative, rems, size, uniform_list, AnyElement, + AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Component, Context, EventEmitter, FocusHandle, FontFeatures, FontStyle, FontWeight, HighlightStyle, Hsla, - InputHandler, KeyContext, Model, MouseButton, ParentElement, Pixels, Render, - StatelessInteractive, Styled, Subscription, Task, TextStyle, UniformListScrollHandle, View, - ViewContext, VisualContext, WeakView, WindowContext, + InputHandler, KeyContext, Model, MouseButton, ParentComponent, Pixels, Render, Styled, + Subscription, Task, TextStyle, UniformListScrollHandle, View, ViewContext, VisualContext, + WeakView, WindowContext, }; use highlight_matching_bracket::refresh_matching_bracket_highlights; use hover_popover::{hide_hover, HoverState}; diff --git a/crates/editor2/src/element.rs b/crates/editor2/src/element.rs index 8ee99e19af..ba2dcb431a 100644 --- a/crates/editor2/src/element.rs +++ b/crates/editor2/src/element.rs @@ -2442,7 +2442,7 @@ enum Invisible { impl Element for EditorElement { type ElementState = (); - fn id(&self) -> Option { + fn element_id(&self) -> Option { None } diff --git a/crates/editor2/src/items.rs b/crates/editor2/src/items.rs index 25e9f91608..b1fc69ecac 100644 --- a/crates/editor2/src/items.rs +++ b/crates/editor2/src/items.rs @@ -9,7 +9,7 @@ use collections::HashSet; use futures::future::try_join_all; use gpui::{ div, point, AnyElement, AppContext, AsyncAppContext, Entity, EntityId, EventEmitter, - FocusHandle, Model, ParentElement, Pixels, SharedString, Styled, Subscription, Task, View, + FocusHandle, Model, ParentComponent, Pixels, SharedString, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView, }; use language::{ diff --git a/crates/go_to_line2/src/go_to_line.rs b/crates/go_to_line2/src/go_to_line.rs index 50592901b5..9f2ba6db21 100644 --- a/crates/go_to_line2/src/go_to_line.rs +++ b/crates/go_to_line2/src/go_to_line.rs @@ -1,7 +1,7 @@ use editor::{display_map::ToDisplayPoint, scroll::autoscroll::Autoscroll, Editor}; use gpui::{ - actions, div, AppContext, Div, EventEmitter, ParentElement, Render, SharedString, - StatelessInteractive, Styled, Subscription, View, ViewContext, VisualContext, WindowContext, + actions, div, prelude::*, AppContext, EventEmitter, Node, ParentComponent, Render, + SharedString, Styled, Subscription, View, ViewContext, VisualContext, WindowContext, }; use text::{Bias, Point}; use theme::ActiveTheme; @@ -145,11 +145,11 @@ impl GoToLine { } impl Render for GoToLine { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { modal(cx) - .context("GoToLine") + .key_context("GoToLine") .on_action(Self::cancel) .on_action(Self::confirm) .w_96() diff --git a/crates/gpui2/src/element.rs b/crates/gpui2/src/element.rs index 80ab0abc90..46ea5c6cd2 100644 --- a/crates/gpui2/src/element.rs +++ b/crates/gpui2/src/element.rs @@ -8,7 +8,7 @@ use std::{any::Any, mem}; pub trait Element { type ElementState: 'static; - fn id(&self) -> Option; + fn element_id(&self) -> Option; /// Called to initialize this element for the current frame. If this /// element had state in a previous frame, it will be passed in for the 3rd argument. @@ -38,7 +38,7 @@ pub trait Element { #[derive(Deref, DerefMut, Default, Clone, Debug, Eq, PartialEq, Hash)] pub struct GlobalElementId(SmallVec<[ElementId; 32]>); -pub trait ParentElement { +pub trait ParentComponent { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]>; fn child(mut self, child: impl Component) -> Self @@ -120,7 +120,7 @@ where E::ElementState: 'static, { fn initialize(&mut self, view_state: &mut V, cx: &mut ViewContext) { - let frame_state = if let Some(id) = self.element.id() { + let frame_state = if let Some(id) = self.element.element_id() { cx.with_element_state(id, |element_state, cx| { let element_state = self.element.initialize(view_state, element_state, cx); ((), element_state) @@ -142,7 +142,7 @@ where frame_state: initial_frame_state, } => { frame_state = initial_frame_state; - if let Some(id) = self.element.id() { + if let Some(id) = self.element.element_id() { layout_id = cx.with_element_state(id, |element_state, cx| { let mut element_state = element_state.unwrap(); let layout_id = self.element.layout(state, &mut element_state, cx); @@ -181,7 +181,7 @@ where .. } => { let bounds = cx.layout_bounds(layout_id); - if let Some(id) = self.element.id() { + if let Some(id) = self.element.element_id() { cx.with_element_state(id, |element_state, cx| { let mut element_state = element_state.unwrap(); self.element @@ -351,7 +351,7 @@ where { type ElementState = AnyElement; - fn id(&self) -> Option { + fn element_id(&self) -> Option { None } diff --git a/crates/gpui2/src/elements.rs b/crates/gpui2/src/elements.rs index e0e155fb03..5bf9e6202b 100644 --- a/crates/gpui2/src/elements.rs +++ b/crates/gpui2/src/elements.rs @@ -1,12 +1,13 @@ -mod div; +// mod div; mod img; mod node; mod svg; mod text; mod uniform_list; -pub use div::*; +// pub use div::*; pub use img::*; +pub use node::*; pub use svg::*; pub use text::*; pub use uniform_list::*; diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index 1d85450c29..537c146339 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -55,16 +55,6 @@ where I: ElementInteractivity, F: KeyDispatch, { - pub fn group(mut self, group: impl Into) -> Self { - self.group = Some(group.into()); - self - } - - pub fn z_index(mut self, z_index: u32) -> Self { - self.base_style.z_index = Some(z_index); - self - } - pub fn context(mut self, context: C) -> Self where Self: Sized, @@ -77,22 +67,6 @@ where self } - pub fn overflow_hidden(mut self) -> Self { - self.base_style.overflow.x = Some(Overflow::Hidden); - self.base_style.overflow.y = Some(Overflow::Hidden); - self - } - - pub fn overflow_hidden_x(mut self) -> Self { - self.base_style.overflow.x = Some(Overflow::Hidden); - self - } - - pub fn overflow_hidden_y(mut self) -> Self { - self.base_style.overflow.y = Some(Overflow::Hidden); - self - } - pub fn compute_style( &self, bounds: Bounds, @@ -135,22 +109,6 @@ impl Div, NonFocusableKeyDispatch> { base_style: self.base_style, } } - - pub fn overflow_scroll(mut self) -> Self { - self.base_style.overflow.x = Some(Overflow::Scroll); - self.base_style.overflow.y = Some(Overflow::Scroll); - self - } - - pub fn overflow_x_scroll(mut self) -> Self { - self.base_style.overflow.x = Some(Overflow::Scroll); - self - } - - pub fn overflow_y_scroll(mut self) -> Self { - self.base_style.overflow.y = Some(Overflow::Scroll); - self - } } impl Div, NonFocusableKeyDispatch> { diff --git a/crates/gpui2/src/elements/img.rs b/crates/gpui2/src/elements/img.rs index 1ff088c1af..bfa3c6cfae 100644 --- a/crates/gpui2/src/elements/img.rs +++ b/crates/gpui2/src/elements/img.rs @@ -1,35 +1,28 @@ use crate::{ - div, AnyElement, BorrowWindow, Bounds, Component, Div, DivState, Element, ElementId, - ElementInteractivity, FocusListeners, Focusable, FocusableKeyDispatch, KeyDispatch, LayoutId, - NonFocusableKeyDispatch, Pixels, SharedString, StatefulInteractive, StatefulInteractivity, - StatelessInteractive, StatelessInteractivity, StyleRefinement, Styled, ViewContext, + AnyElement, BorrowWindow, Bounds, Component, Element, InteractiveComponent, + InteractiveElementState, Interactivity, LayoutId, Pixels, SharedString, StyleRefinement, + Styled, ViewContext, }; use futures::FutureExt; use util::ResultExt; -pub struct Img< - V: 'static, - I: ElementInteractivity = StatelessInteractivity, - F: KeyDispatch = NonFocusableKeyDispatch, -> { - base: Div, +pub struct Img { + interactivity: Interactivity, uri: Option, grayscale: bool, } -pub fn img() -> Img, NonFocusableKeyDispatch> { +pub fn img() -> Img { Img { - base: div(), + interactivity: Interactivity::default(), uri: None, grayscale: false, } } -impl Img +impl Img where V: 'static, - I: ElementInteractivity, - F: KeyDispatch, { pub fn uri(mut self, uri: impl Into) -> Self { self.uri = Some(uri.into()); @@ -42,38 +35,17 @@ where } } -impl Img, F> -where - F: KeyDispatch, -{ - pub fn id(self, id: impl Into) -> Img, F> { - Img { - base: self.base.id(id), - uri: self.uri, - grayscale: self.grayscale, - } - } -} - -impl Component for Img -where - I: ElementInteractivity, - F: KeyDispatch, -{ +impl Component for Img { fn render(self) -> AnyElement { AnyElement::new(self) } } -impl Element for Img -where - I: ElementInteractivity, - F: KeyDispatch, -{ - type ElementState = DivState; +impl Element for Img { + type ElementState = InteractiveElementState; - fn id(&self) -> Option { - self.base.id() + fn element_id(&self) -> Option { + self.interactivity.element_id.clone() } fn initialize( @@ -82,7 +54,7 @@ where element_state: Option, cx: &mut ViewContext, ) -> Self::ElementState { - self.base.initialize(view_state, element_state, cx) + self.interactivity.initialize(element_state, cx) } fn layout( @@ -91,7 +63,9 @@ where element_state: &mut Self::ElementState, cx: &mut ViewContext, ) -> LayoutId { - self.base.layout(view_state, element_state, cx) + self.interactivity.layout(element_state, cx, |style, cx| { + cx.request_layout(&style, None) + }) } fn paint( @@ -101,86 +75,50 @@ where element_state: &mut Self::ElementState, cx: &mut ViewContext, ) { - cx.with_z_index(0, |cx| { - self.base.paint(bounds, view, element_state, cx); - }); + self.interactivity.paint( + bounds, + bounds.size, + element_state, + cx, + |style, scroll_offset, cx| { + let corner_radii = style.corner_radii; - let style = self.base.compute_style(bounds, element_state, cx); - let corner_radii = style.corner_radii; - - if let Some(uri) = self.uri.clone() { - // eprintln!(">>> image_cache.get({uri}"); - let image_future = cx.image_cache.get(uri.clone()); - // eprintln!("<<< image_cache.get({uri}"); - if let Some(data) = image_future - .clone() - .now_or_never() - .and_then(ResultExt::log_err) - { - let corner_radii = corner_radii.to_pixels(bounds.size, cx.rem_size()); - cx.with_z_index(1, |cx| { - cx.paint_image(bounds, corner_radii, data, self.grayscale) - .log_err() - }); - } else { - cx.spawn(|_, mut cx| async move { - if image_future.await.log_err().is_some() { - cx.on_next_frame(|cx| cx.notify()); + if let Some(uri) = self.uri.clone() { + // eprintln!(">>> image_cache.get({uri}"); + let image_future = cx.image_cache.get(uri.clone()); + // eprintln!("<<< image_cache.get({uri}"); + if let Some(data) = image_future + .clone() + .now_or_never() + .and_then(ResultExt::log_err) + { + let corner_radii = corner_radii.to_pixels(bounds.size, cx.rem_size()); + cx.with_z_index(1, |cx| { + cx.paint_image(bounds, corner_radii, data, self.grayscale) + .log_err() + }); + } else { + cx.spawn(|_, mut cx| async move { + if image_future.await.log_err().is_some() { + cx.on_next_frame(|cx| cx.notify()); + } + }) + .detach() } - }) - .detach() - } - } + } + }, + ) } } -impl Styled for Img -where - I: ElementInteractivity, - F: KeyDispatch, -{ +impl Styled for Img { fn style(&mut self) -> &mut StyleRefinement { - self.base.style() + &mut self.interactivity.base_style } } -impl StatelessInteractive for Img -where - I: ElementInteractivity, - F: KeyDispatch, -{ - fn stateless_interactivity(&mut self) -> &mut StatelessInteractivity { - self.base.stateless_interactivity() - } -} - -impl StatefulInteractive for Img, F> -where - F: KeyDispatch, -{ - fn stateful_interactivity(&mut self) -> &mut StatefulInteractivity { - self.base.stateful_interactivity() - } -} - -impl Focusable for Img> -where - V: 'static, - I: ElementInteractivity, -{ - fn focus_listeners(&mut self) -> &mut FocusListeners { - self.base.focus_listeners() - } - - fn set_focus_style(&mut self, style: StyleRefinement) { - self.base.set_focus_style(style) - } - - fn set_focus_in_style(&mut self, style: StyleRefinement) { - self.base.set_focus_in_style(style) - } - - fn set_in_focus_style(&mut self, style: StyleRefinement) { - self.base.set_in_focus_style(style) +impl InteractiveComponent for Img { + fn interactivity(&mut self) -> &mut Interactivity { + &mut self.interactivity } } diff --git a/crates/gpui2/src/elements/node.rs b/crates/gpui2/src/elements/node.rs index 82a952fc16..49c447254e 100644 --- a/crates/gpui2/src/elements/node.rs +++ b/crates/gpui2/src/elements/node.rs @@ -1,9 +1,9 @@ use crate::{ point, px, Action, AnyDrag, AnyElement, AnyTooltip, AnyView, AppContext, BorrowAppContext, - BorrowWindow, Bounds, ClickEvent, DispatchPhase, Element, ElementId, FocusEvent, FocusHandle, - KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, - MouseUpEvent, Pixels, Point, Render, ScrollWheelEvent, SharedString, Size, Style, - StyleRefinement, Styled, Task, View, ViewContext, Visibility, + BorrowWindow, Bounds, ClickEvent, Component, DispatchPhase, Element, ElementId, FocusEvent, + FocusHandle, KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton, MouseDownEvent, + MouseMoveEvent, MouseUpEvent, ParentComponent, Pixels, Point, Render, ScrollWheelEvent, + SharedString, Size, Style, StyleRefinement, Styled, Task, View, ViewContext, Visibility, }; use collections::HashMap; use parking_lot::Mutex; @@ -32,6 +32,11 @@ pub struct GroupStyle { pub trait InteractiveComponent: Sized + Element { fn interactivity(&mut self) -> &mut Interactivity; + fn group(mut self, group: impl Into) -> Self { + self.interactivity().group = Some(group.into()); + self + } + fn id(mut self, id: impl Into) -> Stateful { self.interactivity().element_id = Some(id.into()); @@ -41,9 +46,9 @@ pub trait InteractiveComponent: Sized + Element { } } - fn track_focus(mut self, focus_handle: FocusHandle) -> Focusable { + fn track_focus(mut self, focus_handle: &FocusHandle) -> Focusable { self.interactivity().focusable = true; - self.interactivity().tracked_focus_handle = Some(focus_handle); + self.interactivity().tracked_focus_handle = Some(focus_handle.clone()); Focusable { element: self, view_type: PhantomData, @@ -269,8 +274,27 @@ pub trait InteractiveComponent: Sized + Element { } pub trait StatefulInteractiveComponent>: InteractiveComponent { - fn focusable(mut self) -> Self { + fn focusable(mut self) -> Focusable { self.interactivity().focusable = true; + Focusable { + element: self, + view_type: PhantomData, + } + } + + fn overflow_scroll(mut self) -> Self { + self.interactivity().base_style.overflow.x = Some(Overflow::Scroll); + self.interactivity().base_style.overflow.y = Some(Overflow::Scroll); + self + } + + fn overflow_x_scroll(mut self) -> Self { + self.interactivity().base_style.overflow.x = Some(Overflow::Scroll); + self + } + + fn overflow_y_scroll(mut self) -> Self { + self.interactivity().base_style.overflow.y = Some(Overflow::Scroll); self } @@ -514,16 +538,16 @@ pub type KeyUpListener = pub type ActionListener = Box) + 'static>; -pub fn node() -> Node { +pub fn div() -> Node { Node { interactivity: Interactivity::default(), - children: Vec::default(), + children: SmallVec::default(), } } pub struct Node { interactivity: Interactivity, - children: Vec>, + children: SmallVec<[AnyElement; 2]>, } impl Styled for Node { @@ -538,10 +562,16 @@ impl InteractiveComponent for Node { } } +impl ParentComponent for Node { + fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { + &mut self.children + } +} + impl Element for Node { type ElementState = NodeState; - fn id(&self) -> Option { + fn element_id(&self) -> Option { self.interactivity.element_id.clone() } @@ -641,48 +671,54 @@ impl Element for Node { } } +impl Component for Node { + fn render(self) -> AnyElement { + AnyElement::new(self) + } +} + pub struct NodeState { child_layout_ids: SmallVec<[LayoutId; 4]>, interactive_state: InteractiveElementState, } pub struct Interactivity { - element_id: Option, - key_context: KeyContext, - focusable: bool, - tracked_focus_handle: Option, - focus_listeners: FocusListeners, - scroll_offset: Point, - group: Option, - base_style: StyleRefinement, - focus_style: StyleRefinement, - focus_in_style: StyleRefinement, - in_focus_style: StyleRefinement, - hover_style: StyleRefinement, - group_hover_style: Option, - active_style: StyleRefinement, - group_active_style: Option, - drag_over_styles: SmallVec<[(TypeId, StyleRefinement); 2]>, - group_drag_over_styles: SmallVec<[(TypeId, GroupStyle); 2]>, - mouse_down_listeners: SmallVec<[MouseDownListener; 2]>, - mouse_up_listeners: SmallVec<[MouseUpListener; 2]>, - mouse_move_listeners: SmallVec<[MouseMoveListener; 2]>, - scroll_wheel_listeners: SmallVec<[ScrollWheelListener; 2]>, - key_down_listeners: SmallVec<[KeyDownListener; 2]>, - key_up_listeners: SmallVec<[KeyUpListener; 2]>, - action_listeners: SmallVec<[(TypeId, ActionListener); 8]>, - drop_listeners: SmallVec<[(TypeId, Box>); 2]>, - click_listeners: SmallVec<[ClickListener; 2]>, - drag_listener: Option>, - hover_listener: Option>, - tooltip_builder: Option>, + pub element_id: Option, + pub key_context: KeyContext, + pub focusable: bool, + pub tracked_focus_handle: Option, + pub focus_listeners: FocusListeners, + // pub scroll_offset: Point, + pub group: Option, + pub base_style: StyleRefinement, + pub focus_style: StyleRefinement, + pub focus_in_style: StyleRefinement, + pub in_focus_style: StyleRefinement, + pub hover_style: StyleRefinement, + pub group_hover_style: Option, + pub active_style: StyleRefinement, + pub group_active_style: Option, + pub drag_over_styles: SmallVec<[(TypeId, StyleRefinement); 2]>, + pub group_drag_over_styles: SmallVec<[(TypeId, GroupStyle); 2]>, + pub mouse_down_listeners: SmallVec<[MouseDownListener; 2]>, + pub mouse_up_listeners: SmallVec<[MouseUpListener; 2]>, + pub mouse_move_listeners: SmallVec<[MouseMoveListener; 2]>, + pub scroll_wheel_listeners: SmallVec<[ScrollWheelListener; 2]>, + pub key_down_listeners: SmallVec<[KeyDownListener; 2]>, + pub key_up_listeners: SmallVec<[KeyUpListener; 2]>, + pub action_listeners: SmallVec<[(TypeId, ActionListener); 8]>, + pub drop_listeners: SmallVec<[(TypeId, Box>); 2]>, + pub click_listeners: SmallVec<[ClickListener; 2]>, + pub drag_listener: Option>, + pub hover_listener: Option>, + pub tooltip_builder: Option>, } impl Interactivity where V: 'static, { - fn initialize( + pub fn initialize( &mut self, element_state: Option, cx: &mut ViewContext, @@ -703,7 +739,7 @@ where element_state } - fn layout( + pub fn layout( &mut self, element_state: &mut InteractiveElementState, cx: &mut ViewContext, @@ -719,7 +755,7 @@ where }) } - fn paint( + pub fn paint( &mut self, bounds: Bounds, content_size: Size, @@ -996,6 +1032,11 @@ where GroupBounds::push(group, bounds, cx); } + let scroll_offset = element_state + .scroll_offset + .as_ref() + .map(|scroll_offset| *scroll_offset.lock()); + cx.with_element_id(self.element_id.clone(), |cx| { cx.with_key_dispatch( self.key_context.clone(), @@ -1026,7 +1067,7 @@ where } } - f(style, self.scroll_offset, cx) + f(style, scroll_offset.unwrap_or_default(), cx) }, ); }); @@ -1036,7 +1077,7 @@ where } } - fn compute_style( + pub fn compute_style( &self, bounds: Option>, element_state: &mut InteractiveElementState, @@ -1118,7 +1159,7 @@ impl Default for Interactivity { focusable: false, tracked_focus_handle: None, focus_listeners: SmallVec::default(), - scroll_offset: Point::default(), + // scroll_offset: Point::default(), group: None, base_style: StyleRefinement::default(), focus_style: StyleRefinement::default(), @@ -1148,15 +1189,15 @@ impl Default for Interactivity { #[derive(Default)] pub struct InteractiveElementState { - focus_handle: Option, - clicked_state: Arc>, - hover_state: Arc>, - pending_mouse_down: Arc>>, - scroll_offset: Option>>>, - active_tooltip: Arc>>, + pub focus_handle: Option, + pub clicked_state: Arc>, + pub hover_state: Arc>, + pub pending_mouse_down: Arc>>, + pub scroll_offset: Option>>>, + pub active_tooltip: Arc>>, } -struct ActiveTooltip { +pub struct ActiveTooltip { #[allow(unused)] // used to drop the task waiting: Option>, tooltip: Option, @@ -1164,7 +1205,7 @@ struct ActiveTooltip { /// Whether or not the element or a group that contains it is clicked by the mouse. #[derive(Copy, Clone, Default, Eq, PartialEq)] -struct ElementClickedState { +pub struct ElementClickedState { pub group: bool, pub element: bool, } @@ -1222,6 +1263,16 @@ impl> StatefulInteractiveCompo { } +impl Styled for Focusable +where + V: 'static, + E: Styled, +{ + fn style(&mut self) -> &mut StyleRefinement { + self.element.style() + } +} + impl Element for Focusable where V: 'static, @@ -1229,8 +1280,8 @@ where { type ElementState = E::ElementState; - fn id(&self) -> Option { - self.element.id() + fn element_id(&self) -> Option { + self.element.element_id() } fn initialize( @@ -1262,11 +1313,41 @@ where } } +impl Component for Focusable +where + V: 'static, + E: 'static + Element, +{ + fn render(self) -> AnyElement { + AnyElement::new(self) + } +} + +impl ParentComponent for Focusable +where + V: 'static, + E: ParentComponent, +{ + fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { + self.element.children_mut() + } +} + pub struct Stateful { element: E, view_type: PhantomData, } +impl Styled for Stateful +where + V: 'static, + E: Styled, +{ + fn style(&mut self) -> &mut StyleRefinement { + self.element.style() + } +} + impl StatefulInteractiveComponent for Stateful where V: 'static, @@ -1294,8 +1375,8 @@ where { type ElementState = E::ElementState; - fn id(&self) -> Option { - self.element.id() + fn element_id(&self) -> Option { + self.element.element_id() } fn initialize( @@ -1326,3 +1407,23 @@ where self.element.paint(bounds, view_state, element_state, cx) } } + +impl Component for Stateful +where + V: 'static, + E: 'static + Element, +{ + fn render(self) -> AnyElement { + AnyElement::new(self) + } +} + +impl ParentComponent for Stateful +where + V: 'static, + E: ParentComponent, +{ + fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { + self.element.children_mut() + } +} diff --git a/crates/gpui2/src/elements/svg.rs b/crates/gpui2/src/elements/svg.rs index bafedb7f2d..d0b321c0e2 100644 --- a/crates/gpui2/src/elements/svg.rs +++ b/crates/gpui2/src/elements/svg.rs @@ -1,69 +1,40 @@ use crate::{ - div, AnyElement, Bounds, Component, Div, DivState, Element, ElementId, ElementInteractivity, - FocusListeners, Focusable, FocusableKeyDispatch, KeyDispatch, LayoutId, - NonFocusableKeyDispatch, Pixels, SharedString, StatefulInteractive, StatefulInteractivity, - StatelessInteractive, StatelessInteractivity, StyleRefinement, Styled, ViewContext, + AnyElement, Bounds, Component, Element, ElementId, InteractiveComponent, + InteractiveElementState, Interactivity, LayoutId, Pixels, SharedString, StyleRefinement, + Styled, ViewContext, }; use util::ResultExt; -pub struct Svg< - V: 'static, - I: ElementInteractivity = StatelessInteractivity, - F: KeyDispatch = NonFocusableKeyDispatch, -> { - base: Div, +pub struct Svg { + interactivity: Interactivity, path: Option, } -pub fn svg() -> Svg, NonFocusableKeyDispatch> { +pub fn svg() -> Svg { Svg { - base: div(), + interactivity: Interactivity::default(), path: None, } } -impl Svg -where - I: ElementInteractivity, - F: KeyDispatch, -{ +impl Svg { pub fn path(mut self, path: impl Into) -> Self { self.path = Some(path.into()); self } } -impl Svg, F> -where - F: KeyDispatch, -{ - pub fn id(self, id: impl Into) -> Svg, F> { - Svg { - base: self.base.id(id), - path: self.path, - } - } -} - -impl Component for Svg -where - I: ElementInteractivity, - F: KeyDispatch, -{ +impl Component for Svg { fn render(self) -> AnyElement { AnyElement::new(self) } } -impl Element for Svg -where - I: ElementInteractivity, - F: KeyDispatch, -{ - type ElementState = DivState; +impl Element for Svg { + type ElementState = InteractiveElementState; - fn id(&self) -> Option { - self.base.id() + fn element_id(&self) -> Option { + self.interactivity.element_id.clone() } fn initialize( @@ -72,7 +43,7 @@ where element_state: Option, cx: &mut ViewContext, ) -> Self::ElementState { - self.base.initialize(view_state, element_state, cx) + self.interactivity.initialize(element_state, cx) } fn layout( @@ -81,7 +52,9 @@ where element_state: &mut Self::ElementState, cx: &mut ViewContext, ) -> LayoutId { - self.base.layout(view_state, element_state, cx) + self.interactivity.layout(element_state, cx, |style, cx| { + cx.request_layout(&style, None) + }) } fn paint( @@ -93,65 +66,23 @@ where ) where Self: Sized, { - self.base.paint(bounds, view, element_state, cx); - let color = self - .base - .compute_style(bounds, element_state, cx) - .text - .color; - if let Some((path, color)) = self.path.as_ref().zip(color) { - cx.paint_svg(bounds, path.clone(), color).log_err(); - } + self.interactivity + .paint(bounds, bounds.size, element_state, cx, |style, _, cx| { + if let Some((path, color)) = self.path.as_ref().zip(style.text.color) { + cx.paint_svg(bounds, path.clone(), color).log_err(); + } + }) } } -impl Styled for Svg -where - I: ElementInteractivity, - F: KeyDispatch, -{ +impl Styled for Svg { fn style(&mut self) -> &mut StyleRefinement { - self.base.style() + &mut self.interactivity.base_style } } -impl StatelessInteractive for Svg -where - I: ElementInteractivity, - F: KeyDispatch, -{ - fn stateless_interactivity(&mut self) -> &mut StatelessInteractivity { - self.base.stateless_interactivity() - } -} - -impl StatefulInteractive for Svg, F> -where - V: 'static, - F: KeyDispatch, -{ - fn stateful_interactivity(&mut self) -> &mut StatefulInteractivity { - self.base.stateful_interactivity() - } -} - -impl Focusable for Svg> -where - I: ElementInteractivity, -{ - fn focus_listeners(&mut self) -> &mut FocusListeners { - self.base.focus_listeners() - } - - fn set_focus_style(&mut self, style: StyleRefinement) { - self.base.set_focus_style(style) - } - - fn set_focus_in_style(&mut self, style: StyleRefinement) { - self.base.set_focus_in_style(style) - } - - fn set_in_focus_style(&mut self, style: StyleRefinement) { - self.base.set_in_focus_style(style) +impl InteractiveComponent for Svg { + fn interactivity(&mut self) -> &mut Interactivity { + &mut self.interactivity } } diff --git a/crates/gpui2/src/elements/text.rs b/crates/gpui2/src/elements/text.rs index 5c5709d32e..8688581cb8 100644 --- a/crates/gpui2/src/elements/text.rs +++ b/crates/gpui2/src/elements/text.rs @@ -53,7 +53,7 @@ impl Component for Text { impl Element for Text { type ElementState = Arc>>; - fn id(&self) -> Option { + fn element_id(&self) -> Option { None } diff --git a/crates/gpui2/src/elements/uniform_list.rs b/crates/gpui2/src/elements/uniform_list.rs index 521df8699a..2f6584cda5 100644 --- a/crates/gpui2/src/elements/uniform_list.rs +++ b/crates/gpui2/src/elements/uniform_list.rs @@ -1,24 +1,23 @@ use crate::{ point, px, size, AnyElement, AvailableSpace, BorrowWindow, Bounds, Component, Element, - ElementId, ElementInteractivity, InteractiveElementState, LayoutId, Pixels, Point, Size, - StatefulInteractive, StatefulInteractivity, StatelessInteractive, StatelessInteractivity, - StyleRefinement, Styled, ViewContext, + ElementId, InteractiveComponent, InteractiveElementState, Interactivity, LayoutId, Pixels, + Point, Size, StyleRefinement, Styled, ViewContext, }; use parking_lot::Mutex; use smallvec::SmallVec; -use std::{cmp, ops::Range, sync::Arc}; +use std::{cmp, mem, ops::Range, sync::Arc}; use taffy::style::Overflow; /// uniform_list provides lazy rendering for a set of items that are of uniform height. /// When rendered into a container with overflow-y: hidden and a fixed (or max) height, /// uniform_list will only render the visibile subset of items. -pub fn uniform_list( - id: Id, +pub fn uniform_list( + id: I, item_count: usize, f: impl 'static + Fn(&mut V, Range, &mut ViewContext) -> SmallVec<[C; 64]>, ) -> UniformList where - Id: Into, + I: Into, V: 'static, C: Component, { @@ -37,7 +36,10 @@ where .map(|component| component.render()) .collect() }), - interactivity: StatefulInteractivity::new(id, StatelessInteractivity::default()), + interactivity: Interactivity { + element_id: Some(id.into()), + ..Default::default() + }, scroll_handle: None, } } @@ -54,7 +56,7 @@ pub struct UniformList { &'a mut ViewContext, ) -> SmallVec<[AnyElement; 64]>, >, - interactivity: StatefulInteractivity, + interactivity: Interactivity, scroll_handle: Option, } @@ -103,7 +105,7 @@ pub struct UniformListState { impl Element for UniformList { type ElementState = UniformListState; - fn id(&self) -> Option { + fn element_id(&self) -> Option { Some(self.id.clone()) } @@ -113,13 +115,18 @@ impl Element for UniformList { element_state: Option, cx: &mut ViewContext, ) -> Self::ElementState { - element_state.unwrap_or_else(|| { + if let Some(mut element_state) = element_state { + element_state.interactive = self + .interactivity + .initialize(Some(element_state.interactive), cx); + element_state + } else { let item_size = self.measure_item(view_state, None, cx); UniformListState { - interactive: InteractiveElementState::default(), + interactive: self.interactivity.initialize(None, cx), item_size, } - }) + } } fn layout( @@ -132,35 +139,44 @@ impl Element for UniformList { let item_size = element_state.item_size; let rem_size = cx.rem_size(); - cx.request_measured_layout( - self.computed_style(), - rem_size, - move |known_dimensions: Size>, available_space: Size| { - let desired_height = item_size.height * max_items; - let width = known_dimensions - .width - .unwrap_or(match available_space.width { - AvailableSpace::Definite(x) => x, - AvailableSpace::MinContent | AvailableSpace::MaxContent => item_size.width, - }); - let height = match available_space.height { - AvailableSpace::Definite(x) => desired_height.min(x), - AvailableSpace::MinContent | AvailableSpace::MaxContent => desired_height, - }; - size(width, height) - }, - ) + self.interactivity + .layout(&mut element_state.interactive, cx, |style, cx| { + cx.request_measured_layout( + style, + rem_size, + move |known_dimensions: Size>, + available_space: Size| { + let desired_height = item_size.height * max_items; + let width = known_dimensions + .width + .unwrap_or(match available_space.width { + AvailableSpace::Definite(x) => x, + AvailableSpace::MinContent | AvailableSpace::MaxContent => { + item_size.width + } + }); + let height = match available_space.height { + AvailableSpace::Definite(x) => desired_height.min(x), + AvailableSpace::MinContent | AvailableSpace::MaxContent => { + desired_height + } + }; + size(width, height) + }, + ) + }) } fn paint( &mut self, - bounds: crate::Bounds, + bounds: Bounds, view_state: &mut V, element_state: &mut Self::ElementState, cx: &mut ViewContext, ) { - let style = self.computed_style(); - + let style = + self.interactivity + .compute_style(Some(bounds), &mut element_state.interactive, cx); let border = style.border_widths.to_pixels(cx.rem_size()); let padding = style.padding.to_pixels(bounds.size.into(), cx.rem_size()); @@ -170,74 +186,75 @@ impl Element for UniformList { - point(border.right + padding.right, border.bottom + padding.bottom), ); - cx.with_z_index(style.z_index.unwrap_or(0), |cx| { - style.paint(bounds, cx); + let item_size = element_state.item_size; + let content_size = Size { + width: padded_bounds.size.width, + height: item_size.height * self.item_count, + }; - let content_size; - if self.item_count > 0 { - let item_height = self - .measure_item(view_state, Some(padded_bounds.size.width), cx) - .height; - if let Some(scroll_handle) = self.scroll_handle.clone() { - scroll_handle.0.lock().replace(ScrollHandleState { - item_height, - list_height: padded_bounds.size.height, - scroll_offset: element_state.interactive.track_scroll_offset(), - }); - } - let visible_item_count = if item_height > px(0.) { - (padded_bounds.size.height / item_height).ceil() as usize + 1 - } else { - 0 - }; - let scroll_offset = element_state - .interactive - .scroll_offset() - .map_or((0.0).into(), |offset| offset.y); - let first_visible_element_ix = (-scroll_offset / item_height).floor() as usize; - let visible_range = first_visible_element_ix - ..cmp::min( - first_visible_element_ix + visible_item_count, - self.item_count, - ); + let mut interactivity = mem::take(&mut self.interactivity); + let shared_scroll_offset = element_state.interactive.scroll_offset.clone().unwrap(); - let mut items = (self.render_items)(view_state, visible_range.clone(), cx); + interactivity.paint( + bounds, + content_size, + &mut element_state.interactive, + cx, + |style, scroll_offset, cx| { + let border = style.border_widths.to_pixels(cx.rem_size()); + let padding = style.padding.to_pixels(bounds.size.into(), cx.rem_size()); - content_size = Size { - width: padded_bounds.size.width, - height: item_height * self.item_count, - }; - - cx.with_z_index(1, |cx| { - for (item, ix) in items.iter_mut().zip(visible_range) { - let item_origin = - padded_bounds.origin + point(px(0.), item_height * ix + scroll_offset); - let available_space = size( - AvailableSpace::Definite(padded_bounds.size.width), - AvailableSpace::Definite(item_height), - ); - item.draw(item_origin, available_space, view_state, cx); - } - }); - } else { - content_size = Size { - width: bounds.size.width, - height: px(0.), - }; - } - - let overflow = point(style.overflow.x, Overflow::Scroll); - - cx.with_z_index(0, |cx| { - self.interactivity.handle_events( - bounds, - content_size, - overflow, - &mut element_state.interactive, - cx, + let padded_bounds = Bounds::from_corners( + bounds.origin + point(border.left + padding.left, border.top + padding.top), + bounds.lower_right() + - point(border.right + padding.right, border.bottom + padding.bottom), ); - }); - }) + + cx.with_z_index(style.z_index.unwrap_or(0), |cx| { + style.paint(bounds, cx); + + if self.item_count > 0 { + let item_height = self + .measure_item(view_state, Some(padded_bounds.size.width), cx) + .height; + if let Some(scroll_handle) = self.scroll_handle.clone() { + scroll_handle.0.lock().replace(ScrollHandleState { + item_height, + list_height: padded_bounds.size.height, + scroll_offset: shared_scroll_offset, + }); + } + let visible_item_count = if item_height > px(0.) { + (padded_bounds.size.height / item_height).ceil() as usize + 1 + } else { + 0 + }; + + let first_visible_element_ix = + (-scroll_offset.y / item_height).floor() as usize; + let visible_range = first_visible_element_ix + ..cmp::min( + first_visible_element_ix + visible_item_count, + self.item_count, + ); + + let mut items = (self.render_items)(view_state, visible_range.clone(), cx); + cx.with_z_index(1, |cx| { + for (item, ix) in items.iter_mut().zip(visible_range) { + let item_origin = padded_bounds.origin + + point(px(0.), item_height * ix + scroll_offset.y); + let available_space = size( + AvailableSpace::Definite(padded_bounds.size.width), + AvailableSpace::Definite(item_height), + ); + item.draw(item_origin, available_space, view_state, cx); + } + }); + } + }) + }, + ); + self.interactivity = interactivity; } } @@ -275,14 +292,8 @@ impl UniformList { } } -impl StatelessInteractive for UniformList { - fn stateless_interactivity(&mut self) -> &mut StatelessInteractivity { - self.interactivity.as_stateless_mut() - } -} - -impl StatefulInteractive for UniformList { - fn stateful_interactivity(&mut self) -> &mut StatefulInteractivity { +impl InteractiveComponent for UniformList { + fn interactivity(&mut self) -> &mut crate::Interactivity { &mut self.interactivity } } diff --git a/crates/gpui2/src/interactive.rs b/crates/gpui2/src/interactive.rs index f896bfc439..702a7ca5db 100644 --- a/crates/gpui2/src/interactive.rs +++ b/crates/gpui2/src/interactive.rs @@ -1,915 +1,17 @@ use crate::{ - div, point, px, Action, AnyDrag, AnyTooltip, AnyView, AppContext, Bounds, Component, - DispatchPhase, Div, Element, ElementId, FocusHandle, KeyContext, Keystroke, Modifiers, - Overflow, Pixels, Point, Render, SharedString, Size, Style, StyleRefinement, Task, View, - ViewContext, + div, point, px, AnyDrag, AnyTooltip, AnyView, AppContext, Bounds, Component, DispatchPhase, + FocusHandle, Keystroke, Modifiers, Node, Pixels, Point, Render, SharedString, StyleRefinement, + Task, ViewContext, }; -use collections::HashMap; -use derive_more::{Deref, DerefMut}; -use parking_lot::Mutex; -use refineable::Refineable; use smallvec::SmallVec; use std::{ - any::{Any, TypeId}, - fmt::Debug, - marker::PhantomData, - mem, - ops::Deref, - path::PathBuf, - sync::Arc, - time::Duration, + any::Any, fmt::Debug, marker::PhantomData, ops::Deref, path::PathBuf, sync::Arc, time::Duration, }; const DRAG_THRESHOLD: f64 = 2.; const TOOLTIP_DELAY: Duration = Duration::from_millis(500); const TOOLTIP_OFFSET: Point = Point::new(px(10.0), px(8.0)); -pub trait StatelessInteractive: Element { - fn stateless_interactivity(&mut self) -> &mut StatelessInteractivity; - - fn hover(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self - where - Self: Sized, - { - self.stateless_interactivity().hover_style = f(StyleRefinement::default()); - self - } - - fn group_hover( - mut self, - group_name: impl Into, - f: impl FnOnce(StyleRefinement) -> StyleRefinement, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity().group_hover_style = Some(GroupStyle { - group: group_name.into(), - style: f(StyleRefinement::default()), - }); - self - } - - fn on_mouse_down( - mut self, - button: MouseButton, - handler: impl Fn(&mut V, &MouseDownEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .mouse_down_listeners - .push(Box::new(move |view, event, bounds, phase, cx| { - if phase == DispatchPhase::Bubble - && event.button == button - && bounds.contains_point(&event.position) - { - handler(view, event, cx) - } - })); - self - } - - fn on_mouse_up( - mut self, - button: MouseButton, - handler: impl Fn(&mut V, &MouseUpEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .mouse_up_listeners - .push(Box::new(move |view, event, bounds, phase, cx| { - if phase == DispatchPhase::Bubble - && event.button == button - && bounds.contains_point(&event.position) - { - handler(view, event, cx) - } - })); - self - } - - fn on_mouse_down_out( - mut self, - handler: impl Fn(&mut V, &MouseDownEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .mouse_down_listeners - .push(Box::new(move |view, event, bounds, phase, cx| { - if phase == DispatchPhase::Capture && !bounds.contains_point(&event.position) { - handler(view, event, cx) - } - })); - self - } - - fn on_mouse_up_out( - mut self, - button: MouseButton, - handler: impl Fn(&mut V, &MouseUpEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .mouse_up_listeners - .push(Box::new(move |view, event, bounds, phase, cx| { - if phase == DispatchPhase::Capture - && event.button == button - && !bounds.contains_point(&event.position) - { - handler(view, event, cx); - } - })); - self - } - - fn on_mouse_move( - mut self, - handler: impl Fn(&mut V, &MouseMoveEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .mouse_move_listeners - .push(Box::new(move |view, event, bounds, phase, cx| { - if phase == DispatchPhase::Bubble && bounds.contains_point(&event.position) { - handler(view, event, cx); - } - })); - self - } - - fn on_scroll_wheel( - mut self, - handler: impl Fn(&mut V, &ScrollWheelEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .scroll_wheel_listeners - .push(Box::new(move |view, event, bounds, phase, cx| { - if phase == DispatchPhase::Bubble && bounds.contains_point(&event.position) { - handler(view, event, cx); - } - })); - self - } - - /// Capture the given action, fires during the capture phase - fn capture_action( - mut self, - listener: impl Fn(&mut V, &A, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity().action_listeners.push(( - TypeId::of::(), - Box::new(move |view, action, phase, cx| { - let action = action.downcast_ref().unwrap(); - if phase == DispatchPhase::Capture { - listener(view, action, cx) - } - }), - )); - self - } - - /// Add a listener for the given action, fires during the bubble event phase - fn on_action( - mut self, - listener: impl Fn(&mut V, &A, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity().action_listeners.push(( - TypeId::of::(), - Box::new(move |view, action, phase, cx| { - let action = action.downcast_ref().unwrap(); - if phase == DispatchPhase::Bubble { - listener(view, action, cx) - } - }), - )); - self - } - - fn on_key_down( - mut self, - listener: impl Fn(&mut V, &KeyDownEvent, DispatchPhase, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .key_down_listeners - .push(Box::new(move |view, event, phase, cx| { - listener(view, event, phase, cx) - })); - self - } - - fn on_key_up( - mut self, - listener: impl Fn(&mut V, &KeyUpEvent, DispatchPhase, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .key_up_listeners - .push(Box::new(move |view, event, phase, cx| { - listener(view, event, phase, cx) - })); - self - } - - fn drag_over(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self - where - Self: Sized, - { - self.stateless_interactivity() - .drag_over_styles - .push((TypeId::of::(), f(StyleRefinement::default()))); - self - } - - fn group_drag_over( - mut self, - group_name: impl Into, - f: impl FnOnce(StyleRefinement) -> StyleRefinement, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity().group_drag_over_styles.push(( - TypeId::of::(), - GroupStyle { - group: group_name.into(), - style: f(StyleRefinement::default()), - }, - )); - self - } - - fn on_drop( - mut self, - listener: impl Fn(&mut V, View, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateless_interactivity().drop_listeners.push(( - TypeId::of::(), - Box::new(move |view, dragged_view, cx| { - listener(view, dragged_view.downcast().unwrap(), cx); - }), - )); - self - } -} - -pub trait StatefulInteractive: StatelessInteractive { - fn stateful_interactivity(&mut self) -> &mut StatefulInteractivity; - - fn active(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self - where - Self: Sized, - { - self.stateful_interactivity().active_style = f(StyleRefinement::default()); - self - } - - fn group_active( - mut self, - group_name: impl Into, - f: impl FnOnce(StyleRefinement) -> StyleRefinement, - ) -> Self - where - Self: Sized, - { - self.stateful_interactivity().group_active_style = Some(GroupStyle { - group: group_name.into(), - style: f(StyleRefinement::default()), - }); - self - } - - fn on_click( - mut self, - listener: impl Fn(&mut V, &ClickEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.stateful_interactivity() - .click_listeners - .push(Box::new(move |view, event, cx| listener(view, event, cx))); - self - } - - fn on_drag( - mut self, - listener: impl Fn(&mut V, &mut ViewContext) -> View + 'static, - ) -> Self - where - Self: Sized, - W: 'static + Render, - { - debug_assert!( - self.stateful_interactivity().drag_listener.is_none(), - "calling on_drag more than once on the same element is not supported" - ); - self.stateful_interactivity().drag_listener = - Some(Box::new(move |view_state, cursor_offset, cx| AnyDrag { - view: listener(view_state, cx).into(), - cursor_offset, - })); - self - } - - fn on_hover(mut self, listener: impl 'static + Fn(&mut V, bool, &mut ViewContext)) -> Self - where - Self: Sized, - { - debug_assert!( - self.stateful_interactivity().hover_listener.is_none(), - "calling on_hover more than once on the same element is not supported" - ); - self.stateful_interactivity().hover_listener = Some(Box::new(listener)); - self - } - - fn tooltip( - mut self, - build_tooltip: impl Fn(&mut V, &mut ViewContext) -> View + 'static, - ) -> Self - where - Self: Sized, - W: 'static + Render, - { - debug_assert!( - self.stateful_interactivity().tooltip_builder.is_none(), - "calling tooltip more than once on the same element is not supported" - ); - self.stateful_interactivity().tooltip_builder = Some(Arc::new(move |view_state, cx| { - build_tooltip(view_state, cx).into() - })); - - self - } -} - -pub trait ElementInteractivity: 'static { - fn as_stateless(&self) -> &StatelessInteractivity; - fn as_stateless_mut(&mut self) -> &mut StatelessInteractivity; - fn as_stateful(&self) -> Option<&StatefulInteractivity>; - fn as_stateful_mut(&mut self) -> Option<&mut StatefulInteractivity>; - - fn refine_style( - &self, - style: &mut Style, - bounds: Bounds, - element_state: &InteractiveElementState, - cx: &mut ViewContext, - ) { - let mouse_position = cx.mouse_position(); - let stateless = self.as_stateless(); - if let Some(group_hover) = stateless.group_hover_style.as_ref() { - if let Some(group_bounds) = GroupBounds::get(&group_hover.group, cx) { - if group_bounds.contains_point(&mouse_position) { - style.refine(&group_hover.style); - } - } - } - if bounds.contains_point(&mouse_position) { - style.refine(&stateless.hover_style); - } - - if let Some(drag) = cx.active_drag.take() { - for (state_type, group_drag_style) in &self.as_stateless().group_drag_over_styles { - if let Some(group_bounds) = GroupBounds::get(&group_drag_style.group, cx) { - if *state_type == drag.view.entity_type() - && group_bounds.contains_point(&mouse_position) - { - style.refine(&group_drag_style.style); - } - } - } - - for (state_type, drag_over_style) in &self.as_stateless().drag_over_styles { - if *state_type == drag.view.entity_type() && bounds.contains_point(&mouse_position) - { - style.refine(drag_over_style); - } - } - - cx.active_drag = Some(drag); - } - - if let Some(stateful) = self.as_stateful() { - let active_state = element_state.active_state.lock(); - if active_state.group { - if let Some(group_style) = stateful.group_active_style.as_ref() { - style.refine(&group_style.style); - } - } - if active_state.element { - style.refine(&stateful.active_style); - } - } - } - - fn initialize(&mut self, cx: &mut ViewContext) { - let stateless = self.as_stateless_mut(); - - for listener in stateless.key_down_listeners.drain(..) { - cx.on_key_event(move |state, event: &KeyDownEvent, phase, cx| { - listener(state, event, phase, cx); - }) - } - - for listener in stateless.key_up_listeners.drain(..) { - cx.on_key_event(move |state, event: &KeyUpEvent, phase, cx| { - listener(state, event, phase, cx); - }) - } - - for (action_type, listener) in stateless.action_listeners.drain(..) { - cx.on_action(action_type, listener) - } - } - - fn handle_events( - &mut self, - bounds: Bounds, - content_size: Size, - overflow: Point, - element_state: &mut InteractiveElementState, - cx: &mut ViewContext, - ) { - let stateless = self.as_stateless_mut(); - for listener in stateless.mouse_down_listeners.drain(..) { - cx.on_mouse_event(move |state, event: &MouseDownEvent, phase, cx| { - listener(state, event, &bounds, phase, cx); - }) - } - - for listener in stateless.mouse_up_listeners.drain(..) { - cx.on_mouse_event(move |state, event: &MouseUpEvent, phase, cx| { - listener(state, event, &bounds, phase, cx); - }) - } - - for listener in stateless.mouse_move_listeners.drain(..) { - cx.on_mouse_event(move |state, event: &MouseMoveEvent, phase, cx| { - listener(state, event, &bounds, phase, cx); - }) - } - - for listener in stateless.scroll_wheel_listeners.drain(..) { - cx.on_mouse_event(move |state, event: &ScrollWheelEvent, phase, cx| { - listener(state, event, &bounds, phase, cx); - }) - } - - let hover_group_bounds = stateless - .group_hover_style - .as_ref() - .and_then(|group_hover| GroupBounds::get(&group_hover.group, cx)); - - if let Some(group_bounds) = hover_group_bounds { - let hovered = group_bounds.contains_point(&cx.mouse_position()); - cx.on_mouse_event(move |_, event: &MouseMoveEvent, phase, cx| { - if phase == DispatchPhase::Capture { - if group_bounds.contains_point(&event.position) != hovered { - cx.notify(); - } - } - }); - } - - if stateless.hover_style.is_some() - || (cx.active_drag.is_some() && !stateless.drag_over_styles.is_empty()) - { - let hovered = bounds.contains_point(&cx.mouse_position()); - cx.on_mouse_event(move |_, event: &MouseMoveEvent, phase, cx| { - if phase == DispatchPhase::Capture { - if bounds.contains_point(&event.position) != hovered { - cx.notify(); - } - } - }); - } - - if cx.active_drag.is_some() { - let drop_listeners = mem::take(&mut stateless.drop_listeners); - cx.on_mouse_event(move |view, event: &MouseUpEvent, phase, cx| { - if phase == DispatchPhase::Bubble && bounds.contains_point(&event.position) { - if let Some(drag_state_type) = - cx.active_drag.as_ref().map(|drag| drag.view.entity_type()) - { - for (drop_state_type, listener) in &drop_listeners { - if *drop_state_type == drag_state_type { - let drag = cx - .active_drag - .take() - .expect("checked for type drag state type above"); - listener(view, drag.view.clone(), cx); - cx.notify(); - cx.stop_propagation(); - } - } - } - } - }); - } - - if let Some(stateful) = self.as_stateful_mut() { - let click_listeners = mem::take(&mut stateful.click_listeners); - let drag_listener = mem::take(&mut stateful.drag_listener); - - if !click_listeners.is_empty() || drag_listener.is_some() { - let pending_mouse_down = element_state.pending_mouse_down.clone(); - let mouse_down = pending_mouse_down.lock().clone(); - if let Some(mouse_down) = mouse_down { - if let Some(drag_listener) = drag_listener { - let active_state = element_state.active_state.clone(); - - cx.on_mouse_event(move |view_state, event: &MouseMoveEvent, phase, cx| { - if cx.active_drag.is_some() { - if phase == DispatchPhase::Capture { - cx.notify(); - } - } else if phase == DispatchPhase::Bubble - && bounds.contains_point(&event.position) - && (event.position - mouse_down.position).magnitude() - > DRAG_THRESHOLD - { - *active_state.lock() = ActiveState::default(); - let cursor_offset = event.position - bounds.origin; - let drag = drag_listener(view_state, cursor_offset, cx); - cx.active_drag = Some(drag); - cx.notify(); - cx.stop_propagation(); - } - }); - } - - cx.on_mouse_event(move |view_state, event: &MouseUpEvent, phase, cx| { - if phase == DispatchPhase::Bubble && bounds.contains_point(&event.position) - { - let mouse_click = ClickEvent { - down: mouse_down.clone(), - up: event.clone(), - }; - for listener in &click_listeners { - listener(view_state, &mouse_click, cx); - } - } - *pending_mouse_down.lock() = None; - }); - } else { - cx.on_mouse_event(move |_state, event: &MouseDownEvent, phase, _cx| { - if phase == DispatchPhase::Bubble && bounds.contains_point(&event.position) - { - *pending_mouse_down.lock() = Some(event.clone()); - } - }); - } - } - - if let Some(hover_listener) = stateful.hover_listener.take() { - let was_hovered = element_state.hover_state.clone(); - let has_mouse_down = element_state.pending_mouse_down.clone(); - - cx.on_mouse_event(move |view_state, event: &MouseMoveEvent, phase, cx| { - if phase != DispatchPhase::Bubble { - return; - } - let is_hovered = - bounds.contains_point(&event.position) && has_mouse_down.lock().is_none(); - let mut was_hovered = was_hovered.lock(); - - if is_hovered != was_hovered.clone() { - *was_hovered = is_hovered; - drop(was_hovered); - - hover_listener(view_state, is_hovered, cx); - } - }); - } - - if let Some(tooltip_builder) = stateful.tooltip_builder.take() { - let active_tooltip = element_state.active_tooltip.clone(); - let pending_mouse_down = element_state.pending_mouse_down.clone(); - - cx.on_mouse_event(move |_, event: &MouseMoveEvent, phase, cx| { - if phase != DispatchPhase::Bubble { - return; - } - - let is_hovered = bounds.contains_point(&event.position) - && pending_mouse_down.lock().is_none(); - if !is_hovered { - active_tooltip.lock().take(); - return; - } - - if active_tooltip.lock().is_none() { - let task = cx.spawn({ - let active_tooltip = active_tooltip.clone(); - let tooltip_builder = tooltip_builder.clone(); - - move |view, mut cx| async move { - cx.background_executor().timer(TOOLTIP_DELAY).await; - view.update(&mut cx, move |view_state, cx| { - active_tooltip.lock().replace(ActiveTooltip { - waiting: None, - tooltip: Some(AnyTooltip { - view: tooltip_builder(view_state, cx), - cursor_offset: cx.mouse_position() + TOOLTIP_OFFSET, - }), - }); - cx.notify(); - }) - .ok(); - } - }); - active_tooltip.lock().replace(ActiveTooltip { - waiting: Some(task), - tooltip: None, - }); - } - }); - - if let Some(active_tooltip) = element_state.active_tooltip.lock().as_ref() { - if active_tooltip.tooltip.is_some() { - cx.active_tooltip = active_tooltip.tooltip.clone() - } - } - } - - let active_state = element_state.active_state.clone(); - if active_state.lock().is_none() { - let active_group_bounds = stateful - .group_active_style - .as_ref() - .and_then(|group_active| GroupBounds::get(&group_active.group, cx)); - cx.on_mouse_event(move |_view, down: &MouseDownEvent, phase, cx| { - if phase == DispatchPhase::Bubble { - let group = active_group_bounds - .map_or(false, |bounds| bounds.contains_point(&down.position)); - let element = bounds.contains_point(&down.position); - if group || element { - *active_state.lock() = ActiveState { group, element }; - cx.notify(); - } - } - }); - } else { - cx.on_mouse_event(move |_, _: &MouseUpEvent, phase, cx| { - if phase == DispatchPhase::Capture { - *active_state.lock() = ActiveState::default(); - cx.notify(); - } - }); - } - - if overflow.x == Overflow::Scroll || overflow.y == Overflow::Scroll { - let scroll_offset = element_state - .scroll_offset - .get_or_insert_with(Arc::default) - .clone(); - let line_height = cx.line_height(); - let scroll_max = (content_size - bounds.size).max(&Size::default()); - - cx.on_mouse_event(move |_, event: &ScrollWheelEvent, phase, cx| { - if phase == DispatchPhase::Bubble && bounds.contains_point(&event.position) { - let mut scroll_offset = scroll_offset.lock(); - let old_scroll_offset = *scroll_offset; - let delta = event.delta.pixel_delta(line_height); - - if overflow.x == Overflow::Scroll { - scroll_offset.x = - (scroll_offset.x + delta.x).clamp(-scroll_max.width, px(0.)); - } - - if overflow.y == Overflow::Scroll { - scroll_offset.y = - (scroll_offset.y + delta.y).clamp(-scroll_max.height, px(0.)); - } - - if *scroll_offset != old_scroll_offset { - cx.notify(); - cx.stop_propagation(); - } - } - }); - } - } - } -} - -#[derive(Deref, DerefMut)] -pub struct StatefulInteractivity { - pub id: ElementId, - #[deref] - #[deref_mut] - stateless: StatelessInteractivity, - click_listeners: SmallVec<[ClickListener; 2]>, - active_style: StyleRefinement, - group_active_style: Option, - drag_listener: Option>, - hover_listener: Option>, - tooltip_builder: Option>, -} - -impl StatefulInteractivity { - pub fn new(id: ElementId, stateless: StatelessInteractivity) -> Self { - Self { - id, - stateless, - click_listeners: SmallVec::new(), - active_style: StyleRefinement::default(), - group_active_style: None, - drag_listener: None, - hover_listener: None, - tooltip_builder: None, - } - } -} - -impl ElementInteractivity for StatefulInteractivity { - fn as_stateful(&self) -> Option<&StatefulInteractivity> { - Some(self) - } - - fn as_stateful_mut(&mut self) -> Option<&mut StatefulInteractivity> { - Some(self) - } - - fn as_stateless(&self) -> &StatelessInteractivity { - &self.stateless - } - - fn as_stateless_mut(&mut self) -> &mut StatelessInteractivity { - &mut self.stateless - } -} - -type DropListener = dyn Fn(&mut V, AnyView, &mut ViewContext) + 'static; - -pub struct StatelessInteractivity { - pub dispatch_context: KeyContext, - pub mouse_down_listeners: SmallVec<[MouseDownListener; 2]>, - pub mouse_up_listeners: SmallVec<[MouseUpListener; 2]>, - pub mouse_move_listeners: SmallVec<[MouseMoveListener; 2]>, - pub scroll_wheel_listeners: SmallVec<[ScrollWheelListener; 2]>, - pub key_down_listeners: SmallVec<[KeyDownListener; 2]>, - pub key_up_listeners: SmallVec<[KeyUpListener; 2]>, - pub action_listeners: SmallVec<[(TypeId, ActionListener); 8]>, - pub hover_style: StyleRefinement, - pub group_hover_style: Option, - drag_over_styles: SmallVec<[(TypeId, StyleRefinement); 2]>, - group_drag_over_styles: SmallVec<[(TypeId, GroupStyle); 2]>, - drop_listeners: SmallVec<[(TypeId, Box>); 2]>, -} - -impl StatelessInteractivity { - pub fn into_stateful(self, id: impl Into) -> StatefulInteractivity { - StatefulInteractivity { - id: id.into(), - stateless: self, - click_listeners: SmallVec::new(), - drag_listener: None, - hover_listener: None, - tooltip_builder: None, - active_style: StyleRefinement::default(), - group_active_style: None, - } - } -} - -pub struct GroupStyle { - pub group: SharedString, - pub style: StyleRefinement, -} - -#[derive(Default)] -pub struct GroupBounds(HashMap; 1]>>); - -impl GroupBounds { - pub fn get(name: &SharedString, cx: &mut AppContext) -> Option> { - cx.default_global::() - .0 - .get(name) - .and_then(|bounds_stack| bounds_stack.last()) - .cloned() - } - - pub fn push(name: SharedString, bounds: Bounds, cx: &mut AppContext) { - cx.default_global::() - .0 - .entry(name) - .or_default() - .push(bounds); - } - - pub fn pop(name: &SharedString, cx: &mut AppContext) { - cx.default_global::().0.get_mut(name).unwrap().pop(); - } -} - -#[derive(Copy, Clone, Default, Eq, PartialEq)] -struct ActiveState { - pub group: bool, - pub element: bool, -} - -impl ActiveState { - pub fn is_none(&self) -> bool { - !self.group && !self.element - } -} - -#[derive(Default)] -pub struct InteractiveElementState { - active_state: Arc>, - hover_state: Arc>, - pending_mouse_down: Arc>>, - scroll_offset: Option>>>, - active_tooltip: Arc>>, -} - -struct ActiveTooltip { - #[allow(unused)] // used to drop the task - waiting: Option>, - tooltip: Option, -} - -impl InteractiveElementState { - pub fn scroll_offset(&self) -> Option> { - self.scroll_offset - .as_ref() - .map(|offset| offset.lock().clone()) - } - - pub fn track_scroll_offset(&mut self) -> Arc>> { - self.scroll_offset - .get_or_insert_with(|| Arc::new(Mutex::new(Default::default()))) - .clone() - } -} - -impl Default for StatelessInteractivity { - fn default() -> Self { - Self { - dispatch_context: KeyContext::default(), - mouse_down_listeners: SmallVec::new(), - mouse_up_listeners: SmallVec::new(), - mouse_move_listeners: SmallVec::new(), - scroll_wheel_listeners: SmallVec::new(), - key_down_listeners: SmallVec::new(), - key_up_listeners: SmallVec::new(), - action_listeners: SmallVec::new(), - hover_style: StyleRefinement::default(), - group_hover_style: None, - drag_over_styles: SmallVec::new(), - group_drag_over_styles: SmallVec::new(), - drop_listeners: SmallVec::new(), - } - } -} - -impl ElementInteractivity for StatelessInteractivity { - fn as_stateful(&self) -> Option<&StatefulInteractivity> { - None - } - - fn as_stateful_mut(&mut self) -> Option<&mut StatefulInteractivity> { - None - } - - fn as_stateless(&self) -> &StatelessInteractivity { - self - } - - fn as_stateless_mut(&mut self) -> &mut StatelessInteractivity { - self - } -} - #[derive(Clone, Debug, Eq, PartialEq)] pub struct KeyDownEvent { pub keystroke: Keystroke, @@ -991,10 +93,6 @@ where } } -// impl Render for Drag { -// // fn render(&mut self, cx: ViewContext) -> -// } - #[derive(Hash, PartialEq, Eq, Copy, Clone, Debug)] pub enum MouseButton { Left, @@ -1103,7 +201,7 @@ impl Deref for MouseExitEvent { pub struct ExternalPaths(pub(crate) SmallVec<[PathBuf; 2]>); impl Render for ExternalPaths { - type Element = Div; + type Element = Node; fn render(&mut self, _: &mut ViewContext) -> Self::Element { div() // Intentionally left empty because the platform will render icons for the dragged files @@ -1229,8 +327,8 @@ pub type ActionListener = #[cfg(test)] mod test { use crate::{ - self as gpui, div, Div, FocusHandle, KeyBinding, Keystroke, ParentElement, Render, - StatefulInteractivity, StatelessInteractive, TestAppContext, VisualContext, + self as gpui, div, FocusHandle, InteractiveComponent, KeyBinding, Keystroke, Node, + ParentComponent, Render, Stateful, TestAppContext, VisualContext, }; struct TestView { @@ -1242,12 +340,12 @@ mod test { actions!(TestAction); impl Render for TestView { - type Element = Div>; + type Element = Stateful>; fn render(&mut self, _: &mut gpui::ViewContext) -> Self::Element { div().id("testview").child( div() - .context("test") + .key_context("test") .track_focus(&self.focus_handle) .on_key_down(|this: &mut TestView, _, _, _| this.saw_key_down = true) .on_action(|this: &mut TestView, _: &TestAction, _| this.saw_action = true), diff --git a/crates/gpui2/src/key_dispatch.rs b/crates/gpui2/src/key_dispatch.rs index 8ace4188ae..afe0b0f3e2 100644 --- a/crates/gpui2/src/key_dispatch.rs +++ b/crates/gpui2/src/key_dispatch.rs @@ -1,7 +1,7 @@ use crate::{ - build_action_from_type, Action, Bounds, DispatchPhase, Element, FocusEvent, FocusHandle, - FocusId, KeyContext, KeyMatch, Keymap, Keystroke, KeystrokeMatcher, MouseDownEvent, Pixels, - Style, StyleRefinement, ViewContext, WindowContext, + build_action_from_type, Action, Bounds, DispatchPhase, FocusEvent, FocusHandle, FocusId, + KeyContext, KeyMatch, Keymap, Keystroke, KeystrokeMatcher, MouseDownEvent, Pixels, Style, + StyleRefinement, ViewContext, WindowContext, }; use collections::HashMap; use parking_lot::Mutex; @@ -342,115 +342,3 @@ impl KeyDispatch for NonFocusableKeyDispatch { &mut self.key_context } } - -pub trait Focusable: Element { - fn focus_listeners(&mut self) -> &mut FocusListeners; - fn set_focus_style(&mut self, style: StyleRefinement); - fn set_focus_in_style(&mut self, style: StyleRefinement); - fn set_in_focus_style(&mut self, style: StyleRefinement); - - fn focus(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self - where - Self: Sized, - { - self.set_focus_style(f(StyleRefinement::default())); - self - } - - fn focus_in(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self - where - Self: Sized, - { - self.set_focus_in_style(f(StyleRefinement::default())); - self - } - - fn in_focus(mut self, f: impl FnOnce(StyleRefinement) -> StyleRefinement) -> Self - where - Self: Sized, - { - self.set_in_focus_style(f(StyleRefinement::default())); - self - } - - fn on_focus( - mut self, - listener: impl Fn(&mut V, &FocusEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.focus_listeners() - .push(Box::new(move |view, focus_handle, event, cx| { - if event.focused.as_ref() == Some(focus_handle) { - listener(view, event, cx) - } - })); - self - } - - fn on_blur( - mut self, - listener: impl Fn(&mut V, &FocusEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.focus_listeners() - .push(Box::new(move |view, focus_handle, event, cx| { - if event.blurred.as_ref() == Some(focus_handle) { - listener(view, event, cx) - } - })); - self - } - - fn on_focus_in( - mut self, - listener: impl Fn(&mut V, &FocusEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.focus_listeners() - .push(Box::new(move |view, focus_handle, event, cx| { - let descendant_blurred = event - .blurred - .as_ref() - .map_or(false, |blurred| focus_handle.contains(blurred, cx)); - let descendant_focused = event - .focused - .as_ref() - .map_or(false, |focused| focus_handle.contains(focused, cx)); - - if !descendant_blurred && descendant_focused { - listener(view, event, cx) - } - })); - self - } - - fn on_focus_out( - mut self, - listener: impl Fn(&mut V, &FocusEvent, &mut ViewContext) + 'static, - ) -> Self - where - Self: Sized, - { - self.focus_listeners() - .push(Box::new(move |view, focus_handle, event, cx| { - let descendant_blurred = event - .blurred - .as_ref() - .map_or(false, |blurred| focus_handle.contains(blurred, cx)); - let descendant_focused = event - .focused - .as_ref() - .map_or(false, |focused| focus_handle.contains(focused, cx)); - if descendant_blurred && !descendant_focused { - listener(view, event, cx) - } - })); - self - } -} diff --git a/crates/gpui2/src/prelude.rs b/crates/gpui2/src/prelude.rs index bc998fc1f4..7c2ad3f07f 100644 --- a/crates/gpui2/src/prelude.rs +++ b/crates/gpui2/src/prelude.rs @@ -1 +1,4 @@ -pub use crate::{Context, ParentElement, Refineable}; +pub use crate::{ + BorrowAppContext, BorrowWindow, Component, Context, FocusableComponent, InteractiveComponent, + ParentComponent, Refineable, Render, StatefulInteractiveComponent, Styled, VisualContext, +}; diff --git a/crates/gpui2/src/styled.rs b/crates/gpui2/src/styled.rs index 3f1fa843f9..71e38efd9b 100644 --- a/crates/gpui2/src/styled.rs +++ b/crates/gpui2/src/styled.rs @@ -6,21 +6,20 @@ use crate::{ use crate::{BoxShadow, TextStyleRefinement}; use refineable::Refineable; use smallvec::{smallvec, SmallVec}; +use taffy::style::Overflow; -pub trait Styled { +pub trait Styled: Sized { fn style(&mut self) -> &mut StyleRefinement; - fn computed_style(&mut self) -> Style { - Style::default().refined(self.style().clone()) - } - gpui2_macros::style_helpers!(); + fn z_index(mut self, z_index: u32) -> Self { + self.style().z_index = Some(z_index); + self + } + /// Sets the size of the element to the full width and height. - fn full(mut self) -> Self - where - Self: Sized, - { + fn full(mut self) -> Self { self.style().size.width = Some(relative(1.).into()); self.style().size.height = Some(relative(1.).into()); self @@ -28,118 +27,98 @@ pub trait Styled { /// Sets the position of the element to `relative`. /// [Docs](https://tailwindcss.com/docs/position) - fn relative(mut self) -> Self - where - Self: Sized, - { + fn relative(mut self) -> Self { self.style().position = Some(Position::Relative); self } /// Sets the position of the element to `absolute`. /// [Docs](https://tailwindcss.com/docs/position) - fn absolute(mut self) -> Self - where - Self: Sized, - { + fn absolute(mut self) -> Self { self.style().position = Some(Position::Absolute); self } /// Sets the display type of the element to `block`. /// [Docs](https://tailwindcss.com/docs/display) - fn block(mut self) -> Self - where - Self: Sized, - { + fn block(mut self) -> Self { self.style().display = Some(Display::Block); self } /// Sets the display type of the element to `flex`. /// [Docs](https://tailwindcss.com/docs/display) - fn flex(mut self) -> Self - where - Self: Sized, - { + fn flex(mut self) -> Self { self.style().display = Some(Display::Flex); self } /// Sets the visibility of the element to `visible`. /// [Docs](https://tailwindcss.com/docs/visibility) - fn visible(mut self) -> Self - where - Self: Sized, - { + fn visible(mut self) -> Self { self.style().visibility = Some(Visibility::Visible); self } /// Sets the visibility of the element to `hidden`. /// [Docs](https://tailwindcss.com/docs/visibility) - fn invisible(mut self) -> Self - where - Self: Sized, - { + fn invisible(mut self) -> Self { self.style().visibility = Some(Visibility::Hidden); self } - fn cursor(mut self, cursor: CursorStyle) -> Self - where - Self: Sized, - { + fn overflow_hidden(mut self) -> Self { + self.style().overflow.x = Some(Overflow::Hidden); + self.style().overflow.y = Some(Overflow::Hidden); + self + } + + fn overflow_hidden_x(mut self) -> Self { + self.style().overflow.x = Some(Overflow::Hidden); + self + } + + fn overflow_hidden_y(mut self) -> Self { + self.style().overflow.y = Some(Overflow::Hidden); + self + } + + fn cursor(mut self, cursor: CursorStyle) -> Self { self.style().mouse_cursor = Some(cursor); self } /// Sets the cursor style when hovering an element to `default`. /// [Docs](https://tailwindcss.com/docs/cursor) - fn cursor_default(mut self) -> Self - where - Self: Sized, - { + fn cursor_default(mut self) -> Self { self.style().mouse_cursor = Some(CursorStyle::Arrow); self } /// Sets the cursor style when hovering an element to `pointer`. /// [Docs](https://tailwindcss.com/docs/cursor) - fn cursor_pointer(mut self) -> Self - where - Self: Sized, - { + fn cursor_pointer(mut self) -> Self { self.style().mouse_cursor = Some(CursorStyle::PointingHand); self } /// Sets the flex direction of the element to `column`. /// [Docs](https://tailwindcss.com/docs/flex-direction#column) - fn flex_col(mut self) -> Self - where - Self: Sized, - { + fn flex_col(mut self) -> Self { self.style().flex_direction = Some(FlexDirection::Column); self } /// Sets the flex direction of the element to `row`. /// [Docs](https://tailwindcss.com/docs/flex-direction#row) - fn flex_row(mut self) -> Self - where - Self: Sized, - { + fn flex_row(mut self) -> Self { self.style().flex_direction = Some(FlexDirection::Row); self } /// Sets the element to allow a flex item to grow and shrink as needed, ignoring its initial size. /// [Docs](https://tailwindcss.com/docs/flex#flex-1) - fn flex_1(mut self) -> Self - where - Self: Sized, - { + fn flex_1(mut self) -> Self { self.style().flex_grow = Some(1.); self.style().flex_shrink = Some(1.); self.style().flex_basis = Some(relative(0.).into()); @@ -148,10 +127,7 @@ pub trait Styled { /// Sets the element to allow a flex item to grow and shrink, taking into account its initial size. /// [Docs](https://tailwindcss.com/docs/flex#auto) - fn flex_auto(mut self) -> Self - where - Self: Sized, - { + fn flex_auto(mut self) -> Self { self.style().flex_grow = Some(1.); self.style().flex_shrink = Some(1.); self.style().flex_basis = Some(Length::Auto); @@ -160,10 +136,7 @@ pub trait Styled { /// Sets the element to allow a flex item to shrink but not grow, taking into account its initial size. /// [Docs](https://tailwindcss.com/docs/flex#initial) - fn flex_initial(mut self) -> Self - where - Self: Sized, - { + fn flex_initial(mut self) -> Self { self.style().flex_grow = Some(0.); self.style().flex_shrink = Some(1.); self.style().flex_basis = Some(Length::Auto); @@ -172,10 +145,7 @@ pub trait Styled { /// Sets the element to prevent a flex item from growing or shrinking. /// [Docs](https://tailwindcss.com/docs/flex#none) - fn flex_none(mut self) -> Self - where - Self: Sized, - { + fn flex_none(mut self) -> Self { self.style().flex_grow = Some(0.); self.style().flex_shrink = Some(0.); self @@ -183,40 +153,28 @@ pub trait Styled { /// Sets the element to allow a flex item to grow to fill any available space. /// [Docs](https://tailwindcss.com/docs/flex-grow) - fn grow(mut self) -> Self - where - Self: Sized, - { + fn grow(mut self) -> Self { self.style().flex_grow = Some(1.); self } /// Sets the element to align flex items to the start of the container's cross axis. /// [Docs](https://tailwindcss.com/docs/align-items#start) - fn items_start(mut self) -> Self - where - Self: Sized, - { + fn items_start(mut self) -> Self { self.style().align_items = Some(AlignItems::FlexStart); self } /// Sets the element to align flex items to the end of the container's cross axis. /// [Docs](https://tailwindcss.com/docs/align-items#end) - fn items_end(mut self) -> Self - where - Self: Sized, - { + fn items_end(mut self) -> Self { self.style().align_items = Some(AlignItems::FlexEnd); self } /// Sets the element to align flex items along the center of the container's cross axis. /// [Docs](https://tailwindcss.com/docs/align-items#center) - fn items_center(mut self) -> Self - where - Self: Sized, - { + fn items_center(mut self) -> Self { self.style().align_items = Some(AlignItems::Center); self } @@ -224,40 +182,28 @@ pub trait Styled { /// Sets the element to justify flex items along the container's main axis /// such that there is an equal amount of space between each item. /// [Docs](https://tailwindcss.com/docs/justify-content#space-between) - fn justify_between(mut self) -> Self - where - Self: Sized, - { + fn justify_between(mut self) -> Self { self.style().justify_content = Some(JustifyContent::SpaceBetween); self } /// Sets the element to justify flex items along the center of the container's main axis. /// [Docs](https://tailwindcss.com/docs/justify-content#center) - fn justify_center(mut self) -> Self - where - Self: Sized, - { + fn justify_center(mut self) -> Self { self.style().justify_content = Some(JustifyContent::Center); self } /// Sets the element to justify flex items against the start of the container's main axis. /// [Docs](https://tailwindcss.com/docs/justify-content#start) - fn justify_start(mut self) -> Self - where - Self: Sized, - { + fn justify_start(mut self) -> Self { self.style().justify_content = Some(JustifyContent::Start); self } /// Sets the element to justify flex items against the end of the container's main axis. /// [Docs](https://tailwindcss.com/docs/justify-content#end) - fn justify_end(mut self) -> Self - where - Self: Sized, - { + fn justify_end(mut self) -> Self { self.style().justify_content = Some(JustifyContent::End); self } @@ -265,10 +211,7 @@ pub trait Styled { /// Sets the element to justify items along the container's main axis such /// that there is an equal amount of space on each side of each item. /// [Docs](https://tailwindcss.com/docs/justify-content#space-around) - fn justify_around(mut self) -> Self - where - Self: Sized, - { + fn justify_around(mut self) -> Self { self.style().justify_content = Some(JustifyContent::SpaceAround); self } @@ -295,30 +238,21 @@ pub trait Styled { /// Sets the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow(mut self, shadows: SmallVec<[BoxShadow; 2]>) -> Self - where - Self: Sized, - { + fn shadow(mut self, shadows: SmallVec<[BoxShadow; 2]>) -> Self { self.style().box_shadow = Some(shadows); self } /// Clears the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow_none(mut self) -> Self - where - Self: Sized, - { + fn shadow_none(mut self) -> Self { self.style().box_shadow = Some(Default::default()); self } /// Sets the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow_sm(mut self) -> Self - where - Self: Sized, - { + fn shadow_sm(mut self) -> Self { self.style().box_shadow = Some(smallvec::smallvec![BoxShadow { color: hsla(0., 0., 0., 0.05), offset: point(px(0.), px(1.)), @@ -330,10 +264,7 @@ pub trait Styled { /// Sets the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow_md(mut self) -> Self - where - Self: Sized, - { + fn shadow_md(mut self) -> Self { self.style().box_shadow = Some(smallvec![ BoxShadow { color: hsla(0.5, 0., 0., 0.1), @@ -353,10 +284,7 @@ pub trait Styled { /// Sets the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow_lg(mut self) -> Self - where - Self: Sized, - { + fn shadow_lg(mut self) -> Self { self.style().box_shadow = Some(smallvec![ BoxShadow { color: hsla(0., 0., 0., 0.1), @@ -376,10 +304,7 @@ pub trait Styled { /// Sets the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow_xl(mut self) -> Self - where - Self: Sized, - { + fn shadow_xl(mut self) -> Self { self.style().box_shadow = Some(smallvec![ BoxShadow { color: hsla(0., 0., 0., 0.1), @@ -399,10 +324,7 @@ pub trait Styled { /// Sets the box shadow of the element. /// [Docs](https://tailwindcss.com/docs/box-shadow) - fn shadow_2xl(mut self) -> Self - where - Self: Sized, - { + fn shadow_2xl(mut self) -> Self { self.style().box_shadow = Some(smallvec![BoxShadow { color: hsla(0., 0., 0., 0.25), offset: point(px(0.), px(25.)), @@ -417,198 +339,138 @@ pub trait Styled { &mut style.text } - fn text_color(mut self, color: impl Into) -> Self - where - Self: Sized, - { + fn text_color(mut self, color: impl Into) -> Self { self.text_style().get_or_insert_with(Default::default).color = Some(color.into()); self } - fn text_size(mut self, size: impl Into) -> Self - where - Self: Sized, - { + fn text_size(mut self, size: impl Into) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(size.into()); self } - fn text_xs(mut self) -> Self - where - Self: Sized, - { + fn text_xs(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(0.75).into()); self } - fn text_sm(mut self) -> Self - where - Self: Sized, - { + fn text_sm(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(0.875).into()); self } - fn text_base(mut self) -> Self - where - Self: Sized, - { + fn text_base(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(1.0).into()); self } - fn text_lg(mut self) -> Self - where - Self: Sized, - { + fn text_lg(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(1.125).into()); self } - fn text_xl(mut self) -> Self - where - Self: Sized, - { + fn text_xl(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(1.25).into()); self } - fn text_2xl(mut self) -> Self - where - Self: Sized, - { + fn text_2xl(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(1.5).into()); self } - fn text_3xl(mut self) -> Self - where - Self: Sized, - { + fn text_3xl(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_size = Some(rems(1.875).into()); self } - fn text_decoration_none(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_none(mut self) -> Self { self.text_style() .get_or_insert_with(Default::default) .underline = None; self } - fn text_decoration_color(mut self, color: impl Into) -> Self - where - Self: Sized, - { + fn text_decoration_color(mut self, color: impl Into) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.color = Some(color.into()); self } - fn text_decoration_solid(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_solid(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.wavy = false; self } - fn text_decoration_wavy(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_wavy(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.wavy = true; self } - fn text_decoration_0(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_0(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.thickness = px(0.); self } - fn text_decoration_1(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_1(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.thickness = px(1.); self } - fn text_decoration_2(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_2(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.thickness = px(2.); self } - fn text_decoration_4(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_4(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.thickness = px(4.); self } - fn text_decoration_8(mut self) -> Self - where - Self: Sized, - { + fn text_decoration_8(mut self) -> Self { let style = self.text_style().get_or_insert_with(Default::default); let underline = style.underline.get_or_insert_with(Default::default); underline.thickness = px(8.); self } - fn font(mut self, family_name: impl Into) -> Self - where - Self: Sized, - { + fn font(mut self, family_name: impl Into) -> Self { self.text_style() .get_or_insert_with(Default::default) .font_family = Some(family_name.into()); self } - fn line_height(mut self, line_height: impl Into) -> Self - where - Self: Sized, - { + fn line_height(mut self, line_height: impl Into) -> Self { self.text_style() .get_or_insert_with(Default::default) .line_height = Some(line_height.into()); diff --git a/crates/gpui2/src/view.rs b/crates/gpui2/src/view.rs index 3299ce7d45..801d8ceb0b 100644 --- a/crates/gpui2/src/view.rs +++ b/crates/gpui2/src/view.rs @@ -206,7 +206,7 @@ impl From> for AnyView { impl Element for AnyView { type ElementState = Box; - fn id(&self) -> Option { + fn element_id(&self) -> Option { Some(self.model.entity_id.into()) } diff --git a/crates/gpui2_macros/src/style_helpers.rs b/crates/gpui2_macros/src/style_helpers.rs index 57aef03afa..181311807c 100644 --- a/crates/gpui2_macros/src/style_helpers.rs +++ b/crates/gpui2_macros/src/style_helpers.rs @@ -130,7 +130,7 @@ fn generate_predefined_setter( let method = quote! { #[doc = #doc_string] - fn #method_name(mut self) -> Self where Self: std::marker::Sized { + fn #method_name(mut self) -> Self { let style = self.style(); #(#field_assignments)* self @@ -163,7 +163,7 @@ fn generate_custom_value_setter( let method = quote! { #[doc = #doc_string] - fn #method_name(mut self, length: impl std::clone::Clone + Into) -> Self where Self: std::marker::Sized { + fn #method_name(mut self, length: impl std::clone::Clone + Into) -> Self { let style = self.style(); #(#field_assignments)* self diff --git a/crates/picker2/src/picker2.rs b/crates/picker2/src/picker2.rs index e1979f1b13..189c07b49a 100644 --- a/crates/picker2/src/picker2.rs +++ b/crates/picker2/src/picker2.rs @@ -1,6 +1,6 @@ use editor::Editor; use gpui::{ - div, uniform_list, Component, Div, ParentElement, Render, StatelessInteractive, Styled, Task, + div, uniform_list, Component, Node, ParentComponent, Render, Styled, Task, UniformListScrollHandle, View, ViewContext, VisualContext, WindowContext, }; use std::{cmp, sync::Arc}; @@ -139,11 +139,11 @@ impl Picker { } impl Render for Picker { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { div() - .context("picker") + .key_context("picker") .size_full() .elevation_2(cx) .on_action(Self::select_next) diff --git a/crates/storybook2/src/stories/colors.rs b/crates/storybook2/src/stories/colors.rs index 13b7b36a8c..a5e9efc0da 100644 --- a/crates/storybook2/src/stories/colors.rs +++ b/crates/storybook2/src/stories/colors.rs @@ -1,12 +1,12 @@ use crate::story::Story; -use gpui::{px, Div, Render}; +use gpui::{prelude::*, px, Node, Render}; use theme2::{default_color_scales, ColorScaleStep}; use ui::prelude::*; pub struct ColorsStory; impl Render for ColorsStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let color_scales = default_color_scales(); diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs index bba798d9fe..a6b27c460d 100644 --- a/crates/storybook2/src/stories/focus.rs +++ b/crates/storybook2/src/stories/focus.rs @@ -1,6 +1,5 @@ use gpui::{ - actions, div, Div, FocusHandle, Focusable, FocusableKeyDispatch, KeyBinding, ParentElement, - Render, StatefulInteractivity, StatelessInteractive, Styled, View, VisualContext, + actions, div, prelude::*, FocusHandle, Focusable, KeyBinding, Node, Render, Stateful, View, WindowContext, }; use theme2::ActiveTheme; @@ -28,7 +27,7 @@ impl FocusStory { } impl Render for FocusStory { - type Element = Div, FocusableKeyDispatch>; + type Element = Focusable>>; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { let theme = cx.theme(); @@ -42,7 +41,7 @@ impl Render for FocusStory { div() .id("parent") .focusable() - .context("parent") + .key_context("parent") .on_action(|_, action: &ActionA, cx| { println!("Action A dispatched on parent"); }) @@ -62,7 +61,7 @@ impl Render for FocusStory { .child( div() .track_focus(&self.child_1_focus) - .context("child-1") + .key_context("child-1") .on_action(|_, action: &ActionB, cx| { println!("Action B dispatched on child 1 during"); }) @@ -82,7 +81,7 @@ impl Render for FocusStory { .child( div() .track_focus(&self.child_2_focus) - .context("child-2") + .key_context("child-2") .on_action(|_, action: &ActionC, cx| { println!("Action C dispatched on child 2"); }) diff --git a/crates/storybook2/src/stories/kitchen_sink.rs b/crates/storybook2/src/stories/kitchen_sink.rs index 6831ae2722..0a165eff74 100644 --- a/crates/storybook2/src/stories/kitchen_sink.rs +++ b/crates/storybook2/src/stories/kitchen_sink.rs @@ -1,5 +1,5 @@ use crate::{story::Story, story_selector::ComponentStory}; -use gpui::{Div, Render, StatefulInteractivity, View, VisualContext}; +use gpui::{prelude::*, Node, Render, Stateful, View}; use strum::IntoEnumIterator; use ui::prelude::*; @@ -12,7 +12,7 @@ impl KitchenSinkStory { } impl Render for KitchenSinkStory { - type Element = Div>; + type Element = Stateful>; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let component_stories = ComponentStory::iter() diff --git a/crates/storybook2/src/stories/picker.rs b/crates/storybook2/src/stories/picker.rs index 067c190575..bba8ae9990 100644 --- a/crates/storybook2/src/stories/picker.rs +++ b/crates/storybook2/src/stories/picker.rs @@ -1,11 +1,7 @@ -use std::sync::Arc; - use fuzzy::StringMatchCandidate; -use gpui::{ - div, Component, Div, KeyBinding, ParentElement, Render, StatelessInteractive, Styled, Task, - View, VisualContext, WindowContext, -}; +use gpui::{div, prelude::*, KeyBinding, Node, Render, Styled, Task, View, WindowContext}; use picker::{Picker, PickerDelegate}; +use std::sync::Arc; use theme2::ActiveTheme; pub struct PickerStory { @@ -38,7 +34,7 @@ impl Delegate { } impl PickerDelegate for Delegate { - type ListItem = Div>; + type ListItem = Node>; fn match_count(&self) -> usize { self.candidates.len() @@ -207,7 +203,7 @@ impl PickerStory { } impl Render for PickerStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { div() diff --git a/crates/storybook2/src/stories/scroll.rs b/crates/storybook2/src/stories/scroll.rs index 296dc50cb4..c5675b5681 100644 --- a/crates/storybook2/src/stories/scroll.rs +++ b/crates/storybook2/src/stories/scroll.rs @@ -1,6 +1,5 @@ use gpui::{ - div, px, Component, Div, ParentElement, Render, SharedString, StatefulInteractivity, Styled, - View, VisualContext, WindowContext, + div, prelude::*, px, Node, Render, SharedString, Stateful, Styled, View, WindowContext, }; use theme2::ActiveTheme; @@ -13,7 +12,7 @@ impl ScrollStory { } impl Render for ScrollStory { - type Element = Div>; + type Element = Stateful>; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { let theme = cx.theme(); diff --git a/crates/storybook2/src/stories/text.rs b/crates/storybook2/src/stories/text.rs index b4a4c86e7e..86ab2fce99 100644 --- a/crates/storybook2/src/stories/text.rs +++ b/crates/storybook2/src/stories/text.rs @@ -1,4 +1,4 @@ -use gpui::{div, white, Div, ParentElement, Render, Styled, View, VisualContext, WindowContext}; +use gpui::{div, white, Node, ParentComponent, Render, Styled, View, VisualContext, WindowContext}; pub struct TextStory; @@ -9,7 +9,7 @@ impl TextStory { } impl Render for TextStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut gpui::ViewContext) -> Self::Element { div().size_full().bg(white()).child(concat!( diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs index 46ec0f4a35..259685b9fa 100644 --- a/crates/storybook2/src/stories/z_index.rs +++ b/crates/storybook2/src/stories/z_index.rs @@ -1,4 +1,4 @@ -use gpui::{px, rgb, Div, Hsla, Render}; +use gpui::{px, rgb, Hsla, Node, Render}; use ui::prelude::*; use crate::story::Story; @@ -8,7 +8,7 @@ use crate::story::Story; pub struct ZIndexStory; impl Render for ZIndexStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) @@ -77,7 +77,7 @@ trait Styles: Styled + Sized { } } -impl Styles for Div {} +impl Styles for Node {} #[derive(Component)] struct ZIndexExample { diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs index f0ba124162..f20aa59095 100644 --- a/crates/storybook2/src/storybook2.rs +++ b/crates/storybook2/src/storybook2.rs @@ -9,7 +9,7 @@ use std::sync::Arc; use clap::Parser; use gpui::{ - div, px, size, AnyView, AppContext, Bounds, Div, Render, ViewContext, VisualContext, + div, px, size, AnyView, AppContext, Bounds, Node, Render, ViewContext, VisualContext, WindowBounds, WindowOptions, }; use log::LevelFilter; @@ -107,7 +107,7 @@ impl StoryWrapper { } impl Render for StoryWrapper { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { div() diff --git a/crates/theme2/src/players.rs b/crates/theme2/src/players.rs index 0e36ff5947..32b3504b65 100644 --- a/crates/theme2/src/players.rs +++ b/crates/theme2/src/players.rs @@ -40,12 +40,12 @@ pub use stories::*; mod stories { use super::*; use crate::{ActiveTheme, Story}; - use gpui::{div, img, px, Div, ParentElement, Render, Styled, ViewContext}; + use gpui::{div, img, px, Node, ParentComponent, Render, Styled, ViewContext}; pub struct PlayerStory; impl Render for PlayerStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx).child( diff --git a/crates/theme2/src/story.rs b/crates/theme2/src/story.rs index 8b3754b59e..00cb20df92 100644 --- a/crates/theme2/src/story.rs +++ b/crates/theme2/src/story.rs @@ -1,11 +1,11 @@ -use gpui::{div, Component, Div, ParentElement, Styled, ViewContext}; +use gpui::{div, Component, Node, ParentComponent, Styled, ViewContext}; use crate::ActiveTheme; pub struct Story {} impl Story { - pub fn container(cx: &mut ViewContext) -> Div { + pub fn container(cx: &mut ViewContext) -> Node { div() .size_full() .flex() diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs index d083d8fd46..d270f2fd32 100644 --- a/crates/ui2/src/components/avatar.rs +++ b/crates/ui2/src/components/avatar.rs @@ -44,12 +44,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct AvatarStory; impl Render for AvatarStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/button.rs b/crates/ui2/src/components/button.rs index 5787616832..eeb8ddb906 100644 --- a/crates/ui2/src/components/button.rs +++ b/crates/ui2/src/components/button.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use gpui::{div, DefiniteLength, Hsla, MouseButton, WindowContext}; +use gpui::{div, DefiniteLength, Hsla, MouseButton, StatefulInteractiveComponent, WindowContext}; use crate::{ h_stack, prelude::*, Icon, IconButton, IconColor, IconElement, Label, LabelColor, @@ -236,13 +236,13 @@ pub use stories::*; mod stories { use super::*; use crate::{h_stack, v_stack, LabelColor, Story}; - use gpui::{rems, Div, Render}; + use gpui::{rems, Node, Render}; use strum::IntoEnumIterator; pub struct ButtonStory; impl Render for ButtonStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let states = InteractionState::iter(); diff --git a/crates/ui2/src/components/checkbox.rs b/crates/ui2/src/components/checkbox.rs index 20dad74712..c2a0cfdc2f 100644 --- a/crates/ui2/src/components/checkbox.rs +++ b/crates/ui2/src/components/checkbox.rs @@ -1,9 +1,5 @@ +use gpui::{div, prelude::*, Component, ElementId, Styled, ViewContext}; use std::sync::Arc; - -use gpui::{ - div, Component, ElementId, ParentElement, StatefulInteractive, StatelessInteractive, Styled, - ViewContext, -}; use theme2::ActiveTheme; use crate::{Icon, IconColor, IconElement, Selection}; @@ -175,12 +171,12 @@ pub use stories::*; mod stories { use super::*; use crate::{h_stack, Story}; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct CheckboxStory; impl Render for CheckboxStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs index 117be12779..a33f10c296 100644 --- a/crates/ui2/src/components/context_menu.rs +++ b/crates/ui2/src/components/context_menu.rs @@ -65,12 +65,12 @@ pub use stories::*; mod stories { use super::*; use crate::story::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct ContextMenuStory; impl Render for ContextMenuStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/details.rs b/crates/ui2/src/components/details.rs index f138290f17..44c433179a 100644 --- a/crates/ui2/src/components/details.rs +++ b/crates/ui2/src/components/details.rs @@ -47,12 +47,12 @@ pub use stories::*; mod stories { use super::*; use crate::{Button, Story}; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct DetailsStory; impl Render for DetailsStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/elevated_surface.rs b/crates/ui2/src/components/elevated_surface.rs index 7a6f11978e..3a1699a64a 100644 --- a/crates/ui2/src/components/elevated_surface.rs +++ b/crates/ui2/src/components/elevated_surface.rs @@ -1,11 +1,11 @@ -use gpui::Div; +use gpui::Node; use crate::{prelude::*, v_stack}; /// Create an elevated surface. /// /// Must be used inside of a relative parent element -pub fn elevated_surface(level: ElevationIndex, cx: &mut ViewContext) -> Div { +pub fn elevated_surface(level: ElevationIndex, cx: &mut ViewContext) -> Node { let colors = cx.theme().colors(); // let shadow = BoxShadow { @@ -23,6 +23,6 @@ pub fn elevated_surface(level: ElevationIndex, cx: &mut ViewContext< .shadow(level.shadow()) } -pub fn modal(cx: &mut ViewContext) -> Div { +pub fn modal(cx: &mut ViewContext) -> Node { elevated_surface(ElevationIndex::ModalSurface, cx) } diff --git a/crates/ui2/src/components/facepile.rs b/crates/ui2/src/components/facepile.rs index efac4925f8..43fd233458 100644 --- a/crates/ui2/src/components/facepile.rs +++ b/crates/ui2/src/components/facepile.rs @@ -33,12 +33,12 @@ pub use stories::*; mod stories { use super::*; use crate::{static_players, Story}; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct FacepileStory; impl Render for FacepileStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let players = static_players(); diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs index 907f3f9187..ce980a879b 100644 --- a/crates/ui2/src/components/icon.rs +++ b/crates/ui2/src/components/icon.rs @@ -204,7 +204,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use strum::IntoEnumIterator; use crate::Story; @@ -214,7 +214,7 @@ mod stories { pub struct IconStory; impl Render for IconStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let icons = Icon::iter(); diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs index 91653ea8cd..86803c584c 100644 --- a/crates/ui2/src/components/icon_button.rs +++ b/crates/ui2/src/components/icon_button.rs @@ -1,9 +1,7 @@ -use std::sync::Arc; - -use gpui::{rems, MouseButton}; - use crate::{h_stack, prelude::*}; use crate::{ClickHandler, Icon, IconColor, IconElement}; +use gpui::{prelude::*, rems, MouseButton}; +use std::sync::Arc; struct IconButtonHandlers { click: Option>, diff --git a/crates/ui2/src/components/input.rs b/crates/ui2/src/components/input.rs index 1a44827fe8..d873d6a5cb 100644 --- a/crates/ui2/src/components/input.rs +++ b/crates/ui2/src/components/input.rs @@ -1,6 +1,5 @@ -use crate::prelude::*; -use crate::Label; -use crate::LabelColor; +use crate::{prelude::*, Label, LabelColor}; +use gpui::prelude::*; #[derive(Default, PartialEq)] pub enum InputVariant { @@ -111,12 +110,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct InputStory; impl Render for InputStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs index bd02e694ed..86e876d245 100644 --- a/crates/ui2/src/components/keybinding.rs +++ b/crates/ui2/src/components/keybinding.rs @@ -158,13 +158,13 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; use itertools::Itertools; pub struct KeybindingStory; impl Render for KeybindingStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let all_modifier_permutations = ModifierKey::iter().permutations(2); diff --git a/crates/ui2/src/components/label.rs b/crates/ui2/src/components/label.rs index 827ba87918..497ebe6773 100644 --- a/crates/ui2/src/components/label.rs +++ b/crates/ui2/src/components/label.rs @@ -196,12 +196,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct LabelStory; impl Render for LabelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/modal.rs b/crates/ui2/src/components/modal.rs index 75528b5c34..c3d71a78d8 100644 --- a/crates/ui2/src/components/modal.rs +++ b/crates/ui2/src/components/modal.rs @@ -74,7 +74,7 @@ impl Modal { } } -impl ParentElement for Modal { +impl ParentComponent for Modal { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs index 7f736433fc..4a753215f0 100644 --- a/crates/ui2/src/components/palette.rs +++ b/crates/ui2/src/components/palette.rs @@ -1,5 +1,5 @@ -use crate::prelude::*; -use crate::{h_stack, v_stack, Keybinding, Label, LabelColor}; +use crate::{h_stack, prelude::*, v_stack, Keybinding, Label, LabelColor}; +use gpui::prelude::*; #[derive(Component)] pub struct Palette { @@ -159,7 +159,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::{ModifierKeys, Story}; @@ -168,7 +168,7 @@ mod stories { pub struct PaletteStory; impl Render for PaletteStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { { diff --git a/crates/ui2/src/components/panel.rs b/crates/ui2/src/components/panel.rs index 1762003a2c..2b317b0bc1 100644 --- a/crates/ui2/src/components/panel.rs +++ b/crates/ui2/src/components/panel.rs @@ -1,4 +1,4 @@ -use gpui::{AbsoluteLength, AnyElement}; +use gpui::{prelude::*, AbsoluteLength, AnyElement}; use smallvec::SmallVec; use crate::prelude::*; @@ -113,7 +113,7 @@ impl Panel { } } -impl ParentElement for Panel { +impl ParentComponent for Panel { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } @@ -126,12 +126,12 @@ pub use stories::*; mod stories { use super::*; use crate::{Label, Story}; - use gpui::{Div, Render}; + use gpui::{InteractiveComponent, Node, Render}; pub struct PanelStory; impl Render for PanelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/stack.rs b/crates/ui2/src/components/stack.rs index d3d7a75aa7..d705863ad4 100644 --- a/crates/ui2/src/components/stack.rs +++ b/crates/ui2/src/components/stack.rs @@ -1,17 +1,17 @@ -use gpui::{div, Div}; +use gpui::{div, Node}; use crate::StyledExt; /// Horizontally stacks elements. /// /// Sets `flex()`, `flex_row()`, `items_center()` -pub fn h_stack() -> Div { +pub fn h_stack() -> Node { div().h_flex() } /// Vertically stacks elements. /// /// Sets `flex()`, `flex_col()` -pub fn v_stack() -> Div { +pub fn v_stack() -> Node { div().v_flex() } diff --git a/crates/ui2/src/components/tab.rs b/crates/ui2/src/components/tab.rs index e936dc924a..fe993555b9 100644 --- a/crates/ui2/src/components/tab.rs +++ b/crates/ui2/src/components/tab.rs @@ -1,6 +1,6 @@ use crate::prelude::*; use crate::{Icon, IconColor, IconElement, Label, LabelColor}; -use gpui::{red, Div, ElementId, Render, View, VisualContext}; +use gpui::{prelude::*, red, ElementId, Node, Render, View}; #[derive(Component, Clone)] pub struct Tab { @@ -21,7 +21,7 @@ struct TabDragState { } impl Render for TabDragState { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { div().w_8().h_4().bg(red()) @@ -178,7 +178,7 @@ mod stories { pub struct TabStory; impl Render for TabStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let git_statuses = GitStatus::iter(); diff --git a/crates/ui2/src/components/toast.rs b/crates/ui2/src/components/toast.rs index 4164be2c3e..2f07bbc3e0 100644 --- a/crates/ui2/src/components/toast.rs +++ b/crates/ui2/src/components/toast.rs @@ -1,7 +1,6 @@ -use gpui::AnyElement; -use smallvec::SmallVec; - use crate::prelude::*; +use gpui::{prelude::*, AnyElement}; +use smallvec::SmallVec; #[derive(Default, Debug, PartialEq, Eq, Clone, Copy)] pub enum ToastOrigin { @@ -59,7 +58,7 @@ impl Toast { } } -impl ParentElement for Toast { +impl ParentComponent for Toast { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } @@ -70,7 +69,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::{Label, Story}; @@ -79,7 +78,7 @@ mod stories { pub struct ToastStory; impl Render for ToastStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/components/toggle.rs b/crates/ui2/src/components/toggle.rs index 368c95662f..f34f08e09e 100644 --- a/crates/ui2/src/components/toggle.rs +++ b/crates/ui2/src/components/toggle.rs @@ -1,4 +1,4 @@ -use gpui::{div, Component, ParentElement}; +use gpui::{div, Component, ParentComponent}; use crate::{Icon, IconColor, IconElement, IconSize}; diff --git a/crates/ui2/src/components/tooltip.rs b/crates/ui2/src/components/tooltip.rs index 87860ce943..6c5fa7bc2b 100644 --- a/crates/ui2/src/components/tooltip.rs +++ b/crates/ui2/src/components/tooltip.rs @@ -1,4 +1,4 @@ -use gpui::{div, Div, ParentElement, Render, SharedString, Styled, ViewContext}; +use gpui::{div, Node, ParentComponent, Render, SharedString, Styled, ViewContext}; use theme2::ActiveTheme; #[derive(Clone, Debug)] @@ -13,7 +13,7 @@ impl TextTooltip { } impl Render for TextTooltip { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let theme = cx.theme(); diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs index 545f437a9b..f37b6123e3 100644 --- a/crates/ui2/src/prelude.rs +++ b/crates/ui2/src/prelude.rs @@ -1,8 +1,8 @@ use gpui::rems; use gpui::Rems; pub use gpui::{ - div, Component, Element, ElementId, ParentElement, SharedString, StatefulInteractive, - StatelessInteractive, Styled, ViewContext, WindowContext, + div, Component, Element, ElementId, InteractiveComponent, ParentComponent, SharedString, Styled, + ViewContext, WindowContext, }; pub use crate::elevation::*; diff --git a/crates/ui2/src/story.rs b/crates/ui2/src/story.rs index 94e38267f4..cf5737a245 100644 --- a/crates/ui2/src/story.rs +++ b/crates/ui2/src/story.rs @@ -1,11 +1,11 @@ -use gpui::Div; +use gpui::Node; use crate::prelude::*; pub struct Story {} impl Story { - pub fn container(cx: &mut ViewContext) -> Div { + pub fn container(cx: &mut ViewContext) -> Node { div() .size_full() .flex() diff --git a/crates/ui2/src/styled_ext.rs b/crates/ui2/src/styled_ext.rs index 0407d98f86..d9911e6833 100644 --- a/crates/ui2/src/styled_ext.rs +++ b/crates/ui2/src/styled_ext.rs @@ -1,4 +1,4 @@ -use gpui::{Div, ElementInteractivity, KeyDispatch, Styled, UniformList, ViewContext}; +use gpui::{Styled, ViewContext}; use theme2::ActiveTheme; use crate::{ElevationIndex, UITextSize}; @@ -93,11 +93,4 @@ pub trait StyledExt: Styled + Sized { } } -impl StyledExt for Div -where - I: ElementInteractivity, - F: KeyDispatch, -{ -} - -impl StyledExt for UniformList {} +impl StyledExt for E {} diff --git a/crates/ui2/src/to_extract/assistant_panel.rs b/crates/ui2/src/to_extract/assistant_panel.rs index 8a35757f5c..59d9059122 100644 --- a/crates/ui2/src/to_extract/assistant_panel.rs +++ b/crates/ui2/src/to_extract/assistant_panel.rs @@ -1,6 +1,6 @@ use crate::prelude::*; use crate::{Icon, IconButton, Label, Panel, PanelSide}; -use gpui::{rems, AbsoluteLength}; +use gpui::{prelude::*, rems, AbsoluteLength}; #[derive(Component)] pub struct AssistantPanel { @@ -77,11 +77,11 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct AssistantPanelStory; impl Render for AssistantPanelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/breadcrumb.rs b/crates/ui2/src/to_extract/breadcrumb.rs index 782f772fa1..c113c64168 100644 --- a/crates/ui2/src/to_extract/breadcrumb.rs +++ b/crates/ui2/src/to_extract/breadcrumb.rs @@ -1,9 +1,7 @@ +use crate::{h_stack, prelude::*, HighlightedText}; +use gpui::{prelude::*, Node}; use std::path::PathBuf; -use crate::prelude::*; -use crate::{h_stack, HighlightedText}; -use gpui::Div; - #[derive(Clone)] pub struct Symbol(pub Vec); @@ -18,7 +16,7 @@ impl Breadcrumb { Self { path, symbols } } - fn render_separator(&self, cx: &WindowContext) -> Div { + fn render_separator(&self, cx: &WindowContext) -> Node { div() .child(" › ") .text_color(cx.theme().colors().text_muted) @@ -79,7 +77,7 @@ mod stories { pub struct BreadcrumbStory; impl Render for BreadcrumbStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/buffer.rs b/crates/ui2/src/to_extract/buffer.rs index aa4bebc9d5..b04f2221d3 100644 --- a/crates/ui2/src/to_extract/buffer.rs +++ b/crates/ui2/src/to_extract/buffer.rs @@ -235,12 +235,12 @@ mod stories { empty_buffer_example, hello_world_rust_buffer_example, hello_world_rust_buffer_with_status_example, Story, }; - use gpui::{rems, Div, Render}; + use gpui::{rems, Node, Render}; pub struct BufferStory; impl Render for BufferStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/buffer_search.rs b/crates/ui2/src/to_extract/buffer_search.rs index 9993cd3612..0e6fffa5a7 100644 --- a/crates/ui2/src/to_extract/buffer_search.rs +++ b/crates/ui2/src/to_extract/buffer_search.rs @@ -1,4 +1,4 @@ -use gpui::{Div, Render, View, VisualContext}; +use gpui::{Node, Render, View, VisualContext}; use crate::prelude::*; use crate::{h_stack, Icon, IconButton, IconColor, Input}; @@ -27,9 +27,9 @@ impl BufferSearch { } impl Render for BufferSearch { - type Element = Div; + type Element = Node; - fn render(&mut self, cx: &mut ViewContext) -> Div { + fn render(&mut self, cx: &mut ViewContext) -> Node { h_stack() .bg(cx.theme().colors().toolbar_background) .p_2() diff --git a/crates/ui2/src/to_extract/chat_panel.rs b/crates/ui2/src/to_extract/chat_panel.rs index 538b5dfceb..13f35468ff 100644 --- a/crates/ui2/src/to_extract/chat_panel.rs +++ b/crates/ui2/src/to_extract/chat_panel.rs @@ -1,7 +1,6 @@ +use crate::{prelude::*, Icon, IconButton, Input, Label, LabelColor}; use chrono::NaiveDateTime; - -use crate::prelude::*; -use crate::{Icon, IconButton, Input, Label, LabelColor}; +use gpui::prelude::*; #[derive(Component)] pub struct ChatPanel { @@ -108,7 +107,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { use chrono::DateTime; - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::{Panel, Story}; @@ -117,7 +116,7 @@ mod stories { pub struct ChatPanelStory; impl Render for ChatPanelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/collab_panel.rs b/crates/ui2/src/to_extract/collab_panel.rs index d56166ad2e..d2ac353e05 100644 --- a/crates/ui2/src/to_extract/collab_panel.rs +++ b/crates/ui2/src/to_extract/collab_panel.rs @@ -1,7 +1,8 @@ -use crate::{prelude::*, Toggle}; use crate::{ - static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, List, ListHeader, + prelude::*, static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, + List, ListHeader, Toggle, }; +use gpui::prelude::*; #[derive(Component)] pub struct CollabPanel { @@ -92,12 +93,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct CollabPanelStory; impl Render for CollabPanelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/command_palette.rs b/crates/ui2/src/to_extract/command_palette.rs index 8a9461c796..8a9c61490c 100644 --- a/crates/ui2/src/to_extract/command_palette.rs +++ b/crates/ui2/src/to_extract/command_palette.rs @@ -27,7 +27,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::Story; @@ -36,7 +36,7 @@ mod stories { pub struct CommandPaletteStory; impl Render for CommandPaletteStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/copilot.rs b/crates/ui2/src/to_extract/copilot.rs index 8750ab3c51..2a2c2c4a27 100644 --- a/crates/ui2/src/to_extract/copilot.rs +++ b/crates/ui2/src/to_extract/copilot.rs @@ -25,7 +25,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::Story; @@ -34,7 +34,7 @@ mod stories { pub struct CopilotModalStory; impl Render for CopilotModalStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/editor_pane.rs b/crates/ui2/src/to_extract/editor_pane.rs index fd21e81242..4546c24794 100644 --- a/crates/ui2/src/to_extract/editor_pane.rs +++ b/crates/ui2/src/to_extract/editor_pane.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use gpui::{Div, Render, View, VisualContext}; +use gpui::{Node, Render, View, VisualContext}; use crate::prelude::*; use crate::{ @@ -48,9 +48,9 @@ impl EditorPane { } impl Render for EditorPane { - type Element = Div; + type Element = Node; - fn render(&mut self, cx: &mut ViewContext) -> Div { + fn render(&mut self, cx: &mut ViewContext) -> Node { v_stack() .w_full() .h_full() diff --git a/crates/ui2/src/to_extract/language_selector.rs b/crates/ui2/src/to_extract/language_selector.rs index 694ca78e9c..46a10d5c88 100644 --- a/crates/ui2/src/to_extract/language_selector.rs +++ b/crates/ui2/src/to_extract/language_selector.rs @@ -40,12 +40,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct LanguageSelectorStory; impl Render for LanguageSelectorStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/multi_buffer.rs b/crates/ui2/src/to_extract/multi_buffer.rs index 78a22d51d0..0649bf1290 100644 --- a/crates/ui2/src/to_extract/multi_buffer.rs +++ b/crates/ui2/src/to_extract/multi_buffer.rs @@ -40,12 +40,12 @@ pub use stories::*; mod stories { use super::*; use crate::{hello_world_rust_buffer_example, Story}; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct MultiBufferStory; impl Render for MultiBufferStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/notifications_panel.rs b/crates/ui2/src/to_extract/notifications_panel.rs index b2cc4a7846..0a85a15f34 100644 --- a/crates/ui2/src/to_extract/notifications_panel.rs +++ b/crates/ui2/src/to_extract/notifications_panel.rs @@ -1,10 +1,9 @@ -use crate::utils::naive_format_distance_from_now; use crate::{ - h_stack, prelude::*, static_new_notification_items_2, v_stack, Avatar, ButtonOrIconButton, - Icon, IconElement, Label, LabelColor, LineHeightStyle, ListHeaderMeta, ListSeparator, - PublicPlayer, UnreadIndicator, + h_stack, prelude::*, static_new_notification_items_2, utils::naive_format_distance_from_now, + v_stack, Avatar, ButtonOrIconButton, ClickHandler, Icon, IconElement, Label, LabelColor, + LineHeightStyle, ListHeader, ListHeaderMeta, ListSeparator, PublicPlayer, UnreadIndicator, }; -use crate::{ClickHandler, ListHeader}; +use gpui::prelude::*; #[derive(Component)] pub struct NotificationsPanel { @@ -353,12 +352,12 @@ pub use stories::*; mod stories { use super::*; use crate::{Panel, Story}; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct NotificationsPanelStory; impl Render for NotificationsPanelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/panes.rs b/crates/ui2/src/to_extract/panes.rs index b57b77d5ee..288419d8bf 100644 --- a/crates/ui2/src/to_extract/panes.rs +++ b/crates/ui2/src/to_extract/panes.rs @@ -59,7 +59,7 @@ impl Pane { } } -impl ParentElement for Pane { +impl ParentComponent for Pane { fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> { &mut self.children } diff --git a/crates/ui2/src/to_extract/project_panel.rs b/crates/ui2/src/to_extract/project_panel.rs index d4f5c72426..c55056a7a9 100644 --- a/crates/ui2/src/to_extract/project_panel.rs +++ b/crates/ui2/src/to_extract/project_panel.rs @@ -1,7 +1,8 @@ -use crate::prelude::*; use crate::{ - static_project_panel_project_items, static_project_panel_single_items, Input, List, ListHeader, + prelude::*, static_project_panel_project_items, static_project_panel_single_items, Input, List, + ListHeader, }; +use gpui::prelude::*; #[derive(Component)] pub struct ProjectPanel { @@ -54,12 +55,12 @@ pub use stories::*; mod stories { use super::*; use crate::{Panel, Story}; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct ProjectPanelStory; impl Render for ProjectPanelStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/recent_projects.rs b/crates/ui2/src/to_extract/recent_projects.rs index 3d4f551490..83b15a3128 100644 --- a/crates/ui2/src/to_extract/recent_projects.rs +++ b/crates/ui2/src/to_extract/recent_projects.rs @@ -36,12 +36,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct RecentProjectsStory; impl Render for RecentProjectsStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/tab_bar.rs b/crates/ui2/src/to_extract/tab_bar.rs index aff095c639..e8de2e9e58 100644 --- a/crates/ui2/src/to_extract/tab_bar.rs +++ b/crates/ui2/src/to_extract/tab_bar.rs @@ -1,5 +1,5 @@ -use crate::prelude::*; -use crate::{Icon, IconButton, Tab}; +use crate::{prelude::*, Icon, IconButton, Tab}; +use gpui::prelude::*; #[derive(Component)] pub struct TabBar { @@ -100,12 +100,12 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct TabBarStory; impl Render for TabBarStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/terminal.rs b/crates/ui2/src/to_extract/terminal.rs index 6c36f35152..5bcbca4fde 100644 --- a/crates/ui2/src/to_extract/terminal.rs +++ b/crates/ui2/src/to_extract/terminal.rs @@ -83,11 +83,11 @@ pub use stories::*; mod stories { use super::*; use crate::Story; - use gpui::{Div, Render}; + use gpui::{Node, Render}; pub struct TerminalStory; impl Render for TerminalStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/theme_selector.rs b/crates/ui2/src/to_extract/theme_selector.rs index 7f911b50bf..7dd169a2f7 100644 --- a/crates/ui2/src/to_extract/theme_selector.rs +++ b/crates/ui2/src/to_extract/theme_selector.rs @@ -39,7 +39,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::Story; @@ -48,7 +48,7 @@ mod stories { pub struct ThemeSelectorStory; impl Render for ThemeSelectorStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/title_bar.rs b/crates/ui2/src/to_extract/title_bar.rs index 87d7dd4146..d805992023 100644 --- a/crates/ui2/src/to_extract/title_bar.rs +++ b/crates/ui2/src/to_extract/title_bar.rs @@ -1,7 +1,7 @@ use std::sync::atomic::AtomicBool; use std::sync::Arc; -use gpui::{Div, Render, View, VisualContext}; +use gpui::{Node, Render, View, VisualContext}; use crate::prelude::*; use crate::settings::user_settings; @@ -86,9 +86,9 @@ impl TitleBar { } impl Render for TitleBar { - type Element = Div; + type Element = Node; - fn render(&mut self, cx: &mut ViewContext) -> Div { + fn render(&mut self, cx: &mut ViewContext) -> Node { let settings = user_settings(cx); // let has_focus = cx.window_is_active(); @@ -202,9 +202,9 @@ mod stories { } impl Render for TitleBarStory { - type Element = Div; + type Element = Node; - fn render(&mut self, cx: &mut ViewContext) -> Div { + fn render(&mut self, cx: &mut ViewContext) -> Node { Story::container(cx) .child(Story::title_for::<_, TitleBar>(cx)) .child(Story::label(cx, "Default")) diff --git a/crates/ui2/src/to_extract/toolbar.rs b/crates/ui2/src/to_extract/toolbar.rs index 81918f34a7..1c1795437b 100644 --- a/crates/ui2/src/to_extract/toolbar.rs +++ b/crates/ui2/src/to_extract/toolbar.rs @@ -73,7 +73,7 @@ mod stories { use std::path::PathBuf; use std::str::FromStr; - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::{Breadcrumb, HighlightedText, Icon, IconButton, Story, Symbol}; @@ -82,7 +82,7 @@ mod stories { pub struct ToolbarStory; impl Render for ToolbarStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/traffic_lights.rs b/crates/ui2/src/to_extract/traffic_lights.rs index 245ff377f2..76898eb19a 100644 --- a/crates/ui2/src/to_extract/traffic_lights.rs +++ b/crates/ui2/src/to_extract/traffic_lights.rs @@ -77,7 +77,7 @@ pub use stories::*; #[cfg(feature = "stories")] mod stories { - use gpui::{Div, Render}; + use gpui::{Node, Render}; use crate::Story; @@ -86,7 +86,7 @@ mod stories { pub struct TrafficLightsStory; impl Render for TrafficLightsStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { Story::container(cx) diff --git a/crates/ui2/src/to_extract/workspace.rs b/crates/ui2/src/to_extract/workspace.rs index d6de8a8288..2ab6b4b3ef 100644 --- a/crates/ui2/src/to_extract/workspace.rs +++ b/crates/ui2/src/to_extract/workspace.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use chrono::DateTime; -use gpui::{px, relative, Div, Render, Size, View, VisualContext}; +use gpui::{px, relative, Node, Render, Size, View, VisualContext}; use settings2::Settings; use theme2::ThemeSettings; @@ -192,9 +192,9 @@ impl Workspace { } impl Render for Workspace { - type Element = Div; + type Element = Node; - fn render(&mut self, cx: &mut ViewContext) -> Div { + fn render(&mut self, cx: &mut ViewContext) -> Node { let root_group = PaneGroup::new_panes( vec![Pane::new( "pane-0", @@ -388,7 +388,7 @@ mod stories { } impl Render for WorkspaceStory { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { div().child(self.workspace.clone()) diff --git a/crates/workspace2/src/dock.rs b/crates/workspace2/src/dock.rs index f21eb84ae2..0e507c0f7c 100644 --- a/crates/workspace2/src/dock.rs +++ b/crates/workspace2/src/dock.rs @@ -1,7 +1,7 @@ use crate::{status_bar::StatusItemView, Axis, Workspace}; use gpui::{ - div, Action, AnyView, AppContext, Div, Entity, EntityId, EventEmitter, ParentElement, Render, - Subscription, View, ViewContext, WeakView, WindowContext, + div, Action, AnyView, AppContext, Entity, EntityId, EventEmitter, Node, ParentComponent, + Render, Subscription, View, ViewContext, WeakView, WindowContext, }; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -419,7 +419,7 @@ impl Dock { } impl Render for Dock { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { todo!() @@ -621,7 +621,7 @@ impl PanelButtons { // } impl Render for PanelButtons { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { // todo!() @@ -647,7 +647,7 @@ impl StatusItemView for PanelButtons { #[cfg(any(test, feature = "test-support"))] pub mod test { use super::*; - use gpui::{div, Div, ViewContext, WindowContext}; + use gpui::{div, Node, ViewContext, WindowContext}; pub struct TestPanel { pub position: DockPosition, @@ -672,7 +672,7 @@ pub mod test { } impl Render for TestPanel { - type Element = Div; + type Element = Node; fn render(&mut self, _cx: &mut ViewContext) -> Self::Element { div() diff --git a/crates/workspace2/src/modal_layer.rs b/crates/workspace2/src/modal_layer.rs index 09ffa6c13f..8beaaed3c3 100644 --- a/crates/workspace2/src/modal_layer.rs +++ b/crates/workspace2/src/modal_layer.rs @@ -1,6 +1,6 @@ use gpui::{ - div, px, AnyView, Div, EventEmitter, FocusHandle, ParentElement, Render, StatelessInteractive, - Styled, Subscription, View, ViewContext, VisualContext, WindowContext, + div, prelude::*, px, AnyView, EventEmitter, FocusHandle, InteractiveComponent, Node, + ParentComponent, Render, Styled, Subscription, View, ViewContext, VisualContext, WindowContext, }; use ui::v_stack; @@ -76,7 +76,7 @@ impl ModalLayer { } impl Render for ModalLayer { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let Some(active_modal) = &self.active_modal else { diff --git a/crates/workspace2/src/notifications.rs b/crates/workspace2/src/notifications.rs index 7277cc6fc4..8673645b1e 100644 --- a/crates/workspace2/src/notifications.rs +++ b/crates/workspace2/src/notifications.rs @@ -165,7 +165,7 @@ impl Workspace { pub mod simple_message_notification { use super::{Notification, NotificationEvent}; - use gpui::{AnyElement, AppContext, Div, EventEmitter, Render, TextStyle, ViewContext}; + use gpui::{AnyElement, AppContext, EventEmitter, Node, Render, TextStyle, ViewContext}; use serde::Deserialize; use std::{borrow::Cow, sync::Arc}; @@ -252,7 +252,7 @@ pub mod simple_message_notification { } impl Render for MessageNotification { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { todo!() diff --git a/crates/workspace2/src/pane.rs b/crates/workspace2/src/pane.rs index 2bba684d12..ff16ebdc6d 100644 --- a/crates/workspace2/src/pane.rs +++ b/crates/workspace2/src/pane.rs @@ -1,5 +1,3 @@ -// mod dragged_item_receiver; - use crate::{ item::{Item, ItemHandle, ItemSettings, WeakItemHandle}, toolbar::Toolbar, @@ -9,9 +7,9 @@ use crate::{ use anyhow::Result; use collections::{HashMap, HashSet, VecDeque}; use gpui::{ - actions, register_action, AppContext, AsyncWindowContext, Component, Div, EntityId, - EventEmitter, FocusHandle, Model, PromptLevel, Render, Task, View, ViewContext, VisualContext, - WeakView, WindowContext, + actions, prelude::*, register_action, AppContext, AsyncWindowContext, Component, EntityId, + EventEmitter, FocusHandle, Model, Node, PromptLevel, Render, Task, View, ViewContext, + VisualContext, WeakView, WindowContext, }; use parking_lot::Mutex; use project2::{Project, ProjectEntryId, ProjectPath}; @@ -1903,7 +1901,7 @@ impl Pane { // } impl Render for Pane { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { v_stack() @@ -2928,7 +2926,7 @@ struct DraggedTab { } impl Render for DraggedTab { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { div().w_8().h_4().bg(gpui::red()) diff --git a/crates/workspace2/src/status_bar.rs b/crates/workspace2/src/status_bar.rs index fcf6ac3b61..6ac524f824 100644 --- a/crates/workspace2/src/status_bar.rs +++ b/crates/workspace2/src/status_bar.rs @@ -2,8 +2,8 @@ use std::any::TypeId; use crate::{ItemHandle, Pane}; use gpui::{ - div, AnyView, Component, Div, ParentElement, Render, Styled, Subscription, View, ViewContext, - WindowContext, + div, AnyView, Component, Node, ParentComponent, Render, Styled, Subscription, View, + ViewContext, WindowContext, }; use theme2::ActiveTheme; use util::ResultExt; @@ -34,7 +34,7 @@ pub struct StatusBar { } impl Render for StatusBar { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { div() diff --git a/crates/workspace2/src/toolbar.rs b/crates/workspace2/src/toolbar.rs index 1d67da06b2..dfe661d5b0 100644 --- a/crates/workspace2/src/toolbar.rs +++ b/crates/workspace2/src/toolbar.rs @@ -1,6 +1,6 @@ use crate::ItemHandle; use gpui::{ - AnyView, Div, Entity, EntityId, EventEmitter, Render, View, ViewContext, WindowContext, + AnyView, Entity, EntityId, EventEmitter, Node, Render, View, ViewContext, WindowContext, }; pub enum ToolbarItemEvent { @@ -52,7 +52,7 @@ pub struct Toolbar { } impl Render for Toolbar { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { todo!() diff --git a/crates/workspace2/src/workspace2.rs b/crates/workspace2/src/workspace2.rs index 14a7685a9b..df2b1d8f30 100644 --- a/crates/workspace2/src/workspace2.rs +++ b/crates/workspace2/src/workspace2.rs @@ -36,12 +36,11 @@ use futures::{ Future, FutureExt, StreamExt, }; use gpui::{ - actions, div, point, rems, size, Action, AnyModel, AnyView, AnyWeakView, AppContext, - AsyncAppContext, AsyncWindowContext, Bounds, Component, Div, Entity, EntityId, EventEmitter, - FocusHandle, GlobalPixels, KeyContext, Model, ModelContext, ParentElement, Point, Render, Size, - StatefulInteractive, StatelessInteractive, StatelessInteractivity, Styled, Subscription, Task, - View, ViewContext, VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle, - WindowOptions, + actions, div, point, prelude::*, rems, size, Action, AnyModel, AnyView, AnyWeakView, + AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Component, Entity, EntityId, + EventEmitter, FocusHandle, GlobalPixels, KeyContext, Model, ModelContext, Node, + ParentComponent, Point, Render, Size, Styled, Subscription, Task, View, ViewContext, WeakView, + WindowBounds, WindowContext, WindowHandle, WindowOptions, }; use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ItemSettings, ProjectItem}; use itertools::Itertools; @@ -443,7 +442,6 @@ struct Follower { impl AppState { #[cfg(any(test, feature = "test-support"))] pub fn test(cx: &mut AppContext) -> Arc { - use gpui::Context; use node_runtime::FakeNodeRuntime; use settings2::SettingsStore; @@ -531,13 +529,7 @@ pub enum Event { pub struct Workspace { weak_self: WeakView, focus_handle: FocusHandle, - workspace_actions: Vec< - Box< - dyn Fn( - Div>, - ) -> Div>, - >, - >, + workspace_actions: Vec) -> Node>>, zoomed: Option, zoomed_position: Option, center: PaneGroup, @@ -3450,7 +3442,6 @@ impl Workspace { #[cfg(any(test, feature = "test-support"))] pub fn test_new(project: Model, cx: &mut ViewContext) -> Self { - use gpui::Context; use node_runtime::FakeNodeRuntime; let client = project.read(cx).client(); @@ -3512,10 +3503,7 @@ impl Workspace { })); } - fn add_workspace_actions_listeners( - &self, - mut div: Div>, - ) -> Div> { + fn add_workspace_actions_listeners(&self, mut div: Node) -> Node { for action in self.workspace_actions.iter() { div = (action)(div) } @@ -3740,14 +3728,14 @@ fn notify_if_database_failed(workspace: WindowHandle, cx: &mut AsyncA impl EventEmitter for Workspace {} impl Render for Workspace { - type Element = Div; + type Element = Node; fn render(&mut self, cx: &mut ViewContext) -> Self::Element { let mut context = KeyContext::default(); context.add("Workspace"); self.add_workspace_actions_listeners(div()) - .context(context) + .key_context(context) .relative() .size_full() .flex()